wording

Specifically, places that refer to "plugin" when they're really talking
about a directive.

diff --git a/doc/ikiwiki/directive/aggregate.mdwn b/doc/ikiwiki/directive/aggregate.mdwn
index f132c9746f4bb88a0dc901dc59a4645c96b40348..58c580b8fe3e4a7729d46d600639be829f7fa176 100644 (file)
--- a/doc/ikiwiki/directive/aggregate.mdwn
+++ b/doc/ikiwiki/directive/aggregate.mdwn
@@ -1,7 +1,6 @@
 The `aggregate` directive is supplied by the [[!iki plugins/aggregate]] plugin.
-
-This plugin requires extra setup, specifically, a cron job.
-See the plugin documentation for details.
+This plugin requires extra setup, specifically, a cron job. See the
+plugin's documentation for details.
 
 This directive allows content from other feeds to be aggregated into the wiki.
 Aggregate a feed as follows:

diff --git a/doc/ikiwiki/directive/cutpaste.mdwn b/doc/ikiwiki/directive/cutpaste.mdwn
index 7c1d5b6cbd8b2f314990824e5b17c9e7d9d25333..a2ce40d64a0868c0055fe370ff0b249b349c2ee8 100644 (file)
--- a/doc/ikiwiki/directive/cutpaste.mdwn
+++ b/doc/ikiwiki/directive/cutpaste.mdwn
@@ -17,12 +17,6 @@ follow the paste directive that uses its text.  In fact, this is quite useful
 to postpone big blocks of text like long annotations and have a more natural
 flow.  For example:
 
-       This plugin provides three directives:
-
-        * \[[!toggle id="cut" text="cut"]] that cuts text
-        * \[[!toggle id="copy" text="copy"]] that copies text
-        * \[[!toggle id="paste" text="paste"]] that pastes text
-
        \[[!toggleable id="cut" text="\[[!paste id=cutlongdesc]]"]]
        \[[!toggleable id="copy" text="\[[!paste id=copylongdesc]]"]]
        \[[!toggleable id="paste" text="\[[!paste id=pastelongdesc]]"]]

diff --git a/doc/ikiwiki/directive/haiku.mdwn b/doc/ikiwiki/directive/haiku.mdwn
index 15d303bb773554c5fb000799759f2c9bfcf14c32..a7e99f219b7a3a3ef31871ad7b9a3cc251c2408f 100644 (file)
--- a/doc/ikiwiki/directive/haiku.mdwn
+++ b/doc/ikiwiki/directive/haiku.mdwn
@@ -1,6 +1,6 @@
 The `haiku` directive is supplied by the [[!iki plugins/haiku]] plugin.
 
-This plugin allows inserting a randomly generated haiku into a wiki page.
+This directive allows inserting a randomly generated haiku into a wiki page.
 Just type:
 
        \[[!haiku hint="argument"]]

diff --git a/doc/ikiwiki/directive/map.mdwn b/doc/ikiwiki/directive/map.mdwn
index 543470864646c4b0af54e1911c1a788aa6715317..eb8d11f39a9aa7a0a3318bf9f8180db60fa3d21b 100644 (file)
--- a/doc/ikiwiki/directive/map.mdwn
+++ b/doc/ikiwiki/directive/map.mdwn
@@ -9,7 +9,7 @@ the wiki are mapped.
 
 By default, the names of pages are shown in the map. The `show` parameter
 can be used to show the titles or descriptions of pages instead (as set by
-the [[meta]] plugin). For example:
+the [[meta]] directive). For example:
 
        \[[!map pages="* and !blog/* and !*/Discussion" show=title]]
 

diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index b01dbfe7605694159191ed08b61ee456f9c15a79..bbf020c3e5306e5be4b5ae82035561b0e7cf925d 100644 (file)
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -1,6 +1,6 @@
 The `meta` directive is supplied by the [[!iki plugins/meta]] plugin.
 
-This plugin allows inserting arbitrary metadata into the source of a page.
+This directive allows inserting arbitrary metadata into the source of a page.
 Enter the metadata as follows:
 
        \[[!meta field="value"]]
@@ -44,7 +44,7 @@ Supported fields:
 * description
 
   Specifies a "description" of the page. You could use this to provide
-  a summary, for example, to be picked up by the [[map]] plugin.
+  a summary, for example, to be picked up by the [[map]] directive.
 
 * permalink
 
@@ -125,9 +125,7 @@ Supported fields:
   some combinations make sense. If there is no robots meta tag, "index,
   follow" is used as the default.
 
-  The plugin escapes the value, but otherwise does not care about its
-  contents. In particular, it does not check the values against the set of
-  valid values but serves whatever you pass it.
+  The value is escaped, but its contents are not otherwise checked.
 
 * guid
 

diff --git a/doc/ikiwiki/directive/progress.mdwn b/doc/ikiwiki/directive/progress.mdwn
index c477c435abb8e50bd161655cce2a8095d1716a17..23b69a3604e42d726b1f884045d2110c1e7ec791 100644 (file)
--- a/doc/ikiwiki/directive/progress.mdwn
+++ b/doc/ikiwiki/directive/progress.mdwn
@@ -6,7 +6,7 @@ There are two possible parameter sets.  The first is a single parameter
 "percent" which holds a percentage figure of how complete the progress bar is.
 
 The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s,
-`totalpages` and `donepages`.  The progress plugin counts the number of
+`totalpages` and `donepages`. The directive counts the number of
 pages in each pagespec and shows the percentage of the total pages that are
 done.