From: Filippo Giunchedi <filippo@esaurito.net>
Date: Thu, 2 Jul 2009 13:42:18 +0000 (+0200)
Subject: Update kernel config options location
X-Git-Tag: lxc_0_6_3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0478642a4349846ab8e76e318909886e795df92d;p=thirdparty%2Flxc.git

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>
---

diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
index 31f5e1807..41ba06774 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>