diff options
author | Damien Miller <djm@mindrot.org> | 2010-03-04 21:39:01 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-03-04 21:39:01 +0100 |
commit | 72b33820af596f78a7ea7ee1200ae4c46b6167e5 (patch) | |
tree | 7ec47389a618db2b2d742938cef2756848a997cf | |
parent | - djm@cvs.openbsd.org 2010/03/04 10:38:23 (diff) | |
download | openssh-72b33820af596f78a7ea7ee1200ae4c46b6167e5.tar.xz openssh-72b33820af596f78a7ea7ee1200ae4c46b6167e5.zip |
- jmc@cvs.openbsd.org 2010/03/04 12:51:25
[ssh.1 sshd_config.5]
tweak previous;
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh.1 | 8 | ||||
-rw-r--r-- | sshd_config.5 | 6 |
3 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,9 @@ +20100305 + - OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2010/03/04 12:51:25 + [ssh.1 sshd_config.5] + tweak previous; + 20100304 - (djm) [ssh-keygen.c] Use correct local variable, instead of maybe-undefined global "optarg" @@ -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: ssh.1,v 1.297 2010/03/04 10:36:03 djm Exp $ +.\" $OpenBSD: ssh.1,v 1.298 2010/03/04 12:51:25 jmc Exp $ .Dd $Mdocdate: March 4 2010 $ .Dt SSH 1 .Os @@ -1122,7 +1122,7 @@ section of .Xr ssh-keygen 1 for more details. .Pp -Keys may be also be marked as revoked using the +Keys may also be marked as revoked using the .Dq @revoked marker. Revoked keys will always trigger a warning when encountered and the host @@ -1133,10 +1133,10 @@ For example: .Pp Revoking a key revokes it for direct use and as a certification authority. Do not use both the -.Dq @cert-authority and +.Dq @cert-authority +and .Dq @revoked markers on the same line. -.Pp .Sh SSH-BASED VIRTUAL PRIVATE NETWORKS .Nm contains support for Virtual Private Network (VPN) tunnelling diff --git a/sshd_config.5 b/sshd_config.5 index 07e74e2b7..a0427584d 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.118 2010/03/04 10:36:03 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.119 2010/03/04 12:51:25 jmc Exp $ .Dd $Mdocdate: March 4 2010 $ .Dt SSHD_CONFIG 5 .Os @@ -897,7 +897,7 @@ To disable TCP keepalive messages, the value should be set to .It Cm TrustedUserCAKeys Specifies a file containing public keys of certificate authorities that are trusted sign user certificates for authentication. -Keys are listed one per line, empty lines and comments starting with +Keys are listed one per line; empty lines and comments starting with .Ql # are allowed. If a certificate is presented for authentication and has its signing CA key @@ -906,7 +906,7 @@ listed in the certificate's principals list. Note that certificates that lack a list of principals will not be permitted for authentication using .Cm TrustedUserCAKeys . -For more details in certificates, please see the +For more details on certificates, see the .Sx CERTIFICATES section in .Xr ssh-keygen 1 . |