From 052281e861651dbcb13c6cf3c4898aa57ae65880 Mon Sep 17 00:00:00 2001
From: Micael Karlberg
Date: Wed, 7 Dec 2011 14:43:50 +0100
Subject: Fixed doc make target for (internally used) index.html file. Updated
appup, version and release notes for R15 release.
---
lib/megaco/doc/src/Makefile | 13 ++++++++-----
lib/megaco/doc/src/notes.xml | 31 ++++++++++++++++++++++++++++---
2 files changed, 36 insertions(+), 8 deletions(-)
(limited to 'lib/megaco/doc/src')
diff --git a/lib/megaco/doc/src/Makefile b/lib/megaco/doc/src/Makefile
index f782afc3f6..137f0315d8 100644
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2000-2010. All Rights Reserved.
+# Copyright Ericsson AB 2000-2011. 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
@@ -123,10 +123,13 @@ imgs: $(IMG_FILES:%=$(HTMLDIR)/%)
man: $(MAN3_FILES)
$(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE)
- sed -e 's/%VSN%/$(VSN)/; \
- s/%ERLANG_SITE%/www\.erlang\.se\//; \
- s/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/; \
- s/%OFF_PRINT%/pdf\/megaco-$(VSN).pdf/' $< > $@
+ sed -e 's/%VSN%/$(VSN)/' $< > $@
+
+$(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE)
+ sed -e 's/%VSN%/$(VSN)/' \
+ -e 's/%ERLANG_SITE%/www\.erlang\.se\//' \
+ -e 's/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/' \
+ -e 's/%OFF_PRINT%/pdf\/megaco-$(VSN).pdf/' $< > $@
debug opt:
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index baf8c6a201..5eebf7729d 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,9 +36,9 @@
section is the version number of Megaco.
- Megaco 3.15.1.2
+ Megaco 3.16
- Version 3.15.1.2 supports code replacement in runtime from/to
+
Version 3.16 supports code replacement in runtime from/to
version 3.15.1.1, 3.15.1 and 3.15.
@@ -67,6 +67,13 @@
Own Id: OTP-9679
+ -
+
The flex driver has been updated (along with all other drivers)
+ to support the new driver format. This change may effect the
+ ability to build and/or use the driver without reentrant support.
+ Own Id: OTP-NNNN
+
+
@@ -88,7 +95,25 @@
-
+
+ Incompatibilities
+
+
+
+ -
+
Due to the change in the flex driver API,
+ we may no longer be able to build and/or use
+ the flex driver without reentrant support.
+ Own Id: OTP-NNNN
+
+
+
+
+
+
+
Megaco 3.15.1.1
--
cgit v1.2.3
From 7cf22790eb116d7f387d1c014291c77da7372136 Mon Sep 17 00:00:00 2001
From: Micael Karlberg
Date: Wed, 7 Dec 2011 17:29:07 +0100
Subject: Added ticket number. OTP-9795
---
lib/megaco/doc/src/notes.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'lib/megaco/doc/src')
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 5eebf7729d..8869d13234 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -71,7 +71,7 @@
The flex driver has been updated (along with all other drivers)
to support the new driver format. This change may effect the
ability to build and/or use the driver without reentrant support.
- Own Id: OTP-NNNN
+ Own Id: OTP-9795
@@ -106,7 +106,7 @@
Due to the change in the flex driver API,
we may no longer be able to build and/or use
the flex driver without reentrant support.
- Own Id: OTP-NNNN
+ Own Id: OTP-9795
--
cgit v1.2.3