Merge branch 'stable'

CHANGES

@@ -90,6 +90,7 @@ Bugs fixed
 * #3803: Sphinx crashes with invalid PO files
 * #3791: PDF "continued on next page" for long tables isn't internationalized
 * #3788: smartquotes emits warnings for unsupported languages
+* #3807: docs do not say Latexmk is dependency on Windows for ``make latexpdf``
 
 Testing
 --------
@@ -105,7 +106,7 @@ Dependencies
 * (updated) latex output is tested with Ubuntu trusty's texlive packages (Feb.
   2014) and earlier tex installations may not be fully compliant, particularly
   regarding Unicode engines xelatex and lualatex
-* (added) latexmk is required for ``make latexpdf`` on Unix-like platforms
+* (added) latexmk is required for ``make latexpdf``
   (refs: #3082)
 
 Incompatible changes

doc/builders.rst

@@ -180,9 +180,9 @@ The builder's "name" must be given to the **-b** command-line option of
          Formerly, testing had been done for some years on Ubuntu precise
          (based on TeXLive 2009).
       .. versionchanged:: 1.6
-         Use of ``latexmk`` on GNU/Linux or Mac OS X.
+         Use of ``latexmk`` for ``make latexpdf``
 
-      Since 1.6, and on GNU/Linux and Mac OS X, ``make latexpdf`` (or
+      Since 1.6, ``make latexpdf`` (or
       ``make -C "<builddir>/latex"`` after a ``sphinx-build`` run) uses
       ``latexmk``. One can pass to ``latexmk`` options via the ``LATEXMKOPTS``
       Makefile variable. For example:

sphinx/environment/__init__.py

@@ -678,7 +678,7 @@ class BuildEnvironment(object):
         self.settings['smart_quotes'] = True
         for tag in normalize_language_tag(language):
             if tag in smartchars.quotes:
-                    break
+                break
         else:
             self.settings['smart_quotes'] = False