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 /system/doc | |
| 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 'system/doc')
| -rw-r--r-- | system/doc/efficiency_guide/xmlfiles.mk | 4 | ||||
| -rw-r--r-- | system/doc/reference_manual/xmlfiles.mk | 5 | ||||
| -rw-r--r-- | system/doc/top/Makefile | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/system/doc/efficiency_guide/xmlfiles.mk b/system/doc/efficiency_guide/xmlfiles.mk index 88df9417f5..23c0d991b4 100644 --- a/system/doc/efficiency_guide/xmlfiles.mk +++ b/system/doc/efficiency_guide/xmlfiles.mk @@ -29,5 +29,5 @@ EFF_GUIDE_CHAPTER_FILES = \ processes.xml \ profiling.xml \ tablesDatabases.xml \ - drivers.xml - + drivers.xml \ + retired_myths.xml diff --git a/system/doc/reference_manual/xmlfiles.mk b/system/doc/reference_manual/xmlfiles.mk index 61637ae701..fffcbdd911 100644 --- a/system/doc/reference_manual/xmlfiles.mk +++ b/system/doc/reference_manual/xmlfiles.mk @@ -30,5 +30,6 @@ REF_MAN_CHAPTER_FILES = \ processes.xml \ distributed.xml \ code_loading.xml \ - ports.xml - + ports.xml \ + character_set.xml \ + typespec.xml diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile index 116ec688fa..b6a80aadf5 100644 --- a/system/doc/top/Makefile +++ b/system/doc/top/Makefile @@ -50,6 +50,8 @@ include ../tutorial/xmlfiles.mk include ../design_principles/xmlfiles.mk include ../oam/xmlfiles.mk +BOOK_FILES = book.xml + XML_FILES = \ $(INST_GUIDE_CHAPTER_FILES:%=../installation_guide/%) \ $(SYSTEM_PRINCIPLES_CHAPTER_FILES:%=../system_principles/%) \ @@ -70,9 +72,9 @@ XML_FILES = \ ../efficiency_guide/part.xml \ ../tutorial/part.xml \ ../design_principles/part.xml \ - ../oam/part.xml + ../oam/part.xml \ + $(BOOK_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 |