X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=pve-doc-generator.mk;h=e8eea64caff04b86af40594b53baeabf35f47b27;hp=2d77f0e4235254d7d0a8c29d4e5dfe280a946c14;hb=2fcf16dfb029d5416e2ed0f83fe60637f6365809;hpb=25d13a7a789115315274f2cc5bb42318e8b9ea30

diff --git a/pve-doc-generator.mk b/pve-doc-generator.mk
index 2d77f0e..e8eea64 100644
--- a/pve-doc-generator.mk
+++ b/pve-doc-generator.mk
@@ -1,5 +1,5 @@
 # also update debian/changelog
-DOCRELEASE=4.1
+DOCRELEASE=4.3
 
 DGDIR?=/usr/share/pve-doc-generator
 
@@ -33,6 +33,7 @@ PVESM_MAN1_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	\
@@ -41,6 +42,7 @@ PVESM_MAN1_SOURCES=			\
 VZDUMP_MAN1_SOURCES=			\
 	vzdump.adoc 			\
 	vzdump.1-synopsis.adoc		\
+	vzdump.conf.5-opts.adoc		\
 	${PVE_COMMON_DOC_SOURCES}
 
 PVESUBSCRIPTION_MAN1_SOURCES=		\
@@ -56,6 +58,9 @@ PVECEPH_MAN1_SOURCES=			\
 PCT_MAN1_SOURCES=			\
 	pct.adoc 			\
 	pct.1-synopsis.adoc		\
+	pct.conf.5-opts.adoc		\
+	pct-network-opts.adoc		\
+	pct-mountpoint-opts.adoc	\
 	${PVE_COMMON_DOC_SOURCES}
 
 PCT_CONF_MAN5_SOURCES=			\
@@ -71,6 +76,7 @@ DATACENTER_CONF_MAN5_SOURCES=		\
 QM_MAN1_SOURCES=			\
 	qm.adoc 			\
 	qm.1-synopsis.adoc		\
+	qm.conf.5-opts.adoc		\
 	${PVE_COMMON_DOC_SOURCES}
 
 QM_CONF_MAN5_SOURCES=			\
@@ -146,11 +152,11 @@ attributes.txt docinfo.xml:
 	mv $@.tmp $@
 
 %.1-synopsis.adoc:
-	perl -I. -e "use PVE::CLI::$(subst -,_,$*);print PVE::CLI::$(subst -,_,$*)->generate_asciidoc_synopsys();" > $@.tmp
+	perl -I. -e "use PVE::CLI::$(subst -,_,$*);print PVE::CLI::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
 	mv $@.tmp $@
 
 %.8-synopsis.adoc:
-	perl -I. -e "use PVE::Service::$(subst -,_,$*);print PVE::Service::$(subst -,_,$*)->generate_asciidoc_synopsys();" > $@.tmp
+	perl -I. -e "use PVE::Service::$(subst -,_,$*);print PVE::Service::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
 	mv $@.tmp $@
 
 ifneq (${DGDIR},.)
@@ -159,85 +165,107 @@ ifneq (${DGDIR},.)
 	mv $@.tmp $@
 endif
 
