From f2f9742d4d7c9e8132f753bb9eff8b478dd2f899 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 3 May 2013 15:25:37 +0100 Subject: [PATCH] Fix multiple formatting problems in HTML docs The rule generating the HTML docs passing the --html flag to xsltproc. This makes it use the legacy HTML parser, which either ignores or tries to fix all sorts of broken XML tags. There's no reason why we should be writing broken XML in the first place, so removing --html and adding the XHTML doctype to all files forces us to create good XML. This adds the XHTML doc type and fixes many, many XML tag problems it exposes. Signed-off-by: Daniel P. Berrange --- docs/404.html.in | 5 +++-- docs/Makefile.am | 6 +++--- docs/api.html.in | 5 +++-- docs/api_extension.html.in | 4 +++- docs/apps.html.in | 5 ++++- docs/archdomain.html.in | 4 +++- docs/architecture.html.in | 5 +++-- docs/archnetwork.html.in | 5 +++-- docs/archnode.html.in | 4 +++- docs/archstorage.html.in | 4 +++- docs/auth.html.in | 5 +++-- docs/bindings.html.in | 5 +++-- docs/bugs.html.in | 5 +++-- docs/compiling.html.in | 5 +++-- docs/contact.html.in | 5 +++-- docs/csharp.html.in | 5 +++-- docs/deployment.html.in | 4 +++- docs/devguide.html.in | 5 +++-- docs/docs.html.in | 4 +++- docs/downloads.html.in | 5 +++-- docs/drivers.html.in | 4 +++- docs/drvesx.html.in | 5 ++++- docs/drvhyperv.html.in | 5 ++++- docs/drvlxc.html.in | 4 +++- docs/drvopenvz.html.in | 4 +++- docs/drvparallels.html.in | 5 ++++- docs/drvphyp.html.in | 5 ++++- docs/drvqemu.html.in | 7 +++++-- docs/drvremote.html.in | 4 +++- docs/drvtest.html.in | 4 +++- docs/drvuml.html.in | 4 +++- docs/drvvbox.html.in | 4 +++- docs/drvvmware.html.in | 4 +++- docs/drvxen.html.in | 4 +++- docs/errors.html.in | 5 +++-- docs/firewall.html.in | 5 +++-- docs/format.html.in | 3 ++- docs/formatcaps.html.in | 4 +++- docs/formatdomain.html.in | 15 ++++++++++++--- docs/formatnetwork.html.in | 4 +++- docs/formatnode.html.in | 4 +++- docs/formatnwfilter.html.in | 16 +++++++++------- docs/formatsecret.html.in | 4 +++- docs/formatsnapshot.html.in | 4 +++- docs/formatstorage.html.in | 4 +++- docs/formatstorageencryption.html.in | 4 +++- docs/goals.html.in | 5 +++-- docs/hacking.html.in | 4 +++- docs/hacking1.xsl | 10 ++++++---- docs/hacking2.xsl | 24 +++++++++++++----------- docs/hooks.html.in | 5 +++-- docs/index.html.in | 5 +++-- docs/internals.html.in | 4 +++- docs/internals/command.html.in | 4 +++- docs/internals/locking.html.in | 4 +++- docs/internals/rpc.html.in | 5 ++++- docs/intro.html.in | 5 +++-- docs/java.html.in | 5 +++-- docs/locking.html.in | 5 +++-- docs/logging.html.in | 5 +++-- docs/migration.html.in | 14 ++++++++------ docs/news.html.in | 5 +++-- docs/pending.html.in | 4 +++- docs/php.html.in | 5 +++-- docs/python.html.in | 5 +++-- docs/relatedlinks.html.in | 4 +++- docs/remote.html.in | 5 +++-- docs/sitemap.html.in | 4 +++- docs/storage.html.in | 5 +++-- docs/testapi.html.in | 7 ++++--- docs/testsuites.html.in | 7 +++++-- docs/testtck.html.in | 7 ++++--- docs/uri.html.in | 5 +++-- docs/virshcmdref.html.in | 5 +++-- docs/windows.html.in | 5 +++-- 75 files changed, 269 insertions(+), 138 deletions(-) diff --git a/docs/404.html.in b/docs/404.html.in index 6021ad0d08..5b771bb156 100644 --- a/docs/404.html.in +++ b/docs/404.html.in @@ -1,5 +1,6 @@ - - + + +

