Merge branch 'lukas/common_test/deep_get_config/OTP-9626' into maint

* lukas/common_test/deep_get_config/OTP-9626:
  Add more cross reference links to ct docs
  Remove config option from common_test args
  Update user config to use nested tuple keys

9 files changed, 75 insertions, 69 deletions

diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 6babdb93af..a0fa45c71f 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>groups/0</c>).
+	  an atom, is the name of the group (defined in <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
 	  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>groups/0</c>).
+	  properties in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
 	  (With value <c>default</c>, the group definition properties
 	  will be used).</p>
 	
@@ -162,7 +162,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,SubKey} | {Key,SubKey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -184,8 +184,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>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c>). If the timetrap time is
+	  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
 	  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
@@ -201,11 +201,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>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</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>ct:userdata/2</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -264,7 +264,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>init_per_suite/1</c>.
+	  <c><seealso marker="#Module:init_per_suite-1">init_per_suite/1</seealso></c>.
 	  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>
@@ -289,7 +289,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -309,13 +309,14 @@
 	<p>This is the test case group info function. It is supposed to 
 	  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>groups/1</c> override
+	  and sub-groups). Properties set by
+	  <c><seealso marker="#Module:group-1">group/1</seealso></c> override
 	  properties with the same key that have been previously set by
-	  <c>suite/0</c>.</p>
+	  <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c>). If the timetrap time is
+	  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
 	  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
@@ -330,11 +331,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>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</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>ct:userdata/2</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -367,7 +368,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>groups/0</c>). The
+	    group, as specified in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>). 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>
@@ -396,10 +397,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>init_per_group/2</c>.
+	    It is meant to be used for cleaning up after <c><seealso marker="#Module:init_per_group-2">init_per_group/2</seealso></c>.
 	    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>end_per_group/2</c> for the group on the level above. The status will also
+	    <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
 	    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>
 
@@ -450,7 +451,7 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p> This function is called after each test case, and can be used
-	    to clean up after <c>init_per_testcase/2</c> and the test case. 
+	    to clean up after <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c> 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
@@ -476,7 +477,7 @@
 	<v> Func = atom()</v>
 	<v> Args = list()</v>
 	<v> Fun = fun()</v>
-	<v> Required = Key | {Key,SubKeys}</v>
+	<v> Required = Key | {Key,SubKeys} | {Key,Subkey} | {Key,Subkey,SubKeys}</v>
 	<v> Key = atom()</v>
 	<v> SubKeys = SubKey | [SubKey]</v>
 	<v> SubKey = atom()</v>
@@ -492,15 +493,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>Testcase/0</c> override
+	  Properties set by <c><seealso marker="#Module:Testcase-0">Testcase/0</seealso></c> override
 	  properties that have been previously set for the test case
-	  by <c>group/1</c> or <c>suite/0</c>.</p>
+	  by <c><seealso marker="#Module:group-1">group/1</seealso></c> or <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</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>init_per_testcase/2</c>
-	  and <c>end_per_testcase/2</c> are included in the
+	  <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
 	  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
@@ -514,15 +515,15 @@
 	  configuration files, the test case is skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c>ct:require/[1,2]</c>.</p>
+	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
 
 	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  default values specified by <c>suite/0</c> (or
-	  <c>group/1</c>) will be used.</p>
+	  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>
 
 	<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>ct:userdata/3</c>.</p>
+	  read by calling <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -550,7 +551,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>ct:fail/1/2</c> 
+	  function causes a runtime error, or call <c><seealso marker="ct#fail-1">ct:fail/1/2</seealso></c>
 	  (which also causes the test case process to terminate).</p>
 	
 	<p>Elements from the <c>Config</c> list can e.g. be read
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index 6a860bb58b..e843ed3ba4 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -78,7 +78,7 @@
     test is skipped (unless a default value has been specified, see the
     <seealso marker="write_test_chapter#info_function">test case info
     function</seealso> chapter for details). There is also a function
