generate default output file mappings automatically

datacenter.cfg.adoc

@@ -24,9 +24,9 @@ ifndef::manvolnum[]
 Datacenter Configuration
 ========================
 include::attributes.txt[]
+:pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
-:pve-toplevel:
 :title: Manual: datacenter.cfg
 endif::wiki[]
 

ha-manager.adoc

@@ -22,10 +22,8 @@ ifndef::manvolnum[]
 High Availability
 =================
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 Our modern society depends heavily on information provided by
 computers over the network. Mobile devices amplified that dependency,

pct.adoc

@@ -24,9 +24,9 @@ ifndef::manvolnum[]
 Proxmox Container Toolkit
 =========================
 include::attributes.txt[]
+:pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
-:pve-toplevel:
 :title: Linux Container
 endif::wiki[]
 

pmxcfs.adoc

@@ -22,10 +22,8 @@ ifndef::manvolnum[]
 Proxmox Cluster File System (pmxcfs)
 ====================================
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 The Proxmox Cluster file system (``pmxcfs'') is a database-driven file
 system for storing configuration files, replicated in real time to all

pve-bibliography.adoc

@@ -2,9 +2,9 @@
 Bibliography
 ============
 include::attributes.txt[]
-ifdef::wiki[]
+ifndef::manvolnum[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 [bibliography]
 .Books about {pve}

pve-faq.adoc

@@ -1,8 +1,10 @@
 Frequently Asked Questions
 ==========================
 include::attributes.txt[]
-ifdef::wiki[]
+ifndef::manvolnum[]
 :pve-toplevel:
+endif::manvolnum[]
+ifdef::wiki[]
 :title: FAQ
 endif::wiki[]
 

pve-firewall.adoc

@@ -24,9 +24,9 @@ ifndef::manvolnum[]
 {pve} Firewall
 ==============
 include::attributes.txt[]
+:pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
-:pve-toplevel:
 :title: Firewall
 endif::wiki[]
 

pve-installation.adoc

@@ -1,8 +1,10 @@
 Installing Proxmox VE
 =====================
 include::attributes.txt[]
-ifdef::wiki[]
+ifndef::manvolnum[]
 :pve-toplevel:
+endif::manvolnum[]
+ifdef::wiki[]
 :title: Installation
 endif::wiki[]
 

pvecm.adoc

@@ -22,10 +22,8 @@ ifndef::manvolnum[]
 Cluster Manager
 ===============
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 The {PVE} cluster manager `pvecm` is a tool to create a group of
 physical servers. Such a group is called a *cluster*. We use the

pvesm.adoc

@@ -23,9 +23,9 @@ ifndef::manvolnum[]
 {pve} Storage
 =============
 include::attributes.txt[]
+:pve-toplevel:
 endif::manvolnum[]
 ifdef::wiki[]
-:pve-toplevel:
 :title: Storage
 endif::wiki[]
 

pveum.adoc

@@ -24,10 +24,8 @@ ifndef::manvolnum[]
 User Management
 ===============
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 // Copied from pve wiki: Revision as of 16:10, 27 October 2015
 

qm.adoc

@@ -23,10 +23,8 @@ ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 // deprecates
 // http://pve.proxmox.com/wiki/Container_and_Full_Virtualization

scan-adoc-refs

@@ -14,27 +14,7 @@ my $environments = {
     pvelogo => 0, # ignore
 };
 
-my $fileinfo = {
+my $fileinfo = {};
-    outfile => {
-	default => {
-	    "pve-admin-guide.adoc" => "pve-admin-guide.html",
-	    "datacenter.cfg.adoc" => "datacenter.cfg.5.html",
-	    "ha-manager.adoc" => "chapter-ha-manager.html",
-	    "pct.adoc" => "chapter-pct.html",
-	    "pve-bibliography.adoc" => "chapter-pve-bibliography.html",
-	    "pve-firewall.adoc" => "chapter-pve-firewall.html",
-	    "pve-installation.adoc" => "chapter-pve-installation.html",
-	    "pvecm.adoc" => "chapter-pvecm.html",
-	    "pvesm.adoc" => "chapter-pvesm.html",
-	    "pveum.adoc" => "chapter-pveum.html",
-	    "qm.adoc" => "chapter-qm.html",
-	    "sysadmin.adoc" => "chapter-sysadmin.html",
-	    "vzdump.adoc" => "chapter-vzdump.html",
-	    "pmxcfs.adoc" => "chapter-pmxcfs.html",
-	    "pve-faq.adoc" => "chapter-pve-faq.html",
-	},
-    },
-};
 
 my $start_env = [];
 foreach my $e (keys %$environments) {
@@ -291,9 +271,24 @@ foreach my $e (@$start_env) {
 	} elsif ($e eq 'manvolnum') {
 	    my $realfn = $fn;
 	    $realfn =~ s/\.adoc$//;
-	    die "toplevel file '$fn' is marhes as manual page!" if !$mansection;
+	    die "toplevel file '$fn' is not marked as manual page!" if !$mansection;
 	    $realfn .= ".$mansection";
 	    $fileinfo->{outfile}->{$e}->{$fn} = $realfn;
+	} elsif ($e eq 'default') {
+	    my $realfn = $fn;
+	    $realfn =~ s/\.adoc$//;		    
+	    if (defined($mansection) && ($mansection == 5)) {
+		$realfn .= ".$mansection";
+		$realfn = "$realfn.html";
+	    } else {
+		if (($fn ne 'pve-admin-guide.adoc') &&
+		    $fileinfo->{doctype}->{$e}->{$fn} == 0) {
+		    $realfn = "chapter-$realfn.html";	    
+		} else {
+		    $realfn = "$realfn.html";
+		}
+	    }
+	    $fileinfo->{outfile}->{$e}->{$fn} = $realfn;
 	}
     }
 }

sysadmin.adoc

@@ -2,9 +2,9 @@
 Host System Administration
 ==========================
 include::attributes.txt[]
-ifdef::wiki[]
+ifndef::manvolnum[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 {pve} is based on the famous https://www.debian.org/[Debian] Linux
 distribution. That means that you have access to the whole world of

vzdump.adoc

@@ -24,10 +24,8 @@ ifndef::manvolnum[]
 Backup and Restore
 ==================
 include::attributes.txt[]
-endif::manvolnum[]
-ifdef::wiki[]
 :pve-toplevel:
-endif::wiki[]
+endif::manvolnum[]
 
 Backups are a requirements for any sensible IT deployment, and {pve}
 provides a fully integrated solution, using the capabilities of each