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

9 files changed, 315 insertions, 213 deletions

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index d68a78ed6d..2cbe48ecce 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -21,7 +21,7 @@
 
 <copyright>
 <year>2011</year>
-<year>2016</year>
+<year>2017</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -94,12 +94,12 @@ in this module.</p>
 
 <taglist>
 
-<tag><c>Address()</c></tag>
-<tag><c>DiameterIdentity()</c></tag>
-<tag><c>Grouped()</c></tag>
-<tag><c>OctetString()</c></tag>
-<tag><c>Time()</c></tag>
-<tag><c>Unsigned32()</c></tag>
+<tag><c>Address()</c></tag><item/>
+<tag><c>DiameterIdentity()</c></tag><item/>
+<tag><c>Grouped()</c></tag><item/>
+<tag><c>OctetString()</c></tag><item/>
+<tag><c>Time()</c></tag><item/>
+<tag><c>Unsigned32()</c></tag><item/>
 <tag><c>UTF8String()</c></tag>
 <item>
 <p>
@@ -159,8 +159,7 @@ Has one the following types.</p>
 <p>
 Unique identifier for the application in the scope of the
 service.
-Defaults to the value of the <c>dictionary</c> option if
-unspecified.</p>
+Defaults to the value of the <c>dictionary</c> option.</p>
 </item>
 
 <tag><c>{dictionary, atom()}</c></tag>
@@ -187,7 +186,7 @@ Initial callback state.
 The prevailing state is passed to some
 &man_app;
 callbacks, which can then return a new state.
-Defaults to the value of the <c>alias</c> option if unspecified.</p>
+Defaults to the value of the <c>alias</c> option.</p>
 </item>
 
 <tag><c>{call_mutates_state, true|false}</c></tag>
@@ -195,7 +194,7 @@ Defaults to the value of the <c>alias</c> option if unspecified.</p>
 <p>
 Whether or not the &app_pick_peer;
 application callback can modify the application state.
-Defaults to <c>false</c> if unspecified.</p>
+Defaults to <c>false</c>.</p>
 
 <warning>
 <p>
@@ -228,7 +227,7 @@ question is as if a callback had taken place and returned
 <c>{error, failure}</c>.</p>
 
 <p>
-Defaults to <c>discard</c> if unspecified.</p>
+Defaults to <c>discard</c>.</p>
 </item>
 
 <tag><c>{request_errors, answer_3xxx|answer|callback}</c></tag>
@@ -249,7 +248,7 @@ place and its return value determines the answer sent to the peer, if
 any.</p>
 
 <p>
-Defaults to <c>answer_3xxx</c> if unspecified.</p>
+Defaults to <c>answer_3xxx</c>.</p>
 
 <note>
 <p>
@@ -301,6 +300,17 @@ corresponding list of filters.
 Defaults to <c>none</c>.</p>
 </item>
 
+<tag><c>{peer, &app_peer_ref;}</c></tag>
+<item>
+<p>
+Peer to which the request in question can be sent, preempting the
+selection of peers having advertised support for the Diameter
+application in question.
+Multiple options can be specified, and their order is
+respected in the candidate lists passed to a subsequent
+&app_pick_peer; callback.</p>
+</item>
+
 <tag><c>{timeout, &dict_Unsigned32;}</c></tag>
 <item>
 <p>
@@ -339,8 +349,8 @@ Has one of the following types.</p>
 
 <taglist>
 
-<tag><c>{'Origin-Host', &dict_DiameterIdentity;}</c></tag>
-<tag><c>{'Origin-Realm', &dict_DiameterIdentity;}</c></tag>
+<tag><c>{'Origin-Host', &dict_DiameterIdentity;}</c></tag><item/>
+<tag><c>{'Origin-Realm', &dict_DiameterIdentity;}</c></tag><item/>
 <tag><c>{'Host-IP-Address', [&dict_Address;]}</c></tag>
 <item>
 <p>
@@ -352,8 +362,8 @@ question communicates an address list as described in
 &man_transport;</p>
 </item>
 
-<tag><c>{'Vendor-Id', &dict_Unsigned32;}</c></tag>
-<tag><c>{'Product-Name', &dict_UTF8String;}</c></tag>
+<tag><c>{'Vendor-Id', &dict_Unsigned32;}</c></tag><item/>
+<tag><c>{'Product-Name', &dict_UTF8String;}</c></tag><item/>
 <tag><c>{'Origin-State-Id', &dict_Unsigned32;}</c></tag>
 <item>
 <p>
@@ -366,8 +376,8 @@ can be used as to retrieve a value that is computed when the diameter
 application is started.</p>
 </item>
 
-<tag><c>{'Supported-Vendor-Id', [&dict_Unsigned32;]}</c></tag>
-<tag><c>{'Auth-Application-Id', [&dict_Unsigned32;]}</c></tag>
+<tag><c>{'Supported-Vendor-Id', [&dict_Unsigned32;]}</c></tag><item/>
+<tag><c>{'Auth-Application-Id', [&dict_Unsigned32;]}</c></tag><item/>
 <tag><c>{'Inband-Security-Id', [&dict_Unsigned32;]}</c></tag>
 <item>
 <p>
@@ -377,9 +387,9 @@ If 1 (TLS) is specified then TLS is selected if the CER/CEA received
 from the peer offers it.</p>
 </item>
 
