summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-05-08 11:57:55 -0700
committerSteve Piercy <web@stevepiercy.com>2016-05-08 11:57:55 -0700
commitd0c1f9ad5e82c265974f5c678c9d4ea459375593 (patch)
tree50bf7da9a1ee4910a1ef518ede03c1ba5dd33cad
parent8b18ae8fa7f7f51aec7e1fa3a23be8adbb5f88f2 (diff)
parentf06f2e8d39a186fbd8b46fdecd1e5bff42070407 (diff)
downloadpyramid-d0c1f9ad5e82c265974f5c678c9d4ea459375593.tar.gz
pyramid-d0c1f9ad5e82c265974f5c678c9d4ea459375593.tar.bz2
pyramid-d0c1f9ad5e82c265974f5c678c9d4ea459375593.zip
Merge pull request #2558 from vincent-ferotin/vincent-ferotin-scaffolds-allow-pytest-run-without-args
Vincent ferotin : scaffolds allow pytest run without args: fix typos and sign contributor agreement
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--docs/tutorials/wiki/tests.rst4
2 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 563a995a9..55fdf096b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -266,3 +266,5 @@ Contributors
- Marcin Raczyński, 2016/01/26
- Arian Maykon de A. Diógenes, 2016/04/13
+
+- Vincent Férotin, 2016/05/08
diff --git a/docs/tutorials/wiki/tests.rst b/docs/tutorials/wiki/tests.rst
index aa4cb3597..85a023cc9 100644
--- a/docs/tutorials/wiki/tests.rst
+++ b/docs/tutorials/wiki/tests.rst
@@ -52,8 +52,8 @@ Running the tests
=================
We can run these tests by using ``py.test`` similarly to how we did in
-:ref:`running_tests`. Courtest of the scaffold, our testing dependencies have
-already been satisfied and ``py.test`` and coverage has already been
+:ref:`running_tests`. Courtesy of the scaffold, our testing dependencies have
+already been satisfied and ``py.test`` and coverage have already been
configured, so we can jump right to running tests.
On UNIX: