changeset 19197:01d68fb07915 stable

help: stop documentation markup appearing in generated help Markup for links to mercurial commands is appearing in the help documentation. This patch fixes the markup so mercurial command reference links are correctly generated in the help documentation.
author Mike Williams <mrw@eandem.co.uk>
date Wed, 15 May 2013 22:19:12 +0100
parents 278057693a1d
children 15aef461facd
files mercurial/commands.py mercurial/help/urls.txt
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue May 14 18:43:53 2013 -0500
+++ b/mercurial/commands.py	Wed May 15 22:19:12 2013 +0100
@@ -4917,7 +4917,6 @@
     """restore files to their checkout state
 
     .. note::
-
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes), use
        :hg:`update --clean .`.
--- a/mercurial/help/urls.txt	Tue May 14 18:43:53 2013 -0500
+++ b/mercurial/help/urls.txt	Wed May 15 22:19:12 2013 +0100
@@ -7,8 +7,8 @@
   ssh://[user@]host[:port]/[path][#revision]
 
 Paths in the local filesystem can either point to Mercurial
-repositories or to bundle files (as created by :hg:`bundle` or :hg:`
-incoming --bundle`). See also :hg:`help paths`.
+repositories or to bundle files (as created by :hg:`bundle` or
+:hg:`incoming --bundle`). See also :hg:`help paths`.
 
 An optional identifier after # indicates a particular branch, tag, or
 changeset to use from the remote repository. See also :hg:`help