From patchwork Wed May 15 22:00:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [stable] help: stop documentation markup appearing in generated help From: Mike Williams X-Patchwork-Id: 1655 Message-Id: <7b012e75db5cfb265042.1368655219@localhost.home.nodnol.plus.com> To: mercurial-devel@selenic.com Date: Wed, 15 May 2013 23:00:19 +0100 # HG changeset patch # User Mike Williams # Date 1368652752 -3600 # Wed May 15 22:19:12 2013 +0100 # Branch stable # Node ID 7b012e75db5cfb265042c0c1457a9a280934e135 # Parent 278057693a1ddb93f95fa641e30e7a966ac98434 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. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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 .`. diff --git a/mercurial/help/urls.txt b/mercurial/help/urls.txt --- a/mercurial/help/urls.txt +++ b/mercurial/help/urls.txt @@ -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