- jmc@cvs.openbsd.org 2012/06/19 21:35:54

     [sshd_config.5]
     tweak previous; ok markus

diff --git a/ChangeLog b/ChangeLog
index 331a34f86c9334bae949c8bb56dda73349c06127..d1ad692eb1e645f27935a86abc4aec922ecf0c4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
      sshd_config: extend Match to allow AcceptEnv and {Allow,Deny}{Users,Groups}
      this allows 'Match LocalPort 1022' combined with 'AllowUser bauer'
      ok djm@ (back in March)
+   - jmc@cvs.openbsd.org 2012/06/19 21:35:54
+     [sshd_config.5]
+     tweak previous; ok markus
 
 20120519
  - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct.  Patch

diff --git a/sshd_config.5 b/sshd_config.5
index 9ef0bcaa84a28a12f6913b6fa6c3a0a6d7358723..1b9ffad4ce3c9cfecfac503ca77e818e7168cd1c 100644 (file)
--- a/sshd_config.5
+++ b/sshd_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: sshd_config.5,v 1.141 2012/06/19 18:25:28 markus Exp $
+.\" $OpenBSD: sshd_config.5,v 1.142 2012/06/19 21:35:54 jmc Exp $
 .Dd $Mdocdate: June 19 2012 $
 .Dt SSHD_CONFIG 5
 .Os
@@ -707,9 +707,9 @@ Only a subset of keywords may be used on the lines following a
 .Cm Match
 keyword.
 Available keywords are
-.Cm AcceptEnv
+.Cm AcceptEnv ,
 .Cm AllowAgentForwarding ,
-.Cm AllowGroups .
+.Cm AllowGroups ,
 .Cm AllowTcpForwarding ,
 .Cm AllowUsers ,
 .Cm AuthorizedKeysFile ,
@@ -719,8 +719,8 @@ Available keywords are
 .Cm DenyGroups ,
 .Cm DenyUsers ,
 .Cm ForceCommand ,
-.Cm GSSAPIAuthentication ,
 .Cm GatewayPorts ,
+.Cm GSSAPIAuthentication ,
 .Cm HostbasedAuthentication ,
 .Cm HostbasedUsesNameFromPacketOnly ,
 .Cm KbdInteractiveAuthentication ,
@@ -733,8 +733,8 @@ Available keywords are
 .Cm PermitRootLogin ,
 .Cm PermitTunnel ,
 .Cm PubkeyAuthentication ,
-.Cm RSAAuthentication ,
 .Cm RhostsRSAAuthentication ,
+.Cm RSAAuthentication ,
 .Cm X11DisplayOffset ,
 .Cm X11Forwarding
 and