remove attributes.txt (use asciidoc/asciidoc-pve.conf instead)

diff --git a/README.adoc b/README.adoc
index c82d82ed86286498a6f30cf1bb03fd76567fc250..062b94eff9634b3266b220c2e851ff9ac90e13d2 100644 (file)
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,5 @@
 Proxmox VE Documentation
 ========================
 Proxmox VE Documentation
 ========================

-include::attributes.txt[]

 
 We try to generate high quality documentation for
 {website}[{pve}], and choose to use
 
 We try to generate high quality documentation for
 {website}[{pve}], and choose to use


@@ -42,8 +41,8 @@ those Debian packages using:
  make deb
 
 
  make deb
 
 

-Common Macro definition in link:attributes.txt[]
-------------------------------------------------
+Common Macro definition in link:asciidoc/asciidoc-pve.conf[]
+------------------------------------------------------------

 
 'asciidoc' allows us to define common macros, which can then be
 referred to using `{macro}`. We try to use this mechanism to improve
 
 'asciidoc' allows us to define common macros, which can then be
 referred to using `{macro}`. We try to use this mechanism to improve


@@ -59,13 +58,12 @@ description
 For example, the macro `{forum-url}` expands to {forum-url}, and the macro
 `{forum}` expands to {forum}.
 
 For example, the macro `{forum-url}` expands to {forum-url}, and the macro
 `{forum}` expands to {forum}.
 

-The plan is to add more such definitions for terms which are used more than once.
+The plan is to add more such definitions for terms which are used more
+than once.

 
 

-WARNING: When asciidoc encounters a misspelled macro name, it will silently drop
-the containing line!
+WARNING: When asciidoc encounters a misspelled macro name, it will
+silently drop the containing line!

 
 

-WARNING: Never use macros in document titles or the ``NAME'' section of man pages,
-as these get parsed before the `attributes.txt` file gets included.

 
 Autogenerated CLI Command Synopsis
 ----------------------------------
 
 Autogenerated CLI Command Synopsis
 ----------------------------------

diff --git a/attributes.txt b/attributes.txt
deleted file mode 100644 (file)
index 7ab1fa3..0000000
--- a/attributes.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-:proxmoxGmbh: Proxmox Server Solutions Gmbh
-:copyright:   {proxmoxGmbh}
-:pve:         Proxmox VE
-:website:     http://www.proxmox.com/
-:forum-url:   https://forum.proxmox.com/
-:forum:       https://forum.proxmox.com/[{pve} Community Forum]
-:webwiki-url:    https://pve.proxmox.com/wiki/
-:webwiki:        https://pve.proxmox.com/wiki/[{pve} Wiki]
-:manmanual:   {pve} Documentation
-:max-width:   55em
-ifndef::docinfo1[]
-:author:      {proxmoxGmbh}
-:email:       support@proxmox.com
-endif::docinfo1[]

diff --git a/datacenter.cfg.adoc b/datacenter.cfg.adoc
index de64699689c4fcb92ff74f0ba9e916fc1a324768..d9404904b1a3d054d30a281d1d135541bf1f4236 100644 (file)
--- a/datacenter.cfg.adoc
+++ b/datacenter.cfg.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 datacenter.cfg(5)
 =================
 ifdef::manvolnum[]
 datacenter.cfg(5)
 =================

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Datacenter Configuration
 ========================
 ifndef::manvolnum[]
 Datacenter Configuration
 ========================

-include::attributes.txt[]

 endif::manvolnum[]
 ifdef::wiki[]
 :title: Manual: datacenter.cfg
 endif::manvolnum[]
 ifdef::wiki[]
 :title: Manual: datacenter.cfg

diff --git a/getting-help.adoc b/getting-help.adoc
index 97f80b4b32b63cdea25bc5c4ce722d679f7e4dd5..fb2651f6678722d710dfd5554c47df47d0204e3d 100644 (file)
--- a/getting-help.adoc
+++ b/getting-help.adoc
@@ -1,7 +1,6 @@
 [[getting_help]]
 Getting Help
 ------------
 [[getting_help]]
 Getting Help
 ------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/ha-manager.adoc b/ha-manager.adoc
