summaryrefslogtreecommitdiffstats
path: root/doc/gpg.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2013-04-04 14:24:11 +0200
committerWerner Koch <wk@gnupg.org>2013-04-04 14:26:39 +0200
commite1f7f61d1e10fc3ee816970ce611afbc9b654eda (patch)
tree20e23a0bd8fa7987b150d30b4572f7865010697c /doc/gpg.texi
parentscd: move SCDaemon to libexecdir. (diff)
downloadgnupg2-e1f7f61d1e10fc3ee816970ce611afbc9b654eda.tar.xz
gnupg2-e1f7f61d1e10fc3ee816970ce611afbc9b654eda.zip
Fix doc for the Expire-Date key generation parameter.
--
Diffstat (limited to 'doc/gpg.texi')
-rw-r--r--doc/gpg.texi22
1 files changed, 12 insertions, 10 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 0462c9e45..71941127d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3310,21 +3310,23 @@ If you don't give any of them, no user ID is created.
@item Expire-Date: @var{iso-date}|(@var{number}[d|w|m|y])
Set the expiration date for the key (and the subkey). It may either
-be entered in ISO date format (2000-08-15) or as number of days,
-weeks, month or years. The special notation "seconds=N" is also
-allowed to directly give an Epoch value. Without a letter days are
-assumed. Note that there is no check done on the overflow of the type
-used by OpenPGP for timestamps. Thus you better make sure that the
-given value make sense. Although OpenPGP works with time intervals,
-GnuPG uses an absolute value internally and thus the last year we can
-represent is 2105.
+be entered in ISO date format (e.g. "20000815T145012") or as number of
+days, weeks, month or years after the creation date. The special
+notation "seconds=N" is also allowed to specify a number of seconds
+since creation. Without a letter days are assumed. Note that there
+is no check done on the overflow of the type used by OpenPGP for
+timestamps. Thus you better make sure that the given value make
+sense. Although OpenPGP works with time intervals, GnuPG uses an
+absolute value internally and thus the last year we can represent is
+2105.
@item Ceation-Date: @var{iso-date}
Set the creation date of the key as stored in the key information and
which is also part of the fingerprint calculation. Either a date like
"1986-04-26" or a full timestamp like "19860426T042640" may be used.
-The time is considered to be UTC. If it is not given the current time
-is used.
+The time is considered to be UTC. The special notation "seconds=N"
+may be used to directly specify a the number of seconds since Epoch
+(Unix time). If it is not given the current time is used.
@item Preferences: @var{string}
Set the cipher, hash, and compression preference values for this key.