Author: dos
Date: Wed Aug 23 03:11:49 2006
New Revision: 434000
URL: http://svn.apache.org/viewvc?rev=434000&view=rev
Log:
bug 5046: document sa-learn's --import option
Modified:
spamassassin/branches/3.1/sa-update.raw
Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?rev=434000&r1=433999&r2=434000&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Wed Aug 23 03:11:49 2006
@@ -1239,6 +1239,8 @@
--gpg and --nogpg Use (or do not use) GPG to verify updates
(--gpg is assumed by use of the above
--gpgkey and --gpgkeyfile options)
+ --import file Import GPG key(s) from file into sa-update's
+ keyring. Use multiple times for multiple files
-D, --debug [area=n,...] Print debugging messages
-V, --version Print version
@@ -1305,7 +1307,9 @@
and signing with their own key.
By default, sa-update trusts key id C<265FA05B>, which is the standard
-SpamAssassin release key. Use this option to add more trusted keys.
+SpamAssassin release key. Use this option to trust additional keys. See the
+B<--import> option for how to add keys to sa-update's keyring. For sa-update
+to use a key it must be in sa-update's keyring and trusted.
For multiple keys, use the option multiple times. i.e.:
@@ -1325,6 +1329,20 @@
keyring. By default, this is
@@LOCAL_RULES_DIR@@/sa-update-keys
+
+=item B<--import>
+
+Use to import GPG key(s) from a file into the sa-update keyring which is
+located in the directory specified by B<--gpghomedir>. Before using channels
+from third party sources, you should use this option to import the GPG key(s)
+used by those channels. You must still use the B<--gpgkey> or B<--gpgkeyfile>
+options above to get sa-update to trust imported keys.
+
+To import multiple keys, use the option multiple times. i.e.:
+
+ sa-update --import channel1-GPG.KEY --import channel2-GPG.KEY
+
+Note: use of this option automatically enables GPG verification.
=item B<-D> [I<area,...>], B<--debug> [I<area,...>]
Date: Wed Aug 23 03:11:49 2006
New Revision: 434000
URL: http://svn.apache.org/viewvc?rev=434000&view=rev
Log:
bug 5046: document sa-learn's --import option
Modified:
spamassassin/branches/3.1/sa-update.raw
Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?rev=434000&r1=433999&r2=434000&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Wed Aug 23 03:11:49 2006
@@ -1239,6 +1239,8 @@
--gpg and --nogpg Use (or do not use) GPG to verify updates
(--gpg is assumed by use of the above
--gpgkey and --gpgkeyfile options)
+ --import file Import GPG key(s) from file into sa-update's
+ keyring. Use multiple times for multiple files
-D, --debug [area=n,...] Print debugging messages
-V, --version Print version
@@ -1305,7 +1307,9 @@
and signing with their own key.
By default, sa-update trusts key id C<265FA05B>, which is the standard
-SpamAssassin release key. Use this option to add more trusted keys.
+SpamAssassin release key. Use this option to trust additional keys. See the
+B<--import> option for how to add keys to sa-update's keyring. For sa-update
+to use a key it must be in sa-update's keyring and trusted.
For multiple keys, use the option multiple times. i.e.:
@@ -1325,6 +1329,20 @@
keyring. By default, this is
@@LOCAL_RULES_DIR@@/sa-update-keys
+
+=item B<--import>
+
+Use to import GPG key(s) from a file into the sa-update keyring which is
+located in the directory specified by B<--gpghomedir>. Before using channels
+from third party sources, you should use this option to import the GPG key(s)
+used by those channels. You must still use the B<--gpgkey> or B<--gpgkeyfile>
+options above to get sa-update to trust imported keys.
+
+To import multiple keys, use the option multiple times. i.e.:
+
+ sa-update --import channel1-GPG.KEY --import channel2-GPG.KEY
+
+Note: use of this option automatically enables GPG verification.
=item B<-D> [I<area,...>], B<--debug> [I<area,...>]