From 4d658008be5a08ddadbe75ebadb9ef124436b76e Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 14 Mar 2017 15:59:23 +0100
Subject: Prepare release

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 12e64537ed..652560f60c 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,61 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The namespace_conformant option in xmerl_scan did not
+	    work when parsing documents without explicit XML
+	    namespace declaration.</p>
+          <p>
+	    Own Id: OTP-14139</p>
+        </item>
+        <item>
+	    <p> Fix a "well-formedness" bug in the XML Sax parser so
+	    it returns an error if there are something more in the
+	    file after the matching document. If one using the
+	    xmerl_sax_parser:stream() a rest is allowed which then
+	    can be sent to a new call of xmerl_sax_parser:stream() to
+	    parse next document. </p> <p> This is done to be
+	    compliant with XML conformance tests. </p>
+          <p>
+	    Own Id: OTP-14211</p>
+        </item>
+        <item>
+	    <p> Fixed compiler and dialyzer warnings in the XML SAX
+	    parser. </p>
+          <p>
+	    Own Id: OTP-14212</p>
+        </item>
+        <item>
+	    <p> Change how to interpret end of document in the XML
+	    SAX parser to comply with Tim Brays comment on the
+	    standard. This makes it possible to handle more than one
+	    doc on a stream, the standard makes it impossible to know
+	    when the document is ended without waiting for the next
+	    document (and not always even that). </p> <p> Tim Brays
+	    comment: </p> <p> Trailing "Misc"<br/> The fact that
+	    you're allowed some trailing junk after the root element,
+	    I decided (but unfortunately too late) is a real design
+	    error in XML. If I'm writing a network client, I'm
+	    probably going to close the link as soon as a I see the
+	    root element end-tag, and not depend on the other end
+	    closing it down properly.<br/> Furthermore, if I want to
+	    send a succession of XML documents over a network link,
+	    if I find a processing instruction after a root element,
+	    is it a trailer on the previous document, or part of the
+	    prolog of the next? </p>
+          <p>
+	    Own Id: OTP-14213</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 83e20c62057ebc1d8064bf57b01be560cd244e1d Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 4 May 2017 15:42:21 +0200
Subject: Update copyright year

---
 lib/xmerl/doc/src/notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 652560f60c..ef4831e6ec 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-- 
cgit v1.2.3


From dc57404252c47520f352834ad9be45ad684f96c9 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 4 May 2017 17:05:25 +0200
Subject: Prepare release

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index ef4831e6ec..a7592dc344 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improves accumulator fun in xmerl_scan so that only one
+	    #xmlText record is returned for strings which have
+	    character references.</p>
+          <p>
+	    (Thanks to Jimmy Zöger)</p>
+          <p>
+	    Own Id: OTP-14377 Aux Id: PR-1369 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From eace29905be436d77245656b2511c9a9c2c67c90 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 5 May 2017 13:15:42 +0200
Subject: Revert "Prepare release"

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index a7592dc344..ef4831e6ec 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,25 +32,6 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
-<section><title>Xmerl 1.3.14</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Improves accumulator fun in xmerl_scan so that only one
-	    #xmlText record is returned for strings which have
-	    character references.</p>
-          <p>
-	    (Thanks to Jimmy Zöger)</p>
-          <p>
-	    Own Id: OTP-14377 Aux Id: PR-1369 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From eaf8ca41dfa4850437ad270d3897399c9358ced0 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 30 May 2017 16:15:30 +0200
Subject: Prepare release

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index ef4831e6ec..a7592dc344 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improves accumulator fun in xmerl_scan so that only one
+	    #xmlText record is returned for strings which have
+	    character references.</p>
+          <p>
+	    (Thanks to Jimmy Zöger)</p>
+          <p>
+	    Own Id: OTP-14377 Aux Id: PR-1369 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 32275a2fc0b86d1f1b124706afc80f3ff92216eb Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 31 May 2017 16:21:00 +0200
Subject: Revert "Prepare release"

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index a7592dc344..ef4831e6ec 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,25 +32,6 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
-<section><title>Xmerl 1.3.14</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Improves accumulator fun in xmerl_scan so that only one
-	    #xmlText record is returned for strings which have
-	    character references.</p>
-          <p>
-	    (Thanks to Jimmy Zöger)</p>
-          <p>
-	    Own Id: OTP-14377 Aux Id: PR-1369 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 984d9f66c0cdff91a599e8a1e332c85bbadb9b37 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 2 Jun 2017 10:38:30 +0200
Subject: Update release notes

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 652560f60c..0c89311579 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,27 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> A couple of bugs are fixed in the sax parser
+	    (xmerl_sax_parser). </p> <list> <item>The continuation
+	    function was not called correctly when the XML directive
+	    was fragmented. </item> <item>When the event callback
+	    modules (xmerl_sax_old_dom and xmerl_sax_simple) got an
+	    endDocument event at certain conditions the parser
+	    crashed.</item> <item>Replaced internal ets table with
+	    map to avoid table leakage.</item> </list>
+          <p>
+	    Own Id: OTP-14430</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.13</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From c18b13d4c8aa31b145703bbbf228fb07d6b2a0a5 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 21 Jun 2017 10:53:19 +0200
Subject: Prepare release

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

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

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 56856d026e..1162561225 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,25 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improves accumulator fun in xmerl_scan so that only one
+	    #xmlText record is returned for strings which have
+	    character references.</p>
+          <p>
+	    (Thanks to Jimmy Zöger)</p>
+          <p>
+	    Own Id: OTP-14377 Aux Id: PR-1369 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.14</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 9395c7b4a2079349fdb881a1f537af5b73eacfd2 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Mon, 25 Sep 2017 15:15:37 +0200
Subject: Remove unused files from the documentation build

