Merge branch 'maint'

* maint:
  [observer] Correct documentation
  [common_test] Correct documentation
  Extended table_trans timer in order to handle big data on slow machines
  Don't log headings without content
  Speed up receive of many small packages

15 files changed, 133 insertions, 93 deletions

diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index d9892c66f7..3905e23dcc 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -30,8 +30,8 @@
     <file>ct_hooks_chapter.xml</file>
   </header>
 
-  <marker id="general"></marker>
   <section>
+    <marker id="general"></marker>
     <title>General</title>
     <p>
       The <em>Common Test Hook</em> (henceforth called CTH) framework allows 
@@ -60,8 +60,8 @@
 
   </section>
   
-  <marker id="installing"></marker>
   <section>
+    <marker id="installing"></marker>
     <title>Installing a CTH</title>
     <p>There are multiple ways to install a CTH in your test run. You can do it
       for all tests in a run, for specific test suites and for specific groups 
@@ -120,8 +120,8 @@
     </section>
   </section>
 
-  <marker id="scope"/>
   <section>
+    <marker id="scope"/>
     <title>CTH Scope</title>
     <p>Once the CTH is installed into a certain test run it will be there until
       its scope is expired. The scope of a CTH depends on when it is 
@@ -208,8 +208,8 @@
 
   </section>
 
-  <marker id="manipulating"/>
   <section>
+    <marker id="manipulating"/>
     <title>Manipulating tests</title>
     <p>It is through CTHs possible to manipulate the results of tests and 
     configuration functions. The main purpose of doing this with CTHs is to
@@ -226,8 +226,8 @@
       makes it possible to use hooks as configuration fallbacks, or even
       completely replace all configuration functions with hook functions.</p>
 
-    <marker id="pre"/>
     <section>
+      <marker id="pre"/>
       <title>Pre Hooks</title>
       <p>
 	It is possible in a CTH to hook in behaviour before 
@@ -263,8 +263,8 @@
 	
     </section>
     
-    <marker id="post"/>
     <section>
+      <marker id="post"/>
       <title>Post Hooks</title>
       <p>It is also possible in a CTH to hook in behaviour after 
       <seealso marker="common_test#Module:init_per_suite-1">init_per_suite</seealso>, 
@@ -308,8 +308,8 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
   
     </section>
 
-    <marker id="skip_n_fail"/>
     <section>
+      <marker id="skip_n_fail"/>
       <title>Skip and Fail hooks</title>
       <p>
 	After any post hook has been executed for all installed CTHs, 
@@ -323,8 +323,8 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
 
   </section>
 
-  <marker id="synchronizing"/>
   <section>
+    <marker id="synchronizing"/>
     <title>Synchronizing external user applications with Common Test</title>
     <p>CTHs can be used to synchronize test runs with external user applications.
     The init function may e.g. start and/or communicate with an application that
@@ -351,8 +351,8 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
     </p>
   </section>
 
-  <marker id="example"/>
   <section>
+     <marker id="example"/>
      <title>Example CTH</title>
      <p>The CTH below will log information about a test run into a format 
        parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso>.
@@ -455,8 +455,8 @@ terminate(State) ->
     ok.</code>
   </section>
 
-  <marker id="builtin_cths"/>
   <section>
+    <marker id="builtin_cths"/>
     <title>Built-in CTHs</title>
     <p>Common Test is delivered with a couple of general purpose CTHs that
     can be enabled by the user to provide some generic testing functionality.
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index cb7033b196..78e5bb5e70 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -194,8 +194,9 @@
 	  the current test case log file.
 	</p></item>
 
-      <marker id="tc_done"/>
-      <item><c>#event{name = tc_done, data = {Suite,FuncOrGroup,Result}}</c>
+      <item>
+        <marker id="tc_done"/>
+        <c>#event{name = tc_done, data = {Suite,FuncOrGroup,Result}}</c>
         <p><c>Suite = atom()</c>, name of the suite.</p>
         <p><c>FuncOrGroup = Func | {Conf,GroupName,GroupProperties}</c></p>
         <p><c>Func = atom()</c>, name of test case or configuration function.</p>
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index aaf6dffc88..6972d18dfc 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -760,7 +760,7 @@
 	    configuration function or test specification term), the
 	    affected test cases get the status <c>user_skipped</c>
 	    instead.</p> <p>This update has meant a few changes that
