urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Simon McVittie 2008-07-21 12:32:31 +01:00
parent 121d0f3456
commit 47d179802d
54 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/TourBusStop.mdwn
View File

@ -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. 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) * 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** Famous sights to visit here at **ikiwiki**
========================================== ==========================================

2
doc/bugs.mdwn
View File

@ -3,7 +3,7 @@ elsewhere. Link items to [[bugs/done]] when done.
Also see the [Debian bugs](http://bugs.debian.org/ikiwiki). 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/*/*" !link(patch) and !link(bugs/done) and !bugs/*/*"
feedpages="created_after(bugs/no_commit_mails_for_new_pages)" feedpages="created_after(bugs/no_commit_mails_for_new_pages)"
actions=yes rootpage="bugs" postformtext="Add a new bug titled:" show=0]] actions=yes rootpage="bugs" postformtext="Add a new bug titled:" show=0]]

2
doc/css.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="CSS"]] [[!meta title="CSS"]]
## Using CSS with ikiwiki ## Using CSS with ikiwiki

14
doc/css_market.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="CSS Market"]] [[!meta title="CSS Market"]]
User contributed stylesheet files for ikiwiki. Feel free to add your own 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 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]], * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]],
customized mostly for *blogging purposes*, can be seen in action on customized mostly for *blogging purposes*, can be seen in action on
[zack's blog](http://www.bononia.it/~zack/blog/) [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 * **[[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) 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. ;-) 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). 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]]. * **[[css_market/embeddedmoose.css]]**, contributed by [[JoshTriplett]].
Designed for [Embedded Moose](http://embeddedmoose.com). Some ideas from the Designed for [Embedded Moose](http://embeddedmoose.com). Some ideas from the
Debian lighttpd index.html page. Debian lighttpd index.html page.
[[meta stylesheet="embeddedmoose"]] [[!meta stylesheet="embeddedmoose"]]
* **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template * **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template
designed by [styleshout](http://www.styleshout.com). designed by [styleshout](http://www.styleshout.com).
@ -34,18 +34,18 @@ files..)
**[[css_market/02_Template.tmpl]]**. If you prefer **[[css_market/02_Template.tmpl]]**. If you prefer
[my header image](http://martin.wuertele.net/images/header.png) you can [my header image](http://martin.wuertele.net/images/header.png) you can
use it under the terms of the MIT License (see png comment). 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]]. * **[[css_market/cstamas.css]]**, contributed by [[cstamas]].
This one is based on embeddedmoose, however it is slightly different now. 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. [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. 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/). * **[[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 Not quite the same as I use on my site, since that has slightly modified
templates. templates.
[[meta stylesheet="bma"]] [[!meta stylesheet="bma"]]
If your web browser allows selecting between multiple stylesheets, this If your web browser allows selecting between multiple stylesheets, this
page can be viewed using many of the stylesheets above. For example, if page can be viewed using many of the stylesheets above. For example, if

2
doc/download.mdwn
View File

@ -11,7 +11,7 @@ Installation steps and requirements are listed on the [[install]] page.
## packages ## packages
To install with apt, if using Debian (since 4.0), or Ubuntu (since 6.10): 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 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 ikiwiki, there have been lots of enhancements and bug fixes since those
versions. versions.

6
doc/examples/blog/index.mdwn
View File

@ -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 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 browse the tag cloud on the right. An archive of all [[posts]] is also
available. available.
[[inline pages="./posts/* and !*/Discussion" show="10" [[!inline pages="./posts/* and !*/Discussion" show="10"
actions=yes rootpage="./posts"]] actions=yes rootpage="./posts"]]
---- ----

2
doc/examples/blog/posts.mdwn
View File

@ -1,3 +1,3 @@
Here is a full list of posts to my [[blog|index]]. 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]]

2
doc/examples/blog/posts/first_post.mdwn
View File

@ -1,4 +1,4 @@
This is the first post to this example blog. To add new posts, just add 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. files to the blog/posts/ subdirectory, or use the web form.
[[tag tags/tech]] [[!tag tags/tech]]

2
doc/examples/blog/sidebar.mdwn
View File

@ -4,4 +4,4 @@ Example sidebar
* [[Archive|posts]] * [[Archive|posts]]
Categories: Categories:
[[map pages="./tags/* and !*/Discussion"]] [[!map pages="./tags/* and !*/Discussion"]]

2
doc/examples/blog/tags.mdwn
View File

@ -1,3 +1,3 @@
[[pagestats pages="./tags/*"]] [[!pagestats pages="./tags/*"]]
On the right you can see the tag cloud for this blog. On the right you can see the tag cloud for this blog.

2
doc/examples/blog/tags/life.mdwn
View File

@ -1,4 +1,4 @@
This feed contains pages in the "life" category. 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]] show="10" actions=yes]]

2
doc/examples/blog/tags/tech.mdwn
View File

@ -1,3 +1,3 @@
This feed contains pages in the "tech" category. 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]]

2
doc/examples/softwaresite/bugs.mdwn
View File

@ -1,4 +1,4 @@
This is FooBar's bug list. Link bugs to [[bugs/done]] when done. 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]] and !*/Discussion" actions=yes postform=yes show=0]]

2
doc/examples/softwaresite/bugs/done.mdwn
View File

@ -1,3 +1,3 @@
recently fixed [[bugs]] 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]]

2
doc/examples/softwaresite/doc/faq.mdwn
View File

@ -1,6 +1,6 @@
FooBar frequently asked questions. FooBar frequently asked questions.
[[toc ]] [[!toc ]]
## Is this a real program? ## Is this a real program?

2
doc/examples/softwaresite/news.mdwn
View File

@ -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 posted. FooBar users are recommended to subscribe to this page's RSS
feed. feed.
[[inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]] [[!inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]

4
doc/examples/softwaresite/templates/release.mdwn
View File

@ -3,5 +3,5 @@
<TMPL_VAR news> <TMPL_VAR news>
</TMPL_IF> </TMPL_IF>
FooBar <TMPL_VAR version> released with [[toggle text="these changes" id="changelog"]] FooBar <TMPL_VAR version> released with [[!toggle text="these changes" id="changelog"]]
[[toggleable id="changelog" text="""<TMPL_VAR changelog>"""]] [[!toggleable id="changelog" text="""<TMPL_VAR changelog>"""]]

2
doc/features.mdwn
View File

@ -1,5 +1,5 @@
An overview of some of ikiwiki's features: An overview of some of ikiwiki's features:
[[toc ]] [[!toc ]]
## Uses a real RCS ## Uses a real RCS

2
doc/forum.mdwn
View File

@ -4,5 +4,5 @@ _This is a bold experiment by me, since I have exactly such a question. This ove
## Current topics ## ## 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]] actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=0]]

2
doc/freesoftware.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="Free Software"]] [[!meta title="Free Software"]]
ikiwiki, and this documentation wiki, are licensed under the terms of the ikiwiki, and this documentation wiki, are licensed under the terms of the
GNU [[GPL]], version 2 or later. GNU [[GPL]], version 2 or later.

2
doc/ikiwiki/wikilink/discussion.mdwn
View File

@ -17,7 +17,7 @@ BTW, ikiwiki doesn't displays the #foo anchor in the example
> [[preprocessor_directive|preprocessordirective]] for it, though. > [[preprocessor_directive|preprocessordirective]] for it, though.
> --[[JoshTriplett]] > --[[JoshTriplett]]
>> [[tag wishlist]] >> [[!tag wishlist]]
>> I'd like to implement such a thing. Joey, what is this supposed to look like? >> I'd like to implement such a thing. Joey, what is this supposed to look like?
>> `\[[anchor WHATEVER]]`? --[[tschwinge]] >> `\[[anchor WHATEVER]]`? --[[tschwinge]]

4
doc/index.mdwn
View File

