diff --git a/doc/conf.py b/doc/conf.py index add9e8d6158..220774b7f6b 100644 --- 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 index fb183035edd..e2bd7eaf901 100644 --- 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 index 0ae9cd5dfc3..d3eb462a0d3 100644 --- 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 index e90231a1c17..94a3c93e1cd 100644 --- 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/setup.py b/setup.py index 4a1d5aeedf7..2b4504101df 100644 --- a/setup.py +++ b/setup.py @@ -176,7 +176,7 @@ def _run_domain_js(self, domain): setup( name='Sphinx', version=sphinx.__version__, - url='https://sphinx-doc.org/', + url='https://www.sphinx-doc.org/', download_url='https://pypi.org/project/Sphinx/', license='BSD', author='Georg Brandl', diff --git a/sphinx/cmd/build.py b/sphinx/cmd/build.py index 32a89eb2994..9df13e930c7 100644 --- 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 .'), + epilog=__('For more information, visit .'), description=__(""" Generate documentation from source files. diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index 7dfc29e192f..ca30f97beff 100644 --- 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] ', - epilog=__("For more information, visit ."), + epilog=__("For more information, visit ."), description=description) parser.add_argument('-q', '--quiet', action='store_true', dest='quiet', diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py index 471761c11bd..39bb514fc19 100644 --- 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 ' '[EXCLUDE_PATTERN, ...]', - epilog=__('For more information, visit .'), + epilog=__('For more information, visit .'), description=__(""" Look recursively in for Python modules and packages and create one reST file with automodule directives per package in the . diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py index 4f3493659da..a5c8ce11fde 100644 --- 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] ...', - epilog=__('For more information, visit .'), + epilog=__('For more information, visit .'), description=__(""" Generate ReStructuredText using autosummary directives. diff --git a/sphinx/ext/napoleon/__init__.py b/sphinx/ext/napoleon/__init__.py index 8e513a9d015..6fb1c3cb38b 100644 --- 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 - `_ + `_ - `The Extension Tutorial `_ + `The Extension Tutorial `_ - `The Extension API `_ + `The Extension API `_ """ if not isinstance(app, Sphinx): diff --git a/sphinx/templates/quickstart/make.bat.new_t b/sphinx/templates/quickstart/make.bat.new_t index 1bb2f34896f..ab30130c97a 100644 --- 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 index e5d93d1aedd..dfc619ae3c0 100644 --- 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 index 0848a79fdb5..951cf810df0 100644 --- 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 index 718189d5712..2e4b30d921c 100644 --- 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]