-<tag><c>{'Acct-Application-Id', [&dict_Unsigned32;]}</c></tag>
-<tag><c>{'Vendor-Specific-Application-Id', [&dict_Grouped;]}</c></tag>
-<tag><c>{'Firmware-Revision', &dict_Unsigned32;}</c></tag>
+<tag><c>{'Acct-Application-Id', [&dict_Unsigned32;]}</c></tag><item/>
+<tag><c>{'Vendor-Specific-Application-Id', [&dict_Grouped;]}</c></tag><item/>
+<tag><c>{'Firmware-Revision', &dict_Unsigned32;}</c></tag><item/>
 
 </taglist>
 
@@ -567,9 +577,8 @@ Can have one of the following types.</p>
 
 <taglist>
 
-<tag><c>start</c></tag>
+<tag><c>start</c></tag><item/>
 <tag><c>stop</c></tag>
-
 <item>
 <p>
 The service is being started or stopped.
@@ -578,8 +587,8 @@ No event follows a <c>stop</c> event, and this event
 implies the termination of all transport processes.</p>
 </item>
 
-<tag><c>{up, Ref, Peer, Config, Pkt}</c></tag>
-<tag><c>{up, Ref, Peer, Config}</c></tag>
+<tag><c>{up, Ref, Peer, Config, Pkt}</c></tag><item/>
+<tag><c>{up, Ref, Peer, Config}</c></tag><item/>
 <tag><c>{down, Ref, Peer, Config}</c></tag>
 <item>
 <pre>
@@ -788,8 +797,8 @@ be matched by corresponding &capability; configuration, of
 
 </item>
 
-<marker id="incoming_maxlen"/>
-<tag><c>{incoming_maxlen, 0..16777215}</c></tag>
+<tag>
+<marker id="incoming_maxlen"/><c>{incoming_maxlen, 0..16777215}</c></tag>
 <item>
 <p>
 Bound on the expected size of incoming Diameter messages.
@@ -917,8 +926,8 @@ Options <c>monitor</c> and <c>link</c> are ignored.</p>
 Defaults to the empty list.</p>
 </item>
 
-<marker id="strict_mbit"/>
-<tag><c>{strict_mbit, boolean()}</c></tag>
+<tag>
+<marker id="strict_mbit"/><c>{strict_mbit, boolean()}</c></tag>
 <item>
 <p>
 Whether or not to regard an AVP setting the M-bit as erroneous when
@@ -935,7 +944,7 @@ Defaults to <c>true</c>.</p>
 <p>
 RFC 6733 is unclear about the semantics of the M-bit.
 One the one hand, the CCF specification in section 3.2 documents AVP
-in a command grammar as meaning <b>any</b> arbitrary AVP; on the
+in a command grammar as meaning <em>any</em> arbitrary AVP; on the
 other hand, 1.3.4 states that AVPs setting the M-bit cannot be added
 to an existing command: the modified command must instead be
 placed in a new Diameter application.</p>
@@ -945,7 +954,7 @@ allowing arbitrary AVPs setting the M-bit in a command makes its
 interpretation implementation-dependent, since there's no
 guarantee that all implementations will understand the same set of
 arbitrary AVPs in the context of a given command.
-However, interpreting <c>AVP</c> in a command grammar as <b>any</b>
+However, interpreting <c>AVP</c> in a command grammar as any
 AVP, regardless of M-bit, renders 1.3.4 meaningless, since the receiver
 can simply ignore any AVP it thinks isn't relevant, regardless of the
 sender's intent.</p>
@@ -960,8 +969,8 @@ occur in the message in question.</p>
 
 </item>
 
-<marker id="string_decode"/>
-<tag><c>{string_decode, boolean()}</c></tag>
+<tag>
+<marker id="string_decode"/><c>{string_decode, boolean()}</c></tag>
 <item>
 <p>
 Whether or not to decode AVPs of type &dict_OctetString; and its
@@ -1031,8 +1040,9 @@ Option passed to &add_transport;.
 Has one of the following types.</p>
 
 <taglist>
-<marker id="applications"/>
-<tag><c>{applications, [&application_alias;]}</c></tag>
+
+<tag>
+<marker id="applications"/><c>{applications, [&application_alias;]}</c></tag>
 <item>
 <p>
 Diameter applications to which the transport should be restricted.
@@ -1050,8 +1060,8 @@ implies having to set matching *-Application-Id AVPs in a
 
 </item>
 
-<marker id="capabilities"/>
-<tag><c>{capabilities, [&capability;]}</c></tag>
+<tag>
+<marker id="capabilities"/><c>{capabilities, [&capability;]}</c></tag>
 <item>
 <p>
 AVPs used to construct outgoing CER/CEA messages.
@@ -1064,8 +1074,8 @@ may be particularly appropriate for Inband-Security-Id, in case
 TLS is desired over TCP as implemented by &man_tcp;.</p>
 </item>
 
-<marker id="capabilities_cb"/>
-<tag><c>{capabilities_cb, &evaluable;}</c></tag>
+<tag>
+<marker id="capabilities_cb"/><c>{capabilities_cb, &evaluable;}</c></tag>
 <item>
 <p>
 Callback invoked upon reception of CER/CEA during capabilities
@@ -1112,8 +1122,8 @@ case the corresponding callbacks are applied until either all return
 <c>ok</c> or one does not.</p>
 </item>
 
