2 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a3b93580..51de4ee26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,11 @@
    - djm@cvs.openbsd.org 2011/05/06 22:20:10
      [PROTOCOL.mux]
      fix numbering; from bert.wesarg AT googlemail.com
+   - jmc@cvs.openbsd.org 2011/05/07 23:19:39
+     [ssh_config.5]
+     - tweak previous
+     - come consistency fixes
+     ok djm
 
 20110510
  - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/ssh_config.5 b/ssh_config.5
index 83baa82b1..7a3b641ff 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (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.149 2011/05/06 21:34:32 djm Exp $
-.Dd $Mdocdate: May 6 2011 $
+.\" $OpenBSD: ssh_config.5,v 1.150 2011/05/07 23:19:39 jmc Exp $
+.Dd $Mdocdate: May 7 2011 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -320,8 +320,9 @@ will be substituted by the first component of the local host name,
 will be substituted by the local host name (including any domain name),
 .Ql %h
 will be substituted by the target host name,
-.Ql %h
-will be substituted by original target host name specified on the commandline,
+.Ql %n
+will be substituted by the original target host name
+specified on the command line,
 .Ql %p
 the port,
 .Ql %r
@@ -585,7 +586,7 @@ Specifies the real host name to log into.
 This can be used to specify nicknames or abbreviations for hosts.
 If the hostname contains the character sequence
 .Ql %h ,
-then this will be replaced with the host name specified on the commandline
+then this will be replaced with the host name specified on the command line
 (this is useful for manipulating unqualified names).
 The default is the name given on the command line.
 Numeric IP addresses are also permitted (both on the command line and in