Merge remote-tracking branch 'origin/master'

diff --git a/doc/bugs/wrong_discussion_page_created.mdwn b/doc/bugs/wrong_discussion_page_created.mdwn
new file mode 100644 (file)
index 0000000..f1ea100
--- /dev/null
+++ b/doc/bugs/wrong_discussion_page_created.mdwn
@@ -0,0 +1,9 @@
+I seem to have broken Discussion page creation links. --[[Joey]] 
+
+For the toplevel, it needs to save to index/discussion. index/Discussion
+or Discussion won't work. It defaults to Discussion on the toplevel.
+And this is particularly bad as it breaks all other discussion links on
+other pages.
+
+For other pages, it should save to page/discussion. page/Discussion does
+not work. And it defaults to Discussion which is just *wrong*.

diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn
index 31f2d0c022ce4b838158bee8edf9da5cae205703..98933d99e6626e816c46effd71df23599cda2168 100644 (file)
--- a/doc/plugins/htmlscrubber.mdwn
+++ b/doc/plugins/htmlscrubber.mdwn
@@ -6,8 +6,8 @@ to avoid XSS attacks and the like.
 
 It excludes all html tags and attributes except for those that are
 whitelisted using the same lists as used by Mark Pilgrim's Universal Feed
-Parser, documented at <http://feedparser.org/docs/html-sanitization.html>
-(dead link 2011.10.31).
+Parser, documented at
+<http://web.archive.org/web/20110726052341/http://feedparser.org/docs/html-sanitization.html>.
 Notably it strips `style` and `link` tags, and the `style` attribute.
 
 All attributes that can be used to specify an url are checked to make sure