- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / sshd.8

diff --git a/sshd.8 b/sshd.8
index 0656c62a759c52dd78b0f66972c7eb4e36236ecc..8563e021ccada93d4641ee49c589816468fa8d16 100644 (file)
--- a/sshd.8
+++ b/sshd.8
@@ -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.
 .\"
 .\" (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.8,v 1.247 2008/10/03 13:08:12 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.249 2009/10/08 20:42:13 jmc Exp $

 .Dd $Mdocdate$
 .Dt SSHD 8
 .Os
 .Dd $Mdocdate$
 .Dt SSHD 8
 .Os


@@ -260,7 +260,7 @@ or
 .El
 .Sh AUTHENTICATION
 The OpenSSH SSH daemon supports SSH protocols 1 and 2.
 .El
 .Sh AUTHENTICATION
 The OpenSSH SSH daemon supports SSH protocols 1 and 2.

-Both protocols are supported by default,
+The default is to use protocol 2 only,

 though this can be changed via the
 .Cm Protocol
 option in
 though this can be changed via the
 .Cm Protocol
 option in


@@ -543,7 +543,7 @@ for more information on patterns.
 In addition to the wildcard matching that may be applied to hostnames or
 addresses, a
 .Cm from
 In addition to the wildcard matching that may be applied to hostnames or
 addresses, a
 .Cm from

-stanza may match IP addressess using CIDR address/masklen notation.
+stanza may match IP addresses using CIDR address/masklen notation.

 .Pp
 The purpose of this option is to optionally increase security: public key
 authentication by itself does not trust the network or name servers or
 .Pp
 The purpose of this option is to optionally increase security: public key
 authentication by itself does not trust the network or name servers or