Merge remote-tracking branch 'origin/master'

README.rst

@@ -44,8 +44,8 @@ Features
 - Ethereum wallet support
 - Auto-generation of Java smart contract wrappers to create, deploy, transact with and call smart
   contracts from native Java code
-  - from solc output; or
-  - from Truffle `.json` contract files.
+    - from solc output; or
+    - from Truffle `.json` contract files.
 - Reactive-functional API for working with filters
 - Support for Parity's
   `Personal <https://github.com/paritytech/parity/wiki/JSONRPC-personal-module>`__, and Geth's
@@ -265,7 +265,7 @@ Then generate the wrapper code using web3j's `Command line tools`_:
 
 .. code-block:: bash
 
-   $ cd /path/to/your/webj/java/project
+   $ cd /path/to/your/web3j/java/project
    $ web3j truffle generate /path/to/<truffle-smart-contract-output>.json -o /path/to/src/main/java -p com.your.organisation.name
 
 Whether using `Truffle` or `solc` directly, either way you get a ready-to-use Java wrapper for your contract.

docs/source/index.rst

@@ -23,8 +23,8 @@ Features
 - Ethereum wallet support
 - Auto-generation of Java smart contract wrappers to create, deploy, transact with and call smart
   contracts from native Java code
-  - from solc output; or
-  - from Truffle `.json` contract files.
+    - from solc output; or
+    - from Truffle `.json` contract files.
 - Reactive-functional API for working with filters
 - Support for Parity's
   `Personal <https://github.com/paritytech/parity/wiki/JSONRPC-personal-module>`__, and Geth's