-    <c>ct:require/[1,2]</c> which can be called from a test case
+    <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which can be called from a test case
     in order to check if a specific variable is available. The return 
     value from this function must be checked explicitly and appropriate 
     action be taken depending on the result (e.g. to skip the test case
@@ -88,7 +88,7 @@
     info-list should look like this:
     <c>{require,CfgVarName}</c> or <c>{require,AliasName,CfgVarName}</c>.
     The arguments <c>AliasName</c> and <c>CfgVarName</c> are the same as the
-    arguments to <c>ct:require/[1,2]</c> which are described in the
+    arguments to <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which are described in the
     reference manual for <seealso marker="ct">ct</seealso>.
     <c>AliasName</c> becomes an alias for the configuration variable,
     and can be used as reference to the configuration data value.
@@ -101,7 +101,8 @@
         (or test case) and improve readability.</item>
     </list>
     <p>To read the value of a config variable, use the function
-    <c>get_config/[1,2,3]</c> which is also described in the reference
+    <c><seealso marker="ct#get_config-1">get_config/1/2/3</seealso></c>
+    which is also described in the reference
     manual for <seealso marker="ct">ct</seealso>.</p>
     <p>Example:</p>
     <pre>
@@ -118,7 +119,7 @@
   <section>
   <title>Using configuration variables defined in multiple files</title>
     <p>If a configuration variable is defined in multiple files and you 
-      want to access all possible values, you may use the <c>ct:get_config/3</c>
+      want to access all possible values, you may use the <c><seealso marker="ct#get_config-3">ct:get_config/3</seealso></c>
       function and specify <c>all</c> in the options list. The values will then
       be returned in a list and the order of the elements corresponds to the order 
       that the config files were specified at startup. Please see 
@@ -130,7 +131,7 @@
     <marker id="encrypted_config_files"></marker>
     <p>It is possible to encrypt configuration files containing sensitive data
       if these files must be stored in open and shared directories.</p> 
-      <p>Call <c>ct:encrypt_config_file/[2,3]</c> to have Common Test encrypt a 
+      <p>Call <c><seealso marker="ct#encrypt_config_file-2">ct:encrypt_config_file/2/3</seealso></c> to have Common Test encrypt a
       specified file using the DES3 function in the OTP <c>crypto</c> application.
       The encrypted file can then be used as a regular configuration file,
       in combination with other encrypted files or normal text files. The key
@@ -139,7 +140,7 @@
       <c>decrypt_file</c> flag/option, or a key file in a predefined location.</p>
       
       <p>Common Test also provides decryption functions, 
-      <c>ct:decrypt_config_file/[2,3]</c>, for recreating the original text
+      <c><seealso marker="ct#decrypt_config_file-2">ct:decrypt_config_file/2/3</seealso></c>, for recreating the original text
       files.</p> 
 
       <p>Please see the <seealso marker="ct">ct</seealso> reference manual for
@@ -149,8 +150,8 @@
   <section>
     <title>Opening connections by using configuration data</title>
     <p>There are two different methods for opening a connection
-      by means of the support functions in e.g. <c>ct_ssh</c>, <c>ct_ftp</c>,
-      and <c>ct_telnet</c>:</p>
+      by means of the support functions in e.g. <c><seealso marker="ct_ssh">ct_ssh</seealso></c>, <c><seealso marker="ct_ftp">ct_ftp</seealso></c>,
+      and <c><seealso marker="ct_telnet">ct_telnet</seealso></c>:</p>
     <list>
       <item>Using a configuration target name (an alias) as reference.</item>
       <item>Using the configuration variable as reference.</item>
@@ -295,7 +296,7 @@
 
       <pre>
         [{ftp_host, [{ftp, "targethost"}, {username, "tester"}, {password, "letmein"}]},
-        {lm_directory, "/test/loadmodules"}]</pre>
+         {lm_directory, "/test/loadmodules"}]</pre>
 
     </section>
 
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index b7162cb542..fc609ee137 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -100,7 +100,7 @@
     <p><c>$ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
     
     <p>You may also pass the cover specification file name in a
