4 files changed, 11 insertions, 7 deletions
diff --git a/lib/xmerl/doc/src/motorcycles_dtd.txt b/lib/xmerl/doc/src/motorcycles_dtd.txt
index bab0d563f0..62ad4ac5fe 100644
--- a/lib/xmerl/doc/src/motorcycles_dtd.txt
+++ b/lib/xmerl/doc/src/motorcycles_dtd.txt
@@ -15,4 +15,5 @@
 <!ELEMENT date              (#PCDATA)>
 <!ATTLIST  bike year NMTOKEN #REQUIRED
                 color NMTOKENS #REQUIRED
-                condition (useless | bad | serviceable | moderate | good | excellent | new | outstanding) "excellent" >
+                condition (useless | bad | serviceable | moderate | good |
+                           excellent | new | outstanding) "excellent" >
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 05431a5fd2..883153628c 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -461,7 +462,7 @@ hook(X, State) ->
 event(_X, S) ->
     S.
 
-%% The acc/3 function can return either {Acc�, S'} or {Acc', Pos', S'},
+%% The acc/3 function can return either {Acc´, S'} or {Acc', Pos', S'},
 %% where Pos' can be derived from X#xmlElement.pos, X#xmlText.pos, or
 %% X#xmlAttribute.pos (whichever is the current object type.)
 %% The acc/3 function is not allowed to redefine the type of object
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index 78d84d23a4..ffe227c671 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -849,7 +850,7 @@ element_content({import,S=#xsd_state{schema_name=ThisSchema,
     SchemaLocation = get_attribute_value(schemaLocation,I,absent),
     %% If SchemaLocation is absent, the identification of that schema
     %% is leaved to the instance, application or user, via the
-    %% mechanisms described ��4.3 in XML Schema Part 1.
+    %% mechanisms described §4.3 in XML Schema Part 1.
     
     S2 = process_external_schema_once(SchemaLocation,Namespace,S),
     {{import,[]},S2#xsd_state{schema_name=ThisSchema,
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 55b6d1844c..e21355f877 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -1,7 +1,8 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -531,8 +532,8 @@ ticket_7430(Config) ->
 		   {xmlElement,a,a,[],
 		    {xmlNamespace,[],[]},
 		    [],1,[],
-		    [{xmlText,[{a,1}],1,[],"�",text},
-		     {xmlText,[{a,1}],2,[],"\n�",text}],
+		    [{xmlText,[{a,1}],1,[],"é",text},
+		     {xmlText,[{a,1}],2,[],"\né",text}],
 		    [],_,undeclared} ->
 		       ok;
 		   _ ->