2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c9649abda..f2190e585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,10 @@
    - djm@cvs.openbsd.org 2014/07/03 04:36:45
      [digest.h]
      forward-declare struct sshbuf so consumers don't need to include sshbuf.h
+   - djm@cvs.openbsd.org 2014/07/03 05:32:36
+     [ssh_config.5]
+     mention '%%' escape sequence in HostName directives and how it may
+     be used to specify IPv6 link-local addresses
 
 20140702
  - OpenBSD CVS Sync
diff --git a/ssh_config.5 b/ssh_config.5
index f96f37ba3..5c6bd29ea 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.186 2014/03/28 05:17:11 naddy Exp $
-.Dd $Mdocdate: March 28 2014 $
+.\" $OpenBSD: ssh_config.5,v 1.187 2014/07/03 05:32:36 djm Exp $
+.Dd $Mdocdate: July 3 2014 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -763,6 +763,12 @@ If the hostname contains the character sequence
 .Ql %h ,
 then this will be replaced with the host name specified on the command line
 (this is useful for manipulating unqualified names).
+The character sequence
+.Ql %%
+will be replaced by a single
+.Ql %
+character, which may be used when specifying IPv6 link-local addresses.
+.Pp
 The default is the name given on the command line.
 Numeric IP addresses are also permitted (both on the command line and in
 .Cm HostName