summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-10-28 21:45:09 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-10-28 21:45:09 +0000
commitc95f9b914e097756a2eb05135945a2aabb8370c4 (patch)
treebe50ee47ad6b245bf18d17e3b5c0b4173a91edc2 /usr.bin/ssh
parentf6a497ec3de087d4487c9874702c398c7f8438ee (diff)
tweak previous;
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sftp.14
-rw-r--r--usr.bin/ssh/sshd_config.58
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index b912d24e3f5..ab53c1690f6 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/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/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index e6085b8912f..d30b4f6082c 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.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
@@ -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 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