Use dd of= instead of cat >, to save users who use sudo. Closes: #660776.

18 files changed, 52 insertions, 55 deletions

diff --git a/cs/install-methods/boot-usb-files.xml b/cs/install-methods/boot-usb-files.xml
index e0076b6c1..9350ae8bf 100644
--- a/cs/install-methods/boot-usb-files.xml
+++ b/cs/install-methods/boot-usb-files.xml
@@ -65,7 +65,7 @@ přepíšete všechna data, která na ní byla. Například na systému s
 GNU/Linuxem můžete obraz CD/DVD zapsat na USB klíčenku následovně:
 
 <informalexample><screen>
-<prompt>#</prompt> <userinput>cat debian.iso &gt; /dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>
 <prompt>#</prompt> <userinput>sync</userinput>
 </screen></informalexample>
 
diff --git a/de/install-methods/boot-usb-files.xml b/de/install-methods/boot-usb-files.xml
index b4541cf7d..21927ccb7 100644
--- a/de/install-methods/boot-usb-files.xml
+++ b/de/install-methods/boot-usb-files.xml
@@ -78,8 +78,8 @@ werden. Auf einem vorhandenen GNU/Linux-System kann das Image wie folgt
 auf den USB-Stick geschrieben werden:
 
 <informalexample><screen>
-# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</replaceable>
-# sync
+<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>sync</userinput>
 </screen></informalexample>
 
 </para>
diff --git a/debian/changelog b/debian/changelog
index 085b07a62..5165e0e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,8 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
   * Document the availability of other apt sources, thanks Karl for the
     patch. Closes: Bug#608828.
   * Update xorg, brltty and speakup versions.
-  * Document that WPA/WPA2 is now available. Closes: #659648.
+  * WPA/WPA2 is now available. Closes: #659648.
+  * Use dd of= instead of cat >, to save users who use sudo. Closes: #660776.
 
   [ Joey Hess ]
   * Fix typo in example preseed. Closes: #612631
@@ -54,7 +55,7 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
   * Remove dead link to Phoenix large disk BIOS faq. Closes: #638268
   * Add a pointer to the unofficial non-free CDs with firmware.
 
- -- Samuel Thibault <sthibault@debian.org>  Wed, 15 Feb 2012 00:37:34 +0100
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 21 Feb 2012 20:47:50 +0100
 
 installation-guide (20110122) unstable; urgency=low
 
diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml
index 5bc2a14f8..7fe61b691 100644
--- a/en/install-methods/boot-usb-files.xml
+++ b/en/install-methods/boot-usb-files.xml
@@ -73,8 +73,8 @@ GNU/Linux system, the CD or DVD image file can be written to a USB stick
 as follows:
 
 <informalexample><screen>
-# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</replaceable>
-# sync
+<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>sync</userinput>
 </screen></informalexample>
 
 </para>
diff --git a/fr/install-methods/boot-usb-files.xml b/fr/install-methods/boot-usb-files.xml
index c0a54cbfe..a2e25295d 100644
--- a/fr/install-methods/boot-usb-files.xml
+++ b/fr/install-methods/boot-usb-files.xml
@@ -65,8 +65,8 @@ Par exemple, avec un système GNU/Linux, vous pouvez copier l'image
 sur la clé de cette manière :
 
 <informalexample><screen>
-# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</replaceable>
-# sync
+<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>sync</userinput>
 </screen></informalexample>
  
 </para>
diff --git a/it/install-methods/boot-usb-files.xml b/it/install-methods/boot-usb-files.xml
index 9622b581b..0f1c657c2 100644
--- a/it/install-methods/boot-usb-files.xml
+++ b/it/install-methods/boot-usb-files.xml
@@ -129,8 +129,8 @@ GNU/Linux, è possibile scrivere il file con l'immagine del CD o DVD sulla
 chiavetta USB eseguendo:
 
 <informalexample><screen>
-# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</replaceable>
-# sync
+<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>
+<prompt>#</prompt> <userinput>sync</userinput>
 </screen></informalexample>
 
 </para>
