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/TourBusStop.mdwn | 2 +- doc/bugs.mdwn | 2 +- doc/css.mdwn | 2 +- doc/css_market.mdwn | 14 +++++----- doc/download.mdwn | 2 +- 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 +-- doc/features.mdwn | 2 +- doc/forum.mdwn | 2 +- doc/freesoftware.mdwn | 2 +- doc/ikiwiki/wikilink/discussion.mdwn | 2 +- doc/index.mdwn | 4 +-- doc/index/discussion.mdwn | 4 +-- doc/install.mdwn | 4 +-- doc/news.mdwn | 2 +- doc/news/code_swarm.mdwn | 2 +- doc/news/ikiwiki_version_2.0.mdwn | 4 +-- doc/news/openid.mdwn | 2 +- doc/news/server_speed.mdwn | 2 +- doc/news/version_2.49.mdwn | 8 +++--- doc/news/version_2.50.mdwn | 4 +-- doc/news/version_2.51.mdwn | 4 +-- doc/news/version_2.52.mdwn | 4 +-- doc/news/version_2.53.mdwn | 4 +-- doc/patch.mdwn | 2 +- doc/plugins.mdwn | 4 +-- doc/rcs.mdwn | 4 +-- doc/rcs/details.mdwn | 2 +- doc/rcs/git.mdwn | 2 +- doc/rcs/tla.mdwn | 2 +- doc/sandbox.mdwn | 6 ++--- doc/sandbox/test_nested_inlines.mdwn | 2 +- doc/security.mdwn | 12 ++++----- doc/setup.mdwn | 30 +++++++++++----------- doc/sitemap.mdwn | 2 +- doc/soc.mdwn | 2 +- doc/soc/ideas.mdwn | 2 +- doc/templates/plugin.mdwn | 10 ++++---- doc/tips.mdwn | 2 +- doc/tips/inside_dot_ikiwiki.mdwn | 2 +- .../integrated_issue_tracking_with_ikiwiki.mdwn | 8 +++--- doc/todo.mdwn | 8 +++--- doc/users.mdwn | 2 +- doc/wishlist.mdwn | 2 +- 54 files changed, 107 insertions(+), 107 deletions(-) (limited to 'doc') diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn index 8276c0833..a78e4843a 100644 --- a/doc/TourBusStop.mdwn +++ b/doc/TourBusStop.mdwn @@ -19,7 +19,7 @@ Bus connections * Bus Nr. 02 - **Wiki Developers Tour** - next stop: [MeatballWiki TourBusStop](http://www.usemod.com/cgi-bin/mb.pl?TourBusStop) * Bus Nr. 42 - **Software Developers Tour** - next stop: [Ward's Wiki TourBusStop](http://c2.com/cgi/wiki?TourBusStop) -[[meatballwiki TourBusMap]] +[[!meatballwiki TourBusMap]] Famous sights to visit here at **ikiwiki** ========================================== diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn index 888685625..f634b6e78 100644 --- a/doc/bugs.mdwn +++ b/doc/bugs.mdwn @@ -3,7 +3,7 @@ elsewhere. Link items to [[bugs/done]] when done. Also see the [Debian bugs](http://bugs.debian.org/ikiwiki). -[[inline pages="bugs/* and !bugs/done and !bugs/discussion and +[[!inline pages="bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" feedpages="created_after(bugs/no_commit_mails_for_new_pages)" actions=yes rootpage="bugs" postformtext="Add a new bug titled:" show=0]] diff --git a/doc/css.mdwn b/doc/css.mdwn index bb3c15f51..5b6b9e1af 100644 --- a/doc/css.mdwn +++ b/doc/css.mdwn @@ -1,4 +1,4 @@ -[[meta title="CSS"]] +[[!meta title="CSS"]] ## Using CSS with ikiwiki diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn index 00ad9cf13..4afc6dd83 100644 --- a/doc/css_market.mdwn +++ b/doc/css_market.mdwn @@ -1,4 +1,4 @@ -[[meta title="CSS Market"]] +[[!meta title="CSS Market"]] User contributed stylesheet files for ikiwiki. Feel free to add your own stylesheets here. (Upload as wiki pages; wiki gnomes will convert them to css @@ -7,18 +7,18 @@ files..) * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]], customized mostly for *blogging purposes*, can be seen in action on [zack's blog](http://www.bononia.it/~zack/blog/) - [[meta stylesheet="zack"]] + [[!meta stylesheet="zack"]] * **[[css_market/kirkambar.css]]**, contributed by [[Roktas]]. This far from perfect stylesheet follows a [Gitweb](http://www.kernel.org/git/?p=git/git.git;a=tree;f=gitweb) like theme, so it may provide a consistent look'n feel along with the [[rcs/git]] backend. ;-) You can see it in action on [kirkambar](http://kirkambar.net/) (Turkish content). - [[meta stylesheet="kirkambar"]] + [[!meta stylesheet="kirkambar"]] * **[[css_market/embeddedmoose.css]]**, contributed by [[JoshTriplett]]. Designed for [Embedded Moose](http://embeddedmoose.com). Some ideas from the Debian lighttpd index.html page. - [[meta stylesheet="embeddedmoose"]] + [[!meta stylesheet="embeddedmoose"]] * **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template designed by [styleshout](http://www.styleshout.com). @@ -34,18 +34,18 @@ files..) **[[css_market/02_Template.tmpl]]**. If you prefer [my header image](http://martin.wuertele.net/images/header.png) you can use it under the terms of the MIT License (see png comment). - [[meta stylesheet="02_Template"]] + [[!meta stylesheet="02_Template"]] * **[[css_market/cstamas.css]]**, contributed by [[cstamas]]. This one is based on embeddedmoose, however it is slightly different now. [My webpage's](http://users.itk.ppke.hu/~cstamas/tag/english) is not the same. You can grab some pictures used as background patterns from there. - [[meta stylesheet="cstamas"]] + [[!meta stylesheet="cstamas"]] * **[[css_market/bma.css]]**, contributed by [bma](http://subvert.org.uk/~bma/). Not quite the same as I use on my site, since that has slightly modified templates. - [[meta stylesheet="bma"]] + [[!meta stylesheet="bma"]] If your web browser allows selecting between multiple stylesheets, this page can be viewed using many of the stylesheets above. For example, if diff --git a/doc/download.mdwn b/doc/download.mdwn index 95c48b456..e35cc0a45 100644 --- a/doc/download.mdwn +++ b/doc/download.mdwn @@ -11,7 +11,7 @@ Installation steps and requirements are listed on the [[install]] page. ## packages To install with apt, if using Debian (since 4.0), or Ubuntu (since 6.10): -[[template id=note text=""" +[[!template id=note text=""" Note that Debian 4.0 and especially Ubuntu 6.10 contain older versions of ikiwiki, there have been lots of enhancements and bug fixes since those versions. 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=""""""]] diff --git a/doc/features.mdwn b/doc/features.mdwn index df963ab4f..c6fc95c0b 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -1,5 +1,5 @@ An overview of some of ikiwiki's features: -[[toc ]] +[[!toc ]] ## Uses a real RCS diff --git a/doc/forum.mdwn b/doc/forum.mdwn index cced9636b..bab65cac6 100644 --- a/doc/forum.mdwn +++ b/doc/forum.mdwn @@ -4,5 +4,5 @@ _This is a bold experiment by me, since I have exactly such a question. This ove ## Current topics ## -[[inline pages="forum/* and !forum/discussion and !forum/*/*" +[[!inline pages="forum/* and !forum/discussion and !forum/*/*" actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=0]] diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn index 653c2fe82..7ac1ac6b4 100644 --- a/doc/freesoftware.mdwn +++ b/doc/freesoftware.mdwn @@ -1,4 +1,4 @@ -[[meta title="Free Software"]] +[[!meta title="Free Software"]] ikiwiki, and this documentation wiki, are licensed under the terms of the GNU [[GPL]], version 2 or later. diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn index fa3ac8604..e69fcb31b 100644 --- a/doc/ikiwiki/wikilink/discussion.mdwn +++ b/doc/ikiwiki/wikilink/discussion.mdwn @@ -17,7 +17,7 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example > [[preprocessor_directive|preprocessordirective]] for it, though. > --[[JoshTriplett]] ->> [[tag wishlist]] +>> [[!tag wishlist]] >> I'd like to implement such a thing. Joey, what is this supposed to look like? >> `\[[anchor WHATEVER]]`? --[[tschwinge]] diff --git a/doc/index.mdwn b/doc/index.mdwn index 1a416d798..b1cd2fbec 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -4,7 +4,7 @@ suitable for publishing on a website. Ikiwiki stores pages and history in a There are many other [[features]], including support for [[blogging|ikiwiki/blog]], as well as a large array of [[plugins]]. -[[template id=links]] +[[!template id=links]] ## using ikiwiki @@ -15,7 +15,7 @@ with ikiwiki, and some [[tips]]. All wikis are supposed to have a [[SandBox]], so this one does too. This site generally runs the latest release of ikiwiki; currently, it runs -ikiwiki [[version ]]. +ikiwiki [[!version ]]. ## developer resources diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index f851643e3..f67321294 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -5,7 +5,7 @@ Do so here.. Note that for more formal bug reports or todo items, you can also edit the [[bugs]] and [[todo]] pages. -[[toc ]] +[[!toc ]] # Installation/Setup questions @@ -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/install.mdwn b/doc/install.mdwn index bd8c4b881..d745737aa 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -11,8 +11,8 @@ Ikiwiki is a perl program, and needs a recent version of perl such as It's recommended you have a C compiler, as ikiwiki uses one to build wrappers. -Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]], -[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]] +Ikiwiki requires the [[!cpan Text::Markdown]], [[!cpan URI]], +[[!cpan HTML::Parser]], [[!cpan HTML::Template]], and [[!cpan HTML::Scrubber]] perl modules be installed. It can also use a lot of other perl modules, if they are available. diff --git a/doc/news.mdwn b/doc/news.mdwn index 5d0ab87c6..58413f94c 100644 --- a/doc/news.mdwn +++ b/doc/news.mdwn @@ -2,7 +2,7 @@ This is where announcements of new releases, features, and other news are posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS feed. -[[inline pages="news/* and !news/*/* and !news/discussion" +[[!inline pages="news/* and !news/*/* and !news/discussion" feedpages="created_after(news/Article_on_Ikiwiki_as_a_BTS)" rootpage="news" show="30"]] By the way, some other pages with RSS feeds about ikiwiki include diff --git a/doc/news/code_swarm.mdwn b/doc/news/code_swarm.mdwn index 5302d626b..bdc373432 100644 --- a/doc/news/code_swarm.mdwn +++ b/doc/news/code_swarm.mdwn @@ -1,7 +1,7 @@ I've produced a [code_swarm](http://vis.cs.ucdavis.edu/~ogawa/codeswarm/) visualization of the first 2+ years of ikiwiki's commit history. -[[img screenshot.png size="480x360"]] +[[!img screenshot.png size="480x360"]] * [15 mb avi](http://kitenet.net/~joey/screencasts/ikiwiki_swarm.avi) * [stream on vimeo](http://vimeo.com/1324348) diff --git a/doc/news/ikiwiki_version_2.0.mdwn b/doc/news/ikiwiki_version_2.0.mdwn index 248b21783..e6723c873 100644 --- a/doc/news/ikiwiki_version_2.0.mdwn +++ b/doc/news/ikiwiki_version_2.0.mdwn @@ -9,7 +9,7 @@ default configuration: the procedure described at [[tips/switching_to_usedirs]] or edit your setup file to turn `usedirs` off: `usedirs => 0,` * [[plugins/OpenID]] logins are now enabled by default, if the - [[cpan Net::OpenID::Consumer]] perl module is available. Password logins + [[!cpan Net::OpenID::Consumer]] perl module is available. Password logins are also still enabled by default. If you like, you can turn either OpenID or password logins off via the `disable_plugins` setting. @@ -29,4 +29,4 @@ An overview of changes in the year since the 1.0 release: * Some support for other markup languages than markdown: rst, textile. * Unit test suite, with more than 300 tests. -[[meta date="2007-04-30 00:51:57 -0400"]] +[[!meta date="2007-04-30 00:51:57 -0400"]] diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index c81145fcf..ad76606aa 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]] +[[!poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]] diff --git a/doc/news/server_speed.mdwn b/doc/news/server_speed.mdwn index 181edd0c7..67651f2cf 100644 --- a/doc/news/server_speed.mdwn +++ b/doc/news/server_speed.mdwn @@ -1,7 +1,7 @@ Quick poll: Do you feel that ikiwiki is fast enough on this server, or should I move it to my much beefier auxiliary server? -[[poll open=no 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]] +[[!poll open=no 40 "It's fast enough" 6 "It's too slow!" 4 "No opinion"]] If you have specifics on performance issues, you might mention them on the [[discussion]] page. diff --git a/doc/news/version_2.49.mdwn b/doc/news/version_2.49.mdwn index 4c95b50dd..37cf6b7ba 100644 --- a/doc/news/version_2.49.mdwn +++ b/doc/news/version_2.49.mdwn @@ -1,8 +1,8 @@ News for ikiwiki 2.49: The search plugin no longer uses hyperestraier. Instead, to use it you - will now need to install xapian-omega, and the [[cpan Search::Xapian]], - [[cpan HTML::Scrubber]], and [[cpan Digest::SHA1]] perl modules. Ie, + will now need to install xapian-omega, and the [[!cpan Search::Xapian]], + [[!cpan HTML::Scrubber]], and [[!cpan Digest::SHA1]] perl modules. Ie, `apt-get install xapian-omega libsearch-xapian-perl libhtml-scrubber-perl libdigest-sha1-perl` Also, wikis that use the search plugin will need to be rebuilt, @@ -10,8 +10,8 @@ News for ikiwiki 2.49: but can be done by running `ikiwiki-mass-upgrade` as root, or running `ikiwiki -setup` on individual setup files. -ikiwiki 2.49 released with [[toggle text="these changes"]] -[[toggleable text=""" +ikiwiki 2.49 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * haiku: Generate valid xhtml. * ikiwiki-mass-rebuild: Don't trust $! when setting $) * inline: The optimisation in 2.41 broke nested inlines. Detect those diff --git a/doc/news/version_2.50.mdwn b/doc/news/version_2.50.mdwn index 4863ee256..2c26b27da 100644 --- a/doc/news/version_2.50.mdwn +++ b/doc/news/version_2.50.mdwn @@ -1,5 +1,5 @@ -ikiwiki 2.50 released with [[toggle text="these changes"]] -[[toggleable text=""" +ikiwiki 2.50 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * img: Support captions. * img: Don't generate empty title attributes, etc. * img: Allow setting defaults for class and id too. diff --git a/doc/news/version_2.51.mdwn b/doc/news/version_2.51.mdwn index a139d6eb2..87d742ba4 100644 --- a/doc/news/version_2.51.mdwn +++ b/doc/news/version_2.51.mdwn @@ -1,5 +1,5 @@ -ikiwiki 2.51 released with [[toggle text="these changes"]] -[[toggleable text=""" +ikiwiki 2.51 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * Improve toplevel parentlink to link directly to index.html when usedirs is disabled. * map: Add a "show" parameter. "show=title" can be used to display page diff --git a/doc/news/version_2.52.mdwn b/doc/news/version_2.52.mdwn index 3bdd12fca..5c9d79959 100644 --- a/doc/news/version_2.52.mdwn +++ b/doc/news/version_2.52.mdwn @@ -4,8 +4,8 @@ News for ikiwiki 2.52: wiki in /etc/ikiwiki/wikilist this will be done automatically when the Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. -ikiwiki 2.52 released with [[toggle text="these changes"]] -[[toggleable text=""" +ikiwiki 2.52 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * attachment: New plugin for uploading and managing attachments. This includes a fairly powerful PageSpec based admin pref for deciding whether to accept a given upload, and an attachment management interface diff --git a/doc/news/version_2.53.mdwn b/doc/news/version_2.53.mdwn index 889547ca2..b55773f13 100644 --- a/doc/news/version_2.53.mdwn +++ b/doc/news/version_2.53.mdwn @@ -1,5 +1,5 @@ -ikiwiki 2.53 released with [[toggle text="these changes"]] -[[toggleable text=""" +ikiwiki 2.53 released with [[!toggle text="these changes"]] +[[!toggleable text=""" * search: generate configuration files once only when rebuilding (Gabriel McManus) * attachment: Fix an uninitialised value warning when editing a page diff --git a/doc/patch.mdwn b/doc/patch.mdwn index ca1620225..b570d995c 100644 --- a/doc/patch.mdwn +++ b/doc/patch.mdwn @@ -7,5 +7,5 @@ once it's ready to be applied, add a 'patch' tag so it will show up here. If your patch is non-trivial and might need several iterations to get right, please consider publishing a [[git]] branch. -[[inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and +[[!inline pages="(todo/* or bugs/*) and link(patch) and !link(bugs/done) and !link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]] diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn index 439cecc8a..5ee2bae89 100644 --- a/doc/plugins.mdwn +++ b/doc/plugins.mdwn @@ -1,7 +1,7 @@ Most of ikiwiki's [[features]] are implemented as plugins. Many of these plugins are included with ikiwiki. -[[pagestats pages="plugins/type/* and !plugins/type/slow"]] +[[!pagestats pages="plugins/type/* and !plugins/type/slow"]] There's documentation if you want to [[write]] your own plugins, or you can [[install]] plugins [[contributed|contrib]] by others. @@ -13,7 +13,7 @@ will fit most uses of ikiwiki. ## Plugin directory -[[inline pages="plugins/* and !plugins/type/* and !plugins/write and +[[!inline pages="plugins/* and !plugins/type/* and !plugins/write and !plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion" feedpages="created_after(plugins/graphviz)" archive="yes" rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]] diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index a6f3849f4..f66b85495 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -1,4 +1,4 @@ -[[meta title="Revision Control Systems"]] +[[!meta title="Revision Control Systems"]] Ikiwiki supports using several revision control systems for storing page histories. @@ -10,7 +10,7 @@ generic that it can be adapted to work with many systems by writing a [[git]] is another well-tested option. These are all the supported revision control systems: -[[inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]] +[[!inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]] There is a page with [[details]] about how the different systems work with ikiwiki, for the curious. diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index a6174f439..9bf65762f 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -1,6 +1,6 @@ A few bits about the RCS backends -[[toc ]] +[[!toc ]] ## Terminology diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 74402e155..98daf66da 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -1,4 +1,4 @@ -[[meta title="Git"]] +[[!meta title="Git"]] [Git][git] is a distributed revison control system originally developed for the Linux kernel. Ikiwiki supports storing a wiki in git. diff --git a/doc/rcs/tla.mdwn b/doc/rcs/tla.mdwn index cafd9b49b..cad5d51f4 100644 --- a/doc/rcs/tla.mdwn +++ b/doc/rcs/tla.mdwn @@ -7,4 +7,4 @@ come in. When running as a [[cgi]] with tla, ikiwiki automatically commits edited pages to the Arch repostory, and uses the Arch log to generate the [[RecentChanges]] page. -Note that the tla support needs the [[cpan MailTools]] perl module. +Note that the tla support needs the [[!cpan MailTools]] perl module. diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 5c7368fc3..63537bcc2 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -55,8 +55,8 @@ Bulleted list ---- -[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]] -[[haiku hint="sandbox play"]] +[[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]] +[[!haiku hint="sandbox play"]] ---- @@ -78,4 +78,4 @@ The haiku will change after every save, mind you. This sandbox is also a [[ikiwiki/blog]]! -[[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] +[[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] diff --git a/doc/sandbox/test_nested_inlines.mdwn b/doc/sandbox/test_nested_inlines.mdwn index e8ef805c9..0e6074fbd 100644 --- a/doc/sandbox/test_nested_inlines.mdwn +++ b/doc/sandbox/test_nested_inlines.mdwn @@ -1,3 +1,3 @@ Testing nested inlines: -[[inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]] +[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]] diff --git a/doc/security.mdwn b/doc/security.mdwn index 52ef486e6..498d2b4e7 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -6,7 +6,7 @@ security issues with this program than with cat(1). If, however, you let others edit pages in your wiki, then some possible security issues do need to be kept in mind. -[[toc levels=2]] +[[!toc levels=2]] ---- @@ -362,9 +362,9 @@ allow the security hole to be exploited. The htmlscrubber did not block javascript in uris. This was fixed by adding a whitelist of valid uri types, which does not include javascript. -([[cve CVE-2008-0809]]) Some urls specifyable by the meta plugin could also +([[!cve CVE-2008-0809]]) Some urls specifyable by the meta plugin could also theoretically have been used to inject javascript; this was also blocked -([[cve CVE-2008-0808]]). +([[!cve CVE-2008-0808]]). This hole was discovered on 10 February 2008 and fixed the same day with the release of ikiwiki 2.31.1. (And a few subsequent versions..) @@ -377,7 +377,7 @@ parties. Cross Site Request Forging could be used to constuct a link that would change a logged-in user's password or other preferences if they clicked on the link. It could also be used to construct a link that would cause a wiki -page to be modified by a logged-in user. ([[cve CVE-2008-0165]]) +page to be modified by a logged-in user. ([[!cve CVE-2008-0165]]) These holes were discovered on 10 April 2008 and fixed the same day with the release of ikiwiki 2.42. A fix was also backported to Debian etch, as @@ -391,7 +391,7 @@ pre-emtively guard against that, current versions of ikiwiki store password hashes (using Eksblowfish). If you use the [[plugins/passwordauth]] plugin, I recommend upgrading to -ikiwiki 2.48, installing the [[cpan Authen::Passphrase]] perl module, and running +ikiwiki 2.48, installing the [[!cpan Authen::Passphrase]] perl module, and running `ikiwiki-transition hashpassword` to replace all existing cleartext passwords with strong blowfish hashes. @@ -404,7 +404,7 @@ passwords in cleartext over the net to log in, either. This hole allowed ikiwiki to accept logins using empty passwords, to openid accounts that didn't use a password. It was introduced in version 1.34, and fixed in version 2.48. The [bug](http://bugs.debian.org/483770) was -discovered on 30 May 2008 and fixed the same day. ([[cve CVE-2008-0169]]) +discovered on 30 May 2008 and fixed the same day. ([[!cve CVE-2008-0169]]) I recommend upgrading to 2.48 immediatly if your wiki allows both password and openid logins. diff --git a/doc/setup.mdwn b/doc/setup.mdwn index ed15da274..174d6ceb9 100644 --- a/doc/setup.mdwn +++ b/doc/setup.mdwn @@ -1,6 +1,6 @@ This tutorial will walk you through setting up a wiki with ikiwiki. -[[toc ]] +[[!toc ]] ## [[Download]] and [[install]] ikiwiki. @@ -32,8 +32,8 @@ This will create a simple main page for the wiki. $EDITOR index.mdwn In the editor, you could start by entering a simple page like -[[toggle id=page text="this one"]]. -[[toggleable id=page text=""" +[[!toggle id=page text="this one"]]. +[[!toggleable id=page text=""" Welcome to your new wiki. All wikis are supposed to have a \[[SandBox]], @@ -116,14 +116,14 @@ should be preserved, but not checked into revision control. The new [[ikiwiki-makerepo]] command automates setting up a wiki in revision control. -[[toggle id=subversion text="Subversion"]] -[[toggleable id=subversion text=""" +[[!toggle id=subversion text="Subversion"]] +[[!toggleable id=subversion text=""" REPOSITORY=~/wikirepo ikiwiki-makerepo svn $SRCDIR $REPOSITORY """]] -[[toggle id=git text="Git"]] -[[toggleable id=git text=""" +[[!toggle id=git text="Git"]] +[[!toggleable id=git text=""" REPOSITORY=~/wiki.git ikiwiki-makerepo git $SRCDIR $REPOSITORY @@ -132,20 +132,20 @@ ikiwiki uses git repositories, and some important caveats about using the git repositories. """]] -[[toggle id=mercurial text="Mercurial"]] -[[toggleable id=mercurial text=""" +[[!toggle id=mercurial text="Mercurial"]] +[[!toggleable id=mercurial text=""" REPOSITORY=$SRCDIR ikiwiki-makerepo mercurial $SRCDIR """]] -[[toggle id=bazaar text="Bazaar"]] -[[toggleable id=bazaar text=""" +[[!toggle id=bazaar text="Bazaar"]] +[[!toggleable id=bazaar text=""" REPOSITORY=$SRCDIR ikiwiki-makerepo bzr $SRCDIR """]] -[[toggle id=tla text="TLA"]] -[[toggleable id=tla text=""" +[[!toggle id=tla text="TLA"]] +[[!toggleable id=tla text=""" REPOSITORY=~/wikirepo tla make-archive me@localhost--wiki $REPOSITORY tla my-id "" @@ -158,8 +158,8 @@ about using the git repositories. tla import """]] -[[toggle id=monotone text="Monotone"]] -[[toggleable id=monotone text=""" +[[!toggle id=monotone text="Monotone"]] +[[!toggleable id=monotone text=""" # These instructions are standard instructions to import a directory into monotone # and set it up so that you don't need any passwords to use it REPOSITORY=~/.ikiwiki/mtn.db diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index 836ccdb9a..3c11ed423 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -1,6 +1,6 @@ This map excludes discussion pages, as well as subpages that are in feeds. -[[map pages="* and !*/discussion and !recentchanges +[[!map pages="* and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* and !sandbox/* and !todo/* and !users/* and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] diff --git a/doc/soc.mdwn b/doc/soc.mdwn index fffb5bed4..e05543bd5 100644 --- a/doc/soc.mdwn +++ b/doc/soc.mdwn @@ -1,4 +1,4 @@ -[[meta title="Summer of Code"]] +[[!meta title="Summer of Code"]] This page includes information about ikiwiki's involvement in [Google Summer of Code](http://code.google.com/soc/). diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn index 870f2ca9b..88f06b0f1 100644 --- a/doc/soc/ideas.mdwn +++ b/doc/soc/ideas.mdwn @@ -3,6 +3,6 @@ have a great idea for an ikiwiki project not on this list, please file it as a todo item, and ask us if it might work as a Summer of Code project, but please don't add the `soc` tag yourself. -[[inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and +[[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and !link(todo/done) and !bugs/done and !link(bugs/done) and !*/Discussion" actions=yes show=0]] diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn index d29e721a9..c1d1974d6 100644 --- a/doc/templates/plugin.mdwn +++ b/doc/templates/plugin.mdwn @@ -1,13 +1,13 @@ Plugin:
Author:
-Included in ikiwiki: [[if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]
+Included in ikiwiki: [[!if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]
Enabled by default: yesno
-Included in [[/plugins/goodstuff]]: [[if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]
-Currently enabled: [[if test="enabled()" then="yes" else="no"]]
+Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]
+Currently enabled: [[!if test="enabled()" then="yes" else="no"]]
 -[[if test="sourcepage(plugins/contrib/*)" then="""[[meta title=" (third party plugin)"]]"""]] -[[tag plugins/type/core]] +[[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title=" (third party plugin)"]]"""]] +[[!tag plugins/type/core]] This template is used to create an infobox for an ikiwiki plugin. It uses these parameters: diff --git a/doc/tips.mdwn b/doc/tips.mdwn index f0eb43f0c..53f966001 100644 --- a/doc/tips.mdwn +++ b/doc/tips.mdwn @@ -1,5 +1,5 @@ This page is a place to document tips and techniques for using ikiwiki. -[[inline pages="tips/* and !tips/*/*" +[[!inline pages="tips/* and !tips/*/*" feedpages="created_after(tips/howto_avoid_flooding_aggregators)" archive="yes" rootpage="tips" postformtext="Add a new tip about:" show=0]] diff --git a/doc/tips/inside_dot_ikiwiki.mdwn b/doc/tips/inside_dot_ikiwiki.mdwn index 268910ebc..b649636dc 100644 --- a/doc/tips/inside_dot_ikiwiki.mdwn +++ b/doc/tips/inside_dot_ikiwiki.mdwn @@ -1,4 +1,4 @@ -[[meta title="inside .ikiwiki"]] +[[!meta title="inside .ikiwiki"]] The `.ikiwiki` directory contains ikiwiki's internal state. Normally, you don't need to look in it, but here's some tips for how to do so if diff --git a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn index 8331c9ad9..665c695d2 100644 --- a/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn +++ b/doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn @@ -1,14 +1,14 @@ -[[meta title="Integrated issue tracking with Ikiwiki"]] +[[!meta title="Integrated issue tracking with Ikiwiki"]] -[[meta author="Joey Hess, LinuxWorld.com"]] +[[!meta author="Joey Hess, LinuxWorld.com"]] -[[meta copyright=""" +[[!meta copyright=""" Copyright 2007 Joey Hess , LinuxWorld.com [First published](http://www.linuxworld.com/news/2007/040607-integrated-issue-tracking-ikiwiki.html) on [LinuxWorld.com](http://www.linuxworld.com/), a publication of Network World Inc., 118 Turnpike Rd., Southboro, MA 01772. """]] -[[meta license="[[GPL|freesoftware]]"]] +[[!meta license="[[GPL|freesoftware]]"]] Wikis are not just for encyclopedias and websites anymore. You can use Ikiwiki in combination with your revision control system to handle issue diff --git a/doc/todo.mdwn b/doc/todo.mdwn index 851b4d6b3..75314c75b 100644 --- a/doc/todo.mdwn +++ b/doc/todo.mdwn @@ -3,19 +3,19 @@ as any [[patches|patch]]. If it seems more like a bug in the existing code, post it to [[bugs]] instead. Link items to [[todo/done]] when done. -[[inline pages="todo/* and !todo/done and !link(todo/done) and +[[!inline pages="todo/* and !todo/done and !link(todo/done) and !link(patch) and !link(wishlist) and !todo/*/*" feedpages="created_after(todo/supporting_comments_via_disussion_pages)" actions=yes archive=yes rootpage="todo" postformtext="Add a new todo item titled:" show=0]] diff --git a/doc/users.mdwn b/doc/users.mdwn index 5121dd90c..cc3cf5268 100644 --- a/doc/users.mdwn +++ b/doc/users.mdwn @@ -6,6 +6,6 @@ comments. List of users ============= -[[inline pages="users/* and !users/*/* and !*/Discussion" +[[!inline pages="users/* and !users/*/* and !*/Discussion" feeds=no archive=yes sort=title template=titlepage rootpage="users" postformtext="Add yourself as an ikiwiki user:"]] diff --git a/doc/wishlist.mdwn b/doc/wishlist.mdwn index fb25acb0b..627503760 100644 --- a/doc/wishlist.mdwn +++ b/doc/wishlist.mdwn @@ -2,5 +2,5 @@ These [[todo]] tagged 'wishlist' encompass all kinds of features and improvements people would like to see in ikiwiki. Good patches for any of these will likely be accepted. -[[inline pages="todo/* and !todo/done and !link(todo/done) and +[[!inline pages="todo/* and !todo/done and !link(todo/done) and link(wishlist) and !link(patch) and !todo/*/*" archive=yes show=0]] -- cgit v1.2.3