From b93aa5e35f8ea95d6ab74c1953dead2ea3a14688 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sat, 6 Jan 2018 08:01:34 -0800 Subject: [PATCH 1/2] Prefer https://*.readthedocs.io over http://*.rtfd.org - Requests URL using https instead of http - Avoids unnecessary redirect of *.rtfd.org -> *.readthedocs.io *.rtfd.org exists as a means for pasting short URLs, which doesn't much apply for links in documentation. --- changelog/3092.doc | 1 + doc/en/projects.rst | 2 +- doc/en/tmpdir.rst | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 changelog/3092.doc diff --git a/changelog/3092.doc b/changelog/3092.doc new file mode 100644 index 000000000..fef526d2c --- /dev/null +++ b/changelog/3092.doc @@ -0,0 +1 @@ +Prefer https://*.readthedocs.io over http://*.rtfd.org for links in the documentation. diff --git a/doc/en/projects.rst b/doc/en/projects.rst index 86df99ab2..51f2d94fd 100644 --- a/doc/en/projects.rst +++ b/doc/en/projects.rst @@ -37,7 +37,7 @@ Here are some examples of projects using ``pytest`` (please send notes via :ref: * `mwlib `_ mediawiki parser and utility library * `The Translate Toolkit `_ for localization and conversion * `execnet `_ rapid multi-Python deployment -* `pylib `_ cross-platform path, IO, dynamic code library +* `pylib `_ cross-platform path, IO, dynamic code library * `Pacha `_ configuration management in five minutes * `bbfreeze `_ create standalone executables from Python scripts * `pdb++ `_ a fancier version of PDB diff --git a/doc/en/tmpdir.rst b/doc/en/tmpdir.rst index b8174484e..b9c371e40 100644 --- a/doc/en/tmpdir.rst +++ b/doc/en/tmpdir.rst @@ -106,6 +106,4 @@ When distributing tests on the local machine, ``pytest`` takes care to configure a basetemp directory for the sub processes such that all temporary data lands below a single per-test run basetemp directory. -.. _`py.path.local`: http://py.rtfd.org/en/latest/path.html - - +.. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html From f3c666db3c6ff5d16544ded10496513c1153e8e4 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 6 Jan 2018 14:08:15 -0200 Subject: [PATCH 2/2] Small formatting update in CHANGELOG --- changelog/3092.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/3092.doc b/changelog/3092.doc index fef526d2c..6001b8e22 100644 --- a/changelog/3092.doc +++ b/changelog/3092.doc @@ -1 +1 @@ -Prefer https://*.readthedocs.io over http://*.rtfd.org for links in the documentation. +Prefer ``https://*.readthedocs.io`` over ``http://*.rtfd.org`` for links in the documentation.