Fix bad merge from maint-21

2 files changed, 60 insertions, 519 deletions

diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index fac1b09e44..a1bd6d64b0 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,66 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.17.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The test result when a hook function fails is in general
+	    the same as if the function that the hook is associated
+	    with fails. For example, if <c>post_init_per_testcase</c>
+	    fails the result is that the test case is skipped, as is
+	    the case when <c>init_per_testcase</c> fails.This,
+	    however, was earlier not true for timetrap timeouts or
+	    other error situations where the process running the hook
+	    function was killed. This is now corrected, so the error
+	    handling should be the same no matter how the hook
+	    function fails.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15717 Aux Id: ERIERL-334 </p>
+        </item>
+        <item>
+          <p>
+	    In some rare cases, when two common_test nodes used the
+	    same log directory, a timing problem could occur which
+	    caused common_test to crash because it's log cache file
+	    was unexpectedly empty. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15758 Aux Id: ERIERL-342 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Two new common_test hook functions are introduced:</p>
+          <p>
+	    <c>post_groups/2</c>, which is called after
+	    <c>Suite:groups/0</c><br/> <c>post_all/3</c>, which is
+	    called after <c>Suite:all/0</c></p>
+          <p>
+	    These functions allow modifying the return values from
+	    the <c>groups/0</c> and <c>all/0</c> functions,
+	    respectively.</p>
+          <p>
+	    A new term, <c>{testcase,TestCase,RepeatProperties}</c>
+	    is now also allowed in the return from <c>all/0</c>. This
+	    can be used for repeating a single test case a specific
+	    number of times, or until it fails or succeeds once.</p>
+          <p>
+	    Own Id: OTP-14746 Aux Id: ERIERL-143 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.17.1</title>
 
     <section><title>Improvements and New Features</title>
@@ -216,183 +276,6 @@
 
 </section>
 
-<section><title>Common_Test 1.17.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The test result when a hook function fails is in general
-	    the same as if the function that the hook is associated
-	    with fails. For example, if <c>post_init_per_testcase</c>
-	    fails the result is that the test case is skipped, as is
-	    the case when <c>init_per_testcase</c> fails.This,
-	    however, was earlier not true for timetrap timeouts or
-	    other error situations where the process running the hook
-	    function was killed. This is now corrected, so the error
-	    handling should be the same no matter how the hook
-	    function fails.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15717 Aux Id: ERIERL-334 </p>
-        </item>
-        <item>
-          <p>
-	    In some rare cases, when two common_test nodes used the
-	    same log directory, a timing problem could occur which
-	    caused common_test to crash because it's log cache file
-	    was unexpectedly empty. This is now corrected.</p>
-          <p>
-	    Own Id: OTP-15758 Aux Id: ERIERL-342 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Two new common_test hook functions are introduced:</p>
-          <p>
-	    <c>post_groups/2</c>, which is called after
-	    <c>Suite:groups/0</c><br/> <c>post_all/3</c>, which is
-	    called after <c>Suite:all/0</c></p>
-          <p>
-	    These functions allow modifying the return values from
-	    the <c>groups/0</c> and <c>all/0</c> functions,
-	    respectively.</p>
-          <p>
-	    A new term, <c>{testcase,TestCase,RepeatProperties}</c>
-	    is now also allowed in the return from <c>all/0</c>. This
-	    can be used for repeating a single test case a specific
-	    number of times, or until it fails or succeeds once.</p>
-          <p>
-	    Own Id: OTP-14746 Aux Id: ERIERL-143 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Common_Test 1.17.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    OTP internal test improvements.</p>
-          <p>
-	    Own Id: OTP-15716</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Common_Test 1.17</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    A bug caused <c>ct:encrypt_config_file/3</c> and
-	    <c>ct:decrypt_config_file/3</c> to fail with
-	    <c>badmatch</c> if input parameter <c>KeyOrFile</c> was
-	    <c>{key,string()}</c>. This is now corrected.</p>
-          <p>
-	    Own Id: OTP-15540</p>
-        </item>
-        <item>
-          <p>
-	    The status of a test case which failed with timetrap
-	    timeout in <c>end_per_testcase</c> could not be modified
-	    by returning <c>{fail,Reason}</c> from a
-	    <c>post_end_per_testcase</c> hook function. This is now
-	    corrected.</p>
-          <p>
-	    Own Id: OTP-15584 Aux Id: ERIERL-282 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A new variant of the <c>newline</c> option to
-	    <c>ct_telnet:cmd/3</c> and <c>ct_telnet:send/3</c> is
-	    added, which allows to specify a string to append as
-	    newline indicator on a command. By default, the value is
-	    "\n", but in some cases it is required to be "\r\n",
-	    which this option allows.</p>
-          <p>
-	    A faulty regular expression given as parameter to
-	    <c>ct_telnet:expect/2,3</c> would earlier crash and look
-	    like an internal error in common_test. A better error
-	    indication is now given, but the test case will still
-	    fail.</p>
-          <p>
-	    Own Id: OTP-15229 Aux Id: ERIERL-203 </p>
-        </item>
-        <item>
-          <p>
-	    Since the yang RFC allows more than one top element of
-	    config data in an <c>edit-config</c> element,
-	    <c>ct_netconfc:edit_config/3,4,5</c> can now take a list
-	    of XML elements.</p>
-          <p>
-	    Own Id: OTP-15298</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Common_Test 1.16.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The Logger handler cth_log_redirect earlier called the
-	    report callback (report_cb) before calling the logger
-	    formatter. In some cases this would fail, since
-	    cth_log_redirect could not handle report callbacks with
-	    two arguments. This is now corrected, so only the
-	    formatter will call the report callback.</p>
-          <p>
-	    Own Id: OTP-15307</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Common_Test 1.16</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>Use the compiler option <c>nowarn_export_all</c> to
-	    disable <c>export_all</c> warnings when automatically
-	    compiling test suites.</p>
-          <p>
-	    Own Id: OTP-14810</p>
-        </item>
-        <item>
-          <p>
-	    Use uri_string module instead of http_uri.</p>
-          <p>
-	    Own Id: OTP-14902</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Common_Test 1.15.4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 75cc7d2bfb..1bc4f866ce 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -390,348 +390,6 @@
 
 </section>
 
