summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-05 10:41:45 +1100
committerDamien Miller <djm@mindrot.org>2010-03-05 10:41:45 +1100
commitc6db99ec14f511d8ee5efb3c1fee42ab1ab61c8e (patch)
tree83ca3793a4678ce7136e63aab6e16a81e6d26bae
parent8f6c337563f2217b6704f0f40bed68cee349f8c4 (diff)
- djm@cvs.openbsd.org 2010/03/04 23:17:25
[sshd_config.5] missing word; spotted by jmc@
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.54
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1659e324a..f8e1d0e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - jmc@cvs.openbsd.org 2010/03/04 22:52:40 9 - jmc@cvs.openbsd.org 2010/03/04 22:52:40
10 [ssh-keygen.1] 10 [ssh-keygen.1]
11 fix Bk/Ek; 11 fix Bk/Ek;
12 - djm@cvs.openbsd.org 2010/03/04 23:17:25
13 [sshd_config.5]
14 missing word; spotted by jmc@
12 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older 15 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
13 compilers. OK djm@ 16 compilers. OK djm@
14 17
diff --git a/sshd_config.5 b/sshd_config.5
index a0427584d..2f5410281 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.119 2010/03/04 12:51:25 jmc Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.120 2010/03/04 23:17:25 djm Exp $
38.Dd $Mdocdate: March 4 2010 $ 38.Dd $Mdocdate: March 4 2010 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -896,7 +896,7 @@ To disable TCP keepalive messages, the value should be set to
896.Dq no . 896.Dq no .
897.It Cm TrustedUserCAKeys 897.It Cm TrustedUserCAKeys
898Specifies a file containing public keys of certificate authorities that are 898Specifies a file containing public keys of certificate authorities that are
899trusted sign user certificates for authentication. 899trusted to sign user certificates for authentication.
900Keys are listed one per line; empty lines and comments starting with 900Keys are listed one per line; empty lines and comments starting with
901.Ql # 901.Ql #
902are allowed. 902are allowed.