r1980 - / trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jul 12 16:46:32 PDT 2006


Author: jim
Date: 2006-07-12 17:46:32 -0600 (Wed, 12 Jul 2006)
New Revision: 1980

Modified:
   /
   trunk/BOOK/final-system/common/shadow.xml
   trunk/BOOK/final-system/multilib/shadow-64bit.xml
Log:
 r4526 at server (orig r2087):  jciccone | 2006-07-12 16:23:47 -0700
 Added a missing xinclude to the 64bit multilib shadow instructions.



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

Modified: trunk/BOOK/final-system/common/shadow.xml
===================================================================
--- trunk/BOOK/final-system/common/shadow.xml	2006-07-12 15:47:00 UTC (rev 1979)
+++ trunk/BOOK/final-system/common/shadow.xml	2006-07-12 23:46:32 UTC (rev 1980)
@@ -79,7 +79,7 @@
 
 <screen os="l"><userinput>make install</userinput></screen>
 
-    <para id="shadow-login_defs">Instead of using the default
+    <para os="m" id="shadow-login_defs">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
     <emphasis>MD5</emphasis> method of password encryption, which also allows
     passwords longer than 8 characters. It is also necessary to change the
@@ -89,7 +89,7 @@
     following sed command to make these changes to the appropriate
     configuration file:</para>
 
-    <indexterm zone="shadow-login_defs">
+    <indexterm os="n" zone="shadow-login_defs">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 

Modified: trunk/BOOK/final-system/multilib/shadow-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/shadow-64bit.xml	2006-07-12 15:47:00 UTC (rev 1979)
+++ trunk/BOOK/final-system/multilib/shadow-64bit.xml	2006-07-12 23:46:32 UTC (rev 1980)
@@ -82,6 +82,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list