@ -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 There are many other [[features]], including support for
[[blogging|ikiwiki/blog]], as well as a large array of [[plugins]]. [[blogging|ikiwiki/blog]], as well as a large array of [[plugins]].
[[template id=links]] [[!template id=links]]
## using ikiwiki ## using ikiwiki
@ -15,7 +15,7 @@ with ikiwiki, and some [[tips]].
All wikis are supposed to have a [[SandBox]], so this one does too. 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 This site generally runs the latest release of ikiwiki; currently, it runs
ikiwiki [[version ]]. ikiwiki [[!version ]].
## developer resources ## developer resources

4
doc/index/discussion.mdwn
View File

@ -5,7 +5,7 @@ Do so here..
Note that for more formal bug reports or todo items, you can also edit the Note that for more formal bug reports or todo items, you can also edit the
[[bugs]] and [[todo]] pages. [[bugs]] and [[todo]] pages.
[[toc ]] [[!toc ]]
# Installation/Setup questions # 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 <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). > 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. > We will post the scripts as soon as we have them complete enough to convert our wikis.
> >

4
doc/install.mdwn
View File

@ -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 It's recommended you have a C compiler, as ikiwiki uses one to build
wrappers. wrappers.
Ikiwiki requires the [[cpan Text::Markdown]], [[cpan URI]], Ikiwiki requires the [[!cpan Text::Markdown]], [[!cpan URI]],
[[cpan HTML::Parser]], [[cpan HTML::Template]], and [[cpan HTML::Scrubber]] [[!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 perl modules be installed. It can also use a lot of other perl modules, if
they are available. they are available.

2
doc/news.mdwn
View File

@ -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 posted. [[IkiWikiUsers]] are recommended to subscribe to this page's RSS
feed. 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"]] 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 By the way, some other pages with RSS feeds about ikiwiki include

2
doc/news/code_swarm.mdwn
View File

@ -1,7 +1,7 @@
I've produced a [code_swarm](http://vis.cs.ucdavis.edu/~ogawa/codeswarm/) I've produced a [code_swarm](http://vis.cs.ucdavis.edu/~ogawa/codeswarm/)
visualization of the first 2+ years of ikiwiki's commit history. 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) * [15 mb avi](http://kitenet.net/~joey/screencasts/ikiwiki_swarm.avi)
* [stream on vimeo](http://vimeo.com/1324348) * [stream on vimeo](http://vimeo.com/1324348)

4
doc/news/ikiwiki_version_2.0.mdwn
View File

@ -9,7 +9,7 @@ default configuration:
the procedure described at [[tips/switching_to_usedirs]] the procedure described at [[tips/switching_to_usedirs]]
or edit your setup file to turn `usedirs` off: `usedirs => 0,` or edit your setup file to turn `usedirs` off: `usedirs => 0,`
* [[plugins/OpenID]] logins are now enabled by default, if the * [[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 are also still enabled by default. If you like, you can turn either OpenID
or password logins off via the `disable_plugins` setting. 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. * Some support for other markup languages than markdown: rst, textile.
* Unit test suite, with more than 300 tests. * 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"]]

2
doc/news/openid.mdwn
View File

@ -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 OpenID, and see how OpenID works for you. And let me know your feelings about
making such a switch. --[[Joey]] 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"]]

2
doc/news/server_speed.mdwn
View File

@ -1,7 +1,7 @@
Quick poll: Do you feel that ikiwiki is fast enough on this server, or Quick poll: Do you feel that ikiwiki is fast enough on this server, or
should I move it to my much beefier auxiliary server? 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 If you have specifics on performance issues, you might mention them on the
[[discussion]] page. [[discussion]] page.

8
doc/news/version_2.49.mdwn
View File

@ -1,8 +1,8 @@
News for ikiwiki 2.49: News for ikiwiki 2.49:
The search plugin no longer uses hyperestraier. Instead, to use it you The search plugin no longer uses hyperestraier. Instead, to use it you
will now need to install xapian-omega, and the [[cpan Search::Xapian]], will now need to install xapian-omega, and the [[!cpan Search::Xapian]],
[[cpan HTML::Scrubber]], and [[cpan Digest::SHA1]] perl modules. Ie, [[!cpan HTML::Scrubber]], and [[!cpan Digest::SHA1]] perl modules. Ie,
`apt-get install xapian-omega libsearch-xapian-perl libhtml-scrubber-perl libdigest-sha1-perl` `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, 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 but can be done by running `ikiwiki-mass-upgrade` as root, or
running `ikiwiki -setup` on individual setup files. running `ikiwiki -setup` on individual setup files.
ikiwiki 2.49 released with [[toggle text="these changes"]] ikiwiki 2.49 released with [[!toggle text="these changes"]]
[[toggleable text=""" [[!toggleable text="""
* haiku: Generate valid xhtml. * haiku: Generate valid xhtml.
* ikiwiki-mass-rebuild: Don't trust $! when setting $) * ikiwiki-mass-rebuild: Don't trust $! when setting $)
* inline: The optimisation in 2.41 broke nested inlines. Detect those * inline: The optimisation in 2.41 broke nested inlines. Detect those

4
doc/news/version_2.50.mdwn
View File

@ -1,5 +1,5 @@
ikiwiki 2.50 released with [[toggle text="these changes"]] ikiwiki 2.50 released with [[!toggle text="these changes"]]
[[toggleable text=""" [[!toggleable text="""
* img: Support captions. * img: Support captions.
* img: Don't generate empty title attributes, etc. * img: Don't generate empty title attributes, etc.
* img: Allow setting defaults for class and id too. * img: Allow setting defaults for class and id too.

4
doc/news/version_2.51.mdwn
View File

@ -1,5 +1,5 @@
ikiwiki 2.51 released with [[toggle text="these changes"]] ikiwiki 2.51 released with [[!toggle text="these changes"]]
[[toggleable text=""" [[!toggleable text="""
* Improve toplevel parentlink to link directly to index.html when usedirs is * Improve toplevel parentlink to link directly to index.html when usedirs is
disabled. disabled.
* map: Add a "show" parameter. "show=title" can be used to display page * map: Add a "show" parameter. "show=title" can be used to display page

4
doc/news/version_2.52.mdwn
View File

@ -4,8 +4,8 @@ News for ikiwiki 2.52:
wiki in /etc/ikiwiki/wikilist this will be done automatically when the 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. Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
ikiwiki 2.52 released with [[toggle text="these changes"]] ikiwiki 2.52 released with [[!toggle text="these changes"]]
[[toggleable text=""" [[!toggleable text="""
* attachment: New plugin for uploading and managing attachments. * attachment: New plugin for uploading and managing attachments.
This includes a fairly powerful PageSpec based admin pref for deciding This includes a fairly powerful PageSpec based admin pref for deciding
whether to accept a given upload, and an attachment management interface whether to accept a given upload, and an attachment management interface

4
doc/news/version_2.53.mdwn
View File

@ -1,5 +1,5 @@
ikiwiki 2.53 released with [[toggle text="these changes"]] ikiwiki 2.53 released with [[!toggle text="these changes"]]
[[toggleable text=""" [[!toggleable text="""
* search: generate configuration files once only when rebuilding * search: generate configuration files once only when rebuilding
(Gabriel McManus) (Gabriel McManus)
* attachment: Fix an uninitialised value warning when editing a page * attachment: Fix an uninitialised value warning when editing a page

2
doc/patch.mdwn
View File

@ -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 If your patch is non-trivial and might need several iterations to get
right, please consider publishing a [[git]] branch. 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"]] !link(todo/done) and !*/Discussion" rootpage="todo" archive="yes"]]

4
doc/plugins.mdwn
View File

@ -1,7 +1,7 @@
Most of ikiwiki's [[features]] are implemented as plugins. Many of these Most of ikiwiki's [[features]] are implemented as plugins. Many of these
plugins are included with ikiwiki. 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 There's documentation if you want to [[write]] your own plugins, or you can
[[install]] plugins [[contributed|contrib]] by others. [[install]] plugins [[contributed|contrib]] by others.
@ -13,7 +13,7 @@ will fit most uses of ikiwiki.
## Plugin directory ## 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" !plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"
feedpages="created_after(plugins/graphviz)" archive="yes" feedpages="created_after(plugins/graphviz)" archive="yes"
rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]] rootpage="plugins/contrib" postformtext="Add a new plugin named:" show=0]]

4
doc/rcs.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="Revision Control Systems"]] [[!meta title="Revision Control Systems"]]
Ikiwiki supports using several revision control systems for storing page Ikiwiki supports using several revision control systems for storing page
histories. 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. [[git]] is another well-tested option.
These are all the supported revision control systems: 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 There is a page with [[details]] about how the different systems work with
ikiwiki, for the curious. ikiwiki, for the curious.

2
doc/rcs/details.mdwn
View File

@ -1,6 +1,6 @@
A few bits about the RCS backends A few bits about the RCS backends
[[toc ]] [[!toc ]]
## Terminology ## Terminology

2
doc/rcs/git.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="Git"]] [[!meta title="Git"]]
[Git][git] is a distributed revison control system originally developed for [Git][git] is a distributed revison control system originally developed for
the Linux kernel. Ikiwiki supports storing a wiki in git. the Linux kernel. Ikiwiki supports storing a wiki in git.

2
doc/rcs/tla.mdwn
View File

@ -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 commits edited pages to the Arch repostory, and uses the Arch
log to generate the [[RecentChanges]] page. 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.

6
doc/sandbox.mdwn
View File

@ -55,8 +55,8 @@ Bulleted list
---- ----
[[template id=note text="this is generated by the [[plugins/haiku]] plugin"]] [[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
[[haiku hint="sandbox play"]] [[!haiku hint="sandbox play"]]
---- ----
@ -78,4 +78,4 @@ The haiku will change after every save, mind you.
This sandbox is also a [[ikiwiki/blog]]! 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"]]

2
doc/sandbox/test_nested_inlines.mdwn
View File

@ -1,3 +1,3 @@
Testing nested inlines: 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"]]

12
doc/security.mdwn
View File

@ -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 others edit pages in your wiki, then some possible security issues do need
to be kept in mind. 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 The htmlscrubber did not block javascript in uris. This was fixed by adding
a whitelist of valid uri types, which does not include javascript. 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 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 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..) 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 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 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 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 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 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). hashes (using Eksblowfish).
If you use the [[plugins/passwordauth]] plugin, I recommend upgrading to 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 `ikiwiki-transition hashpassword` to replace all existing cleartext passwords
with strong blowfish hashes. 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 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 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 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 I recommend upgrading to 2.48 immediatly if your wiki allows both password
and openid logins. and openid logins.

30
doc/setup.mdwn
View File

@ -1,6 +1,6 @@
This tutorial will walk you through setting up a wiki with ikiwiki. This tutorial will walk you through setting up a wiki with ikiwiki.
[[toc ]] [[!toc ]]
## [[Download]] and [[install]] ikiwiki. ## [[Download]] and [[install]] ikiwiki.
@ -32,8 +32,8 @@ This will create a simple main page for the wiki.
$EDITOR index.mdwn $EDITOR index.mdwn
In the editor, you could start by entering a simple page like In the editor, you could start by entering a simple page like
[[toggle id=page text="this one"]]. [[!toggle id=page text="this one"]].
[[toggleable id=page text=""" [[!toggleable id=page text="""
Welcome to your new wiki. Welcome to your new wiki.
All wikis are supposed to have a \[[SandBox]], 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 The new [[ikiwiki-makerepo]] command automates setting up a wiki in
revision control. revision control.
[[toggle id=subversion text="Subversion"]] [[!toggle id=subversion text="Subversion"]]
[[toggleable id=subversion text=""" [[!toggleable id=subversion text="""
REPOSITORY=~/wikirepo REPOSITORY=~/wikirepo
ikiwiki-makerepo svn $SRCDIR $REPOSITORY ikiwiki-makerepo svn $SRCDIR $REPOSITORY
"""]] """]]
[[toggle id=git text="Git"]] [[!toggle id=git text="Git"]]
[[toggleable id=git text=""" [[!toggleable id=git text="""
REPOSITORY=~/wiki.git REPOSITORY=~/wiki.git
ikiwiki-makerepo git $SRCDIR $REPOSITORY ikiwiki-makerepo git $SRCDIR $REPOSITORY
@ -132,20 +132,20 @@ ikiwiki uses git repositories, and some important caveats
about using the git repositories. about using the git repositories.
"""]] """]]
[[toggle id=mercurial text="Mercurial"]] [[!toggle id=mercurial text="Mercurial"]]
[[toggleable id=mercurial text=""" [[!toggleable id=mercurial text="""
REPOSITORY=$SRCDIR REPOSITORY=$SRCDIR
ikiwiki-makerepo mercurial $SRCDIR ikiwiki-makerepo mercurial $SRCDIR
"""]] """]]
[[toggle id=bazaar text="Bazaar"]] [[!toggle id=bazaar text="Bazaar"]]
[[toggleable id=bazaar text=""" [[!toggleable id=bazaar text="""
REPOSITORY=$SRCDIR REPOSITORY=$SRCDIR
ikiwiki-makerepo bzr $SRCDIR ikiwiki-makerepo bzr $SRCDIR
"""]] """]]
[[toggle id=tla text="TLA"]] [[!toggle id=tla text="TLA"]]
[[toggleable id=tla text=""" [[!toggleable id=tla text="""
REPOSITORY=~/wikirepo REPOSITORY=~/wikirepo
tla make-archive me@localhost--wiki $REPOSITORY tla make-archive me@localhost--wiki $REPOSITORY
tla my-id "<me@localhost>" tla my-id "<me@localhost>"
@ -158,8 +158,8 @@ about using the git repositories.
tla import tla import
"""]] """]]
[[toggle id=monotone text="Monotone"]] [[!toggle id=monotone text="Monotone"]]
[[toggleable id=monotone text=""" [[!toggleable id=monotone text="""
# These instructions are standard instructions to import a directory into monotone # 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 # and set it up so that you don't need any passwords to use it
REPOSITORY=~/.ikiwiki/mtn.db REPOSITORY=~/.ikiwiki/mtn.db

2
doc/sitemap.mdwn
View File

@ -1,6 +1,6 @@
This map excludes discussion pages, as well as subpages that are in feeds. 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 !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/*
and !sandbox/* and !todo/* and !users/* and !sandbox/* and !todo/* and !users/*
and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]]

2
doc/soc.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="Summer of Code"]] [[!meta title="Summer of Code"]]
This page includes information about ikiwiki's involvement in This page includes information about ikiwiki's involvement in
[Google Summer of Code](http://code.google.com/soc/). [Google Summer of Code](http://code.google.com/soc/).

2
doc/soc/ideas.mdwn
View File

@ -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, 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. 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 !link(todo/done) and !bugs/done and !link(bugs/done) and
!*/Discussion" actions=yes show=0]] !*/Discussion" actions=yes show=0]]

10
doc/templates/plugin.mdwn vendored
View File

@ -1,13 +1,13 @@
<span class="infobox"> <span class="infobox">
Plugin: <TMPL_VAR name><br /> Plugin: <TMPL_VAR name><br />
Author: <TMPL_VAR author><br /> Author: <TMPL_VAR author><br />
Included in ikiwiki: [[if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br /> Included in ikiwiki: [[!if test="sourcepage(plugins/contrib/*)" then="""no""" else="""yes"""]]<br />
Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br /> Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
Included in [[/plugins/goodstuff]]: [[if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br /> Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
Currently enabled: [[if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br /> Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
</span> </span>
[[if test="sourcepage(plugins/contrib/*)" then="""[[meta title="<TMPL_VAR name> (third party plugin)"]]"""]] [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
<TMPL_IF core>[[tag plugins/type/core]]</TMPL_IF> <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
<TMPL_UNLESS NAME="name"> <TMPL_UNLESS NAME="name">
This template is used to create an infobox for an ikiwiki plugin. It uses This template is used to create an infobox for an ikiwiki plugin. It uses
these parameters: these parameters:

2
doc/tips.mdwn
View File

@ -1,5 +1,5 @@
This page is a place to document tips and techniques for using ikiwiki. 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" feedpages="created_after(tips/howto_avoid_flooding_aggregators)" archive="yes"
rootpage="tips" postformtext="Add a new tip about:" show=0]] rootpage="tips" postformtext="Add a new tip about:" show=0]]

2
doc/tips/inside_dot_ikiwiki.mdwn
View File

@ -1,4 +1,4 @@
[[meta title="inside .ikiwiki"]] [[!meta title="inside .ikiwiki"]]
The `.ikiwiki` directory contains ikiwiki's internal state. Normally, 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 you don't need to look in it, but here's some tips for how to do so if

8
doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
View File

@ -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 <joeyh@ikiwiki.info>, LinuxWorld.com Copyright 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com
[First published](http://www.linuxworld.com/news/2007/040607-integrated-issue-tracking-ikiwiki.html) [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 on [LinuxWorld.com](http://www.linuxworld.com/), a publication of Network
World Inc., 118 Turnpike Rd., Southboro, MA 01772. 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 Wikis are not just for encyclopedias and websites anymore. You can use
Ikiwiki in combination with your revision control system to handle issue Ikiwiki in combination with your revision control system to handle issue

8
doc/todo.mdwn
View File

@ -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. post it to [[bugs]] instead. Link items to [[todo/done]] when done.
<!-- currently commented out because I lost all my mtimes :-) <!-- currently commented out because I lost all my mtimes :-)
[[if test="enabled(postsparkline)" [[!if test="enabled(postsparkline)"
then=""" then="""
How long will it take your todo item to be fixed? Well... How long will it take your todo item to be fixed? Well...
[[postsparkline pages="todo/* and !todo/done and !link(todo/done) and !todo/*/*" [[!postsparkline pages="todo/* and !todo/done and !link(todo/done) and !todo/*/*"
max=12 ymin=10 formula=permonth style=bar barwidth=2 barspacing=1 height=13]] max=12 ymin=10 formula=permonth style=bar barwidth=2 barspacing=1 height=13]]
this many are being added per month this many are being added per month
[[postsparkline pages="todo/* and !todo and link(todo/done)" [[!postsparkline pages="todo/* and !todo and link(todo/done)"
max=12 ymin=10 formula=permonth time=mtime style=bar barwidth=2 barspacing=1 height=13]] max=12 ymin=10 formula=permonth time=mtime style=bar barwidth=2 barspacing=1 height=13]]
while this many are being fixed. while this many are being fixed.
"""]] """]]
--> -->
[[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/*/*" !link(patch) and !link(wishlist) and !todo/*/*"
feedpages="created_after(todo/supporting_comments_via_disussion_pages)" feedpages="created_after(todo/supporting_comments_via_disussion_pages)"
actions=yes archive=yes rootpage="todo" postformtext="Add a new todo item titled:" show=0]] actions=yes archive=yes rootpage="todo" postformtext="Add a new todo item titled:" show=0]]

2
doc/users.mdwn
View File

@ -6,6 +6,6 @@ comments.
List of users 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 feeds=no archive=yes sort=title template=titlepage
rootpage="users" postformtext="Add yourself as an ikiwiki user:"]] rootpage="users" postformtext="Add yourself as an ikiwiki user:"]]

2
doc/wishlist.mdwn
View File

@ -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 improvements people would like to see in ikiwiki. Good patches for any of
these will likely be accepted. 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]] link(wishlist) and !link(patch) and !todo/*/*" archive=yes show=0]]