# HG changeset patch # User Martin Geisler # Date 1259624634 -3600 # Node ID f603299ffa7a7a9d1e6be13b586d8e3b394ddc77 # Parent 361bee1ec172671282acbee0b8e7dbdc317e79db# Parent fa99480d5135a1e4bb5b64dd3e5dba1a98e80829 Merge with stable diff -r 361bee1ec172 -r f603299ffa7a doc/Makefile --- a/doc/Makefile Mon Nov 30 23:39:58 2009 +0100 +++ b/doc/Makefile Tue Dec 01 00:43:54 2009 +0100 @@ -8,6 +8,8 @@ PYTHON=python RST2HTML=$(shell which rst2html 2> /dev/null || which rst2html.py) +export LC_ALL=C + all: man html man: $(MAN) diff -r 361bee1ec172 -r f603299ffa7a mercurial/commands.py --- a/mercurial/commands.py Mon Nov 30 23:39:58 2009 +0100 +++ b/mercurial/commands.py Tue Dec 01 00:43:54 2009 +0100 @@ -592,9 +592,9 @@ See 'hg help urls' for valid source format details. - It is possible to specify an ssh:// URL as the destination, but no + It is possible to specify an ``ssh://`` URL as the destination, but no .hg/hgrc and working directory will be created on the remote side. - Please see 'hg help urls' for important details about ssh:// URLs. + Please see 'hg help urls' for important details about ``ssh://`` URLs. If the -U/--noupdate option is specified, the new clone will contain only a repository (.hg) and no working copy (the working copy parent @@ -1939,7 +1939,7 @@ If no directory is given, the current directory is used. - It is possible to specify an ssh:// URL as the destination. + It is possible to specify an ``ssh://`` URL as the destination. See 'hg help urls' for more information. """ hg.repository(cmdutil.remoteui(ui, opts), dest, create=1) @@ -2330,7 +2330,7 @@ If -r/--rev is used, the named revision and all its ancestors will be pushed to the remote repository. - Please see 'hg help urls' for important details about ssh:// + Please see 'hg help urls' for important details about ``ssh://`` URLs. If DESTINATION is omitted, a default path will be used. """ dest, revs, checkout = hg.parseurl(