Sync with upstream version 2.10.

2 files changed, 7 insertions, 1 deletions

diff --git a/blog.mdwn b/blog.mdwn
index 2792a35..fe83977 100644
--- a/blog.mdwn
+++ b/blog.mdwn
@@ -90,6 +90,6 @@ directive:
   matches by that value are included, but some of those can be excluded by
   specifying a tighter [[PageSpec]] here.
 * `feedshow` - Specify the maximum number of matching pages to include in
-  the rss/atom feeds. The default is the same as the `show` value above,
+  the rss/atom feeds. The default is the same as the `show` value above.
 * `feedonly` - Only generate the feed, do not display the pages inline on
   the page.
diff --git a/pagespec.mdwn b/pagespec.mdwn
index e004de4..5c6433e 100644
--- a/pagespec.mdwn
+++ b/pagespec.mdwn
@@ -41,6 +41,12 @@ 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: