r1805 - in trunk/BOOK: boot/ppc64 final-system/common final-system/multilib

chris at linuxfromscratch.org chris at linuxfromscratch.org
Tue Jun 20 15:33:58 PDT 2006


Author: chris
Date: 2006-06-20 16:33:58 -0600 (Tue, 20 Jun 2006)
New Revision: 1805

Modified:
   trunk/BOOK/boot/ppc64/yaboot.xml
   trunk/BOOK/final-system/common/glibc.xml
   trunk/BOOK/final-system/common/shadow.xml
   trunk/BOOK/final-system/common/vim.xml
   trunk/BOOK/final-system/multilib/shadow-64bit.xml
Log:
Text/grammar fixes

Modified: trunk/BOOK/boot/ppc64/yaboot.xml
===================================================================
--- trunk/BOOK/boot/ppc64/yaboot.xml	2006-06-20 21:16:24 UTC (rev 1804)
+++ trunk/BOOK/boot/ppc64/yaboot.xml	2006-06-20 22:33:58 UTC (rev 1805)
@@ -47,7 +47,7 @@
     href="../ppc/yaboot.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="f2">It is also apprpriate if you are running an old 32-bit Linux
+    <para os="f2">It is also appropriate if you are running an old 32-bit Linux
     kernel on a 64-bit machine, or if the kernel personality has been forced to
     32-bit.</para>
 

Modified: trunk/BOOK/final-system/common/glibc.xml
===================================================================
--- trunk/BOOK/final-system/common/glibc.xml	2006-06-20 21:16:24 UTC (rev 1804)
+++ trunk/BOOK/final-system/common/glibc.xml	2006-06-20 22:33:58 UTC (rev 1805)
@@ -28,14 +28,14 @@
     <title>Installation of Glibc</title>
 
     <note os="z">
-      <para>Some packages outside of LFS suggest installing GNU libiconv in
+      <para>Some packages outside of CLFS suggest installing GNU libiconv in
       order to translate data from one encoding to another. The project's
       home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
       <quote>This library provides an <function>iconv()</function>
       implementation, for use on systems which don't have one, or whose
       implementation cannot convert from/to Unicode.</quote> Glibc provides
       an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on an LFS system.</para>
+      Unicode, therefore libiconv is not required on a CLFS system.</para>
     </note>
 
     <para os="b">The Glibc build system is self-contained and will install

Modified: trunk/BOOK/final-system/common/shadow.xml
===================================================================
--- trunk/BOOK/final-system/common/shadow.xml	2006-06-20 21:16:24 UTC (rev 1804)
+++ trunk/BOOK/final-system/common/shadow.xml	2006-06-20 22:33:58 UTC (rev 1805)
@@ -44,7 +44,7 @@
     <varlistentry>
       <term><parameter>--without-libpam</parameter></term>
       <listitem><para>Support for Linux-PAM is enabled by default in Shadow,
-      however PAM is not installed on a base LFS system, so this switch
+      however PAM is not installed on a base CLFS system, so this switch
       disables PAM support in Shadow. For instructions to install PAM and
       link Shadow to it, you can look at
       <ulink url="&blfs-root;view/svn/postlfs/shadow.html"/>.</para></listitem>
@@ -52,13 +52,13 @@
     <varlistentry>
       <term><parameter>--without-audit</parameter></term>
       <listitem><para>Support for auditing is enabled by default, but a
-      library that it needs is not installed in a base LFS system. This
+      library that it needs is not installed in a base CLFS system. This
       switch disables auditing support.</para></listitem>
     </varlistentry>
     <varlistentry>
       <term><parameter>--without-selinux</parameter></term>
       <listitem><para>Support for selinux is enabled by default, but selinux
-      is not built in a base LFS system and configure will fail without this
+      is not built in a base CLFS system and configure will fail without this
       switch.</para></listitem>
     </varlistentry>
   </variablelist>
@@ -85,9 +85,9 @@
     passwords longer than 8 characters. It is also necessary to change the
     obsolete <filename class="directory">/var/spool/mail</filename> location
     for user mailboxes that Shadow uses by default to the <filename
-    class="directory">/var/mail</filename> location used currently. Both of
-    these can be accomplished by changing the relevant configuration file
-    while copying it to its destination:</para>
+    class="directory">/var/mail</filename> location used currently. Use the
+    following sed command to make these changes to the appropriate
+    configuration file:</para>
 
     <indexterm zone="shadow-login_defs">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
@@ -116,12 +116,6 @@
 rm -v /lib/libshadow.so
 ln -svf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
-    <para os="y">The <option>-D</option> option of the <command>useradd</command>
-    program requires the <filename class="directory">/etc/default</filename>
-    directory for it to work properly:</para>
-
-<screen os="z"><userinput>install -dv /etc/default</userinput></screen>
-
   </sect2>
 
   <sect2 id="conf-shadow" role="configuration">
@@ -149,6 +143,12 @@
 
 <screen role="nodump"><userinput>grpconv</userinput></screen>
 
+    <para>To view or change the default settings for new user accounts that
+    you create, you can edit <filename>/etc/default/useradd</filename>. See 
+    <command>man useradd</command> or
+    <ulink url="&blfs-root;view/svn/postlfs/skel.html"/> for more
+    information.</para>
+
   </sect2>
 
   <sect2 id="root-password" role="configuration">

Modified: trunk/BOOK/final-system/common/vim.xml
===================================================================
--- trunk/BOOK/final-system/common/vim.xml	2006-06-20 21:16:24 UTC (rev 1804)
+++ trunk/BOOK/final-system/common/vim.xml	2006-06-20 22:33:58 UTC (rev 1805)
@@ -98,10 +98,10 @@
 <screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
     <para os="p">If an X Window System is going to be installed on the LFS
-    system, it may be necessary to recompile Vim after installing X. Vim
+    system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
-    additional libraries to be installed. For more information on this
-    process, refer to the Vim documentation and the Vim installation page
+    additional libraries to be installed. For more information, refer to the
+    Vim documentation and the Vim installation page
     in the BLFS book at <ulink
     url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
 

Modified: trunk/BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-64bit.xml	2006-06-20 21:16:24 UTC (rev 1804)
+++ trunk/BOOK/final-system/multilib/shadow-64bit.xml	2006-06-20 22:33:58 UTC (rev 1805)
@@ -104,14 +104,6 @@
 rm -v /lib64/libshadow.so
 ln -svf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list