[Clfs-commits] commit: r4792 - in /trunk/BOOK: ./ appendices/dependencies/ final-system/ final-system/common/ final-system/multilib/ introduction/common/ network/ network/common/ network/dhcp/ network/multilib/ network/static/
svn at cross-lfs.org
svn at cross-lfs.org
Mon Mar 2 11:13:12 PST 2009
Author: jciccone
Date: Mon Mar 2 19:13:12 2009
New Revision: 4792
Log:
Added DHCPCD depdency information.
Moved DHCPCD from the network section into the final system and updated the note about the optional build.
Updated the network configuration section.
Added:
trunk/BOOK/final-system/common/dhcpcd.xml
- copied, changed from r4791, trunk/BOOK/network/common/dhcpcd.xml
trunk/BOOK/final-system/multilib/dhcpcd.xml
- copied, changed from r4791, trunk/BOOK/network/multilib/dhcpcd.xml
trunk/BOOK/network/chapter.xml
- copied, changed from r4791, trunk/BOOK/network/x86-chapter.xml
trunk/BOOK/network/common/dhcp.xml
- copied, changed from r4791, trunk/BOOK/network/dhcp/dhcp.xml
trunk/BOOK/network/common/static.xml
- copied, changed from r4791, trunk/BOOK/network/static/network.xml
Removed:
trunk/BOOK/network/alpha-chapter.xml
trunk/BOOK/network/common/dhcpcd.xml
trunk/BOOK/network/dhcp/
trunk/BOOK/network/mips-chapter.xml
trunk/BOOK/network/mips64-64-chapter.xml
trunk/BOOK/network/mips64-chapter.xml
trunk/BOOK/network/multilib/
trunk/BOOK/network/native-chapter.xml
trunk/BOOK/network/native64-chapter.xml
trunk/BOOK/network/ppc-chapter.xml
trunk/BOOK/network/ppc64-chapter.xml
trunk/BOOK/network/sparc-chapter.xml
trunk/BOOK/network/sparc64-64-chapter.xml
trunk/BOOK/network/sparc64-chapter.xml
trunk/BOOK/network/static/
trunk/BOOK/network/x86-chapter.xml
trunk/BOOK/network/x86_64-64-chapter.xml
trunk/BOOK/network/x86_64-chapter.xml
Modified:
trunk/BOOK/alpha-index.xml
trunk/BOOK/appendices/dependencies/common.xml
trunk/BOOK/final-system/alpha-chapter.xml
trunk/BOOK/final-system/mips-chapter.xml
trunk/BOOK/final-system/mips64-64-chapter.xml
trunk/BOOK/final-system/mips64-chapter.xml
trunk/BOOK/final-system/native-chapter.xml
trunk/BOOK/final-system/native64-chapter.xml
trunk/BOOK/final-system/ppc-chapter.xml
trunk/BOOK/final-system/ppc64-chapter.xml
trunk/BOOK/final-system/sparc-chapter.xml
trunk/BOOK/final-system/sparc64-64-chapter.xml
trunk/BOOK/final-system/sparc64-chapter.xml
trunk/BOOK/final-system/x86-chapter.xml
trunk/BOOK/final-system/x86_64-64-chapter.xml
trunk/BOOK/final-system/x86_64-chapter.xml
trunk/BOOK/introduction/common/changelog.xml
trunk/BOOK/mips-index.xml
trunk/BOOK/mips64-64-index.xml
trunk/BOOK/mips64-index.xml
trunk/BOOK/native-index.xml
trunk/BOOK/native64-index.xml
trunk/BOOK/network/common/choose.xml
trunk/BOOK/ppc-index.xml
trunk/BOOK/ppc64-index.xml
trunk/BOOK/sparc-index.xml
trunk/BOOK/sparc64-64-index.xml
trunk/BOOK/sparc64-index.xml
trunk/BOOK/x86-index.xml
trunk/BOOK/x86_64-64-index.xml
trunk/BOOK/x86_64-index.xml
Modified: trunk/BOOK/alpha-index.xml
==============================================================================
--- trunk/BOOK/alpha-index.xml (original)
+++ trunk/BOOK/alpha-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/appendices/dependencies/common.xml
==============================================================================
--- trunk/BOOK/appendices/dependencies/common.xml (original)
+++ trunk/BOOK/appendices/dependencies/common.xml Mon Mar 2 19:13:12 2009
@@ -280,6 +280,33 @@
</seglistitem>
</segmentedlist>
+<!-- Begin DHCPCD dependency info -->
+ <bridgehead renderas="sect2" id="dhcpcd-dep">DHCPCD</bridgehead>
+
+ <segmentedlist>
+ <segtitle>&dependencies;</segtitle>
+
+ <seglistitem>
+ <seg>Bash, Coreutils, GCC, Make, Sed</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&testsuites;</segtitle>
+
+ <seglistitem>
+ <seg>No testsuite available</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&before;</segtitle>
+
+ <seglistitem>
+ <seg>None</seg>
+ </seglistitem>
+ </segmentedlist>
+
<!-- Begin Diffutils dependency info -->
<bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
Modified: trunk/BOOK/final-system/alpha-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/alpha-chapter.xml (original)
+++ trunk/BOOK/final-system/alpha-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/mips-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips-chapter.xml (original)
+++ trunk/BOOK/final-system/mips-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/mips64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml (original)
+++ trunk/BOOK/final-system/mips64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -68,6 +68,7 @@
<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-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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-n32.xml"/>
Modified: trunk/BOOK/final-system/native-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/native-chapter.xml (original)
+++ trunk/BOOK/final-system/native-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/native64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/native64-chapter.xml (original)
+++ trunk/BOOK/final-system/native64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -55,6 +55,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
Modified: trunk/BOOK/final-system/ppc-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/ppc64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -55,6 +55,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
Modified: trunk/BOOK/final-system/sparc-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc64-64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/sparc64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -55,6 +55,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
Modified: trunk/BOOK/final-system/x86-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86-chapter.xml (original)
+++ trunk/BOOK/final-system/x86-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/x86_64-64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
Modified: trunk/BOOK/final-system/x86_64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-chapter.xml (original)
+++ trunk/BOOK/final-system/x86_64-chapter.xml Mon Mar 2 19:13:12 2009
@@ -55,6 +55,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Mon Mar 2 19:13:12 2009
@@ -35,6 +35,17 @@
</itemizedlist>
</listitem>
-->
+
+ <listitem>
+ <para>March 3, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Restructured the XML for the networking section.
+ The new order should help it flow better. Also moved dhcpcd into the
+ final system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>March 2, 2009</para>
Modified: trunk/BOOK/mips-index.xml
==============================================================================
--- trunk/BOOK/mips-index.xml (original)
+++ trunk/BOOK/mips-index.xml Mon Mar 2 19:13:12 2009
@@ -59,7 +59,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/mips64-64-index.xml
==============================================================================
--- trunk/BOOK/mips64-64-index.xml (original)
+++ trunk/BOOK/mips64-64-index.xml Mon Mar 2 19:13:12 2009
@@ -59,7 +59,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
<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="network/mips64-64-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/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"/>
Modified: trunk/BOOK/mips64-index.xml
==============================================================================
--- trunk/BOOK/mips64-index.xml (original)
+++ trunk/BOOK/mips64-index.xml Mon Mar 2 19:13:12 2009
@@ -59,7 +59,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/native-index.xml
==============================================================================
--- trunk/BOOK/native-index.xml (original)
+++ trunk/BOOK/native-index.xml Mon Mar 2 19:13:12 2009
@@ -60,7 +60,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/native-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/native64-index.xml
==============================================================================
--- trunk/BOOK/native64-index.xml (original)
+++ trunk/BOOK/native64-index.xml Mon Mar 2 19:13:12 2009
@@ -60,7 +60,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/native64-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/network/common/choose.xml
==============================================================================
--- trunk/BOOK/network/common/choose.xml (original)
+++ trunk/BOOK/network/common/choose.xml Mon Mar 2 19:13:12 2009
@@ -5,18 +5,26 @@
%general-entities;
]>
-<sect1 id="ch-newtork-choose">
+<sect1 id="ch-network-choose">
<?dbhtml filename="choose.html"?>
<title>Use DHCP or to Static Networking?</title>
- <para os="a"> There are two different ways you can proceed from this point
+ <indexterm zone="ch-network-choose">
+ <primary sortas="d-network">network</primary>
+ <secondary>configuring</secondary></indexterm>
+
+ <para>This section only applies if a network card is to be configured. If
+ you do not need to configure a network interface you can skip on to
+ <xref linkend="chapter-bootable"/>.</para>
+
+ <para> There are two different ways you can proceed from this point
to configure your network. Dynamic will allow you to take advantage of
a DHCP server to get all your configuration information. Static you become
responsible for setting up your options.</para>
- <para os="b">For DHCP Networking, follow <ulink url="dhcp.html"/>.</para>
+ <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
- <para os="c">For Static Networking, follow <ulink url="static.html"/>.</para>
+ <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcp"/>.</para>
</sect1>
Modified: trunk/BOOK/ppc-index.xml
==============================================================================
--- trunk/BOOK/ppc-index.xml (original)
+++ trunk/BOOK/ppc-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/ppc64-index.xml
==============================================================================
--- trunk/BOOK/ppc64-index.xml (original)
+++ trunk/BOOK/ppc64-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc64-chapter.xml"/>
<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="network/ppc64-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="network/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"/>
Modified: trunk/BOOK/sparc-index.xml
==============================================================================
--- trunk/BOOK/sparc-index.xml (original)
+++ trunk/BOOK/sparc-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/sparc64-64-index.xml
==============================================================================
--- trunk/BOOK/sparc64-64-index.xml (original)
+++ trunk/BOOK/sparc64-64-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/sparc64-index.xml
==============================================================================
--- trunk/BOOK/sparc64-index.xml (original)
+++ trunk/BOOK/sparc64-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/x86-index.xml
==============================================================================
--- trunk/BOOK/x86-index.xml (original)
+++ trunk/BOOK/x86-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/x86_64-64-index.xml
==============================================================================
--- trunk/BOOK/x86_64-64-index.xml (original)
+++ trunk/BOOK/x86_64-64-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
<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="network/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"/>
Modified: trunk/BOOK/x86_64-index.xml
==============================================================================
--- trunk/BOOK/x86_64-index.xml (original)
+++ trunk/BOOK/x86_64-index.xml Mon Mar 2 19:13:12 2009
@@ -61,7 +61,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
<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="network/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"/>
More information about the Clfs-commits
mailing list