aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-11-20 10:15:24 +0100
committerLukas Larsson <[email protected]>2017-11-20 10:15:24 +0100
commitc08edb85c05f77c0c8c3b99361dfd373d24fccb5 (patch)
tree24b5a44417f651425dd55af90916f572f39b7ee5 /erts
parent7118c06ee07296337d4348289abc686617e577e9 (diff)
parentf977d258d3e69da8ce0549f0a7bc3d8d9ccf82a6 (diff)
downloadotp-c08edb85c05f77c0c8c3b99361dfd373d24fccb5.tar.gz
otp-c08edb85c05f77c0c8c3b99361dfd373d24fccb5.tar.bz2
otp-c08edb85c05f77c0c8c3b99361dfd373d24fccb5.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/Makefile4
-rw-r--r--erts/doc/src/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/erts/Makefile b/erts/Makefile
index 0393ccc759..60c70b6a2c 100644
--- a/erts/Makefile
+++ b/erts/Makefile
@@ -145,3 +145,7 @@ release:
.PHONY: release_docs
release_docs:
$(V_at)( cd doc/src && $(MAKE) $@ )
+
+.PHONY: xmllint
+xmllint:
+ $(MAKE) -C doc/src $@
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 9e68373af8..c4f1baf89e 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -69,6 +69,7 @@ XML_PART_FILES = \
part.xml
XML_CHAPTER_FILES = \
+ introduction.xml \
tty.xml \
match_spec.xml \
crash_dump.xml \
@@ -80,8 +81,7 @@ XML_CHAPTER_FILES = \
erl_dist_protocol.xml \
communication.xml \
time_correction.xml \
- notes.xml \
- notes_history.xml
+ notes.xml
TOPDOCDIR=../../../doc