2 files changed, 5 insertions, 4 deletions

diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index a8b8b0f83..bab041a05 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -42,13 +42,13 @@ 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.
-# 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
 -------------