Merge remote-tracking branch 'origin/master' into check-updates

2016-11-22 10:25:34 +01:00
parent 45dead9d49 b97763e13d
commit bf9ed2d444
25 changed files with 142 additions and 104 deletions
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -40,7 +40,7 @@ Operating Options:
                           (default: {flag_mode_alarm}).
  --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                           JSON chain specification file or olympic, frontier,
-                           homestead, mainnet, morden, classic, expanse,
+                           homestead, mainnet, morden, ropsten, classic, expanse,
                           testnet or dev (default: {flag_chain}).
  -d --db-path PATH        Specify the database & configuration directory path
                           (default: {flag_db_path}).