Skip to content

Commit fd765f8

Browse files
authored
Merge pull request #1772 from nicoddemus/pdf-link
Fix pdf links in docs and point to docs.pytest.org in README
2 parents d911bfc + 9a68681 commit fd765f8

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

README.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.. image:: http://pytest.org/latest/_static/pytest1.png
2-
:target: http://pytest.org
1+
.. image:: http://docs.pytest.org/en/latest/_static/pytest1.png
2+
:target: http://docs.pytest.org
33
:align: center
44
:alt: pytest
55

@@ -51,33 +51,33 @@ To execute it::
5151
test_sample.py:5: AssertionError
5252
======= 1 failed in 0.12 seconds ========
5353

54-
Due to ``py.test``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <http://pytest.org/latest/getting-started.html#our-first-test-run>`_ for more examples.
54+
Due to ``py.test``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <http://docs.pytest.org/en/latest/getting-started.html#our-first-test-run>`_ for more examples.
5555

5656

5757
Features
5858
--------
5959

60-
- Detailed info on failing `assert statements <http://pytest.org/latest/assert.html>`_ (no need to remember ``self.assert*`` names);
60+
- Detailed info on failing `assert statements <http://docs.pytest.org/en/latest/assert.html>`_ (no need to remember ``self.assert*`` names);
6161

6262
- `Auto-discovery
63-
<http://pytest.org/latest/goodpractices.html#python-test-discovery>`_
63+
<http://docs.pytest.org/en/latest/goodpractices.html#python-test-discovery>`_
6464
of test modules and functions;
6565

66-
- `Modular fixtures <http://pytest.org/latest/fixture.html>`_ for
66+
- `Modular fixtures <http://docs.pytest.org/en/latest/fixture.html>`_ for
6767
managing small or parametrized long-lived test resources;
6868

69-
- Can run `unittest <http://pytest.org/latest/unittest.html>`_ (or trial),
70-
`nose <http://pytest.org/latest/nose.html>`_ test suites out of the box;
69+
- Can run `unittest <http://docs.pytest.org/en/latest/unittest.html>`_ (or trial),
70+
`nose <http://docs.pytest.org/en/latest/nose.html>`_ test suites out of the box;
7171

7272
- Python2.6+, Python3.2+, PyPy-2.3, Jython-2.5 (untested);
7373

74-
- Rich plugin architecture, with over 150+ `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_ and thriving community;
74+
- Rich plugin architecture, with over 150+ `external plugins <http://docs.pytest.org/en/latest/plugins.html#installing-external-plugins-searching>`_ and thriving community;
7575

7676

7777
Documentation
7878
-------------
7979

80-
For full documentation, including installation, tutorials and PDF documents, please see http://pytest.org.
80+
For full documentation, including installation, tutorials and PDF documents, please see http://docs.pytest.org.
8181

8282

8383
Bugs/Requests
@@ -89,7 +89,7 @@ Please use the `GitHub issue tracker <https://github.com/pytest-dev/pytest/issue
8989
Changelog
9090
---------
9191

92-
Consult the `Changelog <http://pytest.org/latest/changelog.html>`_ page for fixes and enhancements of each version.
92+
Consult the `Changelog <http://docs.pytest.org/en/latest/changelog.html>`_ page for fixes and enhancements of each version.
9393

9494

9595
License

doc/en/contents.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Full pytest documentation
44
===========================
55

6-
`Download latest version as PDF <pytest.pdf>`_
6+
`Download latest version as PDF <https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
77

88
.. `Download latest version as EPUB <http://media.readthedocs.org/epub/pytest/latest/pytest.epub>`_
99

doc/en/getting-started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Installation and Getting Started
1111
`colorama (Windows) <http://pypi.python.org/pypi/colorama>`_,
1212
`argparse (py26) <http://pypi.python.org/pypi/argparse>`_.
1313

14-
**documentation as PDF**: `download latest <http://pytest.org/latest/pytest.pdf>`_
14+
**documentation as PDF**: `download latest <https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
1515

1616
.. _`getstarted`:
1717
.. _installation:

doc/en/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pytest: helps you write better programs
1010
- free and open source software, distributed under the terms of the :ref:`MIT license <license>`
1111
- **well tested** with more than a thousand tests against itself
1212
- **strict backward compatibility policy** for safe pytest upgrades
13-
- :ref:`comprehensive online <toc>` and `PDF documentation <pytest.pdf>`_
13+
- :ref:`comprehensive online <toc>` and `PDF documentation <https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
1414
- many :ref:`third party plugins <extplugins>` and :ref:`builtin helpers <pytest helpers>`,
1515
- used in :ref:`many small and large projects and organisations <projects>`
1616
- comes with many :ref:`tested examples <examples>`

0 commit comments

Comments
 (0)