From afb632d2028fdc4a37e10e41e1929264ff59f52e Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 14 Mar 2013 09:53:33 +0100 Subject: Convert XML files to UTF-8, where needed --- lib/xmerl/doc/src/notes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/xmerl/doc/src') diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml index 1de854860c..50cae7be10 100644 --- a/lib/xmerl/doc/src/notes.xml +++ b/lib/xmerl/doc/src/notes.xml @@ -1,4 +1,4 @@ - + @@ -76,7 +76,7 @@

Add missing spaces in xmerl doc (Thanks to Ricardo - Catalinas Jim�nez)

+ Catalinas Jiménez)

Own Id: OTP-9873

 -- cgit v1.2.3 From e5875001247e6a6ac4f474157a51a8c54f94ae49 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 14 Mar 2013 16:01:25 +0100 Subject: Convert XML files to UTF-8 --- lib/xmerl/doc/src/book.xml | 4 ++-- lib/xmerl/doc/src/fascicules.xml | 2 +- lib/xmerl/doc/src/notes.xml | 2 +- lib/xmerl/doc/src/notes_history.xml | 4 ++-- lib/xmerl/doc/src/part.xml | 4 ++-- lib/xmerl/doc/src/part_notes.xml | 4 ++-- lib/xmerl/doc/src/ref_man.xml | 4 ++-- lib/xmerl/doc/src/xmerl_sax_parser.xml | 4 ++-- lib/xmerl/doc/src/xmerl_ug.xmlsrc | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'lib/xmerl/doc/src') diff --git a/lib/xmerl/doc/src/book.xml b/lib/xmerl/doc/src/book.xml index d46d37cf85..128a870628 100644 --- a/lib/xmerl/doc/src/book.xml +++ b/lib/xmerl/doc/src/book.xml @@ -1,10 +1,10 @@ - +
- 20042009 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/xmerl/doc/src/fascicules.xml b/lib/xmerl/doc/src/fascicules.xml index 0678195e07..37feca543f 100644 --- a/lib/xmerl/doc/src/fascicules.xml +++ b/lib/xmerl/doc/src/fascicules.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml index 50cae7be10..90b633d1eb 100644 --- a/lib/xmerl/doc/src/notes.xml +++ b/lib/xmerl/doc/src/notes.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/xmerl/doc/src/notes_history.xml b/lib/xmerl/doc/src/notes_history.xml index a8f7d8b3a6..6afd07fa56 100644 --- a/lib/xmerl/doc/src/notes_history.xml +++ b/lib/xmerl/doc/src/notes_history.xml @@ -1,11 +1,11 @@ - +
2006 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/xmerl/doc/src/part.xml b/lib/xmerl/doc/src/part.xml index 8a544ad3b0..3567fe4a21 100644 --- a/lib/xmerl/doc/src/part.xml +++ b/lib/xmerl/doc/src/part.xml @@ -1,10 +1,10 @@ - +
- 20042009 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/xmerl/doc/src/part_notes.xml b/lib/xmerl/doc/src/part_notes.xml index b3c0597323..ace667deb9 100644 --- a/lib/xmerl/doc/src/part_notes.xml +++ b/lib/xmerl/doc/src/part_notes.xml @@ -1,10 +1,10 @@ - +
- 20042011 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/xmerl/doc/src/ref_man.xml b/lib/xmerl/doc/src/ref_man.xml index 4b79d75d47..db35552845 100644 --- a/lib/xmerl/doc/src/ref_man.xml +++ b/lib/xmerl/doc/src/ref_man.xml @@ -1,10 +1,10 @@ - +
- 20042009 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml index eb22711a75..4af55066eb 100644 --- a/lib/xmerl/doc/src/xmerl_sax_parser.xml +++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml @@ -1,11 +1,11 @@ - +
2008 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/xmerl/doc/src/xmerl_ug.xmlsrc b/lib/xmerl/doc/src/xmerl_ug.xmlsrc index 8a0805020e..92d843bc72 100644 --- a/lib/xmerl/doc/src/xmerl_ug.xmlsrc +++ b/lib/xmerl/doc/src/xmerl_ug.xmlsrc @@ -1,10 +1,10 @@ - +
- 20042012 + 20042013 Ericsson AB. All Rights Reserved. -- cgit v1.2.3 From b20d0ac04fc8153d1c14e707f9424a7f742cf167 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Tue, 6 Aug 2013 17:12:25 +0200 Subject: xmerl: fix typos --- lib/xmerl/doc/src/xmerl_ug.xmlsrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/xmerl/doc/src') diff --git a/lib/xmerl/doc/src/xmerl_ug.xmlsrc b/lib/xmerl/doc/src/xmerl_ug.xmlsrc index 8a0805020e..10c770c400 100644 --- a/lib/xmerl/doc/src/xmerl_ug.xmlsrc +++ b/lib/xmerl/doc/src/xmerl_ug.xmlsrc @@ -409,9 +409,9 @@ Data = specification but the basic functionality. For all details see the reference manual

