diff options
| -rw-r--r-- | doc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/gpg.sgml | 25 |
2 files changed, 29 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 0ecf0d963..214fc8e60 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2002-04-24 David Shaw <[email protected]> + + * gpg.sgml: Add some documentation for + --edit/{addphoto|showphoto|nrsign|nrlsign}, and difference between + %t and %T in photo viewer command lines. + 2002-04-23 Stefan Bellon <[email protected]> * gpg.sgml: Moved options from section "COMMANDS" to diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 7a407b600..a58e31171 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -282,6 +282,17 @@ non-exportable and will therefore never be used by others. This may be used to make keys valid only in the local environment.</para></listitem></varlistentry> <varlistentry> + <term>nrsign</term> + <listitem><para> +Same as --sign but the signature is marked as non-revocable and can +therefore never be revoked.</para></listitem></varlistentry> + <varlistentry> + <term>nrlsign</term> + <listitem><para> +Combines the functionality of nrsign and lsign to make a signature +that is both non-revocable and +non-exportable.</para></listitem></varlistentry> + <varlistentry> <term>revsig</term> <listitem><para> Revoke a signature. GnuPG asks for every @@ -304,6 +315,10 @@ for encryption.</para></listitem></varlistentry> <listitem><para> Create an alternate user id.</para></listitem></varlistentry> <varlistentry> + <term>addphoto</term> + <listitem><para> +Create a photographic user id.</para></listitem></varlistentry> + <varlistentry> <term>deluid</term> <listitem><para> Delete a user id.</para></listitem></varlistentry> @@ -355,6 +370,11 @@ Use 0 to deselect all.</para></listitem></varlistentry> <listitem><para> Check all selected user ids.</para></listitem></varlistentry> <varlistentry> + <term>showphoto</term> + <listitem><para> +Display the selected photographic user +id.</para></listitem></varlistentry> + <varlistentry> <term>pref</term> <listitem><para> List preferences.</para></listitem></varlistentry> @@ -991,8 +1011,9 @@ This is the command line that should be run to view a photo ID. "%i" will be expanded to a filename containing the photo. "%I" does the same, except the file will not be deleted once the viewer exits. Other flags are "%k" for the key ID, "%K" for the long key ID, "%f" -for the key fingerprint, "%t" for the type of image (e.g. jpeg), and -"%%" for an actual percent sign. If neither %i or %I are present, +for the key fingerprint, "%t" for the extension of the image type +(e.g. "jpg"), "%T" for the MIME type of the image (e.g. "image/jpeg"), +and "%%" for an actual percent sign. If neither %i or %I are present, then the photo will be supplied to the viewer on standard input. </para><para> The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' |