From 9e628b80df0eef0d60300bb276391f75bb6e0f64 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 29 Jan 2017 16:26:57 -0500
Subject: Close #306

Update documentation links for ``config.cfg`` settings.
---
 src/mailman/config/config.py | 6 +++---
 src/mailman/docs/NEWS.rst    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index a8b8b0f83..e697a6881 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -46,9 +46,9 @@ MAILMAN_CFG_TEMPLATE = """\
 #
 # This is your GNU Mailman 3 configuration file.  You can edit this file to
 # configure Mailman to your needs, and Mailman will never overwrite it.
-# Additional configuration information is (for now) available in the
-# schema.cfg file <http://tinyurl.com/cm5rtqe> and the base mailman.cfg file
-# <http://tinyurl.com/dx9b8eg>.
+# Additional configuration information is available here:
+#
+# http://mailman.readthedocs.io/en/latest/src/mailman/config/docs/config.html
 #
 # For example, uncomment the following lines to run Mailman in developer mode.
 #
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index dfe71755f..5b580bd9d 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -108,6 +108,7 @@ Bugs
  * Fix confirmation of unsubscription requests.  (Closes: #294)
  * Fix ``mailman stop`` not stopping some runners due to PEP 475 interaction.
    (Closes: #255)
+ * Update documentation links for ``config.cfg`` settings.  (Closes: #306)
 
 Configuration
 -------------
-- 
cgit v1.3.1


From 37d71a16fd3b29fba2de1d039672aed3af6a426c Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 29 Jan 2017 16:29:58 -0500
Subject: Add a UTC tag.

---
 src/mailman/config/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index e697a6881..bab041a05 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -42,7 +42,7 @@ SPACE = ' '
 SPACERS = '\n'
 
 MAILMAN_CFG_TEMPLATE = """\
-# AUTOMATICALLY GENERATED BY MAILMAN ON {}
+# AUTOMATICALLY GENERATED BY MAILMAN ON {} UTC
 #
 # This is your GNU Mailman 3 configuration file.  You can edit this file to
 # configure Mailman to your needs, and Mailman will never overwrite it.
-- 
cgit v1.3.1