Merge pull request #200 from EOSIO/develop

Merge develop into master

docs/01_overview/03_technical_features.md

@@ -13,7 +13,7 @@ EOSIO is designed with high transactions throughput in mind and each new version
 
 The consensus mechanism of Delegated Proof of Stake (DPOS) achieves high transaction throughputs because DPOS does not need to wait for all the nodes to complete a transaction to achieve finality. This behavior results in faster confirmations and lower latency.
 
-The `EOS-VM` mentioned earlier, and all its blockchain-dedicated features and improvements add significant contribution to the overall performance of the EOSIO-based blockchains.
+The `EOS VM` mentioned earlier, and all its blockchain-dedicated features and improvements add significant contribution to the overall performance of the EOSIO-based blockchains.
 
 ## Programmable Economics and Governance
 The resource allocation and governance mechanism of any EOSIO-based blockchains are programmable through smart contracts. You can modify the system smart contracts to customize the resource allocation model and governance rules of a EOSIO blockchain. The on-chain governance mechanism can be modified using system smart contracts, as the core layer code does not always have to be updated for the changes to take place.

docs/02_getting-started/02_development-environment/05_create-development-wallet.md

@@ -5,7 +5,7 @@ link_text: "1.4 Create Development Wallet"
 
 Wallets are repositories of public-private key pairs. Private keys are needed to sign operations performed on the blockchain. Wallets are accessed using cleos.
 ## Step 1: Create a Wallet
-The first step is to create a wallet. Use [cleos wallet create]() to create a new "default" wallet using the option `--to-console` for simplicity. If using cleos in production, it's wise to instead use `--to-file` so your wallet password is not in your bash history. For development purposes and because these are **development and not production keys** `--to-console` poses no security threat.
+The first step is to create a wallet. Use [cleos wallet create]() to create a new "default" wallet using the option `--to-console` for simplicity. If using cleos in production, it's wise to instead use `--file` so your wallet password is not in your bash history. For development purposes and because these are **development and not production keys** `--to-console` poses no security threat.
 
 ```shell
 cleos wallet create --to-console

docs/02_getting-started/03_smart-contract-development/03_understanding-ABI-files.md

@@ -32,7 +32,7 @@ Start with an empty ABI, name it `eosio.token.abi`
 An ABI enables any client or interface to interpret and even generate a GUI for your contract. For this to work consistently, describe the custom types that are used as a parameter in any public action or struct that needs to be described in the ABI.
 
 [[info | Built-in Types]]
-| EOSIO implements a number of custom built-ins. Built-in types don't need to be described in an ABI file. If you would like to familiarize yourself with EOSIO's built-ins, they are defined [here](https://github.com/EOSIO/eos/blob/master/libraries/chain/abi_serializer.cpp#L59-L100)
+| EOSIO implements a number of custom built-ins. Built-in types don't need to be described in an ABI file. If you would like to familiarize yourself with EOSIO's built-ins, they are defined [here](https://github.com/EOSIO/eos/blob/master/libraries/chain/abi_serializer.cpp#L88-L126)
 
 
 ```json

docs/02_getting-started/03_smart-contract-development/04_data-persistence.md

@@ -175,7 +175,7 @@ Previously, a multi_index table was configured, and declared as `address_index`.
 
 1. The first parameter "code", which specifies the owner of this table. As the owner, the account will be charged for storage costs.  Also, only that account can modify or delete the data in this table unless another payer is specified. Here we use the `get_self()` function which will pass the name of this contract.
 
-2. The second parameter "scope" which ensures the uniqueness of the table within this contract. In this case, since we only have one table we can use the value from `get_first_receiver()`. *`get_first_receiver` is the account name this contract is deployed to.*
+2. The second parameter "scope" which ensures the uniqueness of the table in the scope of this contract. In this case, since we only have one table we can use the value from `get_first_receiver()`. The value returned from the *`get_first_receiver` function is the account name on which this contract is deployed to.*
 
 Note that scopes are used to logically separate tables within a multi-index (see the eosio.token contract multi-index for an example, which scopes the table on the token owner).  Scopes were originally intended to separate table state in order to allow for parallel computation on the individual sub-tables.  However, currently inter-blockchain communication has been prioritized over parallelism.  Because of this, scopes are currently only used to logically separate the tables as in the case of eosio.token.
 
@@ -417,7 +417,7 @@ private:
 };    
 ```
 
-## Step 10 Prepare the Ricardian Clauses [Optional]
+## Step 10 Prepare the Ricardian Contract [Optional]
 
 Contracts compiled without a Ricardian contract will generate a compiler warning for each action missing an entry in the Ricardian clause.
 

docs/02_getting-started/03_smart-contract-development/07_inline-action-to-external-contract.md

@@ -201,9 +201,9 @@ public:
 private:
   struct [[eosio::table]] person {
     name key;
-    uint64_t age;
     std::string first_name;
     std::string last_name;
+    uint64_t age;
     std::string street;
     std::string city;
     std::string state;

docs/02_getting-started/03_smart-contract-development/10_payable_actions.md

@@ -273,7 +273,7 @@ cleos set account permission hodl active --add-code
 ```
 Next, create a testing account:
 ```shell
-cleos create account eosio han DEVELOPMENT_KEY
+cleos create account eosio han YOUR_PUBLIC_KEY
 ```
 Let's transfer some SYS tokens issued in the previous section to `han`:
 ```shell

docs/03_tutorials/index.md

@@ -1 +1,2 @@
 1. [BIOS Boot Sequence](bios-boot-sequence.md): Demonstrates how to bootstrap a new EOSIO blockchain
+2. [Tic Tac Toe Game Contract](tic-tac-toe-game-contract.md): Build a sample Tic Tac Toe game on EOSIO to apply the knowledge you acquired earlier