-	    may affect Common Test users in various ways: <list>
+	    may affect Common Test users in various ways:</p> <list>
 	    <item>The test results and statistics will be affected,
 	    which is important to know when running regression tests
 	    and comparing results to previous test runs.</item>
@@ -780,7 +780,7 @@
 	    <c>auto_skipped</c> rather than <c>user_skipped</c> as
 	    before.</item> <item>The event messages that Common Test
 	    generates during test runs have been affected by this
-	    update. For details see OTP-11524.</item> </list> </p>
+	    update. For details see OTP-11524.</item> </list>
           <p>
 	    Own Id: OTP-11305 Aux Id: OTP-11524 </p>
         </item>
@@ -831,7 +831,7 @@
         <item>
 	    <p>The following modifications have been made to the
 	    event messages that Common Test sends during test
-	    execution: <list> <item>For the <c>tc_auto_skip</c>
+	    execution:</p> <list> <item>For the <c>tc_auto_skip</c>
 	    event, the value of the <c>Func</c> element has changed
 	    from <c>end_per_group</c> to
 	    <c>{end_per_group,GroupName}</c>.</item> <item>When
@@ -843,7 +843,7 @@
 	    configuration name already in use, the <c>tc_done</c>
 	    event now reports the error with a tuple (of size 2)
 	    tagged <c>failed</c> instead of <c>skipped</c>.</item>
-	    </list> Please see the Event Handling chapter in the
+	    </list> <p>Please see the Event Handling chapter in the
 	    Common Test User's Guide for reference. </p>
           <p>
 	    Own Id: OTP-11524 Aux Id: OTP-11305 </p>
@@ -1247,7 +1247,6 @@
         <item>
           <p>
 	    Some bugfixes in <c>ct_snmp:</c></p>
-          <p>
 	    <list> <item> ct_snmp will now use the value of the
 	    'agent_vsns' config variable when setting the 'variables'
 	    parameter to snmp application agent configuration.
@@ -1255,14 +1254,13 @@
 	    supported versions had to be specified twice. </item>
 	    <item> Snmp application failed to write notify.conf since
 	    ct_snmp gave the notify type as a string instead of an
-	    atom. This has been corrected. </item> </list></p>
+	    atom. This has been corrected. </item> </list>
           <p>
 	    Own Id: OTP-10432</p>
         </item>
         <item>
           <p>
 	    Some bugfixes in <c>ct_snmp</c>:</p>
-          <p>
 	    <list> <item> Functions <c>register_users/2</c>,
 	    <c>register_agents/2</c> and <c>register_usm_users/2</c>,
 	    and the corresponding <c>unregister_*/1</c> functions
@@ -1279,7 +1277,7 @@
 	    priv_dir instead of in the configuration dir
 	    (priv_dir/conf). This has been corrected. </item> <item>
 	    Arguments to <c>register_usm_users/2</c> were faulty
-	    documented. This has been corrected. </item> </list></p>
+	    documented. This has been corrected. </item> </list>
           <p>
 	    Own Id: OTP-10434 Aux Id: kunagi-264 [175] </p>
         </item>
@@ -1343,7 +1341,7 @@
         </item>
         <item>
           <p>
-	    Update common test modules to handle unicode <list>
+	    Update common test modules to handle unicode:</p> <list>
 	    <item> Use UTF-8 encoding for all HTML files, except the
 	    HTML version of the test suite generated with
 	    erl2html2:convert, which will have the same encoding as
@@ -1354,7 +1352,7 @@
 	    unicode:characters_to_list and
 	    unicode:characters_to_binary for conversion between
 	    binaries and strings instead of binary_to_list and
