Merge branch 'stable'

CHANGES

@@ -48,9 +48,6 @@ Incompatible changes
   Use `Sphinx.set_translator()` API instead.
 * Drop python 2.6 and 3.3 support
 * Drop epub3 builder's ``epub3_page_progression_direction`` option (use ``epub3_writing_mode``).
-* #2931: code-block directive with same :caption: causes warning of duplicate
-  target.  Now `code-block` and `literalinclude` does not define hyperlink
-  target using its caption automatially.
 
 Features added
 --------------
@@ -150,6 +147,7 @@ Release 1.4.7 (in development)
 Bugs fixed
 ----------
 
+* #2890: Quickstart should return an error consistently on all error conditions
 * #2870: flatten genindex columns' heights.
 * #2856: Search on generated HTML site doesnt find some symbols
 * #2882: Fall back to a GET request on 403 status in linkcheck
@@ -162,6 +160,11 @@ Bugs fixed
 * #1462: autosummary warns for namedtuple with attribute with trailing underscore
 * Could not reference equations if ``:nowrap:`` option specified
 * #2873: code-block overflow in latex (due to commas)
+* #1060, #2056: sphinx.ext.intersphinx: broken links are generated if relative
+  paths are used in `intersphinx_mapping`
+* #2931: code-block directive with same :caption: causes warning of duplicate
+  target.  Now `code-block` and `literalinclude` does not define hyperlink
+  target using its caption automatially.
 
 Release 1.4.6 (released Aug 20, 2016)
 =====================================

sphinx/quickstart.py

@@ -606,7 +606,7 @@ def main(argv=sys.argv):
             if not set(['project', 'author']).issubset(d):
                 print('''"quiet" is specified, but any of "project" or \
 "author" is not specified.''')
-                return
+                return 1
 
         if set(['quiet', 'project', 'author']).issubset(d):
             # quiet mode with all required params satisfied, use default
@@ -627,13 +627,13 @@ def main(argv=sys.argv):
                            ' files already exist.'))
                 print('sphinx-quickstart only generate into a empty directory.'
                       ' Please specify a new root path.')
-                return
+                return 1
         else:
             ask_user(d)
     except (KeyboardInterrupt, EOFError):
         print()
         print('[Interrupted.]')
-        return
+        return 130  # 128 + SIGINT
 
     # decode values in d if value is a Python string literal
     for key, value in d.items():