-      call to <c>ct:run_test/1</c>, by adding a <c>{cover,CoverSpec}</c>
+      call to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, by adding a <c>{cover,CoverSpec}</c>
       tuple to the <c>Opts</c> argument. Also, you can of course 
       enable code coverage in your test specifications (read
       more in the chapter about 
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 014507c886..c938851e0e 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -192,12 +192,12 @@
     <section>
       <title>External configuration data and Logging</title>
       <p>It's possible in the CTH to read configuration data values
-	by calling <c>ct:get_config/1/2/3</c> (as explained in the
+	by calling <c><seealso marker="ct#get_config-1">ct:get_config/1/2/3</seealso></c> (as explained in the
 	<seealso marker="config_file_chapter#require_config_data">
 	  External configuration data</seealso>
 	chapter). The config variables in question must, as always, first have been
 	<c>required</c> by means of a suite-, group-, or test case info function,
-	or the <c>ct:require/1/2</c> function. Note that the latter can also be used
+	or the <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> function. Note that the latter can also be used
 	in CT hook functions.</p>
       <p>The CT hook functions may call any of the logging functions available
 	in the <c>ct</c> interface to print information to the log files, or to
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index df1defa664..8061c840b0 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -46,7 +46,7 @@
     particular mode.</p>
 
   <p>There is an interface function that corresponds to this program,
-    called <c>ct:run_test/1</c>, for starting Common Test from the Erlang
+    called <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, for starting Common Test from the Erlang
     shell (or an Erlang program). Please see the <c>ct</c> man page for
     details.</p>
 
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index a5886b9687..b95a18e47e 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -64,7 +64,7 @@
     <marker id="usage"></marker>
     <title>Usage</title>
     <p>Event handlers may be installed by means of an <c>event_handler</c>
-    start flag (<c>ct_run</c>) or option (<c>ct:run_test/1</c>), where the
+    start flag (<c>ct_run</c>) or option (<c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), where the
     argument specifies the names of one or more event handler modules.
     Example:</p>
     <p><c>$ ct_run -suite test/my_SUITE -event_handler handlers/my_evh1 
@@ -78,7 +78,7 @@
     example).</p>
 
     <p>An event_handler tuple in the argument <c>Opts</c> has the following
-      definition (see also <c>ct:run_test/1</c> in the reference manual):</p>
+      definition (see also <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> in the reference manual):</p>
 
     <pre>
     {event_handler,EventHandlers}
@@ -205,7 +205,7 @@
 	                   {error,{RunTimeError,StackTrace}} | 
                            {timetrap_timeout,integer()} | 
 			   {failed,{Suite,end_per_testcase,FailInfo}}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} | 
 			 UserTerm</c>, 
@@ -233,7 +233,7 @@
 	      reason for auto skipping <c>Func</c>.</p>
         <p><c>FailReason = {Suite,ConfigFunc,FailInfo}} | 
 	                   {Suite,FailedCaseInSequence}</c>, reason for failure.</p>	
-        <p><c>RequireInfo = {not_available,atom()}</c>, why require has failed.</p>
+        <p><c>RequireInfo = {not_available,atom() | tuple()}</c>, why require has failed.</p>
         <p><c>ConfigFunc = init_per_suite | init_per_group</c></p>
         <p><c>FailInfo = {timetrap_timeout,integer()} | 
 	                 {RunTimeError,StackTrace} |
@@ -308,7 +308,7 @@
     manager can look like.</p>
 
     <note><p>To ensure that printouts to standard out (or printouts made with
-    <c>ct:log/2/3</c> or <c>ct:pal/2/3</c>) get written to the test case log
+    <c><seealso marker="ct#log-2">ct:log/2/3</seealso></c> or <c><seealso marker="ct:pal-2">ct:pal/2/3</seealso></c>) get written to the test case log
     file, and not to the Common Test framework log, you can syncronize
     with the Common Test server by matching on the <c>tc_start</c> and <c>tc_done</c>
     events. In the period between these events, all IO gets directed to the
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index 039578dd2e..891cbc49f3 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -90,7 +90,7 @@
     <p>As you can understand from the illustration above, Common Test requires
       that a test case generates a runtime error to indicate failure (e.g.
       by causing a bad match error or by calling <c>exit/1</c>, preferrably
-      through the <c>ct:fail/1,2</c> help function). A succesful execution is
+      through the <c><seealso marker="ct#fail-1">ct:fail/1,2</seealso></c> help function). A succesful execution is
       indicated by means of a normal return from the test case function.
     </p>
     </section>
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index bc0af63790..058b27d622 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -242,12 +242,12 @@
     
     <p>Common Test provides an Erlang API for running tests. The main (and most
       flexible) function for specifying and executing tests is called
