diff --git a/contrib/lock-checker.py b/contrib/lock-checker.py
--- a/contrib/lock-checker.py
+++ b/contrib/lock-checker.py
@@ -35,7 +35,7 @@ def reposetup(ui, repo):
             return orig.transaction(self, *args, **kwargs)
 
         # TODO(durin42): kiilerix had a commented-out lock check in
-        # writebranchcache and _writerequirements
+        # _writebranchcache and _writerequirements
 
         def _tag(self, *args, **kwargs):
             _checklock(self)
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -205,7 +205,7 @@ def collapse(repo, first, last, commitop
         - message
         - date
         - username
-    Edition of commit message is trigered in all case.
+    Commit message is edited in all cases.
 
     This function works in memory."""
     ctxs = list(repo.set('%d::%d', first, last))
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -264,7 +264,7 @@ def validdest(repo, old, new):
         return True
     elif repo.obsstore:
         # We only need this complicated logic if there is obsolescence
-        # XXX will probably deserve an optimised rset.
+        # XXX will probably deserve an optimised revset.
 
         validdests = set([old])
         plen = -1
diff --git a/mercurial/store.py b/mercurial/store.py
--- a/mercurial/store.py
+++ b/mercurial/store.py
@@ -227,7 +227,7 @@ def _hybridencode(path, dotencode):
     characters are encoded as '~xx', where xx is the two digit hex code
     of the character (see encodefilename).
     Relevant path components consisting of Windows reserved filenames are
-    masked by encoding the third character ('aux' -> 'au~78', see auxencode).
+    masked by encoding the third character ('aux' -> 'au~78', see _auxencode).
 
     Hashed encoding (not reversible):