summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-12-29 18:03:33 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-12-29 18:03:33 +0000
commit1869460a2e2279fe4526a55965e86cceddb00bc5 (patch)
tree484b971adead2413efd92c548d2dd2db74443ba6 /usr.bin/ssh
parentff3cd81aacd1ded1ea58acb7ee118b73f36563d2 (diff)
sort previous;
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config.58
-rw-r--r--usr.bin/ssh/sshd_config.58
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 442222cc543..3ffc469c255 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index 0ea0f3bf38d..abc500939e0 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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
@@ -807,15 +807,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