r2030 - / trunk/BOOK trunk/BOOK/introduction/common trunk/BOOK/materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 18 00:45:35 PDT 2006


Author: jim
Date: 2006-07-18 01:45:30 -0600 (Tue, 18 Jul 2006)
New Revision: 2030

Modified:
   /
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/common/askforhelp.xml
   trunk/BOOK/materials/common/introduction.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/patches.ent
Log:
 r4658 at server (orig r2151):  chris at beaker67.com | 2006-07-17 21:25:42 -0700
 Text fixes



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

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/general.ent	2006-07-18 07:45:30 UTC (rev 2030)
@@ -32,7 +32,7 @@
 <!ENTITY clfs-root "http://cross-lfs.org/">
 <!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&clfs-root;wiki/faq">
+<!ENTITY faq-root "&clfs-wiki;wiki/faq">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY livecd-root "&lfs-root;livecd/">

Modified: trunk/BOOK/introduction/common/askforhelp.xml
===================================================================
--- trunk/BOOK/introduction/common/askforhelp.xml	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/introduction/common/askforhelp.xml	2006-07-18 07:45:30 UTC (rev 2030)
@@ -68,7 +68,7 @@
       <para>Deviating from this book does <emphasis>not</emphasis>
       mean that we will not help you. After all, the CLFS project is
       about personal preference. Be upfront about any changes to
-      the established procedure, this helps us evaluate and determine
+      the established procedure—this helps us evaluate and determine
       possible causes of your problem.</para>
     </note>
 

Modified: trunk/BOOK/materials/common/introduction.xml
===================================================================
--- trunk/BOOK/materials/common/introduction.xml	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/materials/common/introduction.xml	2006-07-18 07:45:30 UTC (rev 2030)
@@ -24,7 +24,7 @@
   url="http://www.google.com/"/>) provides a useful search engine for
   most packages. If this search is unsuccessful, try one of the
   alternative means of downloading discussed at <ulink
-  url="http://cross-lfs.org/files/packages/&major-version;.&minor-version;.&extra-version;"/>.</para>
+  url="&packages-root;"/>.</para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working
@@ -41,11 +41,11 @@
 
 <screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
 
-  <para>Make this directory writable and sticky. <quote>Sticky</quote>
-  means that even if multiple users have write permission on a
-  directory, only the owner of a file can delete the file within a
-  sticky directory. The following command will enable the write and
-  sticky modes:</para>
+  <para>Make this directory writable and sticky. When a directory is
+  marked <quote>sticky</quote>, that means that even if multiple users have
+  write permission on that directory, any file within that directory can only be
+  deleted or modified by its owner. The following command will enable the
+  write and sticky modes:</para>
 
 <screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
 

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/materials/common/patches.xml	2006-07-18 07:45:30 UTC (rev 2030)
@@ -14,7 +14,7 @@
   These patches correct any mistakes in the packages that should be
   fixed by the maintainer. The patches also make small modifications to
   make the packages easier to work with. The following patches will be
-  needed to build an CLFS system:</para>
+  needed to build a CLFS system:</para>
 
   <variablelist role="materials">
 

Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/packages.ent	2006-07-18 07:45:30 UTC (rev 2030)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY packages-root "http://cross-lfs.org/files/packages/&generic-version;/">
+<!ENTITY packages-root "&clfs-root;files/packages/&generic-version;/">
 
 <!-- Note: For empty *-home entities use " " not "" -->
 

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-07-18 07:45:15 UTC (rev 2029)
+++ trunk/BOOK/patches.ent	2006-07-18 07:45:30 UTC (rev 2030)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY patches-root "http://cross-lfs.org/files/patches/&generic-version;/">
+<!ENTITY patches-root "&clfs-root;files/patches/&generic-version;/">
 
 <!-- Start of Common Patches -->
 




More information about the cross-lfs mailing list