From 2891ac76b197ab6baa5e14f42d62359716bfec94 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 10 Aug 2013 21:09:39 +0200
Subject: [PATCH] Change description of user namespaces to talk about
 containers in general

---
 index.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 7d5018d..37a37c8 100644
--- a/index.html
+++ b/index.html
@@ -202,23 +202,28 @@
 </div>
 
 <div class="slide">
-  <h1>User namespaces [3.7]</h1>
+  <h1>More support for containers</h1>
   <ul class="incremental">
     <li>
-      One of the last missing pieces for OpenVZ-like containers
+      Containers are lightweight VMs - run on the same kernel as host,
+      but with limited privileges and resources
     </li>
     <li>
-      Each user namespace has its own <tt>root</tt> user with
-      privileges over the users and processes in that namespace - but
-      not the whole system
+      Previously done by OpenVZ and Linux-VServer; gradually being
+      reimplemented upstream
+    </li>
+    <li>
+      User namespaces (added in 3.7) support the existence of a
+      <tt>root</tt> user inside the container that is unprivileged
+      outside the container
     </li>
     <li>
       Currently somewhat experimental, and requires filesystem
       changes which haven't been done for XFS
     </li>
     <li>
-      Make it work: send patches to upstream XFS developers (this
-      one's hard)
+      Make user namespaces work: send patches to upstream XFS
+      developers (this one's hard)
     </li>
   </ul>
 </div>
-- 
2.39.5