aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-08-29 16:10:02 +0200
committerHenrik Nord <[email protected]>2012-08-29 16:10:10 +0200
commit2890aeb643cc8ac0b46eebebb2f26e7d348bbea1 (patch)
tree32f40dbe3bc70cad62ea0fd2688be4a764d7177d /lib/common_test
parent293364854f6a404434bd221f4b64dcb4fb846bbf (diff)
parent541e986798f525add633b55349168eb1c75aa5cf (diff)
downloadotp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.tar.gz
otp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.tar.bz2
otp-2890aeb643cc8ac0b46eebebb2f26e7d348bbea1.zip
Merge branch 'ta/docsmaint' into maint
* ta/docsmaint: Fix various doc typos for R15B02 Fix various code typos for R15B02 OTP-10245
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/doc/src/write_test_chapter.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 1fae50577e..198f79126c 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -886,7 +886,7 @@
of its sub-groups. If a timetrap value is defined by <c>group/1</c>
for a sub-group, it overrides that of its higher level groups. Timetrap
values set by individual test cases (by means of the test case info
- function) overrides both group- and suite- level timetraps.</p>
+ function) override both group- and suite- level timetraps.</p>
<p>It is also possible to dynamically set/reset a timetrap during the
excution of a test case, or configuration function. This is done by calling