404 page not found

diff --git a/docs/Makefile.am b/docs/Makefile.am index 137756b11b..b4855d12de 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -171,7 +171,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in echo "Generating $@"; \ $(MKDIR_P) internals; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet --html \ + $(XSLTPROC) --stringparam pagename $$name --nonet \ $(top_srcdir)/docs/subsite.xsl $< > $@ \ || { rm $@ && exit 1; }; fi @@ -179,7 +179,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet --html \ + $(XSLTPROC) --stringparam pagename $$name --nonet \ $(top_srcdir)/docs/site.xsl $< > $@ \ || { rm $@ && exit 1; }; fi @@ -196,7 +196,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ - $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet --html \ + $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \ $(top_srcdir)/docs/site.xsl $< > $@ \ || { rm $@ && exit 1; }; fi diff --git a/docs/api.html.in b/docs/api.html.in index 12dfaeee89..f77e9db70b 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -1,5 +1,6 @@ - - + + +

The libvirt API concepts

diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 83c488c636..6718625364 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -1,4 +1,6 @@ - + + +

Implementing a new API in Libvirt

diff --git a/docs/apps.html.in b/docs/apps.html.in index 76020d8c46..9fdfddb74d 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -1,4 +1,6 @@ - + + +

Applications using libvirt

@@ -340,6 +342,7 @@
  • Shows you Systems Inventory (based on Facter) and provides real time information about hosts status based on Puppet reports.
    • + diff --git a/docs/archdomain.html.in b/docs/archdomain.html.in index 294fecb37a..50843a0964 100644 --- a/docs/archdomain.html.in +++ b/docs/archdomain.html.in @@ -1,4 +1,6 @@ - + + +

    Domain management architecture

    diff --git a/docs/architecture.html.in b/docs/architecture.html.in index d846396bba..5d3d441ba3 100644 --- a/docs/architecture.html.in +++ b/docs/architecture.html.in @@ -1,5 +1,6 @@ - - + + +

    libvirt architecture

    diff --git a/docs/archnetwork.html.in b/docs/archnetwork.html.in index c7ca4cacd6..5ff330c043 100644 --- a/docs/archnetwork.html.in +++ b/docs/archnetwork.html.in @@ -1,5 +1,6 @@ - - + + +

    Network management architecture

    diff --git a/docs/archnode.html.in b/docs/archnode.html.in index b3d50dd83d..ab446dcf88 100644 --- a/docs/archnode.html.in +++ b/docs/archnode.html.in @@ -1,4 +1,6 @@ - + + +

    Node device management architecture

    diff --git a/docs/archstorage.html.in b/docs/archstorage.html.in index 059f0b7921..fb74f18670 100644 --- a/docs/archstorage.html.in +++ b/docs/archstorage.html.in @@ -1,4 +1,6 @@ - + + +

    Storage management architecture

    diff --git a/docs/auth.html.in b/docs/auth.html.in index 1bd02f2bd6..e5703c7f6d 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -1,5 +1,6 @@ - - + + +

    Authentication & access control

    diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 74b3e2c95e..13b7d71141 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -1,5 +1,6 @@ - - + + +

    Bindings for other languages

    diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 7436a717a0..3d79b32632 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -1,5 +1,6 @@ - - + + +

    Bug reporting

    diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 0bfb2981bc..66d2925a5d 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -1,5 +1,6 @@ - - + + +

    libvirt Installation

    diff --git a/docs/contact.html.in b/docs/contact.html.in index 1f5103c4a8..e34de67b22 100644 --- a/docs/contact.html.in +++ b/docs/contact.html.in @@ -1,5 +1,6 @@ - - + + +

    Contacting the development team

    diff --git a/docs/csharp.html.in b/docs/csharp.html.in index 62da6a8533..4c35c871d2 100644 --- a/docs/csharp.html.in +++ b/docs/csharp.html.in @@ -1,5 +1,6 @@ - - + + +

    C# API bindings

    diff --git a/docs/deployment.html.in b/docs/deployment.html.in index 8ef383b423..d7d38ba883 100644 --- a/docs/deployment.html.in +++ b/docs/deployment.html.in @@ -1,4 +1,6 @@ - + + +

    Deployment

    diff --git a/docs/devguide.html.in b/docs/devguide.html.in index ba499db7d0..122fe249b4 100644 --- a/docs/devguide.html.in +++ b/docs/devguide.html.in @@ -1,5 +1,6 @@ - - + + +

    libvirt Application Development Guide

    diff --git a/docs/docs.html.in b/docs/docs.html.in index 970a79ac1a..d4887db9a8 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -1,4 +1,6 @@ - + + +

    Documentation

    diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 64a16c9f37..83b8751580 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -1,5 +1,6 @@ - - + + +

    Downloads

    diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 3d79ed5d0b..7aa44f3b8e 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -1,4 +1,6 @@ - + + +

    Internal drivers

    diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 11df124d3b..0816bafc3f 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -1,4 +1,7 @@ - + + + +

    VMware ESX hypervisor driver

    diff --git a/docs/drvhyperv.html.in b/docs/drvhyperv.html.in index 7f0accd3e1..7acf86f841 100644 --- a/docs/drvhyperv.html.in +++ b/docs/drvhyperv.html.in @@ -1,4 +1,7 @@ - + + + +

    Microsoft Hyper-V hypervisor driver

    diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index c817a9b79c..beff214e92 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -1,4 +1,6 @@ - + + +

    LXC container driver

    diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index a8f9f286e1..e2e72e7a3a 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -1,4 +1,6 @@ - + + +

    OpenVZ container driver

    diff --git a/docs/drvparallels.html.in b/docs/drvparallels.html.in index 0a864512d1..927cc40fae 100644 --- a/docs/drvparallels.html.in +++ b/docs/drvparallels.html.in @@ -1,4 +1,7 @@ - + + + +

    Parallels Cloud Server driver

    diff --git a/docs/drvphyp.html.in b/docs/drvphyp.html.in index 50e26b2920..bb1f69e518 100644 --- a/docs/drvphyp.html.in +++ b/docs/drvphyp.html.in @@ -1,4 +1,7 @@ - + + + +

    IBM PowerVM hypervisor driver (phyp)

    diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index df99377c44..3a5c4dfedc 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -1,4 +1,6 @@ - + + +

    KVM/QEMU hypervisor driver

    @@ -17,6 +19,7 @@
  • The KVM Linux hypervisor +
  • The QEMU emulator
    • @@ -569,7 +572,7 @@ $ virsh domxml-to-native qemu-argv demo.xml pair recorded in the attributes name and optional value. - +

    Example:

     <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
   <name>QEmu-fedora-i686</name>