-<marker id="capx_timeout"/>
-<tag><c>{capx_timeout, &dict_Unsigned32;}</c></tag>
+<tag>
+<marker id="capx_timeout"/><c>{capx_timeout, &dict_Unsigned32;}</c></tag>
 <item>
 <p>
 Number of milliseconds after which a transport process having an
@@ -1127,8 +1137,8 @@ For a listening transport, the peer determines the timing.</p>
 Defaults to 10000.</p>
 </item>
 
-<marker id="connect_timer"/>
-<tag><c>{connect_timer, Tc}</c></tag>
+<tag>
+<marker id="connect_timer"/><c>{connect_timer, Tc}</c></tag>
 <item>
 <pre>
 Tc = &dict_Unsigned32;
@@ -1158,9 +1168,8 @@ Defaults to 30000 for a connecting transport and 60000 for a listening
 transport.</p>
 </item>
 
-<marker id="disconnect_cb"/>
-<tag><c>{disconnect_cb, &evaluable;}</c></tag>
-
+<tag>
+<marker id="disconnect_cb"/><c>{disconnect_cb, &evaluable;}</c></tag>
 <item>
 <p>
 Callback invoked prior to terminating the transport process of a
@@ -1236,8 +1245,8 @@ configured them.</p>
 Defaults to a single callback returning <c>dpr</c>.</p>
 </item>
 
-<marker id="dpa_timeout"/>
-<tag><c>{dpa_timeout, &dict_Unsigned32;}</c></tag>
+<tag>
+<marker id="dpa_timeout"/><c>{dpa_timeout, &dict_Unsigned32;}</c></tag>
 <item>
 <p>
 Number of milliseconds after which a transport connection is
@@ -1247,8 +1256,8 @@ terminated following an outgoing DPR if DPA is not received.</p>
 Defaults to 1000.</p>
 </item>
 
-<marker id="dpr_timeout"/>
-<tag><c>{dpr_timeout, &dict_Unsigned32;}</c></tag>
+<tag>
+<marker id="dpr_timeout"/><c>{dpr_timeout, &dict_Unsigned32;}</c></tag>
 <item>
 <p>
 Number of milliseconds after which a transport connection is
@@ -1259,8 +1268,8 @@ connection.</p>
 Defaults to 5000.</p>
 </item>
 
-<marker id="length_errors"/>
-<tag><c>{length_errors, exit|handle|discard}</c></tag>
+<tag>
+<marker id="length_errors"/><c>{length_errors, exit|handle|discard}</c></tag>
 <item>
 <p>
 How to deal with errors in the Message Length field of the
@@ -1308,8 +1317,8 @@ the same peer.</p>
 
 </item>
 
-<marker id="spawn_opt"/>
-<tag><c>{spawn_opt, [term()]}</c></tag>
+<tag>
+<marker id="spawn_opt"/><c>{spawn_opt, [term()]}</c></tag>
 <item>
 <p>
 Options passed to &spawn_opt; when spawning a process for an
@@ -1320,15 +1329,15 @@ Options <c>monitor</c> and <c>link</c> are ignored.</p>
 Defaults to the list configured on the service if not specified.</p>
 </item>
 
-<marker id="transport_config"/>
-<tag><c>{transport_config, term()}</c></tag>
+<tag>
+<marker id="transport_config"/><c>{transport_config, term()}</c></tag><item/>
 <tag><c>{transport_config, term(), &dict_Unsigned32; | infinity}</c></tag>
 <item>
 <p>
 Term passed as the third argument to the &transport_start; function of
 the relevant &transport_module; in order to
 start a transport process.
-Defaults to the empty list if unspecified.</p>
+Defaults to the empty list.</p>
 
 <p>
 The 3-tuple form additionally specifies an interval, in milliseconds,
@@ -1349,12 +1358,12 @@ request a connection with one peer over SCTP or another
 To listen on both SCTP and TCP, define one transport for each.</p>
 </item>
 
-<marker id="transport_module"/>
-<tag><c>{transport_module, atom()}</c></tag>
+<tag>
+<marker id="transport_module"/><c>{transport_module, atom()}</c></tag>
 <item>
 <p>
 Module implementing a transport process as defined in &man_transport;.
-Defaults to <c>diameter_tcp</c> if unspecified.</p>
+Defaults to <c>diameter_tcp</c>.</p>
 
 <p>
 Multiple <c>transport_module</c> and &transport_config;
@@ -1369,8 +1378,9 @@ modules in order until one establishes a connection within the
 corresponding timeout (see below) or all fail.</p>
 </item>
 
-<marker id="watchdog_config"/>
-<tag><c>{watchdog_config, [{okay|suspect, non_neg_integer()}]}</c></tag>
+<tag>
+<marker id="watchdog_config"/><c>{watchdog_config,
+                       [{okay|suspect, non_neg_integer()}]}</c></tag>
 <item>
 <p>
 Configuration that alters the behaviour of the watchdog
@@ -1393,8 +1403,8 @@ misbehaving nodes during test.</p>
 </warning>
 </item>
 
-<marker id="watchdog_timer"/>
-<tag><c>{watchdog_timer, TwInit}</c></tag>
+<tag>
+<marker id="watchdog_timer"/><c>{watchdog_timer, TwInit}</c></tag>
 <item>
 <pre>
 TwInit = &dict_Unsigned32;
@@ -1412,7 +1422,7 @@ the callback.</p>
 
 <p>
 An integer value must be at least 6000 as required by RFC 3539.
