Merge branch 'master' into features

doc/en/example/parametrize.rst

@@ -333,7 +333,7 @@ The result of this test will be successful::
 Parametrizing test methods through per-class configuration
 --------------------------------------------------------------
 
-.. _`unittest parametrizer`: http://code.google.com/p/unittest-ext/source/browse/trunk/params.py
+.. _`unittest parametrizer`: https://github.com/testing-cabal/unittest-ext/blob/master/params.py
 
 
 Here is an example ``pytest_generate_function`` function implementing a

doc/en/faq.rst

@@ -120,7 +120,7 @@ in a managed class/module/function scope.
 
 .. _`Convention over Configuration`: http://en.wikipedia.org/wiki/Convention_over_Configuration
 
-Can I yield multiple values from a fixture function function?
+Can I yield multiple values from a fixture function?
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 There are two conceptual reasons why yielding from a factory function

doc/en/overview.rst

@@ -5,7 +5,6 @@ Getting started basics
 .. toctree::
    :maxdepth: 2
 
-   index
    getting-started
    usage
    goodpractises