First, some words about the xmerl_xs functionality:

-

You need to wright template functions to be able to control +

You need to write template functions to be able to control what kind of output you want. Thus if you want to encapsulate a - bike element in <p> tags you simply wright a + bike element in <p> tags you simply write a function:

 template(E = #xmlElement{name='bike'}) ->
-- 
cgit v1.2.3


From 20641fe0f2ea745873fc7557448d3a7deb1bd639 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Mon, 16 Sep 2013 20:11:53 +0200
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 1de854860c..be4b4bcb4f 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,22 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.4
+
+    
Improvements and New Features
+      
+        
+          

+	    Fixed various typos in xmerl documentation. Thanks to
+	    David Welton.

+          

+	    Own Id: OTP-11224

+        
+      
+    

+
+

+
 
Xmerl 1.3.3
 
     
Improvements and New Features
-- 
cgit v1.2.3


From 25237481ccccd3ddfa74582dc267632ad618ba30 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Mon, 9 Dec 2013 20:12:33 +0100
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index be4b4bcb4f..3a217aa8b1 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,29 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.5
+
+    
Improvements and New Features
+      
+        
+          

+	    Teach xmerl_xpath to resolve context namespaces in more
+	    cases. Thanks to Daniel White.

+          

+	    Own Id: OTP-11461

+        
+        
+          

+	    Avoid serialization on code_server in xmerl:export().
+	    Thanks to Richard Carlsson.

+          

+	    Own Id: OTP-11463

+        
+      
+    

+
+

+
 
Xmerl 1.3.4
 
     
Improvements and New Features
-- 
cgit v1.2.3


From 23790daf1a2d384b0fc11c655fa825151d9fa420 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Fri, 24 Jan 2014 12:30:47 +0100
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 3a217aa8b1..60cab9e341 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,35 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.6
+
+    
Fixed Bugs and Malfunctions
+      
+        
+	    
 Fixed a problem in the SAX parser when the header of
+	    the next document was appearing in the buffer when using
+	    xmerl_sax_parser:stream/2 function. 

+          

+	    Own Id: OTP-11551 Aux Id: seq12505 

+        
+      
+    

+
+
+    
Improvements and New Features
+      
+        
+	    
 The default encoding of Erlang files has been changed
+	    from ISO-8859-1 to UTF-8. 
 
 The encoding of XML
+	    files has also been changed to UTF-8. 

+          

+	    Own Id: OTP-10907

+        
+      
+    

+
+

+
 
Xmerl 1.3.5
 
     
Improvements and New Features
-- 
cgit v1.2.3


From f719d0fe308f00b85f92c29d7cdf9b0dc20d98a2 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Mon, 7 Apr 2014 19:52:48 +0200
Subject: Update release notes

---
 lib/xmerl/doc/src/notes.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index b020b9bfa3..3fa1f01a79 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,35 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.7
+
+    
Fixed Bugs and Malfunctions
+      
+        
+          

+	    Application upgrade (appup) files are corrected for the
+	    following applications: 

+          

+	    asn1, common_test, compiler, crypto, debugger,
+	    dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe,
+	    inets, observer, odbc, os_mon, otp_mibs, parsetools,
+	    percept, public_key, reltool, runtime_tools, ssh,
+	    syntax_tools, test_server, tools, typer, webtool, wx,
+	    xmerl

+          

+	    A new test utility for testing appup files is added to
+	    test_server. This is now used by most applications in
+	    OTP.

+          

+	    (Thanks to Tobias Schlager)

+          

+	    Own Id: OTP-11744

+        
+      
+    

+
+

+
 
Xmerl 1.3.6
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 03f50a2936f89f61dbdbb664ccd22b45675c74a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= 
Date: Sun, 22 Jun 2014 14:18:41 +0200
Subject: xmerl: Fix xmerl example motorcycle2html

* Update obsolete guards
* Use -include_lib to make the example compilable
---
 lib/xmerl/doc/src/motorcycles2html.erl | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/motorcycles2html.erl b/lib/xmerl/doc/src/motorcycles2html.erl
index dfbd19e359..45c713e1ac 100644
--- a/lib/xmerl/doc/src/motorcycles2html.erl
+++ b/lib/xmerl/doc/src/motorcycles2html.erl
@@ -7,7 +7,7 @@
 %%%-------------------------------------------------------------------
 -module(motorcycles2html).
 
--include("xmerl.hrl").
+-include_lib("xmerl/include/xmerl.hrl").
 
 -import(xmerl_xs, 
 	[ xslapply/2, value_of/1, select/2, built_in_rules/2 ]).
@@ -57,12 +57,12 @@ template(E) -> built_in_rules(fun template/1, E).
 %% sorts on the bike name element, unwraps the bike information and
 %% inserts a line feed and indentation on each bike element.
 sort_by_manufacturer(L) ->
-    Tuples=[X1||X1={H,T} <- L],
+    Tuples=[X1||X1={_,_} <- L],
     SortedTS = lists:keysort(1,Tuples),
     InsertRefName_UnWrap=
 	fun([{[Name],V}|Rest],Name,F)->
 		[V|F(Rest,Name,F)];
-	   ([{[Name],V}|Rest],PreviousName,F) ->
+	   ([{[Name],V}|Rest],_PreviousName,F) ->
 		[[""],V|F(Rest,Name,F)];
 	   ([],_,_) -> []
 	end,
@@ -71,7 +71,7 @@ sort_by_manufacturer(L) ->
     WS = "\n    ",
     Fun=fun([H|T],Acc,F)->
 		F(T,[H,WS|Acc],F);
-	   ([],Acc,F)->
+	   ([],Acc,_F)->
 		lists:reverse([WS|Acc])
 	end,
     if length(SortedRefed) > 0 ->
@@ -96,13 +96,12 @@ remove_duplicates([A|L],Acc) ->
     end.
 
 make_ref([]) -> [];
-make_ref([H]) when atom(H) ->
+make_ref([H]) when is_atom(H) ->
     "";
-make_ref([H]) when list(H) ->
+make_ref([H]) when is_list(H) ->
     "";
-make_ref([H|T]) when atom(H) ->
+make_ref([H|T]) when is_atom(H) ->
     [""
      |make_ref(T)];
-make_ref([H|T]) when list(H) ->
+make_ref([H|T]) when is_list(H) ->
     [""|make_ref(T)].
-
-- 
cgit v1.2.3


From 738c34d4bb8f1a3811acd00af8c6c12107f8315b Mon Sep 17 00:00:00 2001
From: Bruce Yinhe 
Date: Thu, 18 Jun 2015 11:31:02 +0200
Subject: Change license text to APLv2

---
 lib/xmerl/doc/src/Makefile             | 19 ++++++++++---------
 lib/xmerl/doc/src/book.xml             | 21 +++++++++++----------
 lib/xmerl/doc/src/notes.xml            | 21 +++++++++++----------
 lib/xmerl/doc/src/notes_history.xml    | 19 ++++++++++---------
 lib/xmerl/doc/src/part.xml             | 21 +++++++++++----------
 lib/xmerl/doc/src/part_notes.xml       | 21 +++++++++++----------
 lib/xmerl/doc/src/ref_man.xml          | 21 +++++++++++----------
 lib/xmerl/doc/src/xmerl_sax_parser.xml | 21 +++++++++++----------
 lib/xmerl/doc/src/xmerl_ug.xmlsrc      | 21 +++++++++++----------
 9 files changed, 97 insertions(+), 88 deletions(-)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 6f95e30a28..5c39355278 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -3,16 +3,17 @@
 #
 # Copyright Ericsson AB 2004-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
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # %CopyrightEnd%
 #
diff --git a/lib/xmerl/doc/src/book.xml b/lib/xmerl/doc/src/book.xml
index 128a870628..012a62c505 100644
--- a/lib/xmerl/doc/src/book.xml
+++ b/lib/xmerl/doc/src/book.xml
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     
 
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 3fa1f01a79..551fb2933d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
 
     
 
diff --git a/lib/xmerl/doc/src/notes_history.xml b/lib/xmerl/doc/src/notes_history.xml
index 6afd07fa56..02d420c849 100644
--- a/lib/xmerl/doc/src/notes_history.xml
+++ b/lib/xmerl/doc/src/notes_history.xml
@@ -9,16 +9,17 @@
       Ericsson AB, 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
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
   The Initial Developer of the Original Code is Ericsson AB.
     
diff --git a/lib/xmerl/doc/src/part.xml b/lib/xmerl/doc/src/part.xml
index 3567fe4a21..e672bdc3f2 100644
--- a/lib/xmerl/doc/src/part.xml
+++ b/lib/xmerl/doc/src/part.xml
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     
 
diff --git a/lib/xmerl/doc/src/part_notes.xml b/lib/xmerl/doc/src/part_notes.xml
index ace667deb9..a7c89ec560 100644
--- a/lib/xmerl/doc/src/part_notes.xml
+++ b/lib/xmerl/doc/src/part_notes.xml
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     
 
diff --git a/lib/xmerl/doc/src/ref_man.xml b/lib/xmerl/doc/src/ref_man.xml
index db35552845..8805f04fbc 100644
--- a/lib/xmerl/doc/src/ref_man.xml
+++ b/lib/xmerl/doc/src/ref_man.xml
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     
 
diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml
index 4af55066eb..2251be00bb 100644
--- a/lib/xmerl/doc/src/xmerl_sax_parser.xml
+++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml
@@ -9,16 +9,17 @@
       Ericsson AB, 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
-  compliance with the License. You should have received a copy of the
-  Erlang Public License along with this software. If not, it can be
-  retrieved online at http://www.erlang.org/.
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and limitations
-  under the License.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 
   The Initial Developer of the Original Code is Ericsson AB.
     
diff --git a/lib/xmerl/doc/src/xmerl_ug.xmlsrc b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
index aa60c65417..5d1408b54c 100644
--- a/lib/xmerl/doc/src/xmerl_ug.xmlsrc
+++ b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
@@ -8,16 +8,17 @@
       Ericsson AB. 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
-      compliance with the License. You should have received a copy of the
-      Erlang Public License along with this software. If not, it can be
-      retrieved online at http://www.erlang.org/.
-    
-      Software distributed under the License is distributed on an "AS IS"
-      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-      the License for the specific language governing rights and limitations
-      under the License.
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+ 
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
     
     
 
-- 
cgit v1.2.3


From 2955ddebc32837b66d9bacb4e925ad0ed0033168 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Tue, 23 Jun 2015 10:24:26 +0200
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 551fb2933d..a1558b224f 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,20 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.8
+
+    
Fixed Bugs and Malfunctions
+      
+        
+	    
 Remove compiler warnings in xmerl. 

+          

+	    Own Id: OTP-12689

+        
+      
+    

+
+

+
 
Xmerl 1.3.7
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From f4a0ae1736216feac5ae053610644bba2e12ed34 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Tue, 15 Dec 2015 09:45:27 +0100
Subject: Update release notes

---
 lib/xmerl/doc/src/notes.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index a1558b224f..19274e95ae 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,22 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.9
+
+    
Fixed Bugs and Malfunctions
+      
+        
+          

+	    Removed the built-in definitions of xml.xsd from the
+	    xmerl_xsd module.

+          

+	    Own Id: OTP-13070

+        
+      
+    

+
+

+
 
Xmerl 1.3.8
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 0f8afe80c6582f7affd17f36dc9cb48cc7946713 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Mon, 14 Mar 2016 10:46:23 +0100
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 19274e95ae..55367eb25e 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,20 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.10
+
+    
Improvements and New Features
+      
+        
+	    
 Suppress Dialyzer warnings. 

+          

+	    Own Id: OTP-12862

+        
+      
+    

+
+

+
 
Xmerl 1.3.9
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 6664eed554974336909d3ffe03f20349cc4c38fd Mon Sep 17 00:00:00 2001
From: Henrik Nord 
Date: Tue, 15 Mar 2016 15:19:56 +0100
Subject: update copyright-year

---
 lib/xmerl/doc/src/Makefile             | 2 +-
 lib/xmerl/doc/src/book.xml             | 2 +-
 lib/xmerl/doc/src/notes.xml            | 2 +-
 lib/xmerl/doc/src/notes_history.xml    | 2 +-
 lib/xmerl/doc/src/part.xml             | 2 +-
 lib/xmerl/doc/src/part_notes.xml       | 2 +-
 lib/xmerl/doc/src/ref_man.xml          | 2 +-
 lib/xmerl/doc/src/xmerl_sax_parser.xml | 2 +-
 lib/xmerl/doc/src/xmerl_ug.xmlsrc      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 5c39355278..2465217e8e 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2012. All Rights Reserved.
+# Copyright Ericsson AB 2004-2016. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/lib/xmerl/doc/src/book.xml b/lib/xmerl/doc/src/book.xml
index 012a62c505..63b53f5811 100644
--- a/lib/xmerl/doc/src/book.xml
+++ b/lib/xmerl/doc/src/book.xml
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 55367eb25e..4f61d4b52c 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
diff --git a/lib/xmerl/doc/src/notes_history.xml b/lib/xmerl/doc/src/notes_history.xml
index 02d420c849..d4e560a336 100644
--- a/lib/xmerl/doc/src/notes_history.xml
+++ b/lib/xmerl/doc/src/notes_history.xml
@@ -5,7 +5,7 @@
   

     
       2006
-      2013
+      2016
       Ericsson AB, All Rights Reserved
     
     
diff --git a/lib/xmerl/doc/src/part.xml b/lib/xmerl/doc/src/part.xml
index e672bdc3f2..710a968212 100644
--- a/lib/xmerl/doc/src/part.xml
+++ b/lib/xmerl/doc/src/part.xml
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
diff --git a/lib/xmerl/doc/src/part_notes.xml b/lib/xmerl/doc/src/part_notes.xml
index a7c89ec560..4ed441c7d4 100644
--- a/lib/xmerl/doc/src/part_notes.xml
+++ b/lib/xmerl/doc/src/part_notes.xml
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
diff --git a/lib/xmerl/doc/src/ref_man.xml b/lib/xmerl/doc/src/ref_man.xml
index 8805f04fbc..cd41243fcb 100644
--- a/lib/xmerl/doc/src/ref_man.xml
+++ b/lib/xmerl/doc/src/ref_man.xml
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml
index 2251be00bb..8ea197e209 100644
--- a/lib/xmerl/doc/src/xmerl_sax_parser.xml
+++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml
@@ -5,7 +5,7 @@
   

     
       2008
-      2013
+      2016
       Ericsson AB, All Rights Reserved
     
     
diff --git a/lib/xmerl/doc/src/xmerl_ug.xmlsrc b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
index 5d1408b54c..e4aeaddc78 100644
--- a/lib/xmerl/doc/src/xmerl_ug.xmlsrc
+++ b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
@@ -4,7 +4,7 @@
 
   

     
-      20042013
+      20042016
       Ericsson AB. All Rights Reserved.
     
     
-- 
cgit v1.2.3


From bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Wed, 11 May 2016 17:22:23 +0200
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 4f61d4b52c..0abcb87998 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.11
+
+    
Improvements and New Features
+      
+        
+          

+	    Internal changes

+          

+	    Own Id: OTP-13551

+        
+      
+    

+
+

+
 
Xmerl 1.3.10
 
     
Improvements and New Features
-- 
cgit v1.2.3


From 663e847459686604ea051f036a0e4caff18cea6f Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Thu, 12 May 2016 12:04:14 +0200
Subject: Revert "Prepare release"

This reverts commit bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a.
---
 lib/xmerl/doc/src/notes.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 0abcb87998..4f61d4b52c 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,21 +32,6 @@
   
This document describes the changes made to the Xmerl application.

 
 
-
Xmerl 1.3.11
-
-    
Improvements and New Features
-      
-        
-          

-	    Internal changes

-          

-	    Own Id: OTP-13551

-        
-      
-    

-
-

-
 
Xmerl 1.3.10
 
     
Improvements and New Features
-- 
cgit v1.2.3


From e020f75c10410a6943cd055bfa072a2641eab7da Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Thu, 2 Jun 2016 10:55:26 +0200
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 4f61d4b52c..0abcb87998 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.11
+
+    
Improvements and New Features
+      
+        
+          

+	    Internal changes

+          

+	    Own Id: OTP-13551

+        
+      
+    

+
+

+
 
Xmerl 1.3.10
 
     
Improvements and New Features
-- 
cgit v1.2.3


From c04cad3ba921deb086d19e2de2526af4854add75 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Thu, 2 Jun 2016 11:39:07 +0200
Subject: Revert "Prepare release"

This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da.
---
 lib/xmerl/doc/src/notes.xml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 0abcb87998..4f61d4b52c 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,21 +32,6 @@
   
This document describes the changes made to the Xmerl application.

 
 
-
Xmerl 1.3.11
-
-    
Improvements and New Features
-      
-        
-          

-	    Internal changes

-          

-	    Own Id: OTP-13551

-        
-      
-    

-
-

-
 
Xmerl 1.3.10
 
     
Improvements and New Features
-- 
cgit v1.2.3


From 6e51c6d19612d03abc81b86bb70b8d7da678ce5d Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Tue, 21 Jun 2016 15:12:41 +0200
Subject: Prepare release

---
 lib/xmerl/doc/src/notes.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/xmerl/doc/src')

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 4f61d4b52c..0abcb87998 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   
This document describes the changes made to the Xmerl application.

 
 
+
Xmerl 1.3.11
+
+    
Improvements and New Features
+      
+        
+          

+	    Internal changes

+          

+	    Own Id: OTP-13551

+        
+      
+    

+
+

+
 
Xmerl 1.3.10
 
     
Improvements and New Features
-- 
cgit v1.2.3