2 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 9bd2a7cbd..6eda0ee69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
    - jmc@cvs.openbsd.org 2006/07/18 08:03:09
      [ssh-agent.1 sshd_config.5]
      mark up angle brackets;
+   - dtucker@cvs.openbsd.org 2006/07/18 08:22:23
+     [sshd_config.5]
+     Clarify description of Match, with minor correction from jmc@
 
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4964,4 +4967,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4418 2006/07/24 04:04:53 djm Exp $
+$Id: ChangeLog,v 1.4419 2006/07/24 04:05:08 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index cbc2176ff..02996a2ed 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,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: sshd_config.5,v 1.64 2006/07/18 08:03:09 jmc Exp $
+.\" $OpenBSD: sshd_config.5,v 1.65 2006/07/18 08:22:23 dtucker Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
@@ -465,14 +465,15 @@ The default is:
 .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
 .It Cm Match
 Introduces a conditional block.
-Keywords on lines following a
+If all of the criteria on the
 .Cm Match
-block are only applied if all of the criteria on the
+line are satisfied, the keywords on the following lines override those
+set in the global section of the config file, until either another
 .Cm Match
-are satisfied.
+line or the end of the file.
 The arguments to
 .Cm Match
-block are one or more criteria-pattern pairs.
+are one or more criteria-pattern pairs.
 The available criteria are
 .Cm User ,
 .Cm Host ,