index d49a8c6d1ced7cdad6fe6e6f7be5e62242cc65c6..79c90435601012813df4253b0f748a0f2f1c5c3d 100644 (file)
--- a/ha-manager.adoc
+++ b/ha-manager.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 ha-manager(1)
 =============
 ifdef::manvolnum[]
 ha-manager(1)
 =============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 High Availability
 =================
 ifndef::manvolnum[]
 High Availability
 =================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 

diff --git a/howto-improve-pve-docs.adoc b/howto-improve-pve-docs.adoc
index 4e9bec2b28940c02e058399cf2a1792970914193..a7a9abddf694a77ad0f11d3be6a0e2b725b65107 100644 (file)
--- a/howto-improve-pve-docs.adoc
+++ b/howto-improve-pve-docs.adoc
@@ -1,7 +1,6 @@
 [[howto_improve_pve_docs]]
 Improving the Proxmox VE Documentation
 --------------------------------------
 [[howto_improve_pve_docs]]
 Improving the Proxmox VE Documentation
 --------------------------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/index.adoc b/index.adoc
index 9085132c564d55f6ced30ca77afc7d1d3aefecee..78931040f691a37dbe8bc8c3b6efa427b2a524f0 100644 (file)
--- a/index.adoc
+++ b/index.adoc
@@ -1,6 +1,5 @@
 image:./images/proxmox-logo.svg[] pass:[<br>] {pve} Documentation Index
 ========================================================================
 image:./images/proxmox-logo.svg[] pass:[<br>] {pve} Documentation Index
 ========================================================================

-include::attributes.txt[]

 :data-uri:
 :icons:
 :title: {pve} Documentation Index
 :data-uri:
 :icons:
 :title: {pve} Documentation Index

diff --git a/local-lvm.adoc b/local-lvm.adoc
index 45e875f88e8c1a4c8c89cd61d5b0f633242164aa..c5872befed40ebae98bee483ef0474cb2af3aea9 100644 (file)
--- a/local-lvm.adoc
+++ b/local-lvm.adoc
@@ -1,6 +1,5 @@
 Logical Volume Manager (LVM)
 ----------------------------
 Logical Volume Manager (LVM)
 ----------------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/local-zfs.adoc b/local-zfs.adoc
index 6aae81e4a275c729a86514fd2b2d1b5321dcb59b..e9d085704a367c9a010eda52d82e0a3d2f8290a9 100644 (file)
--- a/local-zfs.adoc
+++ b/local-zfs.adoc
@@ -1,6 +1,5 @@
 ZFS on Linux
 ------------
 ZFS on Linux
 ------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pct.adoc b/pct.adoc
index 5f2fb3fe50bc6ff367a6a81b6e736885cb02f112..fde647ad6769d4fe2a5eae0faba39aaf15f941ed 100644 (file)
--- a/pct.adoc
+++ b/pct.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pct(1)
 ======
 ifdef::manvolnum[]
 pct(1)
 ======

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Proxmox Container Toolkit
 =========================
 ifndef::manvolnum[]
 Proxmox Container Toolkit
 =========================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]

diff --git a/pct.conf.adoc b/pct.conf.adoc
index 7fba83dcc640233726bb48b2365b889c16caebf1..d967d795c9beeefecdf89593efe2a5cf1c38c4e4 100644 (file)
--- a/pct.conf.adoc
+++ b/pct.conf.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pct.conf(5)
 ===========
 ifdef::manvolnum[]
 pct.conf(5)
 ===========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Container Configuration
 =======================
 ifndef::manvolnum[]
 Container Configuration
 =======================

-include::attributes.txt[]

 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:

diff --git a/pmxcfs.adoc b/pmxcfs.adoc
index 764cdf452470f91185e0618aa0256adcb645c11a..12e51d19968dfd50ea0f1bad6b27fe20973c4bc1 100644 (file)
--- a/pmxcfs.adoc
+++ b/pmxcfs.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pmxcfs(8)
 =========
 ifdef::manvolnum[]
 pmxcfs(8)
 =========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Proxmox Cluster File System (pmxcfs)
 ====================================
 ifndef::manvolnum[]
 Proxmox Cluster File System (pmxcfs)
 ====================================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 

diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
index e1d1d776154dcf07e7dca6250e53b4c86f453174..289fe8aff01865ed542ba1120b62ad15f3416036 100644 (file)
--- a/pve-admin-guide.adoc
+++ b/pve-admin-guide.adoc
@@ -6,7 +6,6 @@ ifndef::pvelogo[]
 Proxmox VE Administration Guide
 ===============================
 endif::pvelogo[]
 Proxmox VE Administration Guide
 ===============================
 endif::pvelogo[]

-include::attributes.txt[]

 :doctype:   book
 :title: Proxmox VE Administration Guide
 :toc:
 :doctype:   book
 :title: Proxmox VE Administration Guide
 :toc:

diff --git a/pve-bibliography.adoc b/pve-bibliography.adoc
index e1fc28028a8bc0be929805bfa214b5db404ffd29..ed78fcc88326397798fa28f32d9c2412294d9ce6 100644 (file)
--- a/pve-bibliography.adoc
+++ b/pve-bibliography.adoc
@@ -1,7 +1,6 @@
 [bibliography]
 Bibliography
 ============
 [bibliography]
 Bibliography
 ============

-include::attributes.txt[]

 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]

diff --git a/pve-disk-health-monitoring.adoc b/pve-disk-health-monitoring.adoc
index e5f0934cd072497855d3ac8d219f051cebf2e1f6..99ba8aa54feb8a7c796387e9cc4a3ba1751ceb14 100644 (file)
--- a/pve-disk-health-monitoring.adoc
+++ b/pve-disk-health-monitoring.adoc
@@ -1,6 +1,5 @@
 Disk Health Monitoring
 ----------------------
 Disk Health Monitoring
 ----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pve-doc-generator.mk.in b/pve-doc-generator.mk.in
index 65600a1644df227aec2e1af2bf63e6ded699e082..8c2e2a500aad7515eb3936f70b03e9be7185bbcc 100644 (file)
--- a/pve-doc-generator.mk.in
+++ b/pve-doc-generator.mk.in
@@ -7,7 +7,6 @@ ASCIIDOC_PVE?=/usr/bin/asciidoc-pve
 
 PVE_COMMON_DOC_SOURCES=                 \
        ${ASCIIDOC_PVE}                 \
 
 PVE_COMMON_DOC_SOURCES=                 \
        ${ASCIIDOC_PVE}                 \

-       attributes.txt                  \

        pve-copyright.adoc              \
        docinfo.xml
 
        pve-copyright.adoc              \
        docinfo.xml
 


@@ -76,4 +75,4 @@ chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
 
 .PHONY: cleanup-docgen
 cleanup-docgen:
 
 .PHONY: cleanup-docgen
 cleanup-docgen:

-       rm -f *.xml.tmp *.1 *.5 *.8 *.adoc attributes.txt docinfo.xml
+       rm -f *.xml.tmp *.1 *.5 *.8 *.adoc docinfo.xml

diff --git a/pve-external-metric-server.adoc b/pve-external-metric-server.adoc
index 6adc95d6e8cda648c3c67c1e8a86df47b86bd05a..0a7c36e8579bf26de1be078b12dd52a8dca19a32 100644 (file)
--- a/pve-external-metric-server.adoc
+++ b/pve-external-metric-server.adoc
@@ -1,6 +1,5 @@
 External Metric Server
 ----------------------
 External Metric Server
 ----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pve-faq.adoc b/pve-faq.adoc
index abaadcd83fdb41c909a80558b0d87ab49bfcfa1c..ebdb1d4d92aceeba485c33257ee022dd5473ef84 100644 (file)
--- a/pve-faq.adoc
+++ b/pve-faq.adoc
@@ -1,6 +1,5 @@
 Frequently Asked Questions
 ==========================
 Frequently Asked Questions
 ==========================

-include::attributes.txt[]

 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]

