diff options
| author | Siri Hansen <[email protected]> | 2016-03-10 14:55:22 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2016-03-10 14:55:22 +0100 |
| commit | e3e55881b15757e15ea1995b0f8dbfd305f9e89d (patch) | |
| tree | a4379d63af0feefb52542f69511272b70389ce4c /lib/common_test/doc/src/ct_hooks_chapter.xml | |
| parent | 5fa1dff3c9f92a3b7c6a897af32c0c72a9a9e8a7 (diff) | |
| parent | 880280b22f30a5ba67dcbd93bf85e14c04acc25b (diff) | |
| download | otp-e3e55881b15757e15ea1995b0f8dbfd305f9e89d.tar.gz otp-e3e55881b15757e15ea1995b0f8dbfd305f9e89d.tar.bz2 otp-e3e55881b15757e15ea1995b0f8dbfd305f9e89d.zip | |
Merge branch 'siri/common_test/fix-doc-links' into maint
* siri/common_test/fix-doc-links:
Fix link errors in common_test documentation
Document that any ssh option is allowed in ct_netconfc
Conflicts:
lib/common_test/doc/src/ct_hooks_chapter.xml
lib/common_test/doc/src/ct_netconfc.xml
Diffstat (limited to 'lib/common_test/doc/src/ct_hooks_chapter.xml')
| -rw-r--r-- | lib/common_test/doc/src/ct_hooks_chapter.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml index 6f722cb7db..3eb1945a61 100644 --- a/lib/common_test/doc/src/ct_hooks_chapter.xml +++ b/lib/common_test/doc/src/ct_hooks_chapter.xml @@ -237,10 +237,10 @@ <list type="bulleted"> <item><seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso></item> - <item><seealso marker="common_test#Module:init_per_group-1"><c>init_per_group</c></seealso></item> - <item><seealso marker="common_test#Module:init_per_testcase-1"><c>init_per_testcase</c></seealso></item> - <item><seealso marker="common_test#Module:end_per_testcase-1"><c>end_per_testcase</c></seealso></item> - <item><seealso marker="common_test#Module:end_per_group-1"><c>end_per_group</c></seealso></item> + <item><seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso></item> + <item><seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso></item> + <item><seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso></item> + <item><seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso></item> <item><seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso></item> </list> @@ -281,10 +281,10 @@ <p>In a CTH, behavior can be hooked in after the following functions:</p> <list type="bulleted"> <item><seealso marker="common_test#Module:init_per_suite-1"><c>init_per_suite</c></seealso></item> - <item><seealso marker="common_test#Module:init_per_group-1"><c>init_per_group</c></seealso></item> - <item><seealso marker="common_test#Module:init_per_testcase-1"><c>init_per_testcase</c></seealso></item> - <item><seealso marker="common_test#Module:end_per_testcase-1"><c>end_per_testcase</c></seealso></item> - <item><seealso marker="common_test#Module:end_per_group-1"><c>end_per_group</c></seealso></item> + <item><seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso></item> + <item><seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso></item> + <item><seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso></item> + <item><seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso></item> <item><seealso marker="common_test#Module:end_per_suite-1"><c>end_per_suite</c></seealso></item> </list> |