-      <c>ct:run_test/1</c>. This function takes the same start parameters as
+      <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>. This function takes the same start parameters as
       the <c>ct_run</c> program described above, only the flags are instead
       given as options in a list of key-value tuples. E.g. a test specified 
       with <c>ct_run</c> like:</p>
       <p><c>$ ct_run -suite ./my_SUITE -logdir ./results</c></p> 
-      <p>is with <c>ct:run_test/1</c> specified as:</p> 
+      <p>is with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> specified as:</p>
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
       <p>For detailed documentation, please see the <c>ct</c> manual page.</p>    
   </section>
@@ -266,9 +266,9 @@
       for trying out various operations during test suite development.</p>
 
     <p>To invoke the interactive shell mode, you can start an Erlang shell 
-      manually and call <c>ct:install/1</c> to install any configuration
+      manually and call <c><seealso marker="ct#install-1">ct:install/1</seealso></c> to install any configuration
       data you might need (use <c>[]</c> as argument otherwise), then
-      call <c>ct:start_interactive/0</c> to start Common Test. If you use
+      call <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> to start Common Test. If you use
       the <c>ct_run</c> program, you may start the Erlang shell and Common Test
       in the same go by using the <c>-shell</c> and, optionally, the <c>-config</c>
       and/or <c>-userconfig</c> flag. Examples:
@@ -287,7 +287,8 @@
     
     <p>If any functions using "required config data" (e.g. ct_telnet or
       ct_ftp functions) are to be called from the erlang shell, config
-      data must first be required with <c>ct:require/[1,2]</c>. This is
+      data must first be required with <c><seealso marker="ct#require-1">
+      ct:require/1/2</seealso></c>. This is
       equivalent to a <c>require</c> statement in the <seealso
 	marker="write_test_chapter#suite">Test Suite Info 
 	Function</seealso> or in the <seealso
@@ -314,11 +315,11 @@
       is not supported.</p>
     
     <p>If you wish to exit the interactive mode (e.g. to start an
-      automated test run with <c>ct:run_test/1</c>), call the function 
-      <c>ct:stop_interactive/0</c>. This shuts down the
+      automated test run with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), call the function
+      <c><seealso marker="ct#stop_interactive-0">ct:stop_interactive/0</seealso></c>. This shuts down the
       running <c>ct</c> application. Associations between
       configuration names and data created with <c>require</c> are 
-      consequently deleted. <c>ct:start_interactive/0</c> will get you 
+      consequently deleted. <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> will get you
       back into interactive mode, but the previous state is not restored.</p>
   </section>
 
@@ -326,7 +327,7 @@
     <title>Step by step execution of test cases with the Erlang Debugger</title>
    
     <p>By means of <c>ct_run -step [opts]</c>, or by passing the 
-       <c>{step,Opts}</c> option to <c>ct:run_test/1</c>, it is possible
+       <c>{step,Opts}</c> option to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, it is possible
        to get the Erlang Debugger started automatically and use its
        graphical interface to investigate the state of the current test 
        case and to execute it step by step and/or set execution breakpoints.</p>
@@ -586,7 +587,7 @@
       <c>ct_run</c>. This forces Common Test to ignore unrecognizable terms.
       Note that in this mode, Common Test is not able to check the specification 
       for errors as efficiently as if the scanner runs in default mode. 
-      If <c>ct:run_test/1</c> is used for starting the tests, the relaxed scanner 
+      If <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> is used for starting the tests, the relaxed scanner
       mode is enabled by means of the tuple: <c>{allow_user_terms,true}</c></p>
   </section>
   
@@ -943,7 +944,7 @@
       
       <p>The <c>-silent_connections</c> tag (or
 	<c>silent_connections</c> tagged tuple in the call to
-	<c>ct:run_test/1</c>) overrides any settings in the test
+	<c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>) overrides any settings in the test
 	suite.</p>
       
       <p>Note that in the current Common Test version, the
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 7b7e7af8ea..1fae50577e 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -173,7 +173,7 @@
     </p>
 
     <p>The <c>end_per_testcase/2</c> function is called even after a