-A2X_MAN_COMMON_OPTIONS=-a docinfo1 -a "manversion=Release ${DOCRELEASE}" -f manpage
-A2X_MAN1_OPTIONS=${A2X_MAN_COMMON_OPTIONS} -a "manvolnum=1"
-A2X_MAN5_OPTIONS=${A2X_MAN_COMMON_OPTIONS} -a "manvolnum=5"
-A2X_MAN8_OPTIONS=${A2X_MAN_COMMON_OPTIONS} -a "manvolnum=8"
+# asciidoc /etc/asciidoc/docbook-xsl/manpage.xsl skip REFERENCES section
+# like footnotes, so we cannot use a2x. We use xmlto instead.
+#A2MAN_COMMON=a2x -v -k -a docinfo1 -a "manversion=Release ${DOCRELEASE}" -f manpage
+#A2MAN1=${A2MAN_COMMON} -a "manvolnum=1"
+#A2MAN5=${A2MAN_COMMON} -a "manvolnum=5"
+#A2MAN8=${A2MAN_COMMON} -a "manvolnum=8"
+
+A2MAN_COMMON=asciidoc -dmanpage -bdocbook -a docinfo1
+
+define A2MAN1
+${A2MAN_COMMON} -a "manvolnum=1" -o $1.tmp.xml $1.adoc
+xmlto -v man $1.tmp.xml
+@rm -f $1.tmp.xml
+endef
+
+define A2MAN5
+${A2MAN_COMMON} -a "manvolnum=5" -o $1.tmp.xml $1.adoc
+xmlto -v man $1.tmp.xml 
+@rm -f $1.tmp.xml
+endef
+
+define A2MAN8
+${A2MAN_COMMON} -a "manvolnum=8" -o $1.tmp.xml $1.adoc
+xmlto -v man $1.tmp.xml
+@rm -f $1.tmp.xml
+endef
 
 pve-firewall.8: ${PVE_FIREWALL_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pve-firewall.adoc
+	$(call A2MAN8,pve-firewall)
 	test -n "$${NOVIEW}" || man -l $@
 
 pvesm.1: ${PVESM_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pvesm.adoc
+	$(call A2MAN1,pvesm)
 	test -n "$${NOVIEW}" || man -l $@
 
 pveceph.1: ${PVECEPH_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pveceph.adoc
+	$(call A2MAN1,pveceph)
 	test -n "$${NOVIEW}" || man -l $@
 
 pct.1: ${PCT_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pct.adoc
+	$(call A2MAN1,pct)
 	test -n "$${NOVIEW}" || man -l $@
 
 vzdump.1: ${VZDUMP_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} vzdump.adoc
+	$(call A2MAN1,vzdump)
 	test -n "$${NOVIEW}" || man -l $@
 
 pvesubscription.1: ${PVESUBSCRIPTION_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pvesubscription.adoc
+	$(call A2MAN1,pvesubscription)
 	test -n "$${NOVIEW}" || man -l $@
 
 qm.1: ${QM_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} qm.adoc
+	$(call A2MAN1,qm)
 	test -n "$${NOVIEW}" || man -l $@
 
 qmrestore.1: ${QMRESTORE_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} qmrestore.adoc
+	$(call A2MAN1,qmrestore)
 	test -n "$${NOVIEW}" || man -l $@
 
 pvecm.1: ${PVECM_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pvecm.adoc
+	$(call A2MAN1,pvecm)
 	test -n "$${NOVIEW}" || man -l $@
 
 pveum.1: ${PVEUM_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pveum.adoc
+	$(call A2MAN1,pveum)
 	test -n "$${NOVIEW}" || man -l $@
 
 pveam.1: ${PVEAM_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} pveam.adoc
+	$(call A2MAN1,pveam)
 	test -n "$${NOVIEW}" || man -l $@
 
 ha-manager.1: ${HA_MANAGER_MAN1_SOURCES}
-	a2x ${A2X_MAN1_OPTIONS} ha-manager.adoc
+	$(call A2MAN1,ha-manager)
 	test -n "$${NOVIEW}" || man -l $@
 
 pve-ha-crm.8: ${PVE_HA_CRM_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pve-ha-crm.adoc
+	$(call A2MAN8,pve-ha-crm)
 	test -n "$${NOVIEW}" || man -l $@
 
 pve-ha-lrm.8: ${PVE_HA_LRM_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pve-ha-lrm.adoc
+	$(call A2MAN8,pve-ha-lrm)
 	test -n "$${NOVIEW}" || man -l $@
 
 pvestatd.8: ${PVESTATD_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pvestatd.adoc
+	$(call A2MAN8,pvestatd)
 	test -n "$${NOVIEW}" || man -l $@
 
 pvedaemon.8: ${PVEDAEMON_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pvedaemon.adoc
+	$(call A2MAN8,pvedaemon)
 	test -n "$${NOVIEW}" || man -l $@
 
 pveproxy.8: ${PVEPROXY_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pveproxy.adoc
+	$(call A2MAN8,pveproxy)
 	test -n "$${NOVIEW}" || man -l $@
 
 spiceproxy.8: ${SPICEPROXY_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} spiceproxy.adoc
+	$(call A2MAN8,spiceproxy)
 	test -n "$${NOVIEW}" || man -l $@
 
 pmxcfs.8: ${PMXCFS_MAN8_SOURCES}
-	a2x ${A2X_MAN8_OPTIONS} pmxcfs.adoc
+	$(call A2MAN8,pmxcfs)
 	test -n "$${NOVIEW}" || man -l $@
 
 qm.conf.5: ${QM_CONF_MAN5_SOURCES}
@@ -247,9 +275,9 @@ pct.conf.5: ${PCT_CONF_MAN5_SOURCES}
 datacenter.cfg.5: ${DATACENTER_CONF_MAN5_SOURCES}
 
 %.5: %.adoc %.5-opts.adoc ${PVE_COMMON_DOC_SOURCES}
-	a2x ${A2X_MAN5_OPTIONS} $*.adoc
+	$(call A2MAN5,$*)
 	test -n "$${NOVIEW}" || man -l $@
 
 .PHONY: cleanup-docgen
 cleanup-docgen:
-	rm -f *.1 *.5 *.8 *.adoc attributes.txt docinfo.xml
+	rm -f *.tmp.xml *.1 *.5 *.8 *.adoc attributes.txt docinfo.xml