Internal markup reworking to fix the extraneous whitespace problem in the "tidy generated" web site pages. Essentially replace all ocurrences of <para><screen> with <screen> (and of course the matching closing tags).

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2958 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 17 insertions, 17 deletions

diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 05acd19bf..c6ef2893b 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -14,8 +14,8 @@ proper place, create them now, with their proper permissions:</para>
 <para>Create these files with their proper permissions by running the
 following commands:</para>
 
-<para><screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen></para>
+<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
+chmod 644 /var/run/utmp /var/log/{btmp,lastlog,wtmp}</userinput></screen>
 
 <para>The <filename>/var/run/utmp</filename> file lists the users that are
 currently logged in, the <filename>/var/log/wtmp</filename> file who
@@ -33,30 +33,30 @@ the package incorrectly assumes it is going to be located at
 <filename>/bin/passwd</filename>. To work around this bug, create a dummy
 <filename>passwd</filename> file, so that it gets hard-wired properly:</para>
 
-<para><screen><userinput>touch /usr/bin/passwd</userinput></screen></para>
+<screen><userinput>touch /usr/bin/passwd</userinput></screen>
 
 <para>The current shadow suite has a problem in the newgrp command which causes
 it to fail.  The following patch (also appearing in Shadow's CVS code) fixes
 this problem.</para>
 
-<para><screen><userinput>patch -Np1 -i ../&shadow-patch;</userinput></screen></para>
+<screen><userinput>patch -Np1 -i ../&shadow-patch;</userinput></screen>
 
 <para>Now prepare Shadow for compilation:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib --enable-shared</userinput></screen></para>
+<screen><userinput>./configure --prefix=/usr --libdir=/usr/lib --enable-shared</userinput></screen>
 
 <para>Compile the package:</para>
 
-<para><screen><userinput>make</userinput></screen></para>
+<screen><userinput>make</userinput></screen>
 
 <para>And install it:</para>
 
-<para><screen><userinput>make install</userinput></screen></para>
+<screen><userinput>make install</userinput></screen>
 
 <para>Shadow uses two files to configure authentication settings for the
 system. Install these two config files:</para>
 
-<para><screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen></para>
+<screen><userinput>cp etc/{limits,login.access} /etc</userinput></screen>
 
 <para>We want to change the password method to enable MD5 passwords which are
 theoretically more secure than the default "crypt" method and also allow
@@ -66,9 +66,9 @@ mailboxes to the current location at
 <filename class="directory">/var/mail</filename>. We do this by changing the
 relevant configuration file while copying it to its destination:</para>
 
-<para><screen><userinput>sed -e 's%/var/spool/mail%/var/mail%' \
+<screen><userinput>sed -e 's%/var/spool/mail%/var/mail%' \
 &nbsp;&nbsp;&nbsp;&nbsp;-e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
-&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;etc/login.defs.linux &gt; /etc/login.defs</userinput></screen>
 
 <note><para>Be extra careful when typing all of the above. It is probably safer
 to cut-and-paste it rather than try and type it all in.</para></note>
@@ -77,32 +77,32 @@ to cut-and-paste it rather than try and type it all in.</para></note>
 <userinput>vigr</userinput> program should exist too. Since the installation
 procedure doesn't create this program, create a symlink manually:</para>
 
-<para><screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen></para>
+<screen><userinput>ln -s vipw /usr/sbin/vigr</userinput></screen>
 
 <para>As the <filename>/bin/vipw</filename> symlink is redundant (and even
 pointing to a non-existent file), remove it:</para>
 
-<para><screen><userinput>rm /bin/vipw</userinput></screen></para>
+<screen><userinput>rm /bin/vipw</userinput></screen>
 
 <para>Now move the <userinput>sg</userinput> program to its proper place:</para>
 
-<para><screen><userinput>mv /bin/sg /usr/bin</userinput></screen></para>
+<screen><userinput>mv /bin/sg /usr/bin</userinput></screen>
 
 <para>And move Shadow's dynamic libraries to a more appropriate location:</para>
 
-<para><screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen></para>
+<screen><userinput>mv /usr/lib/lib{shadow,misc}.so.0* /lib</userinput></screen>
 
 <para>As some packages expect to find the just-moved libraries in
 <filename>/usr/lib</filename>, create the following symlinks:</para>
 
-<para><screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen></para>
+<screen><userinput>ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
+ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so</userinput></screen>
 
 <para>Coreutils has already installed a <userinput>groups</userinput> program
 in <filename>/usr/bin</filename>. If you wish, you can remove the one
 installed by Shadow:</para>
 
-<para><screen><userinput>rm /bin/groups</userinput></screen></para>
+<screen><userinput>rm /bin/groups</userinput></screen>
 
 </sect2>