---
 lib/xmerl/doc/src/Makefile       | 32 ++++++++++++++------------------
 lib/xmerl/doc/src/fascicules.xml | 18 ------------------
 lib/xmerl/doc/src/part_notes.xml | 40 ----------------------------------------
 3 files changed, 14 insertions(+), 76 deletions(-)
 delete mode 100644 lib/xmerl/doc/src/fascicules.xml
 delete mode 100644 lib/xmerl/doc/src/part_notes.xml

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

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 2465217e8e..7d0b0b2392 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2016. All Rights Reserved.
+# Copyright Ericsson AB 2004-2017. 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.
@@ -59,9 +59,8 @@ XMERL_XML_FILES = $(XMERL_MODULES:=.xml)
 XML_REF3_FILES = $(XMERL_XML_FILES) \
 	xmerl_sax_parser.xml
 
-XML_PART_FILES =  \
-	part.xml \
-	part_notes.xml
+XML_PART_FILES = \
+	part.xml
 
 XML_REF6_FILES =
 
@@ -107,10 +106,10 @@ TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
 
 # ----------------------------------------------------
-# FLAGS 
+# FLAGS
 # ----------------------------------------------------
-XML_FLAGS += 
-DVIPS_FLAGS += 
+XML_FLAGS +=
+DVIPS_FLAGS +=
 
 # ----------------------------------------------------
 # Targets
@@ -120,14 +119,14 @@ $(HTMLDIR)/%.gif: %.gif
 
 docs: pdf html man
 
-$(TOP_PDF_FILE): $(XML_FILES) 
+$(TOP_PDF_FILE): $(XML_FILES)
 
 pdf: $(TOP_PDF_FILE)
 
 html: gifs $(HTML_REF_MAN_FILE)
 
-$(XMERL_XML_FILES): 
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript $(XMERL_DIR)/$(@:%.xml=%.erl) 
+$(XMERL_XML_FILES):
+	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript $(XMERL_DIR)/$(@:%.xml=%.erl)
 
 man: $(MAN3_FILES) $(MAN6_FILES)
 
@@ -135,15 +134,15 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
 xml: $(XMERL_XML_FILES)
 
