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_intro.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_intro.xml')
| -rw-r--r-- | lib/diameter/doc/src/diameter_intro.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter_intro.xml b/lib/diameter/doc/src/diameter_intro.xml index 288ebc0c7c..6c1d1910d2 100644 --- a/lib/diameter/doc/src/diameter_intro.xml +++ b/lib/diameter/doc/src/diameter_intro.xml @@ -40,7 +40,7 @@ under the License. The diameter application is an implementation of the Diameter protocol as defined by &the_rfc;. It supports arbitrary Diameter applications by way of a -<em>dictionary</em> interface that allows messages and AVP's to be +<em>dictionary</em> interface that allows messages and AVPs to be defined and input into diameter as configuration. It has support for all roles defined in the RFC: client, server and agent. @@ -69,7 +69,7 @@ interface</seealso>.</p> <p> While a service typically implements a single Diameter node (as identified by an Origin-Host AVP), transports can themselves be -associated with capabilities AVP's so that a single service can be +associated with capabilities AVPs so that a single service can be used to implement more than one Diameter node.</p> <p> |