# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1337182151 18000
# Node ID 43cfe56121d388ef7ef4d3fe33309d3a67a1b9a8
# Parent  4da10c00a20c953f9f0833f3de0cc6fefe069aaf
help: include bookmarks in 'help revisions' and simplify wording

diff -r 4da10c00a20c -r 43cfe56121d3 mercurial/help/revisions.txt
--- a/mercurial/help/revisions.txt	Sun May 13 14:00:58 2012 +0200
+++ b/mercurial/help/revisions.txt	Wed May 16 10:29:11 2012 -0500
@@ -12,13 +12,13 @@
 identifier. A short-form identifier is only valid if it is the prefix
 of exactly one full-length identifier.
 
-Any other string is treated as a tag or branch name. A tag name is a
-symbolic name associated with a revision identifier. A branch name
-denotes the tipmost revision of that branch. Tag and branch names must
-not contain the ":" character.
+Any other string is treated as a bookmark, tag, or branch name. A
+bookmark is a movable pointer to a revision. A tag is a permanent name
+associated with a revision. A branch name denotes the tipmost revision
+of that branch. Bookmark, tag, and branch names must not contain the ":"
+character.
 
-The reserved name "tip" is a special tag that always identifies the
-most recent revision.
+The reserved name "tip" always identifies the most recent revision.
 
 The reserved name "null" indicates the null revision. This is the
 revision of an empty repository, and the parent of revision 0.
diff -r 4da10c00a20c -r 43cfe56121d3 tests/test-help.t
--- a/tests/test-help.t	Sun May 13 14:00:58 2012 +0200
+++ b/tests/test-help.t	Wed May 16 10:29:11 2012 -0500
@@ -733,13 +733,13 @@
       short-form identifier is only valid if it is the prefix of exactly one
       full-length identifier.
   
-      Any other string is treated as a tag or branch name. A tag name is a
-      symbolic name associated with a revision identifier. A branch name denotes
-      the tipmost revision of that branch. Tag and branch names must not contain
-      the ":" character.
+      Any other string is treated as a bookmark, tag, or branch name. A bookmark
+      is a movable pointer to a revision. A tag is a permanent name associated
+      with a revision. A branch name denotes the tipmost revision of that
+      branch. Bookmark, tag, and branch names must not contain the ":"
+      character.
   
-      The reserved name "tip" is a special tag that always identifies the most
-      recent revision.
+      The reserved name "tip" always identifies the most recent revision.
   
       The reserved name "null" indicates the null revision. This is the revision
       of an empty repository, and the parent of revision 0.