summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2016-04-17 16:34:46 +0200
committerDamien Miller <djm@mindrot.org>2016-04-21 08:30:11 +0200
commit6aaabc2b610e44bae473457ad9556ffb43d90ee3 (patch)
tree20225aed0ba3bc9cfe738b4e3da628450dd90e7b
parentupstream commit (diff)
downloadopenssh-6aaabc2b610e44bae473457ad9556ffb43d90ee3.tar.xz
openssh-6aaabc2b610e44bae473457ad9556ffb43d90ee3.zip
upstream commit
tweak previous; Upstream-ID: 46c1bab91c164078edbccd5f7d06b9058edd814f
-rw-r--r--ssh_config.58
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 880f11049..10650e1bc 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.229 2016/04/15 00:30:19 djm Exp $
-.Dd $Mdocdate: April 15 2016 $
+.\" $OpenBSD: ssh_config.5,v 1.230 2016/04/17 14:34:46 jmc Exp $
+.Dd $Mdocdate: April 17 2016 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1021,14 +1021,14 @@ be listed early in the configuration file as it will not be applied
to unknown options that appear before it.
.It Cm Include
Include the specified configuration file(s).
-Multiple path names may be specified and each pathname may contain
+Multiple pathnames may be specified and each pathname may contain
.Xr glob 3
wildcards and, for user configurations, shell-like
.Dq ~
references to user home directories.
Files without absolute paths are assumed to be in
.Pa ~/.ssh
-if included in a user configurations file or
+if included in a user configuration file or
.Pa /etc/ssh
if included from the system configuration file.
.Cm Include