- jmc@cvs.openbsd.org 2009/10/28 21:45:08

     [sshd_config.5 sftp.1]
     tweak previous;

diff --git a/ChangeLog b/ChangeLog
index 0a931a12074bbdb4c5cb5f27e1a4c2d3748f1c43..35c116484d9474a23c56783428c71434018603ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
      sftp.1 sshd_config.5 readconf.c ssh.c misc.c]
      Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan.
      ok markus@
+   - jmc@cvs.openbsd.org 2009/10/28 21:45:08
+     [sshd_config.5 sftp.1]
+     tweak previous;
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

diff --git a/sftp.1 b/sftp.1
index 7f89e7ed4c3a426b8fcf72b4c625b278c2b58496..b5d0f8c46a9c6d9a3b88e11de2c5bc775c04c0ef 100644 (file)
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.77 2009/10/28 16:38:18 reyk Exp $
+.\" $OpenBSD: sftp.1,v 1.78 2009/10/28 21:45:08 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -207,9 +207,9 @@ For full details of the options listed below, and their possible values, see
 .It Protocol
 .It ProxyCommand
 .It PubkeyAuthentication
+.It RDomain
 .It RekeyLimit
 .It RhostsRSAAuthentication
-.It RDomain
 .It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval

diff --git a/sshd_config.5 b/sshd_config.5
index 7cd75a5308f885989773384385e46c45107240af..98eefd9a4a3c9b357970e05ab3da47ea4dd3cb4e 100644 (file)
--- 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.110 2009/10/28 16:38:18 reyk Exp $
+.\" $OpenBSD: sshd_config.5,v 1.111 2009/10/28 21:45:08 jmc Exp $
 .Dd $Mdocdate$
 .Dt SSHD_CONFIG 5
 .Os
@@ -806,15 +806,15 @@ Specifies whether public key authentication is allowed.
 The default is
 .Dq yes .
 Note that this option applies to protocol version 2 only.
+.It Cm RDomain
+Set the routing domain number.
+The default routing domain is set by the system.
 .It Cm RhostsRSAAuthentication
 Specifies whether rhosts or /etc/hosts.equiv authentication together
 with successful RSA host authentication is allowed.
 The default is
 .Dq no .
 This option applies to protocol version 1 only.
-.It Cm RDomain
-Set the routing domain number.
-The default routing domain is set by the system.
 .It Cm RSAAuthentication
 Specifies whether pure RSA authentication is allowed.
 The default is