diff --git a/contrib/mercurial.el b/contrib/mercurial.el --- a/contrib/mercurial.el +++ b/contrib/mercurial.el @@ -461,7 +461,7 @@ Each key is of the form (section . name) (defun hg-complete-repo (string predicate all) "Attempt to complete a repository name. We complete on either symbolic names from Mercurial's config or real -directory names from the file system. We do not penalise URLs." +directory names from the file system. We do not penalize URLs." (or (if all (all-completions string hg-repo-completion-table predicate) (try-completion string hg-repo-completion-table predicate)) diff --git a/contrib/vim/hgcommand.vim b/contrib/vim/hgcommand.vim --- a/contrib/vim/hgcommand.vim +++ b/contrib/vim/hgcommand.vim @@ -27,7 +27,7 @@ " " You still can read the documentation at the end of this file. Locate it by " searching the "hgcommand-contents" string (and set ft=help to have -" appropriate syntaxic coloration). +" appropriate syntactic coloration). " Section: Plugin header {{{1 @@ -752,7 +752,7 @@ function! s:HGCommit(...) " Protect against case and backslash issues in Windows. let autoPattern = '\c' . messageFileName - " Ensure existance of group + " Ensure existence of group augroup HGCommit augroup END diff --git a/contrib/vim/patchreview.vim b/contrib/vim/patchreview.vim --- a/contrib/vim/patchreview.vim +++ b/contrib/vim/patchreview.vim @@ -17,7 +17,7 @@ " " 0.2.1 - Minor temp directory autodetection logic and cleanup " -" 0.2 - Removed the need for filterdiff by implemeting it in pure vim script +" 0.2 - Removed the need for filterdiff by implementing it in pure vim script " - Added DiffReview command for reverse (changed repository to " pristine state) reviews. " (PatchReview does pristine repository to patch review) diff --git a/doc/hgmanpage.py b/doc/hgmanpage.py --- a/doc/hgmanpage.py +++ b/doc/hgmanpage.py @@ -158,7 +158,7 @@ class Translator(nodes.NodeVisitor): """""" words_and_spaces = re.compile(r'\S+| +|\n') - document_start = """Man page generated from reStructeredText.""" + document_start = """Man page generated from reStructuredText.""" def __init__(self, document): nodes.NodeVisitor.__init__(self, document) @@ -900,7 +900,7 @@ class Translator(nodes.NodeVisitor): # ``.PP`` : Start standard indented paragraph. # ``.LP`` : Start block paragraph, all except the first. # ``.P [type]`` : Start paragraph type. - # NOTE dont use paragraph starts because they reset indentation. + # NOTE don't use paragraph starts because they reset indentation. # ``.sp`` is only vertical space self.ensure_eol() self.body.append('.sp\n') diff --git a/hgext/bugzilla.py b/hgext/bugzilla.py --- a/hgext/bugzilla.py +++ b/hgext/bugzilla.py @@ -45,7 +45,7 @@ Access via XMLRPC/email uses XMLRPC to q email to the Bugzilla email interface to submit comments to bugs. The From: address in the email is set to the email address of the Mercurial user, so the comment appears to come from the Mercurial user. In the event -that the Mercurial user email is not recognised by Bugzilla as a Bugzilla +that the Mercurial user email is not recognized by Bugzilla as a Bugzilla user, the email associated with the Bugzilla username used to log into Bugzilla is used instead as the source of the comment. Marking bugs fixed works on all supported Bugzilla versions. @@ -53,7 +53,7 @@ works on all supported Bugzilla versions Configuration items common to all access modes: bugzilla.version - This access type to use. Values recognised are: + The access type to use. Values recognized are: :``xmlrpc``: Bugzilla XMLRPC interface. :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces. @@ -303,7 +303,7 @@ class bzaccess(object): # Methods to be implemented by access classes. # # 'bugs' is a dict keyed on bug id, where values are a dict holding - # updates to bug state. Recognised dict keys are: + # updates to bug state. Recognized dict keys are: # # 'hours': Value, float containing work hours to be updated. # 'fix': If key present, bug is to be marked fixed. Value ignored. diff --git a/hgext/convert/transport.py b/hgext/convert/transport.py --- a/hgext/convert/transport.py +++ b/hgext/convert/transport.py @@ -43,7 +43,7 @@ def _create_auth_baton(pool): svn.client.get_ssl_client_cert_pw_file_provider(pool), svn.client.get_ssl_server_trust_file_provider(pool), ] - # Platform-dependant authentication methods + # Platform-dependent authentication methods getprovider = getattr(svn.core, 'svn_auth_get_platform_specific_provider', None) if getprovider: diff --git a/hgext/eol.py b/hgext/eol.py --- a/hgext/eol.py +++ b/hgext/eol.py @@ -99,7 +99,7 @@ testedwith = 'internal' # Matches a lone LF, i.e., one that is not part of CRLF. singlelf = re.compile('(^|[^\r])\n') # Matches a single EOL which can either be a CRLF where repeated CR -# are removed or a LF. We do not care about old Machintosh files, so a +# are removed or a LF. We do not care about old Macintosh files, so a # stray CR is an error. eolre = re.compile('\r*\n') diff --git a/hgext/inotify/linux/_inotify.c b/hgext/inotify/linux/_inotify.c --- a/hgext/inotify/linux/_inotify.c +++ b/hgext/inotify/linux/_inotify.c @@ -61,7 +61,7 @@ PyDoc_STRVAR( init_doc, "init() -> fd\n" "\n" - "Initialise an inotify instance.\n" + "Initialize an inotify instance.\n" "Return a file descriptor associated with a new inotify event queue."); static PyObject *add_watch(PyObject *self, PyObject *args) diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1696,7 +1696,7 @@ def debugdag(ui, repo, file_=None, *revs """format the changelog or an index DAG as a concise textual description If you pass a revlog index, the revlog's DAG is emitted. If you list - revision numbers, they get labelled in the output as rN. + revision numbers, they get labeled in the output as rN. Otherwise, the changelog DAG of the current repo is emitted. """ diff --git a/mercurial/config.py b/mercurial/config.py --- a/mercurial/config.py +++ b/mercurial/config.py @@ -67,9 +67,9 @@ class config(object): return self._data.get(section, {}).get(item, default) def backup(self, section, item): - """return a tuple allowing restore to reinstall previous values + """return a tuple allowing restore to reinstall a previous value - The main reason we need it is because it handle the "no data" case. + The main reason we need it is because it handles the "no data" case. """ try: value = self._data[section][item] diff --git a/mercurial/dagparser.py b/mercurial/dagparser.py --- a/mercurial/dagparser.py +++ b/mercurial/dagparser.py @@ -56,13 +56,13 @@ def parsedag(desc): ... :forkhere # a label for the last of the 3 nodes from above ... +5 # 5 more nodes on one branch ... :mergethis # label again - ...