summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-07-07 14:35:58 +0000
committersajolida <sajolida@pimienta.org>2015-07-07 14:35:58 +0000
commit65c5d60212155b62b28c8ab7040637ff77204fb9 (patch)
tree07f75e27762b07c141793040f61de16d49e0721e
parent475d2f82ccee5ce668777428ae69af01db383526 (diff)
parent799193a7635118d949550854d1b084475bd9fb17 (diff)
Merge branch 'doc/9058-reset-osx' (Closes: #9058)
-rw-r--r--wiki/src/doc/first_steps.index.mdwn13
-rw-r--r--wiki/src/doc/first_steps/reset/mac.mdwn37
2 files changed, 44 insertions, 6 deletions
diff --git a/wiki/src/doc/first_steps.index.mdwn b/wiki/src/doc/first_steps.index.mdwn
index f69cca5..677dd87 100644
--- a/wiki/src/doc/first_steps.index.mdwn
+++ b/wiki/src/doc/first_steps.index.mdwn
@@ -1,13 +1,14 @@
- [[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]
- [[!traillink Burning_a_DVD|first_steps/dvd]]
- [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)
- - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],
+ - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]]
using [[!traillink Linux|first_steps/installation/manual/linux]],
- using [[!traillink Windows|first_steps/installation/manual/windows]],
- using [[!traillink Mac|first_steps/installation/manual/mac]]
- - Uninstalling Tails or resetting a USB stick or SD card,
- using [[!traillink Linux|first_steps/reset/linux]],
- using [[!traillink Windows|first_steps/reset/windows]]
+ [[!traillink Windows|first_steps/installation/manual/windows]],
+ or [[!traillink Mac|first_steps/installation/manual/mac]]
+ - Uninstalling Tails or resetting a USB stick or SD card
+ using [[!traillink Linux|first_steps/reset/linux]]
+ [[!traillink Windows|first_steps/reset/windows]],
+ or [[!traillink Mac|first_steps/reset/mac]]
- [[!traillink Upgrading_a_Tails_USB_stick_or_SD_card|first_steps/upgrade]]
- [[!traillink Start_Tails|first_steps/start_tails]]
- [[!traillink Startup_options|first_steps/startup_options]]
diff --git a/wiki/src/doc/first_steps/reset/mac.mdwn b/wiki/src/doc/first_steps/reset/mac.mdwn
new file mode 100644
index 0000000..2217888
--- /dev/null
+++ b/wiki/src/doc/first_steps/reset/mac.mdwn
@@ -0,0 +1,37 @@
+[[!meta title="Resetting a USB stick or SD card using Mac OSX"]]
+
+[[!inline pages="doc/first_steps/usb_reset.intro" raw="yes"]]
+
+<a id="disk_utility"></a>
+
+Using <span class="application">Disk Utility</span>
+===================================================
+
+<div class="caution">
+
+<strong>You might overwrite any hard disk on the computer.</strong> If at some
+point you are not sure about which device to choose, stop proceeding.
+
+</div>
+
+1. Make sure that the USB stick or SD card that you want to reset is unplugged.
+
+2. Start <span class="application">Disk Utility</span>.
+
+ A list of all the storage devices on the computer appears in the left pane
+ of the window.
+
+3. Plug the USB stick or SD card that you want to reset.
+
+ A new device appears in the list of storage devices. This new device
+ corresponds to the USB stick or SD card that you plugged in. Click on it.
+
+4. In the list of storage devices, verify that the device corresponds
+ to the device that you want to reset, its brand, its size, etc.
+
+5. To reset the device, click on the <span class="guilabel">Erase</span> tab
+ in the right pane and click on the <span class="button">Erase</span> button
+ on the bottom right.
+
+6. In the confirmation dialog, click on the <span class="button">Erase</span>
+ button to confirm.