upstream commit

tweak previous;

Upstream-ID: 46c1bab91c164078edbccd5f7d06b9058edd814f
This commit is contained in:
jmc@openbsd.org 2016-04-17 14:34:46 +00:00 committed by Damien Miller
parent 0f839e5969
commit 6aaabc2b61
1 changed files with 4 additions and 4 deletions

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 $ .\" $OpenBSD: ssh_config.5,v 1.230 2016/04/17 14:34:46 jmc Exp $
.Dd $Mdocdate: April 15 2016 $ .Dd $Mdocdate: April 17 2016 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .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. to unknown options that appear before it.
.It Cm Include .It Cm Include
Include the specified configuration file(s). 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 .Xr glob 3
wildcards and, for user configurations, shell-like wildcards and, for user configurations, shell-like
.Dq ~ .Dq ~
references to user home directories. references to user home directories.
Files without absolute paths are assumed to be in Files without absolute paths are assumed to be in
.Pa ~/.ssh .Pa ~/.ssh
if included in a user configurations file or if included in a user configuration file or
.Pa /etc/ssh .Pa /etc/ssh
if included from the system configuration file. if included from the system configuration file.
.Cm Include .Cm Include