# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1409417099 -7200
# Node ID 188b8aa2120b03eead618ba150319074f4e3b42b
# Parent  d226fe36e3626b47ad5bd73aac874125900e8d41# Parent  6a8b8efb06418da18aae18597cd11490f93110f2
merge with crew

diff -r d226fe36e362 -r 188b8aa2120b mercurial/commands.py
--- a/mercurial/commands.py	Sat Aug 30 05:29:38 2014 -0700
+++ b/mercurial/commands.py	Sat Aug 30 18:44:59 2014 +0200
@@ -818,8 +818,8 @@
     Deleting or moving a bookmark has no effect on the associated changesets.
 
     Creating or updating to a bookmark causes it to be marked as 'active'.
-    Active bookmarks are indicated with a '*'.
-    When a commit is made, an active bookmark will advance to the new commit.
+    The active bookmark is indicated with a '*'.
+    When a commit is made, the active bookmark will advance to the new commit.
     A plain :hg:`update` will also advance an active bookmark, if possible.
     Updating away from a bookmark will cause it to be deactivated.