2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 32a383603..e34289124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20110620
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2011/06/04 00:10:26
+     [ssh_config.5]
+     explain IdentifyFile's semantics a little better, prompted by bz#1898
+     ok dtucker jmc
+
 20110603
  - (dtucker) [README version.h contrib/caldera/openssh.spec
    contrib/redhat/openssh.spec contrib/suse/openssh.spec] Pull the version
diff --git a/ssh_config.5 b/ssh_config.5
index 87574e381..694ff814e 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.151 2011/05/24 07:15:47 djm Exp $
-.Dd $Mdocdate: May 24 2011 $
+.\" $OpenBSD: ssh_config.5,v 1.152 2011/06/04 00:10:26 djm Exp $
+.Dd $Mdocdate: June 4 2011 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -648,6 +648,10 @@ escape characters:
 It is possible to have
 multiple identity files specified in configuration files; all these
 identities will be tried in sequence.
+Multiple
+.Cm IdentityFile
+directives will add to the list of identities tried (this behaviour
+differs from that of other configuration directives).
 .It Cm IPQoS
 Specifies the IPv4 type-of-service or DSCP class for connections.
 Accepted values are