[openssh-commits] [openssh] 03/03: upstream: move documentation of the Include directive to near the

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 3c3226f79cf4fa1c0436a91768760b92df87ffab
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Mon Jun 29 08:21:50 2026 +0000

    upstream: move documentation of the Include directive to near the
    
    start of the options list, alongside that for Match and Host which are
    similar insofar as they all affect configuration parsing rather than altering
    the configuration directly. from xspielinbox via bz3968
    
    OpenBSD-Commit-ID: 1cde8af8d40dbbe3ea49cf56c5d408946c875230
---
 ssh_config.5 | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/ssh_config.5 b/ssh_config.5
index 50962fa71..082fc8ee3 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.424 2026/05/21 04:04:57 djm Exp $
-.Dd $Mdocdate: May 21 2026 $
+.\" $OpenBSD: ssh_config.5,v 1.425 2026/06/29 08:21:50 djm Exp $
+.Dd $Mdocdate: June 29 2026 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -280,6 +280,31 @@ for transport-only sessions, such as when
 is started with the
 .Fl N
 flag.
+.It Cm Include
+Include the specified configuration file(s).
+Multiple pathnames may be specified and each pathname may contain
+.Xr glob 7
+wildcards,
+tokens as described in the
+.Sx TOKENS
+section, environment variables as described in the
+.Sx ENVIRONMENT VARIABLES
+section and, for user configurations, shell-like
+.Sq ~
+references to user home directories.
+Wildcards will be expanded and processed in lexical order.
+Files without absolute paths are assumed to be in
+.Pa ~/.ssh
+if included in a user configuration file or
+.Pa /etc/ssh
+if included from the system configuration file.
+.Cm Include
+directive may appear inside a
+.Cm Match
+or
+.Cm Host
+block
+to perform conditional inclusion.
 .It Cm AddKeysToAgent
 Specifies whether keys should be automatically added to a running
 .Xr ssh-agent 1 .
@@ -1227,31 +1252,6 @@ It is recommended that
 .Cm IgnoreUnknown
 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 pathnames may be specified and each pathname may contain
-.Xr glob 7
-wildcards,
-tokens as described in the
-.Sx TOKENS
-section, environment variables as described in the
-.Sx ENVIRONMENT VARIABLES
-section and, for user configurations, shell-like
-.Sq ~
-references to user home directories.
-Wildcards will be expanded and processed in lexical order.
-Files without absolute paths are assumed to be in
-.Pa ~/.ssh
-if included in a user configuration file or
-.Pa /etc/ssh
-if included from the system configuration file.
-.Cm Include
-directive may appear inside a
-.Cm Match
-or
-.Cm Host
-block
-to perform conditional inclusion.
 .It Cm IPQoS
 Specifies the
 .Em Differentiated Services Field Codepoint Pq DSCP

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.