more changes for removal of blog page

diff --git a/doc/ikiwiki/blog/discussion.mdwn b/doc/ikiwiki/blog/discussion.mdwn
deleted file mode 100644 (file)
index 91b2ff4..0000000
--- a/doc/ikiwiki/blog/discussion.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-## How do you provide the per post discussion links in your own blog?
-
-> That's configured by the "actions" parameter to the inline directive. See
-> docs in [[plugins/inline]]. --[[Joey]]
-
-And do you have any ideas/hints about implementing a "comments" feature.
-What I'm after is something for users who don't quite understand the Wiki
-style for discussions.  I would like to have a form for them to post a
-comment and have the comment appended to the discussion Wiki-style.  Maybe
-take it as far as implementing "replies" to other comments.
-
--- Marcelo
-
-> See [[todo/discussion_page_as_blog]] for some of my own thoughts on this
-> --[[Joey]]
-
----
-
-## More dynamic `rootpage` parameter of inline plugin?
-
-(Moved to [[todo/dynamic_rootpage]])

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
new file mode 100644 (file)
index 0000000..91b2ff4
--- /dev/null
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -0,0 +1,21 @@
+## How do you provide the per post discussion links in your own blog?
+
+> That's configured by the "actions" parameter to the inline directive. See
+> docs in [[plugins/inline]]. --[[Joey]]
+
+And do you have any ideas/hints about implementing a "comments" feature.
+What I'm after is something for users who don't quite understand the Wiki
+style for discussions.  I would like to have a form for them to post a
+comment and have the comment appended to the discussion Wiki-style.  Maybe
+take it as far as implementing "replies" to other comments.
+
+-- Marcelo
+
+> See [[todo/discussion_page_as_blog]] for some of my own thoughts on this
+> --[[Joey]]
+
+---
+
+## More dynamic `rootpage` parameter of inline plugin?
+
+(Moved to [[todo/dynamic_rootpage]])

diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn
index a8e0c58f8a1ce4f0be684436c949ae238e43b664..2ed5cc26f32a8822bfc7de5f24c67fb58852c136 100644 (file)
--- a/doc/ikiwiki/formatting.mdwn
+++ b/doc/ikiwiki/formatting.mdwn
@@ -77,7 +77,7 @@ you use the following additional features:
 
 * Insert various [[directives|directive]] onto a page to perform useful
   actions.
 
 * Insert various [[directives|directive]] onto a page to perform useful
   actions.

-[[!if test="enabled(toc) or enabled(meta) or (enabled(inline))" then="""
+[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""

   For example, you can:
 """]]
 
   For example, you can:
 """]]