Merge branch 'clients' of github.com:bitcoin/bitcoin.org into clients

clients.html

@@ -6,16 +6,24 @@ clients:
 - name: Bitcoin-Qt
   url: bitcoin.org
   image: bitcoin-qt.png
-  description: Bitcoin-Qt is the frontend for the original code written by Satoshi. It replaced the aging wxWidgets version with a newer architecture that allows changes to be made easier and making the software more portable to different platforms. Bitcoin-Qt is well tested, and is a good starting point for any Bitcoin user looking for stability.
+  description: The original software written by Satoshi Nakamoto, the project's founder. If you aren't sure which program to pick, this is a good bet. This application is a peer-to-peer client that builds the backbone of the Bitcoin network. It is suited for enthusiasts, merchants, miners, developers and people who want to help support the project. People who run Bitcoin-Qt are first class network citizens and have the highest levels of security, privacy and stability. However, it can be very resource intensive and you should be willing to leave it running in the background so other computers can connect to yours. If your computer is low powered or you aren't willing to tolerate a 8-hour+ initial start time, you should consider other clients. Cutting edge features tend to be implemented in other clients first. 
   platforms:
   - name: linux
   - name: ubuntu
   - name: win
   - name: osx-uni
+- name: MultiBit
+  url: multibit.org
+  image: multibit.png
+  description: MultiBit's primary focus is being fast and easy to use, even for people with no technical knowledge. It has a YouTube channel to help you learn the software, and includes helpful features such as an exchange rate ticker. MultiBit supports many languages such as German, Spanish and Greek. MultiBit synchronizes with the network much faster than Bitcoin-Qt and should be ready for you to use within a few minutes. This is a good choice for non technical users who want an easy to use experience, especially if you use a Mac.
+  platforms:
+  - name: linux
+  - name: win
+  - name: osx-uni
 - name: Armory
   url: bitcoinarmory.com
   image: armory.png
-  description: Armory is an advanced client that incorporates a number of wallet management features for security. It works in conjunction with the Satoshi codebase to leverage a platform which maintain multiple wallets with encryption with support for offline transactions. Armory is security oriented and targets the high end of the Bitcoin userbase.
+  description: Armory is a Bitcoin client that works on top of Bitcoin-Qt, expanding it with functionality for Bitcoin power users. It focuses on advanced features and security options, including "cold-storage" for maintaining Bitcoins on an offline computer to protect your funds from online threats. Armory supports multiple encrypted wallets, each of which only needs to be backed up once using a printer or removable media. Armory is a good choice for experienced Bitcoin users, seeking additional flexibility and security for managing their funds.
   platforms:
   - name: linux
   - name: ubuntu
@@ -23,28 +31,18 @@ clients:
 - name: Electrum
   url: ecdsa.org/electrum
   image: electrum.png
-  description: Electrum is a client that was designed to simplify the use of Bitcoin. Electrum does not download the blockchain and startup times are instant which it does by pooling remote blockchain servers. You do not need to perform regular backups of your wallet as your wallet can be recovered from a secret passphrase which you can memorize or write on a piece of paper.
+  description: Electrum's focus is speed, with low resource usage and simplifying Bitcoin. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjuction with high-performance servers that handle the most complicated parts of the Bitcoin system. Easy to install to packages are not available at this point.
   platforms:
   - name: linux
-  - name: ubuntu
   - name: win
   - name: android
-- name: MultiBit
-  url: multibit.org
-  image: multibit.png
-  description: MultiBit is a Bitcoin client. It understands the Bitcoin protocol so it can send and receive bitcoins. It makes the job of sending and receiving bitcoins simple and quick. MultiBit can handle multiple wallets so you can maintain different Bitcoin "accounts" for different purposes. On the 'Your Wallets' screen you can see all your wallets and transactions. MultiBit provides features like different languages, single click payment and quicker access to new features.
-  platforms:
-  - name: linux
-  - name: ubuntu
-  - name: win
-  - name: osx-uni
-  - name: ios
 ---
 
     <div class="container">
       <section id="graphical-interfaces">
         <h1>Bitcoin Client Software</h1>
         <p>Bitcoin is a system of merchants, individuals, a network of participants and software. Together they maintain a mutually co-operating infrastructure without the need for authorities - a decentralised peer-to-peer system. A core layer of the Bitcoin system is the Bitcoin network through which people interact with it using Bitcoin client software. Below we list such software.</p>
+        <p>Bitcoin clients are the base level of technology for conducting Bitcoin transactions. Clients usually store a collection of keys on that computer (often termed a wallet). These keys allow you to send and receive payments through the Bitcoin network. Nobody has access to these keys except yourself, and they must be kept secure. This is where clients differ, with ingenious strategies and ongoing research into making a user-friendly and secure client - not an easy task when both goals often conflict!</p>
         <div class="row">
           {% for client in page.clients %}
           {% cycle '', '', '', '</div><br><div class="row">' %}