Merge tag 'OTP-20.0' into sverker/20/binary_to_atom-utf8-crash/ERL-474/OTP-14590

18 files changed, 1241 insertions, 761 deletions

diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index e495f587a3..faa2d58a06 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2003-2017. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -53,7 +53,8 @@ XML_REF3_FILES = ct.xml \
 	ct_slave.xml \
 	ct_property_test.xml \
 	ct_netconfc.xml \
-	ct_hooks.xml
+	ct_hooks.xml \
+        ct_testspec.xml
 XML_REF6_FILES = common_test_app.xml
 
 XML_PART_FILES = part.xml 
@@ -105,11 +106,17 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS 
 # ----------------------------------------------------
 XML_FLAGS += 
 DVIPS_FLAGS += 
+SPECS_FLAGS = -I../../include -I../../../snmp/include \
+	-I../../../kernel/include
 
 # ----------------------------------------------------
 # Targets
@@ -118,7 +125,7 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man
+docs: man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -139,6 +146,7 @@ clean clean_docs:
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ 
 
 # ----------------------------------------------------
diff --git a/lib/common_test/doc/src/basics_chapter.xml b/lib/common_test/doc/src/basics_chapter.xml
index b349d93813..95599ca1f1 100644
--- a/lib/common_test/doc/src/basics_chapter.xml
+++ b/lib/common_test/doc/src/basics_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -75,7 +75,7 @@
     
     <p><c>Common Test</c> is also a very useful tool for white-box testing Erlang
       code (for example, module testing), as the test programs can call exported Erlang
-      functions directly. there is very little overhead required for
+      functions directly. There is very little overhead required for
       implementing basic test suites and executing simple tests. For black-box
       testing Erlang software, Erlang RPC and standard O&amp;M interfaces
       can be used for example.
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 3f83747485..a3b3f927eb 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -224,7 +224,9 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	  marker="#Module:end_per_suite-1"><c>end_per_suite/1</c></seealso>
+	  must also be defined.</p>
 
 	  <p>This configuration function is called as the first function in the
 	  suite. It typically contains initializations that are common for
@@ -256,7 +258,9 @@
       </type>
 
       <desc>	
-	<p>OPTIONAL</p>
+	<p>OPTIONAL; if this function is defined, then <seealso
+	  marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>
+	  must also be defined.</p>
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
@@ -360,7 +364,9 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	    marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso>
+	    must also be defined.</p>
 
 	  <p>This configuration function is called before execution of a
 	    test case group. It typically contains initializations that are 
@@ -396,7 +402,9 @@
 	</type>
 
 	<desc>	
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined, then <seealso
+	    marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>
+	    must also be defined.</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
@@ -427,7 +435,10 @@
 	</type>
 	<desc>
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined,
+	    then <seealso marker="#Module:end_per_testcase-2">
+	      <c>end_per_testcase/2</c></seealso> must also be
+	    defined.</p>
 
 	  <p>This function is called before each test case. Argument
 	  <c>TestCase</c> is the test case name, and
@@ -454,7 +465,10 @@
 	</type>
 	<desc>	
 
-	  <p>OPTIONAL</p>
+	  <p>OPTIONAL; if this function is defined,
+	    then <seealso marker="#Module:init_per_testcase-2">
+	      <c>init_per_testcase/2</c></seealso> must also be
+	    defined.</p>
 
 	  <p>This function is called after each test case, and can be used
 	    to clean up after
@@ -566,7 +580,7 @@
 	  (which also causes the test case process to terminate).</p>
 
 	<p>Elements from the <c>Config</c> list can, for example, be read
-	  with <c>proplists:get_value/2</c> in <c>STDLIB</c>
+	  with <c>proplists:get_value/2</c> in STDLIB
 	  (or the macro <c>?config</c> defined in <c>ct.hrl</c>).</p>
 
 	<p>If you decide not to run the test case after all, return
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index 264bcff251..1a3cfdb0c5 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2016</year>
+      <year>2010</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -70,17 +70,69 @@
     <marker id="types"/>
     <taglist>
 
-      <tag><c>handle() = pid()</c></tag>
-        <item><marker id="type-handle"/>
-          <p>The identity (handle) of a connection.</p></item>
-
-      <tag><c>target_name() = atom()</c></tag>
-        <item><marker id="type-target_name"/>
-          <p>A name and association to configuration data introduced
-            through a require statement, or a call to
-            <seealso marker="#require-2"><c>ct:require/2</c></seealso>,
-            for example,
-            <c>ct:require(mynodename,{node,[telnet]})</c>.</p></item>
+      <tag>
+	<marker id="type-handle"/>
+	<c>handle() = pid()</c>
+      </tag>
+      <item>
+        <p>The identity (handle) of a connection.</p>
+      </item>
+
+      <tag>
+	<marker id="type-config_key"/>
+	<c>config_key() = atom()</c>
+      </tag>
+      <item>
+	<p>A configuration key which exists in a configuration file</p>
+      </item>
+
+      <tag>
+	<marker id="type-target_name"/><c>target_name() = atom()</c>
+      </tag>
+      <item>
+        <p>A name and association to configuration data introduced
+          through a require statement, or a call to
+          <seealso marker="#require-2"><c>ct:require/2</c></seealso>,
+          for example,
+          <c>ct:require(mynodename,{node,[telnet]})</c>.</p>
+      </item>
+
+      <tag>
+	<marker id="type-key_or_name"/>
+	<c>key_or_name() = config_key() | target_name()</c>
+      </tag>
+      <item/>
+
+      <tag>
+	<marker id="type-conn_log_options"/>
+	<c>conn_log_options() = [conn_log_option()]</c>
+      </tag>
+      <item>
+	<p>Options that can be given to the <c>cth_conn_log</c> hook,
+	  which is used for logging of NETCONF and Telnet
+	  connections. See
+	  <seealso marker="ct_netconfc#Logging">ct_netconfc</seealso>
+	  or <seealso marker="ct_telnet#Logging">ct_telnet</seealso>
+	  for description and examples of how to use this hook.</p>
+      </item>
+
+      <tag>
+	<marker id="type-conn_log_option"/>
+	<c>conn_log_option() = {log_type,conn_log_type()} | {hosts,[key_or_name()]}</c>
+      </tag>
+      <item/>
+
+      <tag>
+	<marker id="type-conn_log_type"/>
+	<c>conn_log_type() = raw | pretty | html | silent</c>
+      </tag>
+      <item/>
+
+      <tag>
+	<marker id="type-conn_log_mod"/>
+	<c>conn_log_mod() = ct_netconfc | ct_telnet</c>
+      </tag>
+      <item/>
 
     </taglist>
   </section>
@@ -620,6 +672,21 @@
     </func>
 
     <func>
+      <name>get_verbosity(Category) -&gt; Level | undefined</name>
+      <fsummary>Read the verbosity level for a logging category.</fsummary>
+      <type>
+        <v>Category = default | atom()</v>
+        <v>Level = integer()</v>
+      </type>
+      <desc><marker id="get_verbosity-1"/>
+        <p>This function returns the verbosity level for the specified logging
+	category. See the <seealso marker="write_test_chapter#logging">
+	User's Guide</seealso> for details. Use the value <c>default</c> to read
+	the general verbosity level.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>install(Opts) -&gt; ok | {error, Reason}</name>
       <fsummary>Installs configuration files and event handlers.</fsummary>
       <type>
@@ -725,7 +792,7 @@
         <v>Format = string()</v>
         <v>FormatArgs = list()</v>
         <v>Opts = [Opt]</v>
-	<v>Opt = no_css | esc_chars</v>
+	<v>Opt = {heading,string()} | no_css | esc_chars</v>
       </type>
       <desc><marker id="log-5"/>
         <p>Prints from a test case to the log file.</p>
@@ -777,59 +844,77 @@
           caught by any installed event manager.</p>
 
         <p>See also
-          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+          <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>pal(Format) -&gt; ok</name>
-      <fsummary>Equivalent to pal(default, 50, Format, []).</fsummary>
+      <fsummary>Equivalent to pal(default, 50, Format, [], []).</fsummary>
       <desc><marker id="pal-1"/>
         <p>Equivalent to
-          <seealso marker="#pal-4"><c>ct:pal(default, 50, Format,
-            [])</c></seealso>.</p>
+          <seealso marker="#pal-5"><c>ct:pal(default, 50, Format,
+            [], [])</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>pal(X1, X2) -&gt; ok</name>
       <fsummary>Equivalent to pal(Category, Importance, Format,
-        FormatArgs).</fsummary>
+        FormatArgs, []).</fsummary>
       <type>
         <v>X1 = Category | Importance | Format</v>
         <v>X2 = Format | FormatArgs</v>
       </type>
       <desc><marker id="pal-2"/>
-        <p>Equivalent to <seealso marker="#pal-4"><c>ct:pal(Category,
-          Importance, Format, FormatArgs)</c></seealso>.</p>
+        <p>Equivalent to <seealso marker="#pal-5"><c>ct:pal(Category,
+          Importance, Format, FormatArgs, [])</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>pal(X1, X2, X3) -&gt; ok</name>
       <fsummary>Equivalent to pal(Category, Importance, Format,
-        FormatArgs).</fsummary>
+        FormatArgs, Opts).</fsummary>
       <type>
         <v>X1 = Category | Importance</v>
         <v>X2 = Importance | Format</v>
-        <v>X3 = Format | FormatArgs</v>
+        <v>X3 = Format | FormatArgs | Opts</v>
       </type>
       <desc><marker id="pal-3"/>
