aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-06-15 17:44:30 +0200
committerErlang/OTP <[email protected]>2010-06-15 17:44:30 +0200
commitc1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a (patch)
tree57bbee79eb46cc0945c3a56b157333bc60f8bbbf /lib
parent8495f694672a2bb6d1a4a25f9a93aab5c9fc916b (diff)
downloadotp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.tar.gz
otp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.tar.bz2
otp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.zip
The R14A releaseOTP_R14A
Final merge of all unexpected differences from dev to release.
Diffstat (limited to 'lib')
-rw-r--r--lib/erl_docgen/doc/src/notes.xml20
-rw-r--r--lib/erl_docgen/priv/xsl/db_man.xsl10
-rw-r--r--lib/erl_docgen/vsn.mk2
-rw-r--r--lib/kernel/doc/src/notes.xml31
-rw-r--r--lib/kernel/vsn.mk4
5 files changed, 63 insertions, 4 deletions
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index ee74e598d9..ce6ba3d923 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -29,7 +29,25 @@
<file>notes.xml</file>
</header>
<p>This document describes the changes made to the erl_docgen application.</p>
- <section><title>Erl_Docgen 0.2</title>
+ <section><title>erl_docgen 0.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The text within code examples (CODE and PRE tags) will not be
+ space normalized for man pages.
+ </p>
+ <p>
+ Own Id: OTP-8476
+ </p>
+ </item>
+ </list>
+ </section>
+
+ </section>
+
+ <section><title>erl_docgen 0.2</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index a2b1e755e2..71c4a66707 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -336,6 +336,16 @@
<xsl:text>&gt;</xsl:text>
</xsl:template>
+ <!-- Do not noramlize any text within pre and code tags. -->
+ <xsl:template match="pre/text()">
+ <xsl:value-of select="."/>
+ </xsl:template>
+
+ <xsl:template match="code/text()">
+ <xsl:value-of select="."/>
+ </xsl:template>
+
+
<!-- Replace ' by \&' ans . by \&. -->
<xsl:template match="text()">
<xsl:variable name="startstring">
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index dd74ae9ddd..5b14051034 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -17,6 +17,6 @@
# %CopyrightEnd%
#
-ERL_DOCGEN_VSN = 0.2
+ERL_DOCGEN_VSN = 0.2.1
TICKETS =
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index cd98d356bd..b503716037 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -114,6 +114,37 @@
</section>
+<section><title>Kernel 2.13.5.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ A bug introduced in Kernel 2.13.5.2 has been fixed.</p>
+ <p>
+ Own Id: OTP-8686 Aux Id: OTP-8643</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Kernel 2.13.5.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Under certain circumstances the net kernel could hang.
+ (Thanks to Scott Lystig Fritchie.)</p>
+ <p>
+ Own Id: OTP-8643 Aux Id: seq11584</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 2.13.5.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 64a358f114..7dd99b37dd 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1,4 +1,4 @@
-#
+#
# %CopyrightBegin%
#
# Copyright Ericsson AB 1997-2010. All Rights Reserved.
@@ -15,6 +15,6 @@
# under the License.
#
# %CopyrightEnd%
-#
+#
KERNEL_VSN = 2.14