summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian May <brian@linuxpenguins.xyz>2016-01-17 18:34:10 +1100
committerBrian May <brian@linuxpenguins.xyz>2016-01-17 18:34:10 +1100
commit59865269ac03698df010b2d017e0772cbca5e06c (patch)
tree302d15a9203f671b9eef24998158839fcb88c0bb
parent28017303f2edfb03b84b4e0058a96acb012eb03d (diff)
Update documentation
Closes #60.
-rw-r--r--docs/index.rst2
-rw-r--r--docs/manpage.rst7
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 6215d67..4cc6c5a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -10,7 +10,7 @@ Contents:
requirements
installation
usage
- Manpage <manpage>
+ Man Page <manpage>
how-it-works
support
trivia
diff --git a/docs/manpage.rst b/docs/manpage.rst
index 38d00c9..9cfd8a7 100644
--- a/docs/manpage.rst
+++ b/docs/manpage.rst
@@ -49,6 +49,9 @@ Options
run :program:`sshuttle` on a router) try enabling IP Forwarding in
your kernel, then using ``--listen 0.0.0.0:0``.
+ For the tproxy method this can be an IPv6 address. Use this option twice if
+ required, to provide both IPv4 and IPv6 addresses.
+
.. option:: -H, --auto-hosts
Scan for remote hostnames and update the local /etc/hosts
@@ -161,6 +164,10 @@ Options
*pidfilename*. The default is ``sshuttle.pid`` in the
current directory.
+.. option:: --disable-ipv6
+
+ If using the tproxy method, this will disable IPv6 support.
+
.. option:: --firewall
(internal use only) run the firewall manager. This is