Merge branch 'maint'

1 files changed, 27 insertions, 27 deletions

diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 84adbb5723..ea4522c40b 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -99,11 +99,11 @@
 	  be executed by Common Test. A test case is represented by an atom,
 	  the name of the test case function. A test case group is
 	  represented by a <c>group</c> tuple, where <c>GroupName</c>,
-	  an atom, is the name of the group (defined in <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  an atom, is the name of the group (defined in <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  Execution properties for groups may also be specified, both
 	  for a top level group and for any of its sub-groups.
 	  Group execution properties specified here, will override
-	  properties in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  properties in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  (With value <c>default</c>, the group definition properties
 	  will be used).</p>
 	
@@ -186,8 +186,8 @@
 	  test cases in the suite).</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -203,11 +203,11 @@
 	  in any of the configuration files, all test cases are skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test suite related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -266,7 +266,7 @@
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
-	  <c><seealso marker="#Module:init_per_suite-1">init_per_suite/1</seealso></c>.
+	  <seealso marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.
 	  For information on <c>save_config</c>, please see 
 	  <seealso marker="dependencies_chapter#save_config">Dependencies
 	    between Test Cases and Suites</seealso> in the User's Guide.</p>
@@ -313,13 +313,13 @@
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of a test case group (i.e. its test cases
 	  and sub-groups). Properties set by
-	  <c><seealso marker="#Module:group-1">group/1</seealso></c> override
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso> override
 	  properties with the same key that have been previously set by
-	  <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -334,11 +334,11 @@
 	  in any of the configuration files, all test cases in this group are skipped.
 	  For more information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case group related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -371,7 +371,7 @@
 	    test case group. It typically contains initializations which are 
 	    common for all test cases and sub-groups in the group, and which
 	    shall only be performed once. <c>GroupName</c> is the name of the
-	    group, as specified in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>). The
+	    group, as specified in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>). The
 	    <c>Config</c> parameter is the configuration data which can be modified
 	    here. The return value of this function is given as <c>Config</c> 
 	    to all test cases and sub-groups in the group. If <c>{skip,Reason}</c>
@@ -400,10 +400,10 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p>This function is called after the execution of a test case group is finished.
-	    It is meant to be used for cleaning up after <c><seealso marker="#Module:init_per_group-2">init_per_group/2</seealso></c>.
+	    It is meant to be used for cleaning up after <seealso marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>.
 	    By means of <c>{return_group_result,Status}</c>, it is possible to return a 
 	    status value for a nested sub-group. The status can be retrieved in
-	    <c><seealso marker="#Module:end_per_group-2">end_per_group/2</seealso></c> for the group on the level above. The status will also
+	    <seealso marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso> for the group on the level above. The status will also
 	    be used by Common Test for deciding if execution of a group should proceed in
 	    case the property <c>sequence</c> or <c>repeat_until_*</c> is set.</p>
 
@@ -454,7 +454,7 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p> This function is called after each test case, and can be used
-	    to clean up after <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c> and the test case.
+	    to clean up after <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso> and the test case.
 	    Any return value (besides <c>{fail,Reason}</c> and <c>{save_config,SaveConfig}</c>) 
 	    is ignored. By returning <c>{fail,Reason}</c>, <c>TestCase</c> will be marked as
 	    failed (even though it was actually successful in the sense that it returned
@@ -496,15 +496,15 @@
 	<p>This is the test case info function. It is supposed to 
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of this particular test case.
-	  Properties set by <c><seealso marker="#Module:Testcase-0">Testcase/0</seealso></c> override
+	  Properties set by <seealso marker="#Module:Testcase-0"><c>Testcase/0</c></seealso> override
 	  properties that have been previously set for the test case
-	  by <c><seealso marker="#Module:group-1">group/1</seealso></c> or <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  by <seealso marker="#Module:group-1"><c>group/1</c></seealso> or <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time the
 	  test case is allowed to execute. If the timetrap time is
 	  exceeded, the test case fails with reason
-	  <c>timetrap_timeout</c>. <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c> are included in the
+	  <c>timetrap_timeout</c>. <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso> are included in the
 	  timetrap time. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
 	  used to trigger a timetrap timeout by, at some point, returning a
@@ -518,15 +518,15 @@
 	  configuration files, the test case is skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  default values specified by <c><seealso marker="#Module:suite-0">suite/0</seealso></c> (or
-	  <c><seealso marker="#Module:group-1">group/1</seealso></c>) will be used.</p>
+	  default values specified by <seealso marker="#Module:suite-0"><c>suite/0</c></seealso> (or
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso>) will be used.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -554,7 +554,7 @@
 	<p>This is the implementation of a test case. Here you must
 	  call the functions you want to test, and do whatever you
 	  need to check the result. If something fails, make sure the
-	  function causes a runtime error, or call <c><seealso marker="ct#fail-1">ct:fail/1/2</seealso></c>
+	  function causes a runtime error, or call <seealso marker="ct#fail-1"><c>ct:fail/1/2</c></seealso>
 	  (which also causes the test case process to terminate).</p>
 	
 	<p>Elements from the <c>Config</c> list can e.g. be read
@@ -582,7 +582,7 @@
 	  Test Cases and Suites</seealso> in the User's Guide.</p>
       </desc>
     </func>
-    
+     
   </funcs>
 
 </erlref>