[lxc-devel] [PATCH] fix building docs

Dwight Engen dwight.engen at oracle.com
Mon Apr 29 20:47:35 UTC 2013


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 at oracle.com>
---
 configure.ac                    | 16 +++++++++-------
 doc/legacy/lxc-ls.sgml.in       |  2 +-
 doc/lxc-attach.sgml.in          |  2 +-
 doc/lxc-cgroup.sgml.in          |  2 +-
 doc/lxc-checkconfig.sgml.in     |  2 +-
 doc/lxc-checkpoint.sgml.in      |  2 +-
 doc/lxc-clone.sgml.in           |  2 +-
 doc/lxc-console.sgml.in         |  2 +-
 doc/lxc-create.sgml.in          |  2 +-
 doc/lxc-destroy.sgml.in         | 19 +++++++++----------
 doc/lxc-device.sgml.in          |  2 +-
 doc/lxc-execute.sgml.in         |  2 +-
 doc/lxc-freeze.sgml.in          |  2 +-
 doc/lxc-info.sgml.in            |  2 +-
 doc/lxc-kill.sgml.in            |  2 +-
 doc/lxc-ls.sgml.in              |  2 +-
 doc/lxc-monitor.sgml.in         |  2 +-
 doc/lxc-netstat.sgml.in         |  2 +-
 doc/lxc-ps.sgml.in              |  2 +-
 doc/lxc-restart.sgml.in         |  2 +-
 doc/lxc-shutdown.sgml.in        |  2 +-
 doc/lxc-start-ephemeral.sgml.in |  2 +-
 doc/lxc-start.sgml.in           |  2 +-
 doc/lxc-stop.sgml.in            |  2 +-
 doc/lxc-top.sgml.in             |  2 +-
 doc/lxc-unfreeze.sgml.in        |  2 +-
 doc/lxc-unshare.sgml.in         |  2 +-
 doc/lxc-version.sgml.in         |  2 +-
 doc/lxc-wait.sgml.in            |  2 +-
 doc/lxc.conf.sgml.in            |  2 +-
 doc/lxc.sgml.in                 |  2 +-
 31 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b58bab..eba19db 100644
--- 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 60c085c..321e087 100644
--- 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 a3bdb44..5c8d513 100644
--- 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 5dcd619..888db36 100644
--- 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 ec7a4c1..aa02417 100644
--- 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 6cd7169..5737320 100644
--- 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 d00b57b..994f3cd 100644
--- 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 9298a52..9299778 100644
--- 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 90864e0..3969246 100644
--- 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 366dc9a..91d5d19 100644
--- 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 at .
+          </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 at .
-	</para>
-      </listitem>
-    </varlistentry>
-
   </refsect1>
 
   <refsect1>
diff --git a/doc/lxc-device.sgml.in b/doc/lxc-device.sgml.in
index e777382..90cd885 100644
--- 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 de233f6..f800ea6 100644
--- 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 fba139b..c69e4c8 100644
--- 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 03212b0..ba0a044 100644
--- 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 8d58db9..ad0eec0 100644
--- 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 4af2596..4801dbb 100644
--- 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 eae6f82..336061d 100644
--- 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 ab475f3..ea4c9cd 100644
--- 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 b0103cf..0b50baa 100644
--- 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 9be0257..aae7958 100644
--- 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 a4f3acc..9262c6d 100644
--- 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 b753a9b..563acab 100644
--- 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 d501636..0bd7f98 100644
--- 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 33e3064..b4dcc1b 100644
--- 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 2a4f835..a3aa8e5 100644
--- 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 34a2cf4..6b999ea 100644
--- 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 5c899b6..7e862bb 100644
--- 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 3833e9f..fbda32c 100644
--- 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 b43061f..2794067 100644
--- 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 6fb0d0c..0a5a52a 100644
--- 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 a333c49..b06515d 100644
--- 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">
 ]>
-- 
1.8.1.4





More information about the lxc-devel mailing list