Migrate escaped directives (\[[) in the rest of doc to have \[[! prefix

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 14e9b3804cb79185ebcd9fd6fd1936936ccebc88..3e89c4b99f87539fd70ce15405c36c268f025255 100644 (file)
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -10,7 +10,7 @@ Some additional configuration you might want to do:
 
 * Make sure you have the tag plugin enabled, and tag posts using it. An
   example of how to tag a post is:
-       \[[tag tags/life]]
+       \[[!tag tags/life]]
 
 * Enable the sidebar plugin to get a sidebar listing all the categories
   you've tagged posts with.

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index f67321294ab8e07df1fa264586a87469f54b2e78..92fe8fa4762032cca196abd3f18c3587519c2fe8 100644 (file)
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -268,7 +268,7 @@ easily, perl is possible (but I'm not strong in perl).
 
 > Jamey Sharp and I have a set of scripts in progress to convert other wikis to ikiwiki, including history, so that we can migrate a few of our wikis.  We already have support for migrating MoinMoin wikis to ikiwiki, including conversion of the entire history to Git.  We used this to convert the [XCB wiki](http://xcb.freedesktop.org/wiki/) to ikiwiki; until we finalize the conversion and put the new wiki in place of the old one, you can browse the converted result at <http://xcb.freedesktop.org/ikiwiki>.  We already plan to add support for TWiki (including history, since you can just run parsecvs on the TWiki RCS files to get Git), so that we can convert the [Portland State Aerospace Society wiki](http://psas.pdx.edu) (currently in Moin, but with much of its history in TWiki, and with many of its pages still in TWiki format using Jamey's TWiki format for MoinMoin).
 >
-> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[toc ]]`), and then using a modified [[!cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
+> Our scripts convert by way of HTML, using portions of the source wiki's code to render as HTML (with some additional code to do things like translate MoinMoin's `\[[TableOfContents]]` to ikiwiki's `\[[!toc ]]`), and then using a modified [[!cpan HTML::WikiConverter]] to turn this into markdown and ikiwiki.  This produces quite satisfactory results, apart from things that don't have any markdown equivalent and thus remain HTML, such as tables and definition lists.  Conversion of the history occurs by first using another script we wrote to translate MoinMoin history to Git, then using our git-map script to map a transformation over the Git history.
 >
 > We will post the scripts as soon as we have them complete enough to convert our wikis.
 >

diff --git a/doc/tags.mdwn b/doc/tags.mdwn
index a210df09c563cecd94322e33dc6a513d8e5d3433..4fc98bdbf200cd6992e10f8b28cdcd40950bc998 100644 (file)
--- a/doc/tags.mdwn
+++ b/doc/tags.mdwn
@@ -9,11 +9,11 @@ special link that ikiwiki knows is intended to be used as a tag.
 Generally you will tag a page without putting a visible link on it.
 The [[tag_plugin|plugins/tag]] allows you to do so, like this:
 
-       \[[tag mytag othertag thirdtag]]
+       \[[!tag mytag othertag thirdtag]]
 
 You can also tag a page with a visible link:
 
-       \[[taglink mytag]]
+       \[[!taglink mytag]]
 
 This tag will be displayed just like a regular [[ikiwiki/WikiLink]].
 

diff --git a/doc/tags/discussion.mdwn b/doc/tags/discussion.mdwn
index a45ecf6e262fff7eb2f938304dd7a201943b5d77..d7a6297c0cb9735041f4d4670dc9bd85bbfab15a 100644 (file)
--- a/doc/tags/discussion.mdwn
+++ b/doc/tags/discussion.mdwn
@@ -1,6 +1,6 @@
 In another blog, I could tag a post with arbitrary words and not have to do
 anything else for the software to recognize it as a tag.  In Ikiwiki if you
-want to tag something \[[tag foo]] you also have to go to tags/ and create
+want to tag something \[[!tag foo]] you also have to go to tags/ and create
 foo.mkdn (even if it's zero-length), because "tags are links", and links
 don't actually *link* if they have no destination.  This allows for
 customization of how you present different tag feeds, but this (to me) is

diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
index 665c695d20d92926c067371ef8c329ca7af33eac..ea7835b33ae9b4ba7b8d720ec921de197a927fea 100644 (file)
--- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
+++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
@@ -137,7 +137,7 @@ etc, to document different stages of
 their lifecycle. A developer can take ownership of a
 bug by tagging it with something like "owner/Joey".
 
-To tag a wiki page, edit it and add text such as "\[[tag done]]". Note that
+To tag a wiki page, edit it and add text such as "\[[!tag done]]". Note that
 adding a wiki link to "\[[done]]" will have the same categorisation effect
 as a tag, but the link will show up in the body of the page, which is a
 nice effect if used in a sentence such as "This was \[[done]] in version
@@ -155,23 +155,23 @@ be inlined into a given page. A few examples:
 * A typical list of all open bugs, with their full text, and a form to post new
   bugs.
 
-        \[[inline pages="bugs/* and !link(done) and !*/Discussion" actions=yes postform=yes show=0]]
+        \[[!inline pages="bugs/* and !link(done) and !*/Discussion" actions=yes postform=yes show=0]]
 
 * Index of the 30 most recently fixed bugs.
 
-        \[[inline pages="bugs/* and link(done) and !*/Discussion" sort=mtime show=30 archive=yes]]
+        \[[!inline pages="bugs/* and link(done) and !*/Discussion" sort=mtime show=30 archive=yes]]
 
 * Index of the 10 most recently active bugs.
 
-        \[[inline pages="bugs/* and !link(done) and !*/Discussion" sort=mtime show=10]]
+        \[[!inline pages="bugs/* and !link(done) and !*/Discussion" sort=mtime show=10]]
 
 * Open security issues.
 
-        \[[inline pages="bugs/* and link(security) and !link(done) and !*/Discussion"]]
+        \[[!inline pages="bugs/* and link(security) and !link(done) and !*/Discussion"]]
 
 * Full text of bugs assigned to Joey.
 
-        \[[inline pages="bugs/* and link(owner/Joey) and !link(done) and !*/Discussion" show=0]]
+        \[[!inline pages="bugs/* and link(owner/Joey) and !link(done) and !*/Discussion" show=0]]
 
 It may seem strange to consider using a wiki for issue tracking when there
 are several dedicated bug tracking systems, like Bugzilla, that handle all