summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-10-25 16:50:05 +0200
committerholger krekel <holger@merlinux.eu>2013-10-25 16:50:05 +0200
commitf674c57d1a3511845ae0103dca552e34499c0685 (patch)
tree30ecb8b16438259a502ccadce59d93d65b6c4e81
parent9dec27371d6efb4f33b15b8c8f1a0eb54e3094db (diff)
downloadpytest-f674c57d1a3511845ae0103dca552e34499c0685.tar.gz
add german pytest talk (pyconde2013)
-rw-r--r--doc/en/talks.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index 4d562c30f..ed31dd058 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -10,7 +10,10 @@ Tutorial examples and blog postings
.. _`tutorial1 repository`: http://bitbucket.org/hpk42/pytest-tutorial1/
.. _`pycon 2010 tutorial PDF`: http://bitbucket.org/hpk42/pytest-tutorial1/raw/tip/pytest-basic.pdf
-Basic usage and funcargs:
+Basic usage and fixtures:
+
+- `pytest feature and release highlights (GERMAN, October 2013)
+ <http://pyvideo.org/video/2429/pytest-feature-and-new-release-highlights>`_
- `pytest introduction from Brian Okken (January 2013)
<http://pythontesting.net/framework/pytest-introduction/>`_