Changeset e11607f in clfs-sysroot

Timestamp:

Oct 5, 2006, 11:45:54 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

master

Children:

967ae7d

Parents:

052ecb7

Message:

Updated clfs-2.0 branch to OPL license.

Location:

BOOK

Files:

• appendices/license.xml (added)
• arm-index.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• index.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (4 diffs)
• prologue/arm/bookinfo.xml (modified) (1 diff)
• stylesheets/top-index.xsl (modified) (1 diff)
• stylesheets/xhtml/lfs-legalnotice.xsl (modified) (3 diffs)
• x86-index.xml (modified) (1 diff)

BOOK/arm-index.xml

@@ -64 +64 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/arm.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
 
   </part>

BOOK/general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "09"> <!-- Use two digits -->
-<!ENTITY month_name "September">
-<!ENTITY day "17"> <!-- Use two digits -->
+<!ENTITY month "10"> <!-- Use two digits -->
+<!ENTITY month_name "October">
+<!ENTITY day "05"> <!-- Use two digits -->
 <!ENTITY year "2006"> <!-- Use four digits -->
 

BOOK/index.xml

@@ -27 +27 @@
 
   <bibliosource>
-    <emphasis>Based on LFS, Copyright © 1999&ndash;2006 Gerard Beekmans</emphasis>
+    <emphasis>Based on LFS, Copyright &copy; 1999&ndash;2006 Gerard Beekmans</emphasis>
   </bibliosource>
 

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>October 5, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Changed book license to the Open Publication
+          License v1.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 31, 2006</para>
       <itemizedlist>
         <listitem>
-          <para>[jciccone] - Added a Hst System Requirements page.</para>
+          <para>[jciccone] - Added a Host System Requirements page.</para>
         </listitem>
         <listitem>
@@ -57 +67 @@
           systems will fail, it will attempt to connect to 255.255.255.255
           instead of the ip address entered. This was due to a change in glibc's
-          handling of inet_addr, was long now is u_int32_t. Bug found by 
+          handling of inet_addr, was long now is u_int32_t. Bug found by
           Vladimir Vainer.</para>
         </listitem>
@@ -67 +77 @@
         </listitem>
         <listitem>
-          <para>[jciccone] - Removed the keymap settings from the kernel 
+          <para>[jciccone] - Removed the keymap settings from the kernel
           pages.</para>
         </listitem>
@@ -83 +93 @@
         </listitem>
         <listitem>
-          <para>[jciccone] - Updated to Vim Patch -10, which contains upstream 
+          <para>[jciccone] - Updated to Vim Patch -10, which contains upstream
           fixes.</para>
         </listitem>

BOOK/prologue/arm/bookinfo.xml

@@ -27 +27 @@
 
   <legalnotice>
-    <para>Copyright (c) 2005, Jim Gifford &amp; Ryan Oliver</para>
+    <para>Copyright &copy; 2005-2006, Jim Gifford &amp; Ryan Oliver</para>
+
+    <para>All rights reserved.</para>
+
+    <para>This material may be distributed only subject to the terms and
+    conditions set forth in the <xref linkend="license"/> v1.0 or later
+    (the latest version is presently available at <ulink
+    url="http://www.opencontent.org/openpub/"/>).</para>
+
+    <!-- Modifications and limitations to the OPL (see section VI)
+    can be place here, if needed. -->
+
+    <para><trademark class='registered'>Linux</trademark> is a registered
+    trademark of Linus Torvalds.</para>
+
+    <para>This book is based on the "Linux From Scratch" book, that was
+    released under the following license:</para>
+
+    <para>Copyright (c) 1999&ndash;2006, Gerard Beekmans</para>
 
     <para>All rights reserved.</para>

BOOK/stylesheets/top-index.xsl

@@ -162 +162 @@
     <div>
       <p class="copyright">
-        <xsl:text>Copyright (c)</xsl:text>
+        <xsl:text>Copyright ©</xsl:text>
         <xsl:apply-templates/>
       </p>

BOOK/stylesheets/xhtml/lfs-legalnotice.xsl

@@ -8 +8 @@
   <xsl:template match="legalnotice" mode="titlepage.mode">
     <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-      <xsl:variable name="filename" select="concat($base.dir, 'prologue/legalnotice.html')"/>
+      <xsl:variable name="filename" select="concat($base.dir, 'legalnotice.html')"/>
     <xsl:variable name="title">
       <xsl:apply-templates select="." mode="title.markup"/>
@@ -32 +32 @@
                   <a accesskey="h">
                     <xsl:attribute name="href">
-                      <xsl:text>../index.html</xsl:text>
+                      <xsl:text>index.html</xsl:text>
                     </xsl:attribute>
                     <xsl:attribute name="title">
@@ -57 +57 @@
       <a>
         <xsl:attribute name="href">
-          <xsl:value-of select="'prologue/legalnotice.html'"/>
+          <xsl:value-of select="'legalnotice.html'"/>
         </xsl:attribute>
         <xsl:call-template name="gentext">

BOOK/x86-index.xml

@@ -64 +64 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/x86.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
 
   </part>