diff options
author | Damien Miller <djm@mindrot.org> | 2006-07-24 13:46:50 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-07-24 13:46:50 +1000 |
commit | d04f357ac24a6d40176cd53e58d0256b5130d98e (patch) | |
tree | d500c8f9ee625e46095f76336bef719faaad72d9 | |
parent | 341dae59c8e0f0367100e617e049cec4023be427 (diff) |
- jmc@cvs.openbsd.org 2006/07/12 13:39:55
[sshd_config.5]
- new sentence, new line
- s/The the/The/
- kill a bad comma
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | sshd_config.5 | 9 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,11 @@ | |||
1 | 20060724 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2006/07/12 13:39:55 | ||
4 | [sshd_config.5] | ||
5 | - new sentence, new line | ||
6 | - s/The the/The/ | ||
7 | - kill a bad comma | ||
8 | |||
1 | 20060713 | 9 | 20060713 |
2 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h | 10 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h |
3 | 11 | ||
@@ -4915,4 +4923,4 @@ | |||
4915 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4923 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4916 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4924 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4917 | 4925 | ||
4918 | $Id: ChangeLog,v 1.4407 2006/07/12 22:45:14 dtucker Exp $ | 4926 | $Id: ChangeLog,v 1.4408 2006/07/24 03:46:50 djm Exp $ |
diff --git a/sshd_config.5 b/sshd_config.5 index 0b2646027..4db92814c 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.60 2006/07/12 11:34:58 dtucker Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.61 2006/07/12 13:39:55 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -464,12 +464,13 @@ Multiple algorithms must be comma-separated. | |||
464 | The default is: | 464 | The default is: |
465 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . | 465 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . |
466 | .It Cm Match | 466 | .It Cm Match |
467 | Introduces a conditional block. Keywords on lines following a | 467 | Introduces a conditional block. |
468 | Keywords on lines following a | ||
468 | .Cm Match | 469 | .Cm Match |
469 | block are only applied if all of the criteria on the | 470 | block are only applied if all of the criteria on the |
470 | .Cm Match | 471 | .Cm Match |
471 | are satisfied. | 472 | are satisfied. |
472 | The the arguments to | 473 | The arguments to |
473 | .Cm Match | 474 | .Cm Match |
474 | block are one or more criteria-pattern pairs. | 475 | block are one or more criteria-pattern pairs. |
475 | The available criteria are | 476 | The available criteria are |
@@ -481,7 +482,7 @@ Only a subset of keywords may be used on the lines following a | |||
481 | .Cm Match | 482 | .Cm Match |
482 | keyword. | 483 | keyword. |
483 | Available keywords are | 484 | Available keywords are |
484 | .Cm AllowTcpForwarding , | 485 | .Cm AllowTcpForwarding |
485 | and | 486 | and |
486 | .Cm GatewayPorts . | 487 | .Cm GatewayPorts . |
487 | .It Cm MaxAuthTries | 488 | .It Cm MaxAuthTries |