summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TWiki/TWikiPreferences.mdwn7
1 files changed, 5 insertions, 2 deletions
diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn
index 511eceb4..444168b5 100644
--- a/TWiki/TWikiPreferences.mdwn
+++ b/TWiki/TWikiPreferences.mdwn
@@ -56,9 +56,12 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
* Wiki webmaster email address:
* Set WIKIWEBMASTER = <webmaster@yourNOSPAM.company>
-* Mail host for outgoing mail. This is used for [[WebChangesAlert]] if Perl module <code>**Net::SMTP**</code> is installed. If not, sendmail is used instead (defined by <code>**$mailProgram**</code> in <code>**TWiki.cfg**</code>). Examples: `mail.your.company` or `localhost`
+* Mail host for outgoing mail. This is used for [[WebChangesAlert]] if Perl module <code>**Net::SMTP**</code> is installed. If not, or if `SMTPMAILHOST` is empty, the external sendmail program is used instead (defined by <code>**$mailProgram**</code> in <code>**TWiki.cfg**</code>). Examples: `mail.your.company` or `localhost`
* Set SMTPMAILHOST = mail
+* Mail domain sending mail. SMTP requires that you identify the TWiki server sending mail. If not set, <code>**Net::SMTP**</code> will guess it for you. Examples: `twiki.your.company`
+ * Set SMTPSENDERHOST =
+
* [[TWikiPlugins]] configuration: All plugin modules that exist in the `lib/TWiki/Plugins` directory are activated automatically unless disabled by DISABLEDPLUGINS. You can optionally list the installed plugins in INSTALLEDPLUGINS. This is useful to define the sequence of plugin execution, or to specify other webs then the %TWIKIWEB% web for the plugin topics. Specify plugins as a comma separated list of topics.
* Set INSTALLEDPLUGINS = [[TWiki/DefaultPlugin]]
* Set DISABLEDPLUGINS = [[EmptyPlugin]]
@@ -82,7 +85,7 @@ The following settings are **_site-level preferences_** , e.g. affecting all use
* Set ALLOWTOPICRENAME =
* Site-level preferences that are **not** allowed to be overridden by %WEBPREFSTOPIC% and user preferences:
- * Set FINALPREFERENCES = PREVIEWBGIMAGE, WIKIWEBMASTER, MAILHOST
+ * Set FINALPREFERENCES = PREVIEWBGIMAGE, WIKIWEBMASTER, SMTPMAILHOST , SMTPSENDERHOST
**_Notes:_**