Renaming the Shadow files to match the package name.

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

9 files changed, 48 insertions, 53 deletions

diff --git a/appendixa/shadowpwd-dep.xml b/appendixa/shadow-dep.xml
index ce4de6921..ce4de6921 100644
--- a/appendixa/shadowpwd-dep.xml
+++ b/appendixa/shadow-dep.xml
diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadow-desc.xml
index 34a09ce29..34a09ce29 100644
--- a/appendixa/shadowpwd-desc.xml
+++ b/appendixa/shadow-desc.xml
diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadow-down.xml
index 834d8eb1d..834d8eb1d 100644
--- a/appendixa/shadowpwd-down.xml
+++ b/appendixa/shadow-down.xml
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadow-shortdesc.xml
index bf1f99833..bf1f99833 100644
--- a/appendixa/shadowpwd-shortdesc.xml
+++ b/appendixa/shadow-shortdesc.xml
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 53073c013..39dc0139a 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -437,7 +437,7 @@ Most likely something went wrong with the specs file amendment above.</para>
 &c6-procinfo;
 &c6-procps;
 &c6-psmisc;
-&c6-shadowpwd;
+&c6-shadow;
 &c6-sysklogd;
 &c6-sysvinit;
 &c6-tar;
diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml
deleted file mode 100644
index e3268b6f2..000000000
--- a/chapter06/config-shadowpwd.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2><title>Configuring Shadow</title>
-
-<para>This package contains utilities to modify users' passwords, add
-or delete users and groups, and the like. We're not going to explain what
-'password shadowing' means. A full explanation can be found in the
-<filename>doc/HOWTO</filename>
-file within the unpacked Shadow source tree. There's one 
-thing to keep in mind if you decide to use Shadow support: programs that
-need to verify passwords (for example xdm, ftp daemons, pop3 daemons) need
-to be 'shadow-compliant', that is they need to be able to work with 
-shadowed passwords.</para>
-
-<para>To enable shadowed passwords, run the following command:</para>
-
-<screen><userinput>/usr/sbin/pwconv</userinput></screen>
-
-<para>And to enable shadowed group passwords, run the following
-command:</para>
-
-<screen><userinput>/usr/sbin/grpconv</userinput></screen>
-
-<para>Under normal circumstances, you won't have created any passwords yet.
-However, if returning to this section to enable shadowing, you should reset any
-current user passwords with the <command>passwd</command> command or any
-group passwords with the <command>gpasswd</command> command.</para>
-</sect2>
-
diff --git a/chapter06/create-password.xml b/chapter06/create-password.xml
deleted file mode 100644
index 19e592e48..000000000
--- a/chapter06/create-password.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<sect2>
-<title>Setting the root password</title>
-
-<para>Choose a password for user root and set it by running the following
-command:</para>
-
-<screen><userinput>passwd root</userinput></screen>
-
-</sect2>
-
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadow.xml
index 5c9c6b510..69aaf0150 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadow.xml
@@ -8,8 +8,8 @@ way.</para>
 <screen>&buildtime; &shadow-time;
 &diskspace; &shadow-compsize;</screen>
 
-&aa-shadowpwd-down;
-&aa-shadowpwd-dep;
+&aa-shadow-down;
+&aa-shadow-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
@@ -50,7 +50,7 @@ system. Install these two config files:</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
+theoretically more secure than the default crypt method and also allow
 password lengths greater than 8 characters. We also need to change the old
 <filename class="directory">/var/spool/mail</filename> location for user
 mailboxes to the current location at
@@ -92,11 +92,46 @@ Shadow:</para>
 
 </sect2>
 
-&c6-cf-shadowpwd;
-&c6-cf-password;
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Configuring Shadow</title>
+
+<para>This package contains utilities to modify users' passwords, add
+or delete users and groups, and the like. We're not going to explain what
+'password shadowing' means. A full explanation can be found in the
+<filename>doc/HOWTO</filename>
+file within the unpacked Shadow source tree. There's one 
+thing to keep in mind if you decide to use Shadow support: programs that
+need to verify passwords (for example xdm, ftp daemons, pop3 daemons) need
+to be 'shadow-compliant', that is they need to be able to work with 
+shadowed passwords.</para>
+
+<para>To enable shadowed passwords, run the following command:</para>
+
+<screen><userinput>/usr/sbin/pwconv</userinput></screen>
+
+<para>And to enable shadowed group passwords, run the following
+command:</para>
+
+<screen><userinput>/usr/sbin/grpconv</userinput></screen>
+
+<para>Under normal circumstances, you won't have created any passwords yet.
+However, if returning to this section to enable shadowing, you should reset any
+current user passwords with the <command>passwd</command> command or any
+group passwords with the <command>gpasswd</command> command.</para>
+</sect2>
+
+<sect2>
+<title>Setting the root password</title>
+
+<para>Choose a password for user root and set it via:</para>
+
+<screen><userinput>passwd root</userinput></screen>
+
+</sect2>
 
-&aa-shadowpwd-shortdesc;
-&aa-shadowpwd-desc;
+&aa-shadow-shortdesc;
+&aa-shadow-desc;
 
 </sect1>
 
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 5f9e4e973..e81b87416 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -1,10 +1,9 @@
-<!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
-<!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
+<!ENTITY c6-shadow SYSTEM "../chapter06/shadow.xml">
 
-<!ENTITY aa-shadowpwd-shortdesc SYSTEM "../appendixa/shadowpwd-shortdesc.xml">
-<!ENTITY aa-shadowpwd-desc SYSTEM "../appendixa/shadowpwd-desc.xml">
-<!ENTITY aa-shadowpwd-dep SYSTEM "../appendixa/shadowpwd-dep.xml">
-<!ENTITY aa-shadowpwd-down SYSTEM "../appendixa/shadowpwd-down.xml">
+<!ENTITY aa-shadow-shortdesc SYSTEM "../appendixa/shadow-shortdesc.xml">
+<!ENTITY aa-shadow-desc SYSTEM "../appendixa/shadow-desc.xml">
+<!ENTITY aa-shadow-dep SYSTEM "../appendixa/shadow-dep.xml">
+<!ENTITY aa-shadow-down SYSTEM "../appendixa/shadow-down.xml">
 
 <!ENTITY shadow-version "4.0.4.1">
 <!ENTITY shadow-depversion "4.0.4.1">