-<section><title>Ssh 4.7.6</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    When an SSH server receives the very first message on a
-	    new TCP connection, and that message is not the expected
-	    one, the 64 first bytes of the received message are now
-	    dumped in the INFO REPORT that reports the Protocol
-	    Error.</p>
-          <p>
-	    This facilitates the debugging of who sends the bad
-	    message or of detecting a possible port scanning.</p>
-          <p>
-	    Own Id: OTP-15772</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The callback <c>ssh_channel:init/1</c> was missing in
-	    OTP-21</p>
-          <p>
-	    Own Id: OTP-15762</p>
-        </item>
-        <item>
-          <p>
-	    If a client was connected to an server on an already open
-	    socket, the callback <c>fun(PeerName,FingerPrint)</c> in
-	    the <c>accept_callback</c> option passed the local name
-	    in the argument PeerName instead of the remote name.</p>
-          <p>
-	    Own Id: OTP-15763</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    SSH sftp daemon now accepts an SSH_FXP_STAT message
-	    encoded according to the wrong sftp version. Some clients
-	    sends such messages.</p>
-          <p>
-	    Own Id: OTP-15498 Aux Id: ERL-822, PR-2077 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fixed port leakage if a ssh:daemon call failed.</p>
-          <p>
-	    Own Id: OTP-15397 Aux Id: ERL-801 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Incompatibility with newer OpenSSH fixed. Previously
-	    versions 7.8 and later could cause Erlang SSH to exit.</p>
-          <p>
-	    Own Id: OTP-15413</p>
-        </item>
-        <item>
-          <p>
-	    The '<c>exec</c>' option for ssh daemons had wrong format
-	    in the documentation.</p>
-          <p>
-	    Own Id: OTP-15416</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Added public key methods ssh-ed25519 and ssh-ed448.</p>
-          <p>
-	    Requires OpenSSL 1.1.1 or higher as cryptolib under the
-	    OTP application <c>crypto</c>.</p>
-          <p>
-	    Own Id: OTP-15094 Aux Id: OTP-15419 </p>
-        </item>
-        <item>
-          <p>
-	    The SSH property tests are now adapted to the PropEr
-	    testing tool.</p>
-          <p>
-	    Own Id: OTP-15312</p>
-        </item>
-        <item>
-          <p>
-	    The term "user" was not documented in the SSH app. A new
-	    chapter with terminology is added to the User's Manual
-	    where the term "user" is defined.</p>
-          <p>
-	    A reference manual page about the module <c>ssh_file</c>
-	    is also added. This is the default callback module for
-	    user's keys, host keys etc.</p>
-          <p>
-	    Own Id: OTP-15314</p>
-        </item>
-        <item>
-          <p>
-	    Host and user key checking is made more robust.</p>
-          <p>
-	    Own Id: OTP-15424</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Extended the undocumented <c>ssh_dbg</c> debug module
-	    with an api for a circular trace buffer. This makes it
-	    easy to record the last low-level events before an error
-	    is detected. It is intended for solving difficult errors.</p>
-          <p>
-	    Own Id: OTP-15020</p>
-        </item>
-        <item>
-          <p>
-	    The key exchange methods
-	    <c>'[email protected]'</c>,
-	    <c>'curve25519-sha256'</c> and <c>'curve448-sha512'</c>
-	    are implemented. The last two are defined in
-	    https://tools.ietf.org/html/draft-ietf-curdle-ssh-curves</p>
-          <p>
-	    They all depends on that OpenSSL 1.1.1 or higher is used
-	    as cryptolib.</p>
-          <p>
-	    Own Id: OTP-15133 Aux Id: OTP-15240 </p>
-        </item>
-        <item>
-          <p>
-	    The cipher '<c>[email protected]</c>' is now
-	    supported if OpenSSL 1.1.1 or higher is used as
-	    cryptolib.</p>
-          <p>
-	    Own Id: OTP-15209 Aux Id: OTP-15164 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Ssh 4.7</title>
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    If the daemon port listener is restarted, it could
-	    potentially fail with <c>eaddrinuse</c> if the timing is
-	    unlucky. It will now retry and exponentially back off the
-	    listener restart a few times before failing.</p>
-          <p>
-	    Own Id: OTP-14955</p>
-        </item>
-        <item>
-          <p>
-	    A channel callback module always got the module name as
-	    reason in a call to terminate. Now it will get the proper
-	    Reason, usually 'normal'.</p>
-          <p>
-	    Own Id: OTP-15084</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The option <c>exec</c> has new option values defined to
-	    make it much more easy to implement an own <c>exec</c>
-	    server.</p>
-          <p>
-	    An option called <c>exec</c> for daemons implementing the
-	    handling of 'exec' requests has existed a long time but
-	    has been undocumented. The old undocumented value - as
-	    well as its behavior - is kept for compatibility EXCEPT
-	    that error messages are changed and are sent as
-	    "stderror" text.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-14851</p>
-        </item>
-        <item>
-          <p>
-	    Updated ssh_connection:shell/2 documentation.</p>
-          <p>
-	    Own Id: OTP-14880</p>
-        </item>
-        <item>
-          <p>
-	    The experimental <c>ssh_dbg</c> module is completely
-	    re-written. Its purpose is to make tracing and debugging
-	    easier on deployed systems.</p>
-          <p>
-	    Own Id: OTP-14896</p>
-        </item>
-        <item>
-          <p>
-	    The SSH supervisor structure has been slightly changed.
-	    This makes stopping the ssh application considerably
-	    faster if there are open connections. This is important
-	    in for example restarts.</p>
-          <p>
-	    Own Id: OTP-14988</p>
-        </item>
-        <item>
-          <p>
-	    The type specifications in SSH are completly reworked and
-	    the following types are renamed:</p>
-          <p>
-	    <c>ssh:ssh_connection_ref()</c> is changed to
-	    <c>ssh:connection_ref()</c>, </p>
-          <p>
-	    <c>ssh:ssh_daemon_ref()</c> is changed to
-	    <c>ssh:daemon_ref()</c>,</p>
-          <p>
-	    <c>ssh:ssh_channel_id()</c> is changed to
-	    <c>ssh:channel_id()</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15002 Aux Id: OTP-15030 </p>
-        </item>
-        <item>
-          <p>
-	    The internal timer handling in SSH is now based on the
-	    gen_statem timers.</p>
-          <p>
-	    Own Id: OTP-15019</p>
-        </item>
-        <item>
-          <p>
-	    Removed the undocumented and unused modules
-	    <c>ssh_client_key.erl</c> and <c>ssh_server_key.erl</c>.</p>
-          <p>
-	    Own Id: OTP-15028</p>
-        </item>
-        <item>
-          <p>
-	    The Reference Manual pages are partly updated.</p>
-          <p>
-	    The ssh page is now generated from specs and types, is
-	    restructured and is partly rephrased.</p>
-          <p>
-	    The ssh_channel, ssh_connection, ssh_client_key_api,
-	    ssh_server_key_api and ssh_sftp pages are updated with
-	    links, correct type names and some minor changes.</p>
-          <p>
-	    Own Id: OTP-15030 Aux Id: OTP-15002 </p>
-        </item>
-        <item>
-          <p>
-	    The behaviors <c>ssh_channel</c> and
-	    <c>ssh_daemon_channel</c> are renamed to
-	    <c>ssh_client_channel</c> and <c>ssh_server_channel</c>
-	    respectively.</p>
-          <p>
-	    The old modules are kept for compatibility but should
-	    preferably be replaced when updating callback modules
-	    referring them.</p>
-          <p>
-	    Own Id: OTP-15041</p>
-        </item>
-        <item>
-          <p>
-	    New test suite for channels.</p>
-          <p>
-	    Own Id: OTP-15051</p>
-        </item>
-        <item>
-          <p>
-	    The <c>rekey_limit</c> option could now set the max time
-	    as well as the previously max data amount.</p>
-          <p>
-	    Own Id: OTP-15069 Aux Id: ERL-617 </p>
-        </item>
-        <item>
-          <p>
-	    Changed process exit supervision from links to monitors.</p>
-          <p>
-	    Own Id: OTP-15082</p>
-        </item>
-        <item>
-          <p>
-	    Better handling of misbehaving channel callback modules.</p>
-          <p>
-	    Own Id: OTP-15083</p>
-        </item>
-        <item>
-          <p>
-	    A new moduli file is generated. This file is used for the
-	    recommended <c>diffie-hellman-group-exchange-sha256</c>
-	    key exchange algorithm in SSH.</p>
-          <p>
-	    Own Id: OTP-15113</p>
-        </item>
-      </list>
-    </section>
-</section>
-
 <section><title>Ssh 4.6.9.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>