Merge pull request #237 from gin/master

Correct typos, and make indent level consistent

contracts/test/FiatTokenV2NewFieldsTest.sol

@@ -35,28 +35,28 @@ contract FiatTokenV2NewFieldsTest is FiatTokenV1 {
     bool internal initializedV2;
 
     function initialize(
-     	string _name,
-        string _symbol,
-        string _currency,
-        uint8 _decimals,
-        address _masterMinter,
-        address _pauser,
-        address _blacklister,
-        address _owner,
-        bool _newBool,
-        address _newAddress,
-        uint256 _newUint
+      string _name,
+      string _symbol,
+      string _currency,
+      uint8 _decimals,
+      address _masterMinter,
+      address _pauser,
+      address _blacklister,
+      address _owner,
+      bool _newBool,
+      address _newAddress,
+      uint256 _newUint
     ) public {
         super.initialize(_name, _symbol, _currency, _decimals, _masterMinter, _pauser, _blacklister, _owner);
         initV2(_newBool, _newAddress, _newUint);
     }
 
     function initV2(bool _newBool, address _newAddress, uint256 _newUint) public {
-		require(!initializedV2);
-		newBool = _newBool;
-		newAddress = _newAddress;
-		newUint = _newUint;
-		initializedV2 = true;
+      require(!initializedV2);
+      newBool = _newBool;
+      newAddress = _newAddress;
+      newUint = _newUint;
+      initializedV2 = true;
     }
 
 

doc/deployment.md

@@ -3,7 +3,7 @@
 This is the process for deploying a new proxy and implementation (as opposed to upgrading an existing proxy).
 
 Since the proxy uses `delegatecall` to forward calls to the implementation initialization of the contracts becomes a little
-tricky because we can not initialize fields in the implementation contrat via the constructor. Instead there is an initialize
+tricky because we can not initialize fields in the implementation contract via the constructor. Instead there is an initialize
 method in the implementation contract, which is publicly available, but can only be called once per proxy.
 
 
@@ -29,7 +29,7 @@ See [README.validate.md](../validate/validate.js).
 ## Deploying a Proxy:
 
 1. Obtain addresses for the various contract roles from CENTRE ops. The keys for these addresses will be stored offline.
-the address needed are:
+The address needed are:
    ```
    admin
    masterMinter
@@ -85,4 +85,4 @@ sure that the contract has been deployed correctly. The following fields should
    - `totalSupply` is 0
    - `initialized` is `true`
 
-6. If all verification is successful, the contract is deployed and ready to go. If any verification steps failed, restart the process.
+6. If all verification is successful, the contract is deployed and ready to go. If any verification steps failed, restart the process.

doc/tokendesign.md

@@ -4,7 +4,7 @@ It allows minting/burning of tokens by multiple entities, pausing all activity,
 and a way to upgrade the contract so that bugs can be fixed or features added.
 
 ## Roles
-The `FiatToken` has a numer of roles (addresses) which control different functionality:
+The `FiatToken` has a number of roles (addresses) which control different functionality:
 - `masterMinter` - adds and removes minters and increases their minting allowance
 - `minters` - create and destroy tokens
 - `pauser` - pause the contract, which prevents all transfers, minting, and burning