Changeset 5861bcf for BOOK

Timestamp:

May 19, 2017, 5:39:11 PM (8 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

79438a6

Parents:

6d6e80e

Message:

Remove separate para with title before variable list and add title within variablelist as reported by Michio Matsuyama at the CLFS-Dev mailing list.

Location:

BOOK/final-system

Files:

• common/shadow.xml (modified) (4 diffs)
• multilib/shadow.xml (modified) (1 diff)

BOOK/final-system/common/shadow.xml

@@ -54 +54 @@
     --sysconfdir=/etc</userinput></screen>
 
-<para os="f">The meaning of the new configure option:</para>
-
-  <variablelist os="g">
+  <variablelist os="f">
+    <title>The meaning of the new configure option:</title>
+
     <varlistentry>
       <term><parameter>--sysconfdir=/etc</parameter></term>
@@ -66 +66 @@
   </variablelist>
 
-    <para os="h">Compile the package:</para>
-
-<screen os="i"><userinput>make</userinput></screen>
-
-    <para os="j">This package does not come with a test suite.</para>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make install</userinput></screen>
-
-    <para os="m" id="shadow-login_defs">Instead of using the default
+    <para os="g">Compile the package:</para>
+
+<screen os="h"><userinput>make</userinput></screen>
+
+    <para os="i">This package does not come with a test suite.</para>
+
+    <para os="j">Install the package:</para>
+
+<screen os="k"><userinput>make install</userinput></screen>
+
+    <para os="l" id="shadow-login_defs">Instead of using the default
     <emphasis>DES</emphasis> method, use the more secure
     <emphasis>SHA512</emphasis> method of password encryption, which also allows
@@ -86 +86 @@
     configuration file:</para>
 
-    <indexterm os="n" zone="shadow-login_defs">
+    <indexterm os="m" zone="shadow-login_defs">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-<screen os="s"><userinput>sed -i /etc/login.defs \
+<screen os="n"><userinput>sed -i /etc/login.defs \
     -e 's@#\(ENCRYPT_METHOD \).*@\1SHA512@' \
     -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
 
-    <para os="t">Move a misplaced program to its proper location:</para>
-
-<screen os="u"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
-
-    <para os="v">The <command>login</command> program will write to
+    <para os="o">Move a misplaced program to its proper location:</para>
+
+<screen os="p"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
+
+    <para os="q">The <command>login</command> program will write to
     <filename>/var/log/faillog</filename>, to record failed login attempts, and
     <filename>/var/log/lastlog</filename>, to record the date and
@@ -105 +105 @@
     create them now and give them appropriate ownership and permissions:</para>
 
-<screen os="w"><userinput>touch /var/log/{fail,last}log
+<screen os="r"><userinput>touch /var/log/{fail,last}log
 chgrp -v utmp /var/log/{fail,last}log
 chmod -v 664 /var/log/{fail,last}log</userinput></screen>

BOOK/final-system/multilib/shadow.xml

@@ -79 +79 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
+    xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
+    xpointer="xpointer(//*[@os='r'])"/>
 
   </sect2>