-        <p>Equivalent to <seealso marker="#pal-4"><c>ct:pal(Category,
-          Importance, Format, FormatArgs)</c></seealso>.</p>
+        <p>Equivalent to <seealso marker="#pal-5"><c>ct:pal(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name>pal(Category, Importance, Format, FormatArgs) -&gt; ok</name>
+      <name>pal(X1, X2, X3, X4) -&gt; ok</name>
+      <fsummary>Equivalent to pal(Category, Importance, Format,
+        FormatArgs, Opts).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs</v>
+	<v>X4 = FormatArgs | Opts</v>
+      </type>
+      <desc><marker id="pal-4"/>
+        <p>Equivalent to <seealso marker="#pal-5"><c>ct:pal(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>pal(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
       <fsummary>Prints and logs from a test case.</fsummary>
       <type>
         <v>Category = atom()</v>
         <v>Importance = integer()</v>
         <v>Format = string()</v>
         <v>FormatArgs = list()</v>
+        <v>Opts = [Opt]</v>
+	<v>Opt = {heading,string()} | no_css</v>
       </type>
-      <desc><marker id="pal-4"/>
+      <desc><marker id="pal-5"/>
         <p>Prints and logs from a test case.</p>
 
         <p>This function is meant for printing a string from a test case,
@@ -873,52 +958,70 @@
 
     <func>
       <name>print(Format) -&gt; ok</name>
-      <fsummary>Equivalent to print(default, 50, Format, []).</fsummary>
+      <fsummary>Equivalent to print(default, 50, Format, [], []).</fsummary>
       <desc><marker id="print-1"/>
-        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(default,
-        50, Format, [])</c></seealso>.</p>
+        <p>Equivalent to <seealso marker="#print-5"><c>ct:print(default,
+        50, Format, [], [])</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>print(X1, X2) -&gt; ok</name>
       <fsummary>Equivalent to print(Category, Importance, Format,
-        FormatArgs).</fsummary>
+        FormatArgs, []).</fsummary>
       <type>
         <v>X1 = Category | Importance | Format</v>
         <v>X2 = Format | FormatArgs</v>
       </type>
       <desc><marker id="print-2"/>
-        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(Category,
-          Importance, Format, FormatArgs)</c></seealso>.</p>
+        <p>Equivalent to <seealso marker="#print-5"><c>ct:print(Category,
+          Importance, Format, FormatArgs, [])</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
       <name>print(X1, X2, X3) -&gt; ok</name>
       <fsummary>Equivalent to print(Category, Importance, Format,
-        FormatArgs).</fsummary>
+        FormatArgs, Opts).</fsummary>
       <type>
         <v>X1 = Category | Importance</v>
         <v>X2 = Importance | Format</v>
-        <v>X3 = Format | FormatArgs</v>
+        <v>X3 = Format | FormatArgs | Opts</v>
       </type>
       <desc><marker id="print-3"/>
-        <p>Equivalent to <seealso marker="#print-4"><c>ct:print(Category,
-          Importance, Format, FormatArgs)</c></seealso>.</p>
+        <p>Equivalent to <seealso marker="#print-5"><c>ct:print(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>print(X1, X2, X3, X4) -&gt; ok</name>
+      <fsummary>Equivalent to print(Category, Importance, Format,
+        FormatArgs, Opts).</fsummary>
+      <type>
+        <v>X1 = Category | Importance</v>
+        <v>X2 = Importance | Format</v>
+        <v>X3 = Format | FormatArgs</v>
+	<v>X4 = FormatArgs | Opts</v>
+      </type>
+      <desc><marker id="print-4"/>
+        <p>Equivalent to <seealso marker="#print-5"><c>ct:print(Category,
+          Importance, Format, FormatArgs, Opts)</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name>print(Category, Importance, Format, FormatArgs) -&gt; ok</name>
+      <name>print(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
       <fsummary>Prints from a test case to the console.</fsummary>
       <type>
         <v>Category = atom()</v>
         <v>Importance = integer()</v>
         <v>Format = string()</v>
         <v>FormatArgs = list()</v>
+        <v>Opts = [Opt]</v>
+	<v>Opt = {heading,string()}</v>
       </type>
-      <desc><marker id="print-4"/>
+      <desc><marker id="print-5"/>
         <p>Prints from a test case to the console.</p>
 
         <p>This function is meant for printing a string from a test case to
@@ -1139,7 +1242,7 @@
         Opts.</fsummary>
       <type>
         <v>Opts = [OptTuples]</v>
-        <v>OptTuples = {dir, TestDirs} | {suite, Suites} | {group, Groups} | {testcase, Cases} | {spec, TestSpecs} | {join_specs, Bool} | {label, Label} | {config, CfgFiles} | {userconfig, UserConfig} | {allow_user_terms, Bool} | {logdir, LogDir} | {silent_connections, Conns} | {stylesheet, CSSFile} | {cover, CoverSpecFile} | {cover_stop, Bool} | {step, StepOpts} | {event_handler, EventHandlers} | {include, InclDirs} | {auto_compile, Bool} | {abort_if_missing_suites, Bool} | {create_priv_dir, CreatePrivDir} | {multiply_timetraps, M} | {scale_timetraps, Bool} | {repeat, N} | {duration, DurTime} | {until, StopTime} | {force_stop, ForceStop} | {decrypt, DecryptKeyOrFile} | {refresh_logs, LogDir} | {logopts, LogOpts} | {verbosity, VLevels} | {basic_html, Bool} | {esc_chars, Bool} | {ct_hooks, CTHs} | {enable_builtin_hooks, Bool} | {release_shell, Bool}</v>
+        <v>OptTuples = {dir, TestDirs} | {suite, Suites} | {group, Groups} | {testcase, Cases} | {spec, TestSpecs} | {join_specs, Bool} | {label, Label} | {config, CfgFiles} | {userconfig, UserConfig} | {allow_user_terms, Bool} | {logdir, LogDir} | {silent_connections, Conns} | {stylesheet, CSSFile} | {cover, CoverSpecFile} | {cover_stop, Bool} | {step, StepOpts} | {event_handler, EventHandlers} | {include, InclDirs} | {auto_compile, Bool} | {abort_if_missing_suites, Bool} | {create_priv_dir, CreatePrivDir} | {multiply_timetraps, M} | {scale_timetraps, Bool} | {repeat, N} | {duration, DurTime} | {until, StopTime} | {force_stop, ForceStop} | {decrypt, DecryptKeyOrFile} | {refresh_logs, LogDir} | {logopts, LogOpts} | {verbosity, VLevels} | {basic_html, Bool} | {esc_chars, Bool} | {keep_logs,KeepSpec} | {ct_hooks, CTHs} | {enable_builtin_hooks, Bool} | {release_shell, Bool}</v>
         <v>TestDirs = [string()] | string()</v>
         <v>Suites = [string()] | [atom()] | string() | atom()</v>
         <v>Cases = [atom()] | atom()</v>
@@ -1175,6 +1278,7 @@
         <v>VLevels = VLevel | [{Category, VLevel}]</v>
         <v>VLevel = integer()</v>
         <v>Category = atom()</v>
+	<v>KeepSpec = all | pos_integer()</v>
         <v>CTHs = [CTHModule | {CTHModule, CTHInitArgs}]</v>
         <v>CTHModule = atom()</v>
         <v>CTHInitArgs = term()</v>
@@ -1225,6 +1329,21 @@
     </func>
 
     <func>
+      <name>set_verbosity(Category, Level) -&gt; ok</name>
+      <fsummary>Set the verbosity level for a logging category.</fsummary>
+      <type>
+        <v>Category = default | atom()</v>
+        <v>Level = integer()</v>
+      </type>
+      <desc><marker id="set_verbosity-2"/>
+        <p>Use this function to set, or modify, the verbosity level for a logging
+	category. See the <seealso marker="write_test_chapter#logging">
+	User's Guide</seealso> for details. Use the value <c>default</c> to set the
+	general verbosity level.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>sleep(Time) -&gt; ok</name>
       <fsummary>This function, similar to timer:sleep/1, suspends the
         test case for a specified time.</fsummary>
@@ -1236,7 +1355,7 @@
         <v>Millisecs = integer() | float()</v>
       </type>
       <desc><marker id="sleep-1"/>
-        <p>This function, similar to <c>timer:sleep/1</c> in <c>STDLIB</c>, 
+        <p>This function, similar to <c>timer:sleep/1</c> in STDLIB,
           suspends the test case for a specified time.
           However, this function also multiplies <c>Time</c> with the
           <c>multiply_timetraps</c> value (if set) and under certain
@@ -1330,7 +1449,7 @@
           caught by any installed event manager.</p>
 
         <p>See also
-          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.
+          <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.
         </p>
       </desc>
     </func>
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index 3b1e564b66..954be0ffba 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2016</year>
+      <year>2010</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -94,7 +94,7 @@
           <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>,
           or a <c>reference</c> (created using
           <seealso marker="erts:erlang#make_ref-0">erlang:make_ref/0</seealso>
-          in <c>ERTS</c>) if
+          in ERTS) if
           <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>
           is not implemented.</p>
 
@@ -208,9 +208,10 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_group(GroupName, InitData, CTHState) -&gt; Result</name>
+      <name>Module:pre_init_per_group(SuiteName, GroupName, InitData, CTHState) -&gt; Result</name>
       <fsummary>Called before init_per_group.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>GroupName = atom()</v>
         <v>InitData = Config | SkipOrFail</v>
         <v>Config = NewConfig = [{Key,Value}]</v>
@@ -231,13 +232,19 @@
           but for function
           <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
           instead.</p>
+
+	<p>If <c>Module:pre_init_per_group/4</c> is not exported, common_test
+	  will attempt to call <c>Module:pre_init_per_group(GroupName,
+	  InitData, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_init_per_group(GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <name>Module:post_init_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after init_per_group.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>GroupName = atom()</v>
         <v>Config = [{Key,Value}]</v>
         <v>Return = NewReturn = Config | SkipOrFail | term()</v>
@@ -258,13 +265,19 @@
           but for function
           <seealso marker="common_test#Module:init_per_group-2"><c>init_per_group</c></seealso>
           instead.</p>
+
+	<p>If <c>Module:post_init_per_group/5</c> is not exported, common_test
+	  will attempt to call <c>Module:post_init_per_group(GroupName,
+	  Config, Return, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_init_per_testcase(TestcaseName, InitData, CTHState) -&gt; Result</name>
+      <name>Module:pre_init_per_testcase(SuiteName, TestcaseName, InitData, CTHState) -&gt; Result</name>
       <fsummary>Called before init_per_testcase.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestcaseName = atom()</v>
         <v>InitData = Config | SkipOrFail</v>
         <v>Config = NewConfig = [{Key,Value}]</v>
@@ -286,6 +299,11 @@
           <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
           instead.</p>
 
+	<p>If <c>Module:pre_init_per_testcase/4</c> is not exported, common_test
+	  will attempt to call <c>Module:pre_init_per_testcase(TestcaseName,
+	  InitData, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
+
         <p>CTHs cannot be added here right now. That feature may be added in
           a later release, but it would right now break backwards
           compatibility.</p>
@@ -293,9 +311,10 @@
     </func>
 
     <func>
-      <name>Module:post_init_per_testcase(TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <name>Module:post_init_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after init_per_testcase.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestcaseName = atom()</v>
         <v>Config = [{Key,Value}]</v>
         <v>Return = NewReturn = Config | SkipOrFail | term()</v>
@@ -316,15 +335,21 @@
           but for function
           <seealso marker="common_test#Module:init_per_testcase-2"><c>init_per_testcase</c></seealso>
           instead.</p>
+
+	<p>If <c>Module:post_init_per_testcase/5</c> is not exported, common_test
+	  will attempt to call <c>Module:post_init_per_testcase(TestcaseName,
+	  Config, Return, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_end_per_testcase(TestcaseName, InitData, CTHState) -&gt; Result</name>
+      <name>Module:pre_end_per_testcase(SuiteName, TestcaseName, EndData, CTHState) -&gt; Result</name>
       <fsummary>Called before end_per_testcase.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestcaseName = atom()</v>
-        <v>InitData = Config</v>
+        <v>EndData = Config</v>
         <v>Config = NewConfig = [{Key,Value}]</v>
         <v>CTHState = NewCTHState = term()</v>
         <v>Result = {NewConfig, NewCTHState}</v>
@@ -345,14 +370,20 @@
 
         <p>This function can not change the result of the test case by returning skip or fail
 	tuples, but it may insert items in <c>Config</c> that can be read in
-	<c>end_per_testcase/2</c> or in <c>post_end_per_testcase/4</c>.</p>
+	<c>end_per_testcase/2</c> or in <c>post_end_per_testcase/5</c>.</p>
+
+	<p>If <c>Module:pre_end_per_testcase/4</c> is not exported, common_test
+	  will attempt to call <c>Module:pre_end_per_testcase(TestcaseName,
+	  EndData, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_end_per_testcase(TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <name>Module:post_end_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after end_per_testcase.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestcaseName = atom()</v>
         <v>Config = [{Key,Value}]</v>
         <v>Return = NewReturn = Config | SkipOrFail | term()</v>
@@ -373,13 +404,19 @@
           but for function
           <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
           instead.</p>
+
+	<p>If <c>Module:post_end_per_testcase/5</c> is not exported, common_test
+	  will attempt to call <c>Module:post_end_per_testcase(TestcaseName,
+	  Config, Return, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:pre_end_per_group(GroupName, EndData, CTHState) -&gt; Result</name>
+      <name>Module:pre_end_per_group(SuiteName, GroupName, EndData, CTHState) -&gt; Result</name>
       <fsummary>Called before end_per_group.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>GroupName = atom()</v>
         <v>EndData = Config | SkipOrFail</v>
         <v>Config = NewConfig = [{Key,Value}]</v>
@@ -400,13 +437,19 @@
           but for function
           <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group</c></seealso>
           instead.</p>
+
+	<p>If <c>Module:pre_end_per_group/4</c> is not exported, common_test
+	  will attempt to call <c>Module:pre_end_per_group(GroupName,
+	  EndData, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:post_end_per_group(GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <name>Module:post_end_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after end_per_group.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>GroupName = atom()</v>
         <v>Config = [{Key,Value}]</v>
         <v>Return = NewReturn = Config | SkipOrFail | term()</v>
@@ -427,6 +470,11 @@
           but for function
           <seealso marker="common_test#Module:end_per_group-2">end_per_group</seealso>
           instead.</p>
+
+	<p>If <c>Module:post_end_per_group/5</c> is not exported, common_test
+	  will attempt to call <c>Module:post_end_per_group(GroupName,
+	  Config, Return, CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
@@ -485,9 +533,10 @@
     </func>
 
     <func>
-      <name>Module:on_tc_fail(TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <name>Module:on_tc_fail(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
       <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestName = init_per_suite | end_per_suite | {init_per_group,GroupName} | {end_per_group,GroupName} | {FuncName,GroupName} | FuncName</v>
         <v>FuncName = atom()</v>
         <v>GroupName = atom()</v>
@@ -505,7 +554,7 @@
           <item><p>If <c>init_per_suite</c> fails, this function is called after
             <seealso marker="#Module:post_init_per_suite-4"><c>post_init_per_suite</c></seealso>.</p></item>
           <item><p>If a test case fails, this funcion is called after
-          <seealso marker="#Module:post_end_per_testcase-4"><c>post_end_per_testcase</c></seealso>.</p></item>
+          <seealso marker="#Module:post_end_per_testcase-5"><c>post_end_per_testcase</c></seealso>.</p></item>
         </list>
 
          <p>If the failed test case belongs to a test case group, the first
@@ -519,13 +568,19 @@
           For details, see section
           <seealso marker="event_handler_chapter#events">Event Handling</seealso>
           in the User's Guide.</p>
+
+	<p>If <c>Module:on_tc_fail/4</c> is not exported, common_test
+	  will attempt to call <c>Module:on_tc_fail(TestName, Reason,
+	  CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
     <func>
-      <name>Module:on_tc_skip(TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <name>Module:on_tc_skip(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
       <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
+        <v>SuiteName = atom()</v>
         <v>TestName = init_per_suite | end_per_suite | {init_per_group,GroupName} | {end_per_group,GroupName} | {FuncName,GroupName} | FuncName</v>
         <v>FuncName = atom()</v>
         <v>GroupName = atom()</v>
@@ -542,9 +597,9 @@
         <list type="bulleted">
           <item><p>If <c>init_per_group</c> is skipped, this function is
             called after 
-            <seealso marker="#Module:post_init_per_group-4"><c>post_init_per_group</c></seealso>.</p></item>
+            <seealso marker="#Module:post_init_per_group-5"><c>post_init_per_group</c></seealso>.</p></item>
           <item><p>If a test case is skipped, this function is called after
-          <seealso marker="#Module:post_end_per_testcase-4"><c>post_end_per_testcase</c></seealso>.</p></item>
+          <seealso marker="#Module:post_end_per_testcase-5"><c>post_end_per_testcase</c></seealso>.</p></item>
         </list>
 
         <p>If the skipped test case belongs to a test case group, the first
@@ -559,6 +614,11 @@
           For details, see section
           <seealso marker="event_handler_chapter#events">Event Handling</seealso>
           in the User's Guide.</p>
+
+	<p>If <c>Module:on_tc_skip/4</c> is not exported, common_test
+	  will attempt to call <c>Module:on_tc_skip(TestName, Reason,
+	  CTHState)</c> instead. This is for backwards
+	  compatibility.</p>
       </desc>
     </func>
 
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 1998f15697..7ecc2e4298 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2011</year><year>2016</year>
+      <year>2011</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,7 +38,7 @@
       extensions of the default behavior of <c>Common Test</c> using hooks 
       before and after all test suite calls. CTHs allow advanced <c>Common Test</c>
       users to abstract out behavior that is common to multiple test suites
-      without littering all test suites with library calls. this can be used 
+      without littering all test suites with library calls. This can be used
       for logging, starting, and monitoring external systems, 
       building C files needed by the tests, and so on.</p>
 
@@ -175,10 +175,10 @@
       <row>
 	<cell><seealso marker="common_test#Module:init_per_group-2">
 	  init_per_group/2</seealso></cell>
-	<cell><seealso marker="ct_hooks#Module:post_init_per_group-4">
-	    post_init_per_group/4</seealso> is called</cell>
-	<cell><seealso marker="ct_hooks#Module:post_end_per_suite-4">
-	  post_end_per_group/4</seealso> has been called for that group</cell>
+	<cell><seealso marker="ct_hooks#Module:post_init_per_group-5">
+	    post_init_per_group/5</seealso> is called</cell>
+	<cell><seealso marker="ct_hooks#Module:post_end_per_group-5">
+	  post_end_per_group/5</seealso> has been called for that group</cell>
       </row>
     <tcaption>Scope of a CTH</tcaption>
     </table>
@@ -245,16 +245,18 @@
      </list>
 
         <p>
-	This is done in the CTH functions called pre_&lt;name of function&gt;.
-	These functions take the same three arguments, <c>Name</c>, 
+	This is done in the CTH functions called <c>pre_&lt;name of function&gt;</c>.
+	These functions take the arguments <c>SuiteName</c>, <c>Name</c> (group or test case name, if applicable), 
 	<c>Config</c>, and <c>CTHState</c>. The return value of the CTH function
 	is always a combination of a result for the suite/group/test and an 
 	updated <c>CTHState</c>.</p>
 
 	<p>To let the test suite continue on executing, return the configuration 
-	list that you want the test to use as the result. To skip or 
-	fail the test, return a tuple with <c>skip</c> or <c>fail</c>, and a reason 
-	as the result.</p>
+	list that you want the test to use as the result.</p>
+
+        <p>All pre hooks, except <c>pre_end_per_testcase/4</c>, can
+        skip or fail the test by returning a tuple with <c>skip</c> or
+        <c>fail</c>, and a reason as the result.</p>
 
 	<p><em>Example:</em></p>
 	<code>
@@ -290,7 +292,7 @@
 
      <p>
       This is done in the CTH functions called <c>post_&lt;name of function&gt;</c>. 
-      These functions take the same four arguments, <c>Name</c>, 
+      These functions take the arguments <c>SuiteName</c>, <c>Name</c> (group or test case name, if applicable),
       <c>Config</c>, <c>Return</c>, and <c>CTHState</c>. <c>Config</c> in this
       case is the same <c>Config</c> as the testcase is called with. 
       <c>Return</c> is the value returned by the testcase. If the testcase 
@@ -308,7 +310,7 @@
 	
 	<p><em>Example:</em></p>
 	<code>
- post_end_per_testcase(_TC, Config, {'EXIT',{_,_}}, CTHState) -&gt;
+ post_end_per_testcase(_Suite, _TC, Config, {'EXIT',{_,_}}, CTHState) -&gt;
    case db:check_consistency() of
      true ->
        %% DB is good, pass the test.
@@ -317,7 +319,7 @@
        %% DB is not good, mark as skipped instead of failing
        {{skip, "DB is inconsisten!"}, CTHState}
    end;
- post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
+ post_end_per_testcase(_Suite, _TC, Config, Return, CTHState) -&gt;
    %% Do nothing if tc does not crash.
    {Return, CTHState}.</code>
 
@@ -331,8 +333,8 @@
       <title>Skip and Fail Hooks</title>
       <p>
 	After any post hook has been executed for all installed CTHs, 
-	<seealso marker="ct_hooks#Module:on_tc_fail-3">on_tc_fail</seealso>
-	or <seealso marker="ct_hooks#Module:on_tc_skip-3">on_tc_skip</seealso> 
+	<seealso marker="ct_hooks#Module:on_tc_fail-4">on_tc_fail</seealso>
+	or <seealso marker="ct_hooks#Module:on_tc_skip-4">on_tc_skip</seealso>
 	is called if the testcase failed or was skipped, respectively. 
 	You cannot affect the outcome of the tests any further at this point. 
       </p>
@@ -374,7 +376,7 @@
      <title>Example CTH</title>
      <p>The following CTH logs information about a test run into a format 
        parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso> 
-       (in <c>Kernel</c>):
+       (in Kernel):
      </p>
      <code>
  %%% @doc Common Test Example Common Test Hook module.
@@ -389,18 +391,18 @@
  -export([pre_end_per_suite/3]).
  -export([post_end_per_suite/4]).
 
- -export([pre_init_per_group/3]).
- -export([post_init_per_group/4]).
- -export([pre_end_per_group/3]).
- -export([post_end_per_group/4]).
+ -export([pre_init_per_group/4]).
+ -export([post_init_per_group/5]).
+ -export([pre_end_per_group/4]).
+ -export([post_end_per_group/5]).
 
- -export([pre_init_per_testcase/3]).
- -export([post_init_per_testcase/4]).
- -export([pre_end_per_testcase/3]).
- -export([post_end_per_testcase/4]).
+ -export([pre_init_per_testcase/4]).
+ -export([post_init_per_testcase/5]).
+ -export([pre_end_per_testcase/4]).
+ -export([post_end_per_testcase/5]).
 
- -export([on_tc_fail/3]).
- -export([on_tc_skip/3]).
+ -export([on_tc_fail/4]).
+ -export([on_tc_skip/4]).
 
  -export([terminate/1]).
 
@@ -435,46 +437,46 @@
                            total = State#state.total + State#state.suite_total } }.
 
  %% @doc Called before each init_per_group.
- pre_init_per_group(Group,Config,State) ->
+ pre_init_per_group(Suite,Group,Config,State) ->
      {Config, State}.
 
  %% @doc Called after each init_per_group.
- post_init_per_group(Group,Config,Return,State) ->
+ post_init_per_group(Suite,Group,Config,Return,State) ->
      {Return, State}.
 
  %% @doc Called before each end_per_group. 
- pre_end_per_group(Group,Config,State) ->
+ pre_end_per_group(Suite,Group,Config,State) ->
      {Config, State}.
 
  %% @doc Called after each end_per_group. 
- post_end_per_group(Group,Config,Return,State) ->
+ post_end_per_group(Suite,Group,Config,Return,State) ->
      {Return, State}.
 
  %% @doc Called before each init_per_testcase.
- pre_init_per_testcase(TC,Config,State) ->
+ pre_init_per_testcase(Suite,TC,Config,State) ->
      {Config, State#state{ ts = now(), total = State#state.suite_total + 1 } }.
 
  %% Called after each init_per_testcase (immediately before the test case).
- post_init_per_testcase(TC,Config,Return,State) ->
+ post_init_per_testcase(Suite,TC,Config,Return,State) ->
      {Return, State}
 
 %% @doc Called before each end_per_testcase (immediately after the test case).
- pre_end_per_testcase(TC,Config,State) ->
+ pre_end_per_testcase(Suite,TC,Config,State) ->
      {Config, State}.
 
  %% @doc Called after each end_per_testcase.
- post_end_per_testcase(TC,Config,Return,State) ->
-     TCInfo = {testcase, TC, Return, timer:now_diff(now(), State#state.ts)},
+ post_end_per_testcase(Suite,TC,Config,Return,State) ->
+     TCInfo = {testcase, Suite, TC, Return, timer:now_diff(now(), State#state.ts)},
      {Return, State#state{ ts = undefined, tcs = [TCInfo | State#state.tcs] } }.
 
  %% @doc Called after post_init_per_suite, post_end_per_suite, post_init_per_group,
  %% post_end_per_group and post_end_per_testcase if the suite, group or test case failed.
- on_tc_fail(TC, Reason, State) ->
+ on_tc_fail(Suite, TC, Reason, State) ->
      State.
 
  %% @doc Called when a test case is skipped by either user action
  %% or due to an init function failing.  
- on_tc_skip(TC, Reason, State) ->
+ on_tc_skip(Suite, TC, Reason, State) ->
      State.
 
  %% @doc Called when the scope of the CTH is done
@@ -499,13 +501,13 @@
        <tag><c>cth_log_redirect</c></tag>
        <item>
        <p>Built-in</p>
-       <p>Captures all <c>error_logger</c> and <c>SASL</c> logging 
+       <p>Captures all <c>error_logger</c> and SASL logging
 	events and prints them to the current test case log. If an event cannot be 
 	associated with a test case, it is printed in the <c>Common Test</c> framework log. 
 	This happens for test cases running in parallel and events occuring
 	in-between test cases. You can configure the level of
-	<seealso marker="sasl:sasl_app"><c>SASL</c></seealso> events report
-	using the normal <c>SASL</c> mechanisms.</p>
+	<seealso marker="sasl:sasl_app">SASL</seealso> events report
+	using the normal SASL mechanisms.</p>
        </item>
        <tag><c>cth_surefire</c></tag>
        <item>
diff --git a/lib/common_test/doc/src/ct_netconfc.xml b/lib/common_test/doc/src/ct_netconfc.xml
index e6930b30d5..7ec8f23073 100644
--- a/lib/common_test/doc/src/ct_netconfc.xml
+++ b/lib/common_test/doc/src/ct_netconfc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2016</year>
+      <year>2010</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -35,13 +35,35 @@
   <module>ct_netconfc</module>
   <modulesummary>NETCONF client module.</modulesummary>
 
-<description>
+  <description>
 
     <p>NETCONF client module.</p>
 
     <p>The NETCONF client is compliant with RFC 4741 NETCONF Configuration
       Protocol and RFC 4742 Using the NETCONF Configuration Protocol over
-      Secure SHell (SSH)..</p>
+      Secure SHell (SSH).</p>
+
+    <marker id="Connecting"/>
+    <p><em>Connecting to a NETCONF server</em></p>
+
+    <p>NETCONF sessions can either be opened by a single call
+      to <seealso marker="#open-1"><c>open/1,2</c></seealso> or by a call
+      to <seealso marker="#connect-1"><c>connect/1,2</c></seealso> followed
+      by one or more calls to
+      <seealso marker="#session-1"><c>session/1,2,3</c></seealso>.</p>
+
+    <p>The properties of the sessions will be exactly the same, except
+      that when
+      using <seealso marker="#connect-1"><c>connect/1,2</c></seealso>, you
+      may start multiple sessions over the same SSH connection. Each
+      session is implemented as an SSH channel.</p>
+
+    <p><seealso marker="#open-1"><c>open/1,2</c></seealso> will establish one
+      SSH connection with one SSH channel implementing one NETCONF
+      session. You may start mutiple sessions by
+      calling <seealso marker="#open-1"><c>open/1,2</c></seealso> multiple
+      times, but then a new SSH connection will be established for each
+      session.</p>
 
     <p>For each server to test against, the following entry can be added to a
       configuration file:</p>
@@ -49,23 +71,21 @@
     <pre>
  {server_id(),options()}.</pre>
 
-    <p>The <c>server_id()</c> or an associated <c>target_name()</c> (see
-      module <seealso marker="ct"><c>ct</c></seealso>) must then be used
-      in calls to
-      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>.</p>
+    <p>The <seealso marker="#type-server_id"><c>server_id()</c></seealso>
+      or an associated
+      <seealso marker="ct#type-target_name"><c>ct:target_name()</c></seealso>
+      must then be used in calls to
+      <seealso marker="#connect-2"><c>connect/2</c></seealso>
+      or <seealso marker="#open-2"><c>open/2</c></seealso>.</p>
 
-    <p>If no configuration exists for a server, a session can still be
-      opened by calling
-      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso> with
-      all necessary options specified in the call. The first argument to
-      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso> can
-      then be any atom.</p>
+    <p>If no configuration exists for a server,
+      use <seealso marker="#connect-1"><c>connect/1</c></seealso>
+      or <seealso marker="#open-1"><c>open/1</c></seealso> instead,
+      and specify all necessary options in the <c>Options</c> parameter.</p>
 
-  </description>
+    <marker id="Logging"/>
+    <p><em>Logging</em></p>
 
-  <section>
-  <marker id="Logging"/>
-    <title>Logging</title> 
     <p>The NETCONF server uses <c>error_logger</c> for logging of NETCONF
       traffic. A special purpose error handler is implemented in
       <c>ct_conn_log_h</c>. To use this error handler, add the
@@ -73,9 +93,9 @@
 
     <pre>
  suite() -&gt;
-    [{ct_hooks, [{cth_conn_log, [{conn_mod(),hook_options()}]}]}].</pre>
+    [{ct_hooks, [{cth_conn_log, [{<seealso marker="ct#type-conn_log_mod"><c>ct:conn_log_mod()</c></seealso>,<seealso marker="ct#type-conn_log_options"><c>ct:conn_log_options()</c></seealso>}]}]}].</pre>
 
-    <p><c>conn_mod()</c> is the name of the <c>Common Test</c> module
+    <p><c>conn_log_mod()</c> is the name of the <c>Common Test</c> module
       implementing the connection protocol, for example, <c>ct_netconfc</c>.</p>
 
     <p>Hook option <c>log_type</c> specifies the type of logging:</p>
@@ -84,7 +104,7 @@
       <tag><c>raw</c></tag>
       <item><p>The sent and received NETCONF data is logged to a separate
         text file "as is" without any formatting. A link to the file is
-        added to the test case HTML log.</p>.</item>
+        added to the test case HTML log.</p></item>
 
       <tag><c>pretty</c></tag>
       <item><p>The sent and received NETCONF data is logged to a separate
@@ -104,7 +124,7 @@
       To do this, use hook option <c>hosts</c> and list the names of the
       servers/connections to be used in the suite. The connections
       must be named for this to work, that is, they must be opened with
-      <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>.</p>
+      <seealso marker="#open-2"><c>open/2</c></seealso>.</p>
 
     <p>Option <c>hosts</c> has no effect if <c>log_type</c> is set to
       <c>html</c> or <c>silent</c>.</p>
@@ -113,13 +133,13 @@
       configuration variable <c>ct_conn_log</c>:</p>
 
     <pre>
- {ct_conn_log,[{conn_mod(),hook_options()}]}.</pre>
+ {ct_conn_log,[{<seealso marker="ct#type-conn_log_mod"><c>ct:conn_log_mod()</c></seealso>,<seealso marker="ct#type-conn_log_options"><c>ct:conn_log_options()</c></seealso>}]}.</pre>
 
     <p>For example:</p>
 
     <pre>
  {ct_conn_log,[{ct_netconfc,[{log_type,pretty},
-                             {hosts,[key_or_name()]}]}]}</pre>
+                             {hosts,[<seealso marker="ct#type-key_or_name"><c>ct:key_or_name()</c></seealso>]}]}]}</pre>
 
     <note>
       <p>Hook options specified in a configuration file overwrite the
@@ -164,173 +184,149 @@
     <p>The same <c>ct_hooks</c> statement without the configuration file
       would cause HTML logging of all NETCONF connections in to the test
       case HTML log.</p>
-  </section>
 
-  <section>
-  <marker id="Notifications"/>
-    <title>Notifications</title>
+    <marker id="Notifications"/>
+    <p><em>Notifications</em></p>
 
     <p>The NETCONF client is also compliant with RFC 5277 NETCONF Event
       Notifications, which defines a mechanism for an asynchronous message 
       notification delivery service for the NETCONF protocol.</p>
 
     <p>Specific functions to support this are
-      <seealso marker="#create_subscription-6"><c>ct_netconfc:create_subscription/6</c></seealso>
+      <seealso marker="#create_subscription-1"><c>create_subscription/1-6</c></seealso>
       and
-      <seealso marker="#get_event_streams-3"><c>ct_netconfc:get_event_streams/3</c></seealso>.
-      (The functions also exist with other arities.)</p>
-  </section>
-
-  <section>
-    <title>Data Types</title>
-    <marker id="types"/>
-    <taglist>
-      <tag><c>client() = handle() | key_or_name()</c></tag>
-      <item><marker id="type-client"/>
-        <p>For <c>handle()</c>, see module
-          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
-
-      <tag><c>error_reason() = term()</c></tag>
-      <item><marker id="type-error_reason"/> </item>
-      <tag><c>event_time() = {eventTime, xml_attributes(), [xs_datetime()]}</c></tag>
-      <item><marker id="type-event_time"/> </item>
-
-      <tag><c>handle() = term()</c></tag>
-      <item><marker id="type-handle"/>
-        <p>Opaque reference for a connection (NETCONF session). For more
-          information, see module <seealso marker="ct"><c>ct</c></seealso>.</p>
-      </item>
-
-      <tag><c>host() = </c><seealso marker="kernel:inet#type-hostname"><c>inet:hostname()</c></seealso>
-          <c> | </c><seealso marker="kernel:inet#type-ip_address"><c>inet:ip_address()</c></seealso></tag>
-      <item><marker id="type-host"/></item>
-
-      <tag><c>key_or_name() = server_id() | target_name()</c></tag>
-      <item><marker id="type-key_or_name"/>
-        <p>For <c>target_name</c>, see module
-          <seealso marker="ct"><c>ct</c></seealso>.</p></item>
-
-      <tag><c>netconf_db() = running | startup | candidate</c></tag>
-      <item><marker id="type-netconf_db"/> </item>
+      <seealso marker="#get_event_streams-1"><c>get_event_streams/1-3</c></seealso>.</p>
 
-      <tag><c>notification() = {notification, xml_attributes(), notification_content()}</c></tag>
-      <item><marker id="type-notification"/> </item>
+    <marker id="Default_timeout"/>
+    <p><em>Default Timeout</em></p>
 
-      <tag><c>notification_content() = [event_time() | simple_xml()]</c></tag> 
-      <item><marker id="type-notification_content"/> </item>
+    <p>Most of the functions in this module have one variant with
+      a <c>Timeout</c> parameter, and one without. If nothing else is
+      specified, the default value <c>infinity</c> is used when
+      the <c>Timeout</c> parameter is not given.</p>
 
-      <tag><c>option() = {ssh, host()} | {port, </c>
-          <seealso marker="kernel:inet#type-port_number"><c>inet:port_number()</c></seealso>
-          <c>} | {timeout, timeout()} | SshConnectOption</c></tag>
-      <item><marker id="type-option"/>
+  </description>
 
+  <datatypes>
+    <datatype>
+      <name name="client"/>
+    </datatype>
+    <datatype>
+      <name name="error_reason"/>
+    </datatype>
+    <datatype>
+      <name name="event_time"/>
+    </datatype>
+    <datatype>
+      <name name="handle"/>
+      <desc>
+	<p>Opaque reference for a connection to a NETCONF server or a
+	  NETCONF session.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="host"/>
+    </datatype>
+    <datatype>
+      <name name="netconf_db"/>
+    </datatype>
+    <datatype>
+      <name name="notification"/>
+    </datatype>
+    <datatype>
+      <name name="notification_content"/>
+    </datatype>
+    <datatype>
+      <name name="option"/>
+      <desc>
         <p><c>SshConnectOption</c> is any valid option to
           <seealso marker="ssh:ssh#connect-3"><c>ssh:connect/3,4</c></seealso>.
 	  Common options used are <c>user</c>, <c>password</c>
 	  and <c>user_dir</c>. The <c>SshConnectOptions</c> are
-	  verfied by the SSH application.</p></item>
-
-      <tag><c>options() = [option()]</c></tag>
-      <item><marker id="type-options"/>
-        <p>Options used for setting up an SSH connection to a NETCONF
-          server.</p></item>
-
-      <tag><c>server_id() = atom()</c></tag>
-      <item><marker id="type-server_id"/>
+	  verfied by the SSH application.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="options"/>
+      <desc>
+	<p>Options used for setting up an SSH connection to a NETCONF
+          server.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="server_id"/>
+      <desc>
         <p>The identity of a server, specified in a configuration
-          file.</p></item>
-
-      <tag><c>simple_xml() = {xml_tag(), xml_attributes(), xml_content()} | {xml_tag(), xml_content()} | xml_tag()</c></tag>
-      <item><marker id="type-simple_xml"/>
-        <p>This type is further described in application
-          <seealso marker="xmerl:index"><c>xmerl</c></seealso>.</p></item>
-
-      <tag><c>stream_data() = {description, string()} | {replaySupport, string()} | {replayLogCreationTime, string()} | {replayLogAgedTime, string()}</c></tag>
-      <item><marker id="type-stream_data"/>
-        <p>For details about the data format for the string values, see
-          "XML Schema for Event Notifications" in RFC 5277.</p></item>
-
-      <tag><c>stream_name() = string()</c></tag>
-      <item><marker id="type-stream_name"/> </item>
-
-      <tag><c>streams() = [{stream_name(), [stream_data()]}]</c></tag>
-      <item><marker id="type-streams"/> </item>
-
-      <tag><c>xml_attribute_tag() = atom()</c></tag>
-      <item><marker id="type-xml_attribute_tag"/> </item>
-
-      <tag><c>xml_attribute_value() = string()</c></tag>
-      <item><marker id="type-xml_attribute_value"/> </item>
-
-      <tag><c>xml_attributes() = [{xml_attribute_tag(), xml_attribute_value()}]</c></tag>
-      <item><marker id="type-xml_attributes"/> </item>
-
-      <tag><c>xml_content() = [simple_xml() | iolist()]</c></tag>
-      <item><marker id="type-xml_content"/> </item>
-
-      <tag><c>xml_tag() = atom()</c></tag>
-      <item><marker id="type-xml_tag"/> </item>
-
-      <tag><c>xpath() = {xpath, string()}</c></tag>
-      <item><marker id="type-xpath"/> </item>
-
-      <tag><c>xs_datetime() = string()</c></tag>
-      <item><marker id="type-xs_datetime"/>
-        <p>This date and time identifier has the same format as the XML type
+          file.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="simple_xml"/>
+      <desc>
+	<p>This type is further described in application
+          <seealso marker="xmerl:index"><c>xmerl</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="stream_data"/>
+      <desc>
+	<p>For details about the data format for the string values, see
+          "XML Schema for Event Notifications" in RFC 5277.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="stream_name"/>
+    </datatype>
+    <datatype>
+      <name name="streams"/>
+    </datatype>
+    <datatype>
+      <name name="xml_attribute_tag"/>
+    </datatype>
+    <datatype>
+      <name name="xml_attribute_value"/>
+    </datatype>
+    <datatype>
+      <name name="xml_attributes"/>
+    </datatype>
+    <datatype>
+      <name name="xml_content"/>
+    </datatype>
+    <datatype>
+      <name name="xml_tag"/>
+    </datatype>
+    <datatype>
+      <name name="xpath"/>
+    </datatype>
+    <datatype>
+      <name name="xs_datetime"/>
+      <desc>
+	<p>This date and time identifier has the same format as the XML type
           <c>dateTime</c> and is compliant with RFC 3339 Date and Time on
           the Internet Timestamps. The format is as follows:</p>
-      <pre>
+	<pre>
  [-]CCYY-MM-DDThh:mm:ss[.s][Z|(+|-)hh:mm]</pre>
-      </item>
-    </taglist>
-  </section>
-
-  <funcs>
-    <func>
-      <name>action(Client, Action) -&gt; Result</name>
-      <fsummary>Equivalent to action(Client, Action, infinity).</fsummary>
-      <desc><marker id="action-2"/>
-        <p>Equivalent to
-          <seealso marker="#action-3"><c>ct_netconfc:action(Client, Action,
-          infinity)</c></seealso>.</p>
       </desc>
-    </func>
+    </datatype>
+  </datatypes>
 
+  <funcs>
     <func>
-      <name>action(Client, Action, Timeout) -&gt; Result</name>
+      <name name="action" arity="2"/>
+      <name name="action" arity="3"/>
       <fsummary>Executes an action.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Action = simple_xml()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {ok, [simple_xml()]} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="action-3"/>
+      <desc>
         <p>Executes an action. If the return type is void, <c>ok</c> is
           returned instead of <c>{ok,[simple_xml()]}</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>close_session(Client) -&gt; Result</name>
-      <fsummary>Equivalent to close_session(Client, infinity).</fsummary>
-      <desc><marker id="close_session-1"/>
-        <p>Equivalent to
-          <seealso marker="#close_session-2"><c>ct_netconfc:close_session(Client,
-            infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>close_session(Client, Timeout) -&gt; Result</name>
+      <name name="close_session" arity="1"/>
+      <name name="close_session" arity="2"/>
       <fsummary>Requests graceful termination of the session associated with
         the client.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="close_session-2"/>
+      <desc>
         <p>Requests graceful termination of the session associated with the
           client.</p>
 
@@ -343,115 +339,148 @@
     </func>
 
     <func>
-      <name>copy_config(Client, Source, Target) -&gt; Result</name>
-      <fsummary>Equivalent to copy_config(Client, Source, Target,
-        infinity).</fsummary>
-      <desc><marker id="copy_config-3"/>
-        <p>Equivalent to
-          <seealso marker="#copy_config-4"><c>ct_netconfc:copy_config(Client,
-            Source, Target, infinity)</c></seealso>.</p>
-      </desc>
-    </func>
+      <name name="connect" arity="1"/>
+      <fsummary>Opens an SSH connection to a NETCONF server.</fsummary>
+      <desc>
+        <p>Opens an SSH connection to a NETCONF server.</p>
 
-    <func>
-      <name>copy_config(Client, Target, Source, Timeout) -&gt; Result</name>
-      <fsummary>Copies configuration data.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = netconf_db()</v>
-        <v>Source = netconf_db()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="copy_config-4"/>
-        <p>Copies configuration data.</p>
+        <p>If the server options are specified in a configuration file, use
+          <seealso marker="#connect-2"><c>connect/2</c></seealso>
+          instead.</p>
 
-        <p>Which source and target options that can be issued depends on the
-          capabilities supported by the server. That is, <c>:candidate</c>
-          and/or <c>:startup</c> are required.</p>
+        <p>The opaque <seealso marker="#type-handle"><c>handle()</c></seealso>
+	  reference returned from this
+          function is required as connection identifier when opening
+          sessions over this connection, see
+          <seealso marker="#session-1"><c>session/1,2,3</c></seealso>.</p>
+
+        <p>Option <c>timeout</c> (milliseconds) is used when setting up the
+          SSH connection. It is not used for any other purposes during the
+          lifetime of the connection.</p>
       </desc>
     </func>
 
     <func>
-      <name>create_subscription(Client) -&gt; term()</name>
-      <fsummary>Creates a subscription for event notifications.</fsummary>
-      <desc><marker id="create_subscription-1"/></desc>
-    </func>
+      <name name="connect" arity="2"/>
+      <fsummary>Opens an SSH connection to a named NETCONF server.</fsummary>
+      <desc>
+        <p>Open an SSH connection to a named NETCONF server.</p>
 
-    <func>
-      <name>create_subscription(Client, Timeout) -&gt; term()</name>
-      <fsummary>Creates a subscription for event notifications.</fsummary>
-      <desc><marker id="create_subscription-2"/></desc>
-    </func>
+        <p>If <c><anno>KeyOrName</anno></c> is a
+          configured <c>server_id()</c> or a
+          <c>target_name()</c> associated with such an Id, then the options
+          for this server are fetched from the configuration file.</p>
 
-    <func>
-      <name>create_subscription(Client, Stream, Timeout) -&gt; term()</name>
-      <fsummary>Creates a subscription for event notifications.</fsummary>
-      <desc><marker id="create_subscription-3"/></desc>
-    </func>
+        <p>Argument <c><anno>ExtraOptions</anno></c> is added to the
+          options found in the configuration file. If the same options
+          are specified, the values from the configuration file
+          overwrite <c><anno>ExtraOptions</anno></c>.</p>
 
-    <func>
-      <name>create_subscription(Client, StartTime, StopTime, Timeout) -&gt; term()</name>
-      <fsummary>Creates a subscription for event notifications.</fsummary>
-      <desc><marker id="create_subscription-4"/></desc>
+        <p>If the server is not specified in a configuration file, use
+          <seealso marker="#connect-1"><c>connect/1</c></seealso>
+          instead.</p>
+
+        <p>The opaque <seealso marker="#type-handle"><c>handle()</c></seealso>
+	  reference returned from this
+          function can be used as connection identifier when opening
+          sessions over this connection, see
+          <seealso marker="#session-1"><c>session/1,2,3</c></seealso>.
+          However, if <c><anno>KeyOrName</anno></c> is a
+          <c>target_name()</c>, that is, if the server is named through a
+          call to <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>
+          or a <c>require</c> statement in the test suite, then this name can
+          be used instead of
+	  <seealso marker="#type-handle"><c>handle()</c></seealso>.</p>
+
+        <p>Option <c>timeout</c> (milliseconds) is used when setting up the
+          SSH connection. It is not used for any other purposes during the
+          lifetime of the connection.</p>
+      </desc>
     </func>
 
     <func>
-      <name>create_subscription(Client, Stream, StartTime, StopTime, Timeout) -&gt; term()</name>
-      <fsummary>Creates a subscription for event notifications.</fsummary>
-      <desc><marker id="create_subscription-5"/></desc>
+      <name name="copy_config" arity="3"/>
+      <name name="copy_config" arity="4"/>
+      <fsummary>Copies configuration data.</fsummary>
+      <desc>
+        <p>Copies configuration data.</p>
+
+        <p>Which source and target options that can be issued depends on the
+          capabilities supported by the server. That is, <c>:candidate</c>
+          and/or <c>:startup</c> are required.</p>
+      </desc>
     </func>
 
     <func>
-      <name>create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout) -&gt; Result</name>
+      <name>create_subscription(Client) -> Result</name>
+      <name>create_subscription(Client, Stream) -> Result</name>
+      <name>create_subscription(Client, Stream, Filter) -> Result</name>
+      <name>create_subscription(Client, Stream, Filter, Timeout) -> Result</name>
+      <name name="create_subscription" arity="5" clause_i="2"/>
+      <name name="create_subscription" arity="6"/>
       <fsummary>Creates a subscription for event notifications.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Stream = stream_name()</v>
-        <v>Filter = simple_xml() | [simple_xml()]</v>
-        <v>StartTime = xs_datetime()</v>
-        <v>StopTime = xs_datetime()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="create_subscription-6"/>
+      <desc>
         <p>Creates a subscription for event notifications.</p>
 
         <p>This function sets up a subscription for NETCONF event
           notifications of the specified stream type, matching the specified
           filter. The calling process receives notifications as messages of
-          type <c>notification()</c>.</p>
+          type <seealso marker="#type-notification"><c>notification()</c></seealso>.</p>
+
+	<p>Only a subset of the function clauses are show above. The
+	  full set of valid combinations of input parameters is as
+	  follows:</p>
+
+<pre>create_subscription(Client)
+
+create_subscription(Client, Timeout)
+create_subscription(Client, Stream)
+create_subscription(Client, Filter)
+
+create_subscription(Client, Stream, Timeout)
+create_subscription(Client, Filter, Timeout)
+create_subscription(Client, Stream, Filter)
+create_subscription(Client, StartTime, StopTime)
+
+create_subscription(Client, Stream, Filter, Timeout)
+create_subscription(Client, StartTime, StopTime, Timeout)
+create_subscription(Client, Stream, StartTime, StopTime)
+create_subscription(Client, Filter, StartTime, StopTime)
+
+create_subscription(Client, Stream, StartTime, StopTime, Timeout)
+create_subscription(Client, Stream, Filter, StartTime, StopTime)
+create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
 
         <taglist>
-          <tag><c>Stream</c></tag>
+          <tag><c><anno>Stream</anno></c></tag>
           <item><p>Optional parameter that indicates which stream of event
             is of interest. If not present, events in the default NETCONF
             stream are sent.</p></item>
-          <tag><c>Filter</c></tag>
+          <tag><c><anno>Filter</anno></c></tag>
           <item><p>Optional parameter that indicates which subset of all
             possible events is of interest. The parameter format is the
             same as that of the filter parameter in the NETCONF protocol
             operations. If not present, all events not precluded by other
             parameters are sent.</p></item>
-          <tag><c>StartTime</c></tag>
+          <tag><c><anno>StartTime</anno></c></tag>
           <item><p>Optional parameter used to trigger the replay feature and
               indicate that the replay is to start at the time specified.
-              If <c>StartTime</c> is not present, this is not a replay
-              subscription.</p>
+              If <c><anno>StartTime</anno></c> is not present, this is not a
+	      replay subscription.</p>
             <p>It is not valid to specify start times that are later than
-              the current time. If <c>StartTime</c> is specified earlier
-              than the log can support, the replay begins with the earliest
-              available notification.</p>
+              the current time. If <c><anno>StartTime</anno></c> is specified
+	      earlier than the log can support, the replay begins with the
+	      earliest available notification.</p>
             <p>This parameter is of type <c>dateTime</c> and compliant to
               RFC 3339. Implementations must support time zones.</p></item>
-          <tag><c>StopTime</c></tag>
+          <tag><c><anno>StopTime</anno></c></tag>
           <item><p>Optional parameter used with the optional replay feature
               to indicate the newest notifications of interest. If
-              <c>StopTime</c> is not present, the notifications continues
-              until the subscription is terminated.</p>
+              <c><anno>StopTime</anno></c> is not present, the notifications
+	      continues until the subscription is terminated.</p>
             <p>Must be used with and be later than <c>StartTime</c>. Values
-              of <c>StopTime</c> in the future are valid. This parameter is
-              of type <c>dateTime</c> and compliant to RFC 3339.
+              of <c><anno>StopTime</anno></c> in the future are valid. This
+	      parameter is of type <c>dateTime</c> and compliant to RFC 3339.
               Implementations must support time zones.</p></item>
         </taglist>
 
@@ -461,25 +490,10 @@
     </func>
 
     <func>
-      <name>delete_config(Client, Target) -&gt; Result</name>
-      <fsummary>Equivalent to delete_config(Client, Target,
-        infinity).</fsummary>
-      <desc><marker id="delete_config-2"/>
-        <p>Equivalent to
-          <seealso marker="#delete_config-3"><c>ct_netconfc:delete_config(Client, Target, infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>delete_config(Client, Target, Timeout) -&gt; Result</name>
+      <name name="delete_config" arity="2"/>
+      <name name="delete_config" arity="3"/>
       <fsummary>Deletes configuration data.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = startup | candidate</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="delete_config-3"/>
+      <desc>
         <p>Deletes configuration data.</p>
 
         <p>The running configuration cannot be deleted and <c>:candidate</c>
@@ -487,54 +501,25 @@
       </desc>
     </func>
 
-    <func>
-      <name>edit_config(Client, Target, Config) -&gt; Result</name>
-        <fsummary>Equivalent to edit_config(Client, Target, Config, [],
-          infinity).</fsummary>
-      <desc><marker id="edit_config-3"/>
-        <p>Equivalent to
-          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
-          Target, Config, [], infinity)</c></seealso>.</p>
-      </desc>
-    </func>
+     <func>
+      <name name="disconnect" arity="1"/>
+      <fsummary>Closes the given SSH connection.</fsummary>
+      <desc>
+	<p>Closes the given SSH connection.</p>
 
-    <func>
-      <name>edit_config(Client, Target, Config, OptParamsOrTimeout) -&gt; Result</name>
-      <fsummary>If OptParamsOrTimeout is a time-out value, this function is
-        equivalent to ct_netconfc:edit_config(Client, Target, Config, [],
-        Timeout).</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = netconf_db()</v>
-        <v>Config = simple_xml()</v>
-        <v>OptParamsOrTimeout = [simple_xml()] | timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="edit_config-4"/>
-        <p>If <c>OptParamsOrTimeout</c> is a time-out value, this function is
-          equivalent to
-          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
-          Target, Config, [], Timeout)</c></seealso>.</p>
-
-        <p>If <c>OptParamsOrTimeout</c> is a list of simple XML, this
-          function is equivalent to
-          <seealso marker="#edit_config-5"><c>ct_netconfc:edit_config(Client,
-          Target, Config, OptParams, infinity)</c></seealso>.</p>
+	<p>If there are open NETCONF sessions on the connection, these
+	  will be brutally aborted. To avoid this, close each session
+	  with <seealso marker="#close_session-1"><c>close_session/1,2</c></seealso></p>
       </desc>
     </func>
 
     <func>
-      <name>edit_config(Client, Target, Config, OptParams, Timeout) -&gt; Result</name>
+      <name name="edit_config" arity="3"/>
+      <name name="edit_config" arity="4" clause_i="1"/>
+      <name name="edit_config" arity="4" clause_i="2"/>
+      <name name="edit_config" arity="5"/>
       <fsummary>Edits configuration data.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = netconf_db()</v>
-        <v>Config = simple_xml()</v>
-        <v>OptParams = [simple_xml()]</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="edit_config-5"/>
+      <desc>
         <p>Edits configuration data.</p>
 
         <p>By default only the running target is available, unless the server
@@ -550,29 +535,17 @@
         <pre>
  [{'default-operation', ["none"]},
   {'error-option', ["rollback-on-error"]}]</pre>
-      </desc>
-    </func>
 
-    <func>
-      <name>get(Client, Filter) -&gt; Result</name>
-      <fsummary>Equivalent to get(Client, Filter, infinity).</fsummary>
-      <desc><marker id="get-2"/>
-        <p>Equivalent to
-          <seealso marker="#get-3"><c>ct_netconfc:get(Client, Filter,
-            infinity)</c></seealso>.</p>
+	<p>If <c><anno>OptParams</anno></c> is not given, the default
+	  value <c>[]</c> is used.</p>
       </desc>
     </func>
 
     <func>
-      <name>get(Client, Filter, Timeout) -&gt; Result</name>
+      <name name="get" arity="2"/>
+      <name name="get" arity="3"/>
       <fsummary>Gets data.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Filter = simple_xml() | xpath()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = {ok, [simple_xml()]} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="get-3"/>
+      <desc>
         <p>Gets data.</p>
  
         <p>This operation returns both configuration and state data from the
@@ -584,24 +557,10 @@
     </func>
 
     <func>
-      <name>get_capabilities(Client) -&gt; Result</name>
-      <fsummary>Equivalent to get_capabilities(Client, infinity).</fsummary>
-      <desc><marker id="get_capabilities-1"/>
-        <p>Equivalent to
-          <seealso marker="#get_capabilities-2"><c>ct_netconfc:get_capabilities(Client,
-          infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_capabilities(Client, Timeout) -&gt; Result</name>
+      <name name="get_capabilities" arity="1"/>
+      <name name="get_capabilities" arity="2"/>
       <fsummary>Returns the server side capabilities.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = [string()] | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="get_capabilities-2"/>
+      <desc>
         <p>Returns the server side capabilities.</p>
 
         <p>The following capability identifiers, defined in RFC 4741 NETCONF
@@ -623,26 +582,10 @@
     </func>
 
     <func>
-      <name>get_config(Client, Source, Filter) -&gt; Result</name>
-      <fsummary>Equivalent to get_config(Client, Source, Filter,
-        infinity).</fsummary>
-      <desc><marker id="get_config-3"/>
-        <p>Equivalent to
-          <seealso marker="#get_config-4"><c>ct_netconfc:get_config(Client, Source, Filter, infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_config(Client, Source, Filter, Timeout) -&gt; Result</name>
+      <name name="get_config" arity="3"/>
+      <name name="get_config" arity="4"/>
       <fsummary>Gets configuration data.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Source = netconf_db()</v>
-        <v>Filter = simple_xml() | xpath()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = {ok, [simple_xml()]} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="get_config-4"/>
+      <desc>
         <p>Gets configuration data.</p>
 
         <p>To be able to access another source than <c>running</c>, the
@@ -654,25 +597,12 @@
     </func>
 
     <func>
-      <name>get_event_streams(Client, Timeout) -&gt; Result</name>
-      <fsummary>Equivalent to get_event_streams(Client, [], Timeout).</fsummary>
-      <desc><marker id="get_event_streams-2"/>
-        <p>Equivalent to
-          <seealso marker="#get_event_streams-3"><c>ct_netconfc:get_event_streams(Client,
-          [], Timeout)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_event_streams(Client, Streams, Timeout) -&gt; Result</name>
+      <name name="get_event_streams" arity="1"/>
+      <name name="get_event_streams" arity="2" clause_i="1"/>
+      <name name="get_event_streams" arity="2" clause_i="2"/>
+      <name name="get_event_streams" arity="3"/>
       <fsummary>Sends a request to get the specified event streams.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Streams = [stream_name()]</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = {ok, streams()} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="get_event_streams-3"/>
+      <desc>
         <p>Sends a request to get the specified event streams.</p>
 
         <p><c>Streams</c> is a list of stream names. The following filter is
@@ -700,67 +630,28 @@
  &lt;/netconf&gt;</pre>
 
         <p>If more complex filtering is needed, use
-          <seealso marker="#get-2"><c>ct_netconfc:get/2</c></seealso> or
-          <seealso marker="#get-3"><c>ct_netconfc:get/3</c></seealso> and
+          <seealso marker="#get-2"><c>ct_netconfc:get/2,3</c></seealso> and
           specify the exact filter according to "XML Schema for Event
           Notifications" in RFC 5277.</p>
       </desc>
     </func>
 
     <func>
-      <name>get_session_id(Client) -&gt; Result</name>
-      <fsummary>Equivalent to get_session_id(Client, infinity).</fsummary>
-      <desc><marker id="get_session_id-1"/>
-        <p>Equivalent to
-          <seealso marker="#get_session_id-2"><c>ct_netconfc:get_session_id(Client,
-          infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>get_session_id(Client, Timeout) -&gt; Result</name>
+      <name name="get_session_id" arity="1"/>
+      <name name="get_session_id" arity="2"/>
       <fsummary>Returns the session Id associated with the specified
         client.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = pos_integer() | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="get_session_id-2"/>
+      <desc>
         <p>Returns the session Id associated with the specified client.</p>
       </desc>
     </func>
 
     <func>
-      <name>hello(Client) -&gt; Result</name>
-      <fsummary>Equivalent to hello(Client, [], infinity).</fsummary>
-      <desc><marker id="hello-1"/>
-        <p>Equivalent to
-          <seealso marker="#hello-3"><c>ct_netconfc:hello(Client, [],
-          infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>hello(Client, Timeout) -&gt; Result</name>
-      <fsummary>Equivalent to hello(Client, [], Timeout).</fsummary>
-      <desc><marker id="hello-2"/>
-        <p>Equivalent to
-          <seealso marker="#hello-3"><c>ct_netconfc:hello(Client, [],
-          Timeout)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>hello(Client, Options, Timeout) -&gt; Result</name>
+      <name name="hello" arity="1"/>
+      <name name="hello" arity="2"/>
+      <name name="hello" arity="3"/>
       <fsummary>Exchanges hello messages with the server.</fsummary>
-      <type>
-        <v>Client = handle()</v>
-        <v>Options = [{capability, [string()]}]</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="hello-3"/>
+      <desc>
         <p>Exchanges <c>hello</c> messages with the server.</p>
 
         <p>Adds optional capabilities and sends a <c>hello</c> message to the
@@ -769,27 +660,11 @@
     </func>
 
     <func>
-      <name>kill_session(Client, SessionId) -&gt; Result</name>
-      <fsummary>Equivalent to kill_session(Client, SessionId,
-        infinity).</fsummary>
-      <desc><marker id="kill_session-2"/>
-        <p>Equivalent to
-          <seealso marker="#kill_session-3"><c>ct_netconfc:kill_session(Client,
-SessionId, infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>kill_session(Client, SessionId, Timeout) -&gt; Result</name>
+      <name name="kill_session" arity="2"/>
+      <name name="kill_session" arity="3"/>
       <fsummary>Forces termination of the session associated with the supplied
         session Id.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>SessionId = pos_integer()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="kill_session-3"/>
+      <desc>
         <p>Forces termination of the session associated with the supplied
           session Id.</p>
 
@@ -807,26 +682,11 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>lock(Client, Target) -&gt; Result</name>
-      <fsummary>Equivalent to lock(Client, Target, infinity).</fsummary>
-      <desc><marker id="lock-2"/>
-        <p>Equivalent to
-          <seealso marker="#lock-3"><c>ct_netconfc:lock(Client, Target,
-            infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>lock(Client, Target, Timeout) -&gt; Result</name>
-      <fsummary>Unlocks the configuration target.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = netconf_db()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="lock-3"/>
-        <p>Unlocks the configuration target.</p>
+      <name name="lock" arity="2"/>
+      <name name="lock" arity="3"/>
+      <fsummary>Locks the configuration target.</fsummary>
+      <desc>
+        <p>Locks the configuration target.</p>
 
         <p>Which target parameters that can be used depends on if
           <c>:candidate</c> and/or <c>:startup</c> are supported by the
@@ -835,9 +695,7 @@ SessionId, infinity)</c></seealso>.</p>
           Locks are intended to be short-lived.</p>
 
          <p>Operation
-           <seealso marker="#kill_session-2"><c>ct_netconfc:kill_session/2</c></seealso>
-           or
-           <seealso marker="#kill_session-3"><c>ct_netconfc:kill_session/3</c></seealso>
+           <seealso marker="#kill_session-2"><c>kill_session/2,3</c></seealso>
            can be used to force the release of a lock owned by another NETCONF
            session. How this is achieved by the server side is
            implementation-specific.</p>
@@ -845,54 +703,41 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>only_open(Options) -&gt; Result</name>
+      <name name="only_open" arity="1"/>
       <fsummary>Opens a NETCONF session, but does not send hello.</fsummary>
-      <type>
-        <v>Options = options()</v>
-        <v>Result = {ok, handle()} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="only_open-1"/>
+      <desc>
         <p>Opens a NETCONF session, but does not send <c>hello</c>.</p>
 
-        <p>As <seealso marker="#open-1"><c>ct_netconfc:open/1</c></seealso>,
-          but does not send a <c>hello</c> message.</p>
+        <p>As <seealso marker="#open-1"><c>open/1</c></seealso>, but
+          does not send a <c>hello</c> message.</p>
       </desc>
     </func>
 
     <func>
-      <name>only_open(KeyOrName, ExtraOptions) -&gt; Result</name>
-      <fsummary>Opens a name NETCONF session, but does not send
-        hello.</fsummary>
-      <type>
-        <v>KeyOrName = key_or_name()</v>
-        <v>ExtraOptions = options()</v>
-        <v>Result = {ok, handle()} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="only_open-2"/>
-        <p>Opens a name NETCONF session, but does not send <c>hello</c>.</p>
-
-        <p>As <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>,
-          but does not send a <c>hello</c> message.</p>
+      <name name="only_open" arity="2"/>
+      <fsummary>Opens a named NETCONF session, but does not send hello.</fsummary>
+      <desc>
+        <p>Opens a named NETCONF session, but does not send <c>hello</c>.</p>
+
+        <p>As <seealso marker="#open-2"><c>open/2</c></seealso>, but
+          does not send a <c>hello</c> message.</p>
       </desc>
     </func>
 
     <func>
-    <name>open(Options) -&gt; Result</name>
-    <fsummary>Opens a NETCONF session and exchanges hello messages.</fsummary>
-      <type>
-        <v>Options = options()</v>
-        <v>Result = {ok, handle()} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="open-1"/>
+      <name name="open" arity="1"/>
+      <fsummary>Opens a NETCONF session and exchanges hello messages.</fsummary>
+      <desc>
         <p>Opens a NETCONF session and exchanges <c>hello</c> messages.</p>
 
         <p>If the server options are specified in a configuration file,
           or if a named client is needed for logging purposes (see section
           <seealso marker="#Logging">Logging</seealso> in this module), use
-          <seealso marker="#open-2"><c>ct_netconfc:open/2</c></seealso>
+          <seealso marker="#open-2"><c>open/2</c></seealso>
           instead.</p>
 
-        <p>The opaque <c>handle()</c> reference returned from this
+        <p>The opaque <seealso marker="#type-handle"><c>handle()</c></seealso>
+	  reference returned from this
           function is required as client identifier when calling any other
           function in this module.</p>
 
@@ -904,37 +749,36 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>open(KeyOrName, ExtraOptions) -&gt; Result</name>
+      <name name="open" arity="2"/>
       <fsummary>Opens a named NETCONF session and exchanges hello
         messages.</fsummary>
-      <type>
-        <v>KeyOrName = key_or_name()</v>
-        <v>ExtraOptions = options()</v>
-        <v>Result = {ok, handle()} | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="open-2"/>
+      <desc>
         <p>Opens a named NETCONF session and exchanges <c>hello</c>
           messages.</p>
 
-         <p>If <c>KeyOrName</c> is a configured <c>server_id()</c> or a
+         <p>If <c><anno>KeyOrName</anno></c> is a
+           configured <c>server_id()</c> or a
            <c>target_name()</c> associated with such an Id, then the options
            for this server are fetched from the configuration file.</p>
 
-         <p>Argument <c>ExtraOptions</c> is added to the options found in the
-           configuration file. If the same options are specified, the values
-           from the configuration file overwrite <c>ExtraOptions</c>.</p>
+         <p>Argument <c><anno>ExtraOptions</anno></c> is added to the
+           options found in the configuration file. If the same
+           options are specified, the values from the configuration
+           file overwrite <c><anno>ExtraOptions</anno></c>.</p>
 
          <p>If the server is not specified in a configuration file, use
-           <seealso marker="#open-1"><c>ct_netconfc:open/1</c></seealso>
+           <seealso marker="#open-1"><c>open/1</c></seealso>
            instead.</p>
 
-         <p>The opaque <c>handle()</c> reference returned from this
+         <p>The opaque <seealso marker="#type-handle"><c>handle()</c></seealso>
+	   reference returned from this
            function can be used as client identifier when calling any other
-           function in this module. However, if <c>KeyOrName</c> is a
+           function in this module. However, if <c><anno>KeyOrName</anno></c> is a
            <c>target_name()</c>, that is, if the server is named through a
            call to <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>
            or a <c>require</c> statement in the test suite, then this name can
-           be used instead of <c>handle()</c>.</p>
+           be used instead of
+	   <seealso marker="#type-handle"><c>handle()</c></seealso>.</p>
 
         <p>Option <c>timeout</c> (milliseconds) is used when setting up the
           SSH connection and when waiting for the <c>hello</c> message from
@@ -947,25 +791,10 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send(Client, SimpleXml) -&gt; Result</name>
-      <fsummary>Equivalent to send(Client, SimpleXml, infinity).</fsummary>
-      <desc><marker id="send-2"/>
-        <p>Equivalent to
-          <seealso marker="#send-3"><c>ct_netconfc:send(Client, SimpleXml,
-            infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>send(Client, SimpleXml, Timeout) -&gt; Result</name>
+      <name name="send" arity="2"/>
+      <name name="send" arity="3"/>
       <fsummary>Sends an XML document to the server.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>SimpleXml = simple_xml()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = simple_xml() | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="send-3"/>
+      <desc>
         <p>Sends an XML document to the server.</p>
 
         <p>The specified XML document is sent "as is" to the server. This
@@ -975,25 +804,10 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send_rpc(Client, SimpleXml) -&gt; Result</name>
-      <fsummary>Equivalent to send_rpc(Client, SimpleXml, infinity).</fsummary>
-      <desc><marker id="send_rpc-2"/>
-        <p>Equivalent to
-          <seealso marker="#send_rpc-3"><c>ct_netconfc:send_rpc(Client,
-          SimpleXml, infinity)</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name>send_rpc(Client, SimpleXml, Timeout) -&gt; Result</name>
+      <name name="send_rpc" arity="2"/>
+      <name name="send_rpc" arity="3"/>
       <fsummary>Sends a NETCONF rpc request to the server.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>SimpleXml = simple_xml()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = [simple_xml()] | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="send_rpc-3"/>
+      <desc>
         <p>Sends a NETCONF <c>rpc</c> request to the server.</p>
 
         <p>The specified XML document is wrapped in a valid NETCONF <c>rpc</c>
@@ -1006,30 +820,42 @@ SessionId, infinity)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>unlock(Client, Target) -&gt; Result</name>
-      <fsummary>Equivalent to unlock(Client, Target, infinity).</fsummary>
-      <desc><marker id="unlock-2"/>
-        <p>Equivalent to
-          <seealso marker="#unlock-3"><c>ct_netconfc:unlock(Client, Target,
-            infinity)</c></seealso>.</p>
+      <name name="session" arity="1"/>
+      <name name="session" arity="2" clause_i="1"/>
+      <name name="session" arity="2" clause_i="2"/>
+      <name name="session" arity="3"/>
+      <fsummary>Opens a NETCONF session as a channel on the given SSH
+	connection, and exchanges hello messages with the
+	server.</fsummary>
+      <type name="session_options"/>
+      <type name="session_option"/>
+      <desc>
+	<p>Opens a NETCONF session as a channel on the given SSH
+          connection, and exchanges hello messages with the server.</p>
+
+        <p>The opaque <seealso marker="#type-handle"><c>handle()</c></seealso>
+	  reference returned from this
+          function can be used as client identifier when calling any
+          other function in this module. However, if <c><anno>KeyOrName</anno></c>
+          is used and it is a <c>target_name()</c>, that is, if the
+          server is named through a call
+          to <seealso marker="ct#require-2"><c>ct:require/2</c></seealso>
+          or a <c>require</c> statement in the test suite, then this
+          name can be used instead of
+	  <seealso marker="#type-handle"><c>handle()</c></seealso>.</p>
+
       </desc>
     </func>
 
     <func>
-      <name>unlock(Client, Target, Timeout) -&gt; Result</name>
+      <name name="unlock" arity="2"/>
+      <name name="unlock" arity="3"/>
       <fsummary>Unlocks the configuration target.</fsummary>
-      <type>
-        <v>Client = client()</v>
-        <v>Target = netconf_db()</v>
-        <v>Timeout = timeout()</v>
-        <v>Result = ok | {error, error_reason()}</v>
-      </type>
-      <desc><marker id="unlock-3"/>
+      <desc>
         <p>Unlocks the configuration target.</p>
 
         <p>If the client earlier has acquired a lock through
-          <seealso marker="#lock-2"><c>ct_netconfc:lock/2</c></seealso> or
-          <seealso marker="#lock-3"><c>ct_netconfc:lock/3</c></seealso>, this
+          <seealso marker="#lock-2"><c>lock/2,3</c></seealso>, this
           operation releases the associated lock. To access another target
           than <c>running</c>, the server must support <c>:candidate</c>
           and/or <c>:startup</c>.</p>
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 9e6229f1dd..5b962ed5c7 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -4,7 +4,7 @@
 <comref>
   <header>
     <copyright>
-      <year>2007</year><year>2016</year>
+      <year>2007</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -125,6 +125,7 @@
   [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
   [-basic_html]
   [-no_esc_chars]
+  [-keep_logs all | NLogs]
   [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
    CTHModuleN CTHOptsN]
   [-exit_status ignore_config]
@@ -164,6 +165,7 @@
   [-until [YYMoMoDD]HHMMSS [-force_stop [skip_rest]]]
   [-basic_html]
   [-no_esc_chars]
+  [-keep_logs all | NLogs]
   [-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
    CTHModuleN CTHOptsN]
   [-exit_status ignore_config]</pre>
@@ -189,13 +191,15 @@
   [-scale_timetraps]
   [-create_priv_dir auto_per_run | auto_per_tc | manual_per_tc]
   [-basic_html]
-  [-no_esc_chars]</pre>
+  [-no_esc_chars]
+  [-keep_logs all | NLogs]</pre>
   </section>
 
   <section>
     <title>Refresh HTML Index Files</title>
     <pre>
- ct_run -refresh_logs [-logdir LogDir] [-basic_html]</pre>
+ ct_run -refresh_logs [-logdir LogDir] [-basic_html]
+  [-keep_logs all | NLogs]</pre>
   </section>
 
   <section>
diff --git a/lib/common_test/doc/src/ct_ssh.xml b/lib/common_test/doc/src/ct_ssh.xml
index d00737aa5a..0c7efed154 100644
--- a/lib/common_test/doc/src/ct_ssh.xml
+++ b/lib/common_test/doc/src/ct_ssh.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2010</year><year>2016</year>
+      <year>2010</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -64,7 +64,7 @@
     <p><c>ConnType = ssh | sftp</c>.</p>
 
     <p>For other types, see
-      <seealso marker="ssh:ssh"><c>ssh:ssh(3)</c></seealso>.</p>
+      <seealso marker="ssh:ssh"><c>ssh(3)</c></seealso>.</p>
 
     <p>All time-out parameters in <c>ct_ssh</c> functions are values in
       milliseconds.</p>
@@ -88,7 +88,7 @@
       <tag><c>ssh_sftp_return() = term()</c></tag>
       <item><marker id="type-ssh_sftp_return"/>
         <p>Return value from an
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp</c></seealso>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp</c></seealso>
             function.</p></item>
     </taglist>
   </section>
@@ -104,7 +104,7 @@
       </type>
       <desc><marker id="apread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -118,7 +118,7 @@
       </type>
       <desc><marker id="apread-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -132,7 +132,7 @@
       </type>
       <desc><marker id="apwrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -146,7 +146,7 @@
       </type>
       <desc><marker id="apwrite-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -160,7 +160,7 @@
       </type>
       <desc><marker id="aread-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -174,7 +174,7 @@
       </type>
       <desc><marker id="aread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -188,7 +188,7 @@
       </type>
       <desc><marker id="awrite-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -202,7 +202,7 @@
       </type>
       <desc><marker id="awrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -216,7 +216,7 @@
       </type>
       <desc><marker id="close-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -230,7 +230,7 @@
       </type>
       <desc><marker id="close-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -310,7 +310,7 @@
       </type>
       <desc><marker id="del_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -324,7 +324,7 @@
       </type>
       <desc><marker id="del_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -338,7 +338,7 @@
       </type>
       <desc><marker id="delete-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -352,7 +352,7 @@
       </type>
       <desc><marker id="delete-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -423,7 +423,7 @@
       </type>
       <desc><marker id="get_file_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -437,7 +437,7 @@
       </type>
       <desc><marker id="get_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -451,7 +451,7 @@
       </type>
       <desc><marker id="list_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -465,7 +465,7 @@
       </type>
       <desc><marker id="list_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -479,7 +479,7 @@
       </type>
       <desc><marker id="make_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -493,7 +493,7 @@
       </type>
       <desc><marker id="make_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -507,7 +507,7 @@
       </type>
       <desc><marker id="make_symlink-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -521,7 +521,7 @@
       </type>
       <desc><marker id="make_symlink-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -535,7 +535,7 @@
       </type>
       <desc><marker id="open-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -549,7 +549,7 @@
       </type>
       <desc><marker id="open-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -563,7 +563,7 @@
       </type>
       <desc><marker id="opendir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -577,7 +577,7 @@
       </type>
       <desc><marker id="opendir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -591,7 +591,7 @@
       </type>
       <desc><marker id="position-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -605,7 +605,7 @@
       </type>
       <desc><marker id="position-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -619,7 +619,7 @@
       </type>
       <desc><marker id="pread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -633,7 +633,7 @@
       </type>
       <desc><marker id="pread-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -647,7 +647,7 @@
       </type>
       <desc><marker id="pwrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -661,7 +661,7 @@
       </type>
       <desc><marker id="pwrite-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -675,7 +675,7 @@
       </type>
       <desc><marker id="read-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -689,7 +689,7 @@
       </type>
       <desc><marker id="read-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -703,7 +703,7 @@
       </type>
       <desc><marker id="read_file-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -717,7 +717,7 @@
       </type>
       <desc><marker id="read_file-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -731,7 +731,7 @@
       </type>
       <desc><marker id="read_file_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -745,7 +745,7 @@
       </type>
       <desc><marker id="read_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -759,7 +759,7 @@
       </type>
       <desc><marker id="read_link-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -773,7 +773,7 @@
       </type>
       <desc><marker id="read_link-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -787,7 +787,7 @@
       </type>
       <desc><marker id="read_link_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -801,7 +801,7 @@
       </type>
       <desc><marker id="read_link_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -853,7 +853,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
 
         <p>If <c>End</c> is a fun, this fun is called with one argument, the
           data value in a received <c>ssh_cm</c> message (see
-          <seealso marker="ssh:ssh_connection"><c>ssh:ssh_connection(3)</c></seealso>.
+          <seealso marker="ssh:ssh_connection"><c>ssh_connection(3)</c></seealso>.
           The fun is to return either <c>true</c> to end the receiving
           operation (and have the so far collected data returned) or
           <c>false</c> to wait for more data from the server. Even if a fun
@@ -872,7 +872,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
       </type>
       <desc><marker id="rename-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -886,7 +886,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
       </type>
       <desc><marker id="rename-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1034,6 +1034,33 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
+      <name>shell(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
+      <fsummary>Equivalent to shell(SSH, ChannelId, DefaultTimeout).</fsummary>
+      <desc><marker id="shell-2"/>
+        <p>Equivalent to
+          <seealso marker="#shell-3"><c>ct_ssh:shell(SSH, ChannelId,
+            DefaultTimeout)</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>shell(SSH, ChannelId, Timeout) -&gt; ok | {error, Reason}</name>
+      <fsummary>Requests that the user default shell is executed at the
+        server end.</fsummary>
+      <type>
+        <v>SSH = connection()</v>
+        <v>ChannelId = integer()</v>
+        <v>Timeout = integer()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="shell-3"/>
+        <p>Requests that the user default shell (typically defined in
+          <c>/etc/passwd</c> in Unix systems) is executed at the
+          server end.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>subsystem(SSH, ChannelId, Subsystem) -&gt; Status | {error, Reason}</name>
       <fsummary>Equivalent to subsystem(SSH, ChannelId, Subsystem,
         DefaultTimeout).</fsummary>
@@ -1070,7 +1097,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1084,7 +1111,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1098,7 +1125,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1112,7 +1139,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1126,7 +1153,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1140,7 +1167,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file_info-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml
index e2a45e894b..8e85cccc99 100644
--- a/lib/common_test/doc/src/ct_telnet.xml
+++ b/lib/common_test/doc/src/ct_telnet.xml
@@ -198,7 +198,7 @@
       <item><marker id="type-prompt_regexp"/>
         <p>Regular expression matching all possible prompts for a specific
           target type. <c>regexp</c> must not have any groups, that is, when
-          matching, <c>re:run/3</c> (in <c>STDLIB</c>) must return a list with
+          matching, <c>re:run/3</c> (in STDLIB) must return a list with
           one single element.</p></item>
     </taglist>
   </section>
@@ -337,7 +337,7 @@
           <c>FullMatch</c> is the string matched by the whole regular
           expression, and <c>SubMatchN</c> is the string that matched
           subexpression number <c>N</c>. Subexpressions are denoted with
-          <c>(' ')</c> in the regular expression.</p>
+          <c>'(' ')'</c> in the regular expression.</p>
 
         <p>If a <c>Tag</c> is speciifed, the returned <c>Match</c> also
           includes the matched <c>Tag</c>. Otherwise, only <c>RxMatch</c>
diff --git a/lib/common_test/doc/src/ct_testspec.xml b/lib/common_test/doc/src/ct_testspec.xml
new file mode 100644
index 0000000000..36893f66cf
--- /dev/null
+++ b/lib/common_test/doc/src/ct_testspec.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2016</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+
+    </legalnotice>
+
+    <title>ct_testspec</title>
+    <prepared></prepared>
+    <responsible></responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date></date>
+    <rev>A</rev>
+    <file>ct_testspec.xml</file>
+  </header>
+  <module>ct_testspec</module>
+  <modulesummary>Parsing of test specifications for Common Test.
+  </modulesummary>
+
+<description>
+
+    <p>Parsing of test specifications for <c>Common Test</c>.</p>
+
+    <p>This module exports help functions for parsing of test specifications.</p>
+
+</description>
+
+  <funcs>
+    <func>
+    <name>get_tests(SpecsIn) -&gt; {ok, [{Specs,Tests}]} | {error, Reason}</name>
+    <fsummary>Parse the given test specification files and return the tests to run and skip.</fsummary>
+      <type>
+        <v>SpecsIn = [string()] | [[string()]]</v>
+        <v>Specs = [string()]</v>
+        <v>Test = [{Node,Run,Skip}]</v>
+        <v>Node = atom()</v>
+        <v>Run = {Dir,Suites,Cases}</v>
+        <v>Skip = {Dir,Suites,Comment} | {Dir,Suites,Cases,Comment}</v>
+        <v>Dir = string()</v>
+        <v>Suites = atom | [atom()] | all</v>
+        <v>Cases = atom | [atom()] | all</v>
+        <v>Comment = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc><marker id="add_nodes-1"/>
+        <p>Parse the given test specification files and return the
+        tests to run and skip.</p>
+
+        <p>If <c>SpecsIn=[Spec1,Spec2,...]</c>, separate tests will be
+        created per specification. If
+        <c>SpecsIn=[[Spec1,Spec2,...]]</c>, all specifications will be
+        merge into one test.</p>
+
+        <p>For each test, a <c>{Specs,Tests}</c> element is returned,
+        where <c>Specs</c> is a list of all included test
+        specifications, and <c>Tests</c> specifies actual tests to
+        run/skip per node.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+</erlref>
+
+
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 2978226a19..bd9ed21cb4 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -50,7 +50,7 @@
     pass the information on. The event handlers are Erlang modules
     implemented by the <c>Common Test</c> user according to the <c>gen_event</c> 
     behavior (for details, see module
-    <seealso marker="stdlib:gen_event"><c>stdlib:gen_event</c></seealso> and
+    <seealso marker="stdlib:gen_event"><c>gen_event</c></seealso> and
     section
     <seealso marker="doc/design_principles:events"><c>gen_event Behaviour</c></seealso>
     in OTP Design Principles in the System Documentation).
@@ -69,8 +69,8 @@
     manager, either by telling <c>Common Test</c> to install them before the test
     run (described later), or by adding the handlers dynamically during the test
     run using
-    <seealso marker="stdlib:gen_event#add_handler-3"><c>stdlib:gen_event:add_handler/3</c></seealso> or 
-    <seealso marker="stdlib:gen_event#add_sup_handler-3"><c>stdlib:gen_event:add_sup_handler/3</c></seealso>.
+    <seealso marker="stdlib:gen_event#add_handler-3"><c>gen_event:add_handler/3</c></seealso> or
+    <seealso marker="stdlib:gen_event#add_sup_handler-3"><c>gen_event:add_sup_handler/3</c></seealso>.
     In the latter scenario, the reference of the <c>Common Test</c> event manager is
     required. To get it, call 
     <seealso marker="ct#get_event_mgr_ref-0"><c>ct:get_event_mgr_ref/0</c></seealso> 
diff --git a/lib/common_test/doc/src/introduction.xml b/lib/common_test/doc/src/introduction.xml
index 40724f24e9..df12bea6dd 100644
--- a/lib/common_test/doc/src/introduction.xml
+++ b/lib/common_test/doc/src/introduction.xml
@@ -45,7 +45,7 @@
       </list>
       <p><c>Common Test</c> also integrates use of the OTP
       <seealso marker="tools:cover">cover</seealso> tool in application 
-      <c>Tools</c> for code coverage analysis of Erlang/OTP programs.</p>
+      Tools for code coverage analysis of Erlang/OTP programs.</p>
       
       <p><c>Common Test</c> executes test suite programs automatically,
       without operator interaction. Test progress and results are
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 32ae699c7a..28b2d44168 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,6 +33,292 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Errors in the documentation for user HTML stylesheets
+	    have been corrected.</p>
+          <p>
+	    Own Id: OTP-14332 Aux Id: seq13299 </p>
+        </item>
+        <item>
+	    <p>Internal code change: Calls to <c>catch</c> followed
+	    by a call to <c>erlang:get_stacktrace/0</c> has been
+	    rewritten to use <c>try</c> instead of <c>catch</c> to
+	    make the code future-proof.</p>
+          <p>
+	    Own Id: OTP-14400</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The <c>ct_slave</c> modules now handle nodenames in
+	    the same way as nodenames passed to <c>-sname</c>. That
+	    means <c>ct_slave:start('[email protected]').</c> will now
+	    work.</p>
+          <p>
+	    Own Id: OTP-13806</p>
+        </item>
+        <item>
+          <p>
+	    Added the new option, <c>keep_logs</c>. If setting the
+	    value for this option to an integer, N, common_test will
+	    remove all ct_run.* directories in the current log
+	    directory, except the N newest.</p>
+          <p>
+	    Own Id: OTP-14179</p>
+        </item>
+        <item>
+          <p>
+	    The existing <c>ct_netconfc:open/1,2</c> opens an SSH
+	    connection with one SSH channel realizing one Netconf
+	    session. To allow testing of multiple sessions over the
+	    same SSH connection, the following functions are added to
+	    <c>ct_netconfc</c>:</p>
+          <p>
+	    * <c>connect/1,2</c> - establish an SSH connection *
+	    <c>disconnect/1</c> - close the given SSH connection *
+	    <c>session/1,2,3</c> - open an ssh channel on the given
+	    connection and send 'hello' to start a Netconf session</p>
+          <p>
+	    Own Id: OTP-14284</p>
+        </item>
+        <item>
+	    <p> Miscellaneous updates due to atoms containing
+	    arbitrary Unicode characters. </p>
+          <p>
+	    Own Id: OTP-14285</p>
+        </item>
+        <item>
+          <p>
+	    The function ct_ssh:shell/2,3 is added.</p>
+          <p>
+	    Own Id: OTP-14415 Aux Id: seq13315 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The following corrections and improvements are done in
+	    the common_test hook handling:</p> <list> <item> <p>An
+	    extra argument, <c>Suite</c>, is added as the first
+	    argument to each of the following hook callback
+	    functions:</p> <list>
+	    <item><c>pre_init_per_group</c></item>
+	    <item><c>post_init_per_group</c></item>
+	    <item><c>pre_end_per_group</c></item>
+	    <item><c>post_end_per_group</c></item>
+	    <item><c>pre_init_per_testcase</c></item>
+	    <item><c>post_init_per_testcase</c></item>
+	    <item><c>pre_end_per_testcase</c></item>
+	    <item><c>post_end_per_testcase</c></item>
+	    <item><c>on_tc_fail</c></item>
+	    <item><c>on_tc_skip</c></item> </list> <p>For backwards
+	    compatibility, if the new function is not exported from a
+	    hook callback module, <c>common_test</c> will fall back
+	    to the old interface and call the function without the
+	    <c>Suite</c> argument.</p> </item> <item> <p>If either
+	    <c>init_per_suite</c> or <c>end_per_suite</c> exists, but
+	    not the other, then the non-existing function will be
+	    reported as failed with reason <c>undef</c> in the test
+	    log. The same goes for <c>init/end_per_group</c>. This
+	    has always been a requirement according to the user's
+	    guide, but now <c>common_test</c> is more explicit in the
+	    report.</p> </item> <item> <p>If <c>init_per_suite</c>
+	    was exported from a test suite, but not
+	    <c>end_per_suite</c>, then <c>pre/post_end_per_suite</c>
+	    was called with <c>Suite=ct_framework</c> instead of the
+	    correct suite name. This is now corrected.</p> </item>
+	    <item> <p>If <c>end_per_group</c> was exported from a
+	    suite, but not <c>init_per_group</c>, then
+	    <c>end_per_group</c> was never called. This is now
+	    corrected.</p> </item> <item> <p>Tests that were skipped
+	    before calling <c>pre_init_per_*</c> got faulty calls to
+	    the corresponding <c>post_init_per_*</c>. E.g. if a test
+	    was skipped because <c>suite/0</c> failed, then
+	    <c>post_init_per_suite</c> would be called even though
+	    <c>pre_init_per_suite</c> and <c>init_per_suite</c> were
+	    not called. This is now corrected so a <c>post_*</c>
+	    callback will never be called unless the corresponding
+	    <c>pre_*</c> callback has been called first.</p> </item>
+	    <item> <p>Tests that were skipped before or in
+	    <c>init_per_testcase</c> got faulty calls to
+	    <c>pre_end_per_testcase</c> and
+	    <c>post_end_per_testcase</c>. This is now corrected so
+	    <c>pre/post_end_per_testcase</c> are not called when
+	    <c>end_per_testcase</c> is not called.</p> </item> <item>
+	    <p>If an exit signal causes the test case process to die
+	    while running <c>init_per_testcase</c>, the case was
+	    earlier reported as failed with reason <c>{skip,...}</c>.
+	    This is now corrected so the case will be marked as
+	    skipped.</p> </item> <item> <p>If an exist signal causes
+	    the test case process to die while running
+	    <c>end_per_testcase</c>, the case was earlier marked as
+	    failed. This is now corrected so the status of the test
+	    case is not changed - there is only a warning added to
+	    the comment field.</p> </item> <item> <p>If a test case
+	    was skipped because of option
+	    <c>{force_stop,skip_rest}</c> or because of a failed
+	    sequence, then no <c>tc_start</c> event would be sent,
+	    only <c>tc_done</c>. This is now corrected so both events
+	    are sent.</p> </item> <item> <p>When skipping or failing
+	    in a configuration function, the configuration function
+	    itself would get <c>{auto_skipped,Reason}</c>,
+	    <c>{skipped,Reason}</c> or <c>{failed,Reason}</c> in the
+	    hook callbacks <c>on_tc_skip</c> or <c>on_tc_fail</c>.
+	    The other test cases that were skipped as a result of
+	    this would only get <c>Reason</c> in <c>on_tc_skip</c>.
+	    This is now corrected so even the configuration function
+	    that caused the skip/fail will only get <c>Reason</c> in
+	    the hook callback.</p> </item> </list>
+          <p>
+	    Own Id: OTP-10599 Aux Id: kunagi-344 [255] </p>
+        </item>
+        <item>
+          <p>
+	    When a test case was skipped by a <c>skip_cases</c>
+	    statement in a test spec, then <c>cth_surefire</c> would
+	    erroneously mark the previous test case as skipped in the
+	    xml report. The actually skipped test case would not be
+	    present in the xml report at all. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-14129 Aux Id: seq13244 </p>
+        </item>
+        <item>
+	    <p>The <c>multiply_timetraps</c> and
+	    <c>scale_timetraps</c> options did not work with test
+	    specifications, which has been corrected.</p>
+          <p>
+	    Own Id: OTP-14210</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    ct_testspec:get_tests/1 is added. This is used by rebar3
+	    to get all directories that must be compiled when running
+	    tests from testspec - instead of implementing testspec
+	    parsing in rebar3.</p>
+          <p>
+	    Own Id: OTP-14132</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Some types of printouts to screen during test runs
+	    (including <c>ct:print/1,2,3,4</c>) used the local
+	    <c>user</c> process as IO device and these printouts
+	    would not be visible when e.g. running tests via a shell
+	    on a remote node. A default Common Test group leader
+	    process has been introduced to solve the problem. This
+	    process routes printouts to the group leader of the
+	    starting process, if available, otherwise to <c>user</c>.</p>
+          <p>
+	    Own Id: OTP-13973 Aux Id: ERL-279 </p>
+        </item>
+        <item>
+          <p>
+	    Some Common Test processes, that act as I/O group leaders
+	    for test cases, would not terminate as expected at the
+	    end of test runs. This error has been corrected.</p>
+          <p>
+	    Own Id: OTP-14026 Aux Id: ERL-287 </p>
+        </item>
+        <item>
+          <p>
+	    The logging verbosity feature was incorrectly documented.
+	    The default verbosity levels for test runs is e.g. not 50
+	    (<c>?STD_VERBOSITY</c>), but 100 (<c>?MAX_VERBOSITY</c>).
+	    Also, some of the examples had errors and flaws. The
+	    corresponding chapter (5.18) in the User's Guide has been
+	    updated.</p>
+          <p>
+	    Own Id: OTP-14044 Aux Id: seq13223 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A feature to let the user specify headings to log
+	    printouts has been added. The heading is specified as
+	    <c>{heading,string()}</c> in the <c>Opts</c> list
+	    argument to <c>ct:pal/3,4,5</c>, <c>ct:print/3,4,5</c>,
+	    or <c>ct:log/3,4,5</c>. If the heading option is omitted,
+	    the category name, or <c>"User"</c>, is used as the
+	    heading instead.</p>
+          <p>
+	    Own Id: OTP-14043 Aux Id: seq13226 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.12.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If the telnet server would pause during transmission of a
+	    line of text before terminating the line, the
+	    <c>ct_telnet:expect/3</c> function would print the line
+	    twice in the test case HTML log. This problem has been
+	    fixed.</p>
+          <p>
+	    Own Id: OTP-13730 Aux Id: seq13135 </p>
+        </item>
+        <item>
+          <p>
+	    The functions <c>ct:set_verbosity/2</c> and
+	    <c>ct:get_verbosity/1</c> have been added in order to
+	    make it possible for test cases, CT Hooks, or test
+	    framework functions, to modify and read verbosity levels
+	    for logging.</p>
+          <p>
+	    Own Id: OTP-13841</p>
+        </item>
+        <item>
+	    <p><c>make</c> (tools) and <c>ct_make</c> (common_test)
+	    would crash if an Erlang source file contained a
+	    <c>-warning()</c> directive.</p>
+          <p>
+	    Own Id: OTP-13855</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.12.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml
index d1567e2d3c..1ac20db5c2 100644
--- a/lib/common_test/doc/src/ref_man.xml
+++ b/lib/common_test/doc/src/ref_man.xml
@@ -47,6 +47,7 @@
   <xi:include href="ct_slave.xml"/>
   <xi:include href="ct_hooks.xml"/>
   <xi:include href="ct_property_test.xml"/>
+  <xi:include href="ct_testspec.xml"/>
 </application>
 
 
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 43e36adfb6..56f6f7bcc4 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -274,7 +274,7 @@
 
     <note><p>Directories passed to <c>Common Test</c> can have either relative or absolute paths.</p></note>
 
-    <note><p>Any start flags to the Erlang runtime system (application <c>ERTS</c>) can also be passed as
+    <note><p>Any start flags to the Erlang runtime system (application ERTS) can also be passed as
              parameters to <c>ct_run</c>. It is, for example, useful to be able to
 	     pass directories to be added to the Erlang code server search path
 	     with flag <c>-pa</c> or <c>-pz</c>. If you have common help- or library 
@@ -286,7 +286,7 @@
 	  <p>The absolute path of directory <c>chat_server/ebin</c>
 	     is here passed to the code server. This is essential because relative
 	     paths are stored by the code server as relative, and <c>Common Test</c> changes 
-	     the current working directory of <c>ERTS</c> during the test run.</p>
+	     the current working directory of ERTS during the test run.</p>
     </note>
     
     <p>The <c>ct_run</c> program sets the exit status before shutting down. The following values
@@ -1258,7 +1258,7 @@
       <p>The minor log files contain full details of every single test
 	case, each in a separate file. This way, it is
 	straightforward	to compare the latest results to that of previous
-	test runs, even if the set of test cases changes. If application <c>SASL</c> 
+	test runs, even if the set of test cases changes. If application SASL
 	is running, its logs are also printed to the current minor log file by the
 	<seealso marker="common_test:ct_hooks_chapter#builtin_cths">
 	  cth_log_redirect built-in hook</seealso>.
@@ -1322,8 +1322,8 @@
 	  <title>The Unexpected I/O Log</title>
 	  <p>The test suites overview page includes a link to the Unexpected I/O Log.
 	  In this log, <c>Common Test</c> saves printouts made with
-	  <seealso marker="ct#log-2"><c>ct:log/2</c></seealso> and 
-	  <seealso marker="ct#pal-2"><c>ct:pal/2</c></seealso>, as well as captured system 
+	  <seealso marker="ct#log-2"><c>ct:log/1,2,3,4,5</c></seealso> and 
+	  <seealso marker="ct#pal-2"><c>ct:pal/1,2,3,4,5</c></seealso>, as well as captured system 
 	  error- and progress reports, which cannot be associated with particular test cases and
 	  therefore cannot be written to individual test case log files. This occurs,
 	  for example, if a log printout is made from an external process (not a test 
@@ -1338,7 +1338,7 @@
 	  <title>The Pre- and Post Test I/O Log</title>
 	  <p>The <c>Common Test</c> Framework Log page includes links to the
 	  Pre- and Post Test I/O Log. In this log, <c>Common Test</c> saves printouts made 
-	  with <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error-
+	  with <c>ct:log/1,2,3,4,5</c> and <c>ct:pal/1,2,3,4,5</c>, as well as captured system error-
 	  and progress reports, which take place before, and after, the test run.
 	  Examples of this are printouts from a CT hook init- or terminate function, or
 	  progress reports generated when an OTP application is started from a CT hook
@@ -1349,10 +1349,22 @@
 	  applications, see section
 	  <seealso marker="ct_hooks_chapter#synchronizing">Synchronizing</seealso>
 	  in section Common Test Hooks.</p>
-	  <note><p>Logging to file with <c>ct:log/2</c> or <c>ct:pal/2</c>
-	  only works when <c>Common Test</c> is running. Printouts with <c>ct:pal/2</c>
+	  <note><p>Logging to file with <c>ct:log/1,2,3,4,5</c> or <c>ct:pal/1,2,3,4,5</c>
+	  only works when <c>Common Test</c> is running. Printouts with <c>ct:pal/1,2,3,4,5</c>
 	  are however always displayed on screen.</p></note>
 	</section>
+
+	<section>
+	  <marker id="delete_old_logs"></marker>
+	  <title>Delete Old Logs</title>
+	  <p><c>Common Test</c> can automatically delete old log. This
+	    is specified with the <c>keep_logs</c> option. The default
+	    value for this option is <c>all</c>, which means that no
+	    logs are deleted. If the value is set to an
+	    integer, <c>N</c>, <c>Common Test</c> deletes
+	    all <c>ct_run.&lt;timestamp&gt;</c> directories, except
+	    the <c>N</c> newest.</p>
+	</section>
       </section>
   
       <section>
@@ -1371,24 +1383,38 @@
 	<p><c>Common Test</c> includes an <em>optional</em> feature to allow
 	  user HTML style sheets for customizing printouts. The
 	  functions in <c>ct</c> that print to a test case HTML log
-	  file (<c>log/3</c> and <c>pal/3</c>) accept <c>Category</c>
+	  file (<c>log/3,4,5</c> and <c>pal/3,4,5</c>) accept <c>Category</c>
 	  as first argument. With this argument a category can be specified 
-	  that can be mapped to a selector in a CSS
-	  definition. This is useful, especially for coloring text
+	  that can be mapped to a named <c>div</c> selector in a CSS rule-set.
+	  This is useful, especially for coloring text
 	  differently depending on the type of (or reason for) the
-	  printout. Say you want one color for test system
+	  printout. Say you want one particular background color for test system
 	  configuration information, a different one for test system
 	  state information, and finally one for errors detected by the
 	  test case functions. The corresponding style sheet can
 	  look as follows:</p>
 
 	<pre>
- div.sys_config  { background:blue; color:white }
- div.sys_state   { background:yellow; color:black }
- div.error       { background:red; color:white }</pre>
+ div.sys_config  { background:blue }
+ div.sys_state   { background:yellow }
+ div.error       { background:red }</pre>
+
+        <p>Common Test prints the text from <c>ct:log/3,4,5</c> or
+	<c>ct:pal/3,4,5</c> inside a <c>pre</c> element
+	nested under the named <c>div</c> element. Since the <c>pre</c> selector
+	has a predefined CSS rule (in file <c>ct_default.css</c>) for the attributes
+	<c>color</c>, <c>font-family</c> and <c>font-size</c>, if a user wants to
+	change any of the predefined attribute settings, a new rule for <c>pre</c>
+	must be added to the user stylesheet. Example:</p>
+
+	<pre>
+div.error pre { color:white }</pre>
+
+        <p>Here, white text is used instead of the default black for <c>div.error</c>
+	printouts (and no other attribute settings for <c>pre</c> are affected).</p>
 
 	<p>To install the CSS file (<c>Common Test</c> inlines the definition in the 
-	  HTML code), the name can be provided when executing <c>ct_run</c>.</p>
+	  HTML code), the file name can be provided when executing <c>ct_run</c>.</p>
 	  <p><em>Example:</em></p>
 
 	<pre>
@@ -1436,8 +1462,8 @@
 	  suite.</p>
 
 	<p>Argument <c>Category</c> in the previous example can have the
-	  value (atom) <c>sys_config</c> (white on blue), <c>sys_state</c>
-	  (black on yellow), or <c>error</c> (white on red).</p>
+	  value (atom) <c>sys_config</c> (blue background), <c>sys_state</c>
+	  (yellow background), or <c>error</c> (white text on red background).</p>
   </section>
 
   <section>
diff --git a/lib/common_test/doc/src/specs.xml b/lib/common_test/doc/src/specs.xml
new file mode 100644
index 0000000000..7e40e8351d
--- /dev/null
+++ b/lib/common_test/doc/src/specs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_ct_netconfc.xml"/>
+  <xi:include href="../specs/specs_ct.xml"/>
+</specs>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 83daf771a6..82dc06834f 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2003</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -269,10 +269,10 @@
     
     <p>As parameter <c>Config</c> is a list of key-value tuples, that is,
     a data type called a property list, it can be handled by the
-    <seealso marker="stdlib:proplists"><c>stdlib:proplists</c></seealso> module. 
+    <seealso marker="stdlib:proplists"><c>proplists</c></seealso> module.
     A value can, for example, be searched for and returned with function 
     <seealso marker="stdlib:proplists#get_value-2"><c>proplists:get_value/2</c></seealso>.
-    Also, or alternatively, the general <seealso marker="stdlib:lists"><c>stdlib:lists</c></seealso> 
+    Also, or alternatively, the general <seealso marker="stdlib:lists"><c>lists</c></seealso>
     module contains useful functions. Normally, the only operations 
     performed on <c>Config</c> is insert (adding a tuple to the head of the list) 
     and lookup. <c>Common Test</c> provides a simple macro named <c>?config</c>, 
@@ -566,7 +566,7 @@
     for the test cases in the group. After execution of the group is finished, function
     <seealso marker="common_test#Module:end_per_group-2"><c>end_per_group(GroupName, Config)</c></seealso> 
     is called. This function is meant to be used for cleaning up after 
-    <c>init_per_group/2</c>.</p>
+    <c>init_per_group/2</c>. If the init function is defined, so must the end function be.</p>
 
     <p>Whenever a group is executed, if <c>init_per_group</c> and
       <c>end_per_group</c> do not exist in the suite, <c>Common Test</c> calls
@@ -652,7 +652,7 @@
     <title>Parallel Test Cases and I/O</title>
     <p>A parallel test case has a private I/O server as its group leader. 
       (For a description of the group leader concept, see
-      <seealso marker="erts:index"><c>ERTS</c></seealso>). 
+      <seealso marker="erts:index">ERTS</seealso>).
       The central I/O server process, which handles the output from 
       regular test cases and configuration functions, does not respond to I/O messages
       during execution of parallel groups. This is important to understand
@@ -986,15 +986,17 @@
     <c>io:put_chars/1</c>, and so on.</p>
 
     <p><c>Importance</c> is compared to a verbosity level set by the
-    <c>verbosity</c> start flag/option. The verbosity level can be set per
-    category or generally, or both. The default verbosity level, 
-    <c>?STD_VERBOSITY</c>, is 50, that is, all standard I/O gets printed. 
-    If a lower verbosity level is set, standard I/O printouts are ignored. 
-    <c>Common Test</c> performs the following test:</p>
+    <c>verbosity</c> start flag/option. The level can be set per
+    category or generally, or both. If <c>verbosity</c> is not set by the user,
+    a level of 100 (<c>?MAX_VERBOSITY</c> = all printouts visible) is used as
+    default value. <c>Common Test</c> performs the following test:</p>
     <pre>
- Importance >= (100-VerbosityLevel)</pre>
-    <p>This also means that verbosity level 0 effectively turns all logging off
-    (except from printouts made by <c>Common Test</c> itself).</p>
+Importance >= (100-VerbosityLevel)</pre>
+    <p>The constant <c>?STD_VERBOSITY</c> has value 50 (see <c>ct.hrl</c>).
+    At this level, all standard I/O gets printed. If a lower verbosity level
+    is set, standard I/O printouts are ignored. Verbosity level 0 effectively
+    turns all logging off (except from printouts made by <c>Common Test</c>
+    itself).</p>
 
     <p>The general verbosity level is not associated with any particular
     category. This level sets the threshold for the standard I/O printouts,
@@ -1003,17 +1005,17 @@
 
     <p><em>Examples:</em></p>
     <p>Some printouts during test case execution:</p>
-    <pre>  
+    <pre>
  io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
  ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
- ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
+ ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]),
  ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
- ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
- ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),</pre>
+ ct:log(error, ?HI_IMPORTANCE, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
+ ct:log(error, ?MAX_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),</pre>
 
-   <p>If starting the test without specifying any verbosity levels as follows:</p>
+   <p>If starting the test with a general verbosity level of 50 (<c>?STD_VERBOSITY</c>):</p>
    <pre>
- $ ct_run ...</pre>
+ $ ct_run -verbosity 50</pre>
    <p>the following is printed:</p>
    <pre>
  1. Standard IO, importance = 50
@@ -1031,9 +1033,25 @@
  4. Categorized info, importance = 25
  6. Categorized error, importance = 99</pre>
 
+    <p>Note that the category argument is not required in order to only specify the
+    importance of a printout. Example:</p>
+    <pre>
+ct:pal(?LOW_IMPORTANCE, "Info report: ~p", [Info])</pre>
+    <p>Or perhaps in combination with constants:</p>
+    <pre>
+-define(INFO, ?LOW_IMPORTANCE).
+-define(ERROR, ?HI_IMPORTANCE).
+
+ct:log(?INFO, "Info report: ~p", [Info])
+ct:pal(?ERROR, "Error report: ~p", [Error])</pre>
+ 
+    <p>The functions <seealso marker="ct#set_verbosity-2"><c>ct:set_verbosity/2</c></seealso>
+    and <seealso marker="ct#get_verbosity-1"><c>ct:get_verbosity/1</c></seealso> may be used
+    to modify and read verbosity levels during test execution.</p>
+    
     <p>The arguments <c>Format</c> and <c>FormatArgs</c> in <c>ct:log/print/pal</c> are
-    always passed on to the <c>stdlib</c> function <c>io:format/3</c> (For details,
-    see the <seealso marker="stdlib:io"><c>stdlib:io</c></seealso> manual page).</p>
+    always passed on to the STDLIB function <c>io:format/3</c> (For details,
+    see the <seealso marker="stdlib:io"><c>io</c></seealso> manual page).</p>
 
     <p><c>ct:pal/4</c> and <c>ct:log/5</c> add headers to strings being printed to the
     log file. The strings are also wrapped in div tags with a CSS class