diff options
author | holger krekel <holger@merlinux.eu> | 2013-07-03 11:47:18 +0200 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2013-07-03 11:47:18 +0200 |
commit | ea4a3adfd6fe78df5103b499fb7123433041aa7a (patch) | |
tree | 835865d843b3196485ffbfa33f77172548c26f9d /doc | |
parent | c4c966683c082aedb461f94b49e1ef73e4346037 (diff) | |
download | pytest-ea4a3adfd6fe78df5103b499fb7123433041aa7a.tar.gz |
- add my ep2013 talk to talks page
- add "talks/blogs" to the navigation side bar
Diffstat (limited to 'doc')
-rw-r--r-- | doc/en/_templates/localtoc.html | 2 | ||||
-rw-r--r-- | doc/en/index.txt | 3 | ||||
-rw-r--r-- | doc/en/talks.txt | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/doc/en/_templates/localtoc.html b/doc/en/_templates/localtoc.html index 916ea4149..25d56cad0 100644 --- a/doc/en/_templates/localtoc.html +++ b/doc/en/_templates/localtoc.html @@ -31,6 +31,8 @@ <a href="https://bitbucket.org/hpk42/pytest/issues?status=new&status=open">issues[bb]</a> </td><td> <a href="{{ pathto('contact') }}">contact</a> +</td></tr><tr><td> + <a href="{{ pathto('talks') }}">Talks/Posts</a> </td></tr></table> </div> {% extends "basic/localtoc.html" %} diff --git a/doc/en/index.txt b/doc/en/index.txt index e411ad9b0..0ee4fed2f 100644 --- a/doc/en/index.txt +++ b/doc/en/index.txt @@ -4,9 +4,6 @@ pytest: helps you write better programs ============================================= -.. note:: Upcoming: `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig. - - **a mature full-featured Python testing tool** - runs on Posix/Windows, Python 2.4-3.3, PyPy and Jython-2.5.1 diff --git a/doc/en/talks.txt b/doc/en/talks.txt index ececdd49d..4d562c30f 100644 --- a/doc/en/talks.txt +++ b/doc/en/talks.txt @@ -4,8 +4,6 @@ Talks and Tutorials .. _`funcargs`: funcargs.html -.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig. - Tutorial examples and blog postings --------------------------------------------- |