diff options
| author | Björn Gustavsson <[email protected]> | 2013-09-09 16:23:10 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-09-09 16:23:10 +0200 |
| commit | 1daca44d2a29f801343210389a5b909e204f2c10 (patch) | |
| tree | 00b96688b5c0d97ad61fb33df71e0bd0f1922a2d | |
| parent | b24c2c478060937c7dfa4cf16c53a5383d4c1fdd (diff) | |
| parent | 82bc96acf24be36e690225f1adac1854ff693f58 (diff) | |
| download | otp-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
| -rw-r--r-- | erts/doc/src/notes.xml | 4 | ||||
| -rw-r--r-- | lib/et/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/hipe/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/reltool/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/snmp/doc/src/notes.xml | 2 |
5 files changed, 6 insertions, 6 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> diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml index 7b9d3fcf81..a34dd4a541 100644 --- a/lib/et/doc/src/notes.xml +++ b/lib/et/doc/src/notes.xml @@ -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> diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml index 52c5e068e1..86e10a06fc 100644 --- a/lib/hipe/doc/src/notes.xml +++ b/lib/hipe/doc/src/notes.xml @@ -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> diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml index 8aaf4cc5d3..1728515cb4 100644 --- a/lib/reltool/doc/src/notes.xml +++ b/lib/reltool/doc/src/notes.xml @@ -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 553bd79a4d..7514c52dda 100644 --- a/lib/snmp/doc/src/notes.xml +++ b/lib/snmp/doc/src/notes.xml @@ -214,7 +214,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> |