Author: jim
Date: 2006-07-09 01:45:11 -0600 (Sun, 09 Jul 2006)
New Revision: 1938

Modified:
   /
   trunk/BOOK/boot/common/pwdgroup.xml
   trunk/BOOK/chroot/common/pwdgroup.xml
   trunk/BOOK/chroot/multilib/util-linux.xml
Log:
 [EMAIL PROTECTED] (orig r2036):  [EMAIL PROTECTED] | 2006-07-08 20:54:37 -0700
 More text changes in passwd/group file sections



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

Modified: trunk/BOOK/boot/common/pwdgroup.xml
===================================================================
--- trunk/BOOK/boot/common/pwdgroup.xml 2006-07-09 03:47:24 UTC (rev 1937)
+++ trunk/BOOK/boot/common/pwdgroup.xml 2006-07-09 07:45:11 UTC (rev 1938)
@@ -34,7 +34,7 @@
     <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 
-  <para>In order for user <systemitem class="username">root</systemitem> to
+  <para os="a">In order for user <systemitem 
class="username">root</systemitem> to
   be able to login and for the name <quote>root</quote> to be recognized,
   there must be relevant entries in the <filename>/etc/passwd</filename>
   and <filename>/etc/group</filename> files.</para>
@@ -46,11 +46,11 @@
 <literal>root::0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
 
-  <para os="a">The actual password for <systemitem 
class="username">root</systemitem>
+  <para os="b">The actual password for <systemitem 
class="username">root</systemitem>
   (the <quote>::</quote> used here is just a placeholder and allow you to login
   with no password) will be set later.</para>
 
-  <variablelist os="b">
+  <variablelist os="c">
   
     <title>Additional users you may want to add:</title>
 
@@ -138,7 +138,7 @@
 cdrom:x:15:</literal>
 EOF</userinput></screen>
 
-  <variablelist os="c">
+  <variablelist os="d">
 
     <title>Additional groups you may want to add</title>
 
@@ -198,7 +198,7 @@
     </varlistentry>
   </variablelist>
 
-  <para os="d">The created groups are not part of any standard&mdash;they are
+  <para os="e">The created groups are not part of any standard&mdash;they are
   groups decided on in part by the requirements of the Udev configuration
   in the final system, and in part by common convention employed by a
   number of existing Linux distributions. The Linux Standard Base (LSB,
@@ -209,7 +209,7 @@
   well-written programs do not depend on GID numbers, but rather use the
   group's name.</para>
 
-  <para os="e">The <command>login</command>, <command>agetty</command>, and
+  <para os="f">The <command>login</command>, <command>agetty</command>, and
   <command>init</command> programs (and others) use a number of log
   files to record information such as who was logged into the system and
   when. However, these programs will not write to the log files if they

Modified: trunk/BOOK/chroot/common/pwdgroup.xml
===================================================================
--- trunk/BOOK/chroot/common/pwdgroup.xml       2006-07-09 03:47:24 UTC (rev 
1937)
+++ trunk/BOOK/chroot/common/pwdgroup.xml       2006-07-09 07:45:11 UTC (rev 
1938)
@@ -34,11 +34,10 @@
     <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 
-  <para>In order for user <systemitem class="username">root</systemitem> to
-  be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files.</para>
-
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+  href="../../boot/common/pwdgroup.xml"
+  xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
+  
   <para>Create the <filename>/etc/passwd</filename> file by running the
   following command:</para>
 
@@ -46,13 +45,13 @@
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
 
-  <para os="a">The actual password for
+  <para os="b">The actual password for
   <systemitem class="username">root</systemitem> (the <quote>x</quote>
   used here is just a placeholder) will be set later.</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <para>Create the <filename>/etc/group</filename> file by running the
   following command:</para>
@@ -78,15 +77,15 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
 
   <para>To remove the <quote>I have no name!</quote> prompt, start a
   new shell. Since a full Glibc was installed in <xref

Modified: trunk/BOOK/chroot/multilib/util-linux.xml
===================================================================
--- trunk/BOOK/chroot/multilib/util-linux.xml   2006-07-09 03:47:24 UTC (rev 
1937)
+++ trunk/BOOK/chroot/multilib/util-linux.xml   2006-07-09 07:45:11 UTC (rev 
1938)
@@ -36,7 +36,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../common/util-linux.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'ca'])"/>
+    xpointer="xpointer(//[EMAIL PROTECTED]'bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../common/util-linux.xml"

-- 
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to