[FE training-materials-updates] linux-versioning: improve, update and reorder

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : kernel-ng
Link       : http://git.free-electrons.com/training-materials/commit/?id=6270b507a173567ce9a090ddd046c2c3c163ac29

>---------------------------------------------------------------

commit 6270b507a173567ce9a090ddd046c2c3c163ac29
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Sep 18 23:05:12 2013 +0200

    linux-versioning: improve, update and reorder
    
    - Update and reorder some explanations when useful
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

6270b507a173567ce9a090ddd046c2c3c163ac29
 .../sysdev-linux-intro-versioning.tex              |   62 ++++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex b/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
index 22de627..21a31eb 100644
--- a/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
+++ b/slides/sysdev-linux-intro-versioning/sysdev-linux-intro-versioning.tex
@@ -28,7 +28,7 @@
 \end{frame}
 
 \begin{frame}
-  \frametitle{Changes since Linux 2.6 (1)}
+  \frametitle{Changes since Linux 2.6}
   \begin{itemize}
   \item Since \code{2.6.0}, kernel developers have been able to
     introduce lots of new features one by one on a steady pace,
@@ -42,30 +42,46 @@
 \end{frame}
 
 \begin{frame}
-  \frametitle{Changes since Linux 2.6 (2)}
-  Since 2.6.14, the kernel developers agreed on the following
-  development model:
+  \frametitle{3.x stable branch}
   \begin{itemize}
-  \item After the release of a \code{2.6.x} version, a two-weeks merge
-    window opens, during which major additions are merged.
-  \item The merge window is closed by the release of test version
-    \code{2.6.(x+1)-rc1}
-  \item The bug fixing period opens, for 6 to 10 weeks.
-  \item At regular intervals during the bug fixing period,
-    \code{2.6.(x+1)-rcY} test versions are released.
-  \item When considered sufficiently stable, kernel \code{2.6.(x+1)}
-    is released, and the process starts again.
+  \item From 2003 to 2011, the official kernel versions were named \code{2.6.x}.
+  \item Linux \code{3.0} was released in July 2011
+  \item This is only a change to the numbering scheme
+    \begin{itemize}
+    \item Official kernel versions are now named \code{3.x}
+      (\code{3.0, 3.1, 3.2}, etc.)
+    \item Stabilized versions are named \code{3.x.y}
+      (\code{3.0.2, 3.4.3}, etc.)
+    \item It effectively only removes a digit compared to the previous
+      numbering scheme
+    \end{itemize}
   \end{itemize}
 \end{frame}
 
 \begin{frame}
-  \frametitle{Merge and bug fixing windows}
+  \frametitle{New development model}
+  Using merge and bug fixing windows
   \begin{center}
     \includegraphics[width=\textwidth]{slides/sysdev-linux-intro-versioning/new-development-process.pdf}
   \end{center}
 \end{frame}
 
 \begin{frame}
+  \frametitle{New development model - Details}
+  \begin{itemize}
+  \item After the release of a \code{3.x} version (for example),
+    a two-weeks merge window opens, during which major additions are merged.
+  \item The merge window is closed by the release of test version
+    \code{3.(x+1)-rc1}
+  \item The bug fixing period opens, for 6 to 10 weeks.
+  \item At regular intervals during the bug fixing period,
+    \code{3.(x+1)-rcY} test versions are released.
+  \item When considered sufficiently stable, kernel \code{3.(x+1)}
+    is released, and the process starts again.
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
   \frametitle{More stability for the kernel source tree}
   \begin{columns}
     \column{0.7\textwidth}
@@ -87,24 +103,6 @@
   \end{columns}
 \end{frame}
 
-\begin{frame}
-  \frametitle{New 3.x branch}
-  \begin{itemize}
-  \item From 2003 to 2011, the official kernel versions were named \code{2.6.x}.
-  \item Linux \code{3.0} was released in July 2011
-  \item There is no change to the development model, only a change to
-    the numbering scheme
-    \begin{itemize}
-    \item Official kernel versions will be named \code{3.x}
-      (\code{3.0, 3.1, 3.2}, etc.)
-    \item Stabilized versions will be named \code{3.x.y}
-      (\code{3.0.2, 3.4.3}, etc.)
-    \item It effectively only removes a digit compared to the previous
-      numbering scheme
-    \end{itemize}
-  \end{itemize}
-\end{frame}
-
 \begin{frame}[fragile]
   \frametitle{What's new in each Linux release?}
   \begin{itemize}