distinguish between seeds and manual peers in the config/flags

- we only use seeds if we can’t connect to peers in the addrbook.
- we always connect to nodes given in config/flags

Refs #864

docs/deploy-testnets.rst

@@ -24,13 +24,13 @@ Here are the steps to setting up a testnet manually:
    ``tendermint gen_validator``
 4) Compile a list of public keys for each validator into a
    ``genesis.json`` file.
-5) Run ``tendermint node --p2p.seeds=< seed addresses >`` on each node,
-   where ``< seed addresses >`` is a comma separated list of the IP:PORT
+5) Run ``tendermint node --p2p.manual_peers=< peer addresses >`` on each node,
+   where ``< peer addresses >`` is a comma separated list of the IP:PORT
    combination for each node. The default port for Tendermint is
    ``46656``. Thus, if the IP addresses of your nodes were
    ``192.168.0.1, 192.168.0.2, 192.168.0.3, 192.168.0.4``, the command
    would look like:
-   ``tendermint node --p2p.seeds=192.168.0.1:46656,192.168.0.2:46656,192.168.0.3:46656,192.168.0.4:46656``.
+   ``tendermint node --p2p.manual_peers=192.168.0.1:46656,192.168.0.2:46656,192.168.0.3:46656,192.168.0.4:46656``.
 
 After a few seconds, all the nodes should connect to eachother and start
 making blocks! For more information, see the Tendermint Networks section

docs/specification/configuration.rst

@@ -49,6 +49,8 @@ The main config parameters are defined
 -  ``p2p.pex``: Enable Peer-Exchange (dev feature). *Default*: ``false``
 -  ``p2p.seeds``: Comma delimited host:port seed nodes. *Default*:
    ``""``
+-  ``p2p.manual_peers``: Comma delimited host:port manual peers. *Default*:
+   ``""``
 -  ``p2p.skip_upnp``: Skip UPNP detection. *Default*: ``false``
 
 -  ``rpc.grpc_laddr``: GRPC listen address (BroadcastTx only). Port

docs/specification/rpc.rst

@@ -111,7 +111,7 @@ An HTTP Get request to the root RPC endpoint (e.g.
     http://localhost:46657/broadcast_tx_commit?tx=_
     http://localhost:46657/broadcast_tx_sync?tx=_
     http://localhost:46657/commit?height=_
-    http://localhost:46657/dial_seeds?seeds=_
+    http://localhost:46657/dial_manual_peers?manual_peers=_
     http://localhost:46657/subscribe?event=_
     http://localhost:46657/tx?hash=_&prove=_
     http://localhost:46657/unsafe_start_cpu_profiler?filename=_

docs/using-tendermint.rst

@@ -270,14 +270,14 @@ For instance,
 
 ::
 
-    tendermint node --p2p.seeds "1.2.3.4:46656,5.6.7.8:46656"
+    tendermint node --p2p.manual_peers "1.2.3.4:46656,5.6.7.8:46656"
 
-Alternatively, you can use the ``/dial_seeds`` endpoint of the RPC to
+Alternatively, you can use the ``/dial_manual_peers`` endpoint of the RPC to
 specify peers for a running node to connect to:
 
 ::
 
-    curl --data-urlencode "seeds=[\"1.2.3.4:46656\",\"5.6.7.8:46656\"]" localhost:46657/dial_seeds
+    curl --data-urlencode "manual_peers=[\"1.2.3.4:46656\",\"5.6.7.8:46656\"]" localhost:46657/dial_manual_peers
 
 Additionally, the peer-exchange protocol can be enabled using the
 ``--pex`` flag, though this feature is `still under
@@ -290,7 +290,7 @@ Adding a Non-Validator
 
 Adding a non-validator is simple. Just copy the original
 ``genesis.json`` to ``~/.tendermint`` on the new machine and start the
-node, specifying seeds as necessary. If no seeds are specified, the node
+node, specifying manual_peers as necessary. If no manual_peers are specified, the node
 won't make any blocks, because it's not a validator, and it won't hear
 about any blocks, because it's not connected to the other peer.
 
@@ -363,7 +363,7 @@ and the new ``priv_validator.json`` to the ``~/.tendermint`` on a new
 machine.
 
 Now run ``tendermint node`` on both machines, and use either
-``--p2p.seeds`` or the ``/dial_seeds`` to get them to peer up. They
+``--p2p.manual_peers`` or the ``/dial_manual_peers`` to get them to peer up. They
 should start making blocks, and will only continue to do so as long as
 both of them are online.