diff --git a/po/el/install-methods.po b/po/el/install-methods.po
index 9cea5aee6..52a4ffbae 100644
--- a/po/el/install-methods.po
+++ b/po/el/install-methods.po
@@ -877,8 +877,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
@@ -888,8 +888,8 @@ msgstr ""
 "Για παράδειγμα, αν χρησιμοποείτε ένα ήδη υπάρχον σύστημα GNU/Linux, το "
 "αρχείο <filename>mini.iso</filename> μπορεί να εγγραφεί στο κλειδί USB ως "
 "εξής: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> Για να προσθέσετε αρχεία  firmware σε ένα κλειδί "
 "USB που έχετε προετοιμάσει με αυτήν την μέθοδο, κατεβάστε τα απαραίτητα "
 "αρχεία. Δείτε την ενότητα <xref linkend=\"loading-firmware\"/> για "
diff --git a/po/es/install-methods.po b/po/es/install-methods.po
index 5dd0a997b..4a1b49ee1 100644
--- a/po/es/install-methods.po
+++ b/po/es/install-methods.po
@@ -930,13 +930,11 @@ msgstr ""
 #: install-methods.xml:594
 #, no-c-format
 msgid ""
-"# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</"
-"replaceable>\n"
-"# sync"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 msgstr ""
-"# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</"
-"replaceable>\n"
-"# sync"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 
 #. Tag: title
 #: install-methods.xml:601
diff --git a/po/fi/install-methods.po b/po/fi/install-methods.po
index f0bd198c7..b14d665e3 100644
--- a/po/fi/install-methods.po
+++ b/po/fi/install-methods.po
@@ -838,8 +838,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
diff --git a/po/hu/install-methods.po b/po/hu/install-methods.po
index 09daa3724..bb3216ef6 100644
--- a/po/hu/install-methods.po
+++ b/po/hu/install-methods.po
@@ -782,8 +782,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
diff --git a/po/ja/install-methods.po b/po/ja/install-methods.po
index 0d70ea744..843bfe1bf 100644
--- a/po/ja/install-methods.po
+++ b/po/ja/install-methods.po
@@ -882,13 +882,11 @@ msgstr ""
 #, no-c-format
 #| msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 msgid ""
-"# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</"
-"replaceable>\n"
-"# sync"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 msgstr ""
-"# cat <replaceable>debian.iso</replaceable> &gt; /dev/<replaceable>sdX</"
-"replaceable>\n"
-"# sync"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 
 #. Tag: title
 #: install-methods.xml:601
diff --git a/po/ko/install-methods.po b/po/ko/install-methods.po
index a45c4675e..8ba8857ed 100644
--- a/po/ko/install-methods.po
+++ b/po/ko/install-methods.po
@@ -497,13 +497,13 @@ msgstr "설치프로그램을 실시하는 USB 메모리를 준비하려면, 네
 #, no-c-format
 msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini.iso</filename> file can be written to a USB stick as follows: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this way, obtain the necessary firmware files. See <xref linkend=\"loading-firmware\"/> for more information. Now unplug and replug the USB stick, and two partitions should now be visible on it. You should mount the second of the two partitions, and unpack the firmware onto it."
 msgstr ""
 "예를 들어, 기존의 GNU/Linux 시스템을 사용하는 경우, <filename>mini.iso</filename>파일이 다음과 같이 USB 스틱에 기록하실 수 있습니다.<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> 이러한 방법으로 USB 스틱에 준비해 펌웨어를 추가하려면 필요한 펌웨어 파일을 구하십시오. 자세한 내용은 <xref linkend=\"loading-firmware\"/>를 참조하십시오. 이제 USB스틱을 분리 및 재연결 하고, 두 파티션은 지금 표시해야합니다. 당신이 두 파티션의 두 번째를 탑재하고, 펌웨어를 풀어야합니다."
 
 #. Tag: screen
