diff options
| author | Miruna Paun <Miruna.Paun@enea.com> | 2018-02-28 16:04:03 +0100 |
|---|---|---|
| committer | Miruna Paun <Miruna.Paun@enea.com> | 2018-02-28 16:04:03 +0100 |
| commit | 276ae63a2cffa7b71667801ed24db0ac45edbf95 (patch) | |
| tree | 145e76bfe3d7a49c6cc9ab763462c2986a3660a9 | |
| parent | ed7e3c2523fcbe8c74494e74b93d1a0e126264b0 (diff) | |
| download | nfv-access-documentation-276ae63a2cffa7b71667801ed24db0ac45edbf95.tar.gz | |
USERDOCAP-289 issue with same ID for both guide books have been fixed, book component for the intel guide has been added to the makefile too
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | doc/book-enea-nfv-access-guide-intel/doc/book.xml | 2 | ||||
| -rw-r--r-- | doc/book-enea-nfv-access-guide-intel/swcomp.mk | 2 | ||||
| -rw-r--r-- | doc/enea-nfv-access-security-report (renamed from doc/book-enea-nfv-access-security-report) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index f1fc875..391c145 100644 --- a/doc/Makefile +++ b/doc/Makefile | |||
| @@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes | |||
| 50 | DOCBOOK_CLEANTMP ?= yes | 50 | DOCBOOK_CLEANTMP ?= yes |
| 51 | 51 | ||
| 52 | #Components (books) in this subsystem. Now use all books found here | 52 | #Components (books) in this subsystem. Now use all books found here |
| 53 | COMPONENTS := book-enea-nfv-access-release-info book-enea-nfv-access-open-source book-enea-nfv-access-guest-open-source book-enea-nfv-access-dev-open-source book-enea-nfv-access-guest-dev-open-source book-enea-nfv-access-guide | 53 | COMPONENTS := book-enea-nfv-access-release-info book-enea-nfv-access-open-source book-enea-nfv-access-guest-open-source book-enea-nfv-access-dev-open-source book-enea-nfv-access-guest-dev-open-source book-enea-nfv-access-guide book-enea-nfv-access-guide-intel |
| 54 | # COMPONENTS += book-enea-linux-eclipse-open-source (as of 13.04.2017 this is not needed) | 54 | # COMPONENTS += book-enea-linux-eclipse-open-source (as of 13.04.2017 this is not needed) |
| 55 | #COMPONENTS := $(shell ls -d book-enea* ) | 55 | #COMPONENTS := $(shell ls -d book-enea* ) |
| 56 | 56 | ||
diff --git a/doc/book-enea-nfv-access-guide-intel/doc/book.xml b/doc/book-enea-nfv-access-guide-intel/doc/book.xml index ca2f31c..577a15b 100644 --- a/doc/book-enea-nfv-access-guide-intel/doc/book.xml +++ b/doc/book-enea-nfv-access-guide-intel/doc/book.xml | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ | 3 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ |
| 4 | <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED"> | 4 | <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED"> |
| 5 | ]> | 5 | ]> |
| 6 | <book id="book_enea_nfv_access_guide"> | 6 | <book id="book_enea_nfv_access_guide_intel"> |
| 7 | <title><trademark class="registered">Enea</trademark> NFV Access Guide</title> | 7 | <title><trademark class="registered">Enea</trademark> NFV Access Guide</title> |
| 8 | <subtitle>Release Version | 8 | <subtitle>Release Version |
| 9 | <xi:include href="eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)" | 9 | <xi:include href="eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)" |
diff --git a/doc/book-enea-nfv-access-guide-intel/swcomp.mk b/doc/book-enea-nfv-access-guide-intel/swcomp.mk index 0d205f3..bed4664 100644 --- a/doc/book-enea-nfv-access-guide-intel/swcomp.mk +++ b/doc/book-enea-nfv-access-guide-intel/swcomp.mk | |||
| @@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev | |||
| 5 | 5 | ||
| 6 | DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print) | 6 | DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print) |
| 7 | 7 | ||
| 8 | BOOKPACKAGES := book-enea-nfv-access-guide | 8 | BOOKPACKAGES := book-enea-nfv-access-guide-intel |
| 9 | BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Guide" | 9 | BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Guide" |
| 10 | BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS) | 10 | BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS) |
diff --git a/doc/book-enea-nfv-access-security-report b/doc/enea-nfv-access-security-report index 3c8b3f1..3c8b3f1 100644 --- a/doc/book-enea-nfv-access-security-report +++ b/doc/enea-nfv-access-security-report | |||