Changeset 416886f

Timestamp:

05/28/2008 06:11:38 PM (16 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

8d334705

Parents:

2b9defe

Message:

Update license wording; change code license to MIT License

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7483 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• appendices/ac-free-lic.xml (deleted)
• appendices/mit-lic.xml (added)
• book/bookinfo.xml (modified) (3 diffs)
• general.ent (modified) (1 diff)
• index.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)

book/bookinfo.xml

@@ -11 +11 @@
   <date>$Date$</date>
 
-  <!-- <title>Beyond <trademark class='registered'>Linux</trademark> From Scratch</title>-->
   <title>Beyond Linux<superscript>&reg;</superscript> From Scratch</title>
   <subtitle>Version &version;</subtitle>
@@ -17 +16 @@
   <authorgroup>
     <corpauthor>
-      BLFS Development Team
+      &copyholder;
     </corpauthor>
   </authorgroup>
@@ -25 +24 @@
   <copyright id="copyright">
     <year>2001-2008</year>
-    <holder>BLFS Development Team</holder>
+    <holder>&copyholder;</holder>
   </copyright>
 
   <legalnotice>
-    <para>Copyright &copy; 2001-2008, BLFS Development Team</para>
+    <para>Copyright &copy; &copyrightdate;, &copyholder;</para>
 
     <para>All rights reserved.</para>
+    
+                <para>This book is licensed under a <xref linkend="CC"/>.</para>
 
-    <para>Descriptive text is licensed under a <xref linkend="CC"/>.</para>
-    <para>Computer instructions are licensed under the <xref linkend="AFL"/>.</para>
+                <para>Computer instructions may be extracted from the book under the
+                <xref linkend="MIT"/>.</para>
 
     <para><trademark class='registered'>Linux</trademark> is a registered trademark of

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
+<!ENTITY copyrightdate "2001-&year;">
+<!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
 <!ENTITY releasedate  "May &day;th, &year;">

index.xml

@@ -30 +30 @@
   <!-- Appendices -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/creat-comm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/ac-free-lic.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/mit-lic.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/glossary.xml"/>
 

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
     <listitem>
+      <para>May 28th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Clarified the book license.  Changed license for
+          instructions to the MIT license.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 24th, 2008</para>
       <itemizedlist>