-      test case terminates due to a call to <c>ct:abort_current_testcase/1</c>,
+      test case terminates due to a call to <c><seealso marker="ct#abort_current_testcase-1">ct:abort_current_testcase/1</seealso></c>,
       or after a timetrap timeout. However, <c>end_per_testcase</c>
       will then execute on a different process than the test case
       function, and in this situation, <c>end_per_testcase</c> will
@@ -243,7 +243,8 @@
 
     <note><p>The test case function argument <c>Config</c> should not be 
 	confused with the information that can be retrieved from 
-	configuration files (using ct:get_config/[1,2]). The Config argument 
+	configuration files (using <c><seealso marker="ct#get_config-1">
+	ct:get_config/1/2</seealso></c>). The Config argument
 	should be used for runtime configuration of the test suite and the 
 	test cases, while configuration files should typically contain data 
 	related to the SUT. These two types of configuration data are handled 
@@ -302,7 +303,7 @@
 	<item>
 	  <p>
 	    Use this to specify arbitrary data related to the testcase. This
-	    data can be retrieved at any time using the <c>ct:userdata/3</c> 
+	    data can be retrieved at any time using the <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>
 	    utility function.
 	  </p>
 	</item>
@@ -338,7 +339,8 @@
 
 	  <pre>
 	    testcase2() -> 
-	        [{require, unix_telnet, {unix, [telnet, username, password]}},
+	        [{require, unix_telnet, unix},
+		 {require, {unix, [telnet, username, password]}},
 	         {default_config, unix, [{telnet, "my_telnet_host"},
 	                                 {username, "aladdin"},
 	                                 {password, "sesame"}]}}].</pre>
@@ -346,7 +348,8 @@
       </taglist>
 
 	<p>See the <seealso marker="config_file_chapter#require_config_data">Config files</seealso>
-	  chapter and the <c>ct:require/[1,2]</c> function in the
+	  chapter and the <c><seealso marker="ct#require-1">
+	  ct:require/1/2</seealso></c> function in the
 	   <seealso marker="ct">ct</seealso> reference manual for more information about
 	   <c>require</c>.</p>
 
@@ -823,7 +826,7 @@
       Common Test to create one dedicated private directory per
       test case and execution instead. This is accomplished by means of
       the flag/option: <c>create_priv_dir</c> (to be used with the
-      <c>ct_run</c> program, the <c>ct:run_test/1</c> function, or
+      <c>ct_run</c> program, the <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> function, or
       as test specification term). There are three possible values
       for this option:
       <list>
@@ -839,7 +842,7 @@
       become very inefficient for test runs with many test cases and/or
       repetitions. Therefore, in case the manual version is instead used, the
       test case must tell Common Test to create priv_dir when it needs it.
-      It does this by calling the function <c>ct:make_priv_dir/0</c>.
+      It does this by calling the function <c><seealso marker="ct#make_priv_dir-0">ct:make_priv_dir/0</seealso></c>.
       </p>
 
       <note><p>You should not depend on current working directory for
@@ -887,7 +890,7 @@
     
     <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
-    <c>ct:timetrap/1</c>. This function cancels the current timetrap
+    <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c>. This function cancels the current timetrap
     and starts a new one (that stays active until timeout, or end of the
     current function).</p>
     
@@ -900,12 +903,12 @@
     
     <p>If a test case needs to suspend itself for a time that also gets
     multipled by <c>multiply_timetraps</c> (and possibly also scaled up if
-    <c>scale_timetraps</c> is enabled), the function <c>ct:sleep/1</c>
+    <c>scale_timetraps</c> is enabled), the function <c><seealso marker="ct#sleep-1">ct:sleep/1</seealso></c>
     may be used (instead of e.g. <c>timer:sleep/1</c>).</p>
     
     <p>A function (<c>fun/0</c> or <c>MFA</c>) may be specified as
     timetrap value in the suite-, group- and test case info function, as
-    well as argument to the <c>ct:timetrap/1</c> function. Examples:</p>
+    well as argument to the <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c> function. Examples:</p>
 
     <p><c>{timetrap,{my_test_utils,timetrap,[?MODULE,system_start]}}</c></p>
     <p><c>ct:timetrap(fun() -> my_timetrap(TestCaseName, Config) end)</c></p>