summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2023-03-10 02:32:04 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-03-10 14:02:39 +1100
commitd6d38fd77cbe091c59e1bb720c3a494df4990640 (patch)
treeec1e6dff0ee393f1c14852a6ab299d235a3d4279
parent7187d3f86bf8f2066cc9941f217d23b0cacae25e (diff)
upstream: Like sshd_config, some ssh_config options are not
first-match-wins. sshd_config.5 was fixed in r1.348, this is the same for this file OpenBSD-Commit-ID: 7be55b9351cde449b136afcc52d07aa4113b215e
-rw-r--r--ssh_config.56
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 9eb6b977..c56b9d7b 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.378 2023/01/13 07:13:40 jmc Exp $
-.Dd $Mdocdate: January 13 2023 $
+.\" $OpenBSD: ssh_config.5,v 1.379 2023/03/10 02:32:04 djm Exp $
+.Dd $Mdocdate: March 10 2023 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -56,7 +56,7 @@ system-wide configuration file
.Pq Pa /etc/ssh/ssh_config
.El
.Pp
-For each parameter, the first obtained value
+Unless noted otherwise, for each parameter, the first obtained value
will be used.
The configuration files contain sections separated by
.Cm Host