Skip to content

Commit b95c1f3

Browse files
committed
Trim excess whitespace
1 parent 5257d9f commit b95c1f3

File tree

11 files changed

+20
-24
lines changed

11 files changed

+20
-24
lines changed

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ common case:
2424
- You can't use openssh's PermitTunnel feature because
2525
it's disabled by default on openssh servers; plus it does
2626
TCP-over-TCP, which has `terrible performance`_.
27-
27+
2828
.. _terrible performance: https://sshuttle.readthedocs.io/en/stable/how-it-works.html
2929

3030
Obtaining sshuttle
@@ -37,21 +37,21 @@ Obtaining sshuttle
3737
- Debian stretch or later::
3838

3939
apt-get install sshuttle
40-
40+
4141
- Arch Linux::
4242

4343
pacman -S sshuttle
4444

4545
- Fedora::
4646

4747
dnf install sshuttle
48-
48+
4949
- openSUSE::
5050

5151
zypper in sshuttle
5252

5353
- Gentoo::
54-
54+
5555
emerge -av net-proxy/sshuttle
5656

5757
- NixOS::
@@ -116,5 +116,5 @@ https://sshuttle.readthedocs.org/en/latest/
116116

117117
Running as a service
118118
--------------------
119-
Sshuttle can also be run as a service and configured using a config management system:
119+
Sshuttle can also be run as a service and configured using a config management system:
120120
https://medium.com/@mike.reider/using-sshuttle-as-a-service-bec2684a65fe

docs/chromeos.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ stretch/Debian 9 VM, you can then install sshuttle as on any Linux box and
99
it just works, as do xterms and ssvncviewer etc.
1010

1111
https://www.reddit.com/r/Crostini/wiki/getstarted/crostini-setup-guide
12-

docs/how-it-works.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ sshuttle assembles the TCP stream locally, multiplexes it statefully over
3434
an ssh session, and disassembles it back into packets at the other end. So
3535
it never ends up doing TCP-over-TCP. It's just data-over-TCP, which is
3636
safe.
37-

docs/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ Indices and tables
2626

2727
* :ref:`genindex`
2828
* :ref:`search`
29-

docs/manpage.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ information::
344344
$ sshuttle -r example.com -x example.com:22 0/0
345345

346346
Starting sshuttle proxy (version ...).
347-
[local sudo] Password:
347+
[local sudo] Password:
348348
fw: Starting firewall with Python version 3.9.5
349349
fw: ready method name nat.
350350
c : IPv6 disabled since it isn't supported by method nat.
@@ -362,7 +362,7 @@ information::
362362
c : TCP redirector listening on ('127.0.0.1', 12299).
363363
c : Starting client with Python version 3.9.5
364364
c : Connecting to server...
365-
[email protected]'s password:
365+
[email protected]'s password:
366366
s: Starting server with Python version 3.6.8
367367
s: latency control setting = True
368368
s: auto-nets:False
@@ -383,7 +383,7 @@ and subnet guessing::
383383

384384
$ sshuttle -vNHr example.com -x example.com:22
385385
Starting sshuttle proxy (version ...).
386-
[local sudo] Password:
386+
[local sudo] Password:
387387
fw: Starting firewall with Python version 3.9.5
388388
fw: ready method name nat.
389389
c : IPv6 disabled since it isn't supported by method nat.
@@ -401,7 +401,7 @@ and subnet guessing::
401401
c : TCP redirector listening on ('127.0.0.1', 12300).
402402
c : Starting client with Python version 3.9.5
403403
c : Connecting to server...
404-
[email protected]'s password:
404+
[email protected]'s password:
405405
s: Starting server with Python version 3.6.8
406406
s: latency control setting = True
407407
s: auto-nets:True

docs/requirements.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ Additional Suggested Software
8181
- If you are using systemd, sshuttle can notify it when the connection to
8282
the remote end is established and the firewall rules are installed. For
8383
this feature to work you must configure the process start-up type for the
84-
sshuttle service unit to notify, as shown in the example below.
84+
sshuttle service unit to notify, as shown in the example below.
8585

8686
.. code-block:: ini
8787
:emphasize-lines: 6
8888
8989
[Unit]
9090
Description=sshuttle
9191
After=network.target
92-
92+
9393
[Service]
9494
Type=notify
9595
ExecStart=/usr/bin/sshuttle --dns --remote <user>@<server> <subnets...>
96-
96+
9797
[Install]
9898
WantedBy=multi-user.target

