Merge pull request #4823 from tk0miya/4817_fix_URLs

Fix #4817: wrong URLs on warning messages

CHANGES

@@ -23,6 +23,7 @@ Bugs fixed
 * #4783: On windows, Sphinx crashed when drives of srcdir and outdir are
   different
 * #4812: autodoc ignores type annotated variables
+* #4817: wrong URLs on warning messages
 
 Testing
 --------

sphinx/templates/quickstart/conf.py_t

@@ -4,7 +4,7 @@
 #
 # This file does only contain a selection of the most common options. For a
 # full list see the documentation:
-# http://www.sphinx-doc.org/en/stable/config
+# http://www.sphinx-doc.org/en/master/config
 
 # -- Path setup --------------------------------------------------------------
 

sphinx/writers/html.py

@@ -873,7 +873,7 @@ class HTMLTranslator(BaseTranslator):
         # type: (nodes.Node, unicode) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html',
+                       'described at http://sphinx-doc.org/en/master/ext/math.html',
                        location=(self.builder.current_docname, node.line))
         raise nodes.SkipNode
 

sphinx/writers/html5.py

@@ -827,7 +827,7 @@ class HTML5Translator(BaseTranslator):
         # type: (nodes.Node, unicode) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html',
+                       'described at http://sphinx-doc.org/en/master/ext/math.html',
                        location=(self.builder.current_docname, node.line))
         raise nodes.SkipNode
 

sphinx/writers/latex.py

@@ -2630,7 +2630,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         # type: (nodes.Node) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html',
+                       'described at http://sphinx-doc.org/en/master/ext/math.html',
                        location=(self.curfilestack[-1], node.line))
         raise nodes.SkipNode
 

sphinx/writers/manpage.py

@@ -515,7 +515,7 @@ class ManualPageTranslator(BaseTranslator):
         # type: (nodes.Node) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html')
+                       'described at http://sphinx-doc.org/en/master/ext/math.html')
         raise nodes.SkipNode
 
     visit_math_block = visit_math

sphinx/writers/texinfo.py

@@ -1745,7 +1745,7 @@ class TexinfoTranslator(nodes.NodeVisitor):
         # type: (nodes.Node) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html')
+                       'described at http://sphinx-doc.org/en/master/ext/math.html')
         raise nodes.SkipNode
 
     visit_math_block = visit_math

sphinx/writers/text.py

@@ -1185,7 +1185,7 @@ class TextTranslator(nodes.NodeVisitor):
         # type: (nodes.Node) -> None
         logger.warning('using "math" markup without a Sphinx math extension '
                        'active, please use one of the math extensions '
-                       'described at http://sphinx-doc.org/ext/math.html',
+                       'described at http://sphinx-doc.org/en/master/ext/math.html',
                        location=(self.builder.current_docname, node.line))
         raise nodes.SkipNode