Update package names to present

diff --git a/index.html b/index.html
index 146c523b4d3cc0d6d0d254933d501c8e411a7ee6..f3e57f61e6e0edd4ea15dc13410bcdfd6e981520 100644 (file)
--- a/index.html
+++ b/index.html
@@ -207,8 +207,8 @@
 <div class="slide">
   <h1>Official Linux kernel packages (1)</h1>
   <p>
 <div class="slide">
   <h1>Official Linux kernel packages (1)</h1>
   <p>

-    Main source package is <span class="package">linux-2.6</span>
-    (still!).  Most binary package names change regularly.
+    Main source package is <span class="package">linux</span>.  Most
+    binary package names change regularly.

   </p>
   <ul class="incremental">
     <li>
   </p>
   <ul class="incremental">
     <li>


@@ -228,11 +228,11 @@
     </li>
     <li>
       <span class="package">linux-doc-<var>upstream</var></span>,
     </li>
     <li>
       <span class="package">linux-doc-<var>upstream</var></span>,

-      <span class="package">linux-tools-<var>upstream</var></span>, etc.
+      <span class="package">linux-manual-<var>upstream</var></span>, etc.

     </li>
     <li>
       <span class="package">linux-support-<var>upstream</var>-<var>abi</var></span> -
     </li>
     <li>
       <span class="package">linux-support-<var>upstream</var>-<var>abi</var></span> -

-      scripts and metadata to support linux-latest-2.6
+      scripts and metadata to support linux-latest

     </li>
   </ul>
 </div>
     </li>
   </ul>
 </div>


@@ -240,9 +240,9 @@
 <div class="slide">
   <h1>Official Linux kernel packages (2)</h1>
   <p>
 <div class="slide">
   <h1>Official Linux kernel packages (2)</h1>
   <p>

-    The <span class="package">linux-latest-2.6</span> source package builds meta-packages
+    The <span class="package">linux-latest</span> source package builds meta-packages

     to support automatic upgrades between binaries built
     to support automatic upgrades between binaries built

-    from <span class="package">linux-2.6</span>.
+    from <span class="package">linux</span>.

   </p>
   <ul class="incremental">
     <li>
   </p>
   <ul class="incremental">
     <li>


@@ -276,9 +276,21 @@
       images and tools
     </li>
     <li>
       images and tools
     </li>
     <li>

-      <span class="package">linux-kbuild-2.6</span> builds
-      <span class="package">linux-kbuild-<var>upstream</var></span> -
-      kernel build system and tools for building OOT modules
+      <span class="package">linux-tools</span> builds
+      <ul>
+       <li>
+         <span class="package">linux-kbuild-<var>upstream</var></span> -
+         kernel build system and tools for building OOT modules
+       </li>
+       <li>
+         <span class="package">linux-tools-<var>upstream</var></span>
+         - perf tool
+       </li>
+       <li>
+         <span class="package">usbip</span> - usbip configuration
+         tools
+       </li>
+      </ul>

     </li>
   </ul>
 </div>
     </li>
   </ul>
 </div>