aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lezcano <dlezcano@fr.ibm.com>2010-01-22 11:45:11 +0100
committerDaniel Lezcano <dlezcano@fr.ibm.com>2010-01-22 11:45:11 +0100
commit9eb09f87215e8df035df975635f8a68b3201a5b1 (patch)
tree4ffcd5c7ab099b405e403fc33fe59d0dde5d8a00
parentunmount failure is not fatal (diff)
downloadlxc-9eb09f87215e8df035df975635f8a68b3201a5b1.tar.gz
lxc-9eb09f87215e8df035df975635f8a68b3201a5b1.tar.bz2
lxc-9eb09f87215e8df035df975635f8a68b3201a5b1.zip
version 0.6.5lxc-0.6.5
Increment to 0.6.5 version. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
-rw-r--r--configure.ac2
-rw-r--r--doc/lxc.conf.sgml.in11
2 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index faa31b3..f82e7df 100644
--- 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 c0c8bb1..88bdcc1 100644
--- 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>