diff options
| author | Lukas Larsson <[email protected]> | 2017-11-20 10:15:07 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-11-20 10:15:07 +0100 |
| commit | f977d258d3e69da8ce0549f0a7bc3d8d9ccf82a6 (patch) | |
| tree | 9c221c95d3db343ab02c2303a90d34a208611e1a /erts | |
| parent | 1037acb9cba3f88d9dbd318e6f7f75866b5a5fca (diff) | |
| parent | f3af7cf7170246c9e324e78a0fa9e7207ae877f7 (diff) | |
| download | otp-f977d258d3e69da8ce0549f0a7bc3d8d9ccf82a6.tar.gz otp-f977d258d3e69da8ce0549f0a7bc3d8d9ccf82a6.tar.bz2 otp-f977d258d3e69da8ce0549f0a7bc3d8d9ccf82a6.zip | |
Merge branch 'lukas/docs/xmllint_fixes/OTP-14721' into maint
* lukas/docs/xmllint_fixes/OTP-14721:
ssl/ssh: Remove/ignore unused XML_FILES doc files
Refactor xmllint check and make it fail on failure
Add toplevel xmllint make target
Conflicts:
lib/crypto/doc/src/Makefile
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/Makefile | 4 | ||||
| -rw-r--r-- | erts/doc/src/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/erts/Makefile b/erts/Makefile index 12d2ec57a8..ffada839a7 100644 --- a/erts/Makefile +++ b/erts/Makefile @@ -147,3 +147,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 1f591a5cff..18c5490d7b 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 |