# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1393882449 21600
# Node ID 7cd956ace1f48a78efb052172f967281a6a453b4
# Parent  f2bb7ba5945699e332d9b78d619bac87b7287874# Parent  2d183dd5438450e465785b2204e406ed48e6d5f8
merge with stable

diff -r f2bb7ba59456 -r 7cd956ace1f4 mercurial/commands.py
--- a/mercurial/commands.py	Mon Mar 03 12:54:46 2014 -0800
+++ b/mercurial/commands.py	Mon Mar 03 15:34:09 2014 -0600
@@ -4468,7 +4468,7 @@
 
         public < draft < secret
 
-    Return 0 on success, 1 if no phases were changed or some could not
+    Returns 0 on success, 1 if no phases were changed or some could not
     be changed.
     """
     # search for a unique phase argument
diff -r f2bb7ba59456 -r 7cd956ace1f4 mercurial/templates/static/style-paper.css
--- a/mercurial/templates/static/style-paper.css	Mon Mar 03 12:54:46 2014 -0800
+++ b/mercurial/templates/static/style-paper.css	Mon Mar 03 15:34:09 2014 -0600
@@ -168,7 +168,7 @@
 h2 { font-size: 120%; border-bottom: 1px solid #999; }
 h2 a { color: #000; }
 h3 {
-  margin-top: -.7em;
+  margin-top: +.7em;
   font-size: 100%;
 }