Commit e5503ac1 authored by Tails developers's avatar Tails developers
Browse files

Distringuish 'drive' and 'disk' in terminology

According to GNOME and Microsoft documentation guidelines, data is written on a 'hard disk' (or 'disk').
While 'drive' is the generic term for the physical object as in 'CD drive' (without hyphen).

Conflicts:
	wiki/src/doc/encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked.mdwn
parent 2221a725
...@@ -32,16 +32,16 @@ desc="Wikipedia: %s"]].</p> ...@@ -32,16 +32,16 @@ desc="Wikipedia: %s"]].</p>
<a id="usb_and_ssd"></a> <a id="usb_and_ssd"></a>
Warning about USB sticks and solid-state drives Warning about USB sticks and solid-state disks
=============================================== ==============================================
**The methods described below will not work as expected on USB sticks and **The methods described below will not work as expected on USB sticks and
solid-state drives.** solid-state disks.**
- The existing hard drive-oriented techniques for secure deletion of - The existing hard disk-oriented techniques for secure deletion of
individual files are not effective. individual files are not effective.
- Overwriting twice the entire drive is usually, but not always, - Overwriting twice the entire disk is usually, but not always,
sufficient to securely clean the drive. sufficient to securely clean the disk.
<div class="caution"> <div class="caution">
...@@ -90,7 +90,7 @@ the free space on the disk. ...@@ -90,7 +90,7 @@ the free space on the disk.
<div class="caution"> <div class="caution">
This method does not work as expected on solid-state drives or USB sticks. This method does not work as expected on solid-state disks or USB sticks.
</div> </div>
......
...@@ -5,8 +5,8 @@ computer you're using unless you ask it explicitly. It is important ...@@ -5,8 +5,8 @@ computer you're using unless you ask it explicitly. It is important
to understand some of the consequences of that. to understand some of the consequences of that.
Starting a computer on a media containing Tails doesn't change anything on the Starting a computer on a media containing Tails doesn't change anything on the
operating system actually installed on your hard drive: as a live system, Tails operating system actually installed on your hard disk: as a live system, Tails
doesn't need to use your hard drive during the whole session. Be your hard drive absent doesn't need to use your hard disk during the whole session. Be your hard disk absent
or damaged, it wouldn't prevent your computer to start Tails. Consequently, or damaged, it wouldn't prevent your computer to start Tails. Consequently,
removing the DVD or USB stick containing Tails is enough to retrieve your usual removing the DVD or USB stick containing Tails is enough to retrieve your usual
operating system. operating system.
...@@ -14,5 +14,3 @@ operating system. ...@@ -14,5 +14,3 @@ operating system.
You should save anything you want to keep for later access into a You should save anything you want to keep for later access into a
separate device (other USB stick, other DVD or any device you would choose), separate device (other USB stick, other DVD or any device you would choose),
or use the [[persistence feature|first_steps/persistence]]. or use the [[persistence feature|first_steps/persistence]].
...@@ -57,7 +57,7 @@ following: ...@@ -57,7 +57,7 @@ following:
<div class="caution"> <div class="caution">
If you are not sure about the device name, you should stop If you are not sure about the device name, you should stop
proceeding or <strong>you risk overwriting any hard drive on the proceeding or <strong>you risk overwriting any hard disk on the
system</strong>. system</strong>.
</div> </div>
......
...@@ -65,11 +65,11 @@ Yours are probably different. ...@@ -65,11 +65,11 @@ Yours are probably different.
<div class="caution"> <div class="caution">
If you are not sure about the device name you should stop proceeding or If you are not sure about the device name you should stop proceeding or
<strong>you risk overwriting any hard drive on the system</strong>. <strong>you risk overwriting any hard disk on the system</strong>.
</div> </div>
<h2 class="bullet-number-two">Unmount the USB drive</h2> <h2 class="bullet-number-two">Unmount the USB stick</h2>
Execute the following command, replacing `[device]` Execute the following command, replacing `[device]`
with the device name found in step 1. with the device name found in step 1.
...@@ -134,7 +134,7 @@ If you get a "Permission denied" error, try executing the command with ...@@ -134,7 +134,7 @@ If you get a "Permission denied" error, try executing the command with
<pre>sudo dd if=[tails.iso] of=[device]</pre> <pre>sudo dd if=[tails.iso] of=[device]</pre>
Be careful, if the device name is wrong you might overwriting any hard drive on Be careful, if the device name is wrong you might overwriting any hard disk on
the system. the system.
</div> </div>
......
...@@ -33,7 +33,7 @@ You will need version 1.9.5.4 or later. ...@@ -33,7 +33,7 @@ You will need version 1.9.5.4 or later.
[[!img windows/05-browse-iso.png link=no alt="Step 2: Select your tails*.iso"]] [[!img windows/05-browse-iso.png link=no alt="Step 2: Select your tails*.iso"]]
### Choose the USB drive ### Choose the USB stick
[[!img windows/06-choose-drive.png link=no alt="Step 3: Select your USB Flash Drive Letter Only"]] [[!img windows/06-choose-drive.png link=no alt="Step 3: Select your USB Flash Drive Letter Only"]]
......
...@@ -11,7 +11,7 @@ Using <span class="application">GNOME Disk Utility</span> ...@@ -11,7 +11,7 @@ Using <span class="application">GNOME Disk Utility</span>
<div class="caution"> <div class="caution">
<strong>You might overwrite any hard drive on the computer.</strong> If at some <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. point you are not sure about which device to choose, stop proceeding.
</div> </div>
......
...@@ -14,7 +14,7 @@ Using <span class="application">Diskpart</span> ...@@ -14,7 +14,7 @@ Using <span class="application">Diskpart</span>
<div class="caution"> <div class="caution">
<strong>You might overwrite any hard drive on the computer.</strong><br/> <strong>You might overwrite any hard disk on the computer.</strong><br/>
If at some point you are not sure about the disk number, stop proceeding. If at some point you are not sure about the disk number, stop proceeding.
</div> </div>
......
...@@ -8,7 +8,7 @@ Tails without altering your existing operating system. ...@@ -8,7 +8,7 @@ Tails without altering your existing operating system.
If you are using a DVD If you are using a DVD
====================== ======================
Put the Tails DVD into the CD/DVD-drive and restart the computer. You should see Put the Tails DVD into the CD/DVD drive and restart the computer. You should see
a welcome screen prompting you to choose your language. a welcome screen prompting you to choose your language.
If you don't get this menu, you can consult the Ubuntu documentation about If you don't get this menu, you can consult the Ubuntu documentation about
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment