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

maurerdietmar · maurerdietmar · commit a69bfc83f6d2 · 2016-11-08T06:46:43.000+01:00
diff --git a/README.adoc b/README.adoc
@@ -1,6 +1,5 @@
 Proxmox VE Documentation
 ========================
-include::attributes.txt[]
 
 We try to generate high quality documentation for
 {website}[{pve}], and choose to use
@@ -42,8 +41,8 @@ those Debian packages using:
  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
@@ -59,13 +58,12 @@ description
 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
 ----------------------------------
diff --git a/attributes.txt b/attributes.txt
diff --git a/datacenter.cfg.adoc b/datacenter.cfg.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 datacenter.cfg(5)
 =================
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Datacenter Configuration
 ========================
-include::attributes.txt[]
 endif::manvolnum[]
 ifdef::wiki[]
 :title: Manual: datacenter.cfg
diff --git a/getting-help.adoc b/getting-help.adoc
@@ -1,7 +1,6 @@
 [[getting_help]]
 Getting Help
 ------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/ha-manager.adoc b/ha-manager.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 ha-manager(1)
 =============
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 High Availability
 =================
-include::attributes.txt[]
 :pve-toplevel:
 endif::manvolnum[]
 
diff --git 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
 --------------------------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/index.adoc b/index.adoc
@@ -1,6 +1,5 @@
 image:./images/proxmox-logo.svg[] pass:[<br>] {pve} Documentation Index
 ========================================================================
-include::attributes.txt[]
 :data-uri:
 :icons:
 :title: {pve} Documentation Index
diff --git a/local-lvm.adoc b/local-lvm.adoc
@@ -1,6 +1,5 @@
 Logical Volume Manager (LVM)
 ----------------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/local-zfs.adoc b/local-zfs.adoc
@@ -1,6 +1,5 @@
 ZFS on Linux
 ------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pct.adoc b/pct.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pct(1)
 ======
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Proxmox Container Toolkit
 =========================
-include::attributes.txt[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
diff --git a/pct.conf.adoc b/pct.conf.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pct.conf(5)
 ===========
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Container Configuration
 =======================
-include::attributes.txt[]
 endif::manvolnum[]
 ifdef::wiki[]
 :pve-toplevel:
diff --git a/pmxcfs.adoc b/pmxcfs.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pmxcfs(8)
 =========
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -21,7 +20,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Proxmox Cluster File System (pmxcfs)
 ====================================
-include::attributes.txt[]
 :pve-toplevel:
 endif::manvolnum[]
 
diff --git a/pve-admin-guide.adoc b/pve-admin-guide.adoc
@@ -6,7 +6,6 @@ ifndef::pvelogo[]
 Proxmox VE Administration Guide
 ===============================
 endif::pvelogo[]
-include::attributes.txt[]
 :doctype:   book
 :title: Proxmox VE Administration Guide
 :toc:
diff --git a/pve-bibliography.adoc b/pve-bibliography.adoc
@@ -1,7 +1,6 @@
 [bibliography]
 Bibliography
 ============
-include::attributes.txt[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
diff --git a/pve-disk-health-monitoring.adoc b/pve-disk-health-monitoring.adoc
@@ -1,6 +1,5 @@
 Disk Health Monitoring
 ----------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git 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}			\
-	attributes.txt                  \
 	pve-copyright.adoc              \
 	docinfo.xml
 
@@ -76,4 +75,4 @@ chapter-%.html: %.adoc ${PVE_COMMON_DOC_SOURCES}
 
 .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
@@ -1,6 +1,5 @@
 External Metric Server
 ----------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pve-faq.adoc b/pve-faq.adoc
@@ -1,6 +1,5 @@
 Frequently Asked Questions
 ==========================
-include::attributes.txt[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
diff --git a/pve-firewall.adoc b/pve-firewall.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pve-firewall(8)
 ===============
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -23,7 +22,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 {pve} Firewall
 ==============
-include::attributes.txt[]
 :pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
diff --git a/pve-ha-crm.adoc b/pve-ha-crm.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pve-ha-crm(8)
 =============
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Cluster Resource Manager Daemon
 ================================
-include::attributes.txt[]
 endif::manvolnum[]
 
 This is the Cluster Resource Manager Daemon.
diff --git a/pve-ha-lrm.adoc b/pve-ha-lrm.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pve-ha-lrm(8)
 =============
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Local Resource Manager Daemon
 ==============================
-include::attributes.txt[]
 endif::manvolnum[]
 
 This is the Local Resource Manager Daemon.
diff --git a/pve-installation.adoc b/pve-installation.adoc
@@ -1,6 +1,5 @@
 Installing Proxmox VE
 =====================
-include::attributes.txt[]
 ifndef::manvolnum[]
 :pve-toplevel:
 endif::manvolnum[]
diff --git a/pve-network.adoc b/pve-network.adoc
@@ -1,7 +1,6 @@
 [[sysadmin_network_configuration]]
 Network Configuration
 ---------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc
@@ -1,7 +1,6 @@
 [[sysadmin_package_repositories]]
 Package Repositories
 --------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pve-storage-dir.adoc b/pve-storage-dir.adoc
@@ -1,6 +1,5 @@
 Directory Backend
 -----------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: Directory
diff --git a/pve-storage-glusterfs.adoc b/pve-storage-glusterfs.adoc
@@ -1,6 +1,5 @@
 GlusterFS Backend
 -----------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: GlusterFS
diff --git a/pve-storage-iscsi.adoc b/pve-storage-iscsi.adoc
@@ -1,6 +1,5 @@
 http://www.open-iscsi.org/[Open-iSCSI] initiator
 ------------------------------------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: iSCSI
diff --git a/pve-storage-iscsidirect.adoc b/pve-storage-iscsidirect.adoc
@@ -1,6 +1,5 @@
 User Mode iSCSI Backend
 -----------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: User Mode iSCSI
diff --git a/pve-storage-lvm.adoc b/pve-storage-lvm.adoc
@@ -1,6 +1,5 @@
 LVM Backend
 -----------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM
diff --git a/pve-storage-lvmthin.adoc b/pve-storage-lvmthin.adoc
@@ -1,6 +1,5 @@
 LVM thin Backend
 ----------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: LVM Thin
diff --git a/pve-storage-nfs.adoc b/pve-storage-nfs.adoc
@@ -1,6 +1,5 @@
 NFS Backend
 -----------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: NFS
diff --git a/pve-storage-rbd.adoc b/pve-storage-rbd.adoc
@@ -1,6 +1,5 @@
 Ceph RADOS Block Devices (RBD)
 ------------------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: RBD
diff --git a/pve-storage-zfspool.adoc b/pve-storage-zfspool.adoc
@@ -1,6 +1,5 @@
 Local ZFS Pool Backend
 ----------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 :title: Storage: ZFS
diff --git a/pve-system-requirements.adoc b/pve-system-requirements.adoc
@@ -1,6 +1,5 @@
 System Requirements
 -------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pve-usbstick.adoc b/pve-usbstick.adoc
@@ -1,6 +1,5 @@
 Install from USB Stick
 ----------------------
-include::attributes.txt[]
 ifdef::wiki[]
 :pve-toplevel:
 endif::wiki[]
diff --git a/pveam.adoc b/pveam.adoc
@@ -1,7 +1,6 @@
 ifdef::manvolnum[]
 pveam(1)
 ========
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Container Images
 ================
-include::attributes.txt[]
 endif::manvolnum[]
 
 Command line tool to manage container images. See `man pct` for usage
diff --git a/pveceph.adoc b/pveceph.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 pveceph(1)
 ==========
-include::attributes.txt[]
 :pve-toplevel:
 
 NAME
@@ -21,7 +20,6 @@ endif::manvolnum[]
 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.
diff --git a/pvecm.adoc b/pvecm.adoc
diff --git a/pvedaemon.adoc b/pvedaemon.adoc
diff --git a/pveperf.adoc b/pveperf.adoc
diff --git a/pveproxy.adoc b/pveproxy.adoc
diff --git a/pvesm.adoc b/pvesm.adoc
diff --git a/pvestatd.adoc b/pvestatd.adoc
diff --git a/pvesubscription.adoc b/pvesubscription.adoc
diff --git a/pveum.adoc b/pveum.adoc
diff --git a/qm.adoc b/qm.adoc
diff --git a/qm.conf.adoc b/qm.conf.adoc
diff --git a/qmrestore.adoc b/qmrestore.adoc
diff --git a/scan-adoc-refs b/scan-adoc-refs
diff --git a/spiceproxy.adoc b/spiceproxy.adoc
diff --git a/sysadmin.adoc b/sysadmin.adoc
diff --git a/system-software-updates.adoc b/system-software-updates.adoc
diff --git a/system-timesync.adoc b/system-timesync.adoc
diff --git a/vzdump.adoc b/vzdump.adoc