-	    list_to_binary. </item> </list></p>
+	    list_to_binary. </item> </list>
           <p>
 	    Own Id: OTP-10783</p>
         </item>
@@ -1395,7 +1393,6 @@
           <p>
 	    The following corrections/changes are done in the
 	    cth_surefire hook:</p>
-          <p>
 	    <list> <item> Earlier there would always be a
 	    'properties' element under the 'testsuites' element. This
 	    would exist even if there were no 'property' element
@@ -1428,7 +1425,7 @@
 	    </item> <item> A new option named 'url_base' is added for
 	    this hook. If this option is used, a new attribute named
 	    'url' will be added to the 'testcase' and 'testsuite'
-	    elements. </item> </list></p>
+	    elements. </item> </list>
           <p>
 	    Own Id: OTP-10589</p>
         </item>
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index 5239ec1ff8..f7615fdc14 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -116,9 +116,14 @@ write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
 	{silent,_} ->
 	    ok;
 	{LogType,Fd} ->
-	    io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time),
-					format_title(LogType,Info),
-					format_data(ConnMod,LogType,Data)])
+	    case format_data(ConnMod,LogType,Data) of
+		[] ->
+		    ok;
+		FormattedData ->
+		    io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time),
+						format_title(LogType,Info),
+						FormattedData])
+	    end
     end.
 
 write_error(Time,#conn_log{module=ConnMod}=Info,Report,GL,State) ->
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 05977e5649..6e3d1ab1d8 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1374,11 +1374,18 @@ to_xml_doc(Simple) ->
 %%% Parse and handle received XML data
 handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) ->
     log(Connection,recv,NewData),
