Procházet zdrojové kódy

Merge r8323, r8324 and r8325 to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8326 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork před 18 roky
rodič
revize
92ffeebc7e
3 změnil soubory, kde provedl 118 přidání a 103 odebrání
  1. 92 99
      appendices/acknowledgments.xml
  2. 22 0
      chapter01/changelog.xml
  3. 4 4
      packages.ent

+ 92 - 99
appendices/acknowledgments.xml

@@ -25,27 +25,13 @@
     <listitem>
       <para><ulink url="mailto:matthew@linuxfromscratch.org">Matthew
       Burgess</ulink> &lt;matthew@linuxfromscratch.org&gt; &ndash;
-      LFS Project Leader, LFS Technical Writer/Editor, LFS Release
-      Manager</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:archaic@linuxfromscratch.org">Archaic</ulink>
-      &lt;archaic@linuxfromscratch.org&gt; &ndash; LFS Technical Writer/Editor,
-      HLFS Project Leader, BLFS Editor, Hints and Patches Project
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:nathan@linuxfromscratch.org">Nathan
-      Coulson</ulink> &lt;nathan@linuxfromscratch.org&gt; &ndash;
-      LFS-Bootscripts Maintainer</para>
+      LFS Project Leader, LFS Technical Writer/Editor</para>
     </listitem>
 
     <listitem>
       <para><ulink url="mailto:bdubbs@linuxfromscratch.org">Bruce
-      Dubbs</ulink> &lt;bdubbs@linuxfromscratch.org&gt; &ndash; BLFS Project
-      Leader</para>
+      Dubbs</ulink> &lt;bdubbs@linuxfromscratch.org&gt; &ndash; LFS Release 
+      Manager</para>
     </listitem>
 
     <listitem>
@@ -56,8 +42,14 @@
 
     <listitem>
       <para><ulink url="mailto:jim@linuxfromscratch.org">Jim
-      Gifford</ulink> &lt;jim@linuxfromscratch.org&gt; &ndash; LFS Technical
-      Writer, Patches Project Leader</para>
+      Gifford</ulink> &lt;jim@linuxfromscratch.org&gt; &ndash; CLFS Project
+      Co-Leader</para>
+    </listitem>
+
+    <listitem>
+      <para><ulink url="mailto:bryan@linuxfromscratch.org">Bryan
+      Kadzban</ulink> &lt;bryan@linuxfromscratch.org&gt; &ndash; LFS
+      Technical Writer</para>
     </listitem>
 
     <listitem>
@@ -67,27 +59,28 @@
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:lizardo@linuxfromscratch.org">Anderson
-      Lizardo</ulink> &lt;lizardo@linuxfromscratch.org&gt; &ndash; Website
-      Backend-Scripts Maintainer</para>
+      <para><ulink url="mailto:randy@linuxfromscratch.org">Randy
+      McMurchy</ulink> &lt;randy@linuxfromscratch.org&gt; &ndash; BLFS
+      Project Leader</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan
-      Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; &ndash; LFS Toolchain
-      Maintainer</para>
+      <para><ulink url="mailto:dnicholson@linuxfromscratch.org">Dan
+      Nicholson</ulink> &lt;dnicholson@linuxfromscratch.org&gt; &ndash; LFS and
+      BLFS Editor</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:jwrober@linuxfromscratch.org">James
-      Robertson</ulink> &lt;jwrober@linuxfromscratch.org&gt; &ndash; Bugzilla
-      Maintainer</para>
+      <para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan
+      Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; &ndash; CLFS Project
+      Co-Leader</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:tushar@linuxfromscratch.org">Tushar
-      Teredesai</ulink> &lt;tushar@linuxfromscratch.org&gt; &ndash; BLFS Book
-      Editor, Hints and Patches Project Leader</para>
+      <para><ulink url="mailto:alexander@linuxfromscratch.org">Alexander
+      E. Patrakov</ulink> &lt;alexander@linuxfromscratch.org&gt; &ndash; LFS
+      Technical Writer, LFS Internationalization Editor, 
+      LFS Live CD Maintainer</para>
     </listitem>
 
     <listitem>
@@ -140,29 +133,19 @@
       &lt;scott@osuosl.org&gt; &ndash; lfs.oregonstate.edu mirror</para>
     </listitem>
 
-    <listitem>
-      <para><ulink url="mailto:miha@xuy.biz">Mikhail Pastukhov</ulink>
-      &lt;miha@xuy.biz&gt; &ndash; lfs.130th.net mirror</para>
-    </listitem>
-
     <listitem>
       <para><ulink url="mailto:lost@l-w.net">William Astle</ulink>
       &lt;lost@l-w.net&gt; &ndash; ca.linuxfromscratch.org mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:jpolen@rackspace.com">Jeremy Polen</ulink>
-      &lt;jpolen@rackspace.com&gt; &ndash; us2.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tim@idge.net">Tim Jackson</ulink>
-      &lt;tim@idge.net&gt; &ndash; linuxfromscratch.idge.net mirror</para>
+      <para><ulink url="mailto:eujon.sellers@gmail.com">Eujon Sellers</ulink>
+      &lt;jpolen@rackspace.com&gt; &ndash; lfs.introspeed.com mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:jeremy@linux-phreak.net">Jeremy Utley</ulink>
-      &lt;jeremy@linux-phreak.net&gt; &ndash; lfs.linux-phreak.net mirror</para>
+      <para><ulink url="mailto:justin@knierim.org">Justin Knierim</ulink>
+      &lt;tim@idge.net&gt; &ndash; lfs-matrix.net mirror</para>
     </listitem>
 
   </itemizedlist>
@@ -171,11 +154,6 @@
 
   <itemizedlist>
 
-    <listitem>
-      <para><ulink url="mailto:sysop@mesi.com.ar">Andres Meggiotto</ulink>
-      &lt;sysop@mesi.com.ar&gt; &ndash; lfs.mesi.com.ar mirror</para>
-    </listitem>
-
     <listitem>
       <para><ulink url="mailto:manuel@linuxfromscratch.org">Manuel
       Canales Esparcia</ulink> &lt;manuel@linuxfromscratch.org&gt; &ndash;
@@ -183,9 +161,8 @@
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:ebf@aedsolucoes.com.br">Eduardo B.
-      Fonseca</ulink> &lt;ebf@aedsolucoes.com.br&gt; &ndash;
-      br.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:lfalcon@thymbra.com">Luis Falcon</ulink> 
+      &lt;Luis Falcon&gt; &ndash; torredehanoi.org mirror</para>
     </listitem>
 
   </itemizedlist>
@@ -195,44 +172,37 @@
   <itemizedlist>
 
     <listitem>
-      <para><ulink url="mailto:barna@siker.hu">Barna Koczka</ulink>
-      &lt;barna@siker.hu&gt; &ndash; hu.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="http://www.mirror.ac.uk">UK Mirror Service</ulink>
-      &ndash; linuxfromscratch.mirror.ac.uk mirror</para>
+      <para><ulink url="mailto:guido@primerelay.net">Guido Passet</ulink>
+      &lt;guido@primerelay.net&gt; &ndash; nl.linuxfromscratch.org mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:Martin.Voss@ada.de">Martin Voss</ulink>
-      &lt;Martin.Voss@ada.de&gt; &ndash; lfs.linux-matrix.net mirror</para>
+      <para><ulink url="mailto:baafie@planet.nl">Bastiaan Jacques</ulink>
+      &lt;baafie@planet.nl&gt; &ndash; lfs.pagefault.net mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:guido@primerelay.net">Guido Passet</ulink>
-      &lt;guido@primerelay.net&gt; &ndash; nl.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:sven.cranshoff@lineo.be">Sven Cranshoff</ulink>
+      &lt;sven.cranshoff@lineo.be&gt; &ndash; lfs.lineo.be mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:baafie@planet.nl">Bastiaan Jacques</ulink>
-      &lt;baafie@planet.nl&gt; &ndash; lfs.pagefault.net mirror</para>
+      <para>Scarlet Belgium &ndash; lfs.scarlet.be mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:lfs-mirror@linuxfromscratch.rave.org">Roel
-      Neefs</ulink> &lt;lfs-mirror@linuxfromscratch.rave.org&gt; &ndash;
-      linuxfromscratch.rave.org mirror</para>
+      <para><ulink url="mailto:info@aliensoft.org">Sebastian Faulborn</ulink>
+      &lt;info@aliensoft.org&gt; &ndash; lfs.aliensoft.org mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:justin@jrknierim.de">Justin Knierim</ulink>
-      &lt;justin@jrknierim.de&gt; &ndash; www.lfs-matrix.de mirror</para>
+      <para><ulink url="mailto:stuart@dontuse.ms">Stuart Fox</ulink>
+      &lt;stuart@dontuse.ms&gt; &ndash; lfs.dontuse.ms mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:stevie@stevie20.de">Stephan Brendel</ulink>
-      &lt;stevie@stevie20.de&gt; &ndash; lfs.netservice-neuss.de mirror</para>
+      <para><ulink url="mailto:admin@realhost.de">Ralf Uhlemann</ulink>
+      &lt;admin@realhost.de&gt; &ndash; lfs.oss-mirror.org mirror</para>
     </listitem>
 
     <listitem>
