reword after reorg

There was a duplicated paragraph, an example on the wrong page, and some
rewording needed after will's reorg.

diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 02e84763c8bf5df787279da36033b28b957b1d97..b2288ddc9cf8603b80817bd3b40493a8740d1f69 100644 (file)
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -1,8 +1,8 @@
 [[!template id=plugin name=tag author="[[Joey]]"]]
 [[!tag type/tags type/link]]
 
-This plugin implements the [[ikiwiki/directive/tag]] and 
-[[ikiwiki/directive/taglink]] [[ikiwiki/directive]]s.
+This plugin provides the [[ikiwiki/directive/tag]] and 
+[[ikiwiki/directive/taglink]] [[directives|ikiwiki/directive]].
 These directives allow tagging pages.
 
 This plugin has a configuration option. Set --tagbase=tags and links to tags

diff --git a/underlays/basewiki/directive/tag.mdwn b/underlays/basewiki/directive/tag.mdwn
index 68b969f76db05d19e0332e01d06a7f2fdad92018..3ddb3234f0d8e45c74d0ce587a01802634ce4e0c 100644 (file)
--- a/underlays/basewiki/directive/tag.mdwn
+++ b/underlays/basewiki/directive/tag.mdwn
@@ -1,6 +1,6 @@
 The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag]] plugin.
 
-These directives allows tagging pages. List tags as follows:
+These directives allow tagging pages. List tags as follows:
 
        \[[!tag tech life linux]]
 
@@ -16,20 +16,13 @@ instead:
        \[[!taglink foo]]
        \[[!taglink tagged_as_foo|foo]]
 
-This plugin has a configuration option. Set --tagbase=tags and links to tags
-will be located under the specified base page. If ikiwiki is configured
-this way, then the example above actually tags the page with the tags
-tags/tech, tags/life, and tags/linux. This is a useful way to avoid
-having to write the full path to tags, if you want to keep them grouped
-together out of the way.
+Note that if the wiki is configured to use a tagbase, then the tags will be
+located under a base directory, such as "tags/". This is a useful way to
+avoid having to write the full path to tags, if you want to keep them
+grouped together out of the way.
 
 If you want to override the tagbase for a particular tag, you can use
 something like this:
 
        \[[!tag ./foo]]
        \[[!taglink /foo]]
-
-[[!if test="enabled(tag)" then="""
-This wiki has the tag plugin enabled, so you'll see a note below that this
-page is tagged with the "tags" tag.
-"""]]