fix building docs

Commit 69fe23ff added checking for the older docbook2man back into
configure, but this breaks building the docs on at least Oracle Linux and
Fedora when docbook2X is not installed as docbook2man will be found but the
docs don't actually build with that tool.

This change makes it so the docs can be built with either the older
docbook2man or the newer 2X tools by using configure to set the dtd
string to an appropriate value depending on use of docbook2man or
db2x_docbook2man.

Also fixed a small error in lxc-destroy.sgml.in that was noticed
by the old tools.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 9b58bab3838d98b4ba6630aae2f4b84582e17c97..eba19db7f3ebe718babdc7096c62e0608451d4c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,17 +60,12 @@ AM_CONDITIONAL([ENABLE_RPATH], [test "x$enable_rpath" = "xyes"])
 
 # Documentation (manpages)
 AC_ARG_ENABLE([doc],
-       [AC_HELP_STRING([--enable-doc], [make mans (require docbook2x-man installed) [default=auto]])],
+       [AC_HELP_STRING([--enable-doc], [make mans (requires docbook2man or docbook2x-man to be installed) [default=auto]])],
        [], [enable_doc=auto])
 
 if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
        db2xman=""
-
-       if test "x$with_distro" = "xdebian" -o "x$with_distro" = "xubuntu"; then
-               dbparsers="docbook2x-man db2x_docbook2man"
-       else
-               dbparsers="docbook2x-man db2x_docbook2man docbook2man"
-       fi
+       dbparsers="docbook2x-man db2x_docbook2man docbook2man"
 
        AC_MSG_CHECKING(for docbook2x-man)
        for name in ${dbparsers}; do
@@ -93,6 +88,13 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
 fi
 AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])
 
+if test "x$db2xman" = "xdocbook2man"; then
+       docdtd="\"-//Davenport//DTD DocBook V3.0//EN\""
+else
+       docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\""
+fi
+AC_SUBST(docdtd)
+
 # Apparmor
 AC_ARG_ENABLE([apparmor],
        [AC_HELP_STRING([--enable-apparmor], [enable apparmor])],

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

diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
index a3bdb449993c914206015618e47a75584a8ba230..5c8d51337c29b3f655bd5366047c0b1298d81873 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
index 5dcd61962a7c4484fb13c7c977df6f1586ec82ff..888db369baaf9dc9f2041c8038feb82a7880a00d 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

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

diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in
index 6cd7169f726137d5821100a57deedd476f0af86e..5737320cee29bad8651146063ed2e99b9685f287 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-clone.sgml.in b/doc/lxc-clone.sgml.in
index d00b57b015316abae9667be9904ad3f635cad29a..994f3cddb94c850ae63ed1424dbed87837620bf2 100644 (file)
--- a/doc/lxc-clone.sgml.in
+++ b/doc/lxc-clone.sgml.in
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 9298a5234e2fffdf0af6d53ea75f351928070621..92997781b583b14b552d0adf1460e94ab0f0c199 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 90864e067f9f9b2abdb8d0be71f7f6b3167bd231..3969246d4d0823928eb9767ff364e7fd2de8a1f2 100644 (file)
--- a/doc/lxc-create.sgml.in
+++ b/doc/lxc-create.sgml.in
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
index 366dc9a104c362d36898adcefaffa57cb77bb61f..91d5d19a2e8ec989d12cd92f231804da78b60e41 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
@@ -81,17 +81,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
          </para>
        </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>-P, --lxcpath=<replaceable>PATH</replaceable></option></term>
+        <listitem>
+          <para>
+           Use an alternate container path.  The default is @LXCPATH@.
+          </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
-    <varlistentry>
-      <term><option>-P, --lxcpath=<replaceable>PATH</replaceable></option></term>
-      <listitem>
-       <para>
-         Use an alternate container path.  The default is @LXCPATH@.
-       </para>
-      </listitem>
-    </varlistentry>
-
   </refsect1>
 
   <refsect1>

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

diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index de233f68f86b2228c44534e2732f384bb7bb3782..f800ea6f0abc15400d7d6a2f23e28b76712cd658 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 fba139b5917a51ca267fb0da60106ae355d5a4fa..c69e4c8e71bf407f8814a5a7e37e4dab88699f41 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

diff --git a/doc/lxc-info.sgml.in b/doc/lxc-info.sgml.in
index 03212b01a3f8d8fea508a60f6a468046d4378bed..ba0a044d110432a46ae4c2d1480f8d7071dbf1ab 100644 (file)
--- a/doc/lxc-info.sgml.in
+++ b/doc/lxc-info.sgml.in
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 -->
 
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 8d58db9235980dd1c57d1d9c9fce31e6fd4ede81..ad0eec018e877d76fd5bf3e878a7351c98f6b03f 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 4af2596f9f8368fd92b6b8b50e7376984275bc4e..4801dbb3f9a883d30f11be617116f51ab2fef904 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index eae6f8233d839a9eb2c3bfdade32f94d6af807d6..336061dd4ef6155e4abaf202bf1f47ec63a9e5be 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

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

diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
index b0103cfd9483e4ffc13e16fa099dba8a7c6b7690..0b50baa9a36cbb7f7d3ecf98c240ed066229de3a 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in
index 9be025703e440b65256f5888a184b4c861fc30a3..aae7958faf4dbf5695298566619fa85a92fe7d1b 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

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

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

diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index d501636a6097f15e4066417609e9a885808a55ee..0bd7f98270d8c3e8104da3212fe789a329af25d1 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 33e3064b975fc55eb988545a42e3fcfed1afd5fa..b4dcc1bcf5300a8e2c8094feb637ec34cc03bfa9 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

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

diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
index 34a2cf402858bf6dfce89f90f8bfb6fed6ec2cb0..6b999ea72ae067e0a613e6b05246939a3a9c1a6e 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">

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

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

diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
index b43061f6da3202f0bd411ececb38c499ff313587..27940677d6a71bc944cf889cfd4d0578949f5b59 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!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 6fb0d0c42239c5788732e89c1e7bcd9463309998..0a5a52a41b38e7da30152f9e174f1526c029195b 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>

diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index a333c49cda06491f1aa13940043f969d7e33e715..b06515d55247c5b38dd86f241e0cd9489cce62c1 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 "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC @docdtd@ [
 
 <!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
 ]>