diff --git a/docs/drvremote.html.in b/docs/drvremote.html.in
index c66526f924..c967324a4e 100644
--- a/docs/drvremote.html.in
+++ b/docs/drvremote.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Remote management driver
    
   
diff --git a/docs/drvtest.html.in b/docs/drvtest.html.in
index 44bc289d59..ba5fc99ab0 100644
--- a/docs/drvtest.html.in
+++ b/docs/drvtest.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Test "mock" driver
    
 
diff --git a/docs/drvuml.html.in b/docs/drvuml.html.in
index 19b76ab9e4..fe7769d54b 100644
--- a/docs/drvuml.html.in
+++ b/docs/drvuml.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    User Mode Linux driver
    
 
diff --git a/docs/drvvbox.html.in b/docs/drvvbox.html.in
index db82d2a6f5..d59da5783f 100644
--- a/docs/drvvbox.html.in
+++ b/docs/drvvbox.html.in
@@ -1,4 +1,6 @@
-
+
+
+
     
         
    VirtualBox hypervisor driver
    
         
    
diff --git a/docs/drvvmware.html.in b/docs/drvvmware.html.in
index b82f6a3cb9..9ee0ebdc4a 100644
--- a/docs/drvvmware.html.in
+++ b/docs/drvvmware.html.in
@@ -1,4 +1,6 @@
-
+
+
+
     
         
    VMware Workstation / Player hypervisors driver
    
         
    
diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in
index 06bd911414..649ba42bf2 100644
--- a/docs/drvxen.html.in
+++ b/docs/drvxen.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Xen hypervisor driver
    
 
diff --git a/docs/errors.html.in b/docs/errors.html.in
index cbd6e4b8e2..df9aa7c56f 100644
--- a/docs/errors.html.in
+++ b/docs/errors.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Handling of errors
    
     
    The main goals of libvirt when it comes to error handling are:
    
diff --git a/docs/firewall.html.in b/docs/firewall.html.in
index a9af704e50..42642bc592 100644
--- a/docs/firewall.html.in
+++ b/docs/firewall.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Firewall and network filtering in libvirt
    
     
    There are three pieces of libvirt functionality which do network
diff --git a/docs/format.html.in b/docs/format.html.in
index 13061088d6..9cb8eee18a 100644
--- a/docs/format.html.in
+++ b/docs/format.html.in
@@ -1,4 +1,5 @@
-
+
+
 
   
     
    XML Format
    
diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
index 9d42426b23..d060a5b78b 100644
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Driver capabilities XML format
    
 
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 3570bbc1f4..572d7eeeca 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Domain XML format
    
 
@@ -182,6 +184,7 @@
         again in case the boot fails (according to BIOS). The value is
         in milliseconds with maximum of 65535 and special
         value -1 disables the reboot.
+      
     
 
     
    Host bootloader
    
@@ -641,6 +644,7 @@
         how to tune the performance of a NUMA host via controlling NUMA policy
         for domain process. NB, only supported by QEMU driver.
         Since 0.9.3
+      
       
    memory
    
       
    
         The optional memory element specifies how to allocate memory
@@ -1588,6 +1592,7 @@
           
    The optional write_iops_sec element is the
             write I/O operations per second.
    
         
+      
       
    driver
    
       
    
         The optional driver element allows specifying further details
@@ -1847,11 +1852,13 @@
             OS. For Linux this would be the value returned by the
             BLKSSZGET ioctl and describes the smallest units for disk
             I/O.
+          
    
           
    physical_block_size
    
           
    The physical block size the disk will report to the guest
             OS. For Linux this would be the value returned by the
             BLKPBSZGET ioctl and describes the disk's hardware sector
             size which can be relevant for the alignment of disk data.
+          
    
         
       
     
@@ -2067,6 +2074,7 @@
         additional attributes: bus (a 2-digit bus
         number), and slot attribute (a 2-digit slot
         within the bus).  Since 0.8.8.
