Merge branch '1.8'

resolved Conflicts:
	doc/development/tutorials/todo.rst
	sphinx/locale/__init__.py
	sphinx/search/zh.py

1 files changed, 3 insertions, 3 deletions

diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
index 79d601460..e955e34f5 100644
--- a/sphinx/locale/__init__.py
+++ b/sphinx/locale/__init__.py
@@ -155,7 +155,7 @@ def init(locale_dirs, language, catalog='sphinx', namespace='general'):
     """Look for message catalogs in `locale_dirs` and *ensure* that there is at
     least a NullTranslations catalog set in `translators`.  If called multiple
     times or if several ``.mo`` files are found, their contents are merged
-    together (thus making ``init`` reentrable).
+    together (thus making ``init`` reentrant).
     """
     global translators
     translator = translators.get((namespace, catalog))
@@ -314,8 +314,8 @@ admonitionlabels = {
     'warning':   _('Warning'),
 }
 
-# Moved to sphinx.directives.other (will be overrided later)
+# Moved to sphinx.directives.other (will be overriden later)
 versionlabels = {}  # type: Dict[str, str]
 
-# Moved to sphinx.domains.python (will be overrided later)
+# Moved to sphinx.domains.python (will be overriden later)
 pairindextypes = {}  # type: Dict[str, str]