* Patch from Enrico that

  - allows preprocessor directives to have parameters with no specified
    value
  - fixes preprocessor directive parameter parsing so that
    foo=bar baz now means "foo=bar" and a "baz" with no value
  - Add a tag plugin that allows more easily tagging pages.
    The meta plugin can also still be used for this.

4 files changed, 17 insertions, 5 deletions

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 8bc0e3336..b79722db9 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -71,7 +71,8 @@ use IkiWiki::Setup::Standard {
 	#timeformat => '%c',
 	
 	# To add plugins, list them here.
-	#add_plugins => [qw{pagecount brokenlinks search smiley wikitext}],
+	#add_plugins => [qw{meta tag pagecount brokenlinks search smiley
+	#                   wikitext camelcase}],
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber}],
 }
diff --git a/doc/plugins/meta.mdwn b/doc/plugins/meta.mdwn
index 998dd5d86..17a54c8d6 100644
--- a/doc/plugins/meta.mdwn
+++ b/doc/plugins/meta.mdwn
@@ -1,6 +1,4 @@
 This plugin allows inserting arbitrary metadata into the source of a page.
-This plugin is not enabled by default. If it is enabled, the title of this
-page will say it is. [[meta title="meta plugin (enabled)"]]
 Enter the metadata as follows:
 
 	\\[[meta field="value"]]
@@ -41,3 +39,7 @@ You can use any field names you like, but here are some predefined ones:
 If the field is not treated specially (as the link and title fields are),
 the metadata will be written to the generated html page as a <meta>
 header.
+
+This plugin is included in ikiwiki, but it is not enabled by default. If
+it is enabled, the title of this page will say it is.
+[[meta title="meta plugin (enabled)"]]
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
new file mode 100644
index 000000000..95a346622
--- /dev/null
+++ b/doc/plugins/tag.mdwn
@@ -0,0 +1,9 @@
+This plugin allows tagging pages. List tags as follows:
+
+	\\[[tag tech life linux]]
+
+The tags work the same as if you had put a (hidden) [[WikiLink]] on the page
+for each tag, so you can use a [[GlobList]] to link to all pages that are
+tagged with a given tag, for example.
+
+This plugin is included in ikiwiki, but is not enabled by default.
diff --git a/doc/tags.mdwn b/doc/tags.mdwn
index 2b3d73987..64313aec7 100644
--- a/doc/tags.mdwn
+++ b/doc/tags.mdwn
@@ -9,9 +9,9 @@ typical wiki way to do so is to create a "CategoryFoo" page and link pages
 in the category to it. That is just another form of tagging.
 
 Sometimes you may want to tag a page without putting a visible link on it.
-The [[meta_plugin|plugins/meta]] allows you to do so, like this:
+The [[tag_plugin|plugins/tag]] allows you to do so, like this:
 
-	\\[[meta link=mytag]]
+	\\[[tag mytag othertag thirdtag]]
 
 One way to use these tags is to create a [[blog]] of pages that have a
 particular set of tags. Or just look at the [[BackLinks]] to a tag page to