-Defaults to 30000 if unspecified.</p>
+Defaults to 30000.</p>
 </item>
 
 </taglist>
@@ -1422,10 +1432,10 @@ Unrecognized options are silently ignored but are returned unmodified
 by &service_info; and can be referred to
 in predicate functions passed to &remove_transport;.</p>
 
-<marker id="transport_ref"/>
 </item>
 
-<tag><c>transport_ref() = reference()</c></tag>
+<tag>
+<marker id="transport_ref"/><c>transport_ref() = reference()</c></tag>
 <item>
 <p>
 Reference returned by &add_transport; that
@@ -1682,17 +1692,17 @@ returned.</p>
 
 <taglist>
 
-<tag><c>'Origin-Host'</c></tag>
-<tag><c>'Origin-Realm'</c></tag>
-<tag><c>'Vendor-Id'</c></tag>
-<tag><c>'Product-Name'</c></tag>
-<tag><c>'Origin-State-Id'</c></tag>
-<tag><c>'Host-IP-Address'</c></tag>
-<tag><c>'Supported-Vendor'</c></tag>
-<tag><c>'Auth-Application-Id'</c></tag>
-<tag><c>'Inband-Security-Id'</c></tag>
-<tag><c>'Acct-Application-Id'</c></tag>
-<tag><c>'Vendor-Specific-Application-Id'</c></tag>
+<tag><c>'Origin-Host'</c></tag><item/>
+<tag><c>'Origin-Realm'</c></tag><item/>
+<tag><c>'Vendor-Id'</c></tag><item/>
+<tag><c>'Product-Name'</c></tag><item/>
+<tag><c>'Origin-State-Id'</c></tag><item/>
+<tag><c>'Host-IP-Address'</c></tag><item/>
+<tag><c>'Supported-Vendor'</c></tag><item/>
+<tag><c>'Auth-Application-Id'</c></tag><item/>
+<tag><c>'Inband-Security-Id'</c></tag><item/>
+<tag><c>'Acct-Application-Id'</c></tag><item/>
+<tag><c>'Vendor-Specific-Application-Id'</c></tag><item/>
 <tag><c>'Firmware-Revision'</c></tag>
 <item>
 <p>
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml
index 973b6eb732..dfcd00975b 100644
--- a/lib/diameter/doc/src/diameter_app.xml
+++ b/lib/diameter/doc/src/diameter_app.xml
@@ -90,17 +90,14 @@ is called in response to an incoming Diameter request message.</p>
 
 </list>
 
-</description>
-
-<note>
 <p>
-The arities given for the the callback functions here assume no extra
-arguments.
+The arities for the the callback functions here assume no extra arguments.
 All functions will also be passed any extra arguments configured with
 the callback module itself when calling &mod_start_service;
 and, for the call-specific callbacks, any extra arguments passed to
 &mod_call;.</p>
-</note>
+
+</description>
 
 <!-- ===================================================================== -->
 <!-- ===================================================================== -->
@@ -110,9 +107,8 @@ and, for the call-specific callbacks, any extra arguments passed to
 
 <taglist>
 
-<marker id="capabilities"/>
-
-<tag><c>capabilities() = #diameter_caps{}</c></tag>
+<tag>
+<marker id="capabilities"/><c>capabilities() = #diameter_caps{}</c></tag>
 <item>
 <p>
 A record containing the identities of
@@ -126,9 +122,8 @@ Optional or possibly multiple values are encoded as lists of values,
 mandatory values as the bare value.</p>
 </item>
 
-<marker id="message"/>
-
-<tag><c>message() = &codec_message;</c></tag>
+<tag>
+<marker id="message"/><c>message() = &codec_message;</c></tag>
 <item>
 <p>
 The representation of a Diameter message as passed to
@@ -136,9 +131,8 @@ The representation of a Diameter message as passed to
 
 </item>
 
-<marker id="packet"/>
-
-<tag><c>packet() = &codec_packet;</c></tag>
+<tag>
+<marker id="packet"/><c>packet() = &codec_packet;</c></tag>
 <item>
 <p>
 A container for incoming and outgoing Diameter messages that's passed
@@ -146,25 +140,22 @@ through encode/decode and transport.
 Fields should not be set in return values except as documented.</p>
 </item>
 
-<marker id="peer_ref"/>
-
-<tag><c>peer_ref() = term()</c></tag>
+<tag>
+<marker id="peer_ref"/><c>peer_ref() = term()</c></tag>
 <item>
 <p>
 A term identifying a transport connection with a Diameter peer.</p>
 </item>
 
-<marker id="peer"/>
-
-<tag><c>peer() = {&peer_ref;, &capabilities;}</c></tag>
+<tag>
+<marker id="peer"/><c>peer() = {&peer_ref;, &capabilities;}</c></tag>
 <item>
 <p>
 A tuple representing a Diameter peer connection.</p>
 </item>
 
-<marker id="state"/>
-
-<tag><c>state() = term()</c></tag>
+<tag>
+<marker id="state"/><c>state() = term()</c></tag>
 <item>
 <p>
 The state maintained by the application callback functions
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
index a0313e2877..0117c1c88a 100644
--- a/lib/diameter/doc/src/diameter_codec.xml
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -13,7 +13,8 @@
 <erlref>
 <header>
 <copyright>
