From 190a18225bcf21fc3b92820fc168a31ab06ec0d7 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Wed, 27 Dec 2006 04:03:39 +0000
Subject: Update of original English docs

---
 nl/install-methods/tftp/bootp.xml | 12 ++++++------
 nl/install-methods/tftp/dhcp.xml  | 21 +++++++++------------
 2 files changed, 15 insertions(+), 18 deletions(-)

(limited to 'nl/install-methods/tftp')

diff --git a/nl/install-methods/tftp/bootp.xml b/nl/install-methods/tftp/bootp.xml
index 6fc3693b2..97ef2f793 100644
--- a/nl/install-methods/tftp/bootp.xml
+++ b/nl/install-methods/tftp/bootp.xml
@@ -1,16 +1,16 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 untranslated -->
+<!-- original version: 43558 untranslated -->
 
 
   <sect2 condition="supports-bootp" id="tftp-bootp">
-  <title>Setting up BOOTP server</title>
+  <title>Setting up a BOOTP server</title>
 <para>
 
 There are two BOOTP servers available for GNU/Linux. The first is CMU
 <command>bootpd</command>. The other is actually a DHCP server: ISC
 <command>dhcpd</command>. In &debian; these are contained in the
-<classname>bootp</classname> and <classname>dhcp</classname> packages
-respectively.
+<classname>bootp</classname> and <classname>dhcp3-server</classname>
+packages respectively.
 
 </para><para>
 
@@ -61,11 +61,11 @@ By contrast, setting up BOOTP with ISC <command>dhcpd</command> is
 really easy, because it treats BOOTP clients as a moderately special
 case of DHCP clients.  Some architectures require a complex
 configuration for booting clients via BOOTP.  If yours is one of
-those, read the section <xref linkend="dhcpd"/>.  Otherwise, you
+those, read the section <xref linkend="dhcpd"/>.  In that case, you
 will probably be able to get away with simply adding the
 <userinput>allow bootp</userinput> directive to the configuration
 block for the subnet containing the client, and restart
-<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd
+<command>dhcpd</command> with <userinput>/etc/init.d/dhcpd3-server
 restart</userinput>.
 
 </para>
diff --git a/nl/install-methods/tftp/dhcp.xml b/nl/install-methods/tftp/dhcp.xml
index def86c9cc..a69639ccf 100644
--- a/nl/install-methods/tftp/dhcp.xml
+++ b/nl/install-methods/tftp/dhcp.xml
@@ -1,14 +1,14 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 43558 untranslated -->
 
-  <sect2 condition="supports-dhcp" id="dhcpd">
+  <sect2 id="dhcpd">
    <title>Setting up a DHCP server</title>
 <para>
 
 One free software DHCP server is ISC <command>dhcpd</command>.
-In &debian;, this is available in the <classname>dhcp</classname> package.
-Here is a sample configuration file for it (usually
-<filename>/etc/dhcpd.conf</filename>):
+For &debian;, the <classname>dhcp3-server</classname> package is
+recommended.  Here is a sample configuration file for it (see
+<filename>/etc/dhcp3/dhcpd.conf</filename>):
 
 <informalexample><screen>
 option domain-name "example.com";
@@ -32,9 +32,6 @@ host clientname {
 }
 </screen></informalexample>
 
-Note: the new (and preferred) <classname>dhcp3</classname> package uses
-<filename>/etc/dhcp3/dhcpd.conf</filename>.
-
 </para><para>
 
 In this example, there is one server
@@ -48,7 +45,7 @@ file which will be retrieved via TFTP.
 </para><para>
 
 After you have edited the <command>dhcpd</command> configuration file,
-restart it with <userinput>/etc/init.d/dhcpd restart</userinput>.
+restart it with <userinput>/etc/init.d/dhcpd3-server restart</userinput>.
 
 </para>
 
@@ -79,11 +76,11 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
 }
 
 group {
- next-server 192.168.1.3;
- host tftpclient {
+  next-server 192.168.1.3;
+  host tftpclient {
 # tftp client hardware address
   hardware ethernet  00:10:DC:27:6C:15;
-  filename "/tftpboot/pxelinux.0";
+  filename "pxelinux.0";
  }
 }
 </screen></informalexample>
-- 
cgit v1.2.3