From cc8dade5326d130f1c704f7a47a4d0ce88af370e Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 23 Oct 2017 13:10:21 +0200
Subject: Refactor xmllint check and make it fail on failure

This commit also adds a check to see that all files that
are part of an xi:include also have part of XML_FILES
and vice versa. It also fixes any applications where this
was not true.
---
 lib/ssl/doc/src/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index d54ef47461..0e1f026d46 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -43,6 +43,7 @@ XML_REF6_FILES = ssl_app.xml
 
 XML_PART_FILES = usersguide.xml
 XML_CHAPTER_FILES = \
+	ssl_introduction.xml \
 	ssl_protocol.xml \
 	using_ssl.xml \
 	pkix_certs.xml \
-- 
cgit v1.2.3


From f3af7cf7170246c9e324e78a0fa9e7207ae877f7 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 23 Oct 2017 13:17:20 +0200
Subject: ssl/ssh: Remove/ignore unused XML_FILES doc files

---
 lib/ssl/doc/src/Makefile       |  1 -
 lib/ssl/doc/src/pkix_certs.xml | 59 ------------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 lib/ssl/doc/src/pkix_certs.xml

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index 0e1f026d46..f9128e8e45 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -46,7 +46,6 @@ XML_CHAPTER_FILES = \
 	ssl_introduction.xml \
 	ssl_protocol.xml \
 	using_ssl.xml \
-	pkix_certs.xml \
 	ssl_distribution.xml \
 	notes.xml
 
diff --git a/lib/ssl/doc/src/pkix_certs.xml b/lib/ssl/doc/src/pkix_certs.xml
deleted file mode 100644
index f365acef4d..0000000000
--- a/lib/ssl/doc/src/pkix_certs.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2003</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>PKIX Certificates</title>
-    <prepared>UAB/F/P Peter H&ouml;gfeldt</prepared>
-    <docno></docno>
-    <date>2003-06-09</date>
-    <rev>A</rev>
-    <file>pkix_certs.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction to Certificates</title>
-    <p>Certificates were originally defined by ITU (CCITT) and the latest 
-      definitions are described in <cite id="X.509"></cite>, but those definitions
-      are (as always) not working. 
-    </p>
-    <p>Working certificate definitions for the Internet Community are found
-      in the the PKIX RFCs <cite id="rfc3279"></cite> and <cite id="rfc3280"></cite>. 
-      The parsing of certificates in the Erlang/OTP SSL application is
-      based on those RFCS. 
-    </p>
-    <p>Certificates are defined in terms of ASN.1 (<cite id="X.680"></cite>).
-      For an introduction to ASN.1 see <url href="http://asn1.elibel.tm.fr/">ASN.1 Information Site</url>.
-    </p>    
-  </section>
-
-  <section>
-    <title>PKIX Certificates</title>
-    <p>Certificate handling is now handled by the <c>public_key</c> application.</p>
-    <p>
-      DER encoded certificates returned by <c>ssl:peercert/1</c> can for example 
-      be decoded by the <c>public_key:pkix_decode_cert/2</c> function. 
-    </p>
-  </section>
-</chapter>
-
-
-- 
cgit v1.2.3