From 20c2ec48c376fc025774bbb903f57de449bb8c5c Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 15 Mar 2006 11:31:01 +1100
Subject: [PATCH]    - jmc@cvs.openbsd.org 2006/02/12 10:49:44     
 [ssh_config.5]      slight rewording; ok djm

---
 ChangeLog    | 5 ++++-
 ssh_config.5 | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8e857153..70b3bcc62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,9 @@
      raise error when the user specifies a RekeyLimit that is smaller than 16
      (the smallest of our cipher's blocksize) or big enough to cause integer
      wraparound; ok & feedback dtucker@
+   - jmc@cvs.openbsd.org 2006/02/12 10:49:44
+     [ssh_config.5]
+     slight rewording; ok djm
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3980,4 +3983,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4161 2006/03/15 00:30:38 djm Exp $
+$Id: ChangeLog,v 1.4162 2006/03/15 00:31:01 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 5d821a0b1..62a185a39 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.77 2006/02/12 06:45:34 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.78 2006/02/12 10:49:44 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -317,7 +317,7 @@ by the remote login username.
 It is recommended that any
 .Cm ControlPath
 used for opportunistic connection sharing include
-at least the last three of these escape sequences (%h, %p and %r).
+at least %h, %p, and %r.
 This ensures that shared connections are uniquely identified.
 .It Cm DynamicForward
 Specifies that a TCP port on the local machine be forwarded