summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Lenski <daniel.lenski@finalphasesystems.com>2016-05-02 21:40:53 -0700
committerDan Lenski <daniel.lenski@finalphasesystems.com>2016-05-02 21:40:53 -0700
commit5a20783baa9215e76ec781dc3854e4401b34ccce (patch)
tree2b0f8d814fa32ce53179948f20ba6038b92c75a2
parent495b3c39eac62b855d24652d4b657d8714727d78 (diff)
tweak docs to match @vieira's changes
-rw-r--r--docs/manpage.rst4
-rw-r--r--sshuttle/options.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/manpage.rst b/docs/manpage.rst
index 434fe17..fe6633a 100644
--- a/docs/manpage.rst
+++ b/docs/manpage.rst
@@ -136,6 +136,10 @@ Options
if you use this option to give it a few names to start
from.
+ If this option is used *without* :option:`--auto-hosts`,
+ then the listed hostnames will be scanned and added, but
+ no further hostnames will be added.
+
.. option:: --no-latency-control
Sacrifice latency to improve bandwidth benchmarks. ssh
diff --git a/sshuttle/options.py b/sshuttle/options.py
index 0b1aa47..301e8fe 100644
--- a/sshuttle/options.py
+++ b/sshuttle/options.py
@@ -134,7 +134,7 @@ parser.add_argument(
"-H", "--auto-hosts",
action="store_true",
help="""
- scan for remote hostnames and update local /etc/hosts
+ continuously scan for remote hostnames and update local /etc/hosts as they are found
"""
)
parser.add_argument(
@@ -232,7 +232,7 @@ parser.add_argument(
metavar="HOSTNAME[,HOSTNAME]",
default=[],
help="""
- with -H, use these hostnames for initial scan (comma-separated)
+ comma-separated list of hostnames for initial scan (may be used with or without --auto-hosts)
"""
)
parser.add_argument(