Changeset 0b9e109

Timestamp:

Jan 16, 2009, 4:12:21 PM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

fc8643be

Parents:

4ea666a

Message:

Added Network Configuration to Book.

Location:

BOOK

Files:

• alpha-index.xml (modified) (1 diff)
• bootscripts/alpha-chapter.xml (modified) (1 diff)
• bootscripts/common/symlinks.xml (modified) (1 diff)
• bootscripts/common/udev.xml (modified) (1 diff)
• bootscripts/mips-chapter.xml (modified) (1 diff)
• bootscripts/mips64-64-chapter.xml (modified) (1 diff)
• bootscripts/mips64-chapter.xml (modified) (1 diff)
• bootscripts/native-chapter.xml (modified) (1 diff)
• bootscripts/native64-chapter.xml (modified) (1 diff)
• bootscripts/ppc-chapter.xml (modified) (1 diff)
• bootscripts/ppc64-chapter.xml (modified) (1 diff)
• bootscripts/sparc-chapter.xml (modified) (1 diff)
• bootscripts/sparc64-64-chapter.xml (modified) (1 diff)
• bootscripts/sparc64-chapter.xml (modified) (1 diff)
• bootscripts/x86-chapter.xml (modified) (1 diff)
• bootscripts/x86_64-64-chapter.xml (modified) (1 diff)
• bootscripts/x86_64-chapter.xml (modified) (1 diff)
• final-system/alpha-chapter.xml (modified) (1 diff)
• final-system/mips-chapter.xml (modified) (1 diff)
• final-system/mips64-64-chapter.xml (modified) (1 diff)
• final-system/mips64-chapter.xml (modified) (1 diff)
• final-system/native-chapter.xml (modified) (1 diff)
• final-system/native64-chapter.xml (modified) (1 diff)
• final-system/ppc-chapter.xml (modified) (1 diff)
• final-system/ppc64-chapter.xml (modified) (1 diff)
• final-system/sparc-chapter.xml (modified) (1 diff)
• final-system/sparc64-64-chapter.xml (modified) (1 diff)
• final-system/sparc64-chapter.xml (modified) (1 diff)
• final-system/x86-chapter.xml (modified) (1 diff)
• final-system/x86_64-64-chapter.xml (modified) (1 diff)
• final-system/x86_64-chapter.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• mips-index.xml (modified) (1 diff)
• mips64-64-index.xml (modified) (1 diff)
• mips64-index.xml (modified) (1 diff)
• native-index.xml (modified) (1 diff)
• native64-index.xml (modified) (1 diff)
• network/alpha-chapter.xml (added)
• network/common/choose.xml (moved) (moved from BOOK/bootscripts/common/choose.xml) (2 diffs)
• network/common/dhcpcd.xml (moved) (moved from BOOK/final-system/common/dhcpcd.xml) (2 diffs)
• network/common/hostname.xml (moved) (moved from BOOK/bootscripts/common/static/hostname.xml) (1 diff)
• network/common/hosts.xml (moved) (moved from BOOK/bootscripts/common/static/hosts.xml) (1 diff)
• network/dhcp/dhcp.xml (moved) (moved from BOOK/bootscripts/common/dhcp/dhcp.xml) (1 diff)
• network/mips-chapter.xml (added)
• network/mips64-64-chapter.xml (added)
• network/mips64-chapter.xml (added)
• network/multilib/dhcpcd.xml (moved) (moved from BOOK/final-system/multilib/dhcpcd.xml) (1 diff)
• network/native-chapter.xml (added)
• network/native64-chapter.xml (added)
• network/ppc-chapter.xml (added)
• network/ppc64-chapter.xml (added)
• network/sparc-chapter.xml (added)
• network/sparc64-64-chapter.xml (added)
• network/sparc64-chapter.xml (added)
• network/static/network.xml (moved) (moved from BOOK/bootscripts/common/static/network.xml) (1 diff)
• network/static/static.xml (moved) (moved from BOOK/bootscripts/common/static/static.xml) (1 diff)
• network/x86-chapter.xml (added)
• network/x86_64-64-chapter.xml (added)
• network/x86_64-chapter.xml (added)
• ppc-index.xml (modified) (1 diff)
• ppc64-index.xml (modified) (1 diff)
• sparc-index.xml (modified) (1 diff)
• sparc64-64-index.xml (modified) (1 diff)
• sparc64-index.xml (modified) (1 diff)
• x86-index.xml (modified) (1 diff)
• x86_64-64-index.xml (modified) (1 diff)
• x86_64-index.xml (modified) (1 diff)

BOOK/alpha-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/alpha-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/alpha-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/alpha-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/bootscripts/alpha-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/common/symlinks.xml

@@ -99 +99 @@
     fixable by creating udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
-    <xref linkend="ch-scripts-static-network"/>, and sound card configuration can
+    <xref linkend="chapter-network"/>, and sound card configuration can
     be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
 

BOOK/bootscripts/common/udev.xml

@@ -318 +318 @@
       serial number or the output of various *_id utilities installed by Udev.
       See <xref linkend="ch-scripts-symlinks"/> and
-      <xref linkend="ch-scripts-static-network"/> for examples.</para>
+      <xref linkend="chapter-network"/> for examples.</para>
 
     </sect3>

BOOK/bootscripts/mips-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/mips64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/mips64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/native-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/native64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/ppc-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/ppc64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/sparc-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/sparc64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/sparc64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/x86-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/x86_64-64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/bootscripts/x86_64-chapter.xml

@@ -22 +22 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/static/network.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcp/dhcp.xml"/>
 
 </chapter>

BOOK/final-system/alpha-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/mips-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/mips64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/mips64-chapter.xml

