aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-07-02 15:42:18 +0200
committerDaniel Lezcano <dlezcano@fr.ibm.com>2009-07-02 15:42:18 +0200
commit0478642a4349846ab8e76e318909886e795df92d (patch)
tree7b92e63093aacf47ecd5acecfc94083e71e2da41 /doc
parentRewriting the pts section man for lxc.conf (diff)
downloadlxc-0478642a4349846ab8e76e318909886e795df92d.tar.gz
lxc-0478642a4349846ab8e76e318909886e795df92d.tar.bz2
lxc-0478642a4349846ab8e76e318909886e795df92d.zip
Update kernel config options location
These options appear in 2.6.29 in different locations, update the sgml accordingly Signed-off-by: Filippo Giunchedi <filippo@esaurito.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/lxc.sgml.in30
1 files changed, 14 insertions, 16 deletions
diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index 31f5e18..41ba067 100644
--- a/doc/lxc.sgml.in
+++ b/doc/lxc.sgml.in
@@ -105,24 +105,22 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
the kernel to have the full features container:
</para>
<programlisting>
- * General
+ * General setup
* Control Group support
- -> namespace cgroup subsystem
- -> cpuset support
- -> Group CPU scheduler
- -> control group freeze subsystem
- -> Basis for grouping tasks (Control Groups)
- -> Simple CPU accounting
+ -> Namespace cgroup subsystem
+ -> Freezer cgroup subsystem
+ -> Cpuset support
+ -> Simple CPU accounting cgroup subsystem
-> Resource counters
- -> Memory resource controllers for Control Groups
- -> Namespace support
- -> UTS namespace
- -> IPC namespace
- -> User namespace
- -> Pid namespace
- * Network support
- -> Networking options
- -> Network namespace support
+ -> Memory resource controllers for Control Groups
+ * Group CPU scheduler
+ -> Basis for grouping tasks (Control Groups)
+ * Namespaces support
+ -> UTS namespace
+ -> IPC namespace
+ -> User namespace
+ -> Pid namespace
+ -> Network namespace
</programlisting>
<para>