diff options
| author | Anders Svensson <[email protected]> | 2013-02-23 11:01:46 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-02-23 11:01:46 +0100 |
| commit | df465d70c5e7833a393fea02eabf477bbe6c542b (patch) | |
| tree | 902bb838db4c047d6b026373c9b7085530bcab89 /lib/diameter/doc/src/diameter_soc.xml | |
| parent | e23e5d906dcb5168697270a50ea765e480248faf (diff) | |
| parent | acb318e1d702d6ea9ca79257abd09473c091fc9f (diff) | |
| download | otp-df465d70c5e7833a393fea02eabf477bbe6c542b.tar.gz otp-df465d70c5e7833a393fea02eabf477bbe6c542b.tar.bz2 otp-df465d70c5e7833a393fea02eabf477bbe6c542b.zip | |
Merge branch 'anders/diameter/SoC/OTP-10688'
* anders/diameter/SoC/OTP-10688:
Add RFC 6733 commentary to SoC chapter
Add RFC 6737 Capabilities Update dictionary
Remove cruft from doc Makefile
Diffstat (limited to 'lib/diameter/doc/src/diameter_soc.xml')
| -rw-r--r-- | lib/diameter/doc/src/diameter_soc.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/diameter/doc/src/diameter_soc.xml b/lib/diameter/doc/src/diameter_soc.xml index 16f6b9d5bb..4f5419122f 100644 --- a/lib/diameter/doc/src/diameter_soc.xml +++ b/lib/diameter/doc/src/diameter_soc.xml @@ -4,12 +4,12 @@ %also; ]> -<chapter> +<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> <header> <copyright> <year>2011</year> -<year>2012</year> +<year>2013</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> @@ -80,6 +80,8 @@ just be unnecessary configuration of a value that it has no control over.</p> </list> +<xi:include href="diameter_soc_rfc6733.xml"/> + </section> <!-- ===================================================================== --> |