merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 03 Mar 2014 15:34:09 -0600
changeset 20635 7cd956ace1f4
parent 20634 f2bb7ba59456 (current diff)
parent 20633 2d183dd54384 (diff)
child 20636 12580e04cc43
merge with stable
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
--- 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%;
 }