-debug opt: 
+debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*	
-	rm -f $(MAN6DIR)/*	
+	rm -f $(MAN3DIR)/*
+	rm -f $(MAN6DIR)/*
 	rm -f $(XMERL_XML_FILES)
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
+	rm -f errs core *~
 
 
 info:
@@ -158,7 +157,7 @@ info:
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 include $(ERL_TOP)/make/otp_release_targets.mk
 
 release_docs_spec: docs
@@ -177,6 +176,3 @@ release_spec:
 
 
 release_tests_spec:
-
-
-
diff --git a/lib/xmerl/doc/src/fascicules.xml b/lib/xmerl/doc/src/fascicules.xml
deleted file mode 100644
index 37feca543f..0000000000
--- a/lib/xmerl/doc/src/fascicules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE fascicules SYSTEM "fascicules.dtd">
-
-<fascicules>
-  <fascicule file="part" href="part_frame.html" entry="no">
-    User's Guide
-  </fascicule>
-  <fascicule file="ref_man" href="ref_man_frame.html" entry="yes">
-    Reference Manual
-  </fascicule>
-  <fascicule file="part_notes" href="part_notes_frame.html" entry="no">
-    Release Notes
-  </fascicule>
-  <fascicule file="" href="../../../../doc/print.html" entry="no">
-    Off-Print
-  </fascicule>
-</fascicules>
-
diff --git a/lib/xmerl/doc/src/part_notes.xml b/lib/xmerl/doc/src/part_notes.xml
deleted file mode 100644
index 4ed441c7d4..0000000000
--- a/lib/xmerl/doc/src/part_notes.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE part SYSTEM "part.dtd">
-
-<part xmlns:xi="http://www.w3.org/2001/XInclude">
-  <header>
-    <copyright>
-      <year>2004</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>Xmerl Release Notes</title>
-    <prepared>Bertil Karlsson</prepared>
-    <docno></docno>
-    <date>>2004-12-15</date>
-    <rev></rev>
-    <file>part_notes.xml</file>
-  </header>
-  <description>
-    <p>The <em>Xmerl</em> application 
-      contains modules with support for processing of xml files compliant to XML 1.0.</p>
-    <p>There are also release notes for
-      <url href="notes_history.html">older versions</url>.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
-- 
cgit v1.2.3


From 47198f179ab14cf8cfcdab0d976650cd1519b236 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 8 Dec 2017 10:57:50 +0100
Subject: Update release notes

---
 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 1162561225..f62a8dc53d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.16</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Removed all old unused files in the documentation.
+	    </p>
+          <p>
+	    Own Id: OTP-14475 Aux Id: ERL-409, PR-1493 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.15</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From a91f4640bc4554f9a746afa65bacda0e1a60afc0 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 6 Apr 2018 16:40:56 +0200
Subject: erl_docgen: Add ghlink step for all non-generated doc xml files

In order to get line numbers into the ghlink we have to add a post
processing step for all xml files.
---
 lib/xmerl/doc/src/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 7d0b0b2392..94100910ef 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -54,10 +54,9 @@ XMERL_MODULES = \
 
 
 XML_APPLICATION_FILES = ref_man.xml
-XMERL_XML_FILES = $(XMERL_MODULES:=.xml)
+XMERL_XML_FILES = $(XMERL_MODULES:%=$(XMLDIR)/%.xml)
 
-XML_REF3_FILES = $(XMERL_XML_FILES) \
-	xmerl_sax_parser.xml
+XML_REF3_FILES = xmerl_sax_parser.xml
 
 XML_PART_FILES = \
 	part.xml
@@ -65,9 +64,10 @@ XML_PART_FILES = \
 XML_REF6_FILES =
 
 XML_CHAPTER_FILES =  \
-	xmerl_ug.xml \
 	notes.xml
 
+XML_CHAPTER_GEN_FILES = \
+	$(XMLDIR)/xmerl_ug.xml
 
 HTML_EXAMPLE_FILES =  \
 	xmerl_examples.html \
@@ -89,6 +89,8 @@ XML_FILES= \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
 
+XML_GEN_FILES = $(XMERL_XML_FILES) $(XML_CHAPTER_GEN_FILES)
+
 # ----------------------------------------------------
 INFO_FILE = ../../info
 
@@ -97,7 +99,7 @@ HTML_FILES = $(XML_REF_MAN:%.xml=$(HTMLDIR)/%.html) \
 	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
 
 
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
+MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3) $(XMERL_MODULES:%=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 
 HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
@@ -126,7 +128,7 @@ pdf: $(TOP_PDF_FILE)
 html: gifs $(HTML_REF_MAN_FILE)
 
 $(XMERL_XML_FILES):
-	escript $(DOCGEN)/priv/bin/xml_from_edoc.escript $(XMERL_DIR)/$(@:%.xml=%.erl)
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -dir $(XMLDIR) $(XMERL_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
 
 man: $(MAN3_FILES) $(MAN6_FILES)
 
-- 
cgit v1.2.3


From 202bb737e3deabfebee683266f4b7c42781eb521 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 30 Apr 2018 10:06:42 +0200
Subject: Update release notes

---
 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 f62a8dc53d..6959bb77c7 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typos in documentation.</p>
+          <p>
+	    Own Id: OTP-15039</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 561e871d680a081d531ff205b8331eacca1d7a3c Mon Sep 17 00:00:00 2001
From: Henrik <henrik@erlang.org>
Date: Wed, 2 May 2018 09:19:05 +0200
Subject: Revert "Update release notes"

This reverts commit 202bb737e3deabfebee683266f4b7c42781eb521.
---
 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 6959bb77c7..f62a8dc53d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
-<section><title>Xmerl 1.3.17</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix typos in documentation.</p>
-          <p>
-	    Own Id: OTP-15039</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From fd8e49b5bddceaae803670121b603b5eee8c5c08 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 25 May 2018 12:14:27 +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 f62a8dc53d..6959bb77c7 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typos in documentation.</p>
+          <p>
+	    Own Id: OTP-15039</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From b9faca269de1de51ae33577cc204befbea24243c Mon Sep 17 00:00:00 2001
From: Henrik <henrik@erlang.org>
Date: Tue, 29 May 2018 10:47:25 +0200
Subject: Revert "Prepare release"

This reverts commit fd8e49b5bddceaae803670121b603b5eee8c5c08.
---
 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 6959bb77c7..f62a8dc53d 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
-<section><title>Xmerl 1.3.17</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix typos in documentation.</p>
-          <p>
-	    Own Id: OTP-15039</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 5ca92e2eac1e84fd22f60e7abc3aa2b0ff1cb42b Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Mon, 18 Jun 2018 14:51:18 +0200
Subject: Update copyright year

---
 lib/xmerl/doc/src/Makefile  | 2 +-
 lib/xmerl/doc/src/notes.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index 94100910ef..d87677d0a7 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2017. All Rights Reserved.
+# Copyright Ericsson AB 2004-2018. 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/notes.xml b/lib/xmerl/doc/src/notes.xml
index f62a8dc53d..9e40d35ba7 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2017</year>
+      <year>2004</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
-- 
cgit v1.2.3


From bb19e24a485e9ef43bcca3fbe9757da83f70c3a0 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 19 Jun 2018 08:24:54 +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 9e40d35ba7..b7d1db7dfc 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typos in documentation.</p>
+          <p>
+	    Own Id: OTP-15039</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From b453f67879df577fcf5b0eb6062ec444b0c43958 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 13 Jul 2018 15:10:57 +0200
Subject: docs: make clean all XMLDIR

---
 lib/xmerl/doc/src/Makefile | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/lib/xmerl/doc/src/Makefile b/lib/xmerl/doc/src/Makefile
index d87677d0a7..0def492246 100644
--- a/lib/xmerl/doc/src/Makefile
+++ b/lib/xmerl/doc/src/Makefile
@@ -140,6 +140,7 @@ debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(XMERL_XML_FILES)
-- 
cgit v1.2.3


From fb7006280f8d5a45459e1fba066fe6f6131e8e86 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 24 Sep 2018 11:32: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 b7d1db7dfc..a97036127e 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,21 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.18</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improved documentation.</p>
+          <p>
+	    Own Id: OTP-15190</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.17</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3