summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:13:49 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:13:49 +1100
commit713de76f66d4a27134938ebf6836ef97471c128a (patch)
tree0866c3059b376254bf2fd9af00869b71ad87ffbc
parent4d3fd54c91dae68ea2642387196015931ee83200 (diff)
- jmc@cvs.openbsd.org 2005/10/30 08:43:47
[ssh_config.5] remove trailing whitespace;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 52660e2be..85a2545cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,9 @@
68 - dtucker@cvs.openbsd.org 2005/10/30 08:29:29 68 - dtucker@cvs.openbsd.org 2005/10/30 08:29:29
69 [canohost.c sshd.c] 69 [canohost.c sshd.c]
70 Check for connections with IP options earlier and drop silently. ok djm@ 70 Check for connections with IP options earlier and drop silently. ok djm@
71 - jmc@cvs.openbsd.org 2005/10/30 08:43:47
72 [ssh_config.5]
73 remove trailing whitespace;
71 74
7220051102 7520051102
73 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 76 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3201,4 +3204,4 @@
3201 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3204 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3202 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3205 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3203 3206
3204$Id: ChangeLog,v 1.3943 2005/11/05 04:13:24 djm Exp $ 3207$Id: ChangeLog,v 1.3944 2005/11/05 04:13:49 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index fcbf1e594..13cdee88b 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.63 2005/10/30 01:23:19 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.64 2005/10/30 08:43:47 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
@@ -263,7 +263,7 @@ with
263set to 263set to
264.Dq no 264.Dq no
265(the default). 265(the default).
266These sessions will try to reuse the master instance's network connection 266These sessions will try to reuse the master instance's network connection
267rather than initiating new ones, but will fall back to connecting normally 267rather than initiating new ones, but will fall back to connecting normally
268if the control socket does not exist, or is not listening. 268if the control socket does not exist, or is not listening.
269.Pp 269.Pp