summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-14 10:10:31 +1100
committerDamien Miller <djm@mindrot.org>2006-01-14 10:10:31 +1100
commit4a8dc9e2974063b51da3c5c9e6732f64362a783a (patch)
tree91165a5701b5684bce98bdea747820ef17689dc9
parente9d001e02b55f065b7a16d3e2b3d041d32ee9176 (diff)
- jmc@cvs.openbsd.org 2006/01/12 22:34:12
[ssh.1] back out a sentence - AUTHENTICATION already documents this;
-rw-r--r--ChangeLog5
-rw-r--r--ssh.15
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 18b9ec375..8cb8fd131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 - jmc@cvs.openbsd.org 2006/01/12 22:26:02 25 - jmc@cvs.openbsd.org 2006/01/12 22:26:02
26 [ssh_config.5] 26 [ssh_config.5]
27 refer to TCP forwarding, rather than TCP/IP forwarding; 27 refer to TCP forwarding, rather than TCP/IP forwarding;
28 - jmc@cvs.openbsd.org 2006/01/12 22:34:12
29 [ssh.1]
30 back out a sentence - AUTHENTICATION already documents this;
28 31
2920060109 3220060109
30 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on 33 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
@@ -3702,4 +3705,4 @@
3702 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3705 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3703 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3706 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3704 3707
3705$Id: ChangeLog,v 1.4089 2006/01/13 23:10:17 djm Exp $ 3708$Id: ChangeLog,v 1.4090 2006/01/13 23:10:31 djm Exp $
diff --git a/ssh.1 b/ssh.1
index b430ff823..59694822a 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.247 2006/01/12 18:48:48 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.248 2006/01/12 22:34:12 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -950,9 +950,6 @@ to start the service which is to be tunnelled.
950If no connections are made within the time specified, 950If no connections are made within the time specified,
951.Nm 951.Nm
952will exit. 952will exit.
953Once opened,
954a SSH connection will remain active
955until all actively forwarded connections have closed.
956.Sh X11 FORWARDING 953.Sh X11 FORWARDING
957If the 954If the
958.Cm ForwardX11 955.Cm ForwardX11