+      
       
    type='usb'
    
       
    USB addresses have the following additional
         attributes: bus (a hex value between 0 and 0xfff,
@@ -2342,6 +2350,7 @@
       BIOS bootloader section.
       Since 0.8.8 for PCI devices,
       Since 1.0.1 for USB devices.
+      
    
       
    rom
    
       
    The rom element is used to change how a PCI
         device's ROM is presented to the guest. The optional bar
@@ -4005,7 +4014,7 @@ qemu-kvm -net nic,model=? /dev/null
         usually care about the source path since it's libvirt who talks to
         the guest agent. In case users want to utilize this feature, they should
         leave <source> element out.
-
+      
    
       
    spicevmc
    
       
    Paravirtualized SPICE channel. The domain must also have a
         SPICE server as a graphics
@@ -4564,7 +4573,7 @@ qemu-kvm -net nic,model=? /dev/null
           TPM device. The following types are supported:
         
    
         
      
-          
    • 'passthrough' — use the host's TPM device.
+          
    • 'passthrough' — use the host's TPM device.
      • 
         
    
       
    
       
    backend type='passthrough'
    
diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in
index b1888968a6..d72bd0a9f3 100644
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Network XML format
    
 
diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in
index 5712bcf1f5..11654e50ec 100644
--- a/docs/formatnode.html.in
+++ b/docs/formatnode.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Node devices XML format
    
 
diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in
index 78c3b823b2..5e1c6bb9b4 100644
--- a/docs/formatnwfilter.html.in
+++ b/docs/formatnwfilter.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Network Filters
    
 
@@ -113,7 +115,7 @@
     
    
       Filtering rules are organized in filter chains. These chains can be
       thought of as having a tree structure with packet
-      filtering rules as entries in individual chains (branches). 
    
+      filtering rules as entries in individual chains (branches). 
    
       Packets start their filter evaluation in the root chain
       and can then continue their evaluation in other chains, return from
       those chains back into the root chain or be
@@ -227,7 +229,7 @@
     
    
       A chain with a lower priority value is accessed before one with a
       higher value.
-      

    
+      
    
       Since 0.9.8 the above listed chains
       can be assigned custom priorities by writing a value in the
       range [-1000, 1000] into the priority (XML) attribute in the filter
@@ -370,7 +372,7 @@
     
    
       Further, the notation of $VARIABLE is short-hand for $VARIABLE[@0]. The
       former notation always assumes the iterator with Id '0'.
-    
    
+    
    
 
     
    Automatic IP address detection
    
     
    
@@ -394,7 +396,7 @@
        When a VM is migrated to another host or resumed after a suspend operation,
        the first packet sent by the VM will again determine the IP address it can
        use on a particular interface.
-       

    
+       
    
        A value of dhcp specifies that libvirt should only honor DHCP
        server-assigned addresses with valid leases. This method supports the detection
        and usage of multiple IP address per interface.
@@ -567,7 +569,7 @@
         (matching the rule passes this filter, but returns control to
         the calling filter for further
         analysis) (since 0.9.7),
-        or continue (matching the rule goes on to the next
+        or continue (matching the rule goes on to the next
         rule for further analysis) (since
         0.9.7).
      
@@ -585,7 +587,7 @@
         Since 0.9.8 this has been extended to cover
         the range of -1000 to 1000. If this attribute is not
         provided, priority 500 will automatically be assigned.
-        
    
+        
    
         Note that filtering rules in the root chain are sorted
         with filters connected to the root chain following
         their priorities. This allows to interleave filtering rules with
diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in
index c3c4a2597e..f816b50d31 100644
--- a/docs/formatsecret.html.in
+++ b/docs/formatsecret.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Secret XML format
    
 
diff --git a/docs/formatsnapshot.html.in b/docs/formatsnapshot.html.in
index 2e830f8df3..76689cbcb4 100644
--- a/docs/formatsnapshot.html.in
+++ b/docs/formatsnapshot.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Snapshot XML format
    
 
diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index eba364746b..9c3be67a32 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Storage pool and volume XML format
    
 
diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in
index 9557a22155..2b222371af 100644
--- a/docs/formatstorageencryption.html.in
+++ b/docs/formatstorageencryption.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Storage volume encryption XML format
    
 
diff --git a/docs/goals.html.in b/docs/goals.html.in
index a17115e924..60b6c44d16 100644
--- a/docs/goals.html.in
+++ b/docs/goals.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Terminology and goals
    
     
    To avoid ambiguity about the terms used, here are the definitions
diff --git a/docs/hacking.html.in b/docs/hacking.html.in
index 99933d1dda..64cdcc2ee8 100644
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Contributor guidelines
    
 
diff --git a/docs/hacking1.xsl b/docs/hacking1.xsl
index 982fa8df22..cdeb3a4259 100644
--- a/docs/hacking1.xsl
+++ b/docs/hacking1.xsl
@@ -1,5 +1,7 @@
 
-
+
 
 
 
@@ -21,8 +23,8 @@
 
 
-**
-''
-""
+**
+''
+""
 
 
diff --git a/docs/hacking2.xsl b/docs/hacking2.xsl
index cd1712c050..72fa9d3014 100644
--- a/docs/hacking2.xsl
+++ b/docs/hacking2.xsl
@@ -1,5 +1,7 @@
 
-
+
 
 
 
@@ -30,7 +32,7 @@ from docs/hacking.html.in!
 
 
 
-
+
                          
 
 
@@ -65,14 +67,14 @@ from docs/hacking.html.in!
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -91,13 +93,13 @@ from docs/hacking.html.in!
 
 
 
-
+
 
 
 
 
 
-
+
 
 () 
 
@@ -109,23 +111,23 @@ from docs/hacking.html.in!
 
 
 
-- 
+- 
 
 
 
 
--- 
+-- 
 
 
 
 
 
-
+
 
 
 
 
-
+
 
 
 
@@ -137,7 +139,7 @@ from docs/hacking.html.in!
 
 
 
-
+
 
   
 
diff --git a/docs/hooks.html.in b/docs/hooks.html.in
index 3b070e7c52..f0f692bc0a 100644
--- a/docs/hooks.html.in
+++ b/docs/hooks.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Hooks for specific system management
    
 
diff --git a/docs/index.html.in b/docs/index.html.in
index 038986d8a0..772cbfb648 100644
--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    The virtualization API
    
 
diff --git a/docs/internals.html.in b/docs/internals.html.in
index 90143effdc..398d02e649 100644
--- a/docs/internals.html.in
+++ b/docs/internals.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    libvirt internals
    
 
diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in
index 7bb9aa3a04..d63151eeb2 100644
--- a/docs/internals/command.html.in
+++ b/docs/internals/command.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Spawning processes / commands from libvirt drivers
    
 
diff --git a/docs/internals/locking.html.in b/docs/internals/locking.html.in
index c50e68f060..0317c78c99 100644
--- a/docs/internals/locking.html.in
+++ b/docs/internals/locking.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Resource Lock Manager
    
 
diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in
index 91e8449b1d..40fb59df6c 100644
--- a/docs/internals/rpc.html.in
+++ b/docs/internals/rpc.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    libvirt RPC infrastructure
    
 
@@ -152,6 +154,7 @@
           
  • continue: for streams this indicates that further data packets
             will be following
    • 
         
+      
     
 
     
    Packet payload
    
diff --git a/docs/intro.html.in b/docs/intro.html.in
index a661ca3017..6736f2a398 100644
--- a/docs/intro.html.in
+++ b/docs/intro.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Architecture
    
     
    Libvirt is a C toolkit manage the virtualization capabilities
diff --git a/docs/java.html.in b/docs/java.html.in
index 41f26301c8..b5812bacd0 100644
--- a/docs/java.html.in
+++ b/docs/java.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Java API bindings
    
 
diff --git a/docs/locking.html.in b/docs/locking.html.in
index 19dd6a31b9..8e1e72c734 100644
--- a/docs/locking.html.in
+++ b/docs/locking.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Virtual machine disk locking
    
 
diff --git a/docs/logging.html.in b/docs/logging.html.in
index a95f7bc881..86e178c83d 100644
--- a/docs/logging.html.in
+++ b/docs/logging.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Logging in the library and the daemon
    
     
    Libvirt includes logging facilities starting from version 0.6.0,
diff --git a/docs/migration.html.in b/docs/migration.html.in
index aecef41ce9..2ea096938b 100644
--- a/docs/migration.html.in
+++ b/docs/migration.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Guest migration
    
 
@@ -30,7 +32,7 @@
     
    
 
     
    
-      Migration native path
+      Migration native path
     
    
 
     
    libvirt tunnelled transport
    
@@ -48,7 +50,7 @@
     
    
 
     
    
-      Migration tunnel path
+      Migration tunnel path
     
    
 
     
    Communication control paths/flows
    
@@ -75,7 +77,7 @@
     
    
 
     
    
-      Migration direct, managed
+      Migration direct, managed
     
    
 
 
@@ -97,7 +99,7 @@
     
    
 
     
    
-      Migration peer-to-peer
+      Migration peer-to-peer
     
    
 
 
@@ -113,7 +115,7 @@
     
    
 
     
    
-      Migration direct, unmanaged
+      Migration direct, unmanaged
     
    
 
 
diff --git a/docs/news.html.in b/docs/news.html.in
index 44a1b09816..b77cf1d7b1 100644
--- a/docs/news.html.in
+++ b/docs/news.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
   
diff --git a/docs/pending.html.in b/docs/pending.html.in
index f2978bfda5..d9d2eae32d 100644
--- a/docs/pending.html.in
+++ b/docs/pending.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Pending patches needing review
    
     
     A list of pending patches needing review upstream is available
diff --git a/docs/php.html.in b/docs/php.html.in
index 5283e67084..d9a3c1b646 100644
--- a/docs/php.html.in
+++ b/docs/php.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    PHP API bindings
    
 
diff --git a/docs/python.html.in b/docs/python.html.in
index e7538a47ab..3033337f2b 100644
--- a/docs/python.html.in
+++ b/docs/python.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Python API bindings
    
 
diff --git a/docs/relatedlinks.html.in b/docs/relatedlinks.html.in
index 9e96f66ec8..b376ced869 100644
--- a/docs/relatedlinks.html.in
+++ b/docs/relatedlinks.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Related links
    
 
diff --git a/docs/remote.html.in b/docs/remote.html.in
index fc6af82f45..25ae30edd0 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Remote support
    
     
    
diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in
index afabf2dc22..619e4a1f8e 100644
--- a/docs/sitemap.html.in
+++ b/docs/sitemap.html.in
@@ -1,4 +1,6 @@
-
+
+
+
   
     
    Sitemap
    
 
diff --git a/docs/storage.html.in b/docs/storage.html.in
index 649e23bf1d..118144477c 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Storage Management
    
     
    
diff --git a/docs/testapi.html.in b/docs/testapi.html.in
index 9b6161d58c..cf23271195 100644
--- a/docs/testapi.html.in
+++ b/docs/testapi.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    libvirt-test-API:  Python based test suite 
    
     
    Libvirt-test-API is a powerful test tool designed to complement
@@ -24,7 +25,7 @@
     
      
       
    •  A documentation PDF
            file describing the test suite and how to write test cases
-           and test scenarios.
+           and test scenarios.
      • 
     
    
     
     Libvirt-test-API is maintained using
         a GIT
diff --git a/docs/testsuites.html.in b/docs/testsuites.html.in
index 4441d94241..9a382cf625 100644
--- a/docs/testsuites.html.in
+++ b/docs/testsuites.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    Test suites
    
     
    There is a few test suites available to developers for testing
@@ -24,6 +25,7 @@
           in Fedora distributions, but best is probably to get
           the version
           from GIT.
+      
       
  • the libvirt-test-API is also a functional
           test suite, but implemented using the
           Python bindings
@@ -32,6 +34,7 @@
           or directly get
           the version
           from GIT.
+      
    • 
     
   
 
diff --git a/docs/testtck.html.in b/docs/testtck.html.in
index c0e700862f..dff46d0b6e 100644
--- a/docs/testtck.html.in
+++ b/docs/testtck.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
    libvirt TCK  : Technology Compatibility Kit
    
     
    The libvirt TCK provides a framework for performing testing
@@ -26,7 +27,7 @@
     
      
       
    •  The initial
 mail
-           from Daniel Berrange presenting the project.
+           from Daniel Berrange presenting the project.
      • 
       
    •  The page
            describing VirtTCK the inclusion of libvirt-TCK as a
            Fedora Feature.
      • 
diff --git a/docs/uri.html.in b/docs/uri.html.in
index 97a1cdb45c..73c3e88f3e 100644
--- a/docs/uri.html.in
+++ b/docs/uri.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
      Connection URIs
      
 
diff --git a/docs/virshcmdref.html.in b/docs/virshcmdref.html.in
index 484531260d..5503ca0dad 100644
--- a/docs/virshcmdref.html.in
+++ b/docs/virshcmdref.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
      Virsh Command Reference
      
 
diff --git a/docs/windows.html.in b/docs/windows.html.in
index 8e0af7c24b..89dfdb19df 100644
--- a/docs/windows.html.in
+++ b/docs/windows.html.in
@@ -1,5 +1,6 @@
-
-
+
+
+
   
     
      Windows support