Merge branch 'develop' into 864-distinguish-between-seeds-and-manual-peers

This commit is contained in:
Ethan Buchman
2018-01-13 14:34:32 -05:00
27 changed files with 494 additions and 164 deletions

View File

@ -18,7 +18,7 @@ Configuration
~~~~~~~~~~~~~
Set the ``laddr`` config parameter under ``[rpc]`` table in the
$TMHOME/config.toml file or the ``--rpc.laddr`` command-line flag to the
$TMHOME/config/config.toml file or the ``--rpc.laddr`` command-line flag to the
desired protocol://host:port setting. Default: ``tcp://0.0.0.0:46657``.
Arguments