summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 508745b89..b16ff26ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,9 @@
48 restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option 48 restricted by the PermitTunnel (yes|point-to-point|ethernet|no) option
49 in sshd_config(5). 49 in sshd_config(5).
50 ok djm@, man page bits by jmc@ 50 ok djm@, man page bits by jmc@
51 - jmc@cvs.openbsd.org 2005/12/08 21:37:50
52 [ssh_config.5]
53 new sentence, new line;
51 54
5220051201 5520051201
53 - (djm) [envpass.sh] Remove regress script that was accidentally committed 56 - (djm) [envpass.sh] Remove regress script that was accidentally committed
@@ -3440,4 +3443,4 @@
3440 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3443 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3441 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3444 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3442 3445
3443$Id: ChangeLog,v 1.4024 2005/12/13 08:33:19 djm Exp $ 3446$Id: ChangeLog,v 1.4025 2005/12/13 08:33:37 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 68061182c..50df0d432 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.68 2005/12/08 18:34:11 reyk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.69 2005/12/08 21:37:50 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -911,9 +911,9 @@ with older servers.
911.It Cm Tunnel 911.It Cm Tunnel
912Request starting 912Request starting
913.Xr tun 4 913.Xr tun 4
914device forwarding between the client and the server. This option also 914device forwarding between the client and the server.
915allows requesting layer 2 (ethernet) instead of layer 3 915This option also allows requesting layer 2 (ethernet)
916(point-to-point) tunneling from the server. 916instead of layer 3 (point-to-point) tunneling from the server.
917The argument must be 917The argument must be
918.Dq yes , 918.Dq yes ,
919.Dq point-to-point , 919.Dq point-to-point ,