diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -577,7 +577,7 @@ def clone(ui, source, dest=None, **opts) 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. - Look at the help text for urls for important details about ssh:// URLs. + Look at the help text for URLs for important details about ssh:// URLs. For efficiency, hardlinks are used for cloning whenever the source and destination are on the same filesystem (note this applies only @@ -2203,7 +2203,7 @@ def push(ui, repo, dest=None, **opts): If -r is used, the named changeset and all its ancestors will be pushed to the remote repository. - Look at the help text for urls for important details about ssh:// URLs. + Look at the help text for URLs for important details about ssh:// URLs. If DESTINATION is omitted, a default path will be used. See 'hg help urls' for more information. """ diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -349,7 +349,7 @@ PYTHONPATH:: - user: Any text. Returns the user portion of an email address. ''')), - (['urls'], _('Url Paths'), + (['urls'], _('URL Paths'), _(r''' Valid URLs are of the form: @@ -384,18 +384,18 @@ PYTHONPATH:: Alternatively specify "ssh -C" as your ssh command in your hgrc or with the --ssh command line option. - These urls can all be stored in your hgrc with path aliases under the + These URLs can all be stored in your hgrc with path aliases under the [paths] section like so: [paths] alias1 = URL1 alias2 = URL2 ... - You can then use the alias for any command that uses a url (for example + You can then use the alias for any command that uses a URL (for example 'hg pull alias1' would pull from the 'alias1' path). Two path aliases are special because they are used as defaults - when you do not provide the url to a command: + when you do not provide the URL to a command: default: When you create a repository with hg clone, the clone command saves diff --git a/tests/test-globalopts.out b/tests/test-globalopts.out --- a/tests/test-globalopts.out +++ b/tests/test-globalopts.out @@ -207,7 +207,7 @@ additional help topics: multirevs Specifying Multiple Revisions diffs Diff Formats templating Template Usage - urls Url Paths + urls URL Paths use "hg -v help" to show aliases and global options Mercurial Distributed SCM @@ -272,7 +272,7 @@ additional help topics: multirevs Specifying Multiple Revisions diffs Diff Formats templating Template Usage - urls Url Paths + urls URL Paths use "hg -v help" to show aliases and global options %% not tested: --debugger diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -98,7 +98,7 @@ additional help topics: multirevs Specifying Multiple Revisions diffs Diff Formats templating Template Usage - urls Url Paths + urls URL Paths use "hg -v help" to show aliases and global options add add the specified files on the next commit @@ -159,7 +159,7 @@ additional help topics: multirevs Specifying Multiple Revisions diffs Diff Formats templating Template Usage - urls Url Paths + urls URL Paths hg add [OPTION]... [FILE]... add the specified files on the next commit