2 files changed, 22 insertions, 30 deletions
diff --git a/it/install-methods/tftp/bootp.xml b/it/install-methods/tftp/bootp.xml
index a89982818..c9df19216 100644
--- a/it/install-methods/tftp/bootp.xml
+++ b/it/install-methods/tftp/bootp.xml
@@ -1,9 +1,9 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 -->
+<!-- original version: 43558 -->
 
 
   <sect2 condition="supports-bootp" id="tftp-bootp">
-  <!-- <title>Setting up BOOTP server</title> -->
+  <!-- <title>Setting up a BOOTP server</title> -->
   <title>Attivazione di un server BOOTP</title>
 <para>
 
@@ -11,15 +11,15 @@
 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.
 -->
 
 Per GNU/Linux sono disponibili due server BOOTP. Il primo è
 <command>bootpd</command> di CMU, l'altro è un server DHCP:
 <command>dhcpd</command> di ISC. Questi server sono rispettivamente
 contenuti nei pacchetti &debian; <classname>bootp</classname> e
-<classname>dhcp</classname>.
+<classname>dhcp3-server</classname>.
 
 </para><para>
 
@@ -106,11 +106,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>.
 -->
 
@@ -122,7 +122,7 @@ queste leggere la sezione <xref linkend="dhcpd"/>. In caso contrario
 per proseguire è sufficiente aggiungere la direttiva <userinput>allow
 bootp</userinput> al blocco di configurazione della subnet a cui appartiene
 il client e riavviare <command>dhcpd</command> usando
-<userinput>/etc/init.d/dhcpd restart</userinput>.
+<userinput>/etc/init.d/dhcpd3-server restart</userinput>.
 
 </para>
   </sect2>
diff --git a/it/install-methods/tftp/dhcp.xml b/it/install-methods/tftp/dhcp.xml
index 45ad49ec5..05770b551 100644
--- a/it/install-methods/tftp/dhcp.xml
+++ b/it/install-methods/tftp/dhcp.xml
@@ -1,23 +1,23 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43558 -->
 
 
-  <sect2 condition="supports-dhcp" id="dhcpd">
+  <sect2 id="dhcpd">
   <!-- <title>Setting up a DHCP server</title> -->
   <title>Attivazione di un server DHCP</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>):
 -->
 
-Un server DHCP libero è <command>dhcpd</command> di ISC. In &debian; è
-disponibile nel pacchetto <classname>dhcp</classname>. Questo è un esempio
-del file di configurazione per questo server (di solito
-<filename>/etc/dhcpd.conf</filename>):
+Un server DHCP libero è <command>dhcpd</command> di ISC. In &debian;
+si raccomanda il pacchetto <classname>dhcp3-server</classname>. Segue
+un esempio del file di configurazione per questo server (di solito
+<filename>/etc/dhcp3/dhcpd.conf</filename>):
 
 <informalexample><screen>
 option domain-name "example.com";
@@ -41,14 +41,6 @@ host clientname {
 }
 </screen></informalexample>
 
-<!--
-Note: the new (and preferred) <classname>dhcp3</classname> package uses
-<filename>/etc/dhcp3/dhcpd.conf</filename>.
--->
-
-Nota: il nuovo (e da preferire) pacchetto <classname>dhcp3</classname> usa il
-file <filename>/etc/dhcp3/dhcpd.conf</filename>.
-
 </para><para>
 
 <!--
@@ -72,11 +64,11 @@ verrà recuperato tramite TFTP.
 
 <!--
 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>.
 -->
 
 Dopo aver modificato il file di configurazione di <command>dhcpd</command>
-riavviarlo con <userinput>/etc/init.d/dhcpd restart</userinput>.
+riavviarlo con <userinput>/etc/init.d/dhcpd3-server restart</userinput>.
 
 </para>
 
@@ -114,11 +106,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>