diff --git a/pve-firewall.adoc b/pve-firewall.adoc
index 8f5936cec18b6728c1edb5b04a50ad9dd85ca7fb..1c94636cc245a16da53b6eb627effa27344a3028 100644 (file)
--- a/pve-firewall.adoc
+++ b/pve-firewall.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pve-firewall(8)
 ===============
 ifdef::manvolnum[]
 pve-firewall(8)
 ===============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 {pve} Firewall
 ==============
 ifndef::manvolnum[]
 {pve} Firewall
 ==============

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]

diff --git a/pve-ha-crm.adoc b/pve-ha-crm.adoc
index 6386bfd6d0b7569e03cae88b63b42180b18e75ab..35f9e00979e5579ffed4fd8209a03d4cea09b3c8 100644 (file)
--- a/pve-ha-crm.adoc
+++ b/pve-ha-crm.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pve-ha-crm(8)
 =============
 ifdef::manvolnum[]
 pve-ha-crm(8)
 =============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Cluster Resource Manager Daemon
 ================================
 ifndef::manvolnum[]
 Cluster Resource Manager Daemon
 ================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This is the Cluster Resource Manager Daemon.
 endif::manvolnum[]
 
 This is the Cluster Resource Manager Daemon.

diff --git a/pve-ha-lrm.adoc b/pve-ha-lrm.adoc
index 1099160a26c9e362119613172f7a2ad5b905dbd0..c5c76257649e6b9415634be53c746041ff51f137 100644 (file)
--- a/pve-ha-lrm.adoc
+++ b/pve-ha-lrm.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pve-ha-lrm(8)
 =============
 ifdef::manvolnum[]
 pve-ha-lrm(8)
 =============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Local Resource Manager Daemon
 ==============================
 ifndef::manvolnum[]
 Local Resource Manager Daemon
 ==============================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This is the Local Resource Manager Daemon.
 endif::manvolnum[]
 
 This is the Local Resource Manager Daemon.

diff --git a/pve-installation.adoc b/pve-installation.adoc
index f25ac2dc56cd5751ba3ef70fc793da18bb088735..8726ef98bea136f4451baa7a2ad7bd92ee031db5 100644 (file)
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -1,6 +1,5 @@
 Installing Proxmox VE
 =====================
 Installing Proxmox VE
 =====================

-include::attributes.txt[]

 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]

diff --git a/pve-network.adoc b/pve-network.adoc
index e6deb43dc7ab1e6254e1d9327ceafa0cc87ffc7c..fd523576323917958d07c5022a7ae2777b9aa7bf 100644 (file)
--- a/pve-network.adoc
+++ b/pve-network.adoc
@@ -1,7 +1,6 @@
 [[sysadmin_network_configuration]]
 Network Configuration
 ---------------------
 [[sysadmin_network_configuration]]
 Network Configuration
 ---------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc
index 334f2b9aaacce2897ae4ae36214aeb061b59273b..e23c01e9ea8931b5e1ddaaba90104f6db642f8f8 100644 (file)
--- a/pve-package-repos.adoc
+++ b/pve-package-repos.adoc
@@ -1,7 +1,6 @@
 [[sysadmin_package_repositories]]
 Package Repositories
 --------------------
 [[sysadmin_package_repositories]]
 Package Repositories
 --------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pve-storage-dir.adoc b/pve-storage-dir.adoc
index a5084f88cff70851bb1513648986c586be62f5e6..71d87a19060bf167773c10fe43a4a475118dcce9 100644 (file)
--- a/pve-storage-dir.adoc
+++ b/pve-storage-dir.adoc
@@ -1,6 +1,5 @@
 Directory Backend
 -----------------
 Directory Backend
 -----------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: Directory
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: Directory

diff --git a/pve-storage-glusterfs.adoc b/pve-storage-glusterfs.adoc
index 37524024e8fb5a8dc592b1dc94ac3dffc072ca1f..f12884a8a9c1a33a51c846ffdce7fc98da8f0d90 100644 (file)
--- a/pve-storage-glusterfs.adoc
+++ b/pve-storage-glusterfs.adoc
@@ -1,6 +1,5 @@
 GlusterFS Backend
 -----------------
 GlusterFS Backend
 -----------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: GlusterFS
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: GlusterFS

