Updated some FAQ URLs for wiki.list.org.

3 files changed, 7 insertions, 6 deletions

diff --git a/FAQ b/FAQ
index 2dacb43f..ea481a2e 100644
--- a/FAQ
+++ b/FAQ
@@ -2,9 +2,8 @@ Mailman - The GNU Mailing List Management System
 Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
-Note: We're migrating the FAQ to an on-line interactive system called
-      "FAQ Wizard".  To see the Mailman FAQ Wizard in action, go to
-      http://www.python.org/cgi-bin/faqw-mm.py
+Note: We've migrated the FAQ to the wiki at http://wiki.list.org/
+      To see the Mailman FAQ go to http://wiki.list.org/x/AgA3
 
 FREQUENTLY ASKED QUESTIONS
 
@@ -188,8 +187,7 @@ A. If your Mailman installation run on an SSL-enabled web server
 
 Q. I want to backup my lists.  What do I need to save?
 
-A. See this FAQ wizard entry:
-   http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq04.006.htp
+A. See this FAQ entry: http://wiki.list.org/x/5oA9
 
 Q. How do I rename a list?
 
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
index 3aa8ab4e..0e34a1c7 100644
--- a/Mailman/Cgi/edithtml.py
+++ b/Mailman/Cgi/edithtml.py
@@ -168,7 +168,7 @@ must have shell access to your Mailman server.
              """)))
         doc.AddItem(_('See '))
         doc.AddItem(Link(
-'http://www.python.org/cgi-bin/faqw-mm.py?req=show&file=faq04.048.htp',
+'http://wiki.list.org/x/jYA9',
                 _('FAQ 4.48.')))
         doc.AddItem(Header(3,_("Page Unchanged.")))
         doc.AddItem('<hr>')
diff --git a/NEWS b/NEWS
index ba14f9f2..4fdc03d2 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,9 @@ Here is a history of user visible changes to Mailman.
     - Fixed a minor issue in cron/gate_news that could cause a list's
       watermark to not be completely updated.
 
+    - Fixed an issue that prevented editing the options.html template from
+      the web admin interface. SF Bug #2164798.
+
 2.1.11 (30-Jun-2008)
 
   New Features