diff --git a/appendixa/shadowpwd-dep.xml b/appendixa/shadow-dep.xml
similarity index 100%
rename from appendixa/shadowpwd-dep.xml
rename to appendixa/shadow-dep.xml
diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadow-desc.xml
similarity index 100%
rename from appendixa/shadowpwd-desc.xml
rename to appendixa/shadow-desc.xml
diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadow-down.xml
similarity index 100%
rename from appendixa/shadowpwd-down.xml
rename to appendixa/shadow-down.xml
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadow-shortdesc.xml
similarity index 100%
rename from appendixa/shadowpwd-shortdesc.xml
rename to 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.
&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 @@
-
-
-Configuring Shadow
-
-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
-doc/HOWTO
-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.
-
-To enable shadowed passwords, run the following command:
-
-/usr/sbin/pwconv
-
-And to enable shadowed group passwords, run the following
-command:
-
-/usr/sbin/grpconv
-
-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 passwd command or any
-group passwords with the gpasswd command.
-
-
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 @@
-
-Setting the root password
-
-Choose a password for user root and set it by running the following
-command:
-
-passwd root
-
-
-
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadow.xml
similarity index 69%
rename from chapter06/shadowpwd.xml
rename to chapter06/shadow.xml
index 5c9c6b510..69aaf0150 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadow.xml
@@ -8,8 +8,8 @@ way.
&buildtime; &shadow-time;
&diskspace; &shadow-compsize;
-&aa-shadowpwd-down;
-&aa-shadowpwd-dep;
+&aa-shadow-down;
+&aa-shadow-dep;
@@ -50,7 +50,7 @@ system. Install these two config files:
cp etc/{limits,login.access} /etc
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
/var/spool/mail location for user
mailboxes to the current location at
@@ -92,11 +92,46 @@ Shadow:
-&c6-cf-shadowpwd;
-&c6-cf-password;
+
-&aa-shadowpwd-shortdesc;
-&aa-shadowpwd-desc;
+Configuring Shadow
+
+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
+doc/HOWTO
+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.
+
+To enable shadowed passwords, run the following command:
+
+/usr/sbin/pwconv
+
+And to enable shadowed group passwords, run the following
+command:
+
+/usr/sbin/grpconv
+
+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 passwd command or any
+group passwords with the gpasswd command.
+
+
+
+Setting the root password
+
+Choose a password for user root and set it via:
+
+passwd root
+
+
+
+&aa-shadow-shortdesc;
+&aa-shadow-desc;
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 @@
-
-
+
-
-
-
-
+
+
+
+