@@ -248,30 +218,23 @@
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:archive@doc.cs.univ-paris8.fr">Parisian
-      sysadmins</ulink> &lt;archive@doc.cs.univ-paris8.fr&gt; &ndash;
-      www2.fr.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:franck@linuxpourtous.com">Franck</ulink>
+      &lt;franck@linuxpourtous.com&gt; &ndash; lfs.linuxpourtous.com mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:velin@zadnik.org">Alexander Velin</ulink>
-      &lt;velin@zadnik.org&gt; &ndash; bg.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:baque@cict.fr">Philippe Baqu&eacute;</ulink>
+      &lt;baque@cict.fr&gt; &ndash; lfs.cict.fr mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:dirk@securewebservices.co.uk"> Dirk
-      Webster</ulink> &lt;dirk@securewebservices.co.uk&gt; &ndash;
-      lfs.securewebservices.co.uk mirror</para>
+      <para><ulink url="mailto:gyouja@pilgrims.ru">Vitaly Chekasin</ulink>
+      &lt;gyouja@pilgrims.ru&gt; &ndash; lfs.pilgrims.ru mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:thomas@sofagang.dk">Thomas Skyt</ulink>
-      &lt;thomas@sofagang.dk&gt; &ndash; dk.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:sime@dot-sime.com">Simon Nicoll</ulink>
-      &lt;sime@dot-sime.com&gt; &ndash; uk.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:kontakt@wankoo.org">Benjamin Heil</ulink>
+      &lt;kontakt@wankoo.org&gt; &ndash; lfs.wankoo.org mirror</para>
     </listitem>
 
   </itemizedlist>
@@ -281,14 +244,18 @@
   <itemizedlist>
 
     <listitem>
-      <para><ulink url="mailto:pyng@spam.averse.net">Pui Yong</ulink>
-      &lt;pyng@spam.averse.net&gt; &ndash; sg.linuxfromscratch.org mirror</para>
+      <para><ulink url="mailto:satit@wbac.ac.th">Satit Phermsawang</ulink>
+      &lt;satit@wbac.ac.th&gt; &ndash; lfs.phayoune.org mirror</para>
+    </listitem>
+
+    <listitem>
+      <para><ulink url="mailto:info@shizu-net.jp">Shizunet Co.,Ltd.</ulink> 
+      &lt;info@shizu-net.jp&gt; &ndash; lfs.mirror.shizu-net.jp mirror</para>
     </listitem>
 
     <listitem>
-      <para><ulink url="mailto:stuart@althalus.me.uk">Stuart
-      Harris</ulink> &lt;stuart@althalus.me.uk&gt; &ndash;
-      lfs.mirror.intermedia.com.sg mirror</para>
+      <para><ulink url="http://www.initworld.com/">Init World</ulink> 
+      &lt;http://www.initworld.com/&gt; &ndash; lfs.initworld.com mirror</para>
     </listitem>
 
   </itemizedlist>
