aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc
diff options
context:
space:
mode:
authorMagnus Lidén <mange@erlang.org>2013-09-17 10:22:16 +0200
committerMagnus Lidén <mange@erlang.org>2013-09-17 10:22:16 +0200
commit5f89a574cb57f94c9d7d45370b5002b1d38147c9 (patch)
treefaa4a449754c8348a8ef06938f8ffe1246ed0b16 /lib/edoc
parent36d4d6fbe37ba9b03a157cdd0e66f3ac28921e0e (diff)
parent20641fe0f2ea745873fc7557448d3a7deb1bd639 (diff)
downloadotp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.gz
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.tar.bz2
otp-5f89a574cb57f94c9d7d45370b5002b1d38147c9.zip
Merge tag 'OTP_R16B02'
The R16B02 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/edoc')
-rw-r--r--lib/edoc/doc/src/notes.xml17
-rw-r--r--lib/edoc/vsn.mk2
2 files changed, 18 insertions, 1 deletions
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index d2ec82efc8..394e7af09c 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -31,6 +31,23 @@
<p>This document describes the changes made to the EDoc
application.</p>
+<section><title>Edoc 0.7.12.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ The encoding of the <c>notes.xml</c> file has been
+ changed from latin1 to utf-8 to avoid future merge
+ problems.</p>
+ <p>
+ Own Id: OTP-11310</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Edoc 0.7.12</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index af2aa2203f..2fcc97e406 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.12
+EDOC_VSN = 0.7.12.1