X-Git-Url: https://git.decadent.org.uk/gitweb/?p=debian-kernel-talk.git;a=blobdiff_plain;f=index.html;h=146c523b4d3cc0d6d0d254933d501c8e411a7ee6;hp=4c0af612a21ebfbb94a553305b68ba720f43b2cd;hb=e14e2a7f931afa927b7cc95527163ef2534d5af0;hpb=dd646eeaf124aaab897bf9199bc0878fa69ce928

diff --git a/index.html b/index.html
index 4c0af61..146c523 100644
--- a/index.html
+++ b/index.html
@@ -120,36 +120,9 @@
 </div>
 
 <div class="slide">
-  <h1>Linux release model (1)</h1>
+  <h1>Linux release model</h1>
   <p>
-    The old model:
-  </p>
-  <ul class="incremental">
-    <li>
-      Each stable release had even second component.  Bug fixes and
-      minor features in stable releases with third component
-      incremented (e.g. 2.4.27)
-    </li>
-    <li>
-      Major development done separately, resulting in series of
-      unstable releases with odd second component (e.g. 2.5.50)
-    </li>
-    <li>
-      After a year or two, development resulted in a new stable
-      release
-    </li>
-    <li>
-      Problem: users waited years for new features, and then got many
-      more changes all at once.  Particularly bad in the 2.4-2.6
-      transition.
-    </li>
-  </ul>
-</div>
-
-<div class="slide">
-  <h1>Linux release model (2)</h1>
-  <p>
-    The new model:
+    Since ~2004:
   </p>
   <ul class="incremental">
     <li>
@@ -163,8 +136,9 @@
       </ul>
     </li>
     <li>
-      Each 2.6.<var>x</var> release has stable update branch; releases
-      numbered 2.6.<var>x</var>.<var>y</var>
+      Each 2.6.<var>x</var> and 3.<var>x</var> release has a stable
+      update branch; releases numbered 2.6.<var>x</var>.<var>y</var>
+      and 3.<var>x</var>.<var>y</var>
       <ul class="incremental">
 	<li>
 	  Usually closed shortly after next stable release, but may
@@ -172,10 +146,6 @@
 	</li>
       </ul>
     </li>
-    <li>
-      Linux 3.0 doesn't change this, except that <var>x</var> is now
-      the second component and <var>y</var> is the third
-    </li>
   </ul>
 </div>