# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1305705387 -7200
# Node ID cb4ff8ef466b2bb5fa820e32501fcc0fc9195087
# Parent  077cdf172580830fbd2b1bc32b7c9d58c9be167e# Parent  02a5bebd0dc48ab51ef8f921c71f5871e6045fe7
merge with stable

diff -r 077cdf172580 -r cb4ff8ef466b mercurial/revset.py
--- a/mercurial/revset.py	Wed May 18 09:05:18 2011 +0200
+++ b/mercurial/revset.py	Wed May 18 09:56:27 2011 +0200
@@ -333,7 +333,8 @@
 
 def contains(repo, subset, x):
     """``contains(pattern)``
-    Revision contains pattern.
+    Revision contains a file matching pattern. See :hg:`help patterns`
+    for information about file patterns.
     """
     # i18n: "contains" is a keyword
     pat = getstring(x, _("contains requires a pattern"))
@@ -432,7 +433,8 @@
 def grep(repo, subset, x):
     """``grep(regex)``
     Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
-    to ensure special escape characters are handled correctly.
+    to ensure special escape characters are handled correctly. Unlike
+    ``keyword(string)``, the match is case-sensitive.
     """
     try:
         # i18n: "grep" is a keyword
@@ -485,7 +487,7 @@
 def keyword(repo, subset, x):
     """``keyword(string)``
     Search commit message, user name, and names of changed files for
-    string.
+    string. The match is case-insensitive.
     """
     # i18n: "keyword" is a keyword
     kw = getstring(x, _("keyword requires a string")).lower()
@@ -780,7 +782,7 @@
     return [e[-1] for e in l]
 
 def tag(repo, subset, x):
-    """``tag(name)``
+    """``tag([name])``
     The specified tag by name, or all tagged revisions if no name is given.
     """
     # i18n: "tag" is a keyword
@@ -802,7 +804,7 @@
 
 def user(repo, subset, x):
     """``user(string)``
-    User name is string.
+    User name contains string. The match is case-insensitive.
     """
     return author(repo, subset, x)