diff --git a/pve-storage-iscsi.adoc b/pve-storage-iscsi.adoc
index 8d29d6167875321460baba84a5c505e8e43411a0..7d1511c8129417f85c0ef56bab57fe86e58d22c0 100644 (file)
--- a/pve-storage-iscsi.adoc
+++ b/pve-storage-iscsi.adoc
@@ -1,6 +1,5 @@
 http://www.open-iscsi.org/[Open-iSCSI] initiator
 ------------------------------------------------
 http://www.open-iscsi.org/[Open-iSCSI] initiator
 ------------------------------------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: iSCSI
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: iSCSI

diff --git a/pve-storage-iscsidirect.adoc b/pve-storage-iscsidirect.adoc
index f3287f7a4a1b758ab2f4690c657d475fcfc1205c..bace901e0fb6fb79ce536b18daec3f9aa9ebb36c 100644 (file)
--- a/pve-storage-iscsidirect.adoc
+++ b/pve-storage-iscsidirect.adoc
@@ -1,6 +1,5 @@
 User Mode iSCSI Backend
 -----------------------
 User Mode iSCSI Backend
 -----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: User Mode iSCSI
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: User Mode iSCSI

diff --git a/pve-storage-lvm.adoc b/pve-storage-lvm.adoc
index bbfa08be04444eaab29a3bd7886d829710a976b4..b337c861d62f431db4ab030ece6ffa4e98448c0c 100644 (file)
--- a/pve-storage-lvm.adoc
+++ b/pve-storage-lvm.adoc
@@ -1,6 +1,5 @@
 LVM Backend
 -----------
 LVM Backend
 -----------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM

diff --git a/pve-storage-lvmthin.adoc b/pve-storage-lvmthin.adoc
index a29175e1a9966c56c692a56ffa5f128698afd3a7..1a9d55b6576694a73179a35e2360dc213e4c5bb0 100644 (file)
--- a/pve-storage-lvmthin.adoc
+++ b/pve-storage-lvmthin.adoc
@@ -1,6 +1,5 @@
 LVM thin Backend
 ----------------
 LVM thin Backend
 ----------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM Thin
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM Thin

diff --git a/pve-storage-nfs.adoc b/pve-storage-nfs.adoc
index ec4699ab768b93926abd8fe7e8687ca12bfe5ca8..24644dedec0bc99e99dd47d860d6f4a9be8f7a44 100644 (file)
--- a/pve-storage-nfs.adoc
+++ b/pve-storage-nfs.adoc
@@ -1,6 +1,5 @@
 NFS Backend
 -----------
 NFS Backend
 -----------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: NFS
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: NFS

diff --git a/pve-storage-rbd.adoc b/pve-storage-rbd.adoc
index cafc5da83710fe1316a4f59870277bc08d70fbd2..c33b70e0fd1af14cfe17ba2d69605f14db50ee2b 100644 (file)
--- a/pve-storage-rbd.adoc
+++ b/pve-storage-rbd.adoc
@@ -1,6 +1,5 @@
 Ceph RADOS Block Devices (RBD)
 ------------------------------
 Ceph RADOS Block Devices (RBD)
 ------------------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: RBD
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: RBD

diff --git a/pve-storage-zfspool.adoc b/pve-storage-zfspool.adoc
index 79749846f06942c190c41b5bf8a30d522fc50b08..ca1b771ab711e6d16b7c62d44315d260b2acc44f 100644 (file)
--- a/pve-storage-zfspool.adoc
+++ b/pve-storage-zfspool.adoc
@@ -1,6 +1,5 @@
 Local ZFS Pool Backend
 ----------------------
 Local ZFS Pool Backend
 ----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: ZFS
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: ZFS

diff --git a/pve-system-requirements.adoc b/pve-system-requirements.adoc
index a5bbffa3969a07823bb42b5cbb60822c04697f6e..52aa608652904d3e65fa9b0a1e566ef3a226a666 100644 (file)
--- a/pve-system-requirements.adoc
+++ b/pve-system-requirements.adoc
@@ -1,6 +1,5 @@
 System Requirements
 -------------------
 System Requirements
 -------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pve-usbstick.adoc b/pve-usbstick.adoc
index fb30a4c92307f252d27d534ea653c662c60796c2..5f01aae2120f8077ca783b8a0fbdb9a032e2f732 100644 (file)
--- a/pve-usbstick.adoc
+++ b/pve-usbstick.adoc
@@ -1,6 +1,5 @@
 Install from USB Stick
 ----------------------
 Install from USB Stick
 ----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/pveam.adoc b/pveam.adoc
index 97d9d5bc97eff38c5971ad5b29d112a0a8ddcc19..43da99c9377991d6ea7567b3f3bd5523bf4e53bc 100644 (file)
--- a/pveam.adoc
+++ b/pveam.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pveam(1)
 ========
 ifdef::manvolnum[]
 pveam(1)
 ========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Container Images
 ================
 ifndef::manvolnum[]
 Container Images
 ================

-include::attributes.txt[]

 endif::manvolnum[]
 
 Command line tool to manage container images. See `man pct` for usage
 endif::manvolnum[]
 
 Command line tool to manage container images. See `man pct` for usage

diff --git a/pveceph.adoc b/pveceph.adoc
index bc190d98671daad1eca4f88d2a1cde72f3eec132..915017e16c585e5b6ed34a0d2525d62e33eb6c27 100644 (file)
--- a/pveceph.adoc
+++ b/pveceph.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pveceph(1)
 ==========
 ifdef::manvolnum[]
 pveceph(1)
 ==========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pveceph - Manage CEPH Services on Proxmox VE Nodes
 ==================================================
 ifndef::manvolnum[]
 pveceph - Manage CEPH Services on Proxmox VE Nodes
 ==================================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 Tool to manage http://ceph.com[CEPH] services on {pve} nodes.
 endif::manvolnum[]
 
 Tool to manage http://ceph.com[CEPH] services on {pve} nodes.

diff --git a/pvecm.adoc b/pvecm.adoc
index bb1477b8810ee06bcab2489443234f00d9a58637..8db8e473202f7921456b6cdd40c81e3619bce725 100644 (file)
--- a/pvecm.adoc
+++ b/pvecm.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pvecm(1)
 ========
 ifdef::manvolnum[]
 pvecm(1)
 ========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Cluster Manager
 ===============
 ifndef::manvolnum[]
 Cluster Manager
 ===============

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 

diff --git a/pvedaemon.adoc b/pvedaemon.adoc
index fc554a50c5398442229429b3cf63d9b7a3da5b01..66c751a17cb2aaf152e0656d9454379d0c3cca79 100644 (file)
--- a/pvedaemon.adoc
+++ b/pvedaemon.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pvedaemon(8)
 ============
 ifdef::manvolnum[]
 pvedaemon(8)
 ============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pvedaemon - Proxmox VE API Daemon
 =================================
 ifndef::manvolnum[]
 pvedaemon - Proxmox VE API Daemon
 =================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This daemon exposes the whole {pve} API on `127.0.0.1:85`. It runs as
 endif::manvolnum[]
 
 This daemon exposes the whole {pve} API on `127.0.0.1:85`. It runs as

diff --git a/pveperf.adoc b/pveperf.adoc
index 4a01f90872f13a544b32f916b6e910c802bb3098..bb11509d6753a64a4231fc72027c88b12a867d9f 100644 (file)
--- a/pveperf.adoc
+++ b/pveperf.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pveperf(1)
 ==========
 ifdef::manvolnum[]
 pveperf(1)
 ==========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pveperf - Proxmox VE Benchmark Script
 =====================================
 ifndef::manvolnum[]
 pveperf - Proxmox VE Benchmark Script
 =====================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 Tries to gather some CPU/hard disk performance data on the hard disk
 endif::manvolnum[]
 
 Tries to gather some CPU/hard disk performance data on the hard disk

