Bring manpages up to date.

diff --git a/key.1 b/key.1
index cbac9bc..95cba9b 100644 (file)
--- a/key.1
+++ b/key.1
@@ -33,7 +33,7 @@ is one of:
 .IR attr ...
 .br
 .B list
-.RB [ \-qv ]
+.RB [ \-quv ]
 .br
 .B tidy
 .br
@@ -68,7 +68,7 @@ successful exit status.
 Writes a very terse command line summary to standard output, and returns
 a successful exit status.
 .TP
-.BI "\-k, \-\-keyring=" file
+.BI "\-k, \-\-keyring " file
 Names the keyring file which
 .B key
 is to process.  The default keyring, used if this option doesn't specify
@@ -136,12 +136,12 @@ The
 command creates a new key and adds it to the keyring.  The command
 accepts the following options:
 .TP
-.BI "\-b, \-\-bits=" bits
+.BI "\-b, \-\-bits " bits
 The length of the key to generate, in bits.  The default, if this option
 is not supplied, is 128 bits.  The bit length must be nonzero, and must
 be a multiple of 8.
 .TP
-.BI "\-e, \-\-expire=" expire
+.BI "\-e, \-\-expire " expire
 The expiry date for the generated key.  This may be the string
 .RB ` forever '
 if the key should never expire automatically, or any date acceptable to
@@ -157,7 +157,7 @@ and (perhaps more usefully) relative dates such as
 .RB ` "+2 weeks" '.
 The default is to allow a 2 week expiry, which isn't useful.
 .TP
-.BI "\-c, \-\-comment=" comment
+.BI "\-c, \-\-comment " comment
 Sets a comment for the key.  The default is not to attach a comment.
 .PP
 The key's type is given by the required
@@ -208,6 +208,9 @@ Decreases the amount of information displayed for each key.  Each use
 cancels a
 .RB ` \-v '
 option.
+.TP
+.B "\-u, \-\-utc"
+Display key expiry times as UTC rather than using the local time zone.
 .PP
 By default, a single line of output is generated for each, showing
 keyids, types, expiry and deletion dates, and comments.  Additional

diff --git a/keyring.5 b/keyring.5
index 2d27b60..02cae53 100644 (file)
--- a/keyring.5
+++ b/keyring.5
@@ -26,9 +26,10 @@ The key's type string, set when the key was created.
 The actual key, Base64 encoded, as described in RFC2045.
 .TP
 .B "expiry time"
-The time at which this key expires, represented as an integer number of
-seconds since 1970-01-01 00:00:00 UTC, not counting leap seconds.  The
-special value \-1 signifies that this key never expires.
+The time at which this key expires, represented as an integer, in the
+format returned by the
+.BR time (2)
+system call.
 .TP
 .B "deletion time"
 The time at which this key should be deleted, using the same