Gentoo Archives: gentoo-doc-cvs

From: "Joshua Saddler (nightmorph)" <nightmorph@g.o>
To: gentoo-doc-cvs@l.g.o
Subject: [gentoo-doc-cvs] gentoo commit in xml/htdocs/doc/en: gentoo-kernel.xml
Date: Sun, 27 May 2012 09:03:10
Message-Id: 20120527073606.083492004B@flycatcher.gentoo.org
1 nightmorph 12/05/27 07:36:06
2
3 Modified: gentoo-kernel.xml
4 Log:
5 zen-sources is being removed from portage; moved to previous kernels section. also kicked out old 2.4/2.6 kernel info no longer relevant to the default 3.x kernels used/supported everywhere.
6
7 Revision Changes Path
8 1.64 xml/htdocs/doc/en/gentoo-kernel.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?rev=1.64&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?rev=1.64&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml?r1=1.63&r2=1.64
13
14 Index: gentoo-kernel.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v
17 retrieving revision 1.63
18 retrieving revision 1.64
19 diff -u -r1.63 -r1.64
20 --- gentoo-kernel.xml 27 Apr 2012 04:58:55 -0000 1.63
21 +++ gentoo-kernel.xml 27 May 2012 07:36:05 -0000 1.64
22 @@ -1,6 +1,6 @@
23 <?xml version="1.0" encoding="UTF-8"?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v 1.63 2012/04/27 04:58:55 nightmorph Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gentoo-kernel.xml,v 1.64 2012/05/27 07:36:05 nightmorph Exp $ -->
27
28 <guide>
29 <title>Gentoo Linux Kernel Guide</title>
30 @@ -42,8 +42,8 @@
31 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
32 <license/>
33
34 -<version>4</version>
35 -<date>2012-04-26</date>
36 +<version>5</version>
37 +<date>2012-05-27</date>
38
39 <chapter>
40 <title>Introduction</title>
41 @@ -60,31 +60,6 @@
42 sources we make available to you.
43 </p>
44
45 -<p>
46 -Linux 2.4 is maintained by Willy Tarreau. Linus Torvalds, the original creator
47 -of Linux, handed maintainership of the Linux 2.4 branch over to Marcelo Tosatti
48 -when Linus went off to start developing the newer 2.6 kernel tree. Marcelo did a
49 -fine job of keeping 2.4 stable and secure, and has since handed over
50 -maintainership to Willy. Note that only security and bug fixes are accepted into
51 -the 2.4 kernel tree. Actual development happens in the Linux 2.6 kernel tree.
52 -</p>
53 -
54 -<p>
55 -Linux 2.6 is maintained by Andrew Morton, who works closely with Linus
56 -Torvalds to deliver a fast, powerful, and feature-packed Linux kernel.
57 -Development is happening at incredible pace and this kernel tree is now very
58 -mature.
59 -</p>
60 -
61 -<p>
62 -Some of the more uncommon system architectures are not fully compatible with
63 -Linux 2.6, and some users prefer the tried-and-tested Linux 2.4 kernel. However,
64 -please note that Linux 2.4 is currently not being developed further - only bug
65 -and security fixes are being included in the newer releases. If you are able to,
66 -we suggest that you upgrade to Linux 2.6. You may find the <uri
67 -link="/doc/en/migration-to-2.6.xml">migration document</uri> useful.
68 -</p>
69 -
70 </body>
71 </section>
72 </chapter>
73 @@ -114,7 +89,7 @@
74
75 <p>
76 For most users, we recommend the <c>gentoo-sources</c> kernel.
77 -<c>gentoo-sources</c> is a kernel based on Linux 2.6, lightly patched to fix
78 +<c>gentoo-sources</c> is a kernel based on Linux 3.x, lightly patched to fix
79 security problems, kernel bugs, and to increase compatibility with the more
80 uncommon system architectures.
81 </p>
82 @@ -309,19 +284,7 @@
83 </p>
84
85 <p>
86 -Two versions of the kernel can be found under this package: 2.4 and 2.6.
87 -</p>
88 -
89 -</body>
90 -</section>
91 -<section>
92 -<title>zen-sources</title>
93 -<body>
94 -
95 -<p>
96 -<c>zen-sources</c> is designed for desktop systems. It includes code not found
97 -in the mainline kernel. The zen kernel has patches that add new features,
98 -support additional hardware, and contain various tweaks for desktops.
99 +Two versions of the kernel can be found under this package: 2.6 and 3.x.
100 </p>
101
102 </body>
103 @@ -504,5 +467,17 @@
104
105 </body>
106 </section>
107 +<section>
108 +<title>zen-sources</title>
109 +<body>
110 +
111 +<p>
112 +<c>zen-sources</c> was designed for desktop systems. It included code not found
113 +in the mainline kernel. The zen kernel had patches that added new features,
114 +supported additional hardware, and contained various tweaks for desktops.
115 +</p>
116 +
117 +</body>
118 +</section>
119 </chapter>
120 </guide>