diff --git a/pveproxy.adoc b/pveproxy.adoc
index 5ea15fe96e69ee974088e729317ded8871cf1d06..5b831066f00a5ae282da85760c61ccf79677e827 100644 (file)
--- a/pveproxy.adoc
+++ b/pveproxy.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pveproxy(8)
 ===========
 ifdef::manvolnum[]
 pveproxy(8)
 ===========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pveproxy - Proxmox VE API Proxy Daemon
 ======================================
 ifndef::manvolnum[]
 pveproxy - Proxmox VE API Proxy Daemon
 ======================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This daemon exposes the whole {pve} API on TCP port 8006 using
 endif::manvolnum[]
 
 This daemon exposes the whole {pve} API on TCP port 8006 using

diff --git a/pvesm.adoc b/pvesm.adoc
index d41ab41c08a16ad181b69f56b5bc583eb7dcc22d..97390875d21d7d82fa1355677439544bf3dc6ab6 100644 (file)
--- a/pvesm.adoc
+++ b/pvesm.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pvesm(1)
 ========
 ifdef::manvolnum[]
 pvesm(1)
 ========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 {pve} Storage
 =============
 ifndef::manvolnum[]
 {pve} Storage
 =============

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]

diff --git a/pvestatd.adoc b/pvestatd.adoc
index eb968746970c6f0ebd67fc9e1300bf48c6c1eb0a..5a51ad776b36820a79fa67f3c4d407d538abdbfe 100644 (file)
--- a/pvestatd.adoc
+++ b/pvestatd.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pvestatd(8)
 ===========
 ifdef::manvolnum[]
 pvestatd(8)
 ===========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pvestatd - Proxmox VE Status Daemon
 ===================================
 ifndef::manvolnum[]
 pvestatd - Proxmox VE Status Daemon
 ===================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This daemon queries the status of VMs, storages and containers at
 endif::manvolnum[]
 
 This daemon queries the status of VMs, storages and containers at

diff --git a/pvesubscription.adoc b/pvesubscription.adoc
index 910cdb7b673238441505742ac6c9075ac179d08b..75af064c7d9283739b3a2157fc9a8d697f47799b 100644 (file)
--- a/pvesubscription.adoc
+++ b/pvesubscription.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pvesubscription(1)
 ==================
 ifdef::manvolnum[]
 pvesubscription(1)
 ==================

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 pvesubscription - Subscription Management
 =========================================
 ifndef::manvolnum[]
 pvesubscription - Subscription Management
 =========================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 This tool is used to handle {pve} subscriptions.
 endif::manvolnum[]
 
 This tool is used to handle {pve} subscriptions.

diff --git a/pveum.adoc b/pveum.adoc
index 14fff2563f0df0e9dd6b6a71e3b1a8708afec541..db196b537389a2631113f11ac268987cf0e8ad2c 100644 (file)
--- a/pveum.adoc
+++ b/pveum.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pveum(1)
 ========
 ifdef::manvolnum[]
 pveum(1)
 ========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 User Management
 ===============
 ifndef::manvolnum[]
 User Management
 ===============

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 

diff --git a/qm.adoc b/qm.adoc
index eeb4ae673c13381d1d47a2be4fad750f55fbefe0..47813f777f812daf022b42697e2aac8e71ec1215 100644 (file)
--- a/qm.adoc
+++ b/qm.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 qm(1)
 =====
 ifdef::manvolnum[]
 qm(1)
 =====

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================
 ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 

diff --git a/qm.conf.adoc b/qm.conf.adoc
index 70392e6b52e2dedde834597230ef9486670995ac..ddfd65dcf7e9bfa021dfee8ee9096799ba9be6c8 100644 (file)
--- a/qm.conf.adoc
+++ b/qm.conf.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 qm.conf(5)
 ==========
 ifdef::manvolnum[]
 qm.conf(5)
 ==========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Virtual Machine Configuration
 =============================
 ifndef::manvolnum[]
 Virtual Machine Configuration
 =============================

-include::attributes.txt[]

 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:

diff --git a/qmrestore.adoc b/qmrestore.adoc
index 2898372c3ef11dca4190fbe33aeba1094f04ee6b..37f185af80a3e4c3a9bd58ebcd8e7fcafcf424fd 100644 (file)
--- a/qmrestore.adoc
+++ b/qmrestore.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 qmrestore(1)
 ============
 ifdef::manvolnum[]
 qmrestore(1)
 ============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Restore Virtual Machines
 ========================
 ifndef::manvolnum[]
 Restore Virtual Machines
 ========================