docs/tproxy.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ There are some things you need to consider for TPROXY to work:
1111
ip rule add fwmark {TMARK} lookup 100
1212
ip -6 route add local default dev lo table 100
1313
ip -6 rule add fwmark {TMARK} lookup 100
14-
14+
1515
where {TMARK} is the identifier mark passed with -t or --tmark flag
1616
as a hexadecimal string (default value is '0x01').
1717

@@ -20,7 +20,7 @@ There are some things you need to consider for TPROXY to work:
2020

2121
- The client needs to be run as root. e.g.::
2222

23-
sudo SSH_AUTH_SOCK="$SSH_AUTH_SOCK" $HOME/tree/sshuttle.tproxy/sshuttle --method=tproxy ...
23+
sudo SSH_AUTH_SOCK="$SSH_AUTH_SOCK" $HOME/tree/sshuttle.tproxy/sshuttle --method=tproxy ...
2424

2525
- You may need to exclude the IP address of the server you are connecting to.
2626
Otherwise sshuttle may attempt to intercept the ssh packets, which will not

docs/trivia.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@ That project I did for Slipstream was what first gave me the idea to merge
3333
the concepts of Fast Forward, Double Vision, and Tunnel Vision into a single
3434
program that was the best of all worlds. And here we are, at last.
3535
You're welcome.
36-

docs/usage.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ were right there. And if your "client" machine is a router, everyone on
5151
your local network can make connections to your remote network.
5252

5353
You don't need to install sshuttle on the remote server;
54-
the remote server just needs to have python available.
54+
the remote server just needs to have python available.
5555
sshuttle will automatically upload and run its source code
5656
to the remote python interpreter.
5757

@@ -71,7 +71,7 @@ admin access on the server.
7171

7272
Sudoers File
7373
------------
74-
sshuttle can auto-generate the proper sudoers.d file using the current user
74+
sshuttle can auto-generate the proper sudoers.d file using the current user
7575
for Linux and OSX. Doing this will allow sshuttle to run without asking for
7676
the local sudo password and to give users who do not have sudo access
7777
ability to run sshuttle::
@@ -83,7 +83,7 @@ it is needed.
8383

8484
A costume user or group can be set with the :
8585
option:`sshuttle --sudoers --sudoers-username {user_descriptor}` option. Valid
86-
values for this vary based on how your system is configured. Values such as
86+
values for this vary based on how your system is configured. Values such as
8787
usernames, groups pre-pended with `%` and sudoers user aliases will work. See
8888
the sudoers manual for more information on valid user specif actions.
8989
The options must be used with `--sudoers`::

docs/windows.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Assuming the VM has the IP 192.168.1.200 obtained on the bridge NIC (we can
1616
configure that in Vagrant), we can then ask Windows to route all its traffic
1717
via the VM by running the following in cmd.exe with admin right::
1818

19-
route add 0.0.0.0 mask 0.0.0.0 192.168.1.200
19+
route add 0.0.0.0 mask 0.0.0.0 192.168.1.200

sshuttle/methods/pf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class pfioc_natlook(Structure):
273273
def add_anchors(self, anchor):
274274
# before adding anchors and rules we must override the skip lo
275275
# that comes by default in openbsd pf.conf so the rules we will add,
276-
# which rely on translating/filtering packets on lo, can work
276+
# which rely on translating/filtering packets on lo, can work
277277
if self.has_skip_loopback():
278278
pfctl('-f /dev/stdin', b'match on lo\n')
279279
super(OpenBsd, self).add_anchors(anchor)
@@ -353,7 +353,7 @@ def disable(self, anchor):
353353
def add_anchors(self, anchor):
354354
# before adding anchors and rules we must override the skip lo
355355
# that in some cases ends up in the chain so the rules we will add,
356-
# which rely on translating/filtering packets on lo, can work
356+
# which rely on translating/filtering packets on lo, can work
357357
if self.has_skip_loopback():
358358
pfctl('-f /dev/stdin', b'pass on lo\n')
359359
super(Darwin, self).add_anchors(anchor)

0 commit comments

Comments
 (0)