2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a43234ca..c9d436915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,9 @@
    - jmc@cvs.openbsd.org 2006/03/31 09:09:30
      [ssh_config.5]
      kill trailing whitespace;
+   - djm@cvs.openbsd.org 2006/03/31 09:13:56
+     [ssh_config.5]
+     remote user escape is %r not %h; spotted by jmc@
 
 20060326
  - OpenBSD CVS Sync
@@ -4492,4 +4495,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.4299 2006/03/31 12:14:41 djm Exp $
+$Id: ChangeLog,v 1.4300 2006/03/31 12:14:57 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index a1c2a5fbe..7744e95f9 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.91 2006/03/31 09:09:30 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.92 2006/03/31 09:13:56 djm Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -560,7 +560,7 @@ escape characters:
 (local host name),
 .Ql %h
 (remote host name) or
-.Ql %h
+.Ql %r
 (remote user name).
 .Pp
 It is possible to have