diff options
| author | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-12-02 09:45:00 +0100 |
| commit | 22ae0b2bd6fbe973915b19551c7d6a397a8c8a60 (patch) | |
| tree | 58ced6a6e5e434741a2bfcae26d246206e3f4d7b /lib/diameter/doc/src/diameter_app.xml | |
| parent | 0f2458596200b5567b06c626254e2c3477ccfabf (diff) | |
| parent | 5994bd25093d42be188564eda2e22c05aa9ad486 (diff) | |
| download | otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.gz otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.tar.bz2 otp-22ae0b2bd6fbe973915b19551c7d6a397a8c8a60.zip | |
Merge branch 'anders/diameter/R16B03_release/OTP-11499' into maint
* anders/diameter/R16B03_release/OTP-11499:
vsn -> 1.5
Update appup for OTP-11168
Update appup for OTP-11361
Add makefile to build example dictionaries
Add recent Diameter-related RFCs
Generate diameterc.1, not diameter_compile.1
Fix documentation typos
Fix appup blunder
Diffstat (limited to 'lib/diameter/doc/src/diameter_app.xml')
| -rw-r--r-- | lib/diameter/doc/src/diameter_app.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml index e6c9cc9a90..0b6839dcb2 100644 --- a/lib/diameter/doc/src/diameter_app.xml +++ b/lib/diameter/doc/src/diameter_app.xml @@ -308,7 +308,7 @@ The return value <c>{Peer, NewState}</c> is only allowed if the Diameter application in question was configured with the &mod_application_opt; <c>{call_mutates_state, true}</c>. Otherwise, the <c>State</c> argument is always -the intial value as configured on the application, not any subsequent +the initial value as configured on the application, not any subsequent value returned by a &peer_up; or &peer_down; callback.</p> </warning> @@ -565,7 +565,7 @@ Equivalent to</p> </pre> <p> where <c>Avps</c> sets the Origin-Host, Origin-Realm, the specified -Result-Code and (if the request contained one) Session-Id AVP's, and +Result-Code and (if the request contained one) Session-Id AVPs, and possibly Failed-AVP as described below.</p> <p> |