Merge branch 'fredrik/ssh/fix-idle-tests' into fredrik/ssh/rekeying

* fredrik/ssh/fix-idle-tests: (50 commits)
  Modifications to idle_time testcase
  Teach Win installer to handle redist on w2012/w8
  ssl: Receive port EXIT-message so that it does not get mixed up with the protocol-error message we are expecting
  ssl: Add and enhance tests
  ssl: Consider new server options when resuming a session
  Prepare release
  ssl: Add dependencies to Makefile
  Simplify the code for the generated info/0 function
  Don't try to work around a non-loadable NIF library
  Fix BER encoding when multiple levels of typedefs are used
  Update megaco documentation
  Update documentation for the asn1 application
  Fix other applications
  Fix use of asn1 in megaco
  Remove the unused asn1ct_gen_ber module
  Fix erroneous skipping for jinterface, erl_interface and ic
  kernel: Heart port needs to be unregistered
  Update preloaded modules
  Update primary bootstrap
  Update copyright years
  ...

1 files changed, 0 insertions, 23 deletions

diff --git a/lib/megaco/doc/src/megaco_encode.xml b/lib/megaco/doc/src/megaco_encode.xml
index 410e4f3b31..4a9d63c2e3 100644
--- a/lib/megaco/doc/src/megaco_encode.xml
+++ b/lib/megaco/doc/src/megaco_encode.xml
@@ -224,22 +224,11 @@
           messages.</p>
       </item>
       <item>
-        <p>megaco_ber_bin_encoder - encode/decode ASN.1 BER
-          messages. This encoder uses ASN.1 ber_bin which
-          has been optimized using the bit syntax.</p>
-      </item>
-      <item>
         <p>megaco_per_encoder - encode/decode ASN.1 PER
           messages. N.B. that this format is not included in the
           Megaco standard.</p>
       </item>
       <item>
-        <p>megaco_per_bin_encoder - encode/decode ASN.1 PER
-          messages. N.B. that this format is not included in the
-          Megaco standard. This encoder uses ASN.1 per_bin which
-          has been optimized using the bit syntax.</p>
-      </item>
-      <item>
         <p>megaco_erl_dist_encoder - encodes messages into Erlangs
           distribution format. It is rather verbose but encoding and
           decoding is blinding fast. N.B. that this format is not 
@@ -370,18 +359,6 @@
       needs to be specified.</p>
     <list type="bulleted">
       <item>
-        <p><c><![CDATA[[driver|_]]]></c> - make use of the asn1 driver for decode
-          (ber_bin) and encode (per_bin). This option is only available for 
-          encoding modules: <c><![CDATA[megaco_binary_encoder]]></c>, 
-          <c><![CDATA[megaco_ber_bin_encoder]]></c> and <c><![CDATA[megaco_per_bin_encoder]]></c>.</p>
-        <p>If this option is present in the encoding config, it <em>must</em> 
-          to be the <em>first</em>, unless the 
-          <seealso marker="#handling_versions">version3</seealso> encoding 
-          config is present, in which case it must come second, after 
-          the version3 encoding config,  
-          e.g. <c><![CDATA[[{version3,prev3b},driver]]]></c>.</p>
-      </item>
-      <item>
         <p><c><![CDATA[[native]]]></c> - skips the transformation phase, i.e. 
           the decoded message(s) will not be transformed into our internal
           form.</p>