Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / ikiwiki / pagespec.mdwn

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index e1a4762024d3769ae8a4aa79d349917bb3c7dbe3..176228e4b85cf90166d210a56d000e67b1e880d3 100644 (file)
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -1,3 +1,4 @@
+[[!meta robots="noindex, follow"]]

 To select a set of pages, such as pages that are locked, pages
 whose commit emails you want subscribe to, or pages to combine into a
 blog, the wiki uses a PageSpec. This is an expression that matches
 To select a set of pages, such as pages that are locked, pages
 whose commit emails you want subscribe to, or pages to combine into a
 blog, the wiki uses a PageSpec. This is an expression that matches


@@ -21,8 +22,7 @@ match all pages except for Discussion pages and the SandBox:
 
        * and !SandBox and !*/Discussion
 
 
        * and !SandBox and !*/Discussion
 

-Some more elaborate limits can be added to what matches using any of these
-functions:
+Some more elaborate limits can be added to what matches using these functions:

 
 * "`link(page)`" - match only pages that link to a given page (or glob)
 * "`backlink(page)`" - match only pages that a given page links to
 
 * "`link(page)`" - match only pages that link to a given page (or glob)
 * "`backlink(page)`" - match only pages that a given page links to


@@ -33,10 +33,22 @@ functions:
   was created
 * "`created_before(page)`" - match only pages created before the given page
   was created
   was created
 * "`created_before(page)`" - match only pages created before the given page
   was created

-* "`glob(foo)`" - match pages that match the given glob `foo`. Just writing
+* "`glob(someglob)`" - match pages that match the given glob. Just writing

   the glob by itself is actually a shorthand for this function.
   the glob by itself is actually a shorthand for this function.

-* "`internal(foo)`" - like `glob()`, but matches even internal-use 
+* "`internal(glob)`" - like `glob()`, but matches even internal-use 

   pages that globs do not usually match.
   pages that globs do not usually match.

+* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
+  "`license(glob)`", "`copyright(glob)`" - match pages that have the given
+  metadata, matching the specified glob.
+* "`user(username)`" - tests whether a modification is being made by a
+  user with the specified username. If openid is enabled, an openid can also
+  be put here.
+* "`admin()`" - tests whether a modification is being made by one of the
+  wiki admins.
+* "`ip(address)`" - tests whether a modification is being made from the
+  specified IP address.
+* Some additional special-purpose limits may be enabled, for matching
+  [[attachments|attachment]] and [[translations|po]].

 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005: