diff options
| author | Hans Bolinder <[email protected]> | 2011-09-27 09:07:20 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-09-27 09:07:20 +0200 |
| commit | 67e216c86754e7076ffdbb87fec8b48ab0d28e56 (patch) | |
| tree | 9e9b66077d72e611083e66bba35f3270990ca14d /lib/megaco | |
| parent | 0e132c07e92835811e01bec415399916afc3e44d (diff) | |
| parent | adeb8abaca990e6084ee101656832e115579a8ba (diff) | |
| download | otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.gz otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.bz2 otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.zip | |
Merge branch 'dev' into major
* dev:
Improve the generation of man pages
Correct XML files
Diffstat (limited to 'lib/megaco')
| -rw-r--r-- | lib/megaco/doc/src/megaco.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml index b9bf414299..5dd622368c 100644 --- a/lib/megaco/doc/src/megaco.xml +++ b/lib/megaco/doc/src/megaco.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2000</year><year>2010</year> + <year>2000</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -646,7 +646,7 @@ megaco_incr_timer() = #megaco_incr_timer{} segments has not yet been received.</p> <p>When the timer finally expires, a "megaco segments not received" (459) error message is sent to the other side - and the user is notified with a <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the + and the user is notified with a <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> callback function or the return value of the <seealso marker="megaco#call">call</seealso> function. </p> @@ -1165,7 +1165,7 @@ megaco_incr_timer() = #megaco_incr_timer{} <p>When the timer finally expires, a "megaco segments not received" (459) error message is sent to the other side and the user is notified with a - <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the + <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> callback function or the return value of the |