Bruno Oliveira 1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features ...

# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py

2017-03-10 15:54:05 -03:00

..

_templates

Fix link to PDF docs

2016-09-06 21:17:54 +02:00

_themes

refine release process according to Bruno's feedback

2015-03-27 09:27:31 +01:00

announce

fix copy+paste error, its supposed to be 3.0.6

2017-01-22 18:44:30 +01:00

example

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

img

- preliminary sprint page, not yet linked through the header

2016-02-05 11:34:40 +01:00

proposals

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

test

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

adopt.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

assert.rst

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

backwards-compatibility.rst

add backwards compatibility policy

2016-07-17 21:14:16 +02:00

bash-completion.rst

Introduce pytest command as recommended entry point

2016-06-21 16:16:57 +02:00

builtin.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

cache.rst

regendoc

2017-01-22 18:44:30 +01:00

capture.rst

regendoc

2017-01-22 18:44:30 +01:00

changelog.rst

Changelog now in rst format (2.9.0 and onward) and add rst-lint check

2016-01-03 23:09:24 -02:00

check_sphinx.py

added "docs/en" directory and moved

2012-06-06 08:52:53 +09:00

conf.py

Fix typos

2016-12-31 19:01:15 +01:00

conftest.py

added "docs/en" directory and moved

2012-06-06 08:52:53 +09:00

contact.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

contents.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

contributing.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

customize.rst

Add venv to the default norecursedirs

2017-02-15 14:55:12 +01:00

doctest.rst

merge master into features

2017-01-26 12:00:52 +01:00

faq.rst

Remove mention of --assert=reinterp in documentation

2017-01-13 22:35:37 +01:00

fixture.rst

Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2017-03-10 15:54:05 -03:00

funcarg_compare.rst

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

funcargs.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

genapi.py

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

getting-started.rst

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

goodpractices.rst

Fix broken links

2017-01-02 14:19:49 -08:00

index.rst

regendoc

2017-01-22 18:44:30 +01:00

license.rst

Add full MIT license text to the docs section

2016-02-17 00:54:54 +00:00

links.inc

Convert readthedocs link for their .org -> .io migration for hosted projects

2016-05-18 17:12:39 +01:00

Makefile

docs: remove the need for special scripts

2016-09-05 16:42:33 +02:00

mark.rst

Add note that using marks on fixtures is not supported

2015-08-27 20:11:18 -03:00

monkeypatch.rst

Fix typos

2016-12-31 19:01:15 +01:00

naming20.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

nose.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

parametrize.rst

regendoc

2017-01-22 18:44:30 +01:00

plugins.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00

projects.rst

Fix typos

2016-12-31 19:01:15 +01:00

pytest.ini

added "docs/en" directory and moved

2012-06-06 08:52:53 +09:00

recwarn.rst

Merge branch 'master' into merge-master-into-features

2016-11-27 17:30:40 -02:00

setup.rst

Updated documentation from txt to rst

2015-08-04 16:41:02 +05:30

skipping.rst

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

talks.rst

Mention next training event.

2017-02-14 11:45:39 +00:00

tmpdir.rst

regendoc

2017-01-22 18:44:30 +01:00

unittest.rst

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

usage.rst

New-style classes implemented for python 2.7 - #2147

2017-02-16 20:28:17 +01:00

writing_plugins.rst

Fix typo in docs "textures" -> "fixtures"

2017-02-15 13:15:53 -02:00

xunit_setup.rst

setup_* and teardown_* functions argument now optional

2016-07-14 23:41:40 -03:00

yieldfixture.rst

docs warnings as errors and initial page similar to README

2016-08-26 17:47:18 -03:00