Merge pull request #3642 from caramelomartins/master

Fixes # 3592 - Clarify Fixtures' Documentation
pytest-dev · Jul 12, 2018 · 6c37132 · 6c37132
2 parents 593b451 + aa47b64
commit 6c37132
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 96 deletions.
diff --git a/changelog/3592.doc.rst b/changelog/3592.doc.rst
@@ -0,0 +1 @@
+Use ``smtp_connection`` instead of ``smtp`` in fixtures documentation to avoid possible confusion.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use ``smtp_connection`` instead of ``smtp`` in fixtures documentation to avoid possible confusion.