summaryrefslogtreecommitdiff
path: root/doc/en/usage.rst
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2016-07-06 11:51:48 +0200
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2016-07-06 11:51:48 +0200
commitb9a91dc112efa64c5723912234e5ebd074821068 (patch)
treea921c30e533973381f76b8aba8d3bb11c269d41c /doc/en/usage.rst
parentf31c31a73c4bfccf02589423e6c9f0d7175112b5 (diff)
parentcc0920ceb105b832cef1aec6d4422226ffbaf473 (diff)
downloadpytest-b9a91dc112efa64c5723912234e5ebd074821068.tar.gz
merge from master to features
Diffstat (limited to 'doc/en/usage.rst')
-rw-r--r--doc/en/usage.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/en/usage.rst b/doc/en/usage.rst
index 06cc18969..c2a269a15 100644
--- a/doc/en/usage.rst
+++ b/doc/en/usage.rst
@@ -79,7 +79,7 @@ than ``--tb=long``). It also ensures that a stack trace is printed on
**KeyboardInterrrupt** (Ctrl+C).
This is very useful if the tests are taking too long and you interrupt them
with Ctrl+C to find out where the tests are *hanging*. By default no output
-will be shown (because KeyboardInterrupt is catched by pytest). By using this
+will be shown (because KeyboardInterrupt is caught by pytest). By using this
option you make sure a trace is shown.
Dropping to PDB_ (Python Debugger) on failures