- All architectures that support TFTP booting also support DCHP, so remove the "supports-dhcp" condition

- According to the text, Alpha supports BOOTP
- Use dhcp3-server for examples rather than dhcp (version 2)
- tftpd-hpa does not use /tftpboot by default; allow for this in examples

15 files changed, 63 insertions, 51 deletions

diff --git a/build/arch-options/alpha b/build/arch-options/alpha
index 2f9ab20dc..e2806ba8b 100644
--- a/build/arch-options/alpha
+++ b/build/arch-options/alpha
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64
index 02c851382..d82430d70 100644
--- a/build/arch-options/amd64
+++ b/build/arch-options/amd64
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="smp-alternatives"
diff --git a/build/arch-options/arm b/build/arch-options/arm
index 5d8e33b06..3cc122d66 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/arm
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/hppa b/build/arch-options/hppa
index 0acb98476..d1adc0a9b 100644
--- a/build/arch-options/hppa
+++ b/build/arch-options/hppa
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/i386 b/build/arch-options/i386
index c82f65c74..0a1dfc220 100644
--- a/build/arch-options/i386
+++ b/build/arch-options/i386
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="smp-alternatives"
diff --git a/build/arch-options/ia64 b/build/arch-options/ia64
index fda153a2e..3120099ef 100644
--- a/build/arch-options/ia64
+++ b/build/arch-options/ia64
@@ -12,7 +12,7 @@ smp_config_option="SMP support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="parted.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp="supports-smp"
diff --git a/build/arch-options/m68k b/build/arch-options/m68k
index a8d43c57d..8d4b84a5d 100644
--- a/build/arch-options/m68k
+++ b/build/arch-options/m68k
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="atari-fdisk.txt;mac-fdisk.txt;amiga-fdisk.txt;pmac-fdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk"
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/mips b/build/arch-options/mips
index 144df29c3..8a0b6730e 100644
--- a/build/arch-options/mips
+++ b/build/arch-options/mips
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-nfsroot"
+network="supports-tftp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel
index 86863abb7..f41f8b28f 100644
--- a/build/arch-options/mipsel
+++ b/build/arch-options/mipsel
@@ -12,7 +12,7 @@ smp_config_option="N/A"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot=""
 other="supports-serial-console;rescue-needs-root-disk"
 smp=""
diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc
index 00fc9701e..48b6880b9 100644
--- a/build/arch-options/powerpc
+++ b/build/arch-options/powerpc
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="mac-fdisk.txt;cfdisk.txt"
-network="supports-tftp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot;bootable-disk;bootable-usb"
 other="supports-pcmcia;supports-serial-console;rescue-needs-root-disk;g-i"
 smp="supports-smp"
diff --git a/build/arch-options/sparc b/build/arch-options/sparc
index 17bedec44..563a9955c 100644
--- a/build/arch-options/sparc
+++ b/build/arch-options/sparc
@@ -12,7 +12,7 @@ smp_config_option="Symmetric multi-processing support"
 # Options below are assembled into one variable 'condition'
 # in the build scripts
 fdisk="fdisk.txt"
-network="supports-tftp;supports-rarp;supports-dhcp;supports-bootp;supports-nfsroot"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
 boot="supports-floppy-boot"
 other="supports-serial-console;rescue-needs-root-disk"
 # SMP support is described in hardware/supported/sparc.xml
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 39c528be2..6376874e4 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -13,26 +13,27 @@ and the machine configured to support booting of your specific machine.
 
 </para><para>
 
-You need to setup a TFTP server, and for many machines, a BOOTP server
-<phrase condition="supports-rarp">, or RARP server</phrase>
-<phrase condition="supports-dhcp">, or DHCP server</phrase>.
+You need to setup a TFTP server, and for many machines a DHCP 
+server<phrase condition="supports-rarp">, or RARP
+server</phrase><phrase condition="supports-bootp">, or BOOTP
+server</phrase>.
 
 </para><para>
 
 <phrase condition="supports-rarp">The Reverse Address Resolution Protocol (RARP) is
 one way to tell your client what IP address to use for itself. Another
-way is to use the BOOTP protocol. </phrase>
+way is to use the BOOTP protocol.</phrase>
 
 <phrase condition="supports-bootp">BOOTP is an IP protocol that
 informs a computer of its IP address and where on the network to obtain
-a boot image. </phrase>
+a boot image.</phrase>
 
