diff options
47 files changed, 48 insertions, 47 deletions
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn index a3ef105d6..8b1abcd61 100644 --- a/doc/plugins/aggregate.mdwn +++ b/doc/plugins/aggregate.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=aggregate included=1 author="[[Joey]]"]] +[[template id=plugin name=aggregate author="[[Joey]]"]] [[tag type/useful]] This plugin allows content from other feeds to be aggregated into the wiki. diff --git a/doc/plugins/anonok.mdwn b/doc/plugins/anonok.mdwn index ae1c87f43..8afcf86f5 100644 --- a/doc/plugins/anonok.mdwn +++ b/doc/plugins/anonok.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=anonok included=1 author="[[Joey]]"]] +[[template id=plugin name=anonok author="[[Joey]]"]] [[tag type/auth]] By default, anonymous users cannot edit the wiki. This plugin allows diff --git a/doc/plugins/brokenlinks.mdwn b/doc/plugins/brokenlinks.mdwn index b9a82963a..69aa54086 100644 --- a/doc/plugins/brokenlinks.mdwn +++ b/doc/plugins/brokenlinks.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=brokenlinks included=1 author="[[Joey]]"]] +[[template id=plugin name=brokenlinks author="[[Joey]]"]] [[tag type/link type/meta]] This plugin generates a list of broken links on pages in the wiki. This is diff --git a/doc/plugins/camelcase.mdwn b/doc/plugins/camelcase.mdwn index ea0d80f26..2a3e2639d 100644 --- a/doc/plugins/camelcase.mdwn +++ b/doc/plugins/camelcase.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=camelcase included=1 author="[[Joey]]"]] +[[template id=plugin name=camelcase author="[[Joey]]"]] This plugin makes words in CamelCase be treated as a [[WikiLink]]. That is to say, any two or more words capitalised and mashed together are assumed diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn index f3398af57..42eb4e62d 100644 --- a/doc/plugins/conditional.mdwn +++ b/doc/plugins/conditional.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=conditional core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=conditional core=1 author="[[Joey]]"]] [[tag type/format]] With this plugin, you can make text be conditionally displayed on a page. diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn index 307673048..b2c6df05d 100644 --- a/doc/plugins/ddate.mdwn +++ b/doc/plugins/ddate.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=ddate included=1 author="[[Joey]]"]] +[[template id=plugin name=ddate author="[[Joey]]"]] [[tag type/fun]] Enables use of Discordian dates. `--timeformat` can be used to change diff --git a/doc/plugins/favicon.mdwn b/doc/plugins/favicon.mdwn index 2973c94fd..52dbf6a2f 100644 --- a/doc/plugins/favicon.mdwn +++ b/doc/plugins/favicon.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=favicon included=1 author="[[Joey]]"]] +[[template id=plugin name=favicon author="[[Joey]]"]] [[tag type/chrome]] If this plugin is enabled, then an icon link is added to pages, for web diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn index caa002aed..b855c18f3 100644 --- a/doc/plugins/fortune.mdwn +++ b/doc/plugins/fortune.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=fortune included=1 author="[[Joey]]"]] +[[template id=plugin name=fortune author="[[Joey]]"]] [[tag type/fun]] This just uses the `fortune` program to insert a fortune into the page. diff --git a/doc/plugins/goodstuff.mdwn b/doc/plugins/goodstuff.mdwn index 3402c7edc..ca888910d 100644 --- a/doc/plugins/goodstuff.mdwn +++ b/doc/plugins/goodstuff.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=goodstuff included=1 author="[[Joey]]"]] +[[template id=plugin name=goodstuff author="[[Joey]]"]] [[tag type/bundle]] This plugin enables a bunch of other plugins -- basically all the ones that diff --git a/doc/plugins/googlecalendar.mdwn b/doc/plugins/googlecalendar.mdwn index 020e5382e..940918078 100644 --- a/doc/plugins/googlecalendar.mdwn +++ b/doc/plugins/googlecalendar.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=linkmap included=1 author="[[Joey]]"]] +[[template id=plugin name=googlecalendar author="[[Joey]]"]] [[tag type/special-purpose]] This plugin allows embedding a google calendar iframe in the wiki. diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn index 330e9367d..259669d67 100644 --- a/doc/plugins/haiku.mdwn +++ b/doc/plugins/haiku.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=haiku included=1 author="[[Joey]]"]] +[[template id=plugin name=haiku author="[[Joey]]"]] [[tag type/fun]] This plugin allows inserting a randomly generated haiku into a wiki page. diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn index 1a2c5365b..01fdd4852 100644 --- a/doc/plugins/html.mdwn +++ b/doc/plugins/html.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=html included=1 author="[[Joey]]"]] +[[template id=plugin name=html author="[[Joey]]"]] [[tag type/html type/format]] This plugin lets html pages be used as source pages for the wiki. The diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn index a064c4901..4fa11d04e 100644 --- a/doc/plugins/htmlscrubber.mdwn +++ b/doc/plugins/htmlscrubber.mdwn @@ -1,5 +1,4 @@ -[[template id=plugin name=htmlscrubber core=1 included=1 -author="[[Joey]]"]] +[[template id=plugin name=htmlscrubber core=1 author="[[Joey]]"]] [[tag type/html type/core]] This plugin is enabled by default. It sanitizes the html on pages it renders diff --git a/doc/plugins/htmltidy.mdwn b/doc/plugins/htmltidy.mdwn index 7079a7fc6..dae812df2 100644 --- a/doc/plugins/htmltidy.mdwn +++ b/doc/plugins/htmltidy.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=htmltidy included=1 author="Faidon Liambotis"]] +[[template id=plugin name=htmltidy author="Faidon Liambotis"]] [[tag type/html]] [[tag type/slow]] diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index 98233570c..26f258bd3 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=httpauth included=1 author="Alec Berryman"]] +[[template id=plugin name=httpauth author="Alec Berryman"]] [[tag type/auth]] This plugin allows HTTP basic authentication to be used to log into the diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn index 324d46cc5..4795e9403 100644 --- a/doc/plugins/img.mdwn +++ b/doc/plugins/img.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=img included=1 author="Christian Mock" ]] +[[template id=plugin name=img author="Christian Mock"]] [[tag type/chrome]] This is an image handling plugin. While ikiwiki supports inlining full-size diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn index 8b8241ca2..6baf6ba9b 100644 --- a/doc/plugins/inline.mdwn +++ b/doc/plugins/inline.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=inline core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=inline core=1 author="[[Joey]]"]] [[tag type/core]] This is a [[PreProcessorDirective]] that allows including one wiki page diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn index 50d197f2f..e54d8ec89 100644 --- a/doc/plugins/linkmap.mdwn +++ b/doc/plugins/linkmap.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=linkmap included=1 author="Joey Hess"]] +[[template id=plugin name=linkmap author="Joey Hess"]] [[tag type/meta]] [[tag type/slow]] This plugin uses [graphviz](http://www.graphviz.org/) to generate a graph showing the links between a diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn index be9ca841c..8dd448558 100644 --- a/doc/plugins/lockedit.mdwn +++ b/doc/plugins/lockedit.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=lockedit core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=lockedit core=1 author="[[Joey]]"]] [[tag type/auth]] This plugin enables [[page_locking]]. It is enabled by default. diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn index 3d44164ae..cc4e857b4 100644 --- a/doc/plugins/map.mdwn +++ b/doc/plugins/map.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=map included=1 author="Alessandro Dotti Contra"]] +[[template id=plugin name=map author="Alessandro Dotti Contra"]] [[tag type/meta]] This plugin generates a hierarchical page map for the wiki. Example usage: diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn index c5b69689e..277c4f3ec 100644 --- a/doc/plugins/mdwn.mdwn +++ b/doc/plugins/mdwn.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=mdwn core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=mdwn core=1 author="[[Joey]]"]] [[tag type/format type/core]] This plugin lets ikwiki convert files with names ending in ".mdwn" to html. diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn index 41563e965..1cf801028 100644 --- a/doc/plugins/meta.mdwn +++ b/doc/plugins/meta.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=meta included=1 author="[[Joey]]"]] +[[template id=plugin name=meta author="[[Joey]]"]] [[tag type/meta]] This plugin allows inserting arbitrary metadata into the source of a page. diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn index 05d3dc910..25bad0585 100644 --- a/doc/plugins/mirrorlist.mdwn +++ b/doc/plugins/mirrorlist.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=mirror included=1 author="[[Joey]]"]] +[[template id=plugin name=mirror author="[[Joey]]"]] [[tag type/special-purpose]] This plugin allows adding links a list of mirrors to each page in the diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn index 3257224dc..cf0036c4c 100644 --- a/doc/plugins/opendiscussion.mdwn +++ b/doc/plugins/opendiscussion.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=opendiscussion included=1 author="[[Joey]]"]] +[[template id=plugin name=opendiscussion author="[[Joey]]"]] [[tag type/auth]] This plugin allows editing of Discussion pages by anonymous users who have diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn index f0ee4d8b7..94929e7ab 100644 --- a/doc/plugins/openid.mdwn +++ b/doc/plugins/openid.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=openid included=1 author="[[Joey]]"]] +[[template id=plugin name=openid author="[[Joey]]"]] [[tag type/auth]] This plugin allows users to use their [OpenID](http://openid.net/) to log diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn index 9456c50ad..a78016f98 100644 --- a/doc/plugins/orphans.mdwn +++ b/doc/plugins/orphans.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=orphans included=1 author="[[Joey]]"]] +[[template id=plugin name=orphans author="[[Joey]]"]] [[tag type/meta]] This plugin generates a list of possibly orphaned pages -- pages that no diff --git a/doc/plugins/otl.mdwn b/doc/plugins/otl.mdwn index 2ff9a9e29..013a5072a 100644 --- a/doc/plugins/otl.mdwn +++ b/doc/plugins/otl.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=otl included=1 author="[[Joey]]"]] +[[template id=plugin name=otl author="[[Joey]]"]] [[tag type/format]] This plugin allows ikiwiki to process `.otl` outline files, as created by diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn index 48e32672d..34b871262 100644 --- a/doc/plugins/pagecount.mdwn +++ b/doc/plugins/pagecount.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=pagecount included=1 author="[[Joey]]"]] +[[template id=plugin name=pagecount author="[[Joey]]"]] [[tag type/meta]] Provides a \\[[pagecount ]] [[PreProcessorDirective]] that is replaced with diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn index 6c1fd0086..06079414e 100644 --- a/doc/plugins/pagestats.mdwn +++ b/doc/plugins/pagestats.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=pagestate included=1 author="Enrico Zini"]] +[[template id=plugin name=pagestate author="Enrico Zini"]] [[tag type/meta type/tags]] This plugin can generate stats about how pages link to each other. It can diff --git a/doc/plugins/passwordauth.mdwn b/doc/plugins/passwordauth.mdwn index dacdffac6..3d6782dba 100644 --- a/doc/plugins/passwordauth.mdwn +++ b/doc/plugins/passwordauth.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=passwordauth core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=passwordauth core=1 author="[[Joey]]"]] [[tag type/auth]] [[tag type/core]] diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn index 385a78b42..ed55ef319 100644 --- a/doc/plugins/poll.mdwn +++ b/doc/plugins/poll.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=poll included=1 author="[[Joey]]"]] +[[template id=plugin name=poll author="[[Joey]]"]] [[tag type/useful]] This plugin allows you to create online polls in the wiki. Here's an diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn index 5cd2f41d2..8d6794073 100644 --- a/doc/plugins/polygen.mdwn +++ b/doc/plugins/polygen.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=polygen included=1 author="Enrico Zini"]] +[[template id=plugin name=polygen author="Enrico Zini"]] [[tag type/fun]] This plugin allows inserting text generated by polygen into a wiki page. diff --git a/doc/plugins/rawhtml.mdwn b/doc/plugins/rawhtml.mdwn index 41f4a7056..ffbbd467f 100644 --- a/doc/plugins/rawhtml.mdwn +++ b/doc/plugins/rawhtml.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=rawhtml included=1 author="[[Joey]]"]] +[[template id=plugin name=rawhtml author="[[Joey]]"]] [[tag type/html type/format]] This plugin changes how ikiwiki handles html files, making it treat html diff --git a/doc/plugins/rst.mdwn b/doc/plugins/rst.mdwn index 969d71cdb..ff7f8991f 100644 --- a/doc/plugins/rst.mdwn +++ b/doc/plugins/rst.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=rst included=1 author="Sergio Talens-Oliag"]] +[[template id=plugin name=rst author="Sergio Talens-Oliag"]] [[tag type/format]] [[tag type/slow]] diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn index 5b5325371..b324251bf 100644 --- a/doc/plugins/search.mdwn +++ b/doc/plugins/search.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=search included=1 author="[[Joey]]"]] +[[template id=plugin name=search author="[[Joey]]"]] [[tag type/useful]] This plugin is included in ikiwiki, but is not enabled by default. It adds diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn index 83d8593a8..16dfdb44a 100644 --- a/doc/plugins/shortcut.mdwn +++ b/doc/plugins/shortcut.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=shortcut included=1 author="[[Joey]]"]] +[[template id=plugin name=shortcut author="[[Joey]]"]] [[tag type/format]] This plugin allows external links to commonly linked to sites to be made diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn index 04bf6666f..14cfa08c6 100644 --- a/doc/plugins/sidebar.mdwn +++ b/doc/plugins/sidebar.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=sidebar included=1 author="Tuomo Valkonen"]] +[[template id=plugin name=sidebar author="Tuomo Valkonen"]] [[tag type/chrome]] If this plugin is enabled, then a sidebar is added to pages in the wiki. diff --git a/doc/plugins/signinedit.mdwn b/doc/plugins/signinedit.mdwn index 5beae9dab..525a90fe8 100644 --- a/doc/plugins/signinedit.mdwn +++ b/doc/plugins/signinedit.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=signinedit core=1 included=1 author="[[Joey]]"]] +[[template id=plugin name=signinedit core=1 author="[[Joey]]"]] [[tag type/auth]] This plugin, which is enabled by default, requires users be logged in diff --git a/doc/plugins/smiley.mdwn b/doc/plugins/smiley.mdwn index 0e577f5bf..4e03f09e4 100644 --- a/doc/plugins/smiley.mdwn +++ b/doc/plugins/smiley.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=smiley included=1 author="[[Joey]]"]] +[[template id=plugin name=smiley author="[[Joey]]"]] [[tag type/chrome]] This plugin makes it easy to insert smileys and other special symbols into diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index 1bc38e6fb..eae6e132f 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=tag included=1 author="[[Joey]]"]] +[[template id=plugin name=tag author="[[Joey]]"]] [[tag type/tags type/link]] This plugin allows tagging pages. List tags as follows: diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn index 7b70bb281..e7c27101e 100644 --- a/doc/plugins/template.mdwn +++ b/doc/plugins/template.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=template included=1 author="[[Joey]]"]] +[[template id=plugin name=template author="[[Joey]]"]] [[tag type/format]] With this plugin, you can set up templates, and cause them to be filled out diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn index 57bd622ba..27e06cd05 100644 --- a/doc/plugins/toc.mdwn +++ b/doc/plugins/toc.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=toc included=1 author="Joey Hess"]] +[[template id=plugin name=toc author="Joey Hess"]] [[tag type/chrome]] Add a table of contents be to a page: diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn index b59004e6e..fd3e935da 100644 --- a/doc/plugins/toggle.mdwn +++ b/doc/plugins/toggle.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=toggle included=1 author="[[Joey]]"]] +[[template id=plugin name=toggle author="[[Joey]]"]] [[tag type/chrome]] With this plugin you can create links on pages that, when clicked, toggle diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn index 6d7022f12..2e65393a7 100644 --- a/doc/plugins/typography.mdwn +++ b/doc/plugins/typography.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=typography included=1 author="[[Roktas]]"]] +[[template id=plugin name=typography author="[[Roktas]]"]] [[tag type/format]] This plugin, also known as diff --git a/doc/plugins/wikitext.mdwn b/doc/plugins/wikitext.mdwn index abbebb677..34467cf8e 100644 --- a/doc/plugins/wikitext.mdwn +++ b/doc/plugins/wikitext.mdwn @@ -1,4 +1,4 @@ -[[template id=plugin name=wikitext included=1 author="[[Joey]]"]] +[[template id=plugin name=wikitext author="[[Joey]]"]] [[tag type/format]] This plugin allows ikiwiki to process pages written in the original wiki diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn index 33e187e2c..cbf56fa81 100644 --- a/doc/templates/discussion.mdwn +++ b/doc/templates/discussion.mdwn @@ -12,3 +12,5 @@ john Couldn't the [[templates/plugin]] template replace the "included" parameter with the same check used for "third-party plugin"? Don't "third-party plugin" and "included in ikiwiki" form precisely complementary sets? --[[JoshTriplett]] + +> Yes, can be done.. diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn index 1db37e5c2..6715614df 100644 --- a/doc/templates/plugin.mdwn +++ b/doc/templates/plugin.mdwn @@ -1,7 +1,7 @@ <span class="infobox"> Plugin: <TMPL_VAR name><br /> Author: <TMPL_VAR author><br /> -Included in ikiwiki: <TMPL_IF included>yes<TMPL_ELSE>no</TMPL_IF><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 /> Currently enabled: [[if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br /> </span> |