From: Joey Hess Date: Sun, 6 Nov 2011 19:57:24 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 3.20111106~4 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/bf8b3bc12abe9d763329a191bdb152b30978d2ef?hp=64031e30a735969d2cfb6ad93aad87065c0e78d0 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 index 000000000..f1ea100ec --- /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 31f2d0c02..98933d99e 100644 --- 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 -(dead link 2011.10.31). +Parser, documented at +. 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