-include::attributes.txt[]

 endif::manvolnum[]
 
 
 endif::manvolnum[]
 
 

diff --git a/scan-adoc-refs b/scan-adoc-refs
index 732bc34cc74637700f623e6a8859dc3b01464911..9252701634d239e832bac4f72c14c4fac30edb8b 100755 (executable)
--- a/scan-adoc-refs
+++ b/scan-adoc-refs
@@ -467,6 +467,7 @@ if ($generate_depends) {
        my $filelist = $fileinfo->{outfile}->{$e};
        foreach my $sourcefile (sort keys %$filelist) {
            my $varname = $depend_varname_hash->{$sourcefile};
        my $filelist = $fileinfo->{outfile}->{$e};
        foreach my $sourcefile (sort keys %$filelist) {
            my $varname = $depend_varname_hash->{$sourcefile};

+           next if !defined($varname);

            my $target = $filelist->{$sourcefile};
            my $dep = "\$\{$varname\}";
            $make_targets->{$target} = $dep;
            my $target = $filelist->{$sourcefile};
            my $dep = "\$\{$varname\}";
            $make_targets->{$target} = $dep;

diff --git a/spiceproxy.adoc b/spiceproxy.adoc
index d030090fde57a38f360241acb0ab8c9cf1b01e45..4ebee692b897d13a4d01474ea0573b199feb71e8 100644 (file)
--- a/spiceproxy.adoc
+++ b/spiceproxy.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 spiceproxy(8)
 =============
 ifdef::manvolnum[]
 spiceproxy(8)
 =============

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 spiceproxy - SPICE Proxy Service
 ================================
 ifndef::manvolnum[]
 spiceproxy - SPICE Proxy Service
 ================================

-include::attributes.txt[]

 endif::manvolnum[]
 
 http://www.spice-space.org[SPICE] (the Simple Protocol for Independent
 endif::manvolnum[]
 
 http://www.spice-space.org[SPICE] (the Simple Protocol for Independent

diff --git a/sysadmin.adoc b/sysadmin.adoc
index 9f5582dfa937ff74f456d719f4147b2c2132a564..421ab941bc87ebecd592cdf5498f687b8482942f 100644 (file)
--- a/sysadmin.adoc
+++ b/sysadmin.adoc
@@ -1,7 +1,6 @@
 [[chapter_system_administration]]
 Host System Administration
 ==========================
 [[chapter_system_administration]]
 Host System Administration
 ==========================

-include::attributes.txt[]

 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]

diff --git a/system-software-updates.adoc b/system-software-updates.adoc
index dce7979e8924d2b304a82c17d869e54b2bdc0c2a..04c17f3f07cd0ea0884dc7798bf194f1bed47614 100644 (file)
--- a/system-software-updates.adoc
+++ b/system-software-updates.adoc
@@ -1,6 +1,5 @@
 System Software Updates
 -----------------------
 System Software Updates
 -----------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/system-timesync.adoc b/system-timesync.adoc
index 86e16d309dc613c2fd9f36f21d4ab6192bbc1ac2..e30788343c2eb476da5e3f7cae3d037ded3bf56a 100644 (file)
--- a/system-timesync.adoc
+++ b/system-timesync.adoc
@@ -1,6 +1,5 @@
 Time Synchronization
 --------------------
 Time Synchronization
 --------------------

-include::attributes.txt[]

 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]

diff --git a/vzdump.adoc b/vzdump.adoc
index 12055b4c9b302ebd5afe7e561671e01278bb7e81..5c6804c959af68ab2a2eb9a9163053cb67baafce 100644 (file)
--- a/vzdump.adoc
+++ b/vzdump.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 vzdump(1)
 =========
 ifdef::manvolnum[]
 vzdump(1)
 =========

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Backup and Restore
 ==================
 ifndef::manvolnum[]
 Backup and Restore
 ==================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]