3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a931a120..35c116484 100644
--- 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 b912d24e3..ab53c1690 100644
--- 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 1a30f29c1..7e7c6f855 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.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: October 28 2009 $
 .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

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


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


diff --git a/sshd_config.5 b/sshd_config.5 index 1a30f29c1..7e7c6f855 100644 --- a/sshd_config.5 +++ b/sshd_config.5
@@ -34,7 +34,7 @@
34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	34	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	35	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36	.\"	36	.\"
37	.\" $OpenBSD: sshd_config.5,v 1.110 2009/10/28 16:38:18 reyk Exp $	37	.\" $OpenBSD: sshd_config.5,v 1.111 2009/10/28 21:45:08 jmc Exp $
38	.Dd $Mdocdate: October 28 2009 $	38	.Dd $Mdocdate: October 28 2009 $
39	.Dt SSHD_CONFIG 5	39	.Dt SSHD_CONFIG 5
40	.Os	40	.Os
@@ -806,15 +806,15 @@ Specifies whether public key authentication is allowed.
806	The default is	806	The default is
807	.Dq yes .	807	.Dq yes .
808	Note that this option applies to protocol version 2 only.	808	Note that this option applies to protocol version 2 only.
		809	.It Cm RDomain
		810	Set the routing domain number.
		811	The default routing domain is set by the system.
809	.It Cm RhostsRSAAuthentication	812	.It Cm RhostsRSAAuthentication
810	Specifies whether rhosts or /etc/hosts.equiv authentication together	813	Specifies whether rhosts or /etc/hosts.equiv authentication together
811	with successful RSA host authentication is allowed.	814	with successful RSA host authentication is allowed.
812	The default is	815	The default is
813	.Dq no .	816	.Dq no .
814	This option applies to protocol version 1 only.	817	This option applies to protocol version 1 only.
815	.It Cm RDomain
816	Set the routing domain number.
817	The default routing domain is set by the system.
818	.It Cm RSAAuthentication	818	.It Cm RSAAuthentication
819	Specifies whether pure RSA authentication is allowed.	819	Specifies whether pure RSA authentication is allowed.
820	The default is	820	The default is