diff --git a/doc/en/talks.txt b/doc/en/talks.txt index e458a3409..572102c69 100644 --- a/doc/en/talks.txt +++ b/doc/en/talks.txt @@ -12,8 +12,12 @@ Tutorial examples and blog postings Basic usage and funcargs: +- `pycon australia 2012 pytest talk from Brianna Laugher + `_ (`video `_, `slides `_, `code `_) +- `pycon 2012 US talk video from Holger Krekel `_ - `pycon 2010 tutorial PDF`_ and `tutorial1 repository`_ + Function arguments: - :ref:`mysetup`