diff options
author | Anders Svensson <[email protected]> | 2015-03-24 11:03:23 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2015-03-24 11:03:23 +0100 |
commit | 8cad0980fd09b36fe71ee91dd65e56fadb5a22b8 (patch) | |
tree | f3e587be5a8c16ee7f133bfd08f546c001d91cdc /lib/diameter/doc/src/diameter_dict.xml | |
parent | 487446e76102b27fa8df02a353c7fdeec2d091f1 (diff) | |
parent | 79b86a035adb0068e544401104d4c04db8e2b181 (diff) | |
download | otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.tar.gz otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.tar.bz2 otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/doc/src/diameter_dict.xml')
-rw-r--r-- | lib/diameter/doc/src/diameter_dict.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml index 810a146b88..9db9bcffde 100644 --- a/lib/diameter/doc/src/diameter_dict.xml +++ b/lib/diameter/doc/src/diameter_dict.xml @@ -529,6 +529,11 @@ answer record and passed to a &app_handle_request; callback upon reception of an incoming request.</p> <p> +In cases in which there is a choice between list() and binary() types +for OctetString() and derived types, the representation is determined +by the value of &mod_string_decode;.</p> + +<p> <em>Basic AVP Data Formats</em></p> <marker id="OctetString"/> @@ -541,7 +546,7 @@ callback upon reception of an incoming request.</p> <marker id="Grouped"/> <pre> -OctetString() = [0..255] +OctetString() = string() | binary() Integer32() = -2147483647..2147483647 Integer64() = -9223372036854775807..9223372036854775807 Unsigned32() = 0..4294967295 @@ -603,7 +608,7 @@ and <c>{{2104,2,26},{9,42,23}}</c> (both inclusive) can be encoded.</p> <marker id="UTF8String"/> <pre> -UTF8String() = [integer()] +UTF8String() = [integer()] | binary() </pre> <p> |