summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2011-06-04 00:10:27 +0000
committerDamien Miller <djm@cvs.openbsd.org>2011-06-04 00:10:27 +0000
commitd850e5703f3d4386b72c462ab55a9f6afb596804 (patch)
treed0c48e0c331fe0d143e9c2f6f348c63e8b0e05df /usr.bin/ssh
parentaecbbe45ed8444f78d6c0258dea53481e61e06f2 (diff)
explain IdentifyFile's semantics a little better, prompted by bz#1898
ok dtucker jmc
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config.58
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 87574e3813d..694ff814e3d 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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