From 47d179802d5f78365fa7077ae64de35f2892a1e4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 21 Jul 2008 12:32:31 +0100 Subject: Migrate everything else via prefix_directives This is a partial commit of: egrep -rl '\[\[[a-z]+ ' doc | xargs --max-args 1 ./ikiwiki-transition prefix_directives --- doc/examples/blog/index.mdwn | 6 +++--- doc/examples/blog/posts.mdwn | 2 +- doc/examples/blog/posts/first_post.mdwn | 2 +- doc/examples/blog/sidebar.mdwn | 2 +- doc/examples/blog/tags.mdwn | 2 +- doc/examples/blog/tags/life.mdwn | 2 +- doc/examples/blog/tags/tech.mdwn | 2 +- doc/examples/softwaresite/bugs.mdwn | 2 +- doc/examples/softwaresite/bugs/done.mdwn | 2 +- doc/examples/softwaresite/doc/faq.mdwn | 2 +- doc/examples/softwaresite/news.mdwn | 2 +- doc/examples/softwaresite/templates/release.mdwn | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index b0514d575..3b2d46027 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,12 +1,12 @@ -[[meta title="example blog"]] +[[!meta title="example blog"]] -[[pagestats pages="./tags/*"]] +[[!pagestats pages="./tags/*"]] Welcome to my blog. Have a look at the most recent posts below, or browse the tag cloud on the right. An archive of all [[posts]] is also available. -[[inline pages="./posts/* and !*/Discussion" show="10" +[[!inline pages="./posts/* and !*/Discussion" show="10" actions=yes rootpage="./posts"]] ---- diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn index 71eb9f1b1..4b2939120 100644 --- a/doc/examples/blog/posts.mdwn +++ b/doc/examples/blog/posts.mdwn @@ -1,3 +1,3 @@ Here is a full list of posts to my [[blog|index]]. -[[inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]] +[[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]] diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn index f8a698801..3d7174ae8 100644 --- a/doc/examples/blog/posts/first_post.mdwn +++ b/doc/examples/blog/posts/first_post.mdwn @@ -1,4 +1,4 @@ This is the first post to this example blog. To add new posts, just add files to the blog/posts/ subdirectory, or use the web form. -[[tag tags/tech]] +[[!tag tags/tech]] diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn index 19475d7c7..a9fac388e 100644 --- a/doc/examples/blog/sidebar.mdwn +++ b/doc/examples/blog/sidebar.mdwn @@ -4,4 +4,4 @@ Example sidebar * [[Archive|posts]] Categories: -[[map pages="./tags/* and !*/Discussion"]] +[[!map pages="./tags/* and !*/Discussion"]] diff --git a/doc/examples/blog/tags.mdwn b/doc/examples/blog/tags.mdwn index daf77549a..53cc8d368 100644 --- a/doc/examples/blog/tags.mdwn +++ b/doc/examples/blog/tags.mdwn @@ -1,3 +1,3 @@ -[[pagestats pages="./tags/*"]] +[[!pagestats pages="./tags/*"]] On the right you can see the tag cloud for this blog. diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn index 2f7a57379..ddc2e646c 100644 --- a/doc/examples/blog/tags/life.mdwn +++ b/doc/examples/blog/tags/life.mdwn @@ -1,4 +1,4 @@ This feed contains pages in the "life" category. -[[inline pages="link(tags/life) and ./posts/* and !*/Discussion" +[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion" show="10" actions=yes]] diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn index dff92f333..e811cac34 100644 --- a/doc/examples/blog/tags/tech.mdwn +++ b/doc/examples/blog/tags/tech.mdwn @@ -1,3 +1,3 @@ This feed contains pages in the "tech" category. -[[inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]] +[[!inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]] diff --git a/doc/examples/softwaresite/bugs.mdwn b/doc/examples/softwaresite/bugs.mdwn index ad8d6cdb4..46ead2b62 100644 --- a/doc/examples/softwaresite/bugs.mdwn +++ b/doc/examples/softwaresite/bugs.mdwn @@ -1,4 +1,4 @@ This is FooBar's bug list. Link bugs to [[bugs/done]] when done. -[[inline pages="./bugs/* and !./bugs/done and !link(done) +[[!inline pages="./bugs/* and !./bugs/done and !link(done) and !*/Discussion" actions=yes postform=yes show=0]] diff --git a/doc/examples/softwaresite/bugs/done.mdwn b/doc/examples/softwaresite/bugs/done.mdwn index af88c1c7c..ad332e2a2 100644 --- a/doc/examples/softwaresite/bugs/done.mdwn +++ b/doc/examples/softwaresite/bugs/done.mdwn @@ -1,3 +1,3 @@ recently fixed [[bugs]] -[[inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]] +[[!inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]] diff --git a/doc/examples/softwaresite/doc/faq.mdwn b/doc/examples/softwaresite/doc/faq.mdwn index 249c6f779..fe0c3eff0 100644 --- a/doc/examples/softwaresite/doc/faq.mdwn +++ b/doc/examples/softwaresite/doc/faq.mdwn @@ -1,6 +1,6 @@ FooBar frequently asked questions. -[[toc ]] +[[!toc ]] ## Is this a real program? diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn index 20642c203..9b53c7d99 100644 --- a/doc/examples/softwaresite/news.mdwn +++ b/doc/examples/softwaresite/news.mdwn @@ -2,4 +2,4 @@ This is where annoucements of new releases, features, and other news is posted. FooBar users are recommended to subscribe to this page's RSS feed. -[[inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]] +[[!inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]] diff --git a/doc/examples/softwaresite/templates/release.mdwn b/doc/examples/softwaresite/templates/release.mdwn index 759decb40..ac7ff93c7 100644 --- a/doc/examples/softwaresite/templates/release.mdwn +++ b/doc/examples/softwaresite/templates/release.mdwn @@ -3,5 +3,5 @@ -FooBar released with [[toggle text="these changes" id="changelog"]] -[[toggleable id="changelog" text=""""""]] +FooBar released with [[!toggle text="these changes" id="changelog"]] +[[!toggleable id="changelog" text=""""""]] -- cgit v1.2.3 From e3a84952715cdd625258e1695cb74898006c31f3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 21 Jul 2008 12:47:07 +0100 Subject: Migrate escaped directives (\[[) in the rest of doc to have \[[! prefix --- doc/examples/blog.mdwn | 2 +- doc/index/discussion.mdwn | 2 +- doc/tags.mdwn | 4 ++-- doc/tags/discussion.mdwn | 2 +- doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'doc/examples') diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 14e9b3804..3e89c4b99 100644 --- 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 f67321294..92fe8fa47 100644 --- 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 . 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 a210df09c..4fc98bdbf 100644 --- 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 a45ecf6e2..d7a6297c0 100644 --- 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 665c695d2..ea7835b33 100644 --- 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 -- cgit v1.2.3