aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-09-09 16:23:10 +0200
committerBjörn Gustavsson <[email protected]>2013-09-09 16:23:10 +0200
commit1daca44d2a29f801343210389a5b909e204f2c10 (patch)
tree00b96688b5c0d97ad61fb33df71e0bd0f1922a2d /erts
parentb24c2c478060937c7dfa4cf16c53a5383d4c1fdd (diff)
parent82bc96acf24be36e690225f1adac1854ff693f58 (diff)
downloadotp-1daca44d2a29f801343210389a5b909e204f2c10.tar.gz
otp-1daca44d2a29f801343210389a5b909e204f2c10.tar.bz2
otp-1daca44d2a29f801343210389a5b909e204f2c10.zip
Merge branch 'maint'
* maint: Change encoding of troublesome notes.xml files to utf-8 Convert some notes.xml files from latin-1 to utf-8
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 9920dc3c45..822aceff08 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -321,7 +321,7 @@
<item>
<p>
Support wide characters in the shell through wcwidth().
- Thanks to Anthony Ramine. Reported by Lo�c Hoguin.</p>
+ Thanks to Anthony Ramine. Reported by Loïc Hoguin.</p>
<p>
Own Id: OTP-11088</p>
</item>
@@ -342,7 +342,7 @@
<item>
<p>
Remove 'query' from the list of reserved words in docs.
- Thanks to Matthias Endler and Lo�c Hoguin.</p>
+ Thanks to Matthias Endler and Loïc Hoguin.</p>
<p>
Own Id: OTP-11158</p>
</item>