Changeset 03e6a40 for BOOK/network/common/choose.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/network/common/choose.xml (modified) (2 diffs)

BOOK/network/common/choose.xml

@@ -9 +9 @@
   <?dbhtml filename="choose.html"?>
 
-  <title>DHCP or Static Networking?</title>
+  <title>Systemd Networking?</title>
 
   <indexterm zone="ch-network-choose">
@@ -20 +20 @@
 
   <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>
+  to configure your network. You can use Systemd, or install the
+  CLFS-Network-Scripts.</para>
 
-  <para>To configure a Static Interface, Follow <xref linkend="ch-network-static"/>.</para>
+  <para>To use systemd to configure a Network Interface, Follow <xref linkend="ch-systemd-network"/>.</para>
 
-  <para>To configure a DHCP Interface, Follow <xref linkend="ch-network-dhcpcd"/>.</para>
+  <para>To use CLFS-network-scripts to configure a Network Interface, Follow <xref linkend="ch-scripts-network-scripts"/>.</para>
 
 </sect1>