summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-07-02 13:37:17 +1000
committerDamien Miller <djm@mindrot.org>2010-07-02 13:37:17 +1000
commitd59dab83536d4a539e795ff5ce2be6b952d57e24 (patch)
tree020bc5063b5e3910bd159b50734ab7f2d5dbcc27
parent6022f58e3af3fcda0d28b4d62a54429d2ef45e70 (diff)
downloadopenssh-git-d59dab83536d4a539e795ff5ce2be6b952d57e24.tar.gz
- jmc@cvs.openbsd.org 2010/06/30 07:28:34
[sshd_config.5] tweak previous;
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.58
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ca7cfc8f..9b214e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
- jmc@cvs.openbsd.org 2010/06/30 07:26:03
[ssh-keygen.c]
sort usage();
+ - jmc@cvs.openbsd.org 2010/06/30 07:28:34
+ [sshd_config.5]
+ tweak previous;
20100627
- (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs
diff --git a/sshd_config.5 b/sshd_config.5
index 4d066eb8..596a728f 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
.\" (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.124 2010/06/29 23:16:46 djm Exp $
-.Dd $Mdocdate: June 29 2010 $
+.\" $OpenBSD: sshd_config.5,v 1.125 2010/06/30 07:28:34 jmc Exp $
+.Dd $Mdocdate: June 30 2010 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -178,11 +178,11 @@ When using certificates signed by a key listed in
.Cm TrustedUserCAKeys ,
this file lists names, one of which must appear in the certificate for it
to be accepted for authentication.
-Names are listed one per line preceeded by key options (as described
+Names are listed one per line preceded by key options (as described
in
.Sx AUTHORIZED_KEYS FILE FORMAT
in
-.Xr sshd 8 ).
+.Xr sshd 8 ) .
Empty lines and comments starting with
.Ql #
are ignored.