From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 3 Feb 2013 01:39:08 +0000 (+0100)
Subject: Tighter wording for first two slides
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=stable-kernel-talk.git;a=commitdiff_plain;h=8d93d40cbb65f884b5342c724c5ff4b725be88b8

Tighter wording for first two slides
---

diff --git a/index.html b/index.html
index 8a48ace..0d9a78c 100644
--- a/index.html
+++ b/index.html
@@ -56,24 +56,25 @@
   <h1>Linux stable releases</h1>
   <ul>
     <li>
-      Linus releases a 'stable' 3.<var>x</var> every 2-3 months after
+      Linus releases a stable 3.<var>x</var> every 2-3 months after
       a series of release candidates
     </li>
     <li>
-      Greg K-H maintains a 'stable branch' for each Linus release, with
-      releases numbered 3.<var>x</var>.<var>y</var>
+      Greg K-H maintains a <dfn>stable branch</dfn> for each Linus
+      release, with <dfn>stable update</dfn> releases numbered
+      3.<var>x</var>.<var>y</var>
     </li>
     <li>
-      Stable branch includes cherry-picked or backported changes to
-      fix serious bugs and add support for new devices
+      Branch includes cherry-picked or backported changes to fix
+      serious bugs and add support for new devices
     </li>
     <li>
-      Stable update releases roughly every 1-2 weeks, at least until
+      Updates released roughly every 1-2 weeks, at least until
       3.<var>x</var>+1 is available
     </li>
     <li>
-      A 'long-term' stable branch may be maintained by Greg or another
-      developer beyond this period
+      A <dfn>longterm</dfn> stable branch may be maintained by Greg or
+      another developer beyond this period
     </li>
   </ul>
 </div>
@@ -96,13 +97,8 @@
     <li>
       Any commit in Linus's tree, or a fix for a stable-only
       regression, can be nominated by mail to this list, if it
-      meets the criteria
-      <ul>
-	<li>
-	  See
-	  <a href="http://www.kernel.org/doc/Documentation/stable_kernel_rules.txt"><tt>Documentation/stable_kernel_rules.txt</tt></a>
-	</li>
-      </ul>
+      meets the criteria - see
+      <a href="http://www.kernel.org/doc/Documentation/stable_kernel_rules.txt"><tt>Documentation/stable_kernel_rules.txt</tt></a>
     </li>
   </ul>
 </div>