Commit 6e7be391 authored by Tails developers's avatar Tails developers
Browse files

doc: Rework resetting instructions.

parent e43e1b58
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-03-23 13:56+0100\n" "POT-Creation-Date: 2012-03-24 20:21+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -18,10 +18,8 @@ msgstr "" ...@@ -18,10 +18,8 @@ msgstr ""
#. type: Plain text #. type: Plain text
msgid "" msgid ""
"After installing Tails (both [[manually|manual_usb_installation]] and " "To erase Tails from a USB stick, and use it for something else, you have to "
"[[using the USB installer|usb_installer]]), you will end up with a USB stick " "reset it."
"in a weird state, and you might want to reset it, and use it for something "
"else."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
...@@ -31,10 +29,3 @@ msgid "" ...@@ -31,10 +29,3 @@ msgid ""
"might still be able to tell that Tails was installed on the USB stick using\n" "might still be able to tell that Tails was installed on the USB stick using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n" "[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n"
msgstr "" msgstr ""
#. type: Plain text
msgid ""
"If at some point you are not sure about the device name it is recommended to "
"stop proceeding otherwise **you might risk overwriting any hard drive on the "
"system**."
msgstr ""
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-03-23 13:56+0100\n" "POT-Creation-Date: 2012-03-24 20:21+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -18,10 +18,8 @@ msgstr "" ...@@ -18,10 +18,8 @@ msgstr ""
#. type: Plain text #. type: Plain text
msgid "" msgid ""
"After installing Tails (both [[manually|manual_usb_installation]] and " "To erase Tails from a USB stick, and use it for something else, you have to "
"[[using the USB installer|usb_installer]]), you will end up with a USB stick " "reset it."
"in a weird state, and you might want to reset it, and use it for something "
"else."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
...@@ -31,10 +29,3 @@ msgid "" ...@@ -31,10 +29,3 @@ msgid ""
"might still be able to tell that Tails was installed on the USB stick using\n" "might still be able to tell that Tails was installed on the USB stick using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n" "[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n"
msgstr "" msgstr ""
#. type: Plain text
msgid ""
"If at some point you are not sure about the device name it is recommended to "
"stop proceeding otherwise **you might risk overwriting any hard drive on the "
"system**."
msgstr ""
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-03-23 13:56+0100\n" "POT-Creation-Date: 2012-03-24 20:21+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -18,10 +18,8 @@ msgstr "" ...@@ -18,10 +18,8 @@ msgstr ""
#. type: Plain text #. type: Plain text
msgid "" msgid ""
"After installing Tails (both [[manually|manual_usb_installation]] and " "To erase Tails from a USB stick, and use it for something else, you have to "
"[[using the USB installer|usb_installer]]), you will end up with a USB stick " "reset it."
"in a weird state, and you might want to reset it, and use it for something "
"else."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
...@@ -31,10 +29,3 @@ msgid "" ...@@ -31,10 +29,3 @@ msgid ""
"might still be able to tell that Tails was installed on the USB stick using\n" "might still be able to tell that Tails was installed on the USB stick using\n"
"[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n" "[[data recovery techniques|encryption_and_privacy/secure_deletion]].\n"
msgstr "" msgstr ""
#. type: Plain text
msgid ""
"If at some point you are not sure about the device name it is recommended to "
"stop proceeding otherwise **you might risk overwriting any hard drive on the "
"system**."
msgstr ""
...@@ -4,7 +4,3 @@ reset it. ...@@ -4,7 +4,3 @@ reset it.
**The content of the USB stick will be lost in the operation,** but an attacker **The content of the USB stick will be lost in the operation,** but an attacker
might still be able to tell that Tails was installed on the USB stick using might still be able to tell that Tails was installed on the USB stick using
[[data recovery techniques|encryption_and_privacy/secure_deletion]]. [[data recovery techniques|encryption_and_privacy/secure_deletion]].
If at some point you are not sure about the device name it is recommended to
stop proceeding otherwise **you might risk overwriting any hard drive on the
system**.
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-03-23 13:58+0100\n" "POT-Creation-Date: 2012-03-24 20:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -28,117 +28,134 @@ msgstr "" ...@@ -28,117 +28,134 @@ msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!toc levels=2]]\n" msgid "[[!toc levels=1]]\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Title =
#, no-wrap #, no-wrap
msgid "<h2 class=\"bullet-number-one\">Select the device of the USB stick</h2>\n" msgid "Using <span class=\"application\">GNOME Disk Utility</span>\n"
msgstr ""
#. type: Plain text
msgid "Unplug the USB stick you want to reset."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"Open the Gnome disk utility from the menu *Applications* → *System Tools* → " "<div class=\"caution\">\n"
"*Disk Utility*:" "<strong>You might overwrite any hard drive on the computer.</strong> If at some\n"
"point you are not sure about which device to choose, stop proceeding.\n"
"</div>\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '1. '
#, no-wrap msgid "Make sure that the USB stick that you want to reset is unplugged."
msgid "[[!img doc/installing_onto_a_usb_stick/linux/gnome_disk_utility.png link=no alt=\"Applications → System Tools → Disk Utility\"]]\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"The disk utility will list all the current storage devices on the left side " "2. Choose\n"
"of the screen:" " <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
" to start <span class=\"application\">GNOME Disk Utility</span>.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!img doc/installing_onto_a_usb_stick/linux/storage_devices.png link=no alt=\"Storage devices, including USB peripherals\"]]\n" msgid ""
" A list of all the storage devices on the computer appears in the left pane\n"
" of the window.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '3. '
msgid "" msgid "Plug the USB stick that you want to reset."
"Plug back the destination USB stick. A new device should appear in the list "
"of storage devices. Select it with the cursor:"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!img doc/installing_onto_a_usb_stick/linux/destination_device.png link=no alt=\"A new storage device appeared at the end of the list\"]]\n" msgid ""
" A new device appears in the list of storage devices in the left pane of the\n"
" window. This new device corresponds to the USB stick that you plugged in.\n"
" Click on it.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '4. '
msgid "" msgid ""
"Check that the description of the device corresponds to your destination USB " "In the right pane of the window, verify that the device correspond to the "
"stick, its brand, its size, etc. on the right side of the screen." "USB stick that you want to reset, its brand, its size, etc."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '5. '
#, no-wrap msgid ""
msgid "[[!img doc/installing_onto_a_usb_stick/linux/destination_device_description.png link=no alt=\"Drive description containing: 'Device: /dev/sdc'\"]]\n" "To reset the device, click on the <span class=\"button\">Format the drive</"
"span> button."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '6. '
msgid "" msgid ""
"On this screenshot, the destination USB stick is a Kingston DataTraveler of " "In the popup window, choose <span class=\"guilabel\">Master Boot Record</"
"2.0 GB. Yours could be different." "span> from the <span class=\"guilabel\">Scheme</span> drop-down list. Then "
"click on the <span class=\"button\">Format</span> button."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '7. '
#, no-wrap msgid ""
msgid "<h2 class=\"bullet-number-two\">Do the actual reset</h2>\n" "In the confirmation dialog, click on the <span class=\"button\">Format</"
"span> button to confirm."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '8. '
msgid "" msgid ""
"Click *Format Drive* on the right side of the screen. In the *Format* dialog " "To make sure that all the changes are written to the USB stick, click on the "
"box that pops up, select the *Master Boot Record* scheme, then confirm as " "<span class=\"button\">Safe Removal</span> button in the right pane."
"many times as needed by clicking the *Format* button."
msgstr "" msgstr ""
#. type: Plain text #. type: Title =
#, no-wrap #, no-wrap
msgid "<h2 class=\"bullet-number-three\">Make sure all changes are written to the USB stick</h2>\n" msgid "Resetting a Tails USB stick from itself\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
msgid "" msgid ""
"Click *Safe Removal* on the right side of the screen. This makes sure all " "If Tails is your only Linux system, you can generally reset a Tails USB "
"changes are written to the USB stick." "stick directly from that USB stick running Tails."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '1. '
#, no-wrap msgid ""
msgid "<h2 class=\"bullet-number-four\">Resetting a Tails USB stick from itself</h2>\n" "When starting Tails, add the <span class=\"command\">toram</span> boot "
"parameter."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"If you have no Linux system other than Tails, you can generally **reset a " " To do so, when the boot menu appears, press <span class=\"key\">Tab</span>. A\n"
"Tails USB stick from that running Tails system itself**." " list of boot options appears at the bottom of the screen. Press <span\n"
" class=\"key\">Space</span>, and type <span class=\"command\">toram</span>. Then\n"
" press <span class=\"key\">Enter</span> to start Tails.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"To do so, add the `toram` boot parameter: in the graphical boot menu, press " " <!--\n"
"`TAB`, then press `Space`, then add the `toram` parameter to the boot " " FIXME: link to a general doc about the boot menu\n"
"command line, then press `Enter`." " -->\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '2. '
msgid "" msgid ""
"If the system boots properly, just follow the instructions on this page." "If Tails starts as usual, follow the instructions for [[resetting a USB "
"stick using <span class=\"application\">Disk Utility</span>|"
"resetting_a_usb_stick#index2h1]]."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"Else, the computer you are using has not enough memory (RAM) for this " " **If the system fails to start**, that means that the computer does not have\n"
"operation mode, and you may retry on another computer, or find another Linux " " enough memory for this operation mode. Try with another computer, or find\n"
"system (such as another Tails USB stick) to perform the reset from." " another Linux system, such as another Tails USB stick, to do the reset from.\n"
msgstr "" msgstr ""
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-03-23 13:58+0100\n" "POT-Creation-Date: 2012-03-24 20:46+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -28,117 +28,134 @@ msgstr "" ...@@ -28,117 +28,134 @@ msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!toc levels=2]]\n" msgid "[[!toc levels=1]]\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Title =
#, no-wrap #, no-wrap
msgid "<h2 class=\"bullet-number-one\">Select the device of the USB stick</h2>\n" msgid "Using <span class=\"application\">GNOME Disk Utility</span>\n"
msgstr ""
#. type: Plain text
msgid "Unplug the USB stick you want to reset."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"Open the Gnome disk utility from the menu *Applications* → *System Tools* → " "<div class=\"caution\">\n"
"*Disk Utility*:" "<strong>You might overwrite any hard drive on the computer.</strong> If at some\n"
"point you are not sure about which device to choose, stop proceeding.\n"
"</div>\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '1. '
#, no-wrap msgid "Make sure that the USB stick that you want to reset is unplugged."
msgid "[[!img doc/installing_onto_a_usb_stick/linux/gnome_disk_utility.png link=no alt=\"Applications → System Tools → Disk Utility\"]]\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"The disk utility will list all the current storage devices on the left side " "2. Choose\n"
"of the screen:" " <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">System Tools</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Disk Utility</span>\n"
" </span>\n"
" to start <span class=\"application\">GNOME Disk Utility</span>.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!img doc/installing_onto_a_usb_stick/linux/storage_devices.png link=no alt=\"Storage devices, including USB peripherals\"]]\n" msgid ""
" A list of all the storage devices on the computer appears in the left pane\n"
" of the window.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '3. '
msgid "" msgid "Plug the USB stick that you want to reset."
"Plug back the destination USB stick. A new device should appear in the list "
"of storage devices. Select it with the cursor:"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "[[!img doc/installing_onto_a_usb_stick/linux/destination_device.png link=no alt=\"A new storage device appeared at the end of the list\"]]\n" msgid ""
" A new device appears in the list of storage devices in the left pane of the\n"
" window. This new device corresponds to the USB stick that you plugged in.\n"
" Click on it.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '4. '
msgid "" msgid ""
"Check that the description of the device corresponds to your destination USB " "In the right pane of the window, verify that the device correspond to the "
"stick, its brand, its size, etc. on the right side of the screen." "USB stick that you want to reset, its brand, its size, etc."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '5. '
#, no-wrap msgid ""
msgid "[[!img doc/installing_onto_a_usb_stick/linux/destination_device_description.png link=no alt=\"Drive description containing: 'Device: /dev/sdc'\"]]\n" "To reset the device, click on the <span class=\"button\">Format the drive</"
"span> button."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '6. '
msgid "" msgid ""
"On this screenshot, the destination USB stick is a Kingston DataTraveler of " "In the popup window, choose <span class=\"guilabel\">Master Boot Record</"
"2.0 GB. Yours could be different." "span> from the <span class=\"guilabel\">Scheme</span> drop-down list. Then "
"click on the <span class=\"button\">Format</span> button."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '7. '
#, no-wrap msgid ""
msgid "<h2 class=\"bullet-number-two\">Do the actual reset</h2>\n" "In the confirmation dialog, click on the <span class=\"button\">Format</"
"span> button to confirm."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '8. '
msgid "" msgid ""
"Click *Format Drive* on the right side of the screen. In the *Format* dialog " "To make sure that all the changes are written to the USB stick, click on the "
"box that pops up, select the *Master Boot Record* scheme, then confirm as " "<span class=\"button\">Safe Removal</span> button in the right pane."
"many times as needed by clicking the *Format* button."
msgstr "" msgstr ""
#. type: Plain text #. type: Title =
#, no-wrap #, no-wrap
msgid "<h2 class=\"bullet-number-three\">Make sure all changes are written to the USB stick</h2>\n" msgid "Resetting a Tails USB stick from itself\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
msgid "" msgid ""
"Click *Safe Removal* on the right side of the screen. This makes sure all " "If Tails is your only Linux system, you can generally reset a Tails USB "
"changes are written to the USB stick." "stick directly from that USB stick running Tails."
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '1. '
#, no-wrap msgid ""
msgid "<h2 class=\"bullet-number-four\">Resetting a Tails USB stick from itself</h2>\n" "When starting Tails, add the <span class=\"command\">toram</span> boot "
"parameter."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"If you have no Linux system other than Tails, you can generally **reset a " " To do so, when the boot menu appears, press <span class=\"key\">Tab</span>. A\n"
"Tails USB stick from that running Tails system itself**." " list of boot options appears at the bottom of the screen. Press <span\n"
" class=\"key\">Space</span>, and type <span class=\"command\">toram</span>. Then\n"
" press <span class=\"key\">Enter</span> to start Tails.\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"To do so, add the `toram` boot parameter: in the graphical boot menu, press " " <!--\n"
"`TAB`, then press `Space`, then add the `toram` parameter to the boot " " FIXME: link to a general doc about the boot menu\n"
"command line, then press `Enter`." " -->\n"
msgstr "" msgstr ""
#. type: Plain text #. type: Bullet: '2. '
msgid "" msgid ""
"If the system boots properly, just follow the instructions on this page." "If Tails starts as usual, follow the instructions for [[resetting a USB "
"stick using <span class=\"application\">Disk Utility</span>|"
"resetting_a_usb_stick#index2h1]]."
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
#, no-wrap
msgid "" msgid ""
"Else, the computer you are using has not enough memory (RAM) for this " " **If the system fails to start*