Merge branch 'master' into transitive-dependencies

2 files changed, 4 insertions, 2 deletions

diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 426f3e4af..66f851dbd 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -12,7 +12,7 @@ And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
 
-The optional `among` parameter limits counting to pages that match a
+The optional `among` parameter limits display to pages that match a
 [[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
 entries, you could use:
 
diff --git a/doc/ikiwiki/directive/pagetemplate.mdwn b/doc/ikiwiki/directive/pagetemplate.mdwn
index 0e4066f34..8ad901c1a 100644
--- a/doc/ikiwiki/directive/pagetemplate.mdwn
+++ b/doc/ikiwiki/directive/pagetemplate.mdwn
@@ -1,6 +1,8 @@
 The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate desc=pagetemplate]] plugin.
 
-This directive allows a page to be created using a different wikitemplates.
+This directive allows a page to be displayed using a different template than
+the default `page.tmpl` template.
+
 The page text is inserted into the template, so the template controls the
 overall look and feel of the wiki page. This is in contrast to the
 [[ikiwiki/directive/template]] directive, which allows inserting templates