upstream commit

clarify the order in which config statements are used. ok
jmc@ djm@

Upstream-ID: e37e27bb6bbac71315e22cb9690fd8a556a501ed

1 files changed, 3 insertions, 2 deletions

diff --git a/sshd_config.5 b/sshd_config.5
index 251b7467f..7e3a2dbfa 100644
--- 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.253 2017/09/27 06:45:53 jmc Exp $
-.Dd $Mdocdate: September 27 2017 $
+.\" $OpenBSD: sshd_config.5,v 1.254 2017/10/09 20:12:51 benno Exp $
+.Dd $Mdocdate: October 9 2017 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@ reads configuration data from
 .Fl f
 on the command line).
 The file contains keyword-argument pairs, one per line.
+For each keyword, the first obtained value will be used.
 Lines starting with
 .Ql #
 and empty lines are interpreted as comments.