summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh.18
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 51f05cac2..b562035ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
14 split sections on tcp and x11 forwarding into two sections. 14 split sections on tcp and x11 forwarding into two sections.
15 add an example in the tcp section, based on sth i wrote for ssh faq; 15 add an example in the tcp section, based on sth i wrote for ssh faq;
16 help + ok: djm markus dtucker 16 help + ok: djm markus dtucker
17 - jmc@cvs.openbsd.org 2006/01/12 18:48:48
18 [ssh.1]
19 refer to `TCP' rather than `TCP/IP' in the context of connection
20 forwarding;
21 ok markus
17 22
1820060109 2320060109
19 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on 24 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
@@ -3691,4 +3696,4 @@
3691 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3696 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3692 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3697 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3693 3698
3694$Id: ChangeLog,v 1.4086 2006/01/13 23:09:13 djm Exp $ 3699$Id: ChangeLog,v 1.4087 2006/01/13 23:09:30 djm Exp $
diff --git a/ssh.1 b/ssh.1
index c15cfc319..b430ff823 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.246 2006/01/12 14:44:12 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.247 2006/01/12 18:48:48 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -89,7 +89,7 @@ executing commands on a remote machine.
89It is intended to replace rlogin and rsh, 89It is intended to replace rlogin and rsh,
90and provide secure encrypted communications between 90and provide secure encrypted communications between
91two untrusted hosts over an insecure network. 91two untrusted hosts over an insecure network.
92X11 connections and arbitrary TCP/IP ports 92X11 connections and arbitrary TCP ports
93can also be forwarded over the secure channel. 93can also be forwarded over the secure channel.
94.Pp 94.Pp
95.Nm 95.Nm
@@ -146,7 +146,7 @@ of the connection.
146Only useful on systems with more than one address. 146Only useful on systems with more than one address.
147.It Fl C 147.It Fl C
148Requests compression of all data (including stdin, stdout, stderr, and 148Requests compression of all data (including stdin, stdout, stderr, and
149data for forwarded X11 and TCP/IP connections). 149data for forwarded X11 and TCP connections).
150The compression algorithm is the same used by 150The compression algorithm is the same used by
151.Xr gzip 1 , 151.Xr gzip 1 ,
152and the 152and the
@@ -834,7 +834,7 @@ On most systems, setting the escape character to
834will also make the session transparent even if a tty is used. 834will also make the session transparent even if a tty is used.
835.Pp 835.Pp
836The session terminates when the command or shell on the remote 836The session terminates when the command or shell on the remote
837machine exits and all X11 and TCP/IP connections have been closed. 837machine exits and all X11 and TCP connections have been closed.
838.Sh ESCAPE CHARACTERS 838.Sh ESCAPE CHARACTERS
839When a pseudo-terminal has been requested, 839When a pseudo-terminal has been requested,
840.Nm 840.Nm