r1976 - / trunk/BOOK trunk/BOOK/prologue/x86

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jul 12 07:35:38 PDT 2006


Author: jim
Date: 2006-07-12 08:35:38 -0600 (Wed, 12 Jul 2006)
New Revision: 1976

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/index.xml
   trunk/BOOK/prologue/x86/bookinfo.xml
Log:
 r4515 at server (orig r2082):  jim | 2006-07-12 07:34:20 -0700
  r4513 at server:  jim | 2006-07-12 07:33:13 -0700
  Reverted last Changes. Fixed architectures listed for netboot hint
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2081
   + b6734a72-470d-0410-b049-f317dca95413:/:2082


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4512
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4513
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/index.xml
===================================================================
--- trunk/BOOK/index.xml	2006-07-12 14:35:22 UTC (rev 1975)
+++ trunk/BOOK/index.xml	2006-07-12 14:35:38 UTC (rev 1976)
@@ -6,7 +6,7 @@
 ]>
 
 <bookinfo>
-  <title>Cross Linux From Scratch</title>
+  <title>Cross-Compiled Linux From Scratch</title>
   <subtitle>Version &version;</subtitle>
 
   <authorgroup>
@@ -26,7 +26,7 @@
   </copyright>
 
   <bibliosource>
-    <emphasis>Based on Linux From Scratch, Copyright © 1999–2006 Gerard Beekmans</emphasis>
+    <emphasis>Based on LFS, Copyright © 1999–2006 Gerard Beekmans</emphasis>
   </bibliosource>
 
 </bookinfo>

Modified: trunk/BOOK/prologue/x86/bookinfo.xml
===================================================================
--- trunk/BOOK/prologue/x86/bookinfo.xml	2006-07-12 14:35:22 UTC (rev 1975)
+++ trunk/BOOK/prologue/x86/bookinfo.xml	2006-07-12 14:35:38 UTC (rev 1976)
@@ -26,49 +26,43 @@
   xpointer="xpointer(bookinfo/bibliosource)"/>
 
   <legalnotice>
+    <para>Copyright (c) 2005, Jim Gifford & Ryan Oliver</para>
 
-    <para>Cross Linux From Scratch uses the MIT License</para>
+    <para>All rights reserved.</para>
 
-    <para>Cross Linux from Scratch is based off of Linux From Scratch
-    <ulink url="http://www.linuxfromscratch.org"/></para>
+    <para>Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:</para>
 
-    <para>Copyright (c) 2005–2006, Jim Gifford & Ryan Oliver</para>
-
-    <para>Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:</para>
-
     <itemizedlist>
       <listitem>
-        <para>Redistributions in any form must retain the above copyright notice,
-         this list of conditions and the following disclaimer</para>
+        <para>Redistributions in any form must retain the above copyright
+        notice, this list of conditions and the following disclaimer</para>
       </listitem>
       <listitem>
-        <para>Neither the name of <quote>Cross Linux From Scratch</quote> nor the
+        <para>Neither the name of <quote>Linux From Scratch</quote> nor the
         names of its contributors may be used to endorse or promote products
         derived from  this material without specific prior written
         permission</para>
       </listitem>
       <listitem>
-        <para>Any material derived from Cross Linux From Scratch must contain
-        a reference to the <quote>Cross Linux From Scratch</quote> project</para>
+        <para>Any material derived from Linux From Scratch must contain
+        a reference to the <quote>Linux From Scratch</quote> project</para>
       </listitem>
     </itemizedlist>
 
-    <para>The above copyright notice and this permission notice shall be included
-     in all copies or substantial portions of the Software.</para>
+    <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+    BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
 
-    <para>THE SOFTWARE IS PROVIDED <quote>AS IS</quote>, WITHOUT WARRANTY OF ANY
-    KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-    THE USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
-
   </legalnotice>
 
 </bookinfo>




More information about the cross-lfs mailing list