-<phrase arch="m68k"> Yet another alternative exists on VMEbus
-systems: the IP address can be manually configured in boot ROM. </phrase>
+<phrase arch="m68k">Yet another alternative exists on VMEbus
+systems: the IP address can be manually configured in boot ROM.</phrase>
 
-<phrase condition="supports-dhcp">The DHCP (Dynamic Host Configuration
-Protocol) is a more flexible, backwards-compatible extension of BOOTP.
-Some systems can only be configured via DHCP. </phrase>
+The DHCP (Dynamic Host Configuration Protocol) is a more flexible,
+backwards-compatible extension of BOOTP.
+Some systems can only be configured via DHCP.
 
 </para><para arch="powerpc">
 
@@ -101,18 +102,33 @@ tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot
 Debian packages will in general set this up correctly by default when they
 are installed.
 
-</para><para>
+</para>
+<note><para>
+
+Historically TFTP servers used <filename>/tftpboot</filename> as directory
+to serve images from. However, &debian; packages may use other directories
+to comply with the <ulink url="&url-fhs-home;">Filesystem Hierarchy
+Standard</ulink>. For example, <classname>tftpd-hpa</classname> by default
+uses <filename>/var/lib/tftpboot</filename>. You may have to adjust the
+configuration examples in this section accordingly.
+
+</para></note>
+<para>
+
+Look in <filename>/etc/inetd.conf</filename> and remember the directory which
+is used as the argument of <command>in.tftpd</command><footnote>
 
-Look in that file and remember the directory which is used as the
-argument of <command>in.tftpd</command>; you'll need that below.  The
-<userinput>-l</userinput> argument enables some versions of
+<para>
+The <userinput>-l</userinput> argument enables some versions of
 <command>in.tftpd</command> to log all requests to the system logs;
-this is useful for diagnosing boot errors.  If you've had to change
-<filename>/etc/inetd.conf</filename>, you'll have to notify the
-running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd
-reload</userinput>; on other machines,
-find out the process ID for <command>inetd</command>, and run
+this is useful for diagnosing boot errors.
+</para>
+
+</footnote>; you'll need that below.
+If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
+notify the running <command>inetd</command> process that the file has changed.
+On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
+other machines, find out the process ID for <command>inetd</command>, and run
 <userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
 
 </para><para arch="mips">
@@ -146,8 +162,7 @@ to adjust the range of source ports the Linux TFTP server uses.
 
 Next, place the TFTP boot image you need, as found in
 <xref linkend="where-files"/>, in the <command>tftpd</command>
-boot image directory.  Generally, this directory will be
-<filename>/tftpboot</filename>.  You'll have to make a link from that
+boot image directory.  You may have to make a link from that
 file to the file which <command>tftpd</command> will use for booting a
 particular client.  Unfortunately, the file name is determined by the
 TFTP client, and there are no strong standards.
@@ -166,7 +181,7 @@ images via TFTP itself.  For net booting, use the
 For PXE booting, everything you should need is set up in the
 <filename>netboot/netboot.tar.gz</filename> tarball. Simply extract this
 tarball into the <command>tftpd</command> boot image directory. Make sure
-your dhcp server is configured to pass <filename>/pxelinux.0</filename>
+your dhcp server is configured to pass <filename>pxelinux.0</filename>
 to <command>tftpd</command> as the filename to boot.
 
 </para><para arch="ia64">
diff --git a/en/install-methods/tftp/bootp.xml b/en/install-methods/tftp/bootp.xml
index cda0f9c66..f0b0eab42 100644
--- a/en/install-methods/tftp/bootp.xml
+++ b/en/install-methods/tftp/bootp.xml
@@ -3,14 +3,14 @@
 
 
   <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/en/install-methods/tftp/dhcp.xml b/en/install-methods/tftp/dhcp.xml
index fb9c624ea..39327ae23 100644
--- a/en/install-methods/tftp/dhcp.xml
+++ b/en/install-methods/tftp/dhcp.xml
@@ -1,14 +1,14 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-  <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>
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index 8f68abd37..4a7b21e3c 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -390,7 +390,7 @@ Service) server.
 </para></listitem>
 </itemizedlist>
 
-</para><para condition="supports-dhcp">
+</para><para>
 
 On the other hand, if your administrator tells you that a DHCP server
 is available and is recommended, then you don't need this information