summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh_config.53
-rw-r--r--sshd_config.56
2 files changed, 5 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 001544dd3..f9d55f8a2 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.326 2020/05/29 04:25:40 dtucker Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.327 2020/05/29 05:37:03 djm Exp $
37.Dd $Mdocdate: May 29 2020 $ 37.Dd $Mdocdate: May 29 2020 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -1010,6 +1010,7 @@ Multiple pathnames may be specified and each pathname may contain
1010wildcards and, for user configurations, shell-like 1010wildcards and, for user configurations, shell-like
1011.Sq ~ 1011.Sq ~
1012references to user home directories. 1012references to user home directories.
1013Wildcards will be expanded and processed in lexical order.
1013Files without absolute paths are assumed to be in 1014Files without absolute paths are assumed to be in
1014.Pa ~/.ssh 1015.Pa ~/.ssh
1015if included in a user configuration file or 1016if included in a user configuration file or
diff --git a/sshd_config.5 b/sshd_config.5
index b294efc2d..17d8c130f 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.311 2020/04/17 06:12:41 jmc Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.312 2020/05/29 05:37:03 djm Exp $
37.Dd $Mdocdate: April 17 2020 $ 37.Dd $Mdocdate: May 29 2020 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -817,7 +817,7 @@ The default is
817Include the specified configuration file(s). 817Include the specified configuration file(s).
818Multiple pathnames may be specified and each pathname may contain 818Multiple pathnames may be specified and each pathname may contain
819.Xr glob 7 819.Xr glob 7
820wildcards. 820wildcards that will be expanded and processed in lexical order.
821Files without absolute paths are assumed to be in 821Files without absolute paths are assumed to be in
822.Pa /etc/ssh . 822.Pa /etc/ssh .
823An 823An