- jmc@cvs.openbsd.org 2009/12/29 18:03:32

[sshd_config.5 ssh_config.5] sort previous;
author: Darren Tucker <dtucker@zip.com.au> 2010-01-08 18:57:39 +1100
committer: Darren Tucker <dtucker@zip.com.au> 2010-01-08 18:57:39 +1100
commit: 98e5d9a0d3beabc706982260fec70f823ff764b7 (patch)
tree: 50fba9a5f0aa709e7e82e24ae7bb8bc405fe02b2
parent: 535b5e172166c2515500bc20f3ea89216bd1f42b (diff)
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9256d6488..929907961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,6 +134,9 @@
     NOTE: if you currently use RDomain in the ssh client or server config,
     or ssh/sshd -o, you must update to use RoutingDomain.
     ok markus@ djm@
+   - jmc@cvs.openbsd.org 2009/12/29 18:03:32
+     [sshd_config.5 ssh_config.5]
+     sort previous;
 20091226
 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/ssh_config.5 b/ssh_config.5
index 442222cc5..3ffc469c2 100644
--- a/ssh_config.5
+++ b/ssh_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: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $
+.\" $OpenBSD: ssh_config.5,v 1.125 2009/12/29 18:03:32 jmc Exp $
 .Dd $Mdocdate: December 29 2009 $
 .Dt SSH_CONFIG 5
 .Os
@@ -789,9 +789,6 @@ or
 The default is
 .Dq yes .
 This option applies to protocol version 2 only.
-.It Cm RoutingDomain
-Set the routing domain number.
-The default routing domain is set by the system.
 .It Cm RekeyLimit
 Specifies the maximum amount of data that may be transmitted before the
 session key is renegotiated.
@@ -860,6 +857,9 @@ The default is
 This option applies to protocol version 1 only and requires
 .Xr ssh 1
 to be setuid root.
+.It Cm RoutingDomain
+Set the routing domain number.
+The default routing domain is set by the system.
 .It Cm RSAAuthentication
 Specifies whether to try RSA authentication.
 The argument to this keyword must be
diff --git a/sshd_config.5 b/sshd_config.5
index ada265373..a3326447f 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.114 2009/12/29 16:38:41 stevesk Exp $
+.\" $OpenBSD: sshd_config.5,v 1.115 2009/12/29 18:03:32 jmc Exp $
 .Dd $Mdocdate: December 29 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 RoutingDomain
-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 RoutingDomain
+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
author	Darren Tucker <dtucker@zip.com.au>	2010-01-08 18:57:39 +1100
committer	Darren Tucker <dtucker@zip.com.au>	2010-01-08 18:57:39 +1100
commit	98e5d9a0d3beabc706982260fec70f823ff764b7 (patch)
tree	50fba9a5f0aa709e7e82e24ae7bb8bc405fe02b2
parent	535b5e172166c2515500bc20f3ea89216bd1f42b (diff)

diff --git a/ChangeLog b/ChangeLog index 9256d6488..929907961 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -134,6 +134,9 @@
134	NOTE: if you currently use RDomain in the ssh client or server config,	134	NOTE: if you currently use RDomain in the ssh client or server config,
135	or ssh/sshd -o, you must update to use RoutingDomain.	135	or ssh/sshd -o, you must update to use RoutingDomain.
136	ok markus@ djm@	136	ok markus@ djm@
		137	- jmc@cvs.openbsd.org 2009/12/29 18:03:32
		138	[sshd_config.5 ssh_config.5]
		139	sort previous;
137		140
138	20091226	141	20091226
139	- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1	142	- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1


diff --git a/ssh_config.5 b/ssh_config.5 index 442222cc5..3ffc469c2 100644 --- a/ssh_config.5 +++ b/ssh_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: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $	37	.\" $OpenBSD: ssh_config.5,v 1.125 2009/12/29 18:03:32 jmc Exp $
38	.Dd $Mdocdate: December 29 2009 $	38	.Dd $Mdocdate: December 29 2009 $
39	.Dt SSH_CONFIG 5	39	.Dt SSH_CONFIG 5
40	.Os	40	.Os
@@ -789,9 +789,6 @@ or
789	The default is	789	The default is
790	.Dq yes .	790	.Dq yes .
791	This option applies to protocol version 2 only.	791	This option applies to protocol version 2 only.
792	.It Cm RoutingDomain
793	Set the routing domain number.
794	The default routing domain is set by the system.
795	.It Cm RekeyLimit	792	.It Cm RekeyLimit
796	Specifies the maximum amount of data that may be transmitted before the	793	Specifies the maximum amount of data that may be transmitted before the
797	session key is renegotiated.	794	session key is renegotiated.
@@ -860,6 +857,9 @@ The default is
860	This option applies to protocol version 1 only and requires	857	This option applies to protocol version 1 only and requires
861	.Xr ssh 1	858	.Xr ssh 1
862	to be setuid root.	859	to be setuid root.
		860	.It Cm RoutingDomain
		861	Set the routing domain number.
		862	The default routing domain is set by the system.
863	.It Cm RSAAuthentication	863	.It Cm RSAAuthentication
864	Specifies whether to try RSA authentication.	864	Specifies whether to try RSA authentication.
865	The argument to this keyword must be	865	The argument to this keyword must be


diff --git a/sshd_config.5 b/sshd_config.5 index ada265373..a3326447f 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.114 2009/12/29 16:38:41 stevesk Exp $	37	.\" $OpenBSD: sshd_config.5,v 1.115 2009/12/29 18:03:32 jmc Exp $
38	.Dd $Mdocdate: December 29 2009 $	38	.Dd $Mdocdate: December 29 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 RoutingDomain
810	Set the routing domain number.
811	The default routing domain is set by the system.
812	.It Cm RhostsRSAAuthentication	809	.It Cm RhostsRSAAuthentication
813	Specifies whether rhosts or /etc/hosts.equiv authentication together	810	Specifies whether rhosts or /etc/hosts.equiv authentication together
814	with successful RSA host authentication is allowed.	811	with successful RSA host authentication is allowed.
815	The default is	812	The default is
816	.Dq no .	813	.Dq no .
817	This option applies to protocol version 1 only.	814	This option applies to protocol version 1 only.
		815	.It Cm RoutingDomain
		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