aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/diameter_codec.xml
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-08-18 11:00:57 +0200
committerAnders Svensson <[email protected]>2017-08-18 11:00:57 +0200
commit770454f0a32fbc0714c6762ed3e4d761b799814f (patch)
treedc5613f518bc50e768fb03336cdc5b96685bb58f /lib/diameter/doc/src/diameter_codec.xml
parent91318cd5576a3283cd0dbc263e846fad55010f89 (diff)
parentf392006644991074d2c4d5055773409c5e0503d7 (diff)
downloadotp-770454f0a32fbc0714c6762ed3e4d761b799814f.tar.gz
otp-770454f0a32fbc0714c6762ed3e4d761b799814f.tar.bz2
otp-770454f0a32fbc0714c6762ed3e4d761b799814f.zip
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/doc/src/diameter_codec.xml')
-rw-r--r--lib/diameter/doc/src/diameter_codec.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
index 0117c1c88a..0846334d23 100644
--- a/lib/diameter/doc/src/diameter_codec.xml
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -230,7 +230,8 @@ header.</p>
</item>
<tag>
-<marker id="message"/><c>message() = record() | list()</c></tag>
+<marker id="message"/><c>message() = record()
+ | maybe_improper_list()</c></tag>
<item>
<p>
The representation of a Diameter message as passed to
@@ -240,7 +241,11 @@ a message as defined in a dictionary file is encoded as a record with
one field for each component AVP.
Equivalently, a message can also be encoded as a list whose head is
the atom-valued message name (as specified in the relevant dictionary
-file) and whose tail is a list of <c>{AvpName, AvpValue}</c> pairs.</p>
+file) and whose tail is either a list of AVP name/values
+pairs or a map with values keyed on AVP names.
+The format at decode is determined by &mod_service_opt;
+<c>decode_format</c>.
+Any of the formats is accepted at encode.</p>
<p>
Another list-valued representation allows a message to be specified