Update documentation to Docbook 4.5

The package 'docbook-tools' [1] required to format Docbook 3.0 into man pages
has been obsoleted a long time ago and can no longer be downloaded from its
former homepage. Recent versions of that package -- now called 'docbook2X' --,
cannot deal with that old markup format anymore (and don't support the '-w all'
command line switch either). To remedy these issues, all SGML files have been
updated to Docbook 4.5 so that recent versions of docbook2man can process them.

[1] http://sources.redhat.com/docbook-tools/
[2] http://docbook2x.sourceforge.net/

Signed-off-by: Peter Simons <simons@cryp.to>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b18c5ebabf48d497ce13467cbcc395ee166fd33d..87f24890271820061e4ec1d29ce0d7a8f154f90e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,14 +30,14 @@ man_MANS = \
        lxc.7
 
 
-%.1 : %.sgml 
-       docbook2man -w all $<
+%.1 : %.sgml
+       docbook2man $<
 
-%.5 : %.sgml 
-       docbook2man -w all $<
+%.5 : %.sgml
+       docbook2man $<
 
-%.7 : %.sgml 
-       docbook2man -w all $<
+%.7 : %.sgml
+       docbook2man $<
 
 lxc-%.sgml : common_options.sgml see_also.sgml
 

diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
index 34e902743c8715d37db357fb2451fbcbf6b5d677..549c22fe1547270d2fd6df456d4a39b08622c041 100644 (file)
--- a/doc/lxc-attach.sgml.in
+++ b/doc/lxc-attach.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
@@ -220,7 +220,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     <para>
       Nevertheless, it will succeed on an unpatched kernel of version 3.0
       or higher if the <option>-s</option> option is used to restrict the
-      namespaces that the process is to be attached to to one or more of 
+      namespaces that the process is to be attached to to one or more of
       <replaceable>NETWORK</replaceable>, <replaceable>IPC</replaceable>
       and <replaceable>UTSNAME</replaceable>.
     </para>

diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
index 9d49aa8edd8bfc9d5833cbedc7225840600909ba..b321bc3ac01691d0e7784e43914783340f0a619f 100644 (file)
--- a/doc/lxc-cgroup.sgml.in
+++ b/doc/lxc-cgroup.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in
index 9cf0c79b1fcba7b6286be25b26da689899af7a9d..78a6c9d38a070661318264bb1e7d8503dcfd7518 100644 (file)
--- a/doc/lxc-checkpoint.sgml.in
+++ b/doc/lxc-checkpoint.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
index 2afba86eaaefbe1fd87a1fc5f5f603bb4f8f8f3d..3c4533af544bc1c936e48eeb813068c67961a083 100644 (file)
--- a/doc/lxc-console.sgml.in
+++ b/doc/lxc-console.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
index f4f4e592f8ced98e2d0ac89c6e94732d94e8ca79..99bdb7199bb7aec32b01baeed3abe8e605f258f8 100644 (file)
--- a/doc/lxc-create.sgml.in
+++ b/doc/lxc-create.sgml.in
@@ -1,4 +1,4 @@
-<!-- 
+<!--
 
 lxc: linux Container library
 
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
@@ -145,6 +145,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
            filesystem) of size SIZE rather than the default, which is 1G.
          </para>
        </listitem>
+      </varlistentry>
 
       <varlistentry>
        <term>
@@ -179,7 +180,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
            available containers on the system.
           </para>
         </listitem>
-      </varlistentry>    
+      </varlistentry>
 
     </variablelist>
 

diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
index a51e484b6849b634f9394c7d3c00144f9a0cabe4..6b612c258dff853cc1dee9ce977c532f2e975dec 100644 (file)
--- a/doc/lxc-destroy.sgml.in
+++ b/doc/lxc-destroy.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index 6371751c676751b7938cd2ff4421977e7e02ff23..0da2284b31b22192f3e2ba19762379bad02541d3 100644 (file)
--- a/doc/lxc-execute.sgml.in
+++ b/doc/lxc-execute.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in
index 7b7be4976df010b87f2201f5362b51797e6cd95a..2fd2577a0ecb4dd962dc62770f2eea3bc8e1362c 100644 (file)
--- a/doc/lxc-freeze.sgml.in
+++ b/doc/lxc-freeze.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in
index d1e3f69ad4c7229161c24ee4278297915fe8f980..f1f6839ea4bcfa899ba71b5b1caa0ac0a97a6782 100644 (file)
--- a/doc/lxc-kill.sgml.in
+++ b/doc/lxc-kill.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
index 5a32f1da627746f505affad8df200b2b3ff04bbd..f5f65732cf37242ded056530a19c00d4fbb7d4b8 100644 (file)
--- a/doc/lxc-ls.sgml.in
+++ b/doc/lxc-ls.sgml.in
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index d3951ff2fe6895ac5a354920bdb63f4268a4aff6..c982c37c60f1985b05e4dc35586aef7a82a61c7e 100644 (file)
--- a/doc/lxc-monitor.sgml.in
+++ b/doc/lxc-monitor.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
index 401a17c309545b2d5dec781aaaa98da35f2bcacf..6f9d60e2de5e09a29fbb605703b7297a58a3ca4f 100644 (file)
--- a/doc/lxc-ps.sgml.in
+++ b/doc/lxc-ps.sgml.in
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in
index ffc0ad2aa2f062d811a341e6e568ad5a58982776..5285b81232204438269e8c5bae5ce78d11942a6e 100644 (file)
--- a/doc/lxc-restart.sgml.in
+++ b/doc/lxc-restart.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 2b6778f23338b270120ac9360e7216373ea8901c..af79bbc6e248d0cd696b7aafbab6fddf31a8f92e 100644 (file)
--- a/doc/lxc-start.sgml.in
+++ b/doc/lxc-start.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
index d16cab5c5084f2f289d15b4387a5533d8b6f4ccb..b04d019106eb656211f80b38a40968a147ee4c32 100644 (file)
--- a/doc/lxc-stop.sgml.in
+++ b/doc/lxc-stop.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
index c4c545e90fd948759823308f727afd1f9b76e83b..c4e71debb694647906bdcbf7cc8c12d9926b2d18 100644 (file)
--- a/doc/lxc-unfreeze.sgml.in
+++ b/doc/lxc-unfreeze.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
index 61bff8bdfdf035f88a3f807ca4f485c4c1da9b48..11e9b7e17c3ab1be24d60b0bae653f18de53c30d 100644 (file)
--- a/doc/lxc-wait.sgml.in
+++ b/doc/lxc-wait.sgml.in
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index 1428f252c5711b56bdf8ede4adae00db6d2241d5..6c3d7b2aa24a9cb5cb3c7aedf124ed07bf83a8c7 100644 (file)
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index 1b30fedb66cbe11d833ff0f50c799c6ee227a81a..d98ca219f363a9f5646e5341f0a715f5ae54ce6b 100644 (file)
--- a/doc/lxc.sgml.in
+++ b/doc/lxc.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>
@@ -280,7 +280,7 @@ rootfs
       </para>
 
       <programlisting>
-
+<![CDATA[
    ---------
   | STOPPED |<---------------
    ---------                 |
@@ -305,7 +305,7 @@ rootfs
    ----------                |
        |                     |
         ---------------------
-
+]]>
       </programlisting>
     </refsect2>
 
@@ -570,7 +570,7 @@ rootfs
        to the background.
 
        <programlisting>
-
+<![CDATA[
          # launch lxc-wait in background
          lxc-wait -n foo -s STOPPED &
          LXC_WAIT_PID=$!
@@ -583,7 +583,7 @@ rootfs
          # is STOPPED
          wait $LXC_WAIT_PID
          echo "'foo' is finished"
-
+]]>
        </programlisting>
       </para>
     </refsect2>