From f91fcac6739141af4bb66a97dfdaaccdcd74f50b Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Tue, 2 Feb 2010 13:29:22 +0000 Subject: OTP-8317 & OTP-8362. --- lib/megaco/doc/src/Makefile | 20 ++++++++----- lib/megaco/doc/src/megaco_codec_transform.xml | 27 ++++++++--------- lib/megaco/doc/src/megaco_debug.xml | 28 +++++++++--------- lib/megaco/doc/src/megaco_performance.xml | 18 ++++++------ lib/megaco/doc/src/notes.xml | 42 ++++++++------------------- 5 files changed, 62 insertions(+), 73 deletions(-) (limited to 'lib/megaco/doc/src') diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile index 2c55e92914..a82256b372 100644 --- a/lib/megaco/doc/src/Makefile +++ b/lib/megaco/doc/src/Makefile @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 2000-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 2000-2010. All Rights Reserved. +# # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% include $(ERL_TOP)/make/target.mk @@ -49,6 +49,9 @@ include files.mk # ---------------------------------------------------- +XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \ + $(XML_PART_FILES) $(XML_CHAPTER_FILES) + INTERNAL_HTML_FILES = $(TECHNICAL_DESCR_FILES:%.xml=$(HTMLDIR)/%.html) HTML_APP_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) @@ -104,8 +107,11 @@ INDEX_SRC = $(INDEX_FILE).src INDEX_TARGET = $(DOCDIR)/$(INDEX_FILE) STANDARD_DIR = ../standard -STANDARDS = $(STANDARD_DIR)/rfc3015.txt \ - $(STANDARD_DIR)/implementors_guide_v6.pdf +STANDARDS = $(STANDARD_DIR)/rfc3266.txt \ + $(STANDARD_DIR)/rfc3525.txt \ + $(STANDARD_DIR)/rfc4234.txt \ + $(STANDARD_DIR)/rfc4566.txt \ + $(STANDARD_DIR)/implementors_guide_v10-13.pdf # ---------------------------------------------------- # FLAGS diff --git a/lib/megaco/doc/src/megaco_codec_transform.xml b/lib/megaco/doc/src/megaco_codec_transform.xml index 71f7fc689f..89ed3fd654 100644 --- a/lib/megaco/doc/src/megaco_codec_transform.xml +++ b/lib/megaco/doc/src/megaco_codec_transform.xml @@ -4,7 +4,7 @@
- 20022009 + 20022010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + megaco_codec_transform @@ -36,8 +36,8 @@

This module implements a simple megaco message transformation utility.

-

Note that this module is not included in the runtime part of - the application.

+

Note that this module is not included in the + runtime part of the application.

 @@ -51,15 +51,16 @@ MessagePackage = atom() -

Export the messages in the MessagePackage (default is time_test).

-

The out produced by this function is a directory structure with the - following structure:

+

Export the messages in the MessagePackage (default + is time_test).

+

The output produced by this function is a directory structure + with the following structure:

/pretty/ -\011 compact/ -\011 per/ -\011 ber/ -\011 erlang/ +/pretty/ + compact/ + per/ + ber/ + erlang/ ]]> diff --git a/lib/megaco/doc/src/megaco_debug.xml b/lib/megaco/doc/src/megaco_debug.xml index 1b99985341..2523a3be86 100644 --- a/lib/megaco/doc/src/megaco_debug.xml +++ b/lib/megaco/doc/src/megaco_debug.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Testing and tools @@ -159,12 +159,12 @@

When run as above (this will take some time), the measurement process is done as follows:

-\011  For each codec:
-\011      For each message:
-\011          Read the message from the file
-\011               Detect message version
-\011               Measure decode
-                       Measure encode
+For each codec:
+    For each message:
+        Read the message from the file
+            Detect message version
+            Measure decode
+                Measure encode
           Write results, encode, decode and total, to file
@@ -218,11 +218,11 @@ message() = binary() with the following structure:

/pretty/ -\011 compact/ -\011 per/ -\011 ber/ -\011 erlang/ +/pretty/ + compact/ + per/ + ber/ + erlang/ ]]>

The file includes both version 1, 2 and version 3 messages.

diff --git a/lib/megaco/doc/src/megaco_performance.xml b/lib/megaco/doc/src/megaco_performance.xml index b34ee4f389..72b5c156ba 100644 --- a/lib/megaco/doc/src/megaco_performance.xml +++ b/lib/megaco/doc/src/megaco_performance.xml @@ -4,7 +4,7 @@
- 20022009 + 20022010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Performance comparison @@ -257,12 +257,12 @@ MEGACO/1 [124.124.124.222] Transaction = 9998 { Context = - { ServiceChange = ROOT { - \011Services { - \011 Method = Restart, - \011 ServiceChangeAddress = 55555, - \011 Profile = ResGW/1, - \011 Reason = "901 MG Cold Boot" - \011} + Services { + Method = Restart, + ServiceChangeAddress = 55555, + Profile = ResGW/1, + Reason = "901 MG Cold Boot" + } } } } diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml index bacb7275d7..61f3611029 100644 --- a/lib/megaco/doc/src/notes.xml +++ b/lib/megaco/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20002009 + 20002010 Ericsson AB. All Rights Reserved. @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Megaco Release Notes @@ -36,27 +36,27 @@ section is the version number of Megaco.

- Megaco 3.13.0.1 + Megaco 3.13.0.2 -

Version 3.13.0.1 supports code replacement in runtime from/to +

Version 3.13.0.2 supports code replacement in runtime from/to version 3.13, 3.12 and 3.11.3.

Improvements and new features + -
@@ -75,25 +75,7 @@
-
- Incompatibilities -

-

- - - -
- +
-- cgit v1.2.3