diff --git a/ChangeLog b/ChangeLog index 41b5891d8..0333ba30d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ - jmc@cvs.openbsd.org 2004/06/26 09:11:14 [ssh_config.5] punctuation and grammar fixes. also, keep the options in order. + - jmc@cvs.openbsd.org 2004/06/26 09:14:40 + [sshd_config.5] + new sentence, new line; 20040627 - (tim) update README files. @@ -1456,4 +1459,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3460 2004/06/30 12:38:52 djm Exp $ +$Id: ChangeLog,v 1.3461 2004/06/30 12:39:34 djm Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index 3a377ca74..09532fb8d 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.34 2004/06/13 14:01:42 dtucker Exp $ +.\" $OpenBSD: sshd_config.5,v 1.35 2004/06/26 09:14:40 jmc Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -416,8 +416,10 @@ The default is .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . .It Cm MaxAuthTries Specifies the maximum number of authentication attempts permitted per -connection. Once the number of failures reaches half this value, additional -failures are logged. The default is 6. +connection. +Once the number of failures reaches half this value, +additional failures are logged. +The default is 6. .It Cm MaxStartups Specifies the maximum number of concurrent unauthenticated connections to the .Nm sshd