* Fix default tftp directory from /var/lib/tftpboot to /srv/tftp, thanks

    Charles Plessy (Closes: Bug#606725).

40 files changed, 52 insertions, 50 deletions

diff --git a/ca/howto/installation-howto.xml b/ca/howto/installation-howto.xml
index 05976a72f..d82346363 100644
--- a/ca/howto/installation-howto.xml
+++ b/ca/howto/installation-howto.xml
@@ -188,7 +188,7 @@ xarxa el &d-i;.
 
 La manera més fàcil per configurar-ho és probablement l'arrencada amb PXE.
 Desempaqueteu amb el tar el fitxer <filename>netboot/pxeboot.tar.gz</filename>
-a <filename>/var/lib/tftpboot</filename> o a un altre lloc al vostre servidor
+a <filename>/srv/tftp</filename> o a un altre lloc al vostre servidor
 tftp. Configureu el vostre servidor DHCP per que envie als clients el fitxer
 <filename>/pxelinux.0</filename>, i amb una mica de sort tot anirà be.
 Si voleu instruccions més detallades, mireu <xref linkend="install-tftp" />.
diff --git a/ca/install-methods/install-tftp.xml b/ca/install-methods/install-tftp.xml
index 30b44ed2c..49f80aac9 100644
--- a/ca/install-methods/install-tftp.xml
+++ b/ca/install-methods/install-tftp.xml
@@ -91,7 +91,7 @@ Històricament, els servidors TFTP utilitzen el directori
 els paquets de &debian-gnu; poden utilitzar altres directoris per complir
 amb l'<ulink url="&url-fhs-home;">Estàndard de la Jerarquia del Sistema
 de Fitxers</ulink>. Per exemple, el <classname>tftpd-hpa</classname>
-utilitza per defecte <filename>/var/lib/tftpboot</filename>. Es possible
+utilitza per defecte <filename>/srv/tftp</filename>. Es possible
 que hagueu d'ajustar els exemples de configuració d'aquesta secció en
 conseqüència.
 
diff --git a/cs/howto/installation-howto.xml b/cs/howto/installation-howto.xml
index 4ad5966e8..60b9beef7 100644
--- a/cs/howto/installation-howto.xml
+++ b/cs/howto/installation-howto.xml
@@ -191,7 +191,7 @@ potřebovat soubory z adresáře <filename>netboot/</filename>.
 </para><para arch="x86">
 
 Nejjednodušší cesta je asi přes PXE. Do adresáře
-<filename>/var/lib/tftpboot</filename> (nebo jiného podle vašeho tftp
+<filename>/srv/tftp</filename> (nebo jiného podle vašeho tftp
 serveru) rozbalte soubor
 <filename>netboot/pxeboot.tar.gz</filename>. Nastavte DHCP server, aby
 klientům předal název souboru <filename>/pxelinux.0</filename>
diff --git a/cs/install-methods/install-tftp.xml b/cs/install-methods/install-tftp.xml
index 39ef55e15..7fe22da93 100644
--- a/cs/install-methods/install-tftp.xml
+++ b/cs/install-methods/install-tftp.xml
@@ -89,7 +89,7 @@ adresář <filename>/tftpboot</filename>. Aby byl &debian; v souladu se
 standardem <ulink url="&url-fhs-home;">FHS</ulink>, mohou debianí
 balíky používat jiná umístění. Například
 <classname>tftpd-hpa</classname> implicitně používá adresář
-<filename>/var/lib/tftpboot</filename>. Je proto možné, že budete
+<filename>/srv/tftp</filename>. Je proto možné, že budete
 muset cesty uváděné v této kapitole upravit pro konkrétní situaci.
 
 </para></note><para>
diff --git a/de/howto/installation-howto.xml b/de/howto/installation-howto.xml
index e187ef5b8..2fc972934 100644
--- a/de/howto/installation-howto.xml
+++ b/de/howto/installation-howto.xml
@@ -192,7 +192,7 @@ Architektur und den Netzwerk-Boot-Einstellungen. Sie können die Dateien unter
 
 Am einfachsten einzurichten ist wahrscheinlich der PXE-Netzwerkboot.
 Entpacken Sie mittels <command>untar</command> die Datei
-<filename>netboot/pxeboot.tar.gz</filename> nach <filename>/var/lib/tftpboot</filename>
+<filename>netboot/pxeboot.tar.gz</filename> nach <filename>/srv/tftp</filename>
 oder wo auch immer Ihr TFTP-Server sie benötigt. Richten Sie Ihren DHCP-Server
 so ein, dass er die Datei <filename>/pxelinux.0</filename> an die Clients
 weiterleitet, und mit ein bisschen Glück funktioniert es dann.
diff --git a/de/install-methods/install-tftp.xml b/de/install-methods/install-tftp.xml
index 272b05610..6651f2ae2 100644
--- a/de/install-methods/install-tftp.xml
+++ b/de/install-methods/install-tftp.xml
@@ -94,7 +94,7 @@ genutzt, um Images bereitzustellen. Allerdings verwenden Server aus
 <ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink>
 (Festlegungen, an welcher Stelle im Dateisystem bestimmte Daten abgespeichert
 werden sollten) zu erfüllen. Zum Beispiel nutzt <classname>tftpd-hpa</classname>
-standardmäßig <filename>/var/lib/tftpboot</filename>. Sie müssen also
+standardmäßig <filename>/srv/tftp</filename>. Sie müssen also
 eventuell die Konfigurationsbeispiele aus diesem Kapitel entsprechend an
 Ihre Situation anpassen.
 
diff --git a/debian/changelog b/debian/changelog
index 1e9712c72..33ad1b422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Make subsection Installation Over the Network a direct child of Using
     Individual Components instead of hiding it in "Miscellaneous".
   * Rename 6.3.8 "Miscellaneous" into "Troubleshooting".
+  * Fix default tftp directory from /var/lib/tftpboot to /srv/tftp, thanks
+    Charles Plessy (Closes: Bug#606725).
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 8ddbf4696..f88e4b27d 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -179,7 +179,7 @@ The files in <filename>netboot/</filename> can be used to netboot &d-i;.
 
 The easiest thing to set up is probably PXE netbooting. Untar the
 file <filename>netboot/pxeboot.tar.gz</filename> into
-<filename>/var/lib/tftpboot</filename> or
+<filename>/srv/tftp</filename> or
 wherever is appropriate for your tftp server. Set up your DHCP server to pass
 filename <filename>/pxelinux.0</filename> to clients, and with luck
 everything will just work.
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 4ea74196c..868c70155 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -88,7 +88,7 @@ Historically, TFTP servers used <filename>/tftpboot</filename> as directory
 to serve images from. However, &debian-gnu; 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
+uses <filename>/srv/tftp</filename>. You may have to adjust the
 configuration examples in this section accordingly.
 
 </para></note>
diff --git a/en/partitioning/schemes.xml b/en/partitioning/schemes.xml
index f4156827c..eaebab2bb 100644
--- a/en/partitioning/schemes.xml
+++ b/en/partitioning/schemes.xml
@@ -51,7 +51,7 @@ are trying to solve 10000 simultaneous equations on a machine with
 
 </para><para>
 
-On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the
+On some 32-bit architectures (m68k and PowerPC), the
 maximum size of a swap partition is 2GB. That should be enough for
 nearly any installation.  However, if your swap requirements are this
 high, you should probably try to spread the swap across different
diff --git a/eu/howto/installation-howto.xml b/eu/howto/installation-howto.xml
index d09b8973d..96e42cd7e 100644
--- a/eu/howto/installation-howto.xml
+++ b/eu/howto/installation-howto.xml
@@ -182,7 +182,7 @@ abiarazteko.
 
 Konfiguratzeko era errazena ziurrenik PXE sare-abiaraztea da.Despaketatu
 <filename>netboot/pxeboot.tar.gz</filename> fitxategia 
-<filename>/var/lib/tftpboot></filename> karpetan edo zure tftp zerbitzarian 
+<filename>/srv/tftp></filename> karpetan edo zure tftp zerbitzarian 
 egon behar den lekuan. Konfiguratu zure DHCP zerbitzaria 
 <filename>/pxelinux.0</filename> fitxategia bezeroei bidaltzeko, eta dena 
 ondo badabil abiarazi beharko litzateke.
diff --git a/fr/howto/installation-howto.xml b/fr/howto/installation-howto.xml
index b5adb3c7d..9ca86e212 100644
--- a/fr/howto/installation-howto.xml
+++ b/fr/howto/installation-howto.xml
@@ -183,7 +183,7 @@ et de la configuration. Les fichiers dans <filename>netboot/</filename> servent
 
 La méthode la plus facile est l'amorçage de type PXE. Extrayez les fichiers
 de <filename>netboot/pxeboot.tar.gz</filename> dans le répertoire
-<filename>/var/lib/tftpboot</filename> ou dans le répertoire que demande
+<filename>/srv/tftp</filename> ou dans le répertoire que demande
 le serveur tftp. Et configurez le serveur DHCP pour qu'il passe le
 nom <filename>/pxelinux.0</filename> aux clients. Avec un peu de chance,
 tout marchera bien.
diff --git a/fr/install-methods/install-tftp.xml b/fr/install-methods/install-tftp.xml
index a4751eb53..b4038e23d 100644
--- a/fr/install-methods/install-tftp.xml
+++ b/fr/install-methods/install-tftp.xml
@@ -93,7 +93,7 @@ Les serveurs TFTP utilisaient habituellement le répertoire <filename>/tftpboot<
 stocker les images. Cependant les paquets &debian-gnu; se servent d'autres répertoires
 pour obéir au <ulink url="&url-fhs-home;">standard sur l'organisation des fichiers</ulink>.
 Par exemple, <classname>tftpd-hpa</classname> utilise par défaut
-<filename>/var/lib/tftpboot</filename>. Vous aurez à modifier les exemples de cette section.
+<filename>/srv/tftp</filename>. Vous aurez à modifier les exemples de cette section.
 
 </para></note>
 <para>
diff --git a/it/howto/installation-howto.xml b/it/howto/installation-howto.xml
index 138876dff..dbab06a43 100644
--- a/it/howto/installation-howto.xml
+++ b/it/howto/installation-howto.xml
@@ -342,7 +342,7 @@ dalla rete del &d-i;.
 <!--
 The easiest thing to set up is probably PXE netbooting. Untar the
 file <filename>netboot/pxeboot.tar.gz</filename> into
-<filename>/var/lib/tftpboot</filename> or
+<filename>/srv/tftp</filename> or
 wherever is appropriate for your tftp server. Set up your DHCP server to pass
 filename <filename>/pxelinux.0</filename> to clients, and with luck
 everything will just work.
@@ -351,7 +351,7 @@ For detailed instructions, see <xref linkend="install-tftp" />.
 
 Probabilmente la cosa più semplice da configurare è l'avvio da rete con
 PXE. Si deve estrarre il file <filename>netboot/pxeboot.tar.gz</filename>
-in <filename>/var/lib/tftpboot</filename> o in qualsiasi altra posizione
+in <filename>/srv/tftp</filename> o in qualsiasi altra posizione
 riconosciuta come valida dal proprio server TFTP. Poi impostare il server
 DHCP per passare il file <filename>/pxelinux.0</filename> ai client e con
 un po' di fortuna funziona. Per le istruzioni dettagliate si veda
diff --git a/it/install-methods/install-tftp.xml b/it/install-methods/install-tftp.xml
index 6bf82bc61..f3b998a3d 100644
--- a/it/install-methods/install-tftp.xml
+++ b/it/install-methods/install-tftp.xml
@@ -166,7 +166,7 @@ Historically, TFTP servers used <filename>/tftpboot</filename> as directory
 to serve images from. However, &debian-gnu; 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
+uses <filename>/srv/tftp</filename>. You may have to adjust the
 configuration examples in this section accordingly.
 -->
 
@@ -174,7 +174,7 @@ Storicamente i server TFTP hanno usato <filename>/tftpboot</filename> come
 directory dalla quale servire le immagini. Invece, i pacchetti &debian-gnu;
 potrebbero usare una directory diversa in modo da essere conformi al
 <ulink url="&url-fhs-home;">Filesystem Hierarchy Standard</ulink>. Per esempio
-<classname>tftpd-hpa</classname> usa <filename>/var/lib/tftpboot</filename>;
+<classname>tftpd-hpa</classname> usa <filename>/srv/tftp</filename>;
 potrebbe essere necessario modificare gli esempi presenti in questa sezione
 in base alla propria configurazione.
 
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index c1be31c23..fe8893c77 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -179,7 +179,7 @@ The files in <filename>netboot/</filename> can be used to netboot &d-i;.
 
 The easiest thing to set up is probably PXE netbooting. Untar the
 file <filename>netboot/pxeboot.tar.gz</filename> into
-<filename>/var/lib/tftpboot</filename> or
+<filename>/srv/tftp</filename> or
 wherever is appropriate for your tftp server. Set up your DHCP server to pass
 filename <filename>/pxelinux.0</filename> to clients, and with luck
 everything will just work.
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 0717951cc..6c54a89c4 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -88,7 +88,7 @@ Historically, TFTP servers used <filename>/tftpboot</filename> as directory
 to serve images from. However, &debian-gnu; 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
+uses <filename>/srv/tftp</filename>. You may have to adjust the
 configuration examples in this section accordingly.
 
 </para></note>
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 538ab54bc..948d7c41d 100644
--- a/po/el/install-methods.po
+++ b/po/el/install-methods.po
@@ -2322,7 +2322,7 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Κατά παράδοση οι εξυπηρετητές TFTP χρησιμοποιούσαν τον κατάλογο <filename>/"
@@ -2331,7 +2331,7 @@ msgstr ""
 "καταλόγους ώστε να συμμορφώνονται με το πρότυπο  <ulink url=\"&url-fhs-home;"
 "\">Filesystem Hierarchy Standard</ulink>. Για παράδειγμα, το πακέτο "
 "<classname>tftpd-hpa</classname> χρησιμοποιεί εξ ορισμού τον κατάλογο "
-"<filename>/var/lib/tftpboot</filename>. Πιθανόν να πρέπει να προσαρμόσετε τα "
+"<filename>/srv/tftp</filename>. Πιθανόν να πρέπει να προσαρμόσετε τα "
 "παραδείγματα ρυθμίσεων στην παρούσα ενότητα ανάλογα."
 
 #. Tag: para
diff --git a/po/el/installation-howto.po b/po/el/installation-howto.po
index c38bb64d7..42cb384a0 100644
--- a/po/el/installation-howto.po
+++ b/po/el/installation-howto.po
@@ -360,7 +360,7 @@ msgid ""
 msgstr ""
 "Η ευκολότερη μέθοδος είναι πιθανότατα η ρύθμιση της δικτυακής εκκίνησης PXE. "
 "Αποσυμπιέστε το αρχείο <filename>netboot/pxeboot.tar.gz</filename> στον "
-"κατάλογο <filename>/var/lib/tftpboot</filename> ή οπουδήποτε είναι κατάλληλο "
+"κατάλογο <filename>/srv/tftp</filename> ή οπουδήποτε είναι κατάλληλο "
 "για τον εξυπηρετητή tftp. Ρυθμίστε τον εξυπηρετητή DHCP να περνάει το όνομα "
 "<filename>/pxelinux.0</filename> στους πελάτες, και με λίγη τύχη όλα θα "
 "δουλέψουν. Για λεπτομερείς οδηγίες, δείτε το <xref linkend=\"install-tftp\" /"
diff --git a/po/es/install-methods.po b/po/es/install-methods.po
index be52af5cc..284e0d13e 100644
--- a/po/es/install-methods.po
+++ b/po/es/install-methods.po
@@ -2234,7 +2234,7 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Los servidores de TFTP utilizan <filename>/tftpboot</filename> como "
@@ -2242,7 +2242,7 @@ msgstr ""
 "algunos paquetes &debian-gnu; puede utilizar otros directorios para cumplir "
 "con el <ulink url=\"&url-fhs-home;\">estándar de jerarquía de sistemas de "
 "ficheros</ulink>. Por ejemplo, <classname>tftpd-hpa</classname> utiliza, por "
-"omisión, <filename>/var/lib/tftpboot</filename>. Puede tener que ajustar los "
+"omisión, <filename>/srv/tftp</filename>. Puede tener que ajustar los "
 "ejemplos de configuración en esta sección si la ubicación varía."
 
 #. Tag: para
diff --git a/po/es/installation-howto.po b/po/es/installation-howto.po
index 6a43d9878..6f63105e8 100644
--- a/po/es/installation-howto.po
+++ b/po/es/installation-howto.po
@@ -380,7 +380,7 @@ msgid ""
 msgstr ""
 "La forma más fácil de configurar el arranque desde red probablemente sea "
 "usando PXE. Extraiga el fichero <filename>netboot/pxeboot.tar.gz</filename> "
-"en <filename>/var/lib/tftpboot</filename> o donde sea apropiado para su "
+"en <filename>/srv/tftp</filename> o donde sea apropiado para su "
 "servidor tftp. Configure su servidor DHCP para pasar el fichero <filename>/"
 "pxelinux.0</filename> a los clientes, y, con suerte, todo funcionará "
 "correctamente. Para instrucciones detalladas, vea <xref linkend=\"install-"
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index 1de3e882b..f0bd198c7 100644
--- a/po/fi/install-methods.po
+++ b/po/fi/install-methods.po
@@ -2231,7 +2231,7 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Perinteisesti TFTP-palvelimet ovat jakaneet hakemiston <filename>/tftpboot</"
diff --git a/po/fi/installation-howto.po b/po/fi/installation-howto.po
index d7520bcea..4cb5d6986 100644
--- a/po/fi/installation-howto.po
+++ b/po/fi/installation-howto.po
@@ -339,7 +339,7 @@ msgid ""
 "see <xref linkend=\"install-tftp\"/>."
 msgstr ""
 "Helpoin tapa lienee PXE-verkkokäynnistys. Pura tiedosto <filename>netboot/"
-"pxeboot.tar.gz</filename> hakemistoon <filename>/var/lib/tftpboot</filename> "
+"pxeboot.tar.gz</filename> hakemistoon <filename>/srv/tftp</filename> "
 "tai muuhun tftp-palvelimen käyttämään hakemistoon. Tee DHCP-palvelimen "
 "asetukset antamaan tiedostonimi <filename>/pxelinux.0</filename> "
 "asiakaskoneille, ja pienellä tuurilla kaikki toimii. Yksityiskohtaisemmat "
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index 07a2f3ec9..09daa3724 100644
--- a/po/hu/install-methods.po
+++ b/po/hu/install-methods.po
@@ -2096,14 +2096,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Régen a TFTP kiszolgálók a <filename>/tftpboot</filename> könyvtárat "
 "használták képek adására. De a &debian-gnu; csomagok képesek a <ulink url="
 "\"&url-fhs-home;\">Fájlrendszer Hierarchia Szabványnak</ulink> megfelelő "
 "könyvtárak használatára. Például a <classname>tftpd-hpa</classname> alapban "
-"a <filename>/var/lib/tftpboot</filename> könyvtárat használja. Állítsd be az "
+"a <filename>/srv/tftp</filename> könyvtárat használja. Állítsd be az "
 "e szakaszban adott beállító példákat így."
 
 #. Tag: para
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 3dd31a095..0c848b3d1 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -2190,14 +2190,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "歴史的に TFTP サーバは、 イメージを提供するディレクトリに <filename>/"
 "tftpboot</filename> を使用します。 しかし &debian-gnu; のパッケージでは、 "
 "<ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> を満たす"
 "別のディレクトリを使用する可能性があります。 例えば、<classname>tftpd-hpa</"
-"classname> では <filename>/var/lib/tftpboot</filename> をデフォルトで使用しま"
+"classname> では <filename>/srv/tftp</filename> をデフォルトで使用しま"
 "す。 必要に応じて、本節の設定例を調整してください。"
 
 #. Tag: para
diff --git a/po/ja/installation-howto.po b/po/ja/installation-howto.po
index 79f16a39e..9f4dc1c44 100644
--- a/po/ja/installation-howto.po
+++ b/po/ja/installation-howto.po
@@ -337,7 +337,7 @@ msgid ""
 "see <xref linkend=\"install-tftp\"/>."
 msgstr ""
 "設定するのに最も容易なのは、おそらく PXE netbooting です。<filename>netboot/"
-"pxeboot.tar.gz</filename> ファイルを <filename>/var/lib/tftpboot</filename> "
+"pxeboot.tar.gz</filename> ファイルを <filename>/srv/tftp</filename> "
 "の中か、あるいは tftp サーバの適切な場所ならどこにでも解凍してください。DHCP "
 "サーバを設定して、クライアントへファイル名 <filename>/pxelinux.0</filename> "
 "を渡してください。運がよければすべてがうまく動作するでしょう。詳細な説明に関"
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index 9cbcde6e9..70a78c401 100644
--- a/po/ko/install-methods.po
+++ b/po/ko/install-methods.po
@@ -2326,14 +2326,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "전통적으로 부팅 이미지를 저장하는 위치로 TFTP 서버는 <filename>/tftpboot</"
 "filename> 디렉터리를 사용합니다. 하지만, &debian-gnu; 패키지는 <ulink url="
 "\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink>에 맞추기 위해 다른 "
 "디렉터리를 사용합니다. 예를 들어, <classname>tftpd-hpa</classname>는 기본값으"
-"로 <filename>/var/lib/tftpboot</filename>를 사용합니다. 여기서 설명하는 설정 "
+"로 <filename>/srv/tftp</filename>를 사용합니다. 여기서 설명하는 설정 "
 "파일 예제에서는 이 점을 고려해서 적용하십시오."
 
 #. Tag: para
diff --git a/po/ko/installation-howto.po b/po/ko/installation-howto.po
index 443ba3953..10f8c37d3 100644
--- a/po/ko/installation-howto.po
+++ b/po/ko/installation-howto.po
@@ -356,7 +356,7 @@ msgid ""
 "see <xref linkend=\"install-tftp\"/>."
 msgstr ""
 "PXE 네트워크 부팅이 제일 설정하기 쉽습니다. <filename>netboot/pxeboot.tar."
-"gz</filename> 파일을 <filename>/var/lib/tftpboot</filename> 또는 tftp 서버가 "
+"gz</filename> 파일을 <filename>/srv/tftp</filename> 또는 tftp 서버가 "
 "사용하는 위치에 풀어 놓으십시오. DHCP 서버가 <filename>/pxelinux.0</"
 "filename> 파일 이름을 클라이언트에게 넘겨주도록 설정하면, 모두 잘 동작할 것입"
 "니다. 자세한 설명은 <xref linkend=\"install-tftp\"/> 부분을 참고하십시오."
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 02c55af7b..45766075f 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -2200,7 +2200,7 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Historicamente os servidores TFTP utilizavam <filename>/tftpboot</filename> "
diff --git a/po/pt/installation-howto.po b/po/pt/installation-howto.po
index ab53949bb..04f8c8f7a 100644
--- a/po/pt/installation-howto.po
+++ b/po/pt/installation-howto.po
@@ -348,7 +348,7 @@ msgid ""
 msgstr ""
 "A coisa mais simples para configurar é provavelmente o PXE netbooting. "
 "Descomprimir o ficheiro <filename>netboot/pxeboot.tar.gz</filename> para "
-"<filename>/var/lib/tftpboot</filename> ou para onde for mais apropriado para "
+"<filename>/srv/tftp</filename> ou para onde for mais apropriado para "
 "o seu servidor tftp. Configurar o seu servidor DHCP para transferir o "
 "ficheiro <filename>/pxelinux.0</filename> aos clientes, e com sorte tudo "
 "estará simplesmente a funcionar. Para instruções detalhadas, visite a <xref "
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 6755611e0..ec35e92fc 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -2173,14 +2173,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Исторически, TFTP-серверы используют каталог <filename>/tftpboot</filename> "
 "для хранения образов. Однако, пакеты &debian-gnu; могут использовать другие "
 "каталоги, чтобы соответствовать <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink>. Например, <classname>tftpd-hpa</classname> по "
-"умолчанию использует <filename>/var/lib/tftpboot</filename>. Вам может "
+"умолчанию использует <filename>/srv/tftp</filename>. Вам может "
 "потребоваться изменить примеры конфигурации для соответствия."
 
 #. Tag: para
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index f502092f4..8012fb835 100644
--- a/po/sv/install-methods.po
+++ b/po/sv/install-methods.po
@@ -2228,14 +2228,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Historiskt sett hanterade TFTP-servrarna  avbildningar från katalogen "
 "<filename>/tftpboot</filename>. Dock kan &debian-gnu;-paket använda andra "
 "kataloger för att följa <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy "
 "Standard</ulink>. Till exempel, <classname>tftpd-hpa</classname> använder "
-"som standard <filename>/var/lib/tftpboot</filename>. Du kan därför behöva "
+"som standard <filename>/srv/tftp</filename>. Du kan därför behöva "
 "justera konfigurationsexemplen i det här avsnittet."
 
 #. Tag: para
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index 8bb1dd4a7..c3950bf21 100644
--- a/po/vi/install-methods.po
+++ b/po/vi/install-methods.po
@@ -2210,14 +2210,14 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "Trong quá khứ, máy phục vụ TFTP đã dùng <filename>/tftpboot</filename> như "
 "là thư mục từ đó cần phục vụ ảnh. Tuy nhiên, các gói &debian-gnu; có thể sử "
 "dụng thư mục khác để tuân theo <ulink url=\"&url-fhs-home;\">Tiêu Chuẩn Phân "
 "Cấp Hệ Thống Tập Tin</ulink> (FHS). Chẳng hạn, <classname>tftpd-hpa</"
-"classname> theo mặc định sử dụng thư mục <filename>/var/lib/tftpboot</"
+"classname> theo mặc định sử dụng thư mục <filename>/srv/tftp</"
 "filename>. Có lẽ bạn cần phải điều chỉnh những mẫu cấu hình trong phần này "
 "một cách tương ứng."
 
diff --git a/po/vi/installation-howto.po b/po/vi/installation-howto.po
index 45a797ab4..23d6ce899 100644
--- a/po/vi/installation-howto.po
+++ b/po/vi/installation-howto.po
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 "Phương pháp thiết lập dễ nhất rất có thể là tiến trình khởi động từ mạng "
 "kiểu PXE. Hãy giải nến (gunzip và bỏ .tar) tập tin <filename>netboot/pxeboot."
-"tar.gz</filename> vào thư mục <filename>/var/lib/tftpboot</filename> hoặc "
+"tar.gz</filename> vào thư mục <filename>/srv/tftp</filename> hoặc "
 "nơi nào thích hợp với trình phục vụ tftp của bạn. Thiết lập trình phục vụ "
 "DHCP để gởi tên tập tin <filename>/pxelinux.0</filename> qua cho trình "
 "khách, và nếu có may, mọi điều nên đơn giản hoạt động được. Để tìm chỉ dẫn "
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index af7c069a0..92264c8c2 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -2021,13 +2021,13 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 "因为历史原因，TFTP 服务器使用 <filename>/tftpboot</filename> 作为映像文件目"
 "录。然而，&debian-gnu; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem "
 "Hierarchy Standard</ulink> 使用其他的目录。例如，<classname>tftpd-hpa</"
-"classname> 默认使用 <filename>/var/lib/tftpboot</filename>。您或许要适当地调"
+"classname> 默认使用 <filename>/srv/tftp</filename>。您或许要适当地调"
 "整一下配置文件示例。"
 
 #. Tag: para
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 77dce6179..53979b5a6 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -319,7 +319,7 @@ msgid ""
 "see <xref linkend=\"install-tftp\"/>."
 msgstr ""
 "最简单的建立方式是使用 PXE 的网络启动。解开 <filename>netboot/pxeboot.tar."
-"gz</filename> 文件，把它放到 <filename>/var/lib/tftpboot</filename>，或者放到"
+"gz</filename> 文件，把它放到 <filename>/srv/tftp</filename>，或者放到"
 "您的 tftp 服务器所使用的目录。然后再建立 DHCP 服务器，传送 <filename>/"
 "pxelinux.0</filename> 这个文件名给客户端。老天保佑的话，就能顺利安装了。若要"
 "知道详细的操作步骤，请参阅 <xref linkend=\"install-tftp\"/>。"
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index ebbb7cb2d..63d1946c0 100644
--- a/po/zh_TW/install-methods.po
+++ b/po/zh_TW/install-methods.po
@@ -2046,7 +2046,7 @@ msgid ""
 "to serve images from. However, &debian-gnu; 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 "
+"default uses <filename>/srv/tftp</filename>. You may have to adjust "
 "the configuration examples in this section accordingly."
 msgstr ""
 
diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index a110f5174..648cd0cbe 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.po
@@ -317,7 +317,7 @@ msgid ""
 "see <xref linkend=\"install-tftp\"/>."
 msgstr ""
 "最簡單的方式是使用 PXE 的網絡啟動。先解開 <filename>netboot/pxeboot.tar.gz</"
-"filename>，把解壓縮後的檔案放到 <filename>/var/lib/tftpboot</filename>，或者"
+"filename>，把解壓縮後的檔案放到 <filename>/srv/tftp</filename>，或者"
 "放到您的 tftp 伺服器的其它目錄。然後設定 DHCP 伺服器，傳送 <filename>/"
 "pxelinux.0</filename> 檔名給客戶端。順利的話安裝成功。欲知詳情，請參閱 <xref "
 "linkend=\"install-tftp\"/>。"
diff --git a/pt_BR/howto/installation-howto.xml b/pt_BR/howto/installation-howto.xml
index e765c0760..df5ea5ddf 100644
--- a/pt_BR/howto/installation-howto.xml
+++ b/pt_BR/howto/installation-howto.xml
@@ -197,7 +197,7 @@ via rede do &d-i;.
 
 A coisa mais fácil de configurar é provavelmente a inicialização através
 do PXE. Descompacte o arquivo <filename>netboot/pxeboot.tar.gz</filename> em
-<filename>/var/lib/tftpboot</filename> ou
+<filename>/srv/tftp</filename> ou
 no lugar que achar mais conveniente em seu servidor tftp. Configure seu
 servidor DHCP para passar o arquivo <filename>/pxelinux.0</filename> para os
 clientes e provavelmente tudo funcionará.
diff --git a/pt_BR/install-methods/install-tftp.xml b/pt_BR/install-methods/install-tftp.xml
index 60ec41dd3..f50ac1abd 100644
--- a/pt_BR/install-methods/install-tftp.xml
+++ b/pt_BR/install-methods/install-tftp.xml
@@ -97,7 +97,7 @@ diretório para servir imagens. No entanto, pacotes &debian-gnu; podem usar outr
 diretórios para serem compatíveis com o <ulink url="&url-fhs-home;">Filesystem
 Hierarchy Standard</ulink> (Padrão de Hierarquia de Sistemas de Arquivos).
 Por exemplo, o <classname>tftpd-hpa</classname> por padrão usa
-<filename>/var/lib/tftpboot</filename>. Você pode ter que ajustar os exemplos
+<filename>/srv/tftp</filename>. Você pode ter que ajustar os exemplos
 de configuração apresentados nesta seção.
 
 </para></note>