move inheritance section / remove redundant general text

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 0ecf53132fa548a598b48037de71f603eddc676e..cf166fef78ae6fcd022b35162b6302e8d1f9d0b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 # also update debian/changelog
-PKGREL=1
+PKGREL=3
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
@@ -18,6 +18,7 @@ DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 MEDIAWIKI_DEB=${MEDIAWIKI_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 
 CHAPTER_LIST=          \
+       pve-installation        \
        sysadmin        \
        pvecm           \
        pmxcfs          \
@@ -78,6 +79,7 @@ GEN_DEB_SOURCES=                              \
        pve-storage-iscsi.adoc                  \
        pve-storage-iscsidirect.adoc            \
        pve-storage-lvm.adoc                    \
+       pve-storage-lvmthin.adoc                \
        pve-storage-nfs.adoc                    \
        pve-storage-rbd.adoc                    \
        pve-storage-zfspool.adoc                \
@@ -98,11 +100,14 @@ GEN_SCRIPTS=                                       \
        gen-pve-firewall-rules-opts.pl          \
        gen-pve-firewall-vm-opts.pl
 
+INSTALLATION_SOURCES=                          \
+       pve-usbstick.adoc                       \
+       pve-system-requirements.adoc            \
+       pve-installation.adoc
+
 SYSADMIN_PARTS=                                        \
-       getting-help                            \
        pve-network                             \
        pve-package-repos                       \
-       pve-installation                        \
        system-software-updates                 \
        local-lvm                               \
        local-zfs
@@ -122,6 +127,8 @@ PVE_ADMIN_GUIDE_SOURCES=                    \
        ${SYSADMIN_SOURCES}                     \
        pve-admin-guide.adoc                    \
        pve-intro.adoc                          \
+       getting-help.adoc                       \
+       ${INSTALLATION_SOURCES}                 \
        pmxcfs.adoc                             \
        pmxcfs.8-cli.adoc                       \
        pve-faq.adoc                            \
@@ -151,6 +158,9 @@ PVE_ADMIN_GUIDE_SOURCES=                    \
        attributes.txt
 
 WIKI_IMPORTS=                                                                  \
+       section-pve-usbstick-plain.html                                         \
+       section-getting-help-plain.html                                         \
+       section-pve-system-requirements-plain.html                              \
        $(addsuffix -plain.html, $(addprefix sysadmin-, ${SYSADMIN_PARTS}))     \
        $(addsuffix -plain.html, $(addprefix chapter-, ${CHAPTER_LIST}))        \
        $(addsuffix .5-plain.html, ${CONFIG_LIST})                              \
@@ -180,6 +190,9 @@ all: index.html
 sysadmin-%-plain.html: %.adoc
        asciidoc -s -a wiki -a 'leveloffset=-1' ${ADOC_STDARG} -o $@ $*.adoc
 
+section-%-plain.html: %.adoc
+       asciidoc -s -a wiki -a 'leveloffset=-1' ${ADOC_STDARG} -o $@ $*.adoc
+
 chapter-sysadmin.html chapter-sysadmin-plain.html: ${SYSADMIN_SOURCES}
 
 chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
@@ -217,15 +230,18 @@ index.html: index.adoc ${API_VIEWER_SOURCES} ${INDEX_INCLUDES}
        asciidoc -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}" index.adoc
 
 pve-admin-guide.html: ${PVE_ADMIN_GUIDE_SOURCES}
-       asciidoc -a "revnumber=${DOCRELEASE}" -a "date=$(shell date)" pve-admin-guide.adoc
+       asciidoc -a pvelogo -a "revnumber=${DOCRELEASE}" -a "date=$(shell date)" pve-admin-guide.adoc
 
 pve-admin-guide.chunked: ${PVE_ADMIN_GUIDE_SOURCES}
        rm -rf pve-admin-guide.chunked
        a2x -a docinfo -a docinfo1 -a icons -f chunked pve-admin-guide.adoc
 
 pve-admin-guide.pdf: ${PVE_ADMIN_GUIDE_SOURCES} docinfo.xml pve-admin-guide-docinfo.xml
+       inkscape -z -D --export-pdf=proxmox-logo.pdf images/proxmox-logo.svg
+       inkscape -z -D --export-pdf=proxmox-ci-header.pdf images/proxmox-ci-header.svg
        grep ">Release ${DOCRELEASE}<" pve-admin-guide-docinfo.xml || (echo "wrong release in  pve-admin-guide-docinfo.xml" && false);
-       a2x -a docinfo -a docinfo1 -f pdf -L --dblatex-opts "-P latex.output.revhistory=0" --dblatex-opts "-P latex.class.options=12pt" --dblatex-opts "-P doc.section.depth=2 -P toc.section.depth=2" pve-admin-guide.adoc
+       a2x -a docinfo -a docinfo1 -f pdf -L --dblatex-opts "-P latex.output.revhistory=0" --dblatex-opts "-P latex.class.options=12pt" --dblatex-opts "-P doc.section.depth=2 -P toc.section.depth=2" --dblatex-opts "-P doc.publisher.show=0 -s asciidoc-dblatex-custom.sty" pve-admin-guide.adoc
+       rm proxmox-logo.pdf proxmox-ci-header.pdf
 
 pve-admin-guide.epub: ${PVE_ADMIN_GUIDE_SOURCES}
        a2x -f epub pve-admin-guide.adoc