Merge lp:~ted-m-cox/serverguide/cgroupbugs into lp:serverguide/trunk

[Ted Cox]

Bug fixes, minor edits.

[Doug Smythies (dsmythies)]

Is the cgroup assigned to the container or is the container assigned to the cgroup?
I do not know what is right.
If the former, then, it seems to me, the original wording is O.K., if the latter, then the new wording is O.K.

[Serge Hallyn (serge-hallyn)]

Thank you, looks good to me.

(Re "assigned / assigned to", both are true. I think the new text sounds better, so let's go with it)

review: Approve

[Doug Smythies (dsmythies)]

Thanks Serge.

review: Approve

=== modified file 'serverguide/C/virtualization.xml'
--- serverguide/C/virtualization.xml	2015-05-07 04:52:33 +0000
+++ serverguide/C/virtualization.xml	2015-07-13 03:28:37 +0000
@@ -1366,24 +1366,24 @@
         and to lock containers to specific cpus.
 	</para>
 	
-	<para> By default, a privileged container CN will be assigned a cgroup
-	called <filename>/lxc/CN</filename>.  In the case of name conflicts
+	<para> By default, a privileged container CN will be assigned to a cgroup
+	called <filename>/lxc/CN</filename>. In the case of name conflicts
 	(which can occur when using custom lxcpaths) a suffix "-n", where n
 	is an integer starting at 0, will be appended to the cgroup name.
 	</para>
 
-	<para> By default, a privileged container CN will be assigned a cgroup
+	<para> By default, a privileged container CN will be assigned to a cgroup
 	called <filename>CN</filename> under the cgroup of the task which
 	started the container, for instance
-	<filename>/usr/1000.user/1.session/CN</filename>.  The container root
+	<filename>/usr/1000.user/1.session/CN</filename>. The container root
 	will be given group ownership of the directory (but not all files)
 	so that it is allowed to create new child cgroups.
 	</para>
 	<para>
 	As of Ubuntu 14.04, LXC uses the cgroup manager (cgmanager) to
-	administer cgroups.  The cgroup manager receives D-Bus requests
+	administer cgroups. The cgroup manager receives D-Bus requests
 	over the Unix socket <filename>/sys/fs/cgroup/cgmanager/sock</filename>.
-	To fascilitate safe nested containers, the line
+	To facilitate safe nested containers, the line
 <screen>
 <command>
 lxc.mount.auto = cgroup
@@ -1391,12 +1391,12 @@
 </screen>
 	can be added to the container configuration causing the
 	<filename>/sys/fs/cgroup/cgmanager</filename> directory to be bind-mounted
-	into the container.  The container in turn should start the cgroup
+	into the container. The container in turn should start the cgroup
 	management proxy (done by default if the cgmanager package is installed
 	in the container) which will move the <filename>/sys/fs/cgroup/cgmanager</filename>
-	directory to  <filename>/sys/fs/cgroup/cgmanager.lower</filename>, then
+	directory to <filename>/sys/fs/cgroup/cgmanager.lower</filename>, then
 	start listening for requests to proxy on its own socket
-	<filename>/sys/fs/cgroup/cgmanager/sock</filename>.  The host cgmanager
+	<filename>/sys/fs/cgroup/cgmanager/sock</filename>. The host cgmanager
 	will ensure that nested containers cannot escape their assigned cgroups
 	or make requests for which they are not authorized.
 	</para>