-<year>2012</year><year>2016</year>
+<year>2012</year>
+<year>2017</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -53,17 +54,17 @@ communicated to &man_app; callbacks.
 Similarly, outgoing Diameter messages are encoded into binary() before
 being passed to the appropriate &man_transport; module for
 transmission.
-The functions in this module implement this encode/decode.</p>
+The functions documented here implement the default encode/decode.</p>
 
-<note>
+<warning>
 <p>
-Calls to this module are made by diameter itself as a consequence of
-configuration passed to &mod_start_service;.
-The encode/decode functions may also be useful for other purposes (eg.
-test) but the diameter user does not need to call them explicitly when
+The diameter user does not need to call functions here explicitly when
 sending and receiving messages using &mod_call; and the callback
-interface documented in &man_app;.</p>
-</note>
+interface documented in &man_app;: diameter itself provides encode/decode
+as a consequence of configuration passed to &mod_start_service;, and
+the results may differ from those returned by the functions documented
+here, depending on configuration.</p>
+</warning>
 
 <p>
 The &header; and &packet; records below
@@ -88,10 +89,9 @@ files resulting from dictionary file compilation.</p>
 
 <taglist>
 
-<marker id="integers"/>
-
-<tag><c>uint8()&nbsp; = 0..255</c></tag>
-<tag><c>uint24() = 0..16777215</c></tag>
+<tag>
+<marker id="integers"/><c>uint8()&nbsp; = 0..255</c></tag><item/>
+<tag><c>uint24() = 0..16777215</c></tag><item/>
 <tag><c>uint32() = 0..4294967295</c></tag>
 <item>
 <p>
@@ -99,9 +99,8 @@ files resulting from dictionary file compilation.</p>
 headers.</p>
 </item>
 
-<marker id="avp"/>
-
-<tag><c>avp() = #diameter_avp{}</c></tag>
+<tag>
+<marker id="avp"/><c>avp() = #diameter_avp{}</c></tag>
 <item>
 <p>
 The application-neutral representation of an AVP.
@@ -116,9 +115,9 @@ Fields have the following types.</p>
 
 <taglist>
 
-<tag><c>code = uint32()</c></tag>
-<tag><c>is_mandatory = boolean()</c></tag>
-<tag><c>need_encryption = boolean()</c></tag>
+<tag><c>code = uint32()</c></tag><item/>
+<tag><c>is_mandatory = boolean()</c></tag><item/>
+<tag><c>need_encryption = boolean()</c></tag><item/>
 <tag><c>vendor_id = uint32() | undefined</c></tag>
 <item>
 <p>
@@ -167,9 +166,8 @@ Possible types are <c>undefined</c> and the Diameter types:
 
 </item>
 
-<marker id="dictionary"/>
-
-<tag><c>dictionary() = module()</c></tag>
+<tag>
+<marker id="dictionary"/><c>dictionary() = module()</c></tag>
 <item>
 
 <p>
@@ -179,9 +177,8 @@ The interface provided by a dictionary module is an
 implementation detail that may change.</p>
 </item>
 
-<marker id="header"/>
-
-<tag><c>header() = #diameter_header{}</c></tag>
+<tag>
+<marker id="header"/><c>header() = #diameter_header{}</c></tag>
 <item>
 <p>
 The record representation of the Diameter header.
@@ -204,11 +201,11 @@ Fields have the following types.</p>
 
 <taglist>
 
-<tag><c>version = uint8()</c></tag>
-<tag><c>length = uint24()</c></tag>
-<tag><c>cmd_code = uint24()</c></tag>
-<tag><c>application_id = uint32()</c></tag>
-<tag><c>hop_by_hop_id = uint32()</c></tag>
+<tag><c>version = uint8()</c></tag><item/>
+<tag><c>length = uint24()</c></tag><item/>
+<tag><c>cmd_code = uint24()</c></tag><item/>
+<tag><c>application_id = uint32()</c></tag><item/>
+<tag><c>hop_by_hop_id = uint32()</c></tag><item/>
 <tag><c>end_to_end_id = uint32()</c></tag>
 <item>
 <p>
@@ -217,9 +214,9 @@ Hop-by-Hop Identifier and End-to-End Identifier fields of the Diameter
 header.</p>
 </item>
 
-<tag><c>is_request = boolean()</c></tag>
-<tag><c>is_proxiable = boolean()</c></tag>
-<tag><c>is_error = boolean()</c></tag>
+<tag><c>is_request = boolean()</c></tag><item/>
+<tag><c>is_proxiable = boolean()</c></tag><item/>
+<tag><c>is_error = boolean()</c></tag><item/>
 <tag><c>is_retransmitted = boolean()</c></tag>
 <item>
 <p>
@@ -232,9 +229,8 @@ header.</p>
 
 </item>
 
-<marker id="message"/>
-
-<tag><c>message() = record() | list()</c></tag>
+<tag>
+<marker id="message"/><c>message() = record() | list()</c></tag>
 <item>
 <p>
 The representation of a Diameter message as passed to
@@ -257,9 +253,8 @@ question: messages are sent exactly as specified.</p>
 
 </item>
 
-<marker id="packet"/>
-
-<tag><c>packet() = #diameter_packet{}</c></tag>
+<tag>
+<marker id="packet"/><c>packet() = #diameter_packet{}</c></tag>
 <item>
 <p>
 A container for incoming and outgoing Diameter messages.
@@ -296,7 +291,7 @@ corresponding values.</p>
 
 <warning>
 <p>
