From a3afcff92485b6a696e40359a7d0300d4661e9c1 Mon Sep 17 00:00:00 2001
From: Lars Thorsen
Date: Fri, 13 May 2016 08:04:51 +0200
Subject: Make it possible to run xmllint target in system documentation
---
lib/erl_docgen/priv/dtd/common.dtd | 5 +++--
lib/erl_docgen/priv/xsl/db_html.xsl | 12 ++++++------
lib/erl_docgen/priv/xsl/db_man.xsl | 12 ++++++------
lib/erl_docgen/priv/xsl/db_pdf.xsl | 12 ++++++------
make/otp_release_targets.mk | 2 +-
system/doc/system_principles/versions.xml | 4 ++--
system/doc/top/Makefile | 1 +
7 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index 961bcd3fc2..945924fe79 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -12,7 +12,7 @@
limitations under the License.
The Initial Developer of the Original Code is Ericsson AB.
- Portions created by Ericsson are Copyright 1999-2007, Ericsson AB.
+ Portions created by Ericsson are Copyright 1999-2016, Ericsson AB.
All Rights Reserved.''
$Id$
@@ -24,7 +24,7 @@
-
@@ -40,6 +40,7 @@
+
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index c2d7d40446..fa5c15cfa8 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -989,10 +989,6 @@
-
-
-
-
@@ -1009,6 +1005,10 @@
+
+
+
+
@@ -1095,11 +1095,11 @@
- Figure
+ Figure
.:
-
+
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index f75615c105..03b6b0691d 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -589,12 +589,6 @@
-
- \fB
-
- \fR\&
-
-
\fI
@@ -622,6 +616,12 @@
\fI \fR\&
+
+ \fB
+
+ \fR\&
+
+
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index e5e624ac4c..2f7b363b67 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1180,12 +1180,6 @@
-
-
-
-
-
-
@@ -1208,6 +1202,12 @@
+
+
+
+
+
+
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index e104b68991..13b54645ad 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -120,7 +120,7 @@ xmllint: $(XML_FILES)
echo Checking $$i; \
xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities $$i; \
else\
- awk -F\" '/xi:include/ {print "echo Checking " $$2 ;print "xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities " $$2}' $$i |sh; \
+ awk -F\" '/xi:include/ {print "echo Checking " $$2 ;print "xmllint --noout --valid --nodefdtd --loaddtd --path $(DOCGEN)/priv/dtd:$(DOCGEN)/priv/dtd_html_entities:$(XMLLINT_SRCDIRS) " $$2}' $$i |sh; \
fi \
done
diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml
index 3772d773fc..b9f7fa4bf6 100644
--- a/system/doc/system_principles/versions.xml
+++ b/system/doc/system_principles/versions.xml
@@ -57,11 +57,11 @@
In an OTP source code tree, the OTP version can be read from
the text file <OTP source root>/OTP_VERSION. The
absolute path to the file can be constructed by calling
- filename:join([code:root_dir(), "OTP_VERSION"]).
+ filename:join([code:root_dir(), "OTP_VERSION"]).
In an installed OTP development system, the OTP version can be read
from the text file <OTP installation root>/releases/<OTP release number>/OTP_VERSION.
The absolute path to the file can by constructed by calling
- filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), "OTP_VERSION"]).
+ filename:join([code:root_dir(), "releases", erlang:system_info(otp_release), "OTP_VERSION"]).
If the version read from the OTP_VERSION file in a
development system has a ** suffix, the system has been
patched using the
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index caae19a8d1..6aa9d8d340 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -74,6 +74,7 @@ XML_FILES = \
BOOK_FILES = book.xml
+XMLLINT_SRCDIRS= ../installation_guide:../system_principles:../embedded:../getting_started:../reference_manual:../programming_examples:../efficiency_guide:../tutorial:../design_principles:../oam
HTMLDIR= ../html
PDFREFDIR= pdf
--
cgit v1.2.3