Merge remote-tracking branch 'origin/viewvcs' into master

[public-inbox.git] / Documentation / public-inbox-config.pod

diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
index cfd6c93d1dbaa51c0dc7bb98e21cf33dcd119a24..f7353dcaff7e326e410087c10f16f83143861870 100644 (file)
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@ -40,7 +40,7 @@ Default: none, required
 
 =item publicinbox.<name>.mainrepo
 
-The absolute path to the git repository which hosts the
+The absolute path to the directory which hosts the
 public-inbox.  This must be specified once.
 
 Default: none, required
@@ -91,6 +91,15 @@ C<nntp://news.gmane.org/gmane.mail.public-inbox.general>
 
 Default: none
 
+=item publicinboxmda.spamcheck
+
+This may be set to C<none> to disable the use of SpamAssassin
+L<spamc(1)> for filtering spam before it is imported into git
+history.  Other spam filtering backends may be supported in
+the future.
+
+Default: spamc
+
 =item publicinboxwatch.spamcheck
 
 This may be set to C<spamc> to enable the use of SpamAssassin
@@ -105,7 +114,8 @@ Default: none
 This may be set to C<spamc> to enable the use of SpamAssassin
 L<spamc(1)> for filtering spam before it is imported into git
 history.  Other spam filtering backends may be supported in
-the future.  This only affects L<public-inbox-watch(1)>.
+the future.  This requires L<public-inbox-watch(1)>, but affects
+all configured public-inboxes in PI_CONFIG.
 
 Default: none
 
@@ -149,7 +159,7 @@ and L<http://hjrcffqmbrq6wope.onion/meta/>
 
 =head1 COPYRIGHT
 
-Copyright 2016 all contributors L<mailto:meta@public-inbox.org>
+Copyright 2016-2018 all contributors L<mailto:meta@public-inbox.org>
 
 License: AGPL-3.0+ L<https://www.gnu.org/licenses/agpl-3.0.txt>