[gentoo-doc-cvs] cvs commit: gentoo-kernel.xml

[Josh Saddler]

nightmorph    06/12/04 01:19:19

  Modified:             gentoo-kernel.xml
  Log:
  couple more changes by dsd's request on IRC

Revision  Changes    Path
1.46                 xml/htdocs/doc/en/gentoo-kernel.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?r1=1.45&r2=1.46

Index: gentoo-kernel.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gentoo-kernel.xml	30 Nov 2006 20:08:34 -0000	1.45
+++ gentoo-kernel.xml	4 Dec 2006 01:19:19 -0000	1.46
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v 1.45 2006/11/30 20:08:34 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v 1.46 2006/12/04 01:19:19 nightmorph Exp $ -->
 
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 <guide link="/doc/en/gentoo-kernel.xml">
@@ -38,8 +38,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.15</version>
-<date>2006-11-30</date>
+<version>1.16</version>
+<date>2006-12-03</date>
 
 <chapter>
 <title>Introduction</title>
@@ -57,6 +57,22 @@
 </p>
 
 <p>
+Linux 2.4 is maintained by Marcelo Tosatti. Linus Torvalds, the original
+creator of Linux, handed maintainership of the Linux 2.4 branch over to
+Marcelo when Linus went off to start developing the newer 2.6 kernel tree.
+Marcelo has done a fine job of keeping 2.4 stable and secure, and is now
+only accepting security and bug fixes into the 2.4 kernel tree. Actual
+development happens in the Linux 2.6 kernel tree.
+</p>
+
+<p>
+Linux 2.6 is maintained by Andrew Morton, who works closely with Linus
+Torvalds to deliver a fast, powerful, and feature-packed Linux kernel.
+Development is happening at incredible pace and this kernel tree is now very
+mature.
+</p>
+
+<p>
 Some of the more uncommon system architectures are not fully compatible with
 Linux 2.6, and some users prefer the tried-and-tested Linux 2.4 kernel. However,
 please note that Linux 2.4 is currently not being developed further - only bug
@@ -65,7 +81,6 @@
 link="/doc/en/migration-to-2.6.xml">migration document</uri> useful.
 </p>
 
-
 </body>
 </section>
 </chapter>
@@ -317,22 +332,6 @@
 under this package: 2.4 and 2.6.
 </p>
 
-<p>
-Linux 2.4 is maintained by Marcelo Tosatti. Linus Torvalds, the original
-creator of Linux, handed maintainership of the Linux 2.4 branch over to
-Marcelo when Linus went off to start developing the newer 2.6 kernel tree.
-Marcelo has done a fine job of keeping 2.4 stable and secure, and is now
-only accepting security and bug fixes into the 2.4 kernel tree. Actual
-development happens in the Linux 2.6 kernel tree.
-</p>
-
-<p>
-Linux 2.6 is maintained by Andrew Morton, who works closely with Linus
-Torvalds to deliver a fast, powerful, and feature-packed Linux kernel.
-Development is happening at incredible pace and this kernel tree is now very
-mature.
-</p>
-
 </body>
 </section>
 </chapter>



-- 
gentoo-doc-cvs@g.o mailing list