diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh-keygen.1 | 9 |
2 files changed, 8 insertions, 5 deletions
@@ -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 | ||
7 | 20100314 | 11 | 20100314 |
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 |
349 | Allows X11 forwarding. | 349 | Allows X11 forwarding. |
350 | .It Ic source-address Ns = Ns Ar address_list | 350 | .It Ic source-address Ns = Ns Ar address_list |
351 | Restrict the source addresses from which the certificate is considered valid | 351 | Restrict the source addresses from which the certificate is considered valid. |
352 | from. | ||
353 | The | 352 | The |
354 | .Ar address_list | 353 | .Ar address_list |
355 | is a comma-separated list of one or more address/netmask pairs in CIDR | 354 | is 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 | |||
414 | of a minus sign followed by a relative time in the format described in the | 413 | of a minus sign followed by a relative time in the format described in the |
415 | .Sx TIME FORMATS | 414 | .Sx TIME FORMATS |
416 | section of | 415 | section of |
417 | .Xr ssh_config 5 . | 416 | .Xr sshd_config 5 . |
418 | The end time may be specified as a YYYYMMDD date, a YYYYMMDDHHMMSS time or | 417 | The end time may be specified as a YYYYMMDD date, a YYYYMMDDHHMMSS time or |
419 | a relative time starting with a plus character. | 418 | a relative time starting with a plus character. |
420 | .Pp | 419 | .Pp |