From d7ce2d9b68ba83e46100a97aaf56c0ca09899525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Fri, 6 Sep 2013 10:03:56 +0200
Subject: Convert some notes.xml files from latin-1 to utf-8

In the master branch, the encoding for most xml files have been
changed from latin-1 to utf-8. The problem is, that the corresponding
files in the maint branch still are encoded in latin-1, and that
a merge from maint to master may bring in characters encoded in latin-1
into a notes.xml file declared to be in utf-8.

To fix the problem once and for all (for the files involved), we'll
need to re-encode the files files utf-8 in maint, and then merge to
master.

Noticed-by: Magnus Henoch
---
 lib/et/doc/src/notes.xml      | 6 +++---
 lib/hipe/doc/src/notes.xml    | 6 +++---
 lib/reltool/doc/src/notes.xml | 4 ++--
 lib/snmp/doc/src/notes.xml    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index d45d0a89bf..a34dd4a541 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -43,7 +43,7 @@
         <item>
           <p>
 	    Use erlang:demonitor(Ref, [flush]) where applicable.
-	    Thanks to Loïc Hoguin.</p>
+	    Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11039</p>
         </item>
@@ -82,7 +82,7 @@
       <list>
         <item>
           <p>
-	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jiménez)</p>
+	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-10119</p>
         </item>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index b3c41bd396..86e10a06fc 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -37,7 +37,7 @@
         <item>
           <p>
 	    Fix the title of hipe_app documentation page. Thanks to
-	    Loïc Hoguin.</p>
+	    Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-10904</p>
         </item>
@@ -76,7 +76,7 @@
           <p>
 	    Fix bug in hipe compiled code related to the handling of
 	    <c>is_number/1</c>. (Thanks to Sebastian Egner and
-	    Johannes Weißl for minimal test code and Kostis for quick
+	    Johannes Weißl for minimal test code and Kostis for quick
 	    patch)</p>
           <p>
 	    Own Id: OTP-10897</p>
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 598d3333f8..1728515cb4 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -61,7 +61,7 @@
 	    even if the application was explicitly excluded in the
 	    config. This has been changed and will only produce a
 	    warning. If the application is not explicitly excluded it
-	    will still cause reltool to fail. Thanks to Håkan
+	    will still cause reltool to fail. Thanks to HÃ¥kan
 	    Mattsson!</p>
           <p>
 	    Own Id: OTP-10988</p>
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 21c417f0c1..8c4452fb9e 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -147,7 +147,7 @@
 	  <seealso marker="snmpa_mib_storage">mib storage</seealso>. 
 	  At present there are three simple modules 
 	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
-	  <c>snmpa_mib_storage_mnesia</c>) implementíng this behaviour, 
+	  <c>snmpa_mib_storage_mnesia</c>) implementing this behaviour,
 	  provided with the app. </p>
 	  <p>A config option for the (agent) 
 	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso> 
-- 
cgit v1.2.3