-    Data = append_wo_initial_nl(Buff0,NewData),
-    case binary:split(Data,[?END_TAG],[]) of
+    {Start,AddSz} =
+	case byte_size(Buff0) of
+	    BSz when BSz<5 -> {0,BSz};
+	    BSz -> {BSz-5,5}
+	end,
+    Length = byte_size(NewData) + AddSz,
+    Data = <<Buff0/binary, NewData/binary>>,
+    case binary:split(Data,?END_TAG,[{scope,{Start,Length}}]) of
 	[_NoEndTagFound] ->
 	    {noreply, State0#state{buff=Data}};
-	[FirstMsg,Buff1] ->
+	[FirstMsg0,Buff1] ->
+	    FirstMsg = remove_initial_nl(FirstMsg0),
 	    SaxArgs = [{event_fun,fun sax_event/3}, {event_state,[]}],
 	    case xmerl_sax_parser:stream(FirstMsg, SaxArgs) of
 		{ok, Simple, _Thrash} ->
@@ -1400,11 +1407,10 @@ handle_data(NewData,#state{connection=Connection,buff=Buff0} = State0) ->
 
 %% xml does not accept a leading nl and some netconf server add a nl after
 %% each ?END_TAG, ignore them
-append_wo_initial_nl(<<>>,NewData) -> NewData;
-append_wo_initial_nl(<<"\n", Data/binary>>, NewData) ->
-    append_wo_initial_nl(Data, NewData);
-append_wo_initial_nl(Data, NewData) ->
-    <<Data/binary, NewData/binary>>.
+remove_initial_nl(<<"\n", Data/binary>>) ->
+    remove_initial_nl(Data);
+remove_initial_nl(Data) ->
+    Data.
 
 handle_error(Reason, State) ->
     Pending1 = case State#state.pending of
@@ -1770,9 +1776,14 @@ format_data(How,Data) ->
 do_format_data(raw,Data) ->
     io_lib:format("~n~ts~n",[hide_password(Data)]);
 do_format_data(pretty,Data) ->
-    io_lib:format("~n~ts~n",[indent(Data)]);
+    maybe_io_lib_format(indent(Data));
 do_format_data(html,Data) ->
-    io_lib:format("~n~ts~n",[html_format(Data)]).
+    maybe_io_lib_format(html_format(Data)).
+
+maybe_io_lib_format(<<>>) ->
+    [];
+maybe_io_lib_format(String) ->
+    io_lib:format("~n~ts~n",[String]).
 
 %%%-----------------------------------------------------------------
 %%% Hide password elements from XML data
@@ -1811,13 +1822,21 @@ indent1("<?"++Rest1,Indent1) ->
     Line++indent1(Rest2,Indent2);
 indent1("</"++Rest1,Indent1) ->
     %% Stop tag
-    {Line,Rest2,Indent2} = indent_line1(Rest1,Indent1,[$/,$<]),
-    "\n"++Line++indent1(Rest2,Indent2);
+    case indent_line1(Rest1,Indent1,[$/,$<]) of
+	{[],[],_} ->
+	    [];
+	{Line,Rest2,Indent2} ->
+	    "\n"++Line++indent1(Rest2,Indent2)
+    end;
 indent1("<"++Rest1,Indent1) ->
     %% Start- or empty tag
     put(tag,get_tag(Rest1)),
-    {Line,Rest2,Indent2} = indent_line(Rest1,Indent1,[$<]),
-    "\n"++Line++indent1(Rest2,Indent2);
+    case indent_line(Rest1,Indent1,[$<]) of
+	{[],[],_} ->
+	    [];
+	{Line,Rest2,Indent2} ->
+	    "\n"++Line++indent1(Rest2,Indent2)
+    end;
 indent1([H|T],Indent) ->
     [H|indent1(T,Indent)];
 indent1([],_Indent) ->
diff --git a/lib/common_test/src/ct_slave.erl b/lib/common_test/src/ct_slave.erl
index 32a1ff4dbc..0cd83b9f04 100644
--- a/lib/common_test/src/ct_slave.erl
+++ b/lib/common_test/src/ct_slave.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2015. 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.
@@ -134,7 +134,7 @@ start(Host, Node) ->
 %%% executed after startup of the node. Note that all used modules should be
 %%% present in the code path on the <code>Host</code>.</p>
 %%%
-%%% <p>The timeouts are applied as follows:
+%%% <p>The timeouts are applied as follows:</p>
 %%% <list>
 %%%  <item>
 %%%   <code>BootTimeout</code> - time to start the Erlang node, in seconds.
@@ -154,7 +154,7 @@ start(Host, Node) ->
 %%%    If this timeout occurs, the result
 %%%    <code>{error, startup_timeout, NodeName}</code> is returned.
 %%%  </item>
-%%% </list></p>
+%%% </list>
 %%%
 %%% <p>Option <code>monitor_master</code> specifies, if the slave node should be
 %%% stopped in case of master node stop. Defaults to false.</p>
@@ -170,7 +170,7 @@ start(Host, Node) ->
 %%% <p>Option <code>env</code> specifies a list of environment variables
 %%% that will extended the environment.</p>
 %%%
-%%% <p>Special return values are:
+%%% <p>Special return values are:</p>
 %%% <list>
 %%%  <item><code>{error, already_started, NodeName}</code> - if the node with
 %%%   the given name is already started on a given host;</item>
@@ -179,7 +179,7 @@ start(Host, Node) ->
 %%%  <item><code>{error, not_alive, NodeName}</code> - if node on which the
 %%%   <code>ct_slave:start/3</code> is called, is not alive. Note that
 %%%   <code>NodeName</code> is the name of current node in this case.</item>
-%%% </list></p>
+%%% </list>
 %%%
 start(Host, Node, Opts) ->
     ENode = enodename(Host, Node),
diff --git a/lib/common_test/src/ct_snmp.erl b/lib/common_test/src/ct_snmp.erl
index 95098bdaca..bb0167eb22 100644
--- a/lib/common_test/src/ct_snmp.erl
+++ b/lib/common_test/src/ct_snmp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2015. 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.
@@ -20,7 +20,7 @@
 
 %%% @doc Common Test user interface module for the OTP snmp application
 %%%
-%%% The purpose of this module is to make snmp configuration easier for 
+%%% <p>The purpose of this module is to make snmp configuration easier for
 %%% the test case writer. Many test cases can use default values for common
 %%% operations and then no snmp configuration files need to be supplied. When
 %%% it is necessary to change particular configuration parameters, a subset
@@ -31,7 +31,7 @@
 %%% To simplify the test suite, Common Test keeps track
 %%% of some of the snmp manager information. This way the test suite doesn't
 %%% have to handle as many input parameters as it would if it had to interface the
-%%% OTP snmp manager directly.
+%%% OTP snmp manager directly.</p>
 %%% 
 %%% <p> The following snmp manager and agent parameters are configurable: </p>
 %%%
@@ -326,9 +326,9 @@ set_info(Config) ->
 %%% @doc Register the manager entity (=user) responsible for specific agent(s).
 %%% Corresponds to making an entry in users.conf.
 %%%
-%%% This function will try to register the given users, without
+%%% <p>This function will try to register the given users, without
 %%% checking if any of them already exist. In order to change an
-%%% already registered user, the user must first be unregistered.
+%%% already registered user, the user must first be unregistered.</p>
 register_users(MgrAgentConfName, Users) ->
     case setup_users(Users) of
 	ok ->
@@ -351,10 +351,10 @@ register_users(MgrAgentConfName, Users) ->
 %%% @doc Explicitly instruct the manager to handle this agent.
 %%% Corresponds to making an entry in agents.conf 
 %%%
-%%% This function will try to register the given managed agents,
+%%% <p>This function will try to register the given managed agents,
 %%% without checking if any of them already exist. In order to change
 %%% an already registered managed agent, the agent must first be
-%%% unregistered.
+%%% unregistered.</p>
 register_agents(MgrAgentConfName, ManagedAgents) ->
     case setup_managed_agents(MgrAgentConfName,ManagedAgents) of
 	ok ->
@@ -378,9 +378,9 @@ register_agents(MgrAgentConfName, ManagedAgents) ->
 %%% @doc Explicitly instruct the manager to handle this USM user.
 %%% Corresponds to making an entry in usm.conf 
 %%%
-%%% This function will try to register the given users, without
+%%% <p>This function will try to register the given users, without
 %%% checking if any of them already exist. In order to change an
-%%% already registered user, the user must first be unregistered.
+%%% already registered user, the user must first be unregistered.</p>
 register_usm_users(MgrAgentConfName, UsmUsers) ->
     EngineID = ct:get_config({MgrAgentConfName, engine_id}, ?ENGINE_ID),
     case setup_usm_users(UsmUsers, EngineID) of
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index e9487e94db..4d3fd2d094 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2015. 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.
@@ -327,16 +327,16 @@ cmd(Connection,Cmd) ->
 %%%      Reason = term()
 %%% @doc Send a command via telnet and wait for prompt.
 %%%
-%%% This function will by default add a newline to the end of the
+%%% <p>This function will by default add a newline to the end of the
 %%% given command. If this is not desired, the option
 %%% `{newline,false}' can be used. This is necessary, for example,
 %%% when sending telnet command sequences (prefixed with the
-%%% Interprete As Command, IAC, character).
+%%% Interprete As Command, IAC, character).</p>
 %%%
-%%% The option `timeout' specifies how long the client shall wait for
+%%% <p>The option `timeout' specifies how long the client shall wait for
 %%% prompt. If the time expires, the function returns
 %%% `{error,timeout}'. See the module description for information
-%%% about the default value for the command timeout.
+%%% about the default value for the command timeout.</p>
 cmd(Connection,Cmd,Opts) when is_list(Opts) ->
     case check_cmd_opts(Opts) of
 	ok ->
@@ -378,7 +378,7 @@ cmdf(Connection,CmdFormat,Args) ->
 %%% @doc Send a telnet command and wait for prompt 
 %%%      (uses a format string and list of arguments to build the command).
 %%%
-%%% See {@link cmd/3} further description.
+%%% <p>See {@link cmd/3} further description.</p>
 cmdf(Connection,CmdFormat,Args,Opts) when is_list(Args) ->
     Cmd = lists:flatten(io_lib:format(CmdFormat,Args)),
     cmd(Connection,Cmd,Opts).
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index aaa0723488..ea49e36608 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -36,7 +36,8 @@
 -compile(export_all).
 
 suite() ->
-    [{ct_hooks, [{cth_conn_log,
+    [{timetrap,?default_timeout},
+     {ct_hooks, [{cth_conn_log,
 		  [{ct_netconfc,[{log_type,html}, %will be overwritten by config
 				 {hosts,[my_named_connection,netconf1]}]
 		   }]
@@ -72,6 +73,7 @@ all() ->
 	     invalid_opt,
 	     timeout_close_session,
 	     get,
+	     get_a_lot,
 	     timeout_get,
 	     flush_timeout_get,
 	     get_xpath,
@@ -113,12 +115,9 @@ end_per_group(_GroupName, Config) ->
 
 init_per_testcase(_Case, Config) ->
     ets:delete_all_objects(ns_tab),
-    Dog = test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+end_per_testcase(_Case, _Config) ->
     ok.
 
 init_per_suite(Config) ->
@@ -352,6 +351,19 @@ get(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
+get_a_lot(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    Descr = lists:append(lists:duplicate(100,"Description of myserver! ")),
+    Server = {server,[{xmlns,"myns"}],[{name,[],["myserver"]},
+				       {description,[],[Descr]}]},
+    Data = lists:duplicate(100,Server),
+    ?NS:expect_reply('get',{fragmented,{data,Data}}),
+    {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
 timeout_get(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 8c30383343..07893faabc 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -277,6 +277,18 @@ hupp_kill(State = #session{connection = ConnRef}) ->
 send({CM,Ch},Data) ->
     ssh_connection:send(CM, Ch, Data).
 
+%%% Split into many small parts and send to client
+send_frag({CM,Ch},Data) ->
+    Sz = rand:uniform(2000),
+    case Data of
+	<<Chunk:Sz/binary,Rest/binary>> ->
+	    ssh_connection:send(CM, Ch, Chunk),
+	    send_frag({CM,Ch},Rest);
+	Chunk ->
+	    ssh_connection:send(CM, Ch, Chunk)
+    end.
+
+
 %%% Kill ssh connection
 kill({CM,_Ch}) ->
     ssh:close(CM).
@@ -294,7 +306,7 @@ table_trans(Fun,Args) ->
 	    receive
 		{table_trans_done,Result} ->
 		    Result
-	    after 5000 ->
+	    after 20000 ->
 		    exit(table_trans_timeout)
 	    end
     end.
@@ -424,6 +436,9 @@ do(_, undefined) ->
 reply(_,undefined) ->
     ?dbg("no reply~n",[]),
     ok;
+reply(ConnRef,{fragmented,Reply}) ->
+    ?dbg("Reply fragmented: ~p~n",[Reply]),
+    send_frag(ConnRef,make_msg(Reply));
 reply(ConnRef,Reply) ->
     ?dbg("Reply: ~p~n",[Reply]),
     send(ConnRef, make_msg(Reply)).
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml
index 3cd97f2f18..4bb3628ab5 100644
--- a/lib/observer/doc/src/crashdump_ug.xml
+++ b/lib/observer/doc/src/crashdump_ug.xml
@@ -377,7 +377,6 @@
     <p>The <em>Memory</em> panel shows memory and allocator
     information. From the left hand menu you can select:</p>
 
-    <p>
       <list>
 
 	<item><em>Memory</em> <seealso
@@ -394,7 +393,6 @@
 	marker="erts:crash_dump#allocated_areas">More...</seealso></item>
 
       </list>
-    </p>
   </section>
 
   <section>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 5243f50e34..f0c87d865e 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -273,13 +273,12 @@
     <section><title>Improvements and New Features</title>
       <list>
         <item>
-          <p>
 	    <list> <item> The new Memory field from a crash dump is
 	    now presented by crashdump viewer, both in the process
 	    overview and in the process detail page. </item> <item> A
 	    summary of blocks- and carriers sizes is added to the
 	    allocator information page in the crashdump viewer.
-	    </item> </list></p>
+	    </item> </list>
           <p>
 	    Own Id: OTP-10604 Aux Id: kunagi-336 [247] </p>
         </item>
@@ -408,7 +407,6 @@
         <item>
           <p>
 	    The following bugs in <c>ttb</c> have been corrected:</p>
-          <p>
 	    <list> <item><c>ttb:tracer/2</c> would earlier crash when
 	    trying to set up tracing for a diskless node to wrap
 	    files, i.e. when option
@@ -421,7 +419,7 @@
 	    <c>{file,{local,Filename}}</c></item> <item>A deadlock
 	    would sometimes occur due to an information printout from
 	    the <c>ttb_control</c> process when <c>ttb</c> was
-	    stopped.</item> </list></p>
+	    stopped.</item> </list>
           <p>
 	    Own Id: OTP-9431</p>
         </item>
@@ -449,7 +447,6 @@
         <item>
           <p>
 	    The following new features are added to <c>ttb</c>:</p>
-          <p>
 	    <list> <item>A one-command trace setup is added,
 	    <c>ttb:start_trace/4</c>.</item> <item>The following new
 	    options are added to <c>ttb:tracer/2</c>: <list>
@@ -485,7 +482,7 @@
 	    <c>disable_sort</c> is added to <c>ttb:format/2</c>. When
 	    this option is used, trace messages from different logs
 	    are not merged according to timestamps, but just appended
-	    one log after the other. </item> </list></p>
+	    one log after the other. </item> </list>
           <p>
 	    Own Id: OTP-9403</p>
         </item>
@@ -493,7 +490,6 @@
           <p>
 	    The following non backwards compatible changes are done
 	    in <c>ttb</c>:</p>
-          <p>
 	    <list> <item> When setting up trace with ttb, the
 	    'timestamp' trace flag will now always be set. </item>
 	    <item> The 'fetch' option to ttb:stop/1 is removed since
@@ -509,7 +505,7 @@
 	    trace file, this is now changed so the handler state is
 	    passed not only from one trace message to the next in the
 	    same file, but also from one file to the next. </item>
-	    </list></p>
+	    </list>
           <p>
 	    *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
diff --git a/lib/observer/doc/src/observer_ug.xml b/lib/observer/doc/src/observer_ug.xml
index 8388cb6736..ff30d70913 100644
--- a/lib/observer/doc/src/observer_ug.xml
+++ b/lib/observer/doc/src/observer_ug.xml
@@ -105,7 +105,7 @@
     <note>
       <p><em>Reds</em> can be presented as accumulated values or as values since last update.</p>
     </note>
-    <p><c>Process info</c> open a detailed information window on the selected process.
+    <p><c>Process info</c> open a detailed information window on the selected process.</p>
     <taglist>
       <tag>Process Information</tag>
       <item>Shows the process information.</item>
@@ -127,7 +127,6 @@
       <c>rb</c> server will be stopped on the observed node when exiting or changing observed node.
       </p>
     </note>
-    </p>
     <p><c>Trace Processes</c> will add the selected process identifiers to the <c>Trace Overview</c> view and the
     node the processes reside on will be added as well.
     <c>Trace Named Processes</c> will add the registered name of processes. This can be useful
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 0b064b51b8..0a50a20716 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -25,8 +25,7 @@
     </legalnotice>
 
     <title>ttb</title>
-    <prepared>Siri hansen</prepared>
-    <prepared>Bartlomiej Puzon</prepared>
+    <prepared>Siri hansen, Bartlomiej Puzon</prepared>
     <responsible></responsible>
     <docno>1</docno>
     <approved></approved>
@@ -60,17 +59,16 @@
         <p>This function is a shortcut allowing to start a trace with one command. Each
           tuple in <c>Patterns</c> is converted to list which is in turn passed to
           <c>ttb:tpl</c>.
-          The call:<code type="none">
+          The call:</p><code type="none">
 ttb:start_trace([Node, OtherNode],
 [{mod, foo, []}, {mod, bar, 2}],
 {all, call},
 [{file, File}, {handler,{fun myhandler/4, S}}])</code>
-          is equivalent to <code type="none">
+          <p>is equivalent to</p> <code type="none">
 ttb:start_trace([Node, OtherNode], [{file, File}, {handler,{fun myhandler/4, S}}]),
 ttb:tpl(mod, foo, []),
 ttb:tpl(mod, bar, 2, []),
 ttb:p(all, call)</code>
-        </p>
       </desc>
     </func>
     <func>
@@ -193,7 +191,7 @@ ttb:p(all, call)</code>
           (i.e. on diskless nodes), a custom module to handle autostart
           information storage and retrieval can be provided by specifying
           <c>ttb_autostart_module</c> environment variable for the <c>runtime_tools</c>
-          application. The module has to respond to the following API:
+          application. The module has to respond to the following API:</p>
           <taglist>
             <tag><c>write_config(Data) -> ok</c></tag>
             <item>Store the provided data for further retrieval. It is
@@ -207,7 +205,6 @@ ttb:p(all, call)</code>
               must return <c>{error, Error}</c>.
             </item>
           </taglist>
-        </p>
         <p>The <c>resume</c> option implies the default <c>FetchTimeout</c>, which is
           10 seconds</p>
       </desc>
@@ -272,17 +269,19 @@ ttb:p(all, call)</code>
           <item>Clear trace pattern on global function calls</item>
         </taglist>
         <p>With <c>tp</c> and <c>tpl</c> one of match specification shortcuts
-          may be used (example: <c>ttb:tp(foo_module, caller)</c>). The shortcuts are:
+          may be used (example: <c>ttb:tp(foo_module, caller)</c>). The shortcuts are:</p>
           <taglist>
+	    <tag/>
             <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c>
               (report the return value)</item>
+	    <tag/>
             <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c>
               (report the calling function)</item>
+	    <tag/>
             <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments
               passed as strings (example: <c>"fun(_) -> return_trace() end"</c>)
             </item>
           </taglist>
-        </p>
       </desc>
     </func>
     <func>
diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml
index ba8c997133..e2a28d67d0 100644
--- a/lib/observer/doc/src/ttb_ug.xml
+++ b/lib/observer/doc/src/ttb_ug.xml
@@ -320,7 +320,7 @@ do_print(Out,{trace_ts,P,return_from,{M,F,A},R,Ts},N) ->
 </code>
         </section>
         <section>
-          <label>Overload protection</label>
+          <title>Overload protection</title>
           <p>When tracing live systems, special care needs to be always taken
             not to overload a node with too heavy tracing. <c>ttb</c> provides
             the <c>overload</c> option to help to address the problem.</p>
@@ -747,7 +747,7 @@ f3() ->
       of the <c>ttb</c> for setting trace flags on processes and trace
       patterns for call trace, i.e. the functions <c>p</c>, <c>tp</c>,
       <c>tpl</c>, <c>ctp</c>, <c>ctpl</c> and <c>ctpg</c>. There are only
-      two things added by <c>ttb</c> for these functions:
+      two things added by <c>ttb</c> for these functions:</p>
       <list type="bulleted">
         <item>all calls  are stored in the history buffer and can be
           recalled and stored in a configuration file. This makes it
@@ -756,9 +756,8 @@ f3() ->
           typing when using <c>ttb</c> from the erlang shell;</item>
         <item>shortcuts are provided for the most common match
           specifications (in order not to force the user to use
-          <c>dbg:fun2ms</c> continually</item>).
+          <c>dbg:fun2ms</c> continually).</item>
       </list>
-      </p>
     <p>Use <c>list_history/0</c> to see the content of the history
       buffer, and <c>run_history/1</c> to re-execute one of the entries.
       </p>