version 0.6.5

Increment to 0.6.5 version.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/configure.ac b/configure.ac
index faa31b3eeefc4c39959a50677845e0e376ee122c..f82e7df756db1af6548124d9a806ed36bf329257 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lxc], [0.6.4])
+AC_INIT([lxc], [0.6.5])
 
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index c0c8bb1b4b510fc29fada02bcaacbdba4ea8b038..88bdcc1f4f79d5897808960c78b60f290e76e63c 100644 (file)
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -434,16 +434,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
          </term>
          <listitem>
            <para>
-             Specify the capability to be dropped in the
-             container. The format is the lower case of the
-             capability definition without the "CAP_" prefix,
+             Specify the capability to be dropped in the container. A
+             single line defining several capabilities with a space
+             separation is allowed. The format is the lower case of
+             the capability definition without the "CAP_" prefix,
              eg. CAP_SYS_MODULE should be specified as
              sys_module. See
              <citerefentry>
                <refentrytitle><command>capabilities</command></refentrytitle>
-               <manvolnum>7</manvolnum>. A single line defining
-               several capabilities with a space separation is
-               allowed.
+               <manvolnum>7</manvolnum>
              </citerefentry>,
            </para>
          </listitem>