upstream: mention that wildcards are processed in lexical order;

bz#3165

OpenBSD-Commit-ID: 8856f3d1612bd42e9ee606d89386cae456dd165c

diff --git a/ssh_config.5 b/ssh_config.5
index 001544dd35f624175f5e129ec94f8c0c7b88ce27..f9d55f8a27d3cab39be4993ec720260428e63676 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
 .\" (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.326 2020/05/29 04:25:40 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.327 2020/05/29 05:37:03 djm Exp $
 .Dd $Mdocdate: May 29 2020 $
 .Dt SSH_CONFIG 5
 .Os
@@ -1010,6 +1010,7 @@ Multiple pathnames may be specified and each pathname may contain
 wildcards 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

diff --git a/sshd_config.5 b/sshd_config.5
index b294efc2dc0ee4720080c244784c8b444a5cf33f..17d8c130f6c72a91a5ee4703a75b2735a51b2d21 100644 (file)
--- a/sshd_config.5
+++ b/sshd_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: sshd_config.5,v 1.311 2020/04/17 06:12:41 jmc Exp $
-.Dd $Mdocdate: April 17 2020 $
+.\" $OpenBSD: sshd_config.5,v 1.312 2020/05/29 05:37:03 djm Exp $
+.Dd $Mdocdate: May 29 2020 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -817,7 +817,7 @@ The default is
 Include the specified configuration file(s).
 Multiple pathnames may be specified and each pathname may contain
 .Xr glob 7
-wildcards.
+wildcards that will be expanded and processed in lexical order.
 Files without absolute paths are assumed to be in
 .Pa /etc/ssh .
 An