holger krekel cb58eaa611 Merge remote-tracking branch 'upstream/master' into features ... Conflicts: _pytest/__init__.py testing/test_recwarn.py		2015-09-29 15:56:41 +02:00
..
_templates	Update sidebar links from Bitbucket to GitHub	2015-07-16 03:08:06 +00:00
_themes	refine release process according to Bruno's feedback	2015-03-27 09:27:31 +01:00
announce	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
example	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
img	Update CONTRIBUTING documentation with GitHub instructions	2015-07-16 03:07:16 +00:00
plugins_index	generate docs on python3.4	2015-09-22 16:52:35 +02:00
test	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
Makefile	fix documentation gegeneration, kill Makefile	2015-09-22 14:22:37 +02:00
_getdoctarget.py	Fix getdoctarget to ignore comment lines	2015-08-23 11:20:34 -03:00
adopt.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
assert.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
bash-completion.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
builtin.rst	Regenerate fixture list doc with cache docstring.	2015-09-25 18:41:07 +02:00
cache.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
capture.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
changelog.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
check_sphinx.py	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
conf.py	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
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	hide some parts from generating latexpdf	2015-09-29 13:37:30 +02:00
contributing.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
customize.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
doctest.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
faq.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
feedback.rst	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
fixture.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
funcarg_compare.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
funcargs.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
genapi.py	many doc improvements and fixes	2012-10-18 12:24:50 +02:00
getting-started.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
goodpractises.rst	Remove references to distutils as per Issue 766.	2015-09-21 12:00:48 +01:00
index.rst	Various Python 3.5 documentation mentions	2015-09-17 07:32:52 -04:00
links.inc	Fix broken links	2015-07-18 14:15:07 -03:00
mark.rst	Add note that using marks on fixtures is not supported	2015-08-27 20:11:18 -03:00
monkeypatch.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
naming20.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
nose.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
overview.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
parametrize.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
plugins.rst	Reorganize "Contents" page	2015-09-26 01:09:50 -03:00
projects.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
pytest.ini	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
recwarn.rst	Fixes #653 use deprecated_call as context_manager	2015-09-21 19:01:23 +01:00
setup.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
skipping.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
status.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
talks.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
tmpdir.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
unittest.rst	- fix a flaky test on py35-xdist by calling	2015-09-29 13:10:59 +02:00
usage.rst	Add note on docs about record_xml_property not working with xdist	2015-09-26 03:24:07 -03:00
writing_plugins.rst	Mention cookie-cutter in the docs and fix broken links to <extplugin>	2015-08-25 23:59:18 -03:00
xdist.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
xunit_setup.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
yieldfixture.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30