diff --git a/doc/Makefile.am b/doc/Makefile.am
index b18c5ebab..87f248902 100644
--- 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 34e902743..549c22fe1 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
-->
-
@@ -220,7 +220,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Nevertheless, it will succeed on an unpatched kernel of version 3.0
or higher if the 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
NETWORK, IPC
and UTSNAME.
diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
index 9d49aa8ed..b321bc3ac 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
-->
-
diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in
index 9cf0c79b1..78a6c9d38 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
-->
-
diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
index 2afba86ea..3c4533af5 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
-->
-
diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
index f4f4e592f..99bdb7199 100644
--- a/doc/lxc-create.sgml.in
+++ b/doc/lxc-create.sgml.in
@@ -1,4 +1,4 @@
-
-
@@ -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.
+
@@ -179,7 +180,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
available containers on the system.
-
+
diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
index a51e484b6..6b612c258 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
-->
-
diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
index 6371751c6..0da2284b3 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
-->
-
diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in
index 7b7be4976..2fd2577a0 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
-->
-
diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in
index d1e3f69ad..f1f6839ea 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
-->
-
diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
index 5a32f1da6..f5f65732c 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
-->
-
]>
diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
index d3951ff2f..c982c37c6 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
-->
-
diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
index 401a17c30..6f9d60e2d 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
-->
-
]>
diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in
index ffc0ad2aa..5285b8123 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
-->
-
diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
index 2b6778f23..af79bbc6e 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
-->
-
diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
index d16cab5c5..b04d01910 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
-->
-
diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
index c4c545e90..c4e71debb 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
-->
-
diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
index 61bff8bdf..11e9b7e17 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
-->
-
diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index 1428f252c..6c3d7b2aa 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
-->
-
]>
diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index 1b30fedb6..d98ca219f 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
-->
-
]>
@@ -280,7 +280,7 @@ rootfs
-
+
@@ -570,7 +570,7 @@ rootfs
to the background.
-
+