Merge pull request #9616 from jdufresne/fix-url

Update Sphinx url: s|https?://sphinx-doc\.org/|https://www.sphinx-doc.org/|g
sphinx-doc · Sep 11, 2021 · 8416813 · 8416813
2 parents 3a67b49 + 7dd112b
commit 8416813
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -35,7 +35,7 @@
 epub_theme = 'epub'
 epub_basename = 'sphinx'
 epub_author = 'Georg Brandl'
-epub_publisher = 'https://sphinx-doc.org/'
+epub_publisher = 'https://www.sphinx-doc.org/'
 epub_uid = 'web-site'
 epub_scheme = 'url'
 epub_identifier = epub_publisher

diff --git a/doc/make.bat b/doc/make.bat
@@ -19,7 +19,7 @@ if errorlevel 9009 (
  echo.may add the Sphinx directory to PATH.
  echo.
  echo.If you don't have Sphinx installed, grab it from
- echo.https://sphinx-doc.org/
+ echo.https://www.sphinx-doc.org/
  exit /b 1
 )
 

diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst
@@ -2554,7 +2554,7 @@ Options for the linkcheck builder
 
  A dictionary that maps baseurls to HTTP request headers.
 
- The key is a URL base string like ``"https://sphinx-doc.org/"``. To specify
+ The key is a URL base string like ``"https://www.sphinx-doc.org/"``. To specify
  headers for other hosts, ``"*"`` can be used. It matches all hosts only when
  the URL does not match other settings.
 
@@ -2565,7 +2565,7 @@ Options for the linkcheck builder
  .. code-block:: python
 
  linkcheck_request_headers = {
- "https://sphinx-doc.org/": {
+ "https://www.sphinx-doc.org/": {
  "Accept": "text/html",
  "Accept-Encoding": "utf-8",
  },

diff --git a/doc/usage/extensions/graphviz.rst b/doc/usage/extensions/graphviz.rst
@@ -227,13 +227,13 @@ There are also these config values:
  attribute must be set, such as ``"_top"`` and ``"_blank"``. For example, the
  link in the following graph should work in the svg output: ::
 
-  .. graphviz::
+ .. graphviz::
 
-  digraph example {
-  a [label="sphinx", href="https://sphinx-doc.org", target="_top"];
-  b [label="other"];
-  a -> b;
-  }
+ digraph example {
+ a [label="sphinx", href="https://www.sphinx-doc.org/", target="_top"];
+ b [label="other"];
+ a -> b;
+ }
 
  .. versionadded:: 1.0
  Previously, output always was PNG.
diff --git a/sphinx/cmd/build.py b/sphinx/cmd/build.py
@@ -101,7 +101,7 @@ def jobs_argument(value: str) -> int:
 def get_parser() -> argparse.ArgumentParser:
  parser = argparse.ArgumentParser(
  usage='%(prog)s [OPTIONS] SOURCEDIR OUTPUTDIR [FILENAMES...]',
- epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+ epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
  description=__("""
 Generate documentation from source files.
 

diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py
@@ -467,7 +467,7 @@ def get_parser() -> argparse.ArgumentParser:
  )
  parser = argparse.ArgumentParser(
  usage='%(prog)s [OPTIONS] <PROJECT_DIR>',
- epilog=__("For more information, visit <http://sphinx-doc.org/>."),
+ epilog=__("For more information, visit <https://www.sphinx-doc.org/>."),
  description=description)
 
  parser.add_argument('-q', '--quiet', action='store_true', dest='quiet',

diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py
@@ -304,7 +304,7 @@ def get_parser() -> argparse.ArgumentParser:
  parser = argparse.ArgumentParser(
  usage='%(prog)s [OPTIONS] -o <OUTPUT_PATH> <MODULE_PATH> '
  '[EXCLUDE_PATTERN, ...]',
- epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+ epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
  description=__("""
 Look recursively in <MODULE_PATH> for Python modules and packages and create
 one reST file with automodule directives per package in the <OUTPUT_PATH>.

diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
@@ -595,7 +595,7 @@ def find_autosummary_in_lines(lines: List[str], module: str = None, filename: st
 def get_parser() -> argparse.ArgumentParser:
  parser = argparse.ArgumentParser(
  usage='%(prog)s [OPTIONS] <SOURCE_FILE>...',
- epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+ epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
  description=__("""
 Generate ReStructuredText using autosummary directives.
 

diff --git a/sphinx/ext/napoleon/__init__.py b/sphinx/ext/napoleon/__init__.py
@@ -309,11 +309,11 @@ def setup(app: Sphinx) -> Dict[str, Any]:
  See Also
  --------
  `The Sphinx documentation on Extensions
- <http://sphinx-doc.org/extensions.html>`_
+ <https://www.sphinx-doc.org/extensions.html>`_
 
- `The Extension Tutorial <http://sphinx-doc.org/extdev/tutorial.html>`_
+ `The Extension Tutorial <https://www.sphinx-doc.org/extdev/tutorial.html>`_
 
- `The Extension API <http://sphinx-doc.org/extdev/appapi.html>`_
+ `The Extension API <https://www.sphinx-doc.org/extdev/appapi.html>`_
 
  """
  if not isinstance(app, Sphinx):

diff --git a/sphinx/templates/quickstart/make.bat.new_t b/sphinx/templates/quickstart/make.bat.new_t
@@ -21,7 +21,7 @@ if errorlevel 9009 (
  echo.may add the Sphinx directory to PATH.
  echo.
  echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
+ echo.https://www.sphinx-doc.org/
  exit /b 1
 )
 

diff --git a/sphinx/templates/quickstart/make.bat_t b/sphinx/templates/quickstart/make.bat_t
@@ -70,7 +70,7 @@ if errorlevel 9009 (
  echo.may add the Sphinx directory to PATH.
  echo.
  echo.If you don't have Sphinx installed, grab it from
- echo.https://sphinx-doc.org/
+ echo.https://www.sphinx-doc.org/
  exit /b 1
 )
 

diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls
@@ -1,5 +1,5 @@
 %
-% sphinxhowto.cls for Sphinx (http://sphinx-doc.org/)
+% sphinxhowto.cls for Sphinx (https://www.sphinx-doc.org/)
 %
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]

diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls
@@ -1,5 +1,5 @@
 %
-% sphinxmanual.cls for Sphinx (http://sphinx-doc.org/)
+% sphinxmanual.cls for Sphinx (https://www.sphinx-doc.org/)
 %
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]