Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/forum/how_to_enable_multimarkdown__63__.mdwn b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
new file mode 100644 (file)
index 0000000..8213716
--- /dev/null
+++ b/doc/forum/how_to_enable_multimarkdown__63__.mdwn
@@ -0,0 +1,5 @@
+I enabled multimarkdown in my setup file but I get this message 'remote: multimarkdown is enabled, but Text::MultiMarkdown is not installed'.
+I also installed multimarkdown-git for my distro (archlinux), which should take care of installing all required perl modules, I believe.
+What am I missing?
+
+Thanks.

diff --git a/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
new file mode 100644 (file)
index 0000000..5ea0e1f
--- /dev/null
+++ b/doc/forum/square_brackets_inside_backticks_generates_incorrect_html___40__interpreted_as_wikilinks__41____63__.html
@@ -0,0 +1,6 @@
+the following markdown code
+`foo [["bar"]]` generates the following output:
+
+foo <span class="createlink"><a href="http://euler/~dabd/wiki/ikiwiki.cgi?page=__34__bar__34__&amp;from=foo&amp;do=create" rel="nofollow">?</a>&#34;bar&#34;</span>
+
+Perhaps this is a bug in the markdown processor?

diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 14bd28a048cb3f1ba4ee6eb66cd9772723e3ea17..59f83441c7f540f7eb00e306066bdc2903f549c1 100644 (file)
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -49,5 +49,6 @@ held for moderation. (Or with the [[moderatedcomments]] plugin, all
 comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
-The unmoderated comments are stored in the `srcdir` with a filename ending
-in "._comment_pending". They are not checked into revision control.
+To find unmoderated comments, `find /your/ikiwiki/srcdir -name '*._comment_pending'`
+
+They are not checked into revision control.

diff --git a/doc/plugins/comments/discussion.mdwn b/doc/plugins/comments/discussion.mdwn
index 396d1f6d4d07ce2f9da9c70e88d269998501fe06..7cc8a4b2a04b255d3b007a727c1ef84df47284b8 100644 (file)
--- a/doc/plugins/comments/discussion.mdwn
+++ b/doc/plugins/comments/discussion.mdwn
@@ -1,3 +1,9 @@
+## Moderating comments from the CLI
+
+How do you do this, without using the UI in the Preferences?
+
+Please put this info on the page. Many thanks --[[Kai Hendry]]
+
 ## Why internal pages? (unresolved)
 
 Comments are saved as internal pages, so they can never be edited through the CGI,