Merge branch 'master' into features

2016-01-02 23:56:01 +01:00
parent bf4de4bd68 80d6d94635
commit 6c170201d6
12 changed files with 239 additions and 68 deletions
@@ -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