pct.adoc: add CPU and Memory sections

[pve-docs.git] / asciidoc-pve.in

diff --git a/asciidoc-pve.in b/asciidoc-pve.in
index e298abfed0551e1e447754ddd7816dbdef00635d..8550bac19327bc52ef06c39f282ec7d9ac5534d9 100644 (file)
--- a/asciidoc-pve.in
+++ b/asciidoc-pve.in
@@ -234,6 +234,12 @@ sub prepare_adoc_file {
            next;
        }
 
+       if ($line =~ m/xref:\S+?\[[^\]]*$/) {
+           die "possible xref spanning multiple lines in '$filename':\n(line $.): $line\n";
+       }
+       if ($line =~ m/<<((?!\>\>).)*$/) {
+           die "possible xref spanning multiple lines in '$filename':\n(line $.): $line\n";
+       }
        # fix xrefs
        $line =~ s/xref:([^\s\[\]]+)\[([^\]]*)\]/replace_xref(${target_env},$1,$2)/ge;
 
@@ -262,7 +268,7 @@ sub compile_asciidoc {
        die "too many arguments...\n";
 
     my $outfilemap = $fileinfo->{outfile}->{$env}->{$infile} ||
-       die "no output file mapping '$infile => $outfile' ($env)";
+       die "no output file mapping for '$infile' ($env)";
 
     if ($man_target eq 'html') {
        $outfilemap .= '.html';
@@ -270,8 +276,12 @@ sub compile_asciidoc {
        $outfilemap .= '-plain.html';
     }
 
-    die "wrong output file name '$outfile != $outfilemap' ($env)"
-       if $outfile ne $outfilemap;
+    if (defined($outfile)) {
+       die "wrong output file name '$outfile != $outfilemap' ($env)"
+           if $outfile ne $outfilemap;
+    } else {
+       $outfile = $outfilemap;
+    }
 
     defined($fileinfo->{titles}->{$env}) ||
        die "unknown environment '$env'";
@@ -378,8 +388,6 @@ sub compile_asciidoc {
        if (($env eq 'wiki') ||
            (($env eq 'manvolnum') && ($man_target eq 'wiki'))) {
 
-           push @$cmd, '-s';
-
            if (-f "./asciidoc/mediawiki.conf") {
                my $cwd = getcwd();
                push @$cmd, '-b', "$cwd/asciidoc/mediawiki";