merge with stable

mercurial/commands.py

@@ -2523,7 +2523,9 b' def heads(ui, repo, *branchrevs, **opts)'
     no child changeset on the same branch.
 
     If one or more REVs are given, only branch heads on the branches
-    associated with the specified changesets are shown.
+    associated with the specified changesets are shown. This means
+    that you can use :hg:`heads foo` to see the heads on a branch
+    named ``foo``.
 
     If -c/--closed is specified, also show branch heads marked closed
     (see :hg:`commit --close-branch`).

mercurial/help/config.txt

@@ -1166,7 +1166,7 b' The full set of options is:'
     extension. This will serve HTML files as ``text/html`` and might
     allow cross-site scripting attacks when serving untrusted
     repositories. Default is False.
-   
+
 ``allow_read``
     If the user has not already been denied repository access due to
     the contents of deny_read, this list determines whether to grant