diff --git a/po/pt/install-methods.po b/po/pt/install-methods.po
index 586e4f597..4d3707144 100644
--- a/po/pt/install-methods.po
+++ b/po/pt/install-methods.po
@@ -852,8 +852,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
@@ -863,8 +863,8 @@ msgstr ""
 "Por exemplo, ao utilizar um sistema GNU/Linux existente, o ficheiro "
 "<filename>mini.iso</filename> pode ser escrito numa 'pen' USB da seguinte "
 "forma: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> Para acrescentar firmware a uma 'pen' USB "
 "preparada desta forma, obtenha os ficheiros de firmware necessários. Veja "
 "<xref linkend=\"loading-firmware\"/> para mais informações. De seguida "
diff --git a/po/ru/install-methods.po b/po/ru/install-methods.po
index 2560114f8..ff48953d7 100644
--- a/po/ru/install-methods.po
+++ b/po/ru/install-methods.po
@@ -838,8 +838,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
@@ -848,8 +848,8 @@ msgid ""
 msgstr ""
 "Например, используя имеющуюся систему GNU/Linux, файл <filename>mini.iso</"
 "filename> можно записать на карту памяти USB так: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> Чтобы добавить на созданную таким образом карту "
 "памяти USB, сначала нужно их получить. Подробности смотрите в <xref linkend="
 "\"loading-firmware\"/>. Сейчас выдерните и снова вставьте карту памяти USB, "
diff --git a/po/sv/install-methods.po b/po/sv/install-methods.po
index c24239da2..810c473ca 100644
--- a/po/sv/install-methods.po
+++ b/po/sv/install-methods.po
@@ -421,8 +421,8 @@ msgstr "För den första installationsmetoden kommer du att behöva hämta ner e
 #, no-c-format
 msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini.iso</filename> file can be written to a USB stick as follows: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this way, obtain the necessary firmware files. See <xref linkend=\"loading-firmware\"/> for more information. Now unplug and replug the USB stick, and two partitions should now be visible on it. You should mount the second of the two partitions, and unpack the firmware onto it."
 msgstr ""
 
diff --git a/po/vi/install-methods.po b/po/vi/install-methods.po
index aaf10f8de..1ebd4abda 100644
--- a/po/vi/install-methods.po
+++ b/po/vi/install-methods.po
@@ -836,8 +836,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
@@ -847,8 +847,8 @@ msgstr ""
 "Chẳng hạn, khi sử dụng một hệ thống GNU/Linux đã có, tập tin <filename>mini."
 "iso</filename> có thể được ghi vào một thanh USB như theo đây: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> Để thêm phần vững vào một thanh USB được chuẩn "
 "bị bằng cách này, trước tiên lấy những tập tin phần vững cần thiết. Xem "
 "<xref linkend=\"loading-firmware\"/> để tìm thêm thông tin. Sau đó, tháo ra "
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 574d6c7f1..802adbff5 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -767,8 +767,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "
@@ -777,8 +777,8 @@ msgid ""
 msgstr ""
 "例如，当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
 "可以写如到一个 U 盘里面: <informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> 要将固件(firmware)加入到这个 U 盘，需要先取得固件"
 "文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
 "U 盘，就可以看到有两个分区在上面。您应挂载第二个分区，然后将固件解开放在上"
diff --git a/po/zh_TW/install-methods.po b/po/zh_TW/install-methods.po
index 63d1946c0..d7094a221 100644
--- a/po/zh_TW/install-methods.po
+++ b/po/zh_TW/install-methods.po
@@ -743,8 +743,8 @@ msgid ""
 "For example, when using an existing GNU/Linux system, the <filename>mini."
 "iso</filename> file can be written to a USB stick as follows: "
 "<informalexample><screen>\n"
-"# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>\n"
-"# sync\n"
+"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> of=/dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>\n"
 "</screen></informalexample> To add firmware to a USB stick prepared in this "
 "way, obtain the necessary firmware files. See <xref linkend=\"loading-"
 "firmware\"/> for more information. Now unplug and replug the USB stick, and "