From 70bcd1fb7bb45bbbc896fdc1550a095049d077df Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 17 May 2017 17:17:19 -0300
Subject: [PATCH 1/3] Add a reference to Python testing book to talks docs

---
 doc/en/talks.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/en/talks.rst b/doc/en/talks.rst
index 85faf6455..f20f9450e 100644
--- a/doc/en/talks.rst
+++ b/doc/en/talks.rst
@@ -10,6 +10,12 @@ Talks and Tutorials
 
 .. _`funcargs`: funcargs.html
 
+Books
+---------------------------------------------
+
+- `Python Testing with pytest, by Brian Okken (2017)
+  <https://pragprog.com/book/bopytest/python-testing-with-pytest>`_.
+
 Talks and blog postings
 ---------------------------------------------
 

From f7247dc99dddefe16d827dd9fd86b395008c2a50 Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@devork.be>
Date: Wed, 17 May 2017 22:47:51 +0100
Subject: [PATCH 2/3] Remove past training

Leaving the sidebar as an example for in the future.
---
 doc/en/talks.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/en/talks.rst b/doc/en/talks.rst
index 85faf6455..63381b354 100644
--- a/doc/en/talks.rst
+++ b/doc/en/talks.rst
@@ -2,11 +2,12 @@
 Talks and Tutorials
 ==========================
 
-.. sidebar:: Next Open Trainings
+..
+   .. sidebar:: Next Open Trainings
 
-   `Professional Testing with Python
-   <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
-   26-28 April 2017, Leipzig, Germany.
+      `Professional Testing with Python
+      <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_,
+      26-28 April 2017, Leipzig, Germany.
 
 .. _`funcargs`: funcargs.html
 

From 598aefc686cf2149807342583856bd503c2743b5 Mon Sep 17 00:00:00 2001
From: Lev Maximov <lev.maximov@gmail.com>
Date: Thu, 18 May 2017 21:18:09 +0700
Subject: [PATCH 3/3] small fix in an example from the docs

---
 doc/en/example/simple.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
index b9f3daecc..5e5134c70 100644
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -269,6 +269,7 @@ running from a test you can do something like this:
         sys._called_from_test = True
 
     def pytest_unconfigure(config):
+        import sys
         del sys._called_from_test
 
 and then check for the ``sys._called_from_test`` flag: