summaryrefslogtreecommitdiff
path: root/docs/typographical-conventions.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:33:18 -0700
committerGitHub <noreply@github.com>2018-10-05 02:33:18 -0700
commit086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/typographical-conventions.rst
parent2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff)
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
downloadpyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2
pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip
Merge branch 'master' into one_cc
Diffstat (limited to 'docs/typographical-conventions.rst')
-rw-r--r--docs/typographical-conventions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/typographical-conventions.rst b/docs/typographical-conventions.rst
index 76fdf8ace..7f052cbc8 100644
--- a/docs/typographical-conventions.rst
+++ b/docs/typographical-conventions.rst
@@ -128,7 +128,7 @@ When a command that should be typed on one line is too long to fit on the displa
.. code-block:: bash
- $VENV/bin/py.test tutorial/tests.py --cov-report term-missing \
+ $VENV/bin/pytest tutorial/tests.py --cov-report term-missing \
--cov=tutorial -q