@@ -314,6 +281,19 @@
       Book Editor</para>
     </listitem>
 
+    <listitem>
+      <para>Archaic
+      &lt;archaic@linuxfromscratch.org&gt; &ndash; LFS Technical Writer/Editor,
+      HLFS Project Leader, BLFS Editor, Hints and Patches Project
+      Maintainer</para>
+    </listitem>
+
+    <listitem>
+      <para><ulink url="mailto:nathan@linuxfromscratch.org">Nathan
+      Coulson</ulink> &lt;nathan@linuxfromscratch.org&gt; &ndash;
+      LFS-Bootscripts Maintainer</para>
+    </listitem>
+
     <listitem>
       <para>Timothy Bauscher</para>
     </listitem>
@@ -352,6 +332,12 @@
       Maintainer</para>
     </listitem>
 
+    <listitem>
+      <para><ulink url="mailto:lizardo@linuxfromscratch.org">Anderson
+      Lizardo</ulink> &lt;lizardo@linuxfromscratch.org&gt; &ndash; Website
+      Backend-Scripts Maintainer</para>
+    </listitem>
+
     <listitem>
       <para>Simon Perreault</para>
     </listitem>
@@ -362,11 +348,6 @@
       Gateway Maintainer</para>
     </listitem>
 
-    <listitem>
-      <para><ulink url="mailto:semzx@newmail.ru">Alexander Patrakov</ulink>
-      &lt;semzx@newmail.ru&gt; &ndash; LFS Technical Writer</para>
-    </listitem>
-
     <listitem>
       <para><ulink url="mailto:gschafer@zip.com.au">Greg Schafer</ulink>
       &lt;gschafer@zip.com.au&gt; &ndash; LFS Technical Writer</para>
@@ -376,6 +357,18 @@
       <para>Jesse Tie-Ten-Quee &ndash; LFS Technical Writer</para>
     </listitem>
 
+    <listitem>
+      <para><ulink url="mailto:jwrober@linuxfromscratch.org">James
+      Robertson</ulink> &lt;jwrober@linuxfromscratch.org&gt; &ndash; Bugzilla
+      Maintainer</para>
+    </listitem>
+
+    <listitem>
+      <para><ulink url="mailto:tushar@linuxfromscratch.org">Tushar
+      Teredesai</ulink> &lt;tushar@linuxfromscratch.org&gt; &ndash; BLFS Book
+      Editor, Hints and Patches Project Leader</para>
+    </listitem>
+
     <listitem>
       <para><ulink url="mailto:jeremy@linuxfromscratch.org">Jeremy
       Utley</ulink> &lt;jeremy@linuxfromscratch.org&gt; &ndash; LFS Technical
@@ -417,7 +410,7 @@
     </listitem>
 
     <listitem>
-      <para>Mark Stone for donating Belgarath, the linuxfromscratch.org
+      <para>Mark Stone for donating Belgarath, the first linuxfromscratch.org
       server</para>
     </listitem>
 

+ 22 - 0
chapter01/changelog.xml

@@ -36,6 +36,28 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2007-08-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bryan] - Fix typo in acknowledgements.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2007-08-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Linux-2.6.22.3, fixes
+             <ulink url="&lfs-ticket-root;2060">#2060</ulink>..</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated acknowledgements.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-08-13</para>
       <itemizedlist>

+ 4 - 4
packages.ent

@@ -295,13 +295,13 @@
 
 <!ENTITY linux-major-version "2.6">
 <!ENTITY linux-minor-version "22">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "3">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "44,100 KB">
+<!ENTITY linux-size "44,049 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "3dd27284fea13e46fc2e110e3cd8a72c">
+<!ENTITY linux-md5 "13dd3e1fff368190a4d4be8838016880">
 <!ENTITY linux-home "http://www.kernel.org/">
-<!ENTITY linux-ch8-du "310 - 390 MB">
+<!ENTITY linux-ch8-du "350 - 450 MB">
 <!ENTITY linux-ch8-sbu "1.5 - 3.5 SBU">
 
 <!ENTITY linux-headers-ch5-du "286 MB">