Index: BOOK/boot/common/creatingdirs.xml
===================================================================
--- BOOK/boot/common/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/boot/common/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -14,5 +14,5 @@
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
+<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
 install -dv -m 0750 ${CLFS}/root
@@ -28,5 +28,5 @@
 mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
 
-  <para os="b">Directories are, by default, created with permission mode 755,
+  <para os="c">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
   two changes are made&mdash;one to the home directory of user
@@ -34,5 +34,5 @@
   directories for temporary files.</para>
 
-  <para os="c">The first mode change ensures that not just anybody can enter
+  <para os="d">The first mode change ensures that not just anybody can enter
   the <filename class="directory">${CLFS}/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
@@ -44,5 +44,5 @@
   1777 bit mask.</para>
 
-  <sect2 os="d">
+  <sect2 os="e">
     <title>FHS Compliance Note</title>
 
Index: BOOK/boot/mips/creatingdirs.xml
===================================================================
--- BOOK/boot/mips/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/boot/mips/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -15,23 +15,7 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
-install -dv ${CLFS}/media/{floppy,cdrom}
-install -dv ${CLFS}/usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr
-install -dv ${CLFS}/usr/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr/local
-install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/var/{lock,log,mail,run,spool}
-install -dv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv ${CLFS}/opt/{bin,doc,include,info}
-install -dv ${CLFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
@@ -43,8 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
@@ -53,3 +33,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/boot/mips64/creatingdirs.xml
===================================================================
--- BOOK/boot/mips64/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/boot/mips64/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -46,8 +46,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
@@ -56,3 +52,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/boot/multilib/creatingdirs.xml
===================================================================
--- BOOK/boot/multilib/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/boot/multilib/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -15,29 +15,19 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
-install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt,opt}
+mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
 install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
-install -dv ${CLFS}/media/{floppy,cdrom}
-install -dv ${CLFS}/usr/{bin,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr
-install -dv ${CLFS}/usr/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr/local
-install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/var/{lock,log,mail,run,spool}
-install -dv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${CLFS}/opt/{bin,doc,include,info}
-install -dv ${CLFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}{/var,}/tmp -m 1777
+mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
+mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+for dir in /usr{,/local}; do
+  ln -sv share/{man,doc,info} $dir
+done
+mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
+mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
 install -dv ${CLFS}/usr/lib/locale
 ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,3 +39,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/chroot/common/creatingdirs.xml
===================================================================
--- BOOK/chroot/common/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/chroot/common/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -31,7 +31,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
+  xpointer="xpointer(//*[@os='c'])"/>
 
-  <para os="c">The first mode change ensures that not just anybody can enter
+  <para os="d">The first mode change ensures that not just anybody can enter
   the <filename class="directory">/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
@@ -45,5 +45,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
+  xpointer="xpointer(//*[@os='e'])"/>
 
 </sect1>
Index: BOOK/chroot/mips/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/chroot/mips/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -15,23 +15,7 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv /{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv /{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv /root -m 0750
-install -dv /tmp /var/tmp -m 1777
-install -dv /media/{floppy,cdrom}
-install -dv /usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} /usr
-install -dv /usr/share/{doc,info,locale,man}
-install -dv /usr/share/{misc,terminfo,zoneinfo}
-install -dv /usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv /usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} /usr/local
-install -dv /usr/local/share/{doc,info,locale,man}
-install -dv /usr/local/share/{misc,terminfo,zoneinfo}
-install -dv /usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv /var/{lock,log,mail,run,spool}
-install -dv /var/{opt,cache,lib/{misc,locate},local}
-install -dv /opt/{bin,doc,include,info}
-install -dv /opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
    <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
@@ -43,8 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
@@ -53,3 +33,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/chroot/mips64/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips64/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/chroot/mips64/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -48,8 +48,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
@@ -58,3 +54,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/chroot/multilib/creatingdirs.xml
===================================================================
--- BOOK/chroot/multilib/creatingdirs.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/chroot/multilib/creatingdirs.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -39,8 +39,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
@@ -49,3 +45,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
 </sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 906ec5b59de443d7347861e4758a9424920c7584)
+++ BOOK/introduction/common/changelog.xml	(revision d012cdb5822abb83e1b2d294f349be7f0a93def3)
@@ -41,4 +41,16 @@
       <itemizedlist>
         <listitem>
+          <para>[Chris] - Modified the "creating directories" sections -
+          changed multilib instructions to be consistent with the new format
+          now used for every other arch, and changed mips instructions to
+          use xincludes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>July 6, 2006</para>
+      <itemizedlist>
+        <listitem>
           <para>[jim] - Updated Udev rules to 07062006, Fixed cdrom,
           permissions and groups.</para>
