Merge branch 'stable'

CHANGES

@@ -25,9 +25,16 @@ Documentation
 -------------
 
 
-Release 1.4.2 (in development)
+Release 1.4.3 (in development)
 ==============================
 
+Bugs fixed
+----------
+
+
+Release 1.4.2 (released May 29, 2016)
+=====================================
+
 Features added
 --------------
 
@@ -98,6 +105,7 @@ Bugs fixed
 * #2581: The search doesn't work if language="es" (spanish)
 * #2382: Adjust spacing after abbreviations on figure numbers in LaTeX writer
 * #2383: The generated footnote by `latex_show_urls` overflows lines
+* #2497, #2552: The label of search button does not fit for the button itself
 
 
 Release 1.4.1 (released Apr 12, 2016)

sphinx/themes/basic/searchbox.html

@@ -11,8 +11,8 @@
 <div id="searchbox" style="display: none" role="search">
   <h3>{{ _('Quick search') }}</h3>
     <form class="search" action="{{ pathto('search') }}" method="get">
-      <input type="text" name="q" />
-      <input type="submit" value="{{ _('Go') }}" />
+      <div><input type="text" name="q" /></div>
+      <div><input type="submit" value="{{ _('Go') }}" /></div>
       <input type="hidden" name="check_keywords" value="yes" />
       <input type="hidden" name="area" value="default" />
     </form>

sphinx/themes/basic/static/basic.css_t

@@ -85,10 +85,6 @@ div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar #searchbox input[type="submit"] {
-    width: 30px;
-}
-
 img {
     border: 0;
     max-width: 100%;

sphinx/writers/latex.py

@@ -286,7 +286,7 @@ def width_to_latex_length(length_str):
 
 def escape_abbr(text):
     """Adjust spacing after abbreviations."""
-    return text.replace('.', '.\\@')
+    return re.sub('\.(?=\s|$)', '.\\@', text)
 
 
 class LaTeXTranslator(nodes.NodeVisitor):

tests/test_correct_year.py

@@ -16,10 +16,10 @@ from util import TestApp
 def test_correct_year():
     try:
         # save current value of SOURCE_DATE_EPOCH
-        sde = os.environ.pop('SOURCE_DATE_EPOCH',None)
+        sde = os.environ.pop('SOURCE_DATE_EPOCH', None)
 
         # test with SOURCE_DATE_EPOCH unset: no modification
-        app = TestApp(buildername='html',testroot='correct-year')
+        app = TestApp(buildername='html', testroot='correct-year')
         app.builder.build_all()
         content = (app.outdir / 'contents.html').text()
         app.cleanup()
@@ -28,14 +28,14 @@ def test_correct_year():
         # test with SOURCE_DATE_EPOCH set: copyright year should be
         # updated
         os.environ['SOURCE_DATE_EPOCH'] = "1293840000"
-        app = TestApp(buildername='html',testroot='correct-year')
+        app = TestApp(buildername='html', testroot='correct-year')
         app.builder.build_all()
         content = (app.outdir / 'contents.html').text()
         app.cleanup()
         assert '2006-2011' in content
 
         os.environ['SOURCE_DATE_EPOCH'] = "1293839999"
-        app = TestApp(buildername='html',testroot='correct-year')
+        app = TestApp(buildername='html', testroot='correct-year')
         app.builder.build_all()
         content = (app.outdir / 'contents.html').text()
         app.cleanup()
@@ -43,7 +43,7 @@ def test_correct_year():
 
     finally:
         # Restores SOURCE_DATE_EPOCH
-        if sde == None:
-            os.environ.pop('SOURCE_DATE_EPOCH',None)
+        if sde is None:
+            os.environ.pop('SOURCE_DATE_EPOCH', None)
         else:
             os.environ['SOURCE_DATE_EPOCH'] = sde

utils/release-checklist

@@ -8,13 +8,15 @@ Release checklist
 * Update release date in CHANGES
 * `git commit`
 * `make clean`
-* `python setup.py release bdist_wheel sdist upload`
+* `python setup.py release bdist_wheel sdist upload  --identify=[your key]`
 * Check PyPI release page for obvious errors
 * `git tag` with version number
 * Merge default into stable if final major release
-* Update homepage (release info), regenerate docs (+printable!)
+* `git push stable --tags`
+* Open https://readthedocs.org/dashboard/sphinx/versions/ and enable the released version
 * Add new version/milestone to tracker categories
-* Write announcement and send to mailing list/python-announce
+* Write announcement and send to sphinx-dev, sphinx-users and python-announce
 * Update version info, add new CHANGES entry for next version
 * `git commit`
 * `git push`
+* Update `sphinx-doc-translations <https://github.com/sphinx-doc/sphinx-doc-translations>`_