aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2014-03-30 13:35:29 +0200
committerAnders Svensson <[email protected]>2014-03-30 13:35:29 +0200
commitc9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231 (patch)
treeeb0118cfdae1b763e8eb5b8e5f9afadf5ffffffa /lib/diameter/doc
parentd02526929206dadc7c99a7f5e577b8c00803ff8c (diff)
parent5ca206af45b3195233991dfe820e9fb636800a33 (diff)
downloadotp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.tar.gz
otp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.tar.bz2
otp-c9b28ca4c52aa7a76092e1b7b85f69e0dd7b9231.zip
Merge branch 'anders/diameter/17.0_release/OTP-11605'
* anders/diameter/17.0_release/OTP-11605: Move info modules into own subdirectory Include compiler and info modules in app file Remove unused diameter_dbg:log/4 Remove case expecting a pre-R16B return value from os:type/1 Fix doc typo: required -> requires Remove release note unrelated to functionality
Diffstat (limited to 'lib/diameter/doc')
-rw-r--r--lib/diameter/doc/src/diameter_make.xml2
-rw-r--r--lib/diameter/doc/src/notes.xml8
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
index 13ec5bbfc1..0c7e6b794d 100644
--- a/lib/diameter/doc/src/diameter_make.xml
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -52,7 +52,7 @@ under the License.
<p>
The function &codec; is used to compile a diameter
&dictionary; into Erlang source.
-The resulting source implements the interface diameter required
+The resulting source implements the interface diameter requires
to encode and decode the dictionary's messages and AVPs.</p>
<p>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index cd14195e78..e2390df37c 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -11,7 +11,7 @@
<header>
<copyright>
<year>2011</year>
-<year>2013</year>
+<year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -73,12 +73,6 @@ first.</p>
<p>
Own Id: OTP-11361</p>
</item>
- <item>
- <p>
- Fix silent make rules (Thanks to Anthony Ramine)</p>
- <p>
- Own Id: OTP-11514</p>
- </item>
</list>
</section>