* gpg.sgml: Document --compress-level. Some minor tweaks to other

entries.

* TRANSLATE: New, note to translators about the yes|yes multiple match
syntax.

* Makefile.am: Include TRANSLATE in distributed files.

4 files changed, 38 insertions, 17 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 92d994d48..8eb7f40e1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-20  David Shaw  <[email protected]>
+
+	* gpg.sgml: Document --compress-level.  Some minor tweaks to other
+	entries.
+
+	* TRANSLATE: New, note to translators about the yes|yes multiple
+	match syntax.
+
+	* Makefile.am: Include TRANSLATE in distributed files.
+
 2003-10-28  Werner Koch  <[email protected]>
 
 	* DETAILS: Add the 'a' value for field 12 and the new field 15.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5972432a3..4a52af321 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,7 +21,8 @@
 AUTOMAKE_OPTIONS = no-texinfo.tex
 
 EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \
-             HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 gnupg-w32.reg
+             HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 gnupg-w32.reg \
+             TRANSLATE
 
 man_MANS = gpg.1 gpgv.1 gnupg.7
 
diff --git a/doc/TRANSLATE b/doc/TRANSLATE
new file mode 100644
index 000000000..6ddc93fc0
--- /dev/null
+++ b/doc/TRANSLATE
@@ -0,0 +1,18 @@
+$Id$
+
+Note for translators
+--------------------
+
+Some strings in GnuPG are for matching user input against.  These
+strings can accept multiple values that mean essentially the same
+thing.
+
+For example, the string "yes" in English is "s�" in Spanish.  However,
+some users will type "si" (without the accent).  To accomodate both
+users, you can translate the string "yes" as "s�|si".  You can have
+any number of alternate matches seperated by the | character like
+"s�|si|seguro".
+
+The strings that can be handled in this way are of the form "yes|yes",
+(or "no|no", etc.) There should also be a comment in the .po file
+directing you to this file.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 496c692fc..c9d0dbaa1 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -585,14 +585,6 @@ or changed by you.
 
 
 <varlistentry>
-<term>--export-all &OptParmNames;</term>
-<listitem><para>
-Same as --export, but also exports keys which
-are not compatible with OpenPGP.
-</para></listitem></varlistentry>
-
-
-<varlistentry>
 <term>--export-secret-keys &OptParmNames;</term>
 <term>--export-secret-subkeys &OptParmNames;</term>
 <listitem><para>
@@ -905,7 +897,7 @@ Try to be as quiet as possible.
 
 
 <varlistentry>
-<term>-z &ParmN;, --compress &ParmN;</term>
+<term>-z &ParmN;, --compress-level &ParmN;</term>
 <listitem><para>
 Set compression level to &ParmN;. A value of 0 for &ParmN;
 disables compression. Default is to use the default
@@ -1045,7 +1037,7 @@ ID is bound to the key.
 <varlistentry>
 <term>--always-trust</term>
 <listitem><para>
-Identical to `--trust-model always'
+Identical to `--trust-model always'.  This option is deprecated.
 </para></listitem></varlistentry>
 
 
@@ -1056,11 +1048,11 @@ Use &ParmName as your keyserver.  This is the server that --recv-keys,
 --send-keys, and --search-keys will communicate with to receive keys
 from, send keys to, and search for keys on.  The format of the
 &ParmName is a URI: `scheme:[//]keyservername[:port]' The scheme is
-the type of keyserver: "hkp" for the Horowitz (or compatible)
-keyservers, "ldap" for the NAI LDAP keyserver, or "mailto" for the
-Horowitz email keyserver.  Note that your particular installation of
-GnuPG may have other keyserver types available as well.  Keyserver
-schemes are case-insensitive.
+the type of keyserver: "hkp" for the HTTP (or compatible) keyservers,
+"ldap" for the NAI LDAP keyserver, or "mailto" for the Graff email
+keyserver.  Note that your particular installation of GnuPG may have
+other keyserver types available as well.  Keyserver schemes are
+case-insensitive.
 </para><para>
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server.  Using the command "host -l
@@ -2047,7 +2039,7 @@ the SHA-256 digest algorithm.
 <term>--no-force-v3-sigs</term>
 <listitem><para>
 OpenPGP states that an implementation should generate v4 signatures
-but PGP versions 5 and higher only recognize v4 signatures on key
+but PGP versions 5 through 7 only recognize v4 signatures on key
 material.  This option forces v3 signatures for signatures on data.
 Note that this option overrides --ask-sig-expire, as v3 signatures
 cannot have expiration dates.  --no-force-v3-sigs disables this