X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/88e8f08c8ffe61fbb3aa8d0fbf78a86c30c65543..02b54c2fd79487f4c4db797e998c985df592e355:/doc/pagespec.mdwn

diff --git a/doc/pagespec.mdwn b/doc/pagespec.mdwn
index 53519e7f0..5c6433ed3 100644
--- a/doc/pagespec.mdwn
+++ b/doc/pagespec.mdwn
@@ -24,7 +24,7 @@ match all pages except for Discussion pages and the SandBox:
 Some more elaborate limits can be added to what matches using any of these
 functions:
 
-* "`link(page)`" - match only pages that link to a given page
+* "`link(page)`" - match only pages that link to a given page (or glob)
 * "`backlink(page)`" - match only pages that a given page links to
 * "`creation_month(month)`" - match only pages created on the given month
 * "`creation_day(mday)`" - or day of the month
@@ -33,12 +33,20 @@ functions:
   was created
 * "`created_before(page)`" - match only pages created before the given page
   was created
+* "`user(name)`" - only available in page subscription preferences, match
+  only changes made by this user
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
 
 	blog/* and link(music) and creation_year(2005)
 
+Note the use of "and" in the above example, that means that only pages that
+match each of the three expressions match the whole. Use "and" when you
+want to combine expression like that; "or" when it's enough for a page to
+match one expression. Note that it doesn't make sense to say "index and
+SandBox", since no page can match both expressions.
+
 More complex expressions can also be created, by using parentheses for
 grouping. For example, to match pages in a blog that are tagged with either
 of two tags, use: