r1894 - / branches/clfs-2.0/BOOK branches/clfs-2.0/BOOK/bootable/arm branches/clfs-2.0/BOOK/final-preps branches/clfs-2.0/BOOK/introduction/common branches/clfs-2.0/BOOK/materials/common branches/clfs-2.0/BOOK/partitioning/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Jul 2 16:46:18 PDT 2006


Author: jim
Date: 2006-07-02 17:46:18 -0600 (Sun, 02 Jul 2006)
New Revision: 1894

Modified:
   /
   branches/clfs-2.0/BOOK/bootable/arm/kernel.xml
   branches/clfs-2.0/BOOK/final-preps/aboutclfs.xml
   branches/clfs-2.0/BOOK/general.ent
   branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml
   branches/clfs-2.0/BOOK/introduction/common/resources.xml
   branches/clfs-2.0/BOOK/materials/common/introduction.xml
   branches/clfs-2.0/BOOK/partitioning/common/mounting.xml
Log:
 r4276 at server (orig r1980):  jciccone | 2006-07-02 12:53:11 -0700
 More lfs to clfs changes.



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

Modified: branches/clfs-2.0/BOOK/bootable/arm/kernel.xml
===================================================================
--- branches/clfs-2.0/BOOK/bootable/arm/kernel.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/bootable/arm/kernel.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -105,7 +105,7 @@
 
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage ${CLFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
@@ -145,7 +145,7 @@
       <segtitle>Installed files</segtitle>
 
       <seglistitem>
-        <seg>config-[linux-version], lfskernel-[linux-version],
+        <seg>config-[linux-version], clfskernel-[linux-version],
         and System.map-[linux-version]</seg>
       </seglistitem>
     </segmentedlist>
@@ -165,8 +165,8 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="lfskernel">
-        <term><filename>lfskernel-[linux-version]</filename></term>
+      <varlistentry id="clfskernel">
+        <term><filename>clfskernel-[linux-version]</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the
           computer, the kernel is the first part of the operating system
@@ -175,8 +175,8 @@
           as a tree of files to the software and turns a single CPU into
           a multitasking machine capable of running scores of programs
           seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel lfskernel">
-            <primary sortas="b-lfskernel">lfskernel-[linux-version]</primary>
+          <indexterm zone="ch-bootable-kernel clfskernel">
+            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: branches/clfs-2.0/BOOK/final-preps/aboutclfs.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/aboutclfs.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/final-preps/aboutclfs.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -18,16 +18,16 @@
 <screen><userinput>echo $CLFS</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/lfs</filename> if the
+  point, which is <filename class="directory">/mnt/clfs</filename> if the
   provided example was followed. If the output is incorrect, the
   variable can be set with:</para>
 
-<screen><userinput>export CLFS=/mnt/lfs</userinput></screen>
+<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
 
   <para>Having this variable set is beneficial in that commands such as
   <command>install -d $CLFS/tools</command> can be typed literally. The shell
   will automatically replace <quote>$CLFS</quote> with
-  <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
+  <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
   processes the command line.</para>
 
   <para>If you haven't created the <filename class="directory">$CLFS</filename>

Modified: branches/clfs-2.0/BOOK/general.ent
===================================================================
--- branches/clfs-2.0/BOOK/general.ent	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/general.ent	2006-07-02 23:46:18 UTC (rev 1894)
@@ -18,7 +18,7 @@
 <!ENTITY version-ARM "&version;-ARM">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
-<!ENTITY clfs-root "http:/trac.cross-lfs.org/">
+<!ENTITY clfs-root "http://trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
 <!ENTITY faq-root "&lfs-root;faq/">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">

Modified: branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml
===================================================================
--- branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/introduction/common/askforhelp.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -88,10 +88,10 @@
     information. Below is an example of the type of information to include
     from the screen output from <command>make</command>:</para>
 
-<screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/lfs/usr/share/locale\"
--DLIBDIR=\"/mnt/lfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
+<screen><computeroutput>gcc -DALIASPATH=\"/mnt/clfs/usr/share/locale:.\"
+-DLOCALEDIR=\"/mnt/clfs/usr/share/locale\"
+-DLIBDIR=\"/mnt/clfs/usr/lib\"
+-DINCLUDEDIR=\"/mnt/clfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
 -g -O2 -c getopt1.c
 gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
 expand.o file.o function.o getopt.o implicit.o job.o main.o

Modified: branches/clfs-2.0/BOOK/introduction/common/resources.xml
===================================================================
--- branches/clfs-2.0/BOOK/introduction/common/resources.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/introduction/common/resources.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -52,9 +52,8 @@
     community Internet Relay Chat (IRC) network. Before using this support,
     please make sure that your question is not already answered in the LFS
     FAQ or the mailing list archives. You can find the IRC network at
-    <uri>irc.linuxfromscratch.org</uri>. The support channel for cross-lfs is
-    named #cross-lfs. For support on the standard LFS the support channel
-    is named #lfs-support. If you need to show people the output of your
+    <uri>chat.freenode.net</uri>. The support channel for cross-lfs
+    is named #cross-lfs. If you need to show people the output of your
     problems, please use http://pastebin.cross-lfs.org and reference
     the pastebin URL when asking your questions.</para>
 

Modified: branches/clfs-2.0/BOOK/materials/common/introduction.xml
===================================================================
--- branches/clfs-2.0/BOOK/materials/common/introduction.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/materials/common/introduction.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -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="&lfs-root;lfs/packages.html"/>.</para>
+  url="&clfs-root;wiki/download"/>.</para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working

Modified: branches/clfs-2.0/BOOK/partitioning/common/mounting.xml
===================================================================
--- branches/clfs-2.0/BOOK/partitioning/common/mounting.xml	2006-07-02 23:45:59 UTC (rev 1893)
+++ branches/clfs-2.0/BOOK/partitioning/common/mounting.xml	2006-07-02 23:46:18 UTC (rev 1894)
@@ -14,13 +14,13 @@
   be made accessible. In order to do this, the partition needs to be
   mounted at a chosen mount point. For the purposes of this book, it is
   assumed that the file system is mounted under <filename
-  class="directory">/mnt/lfs</filename>, but the directory choice is up
+  class="directory">/mnt/clfs</filename>, but the directory choice is up
   to you.</para>
 
   <para>Choose a mount point and assign it to the <envar>LFS</envar>
   environment variable by running:</para>
 
-<screen><userinput>export CLFS=/mnt/lfs</userinput></screen>
+<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
 
   <para>Next, create the mount point and mount the CLFS file system by
   running:</para>




More information about the cross-lfs mailing list