summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keygen.19
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2270e0eb1..34d5dfdcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - jmc@cvs.openbsd.org 2010/03/08 09:41:27 3 - jmc@cvs.openbsd.org 2010/03/08 09:41:27
4 [ssh-keygen.1] 4 [ssh-keygen.1]
5 sort the list of constraints (to -O); ok djm 5 sort the list of constraints (to -O); ok djm
6 - jmc@cvs.openbsd.org 2010/03/10 07:40:35
7 [ssh-keygen.1]
8 typos; from Ross Richardson
9 closes prs 6334 and 6335
6 10
720100314 1120100314
8 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix 12 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index c819320db..e79246b79 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.89 2010/03/08 09:41:27 jmc Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.90 2010/03/10 07:40:35 jmc Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: March 8 2010 $ 40.Dd $Mdocdate: March 10 2010 $
41.Dt SSH-KEYGEN 1 41.Dt SSH-KEYGEN 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -348,8 +348,7 @@ by
348.It Ic permit-x11-forwarding 348.It Ic permit-x11-forwarding
349Allows X11 forwarding. 349Allows X11 forwarding.
350.It Ic source-address Ns = Ns Ar address_list 350.It Ic source-address Ns = Ns Ar address_list
351Restrict the source addresses from which the certificate is considered valid 351Restrict the source addresses from which the certificate is considered valid.
352from.
353The 352The
354.Ar address_list 353.Ar address_list
355is a comma-separated list of one or more address/netmask pairs in CIDR 354is a comma-separated list of one or more address/netmask pairs in CIDR
@@ -414,7 +413,7 @@ in YYYYMMDDHHMMSS format or a relative time (to the current time) consisting
414of a minus sign followed by a relative time in the format described in the 413of a minus sign followed by a relative time in the format described in the
415.Sx TIME FORMATS 414.Sx TIME FORMATS
416section of 415section of
417.Xr ssh_config 5 . 416.Xr sshd_config 5 .
418The end time may be specified as a YYYYMMDD date, a YYYYMMDDHHMMSS time or 417The end time may be specified as a YYYYMMDD date, a YYYYMMDDHHMMSS time or
419a relative time starting with a plus character. 418a relative time starting with a plus character.
420.Pp 419.Pp