-A record-valued <c>msg</c> field does <b>not</b> imply an absence of
+A record-valued <c>msg</c> field does <em>not</em> imply an absence of
 decode errors.
 The <c>errors</c> field should also be examined.</p>
 </warning>
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index ae40f99aee..94016d9466 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "fileref.dtd" [
+<!DOCTYPE fileref SYSTEM "fileref.dtd" [
   <!ENTITY format
            '<seealso marker="#FILE_FORMAT">FILE FORMAT</seealso>'>
   <!ENTITY records
@@ -16,7 +16,8 @@
 <header>
 
 <copyright>
-<year>2011</year><year>2016</year>
+<year>2011</year>
+<year>2017</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -121,9 +122,8 @@ The order in which sections are specified is unimportant.</p>
 
 <taglist>
 
-<marker id="id"/>
-
-<tag><c>@id Number</c></tag>
+<tag>
+<marker id="id"/><c>@id Number</c></tag>
 <item>
 <p>
 Defines the integer Number as the Diameter Application Id of the
@@ -146,14 +146,13 @@ Example:</p>
 
 </item>
 
-<marker id="name"/>
-
-<tag><c>@name Mod</c></tag>
+<tag>
+<marker id="name"/><c>@name Mod</c></tag>
 <item>
 <p>
 Defines the name of the generated dictionary module.
 Can occur at most once and defaults to the name of the dictionary file
-minus any extension if unspecified.
+minus any extension.
 The section has empty content.</p>
 
 <p>
@@ -169,9 +168,8 @@ Example:</p>
 
 </item>
 
-<marker id="prefix"/>
-
-<tag><c>@prefix Name</c></tag>
+<tag>
+<marker id="prefix"/><c>@prefix Name</c></tag>
 <item>
 <p>
 Defines Name as the prefix to be added to record and constant names
@@ -194,9 +192,8 @@ Example:</p>
 
 </item>
 
-<marker id="vendor"/>
-
-<tag><c>@vendor Number Name</c></tag>
+<tag>
+<marker id="vendor"/><c>@vendor Number Name</c></tag>
 <item>
 <p>
 Defines the integer Number as the the default Vendor-Id of AVPs for
@@ -216,9 +213,8 @@ Example:</p>
 
 </item>
 
-<marker id="avp_vendor_id"/>
-
-<tag><c>@avp_vendor_id Number</c></tag>
+<tag>
+<marker id="avp_vendor_id"/><c>@avp_vendor_id Number</c></tag>
 <item>
 <p>
 Defines the integer Number as the Vendor-Id of the AVPs listed in the
@@ -238,9 +234,8 @@ Region-Set
 
 </item>
 
-<marker id="inherits"/>
-
-<tag><c>@inherits Mod</c></tag>
+<tag>
+<marker id="inherits"/><c>@inherits Mod</c></tag>
 <item>
 <p>
 Defines the name of a dictionary module containing AVP
@@ -274,9 +269,8 @@ Example:</p>
 </pre>
 </item>
 
-<marker id="avp_types"/>
-
-<tag><c>@avp_types</c></tag>
+<tag>
+<marker id="avp_types"/><c>@avp_types</c></tag>
 <item>
 <p>
 Defines the name, code, type and flags of individual AVPs.
@@ -308,18 +302,17 @@ The P flag has been deprecated by &the_rfc;.</p>
 
 </item>
 
-<marker id="custom_types"/>
-
-<tag><c>@custom_types Mod</c></tag>
+<tag>
+<marker id="custom_types"/><c>@custom_types Mod</c></tag>
 <item>
 <p>
 Specifies AVPs for which module Mod provides encode/decode functions.
 The section contents consists of AVP names.
-For each such name, <c>Mod:Name(encode|decode, Type, Data)</c> is
+For each such name, <c>Mod:Name(encode|decode, Type, Data, Opts)</c> is
 expected to provide encode/decode for values of the AVP, where Name is
 the name of the AVP, Type is it's type as declared in the
-<c>@avp_types</c> section of the dictionary and Data is the value to
-encode/decode.</p>
+<c>@avp_types</c> section of the dictionary, Data is the value to
+encode/decode, and Opts is a term that is passed through encode/decode.</p>
 
 <p>
 Example:</p>
@@ -331,14 +324,13 @@ Framed-IP-Address
 </pre>
 </item>
 
-<marker id="codecs"/>
-
-<tag><c>@codecs Mod</c></tag>
+<tag>
+<marker id="codecs"/><c>@codecs Mod</c></tag>
 <item>
 <p>
 Like <c>@custom_types</c> but requires the specified module to export
-<c>Mod:Type(encode|decode, Name, Data)</c> rather than
-<c>Mod:Name(encode|decode, Type, Data)</c>.</p>
+<c>Mod:Type(encode|decode, Name, Data, Opts)</c> rather than
+<c>Mod:Name(encode|decode, Type, Data, Opts)</c>.</p>
 
 <p>
 Example:</p>
@@ -350,9 +342,8 @@ Framed-IP-Address
 </pre>
 </item>
 
-<marker id="messages"/>
-
-<tag><c>@messages</c></tag>
+<tag>
+<marker id="messages"/><c>@messages</c></tag>
 <item>
 <p>
 Defines the messages of the application.
@@ -397,9 +388,8 @@ RTA ::= &lt; Diameter Header: 287, PXY >
 
 </item>
 
-<marker id="grouped"/>
-
-<tag><c>@grouped</c></tag>
+<tag>
+<marker id="grouped"/><c>@grouped</c></tag>
 <item>
 <p>
 Defines the contents of the AVPs of the application having type
@@ -424,9 +414,8 @@ Specifying a Vendor-Id in the definition of a grouped AVP is
 equivalent to specifying it with <c>@avp_vendor_id</c>.</p>
 </item>
 
-<marker id="enum"/>
-
-<tag><c>@enum Name</c></tag>
+<tag>
+<marker id="enum"/><c>@enum Name</c></tag>
 <item>
 <p>
 Defines values of AVP Name having type Enumerated.
@@ -452,9 +441,8 @@ REMOVE_SIP_SERVER        3
 </pre>
 </item>
 
-<marker id="end"/>
-
-<tag><c>@end</c></tag>
+<tag>
+<marker id="end"/><c>@end</c></tag>
 <item>
 <p>
 Causes parsing of the dictionary to terminate:
diff --git a/lib/diameter/doc/src/diameter_examples.xml b/lib/diameter/doc/src/diameter_examples.xml
index 853ef96bb3..2e1f2b3c03 100644
--- a/lib/diameter/doc/src/diameter_examples.xml
+++ b/lib/diameter/doc/src/diameter_examples.xml
@@ -42,4 +42,3 @@ Example code can be found in the diameter application's
 <c>examples</c> subdirectory.</p>
 
 </chapter>
-
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index 00ccc39c15..6ca280c52b 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -150,7 +150,7 @@ Options <c>binary</c>,
 <c>packet</c> and <c>active</c> cannot be specified.
 Also, option <c>port</c> can be specified for a listening transport
 to specify the local listening port, the default being the standardized
-3868 if unspecified.
+3868.
 Note that the option <c>ip</c> specifies the local address.</p>
 
 <p>
diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml
index 736d4cbfbd..294e8a8864 100644
--- a/lib/diameter/doc/src/diameter_transport.xml
+++ b/lib/diameter/doc/src/diameter_transport.xml
@@ -65,9 +65,8 @@ parent).</p>
 
 <taglist>
 
-<marker id="message"/>
-
-<tag><c>message() = binary() | &codec_packet;</c></tag>
+<tag>
+<marker id="message"/><c>message() = binary() | &codec_packet;</c></tag>
 <item>
 <p>
 A Diameter message as passed over the transport interface.</p>
@@ -160,9 +159,9 @@ It should exit if its transport connection with its peer is lost.</p>
 </funcs>
 
 <!-- ===================================================================== -->
-<marker id="MESSAGES"/>
 
 <section>
+<marker id="MESSAGES"/>
 <title>MESSAGES</title>
 
 <p>
@@ -234,7 +233,7 @@ established a connection with the peer.
 Not sent if the transport process has <c>Type=connect</c>.</p>
 </item>
 
-<tag><c>{diameter, {self(), connected, Remote}}</c></tag>
+<tag><c>{diameter, {self(), connected, Remote}}</c></tag><item/>
 <tag><c>{diameter, {self(), connected, Remote, [LocalAddr]}}</c></tag>
 <item>
 <p>
diff --git a/lib/diameter/doc/src/diameterc.xml b/lib/diameter/doc/src/diameterc.xml
index 5bffe9a771..8f1c660989 100644
--- a/lib/diameter/doc/src/diameterc.xml
+++ b/lib/diameter/doc/src/diameterc.xml
@@ -11,7 +11,7 @@
 <comref>
 <header>
 <copyright>
-<year>2011</year><year>2013</year>
+<year>2011</year><year>2016</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -79,14 +79,14 @@ Write generated source to the specified directory.
 Defaults to the current working directory.</p>
 </item>
 
-<tag><![CDATA[-E]]></tag>
+<tag><![CDATA[-E]]></tag><item/>
 <tag><![CDATA[-H]]></tag>
 <item>
 <p>
 Suppress erl and hrl generation, respectively.</p>
 </item>
 
-<tag><![CDATA[--name <name>]]></tag>
+<tag><![CDATA[--name <name>]]></tag><item/>
 <tag><![CDATA[--prefix <prefix>]]></tag>
 <item>
 <p>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index b1be7bdcf7..60478606ad 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -11,7 +11,7 @@
 <header>
 <copyright>
 <year>2011</year>
-<year>2016</year>
+<year>2017</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -43,6 +43,125 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.0</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Let candidate peers be passed to diameter:call/4</p>
+          <p>
+	    With call option peer, to allow a request to be sent to a
+	    peer that hasn't advertised support for the application
+	    in question.</p>
+          <p>
+	    RFC 6733 2.4 requires a node to send the application
+	    identifiers of all locally supported applications at
+	    capabilities exchange, but not all nodes respect this for
+	    the common application, and diameter itself will send
+	    D[WP][RA] without the common application having been
+	    explicitly advertised. Regarding the common application
+	    as implicit renders Result-Code 5010
+	    (DIAMETER_NO_COMMON_APPLICATION) meaningless however, so
+	    allow any request to be sent as long as there is a
+	    configured dictionary to support it.</p>
+          <p>
+	    Own Id: OTP-14338</p>
+        </item>
+        <item>
+          <p>
+	    Improve performance of message encode/decode and related
+	    handling.</p>
+          <p>
+	    Dictionaries using @custom_types or @codecs will need to
+	    adapt the corresponding functions to accept an additional
+	    argument that is now passed through encode/decode, which
+	    was required to remove various process dictionary-based
+	    workarounds that have been used to solve problems in the
+	    past.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14343</p>
+        </item>
+        <item>
+          <p>
+	    Add transport options to avoid deadlock and allow for
+	    load regulation.</p>
+          <p>
+	    Both diameter_tcp and diameter_sctp now accept two new
+	    configuration options: sender and message_cb. The former
+	    causes outgoing sends to take place in a dedicated
+	    process, to avoid the possibility of deadlock when both
+	    the transport process and its peer block in send. The
+	    latter allows a callback to control the reading of
+	    messages on the socket, to allow for backpressure towards
+	    peers when the rate of incoming traffic is greater than
+	    can otherwise be handled.</p>
+          <p>
+	    Neither of these options are yet documented, but are
+	    unlikely to change unless problems are discovered. The
+	    sender option is not the default since it should probably
+	    always be used in combination with message_cb, to prevent
+	    incoming requests from being read at a higher rate than a
+	    peer allows outgoing answers to be sent.</p>
+          <p>
+	    Own Id: OTP-14455 Aux Id: ERL-332 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 1.12.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An improvement in the handling of peer failover in
+	    diameter 1.12.1 adversely affected performance when
+	    sending requests. Further, the inefficient use of a
+	    public table to route incoming answers has been removed.</p>
+          <p>
+	    Own Id: OTP-14206</p>
+        </item>
+        <item>
+          <p>
+	    Fixed xml issues in old release notes</p>
+          <p>
+	    Own Id: OTP-14269</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 1.12.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Close diameter_tcp/sctp listening sockets at
+	    diameter:stop_service/1.</p>
+          <p>
+	    Broken by OTP-13611.</p>
+          <p>
+	    Own Id: OTP-13787 Aux Id: OTP-13611 </p>
+        </item>
+        <item>
+          <p>
+	    Update build scripts to not make assumtions about where
+	    env, cp and perl are located.</p>
+          <p>
+	    Own Id: OTP-13800</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 1.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -230,8 +349,8 @@ first.</p>
 	    Fix decode of Grouped AVPs containing errors.</p>
           <p>
 	    RFC 6733 says this of Failed-AVP in 7.5:</p>
-          <p>
-	    <taglist><item><p><c> In the case where the offending AVP
+
+	    <taglist><tag></tag><item><p><c> In the case where the offending AVP
 	    is embedded within a Grouped AVP, the Failed-AVP MAY
 	    contain the grouped AVP, which in turn contains the
 	    single offending AVP. The same method MAY be employed if
@@ -240,11 +359,11 @@ first.</p>
 	    the grouped AVP hierarchy up to the single offending AVP.
 	    This enables the recipient to detect the location of the
 	    offending AVP when embedded in a
-	    group.</c></p></item></taglist></p>
+	    group.</c></p></item></taglist>
           <p>
 	    It says this of DIAMETER_INVALID_AVP_LENGTH in 7.1.5:</p>
-          <p>
-	    <taglist><item><p><c> The request contained an AVP with
+
+	    <taglist><tag></tag><item><p><c> The request contained an AVP with
 	    an invalid length. A Diameter message indicating this
 	    error MUST include the offending AVPs within a Failed-AVP
 	    AVP. In cases where the erroneous AVP length value
@@ -259,7 +378,8 @@ first.</p>
 	    the minimum AVP header length, it is sufficient to
 	    include an offending AVP header that is formulated by
 	    padding the incomplete AVP header with zero up to the
-	    minimum AVP header length.</c></p></item></taglist></p>
+	    minimum AVP header length.</c></p></item></taglist>
+
           <p>
 	    The AVPs placed in the errors field of a diameter_packet
 	    record are intended to be appropriate for inclusion in a
@@ -924,8 +1044,8 @@ first.</p>
 	    Be lenient with the M-bit in Grouped AVPs.</p>
           <p>
 	    RFC 6733 says this, in 4.4:</p>
-          <p>
-	    <taglist><item><p><c>Receivers of a Grouped AVP that does
+
+	    <taglist><tag></tag><item><p><c>Receivers of a Grouped AVP that does
 	    not have the 'M' (mandatory) bit set and one or more of
 	    the encapsulated AVPs within the group has the 'M'
 	    (mandatory) bit set MAY simply be ignored if the Grouped
@@ -933,14 +1053,14 @@ first.</p>
 	    encapsulated AVP with its 'M' (mandatory) bit set is
 	    further encapsulated within other sub-groups, i.e., other
 	    Grouped AVPs embedded within the Grouped
-	    AVP.</c></p></item></taglist></p>
+	    AVP.</c></p></item></taglist>
           <p>
 	    The first sentence is mangled but take it to mean this:</p>
-          <p>
-	    <taglist><item><p><c>An unrecognized AVP of type Grouped
+
+	    <taglist><tag></tag><item><p><c>An unrecognized AVP of type Grouped
 	    that does not set the 'M' bit MAY be ignored even if one
 	    of its encapsulated AVPs sets the 'M'
-	    bit.</c></p></item></taglist></p>
+	    bit.</c></p></item></taglist>
           <p>
 	    This is a bit of a non-statement since if the AVP is
 	    unrecognized then its type is unknown. We therefore don't