From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-468427-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SYY1V-0006DP-Lx
	for garchives@archives.gentoo.org; Sun, 27 May 2012 07:36:26 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C9682E0764;
	Sun, 27 May 2012 07:36:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 2DC70E0777
	for <gentoo-commits@lists.gentoo.org>; Sun, 27 May 2012 07:36:08 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 63C461B4006
	for <gentoo-commits@lists.gentoo.org>; Sun, 27 May 2012 07:36:07 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2104)
	id 151122004C; Sun, 27 May 2012 07:36:06 +0000 (UTC)
From: "Joshua Saddler (nightmorph)" <nightmorph@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, nightmorph@gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/doc/en: gentoo-kernel.xml
X-VCS-Repository: gentoo
X-VCS-Files: gentoo-kernel.xml
X-VCS-Directories: xml/htdocs/doc/en
X-VCS-Committer: nightmorph
X-VCS-Committer-Name: Joshua Saddler
Content-Type: text/plain; charset=utf8
Message-Id: <20120527073606.151122004C@flycatcher.gentoo.org>
Date: Sun, 27 May 2012 07:36:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 605fd5bc-455c-4f12-8fc5-a5a4b0474f3d
X-Archives-Hash: 89d3d12efcaface92130d79154b51a95

nightmorph    12/05/27 07:36:06

  Modified:             gentoo-kernel.xml
  Log:
  zen-sources is being removed from portage; moved to previous kernels se=
ction. also kicked out old 2.4/2.6 kernel info no longer relevant to the =
default 3.x kernels used/supported everywhere.

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

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gent=
oo-kernel.xml?rev=3D1.64&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gent=
oo-kernel.xml?rev=3D1.64&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gent=
oo-kernel.xml?r1=3D1.63&r2=3D1.64

Index: gentoo-kernel.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gentoo-kernel.xml	27 Apr 2012 04:58:55 -0000	1.63
+++ gentoo-kernel.xml	27 May 2012 07:36:05 -0000	1.64
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v =
1.63 2012/04/27 04:58:55 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v =
1.64 2012/05/27 07:36:05 nightmorph Exp $ -->
=20
 <guide>
 <title>Gentoo Linux Kernel Guide</title>
@@ -42,8 +42,8 @@
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
=20
-<version>4</version>
-<date>2012-04-26</date>
+<version>5</version>
+<date>2012-05-27</date>
=20
 <chapter>
 <title>Introduction</title>
@@ -60,31 +60,6 @@
 sources we make available to you.
 </p>
=20
-<p>
-Linux 2.4 is maintained by Willy Tarreau. Linus Torvalds, the original c=
reator
-of Linux, handed maintainership of the Linux 2.4 branch over to Marcelo =
Tosatti
-when Linus went off to start developing the newer 2.6 kernel tree. Marce=
lo did a
-fine job of keeping 2.4 stable and secure, and has since handed over
-maintainership to Willy. Note that only security and bug fixes are accep=
ted 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 - on=
ly bug
-and security fixes are being included in the newer releases. If you are =
able to,
-we suggest that you upgrade to Linux 2.6. You may find the <uri
-link=3D"/doc/en/migration-to-2.6.xml">migration document</uri> useful.
-</p>
-
 </body>
 </section>
 </chapter>
@@ -114,7 +89,7 @@
=20
 <p>
 For most users, we recommend the <c>gentoo-sources</c> kernel.
-<c>gentoo-sources</c> is a kernel based on Linux 2.6, lightly patched to=
 fix
+<c>gentoo-sources</c> is a kernel based on Linux 3.x, lightly patched to=
 fix
 security problems, kernel bugs, and to increase compatibility with the m=
ore
 uncommon system architectures.
 </p>
@@ -309,19 +284,7 @@
 </p>
=20
 <p>
-Two versions of the kernel can be found under this package: 2.4 and 2.6.
-</p>
-
-</body>
-</section>
-<section>
-<title>zen-sources</title>
-<body>
-
-<p>
-<c>zen-sources</c> is designed for desktop systems. It includes code not=
 found
-in the mainline kernel. The zen kernel has patches that add new features=
,
-support additional hardware, and contain various tweaks for desktops.
+Two versions of the kernel can be found under this package: 2.6 and 3.x.
 </p>
=20
 </body>
@@ -504,5 +467,17 @@
=20
 </body>
 </section>
+<section>
+<title>zen-sources</title>
+<body>
+
+<p>
+<c>zen-sources</c> was designed for desktop systems. It included code no=
t found
+in the mainline kernel. The zen kernel had patches that added new featur=
es,
+supported additional hardware, and contained various tweaks for desktops=
.
+</p>
+
+</body>
+</section>
 </chapter>
 </guide>