@@ -69 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>

BOOK/final-system/native-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/native64-chapter.xml

@@ -56 +56 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>

BOOK/final-system/ppc-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/ppc64-chapter.xml

@@ -56 +56 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>

BOOK/final-system/sparc-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/sparc64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/sparc64-chapter.xml

@@ -56 +56 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>

BOOK/final-system/x86-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/x86_64-64-chapter.xml

@@ -42 +42 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>

BOOK/final-system/x86_64-chapter.xml

@@ -56 +56 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/dhcpcd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>

BOOK/introduction/common/changelog.xml

@@ -43 +43 @@
           <para>[Jonathan] - Added Linux 2.6.22 as a host requirment because 
            coreutils requires it.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Rearranged dhcp to static, to new section Network Coniguration.
+            Makes the flow look a lot smoother.</para>
         </listitem>
       </itemizedlist>

BOOK/mips-index.xml

@@ -60 +60 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/mips64-64-index.xml

@@ -60 +60 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="newtork/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/mips64-index.xml

@@ -60 +60 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/native-index.xml

@@ -61 +61 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/native-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/native-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/native-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/native-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/native64-index.xml

@@ -61 +61 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/native64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/native64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/native64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/native64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/network/common/choose.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-bootscripts-choose">
+<sect1 id="ch-newtork-choose">
   <?dbhtml filename="choose.html"?>
 
-  <title>To DHCP or to Static?</title>
+  <title>Use DHCP or to Static Networking?</title>
 
   <para os="a"> There are two different ways you can proceed from this point
@@ -16 +16 @@
   responsible for setting up your options.</para>
 
-  <para os="b">For the DHCP Networking, follow <ulink url="dhcp.html"/>.</para>
+  <para os="b">For DHCP Networking, follow <ulink url="dhcp.html"/>.</para>
 
-  <para os="c">For the Static Networking, follow <ulink url="static.html"/>.</para>
+  <para os="c">For Static Networking, follow <ulink url="static.html"/>.</para>
 
 </sect1>

BOOK/network/common/dhcpcd.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-dhcpcd" role="wrap">
+<sect1 id="ch-network-dhcpcd" role="wrap">
   <?dbhtml filename="dhcpcd.html"?>
 
   <title>DHCPCD-&dhcpcd-version;</title>
 
-  <indexterm zone="ch-system-dhcpcd">
+  <indexterm zone="ch-network-dhcpcd">
     <primary sortas="a-DHCPCD">DHCPCD</primary>
   </indexterm>
@@ -64 +64 @@
         <listitem>
           <para>To Follow</para>
-          <indexterm zone="ch-system-dhcpcd">
+          <indexterm zone="ch-network-dhcpcd">
             <primary sortas="e-dhcpcd">dhcpcd</primary>
           </indexterm>

BOOK/network/common/hostname.xml

@@ -2 +2 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-static-hostname">
+<sect1 id="ch-network-hostname">
   <?dbhtml filename="hostname.html"?>
 
   <title>Configuring the localnet Script</title>
 
-  <indexterm zone="ch-scripts-static-hostname">
+  <indexterm zone="ch-network-hostname">
     <primary sortas="d-localnet">localnet</primary>
   <secondary>configuring</secondary></indexterm>

BOOK/network/common/hosts.xml

@@ -2 +2 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-static-hosts">
+<sect1 id="ch-network-hosts">
   <?dbhtml filename="hosts.html"?>
 
   <title>Customizing the /etc/hosts File</title>
 
-  <indexterm zone="ch-scripts-static-hosts">
+  <indexterm zone="ch-network-hosts">
     <primary sortas="e-/etc/hosts">/etc/hosts</primary>
   </indexterm>
 
-  <indexterm zone="ch-scripts-static-hosts">
+  <indexterm zone="ch-network-hosts">
     <primary sortas="d-localnet">localnet</primary>
   <secondary>/etc/hosts</secondary></indexterm>
 
-  <indexterm zone="ch-scripts-static-hosts">
+  <indexterm zone="ch-network-hosts">
     <primary sortas="d-network">network</primary>
   <secondary>/etc/hosts</secondary></indexterm>

BOOK/network/dhcp/dhcp.xml

@@ -2 +2 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-bootscripts-dhcp">
+<sect1 id="ch-network-dhcp">
   <?dbhtml filename="dhcp.html"?>
 

BOOK/network/multilib/dhcpcd.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-dhcpcd" role="wrap">
+<sect1 id="ch-network-dhcpcd" role="wrap">
   <?dbhtml filename="dhcpcd.html"?>
 
   <title>DHCPCD-&dhcpcd-version;</title>
 
-  <indexterm zone="ch-system-dhcpcd">
+  <indexterm zone="ch-network-dhcpcd">
     <primary sortas="a-DHCPCD">DHCPCD</primary>
   </indexterm>

BOOK/network/static/network.xml

@@ -2 +2 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-scripts-static-network">
+<sect1 id="ch-network-static-network">
   <?dbhtml filename="network.html"?>
 
   <title>Configuring the network Script</title>
 
-  <indexterm zone="ch-scripts-static-network">
+  <indexterm zone="ch-network-static-network">
     <primary sortas="d-network">network</primary>
   <secondary>configuring</secondary></indexterm>

BOOK/network/static/static.xml

@@ -2 +2 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 ]>
 
-<sect1 id="ch-bootscripts-static">
+<sect1 id="ch-network-static">
   <?dbhtml filename="static.html"?>
 

BOOK/ppc-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/ppc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/ppc64-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/ppc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="newtork/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/sparc-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/sparc64-64-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/sparc64-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/x86-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/x86_64-64-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>

BOOK/x86_64-index.xml

@@ -62 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>