summaryrefslogtreecommitdiffstats
path: root/wiki/src/doc/first_steps
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-25 18:59:04 +0000
committerTails developers <amnesia@boum.org>2015-01-25 19:07:24 +0000
commite5503ac1acc6ee13137ba7cc5452269afe241815 (patch)
tree58fcebc30d9b1522a22119684257d8134890817b /wiki/src/doc/first_steps
parent2221a725985c44e88146460cef6969589f9b3e25 (diff)
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
Diffstat (limited to 'wiki/src/doc/first_steps')
-rw-r--r--wiki/src/doc/first_steps/installation/manual/linux.mdwn2
-rw-r--r--wiki/src/doc/first_steps/installation/manual/mac.mdwn6
-rw-r--r--wiki/src/doc/first_steps/installation/manual/windows.mdwn2
-rw-r--r--wiki/src/doc/first_steps/reset/linux.mdwn2
-rw-r--r--wiki/src/doc/first_steps/reset/windows.mdwn2
-rw-r--r--wiki/src/doc/first_steps/start_tails.mdwn2
6 files changed, 8 insertions, 8 deletions
diff --git a/wiki/src/doc/first_steps/installation/manual/linux.mdwn b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
index dee39aa..737896a 100644
--- a/wiki/src/doc/first_steps/installation/manual/linux.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/linux.mdwn
@@ -57,7 +57,7 @@ following:
<div class="caution">
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>.
</div>
diff --git a/wiki/src/doc/first_steps/installation/manual/mac.mdwn b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
index 2919dbf..3aa8e18 100644
--- a/wiki/src/doc/first_steps/installation/manual/mac.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/mac.mdwn
@@ -65,11 +65,11 @@ Yours are probably different.
<div class="caution">
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>
-<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]`
with the device name found in step 1.
@@ -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>
-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.
</div>
diff --git a/wiki/src/doc/first_steps/installation/manual/windows.mdwn b/wiki/src/doc/first_steps/installation/manual/windows.mdwn
index 47c6ff5..6988a15 100644
--- a/wiki/src/doc/first_steps/installation/manual/windows.mdwn
+++ b/wiki/src/doc/first_steps/installation/manual/windows.mdwn
@@ -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"]]
-### 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"]]
diff --git a/wiki/src/doc/first_steps/reset/linux.mdwn b/wiki/src/doc/first_steps/reset/linux.mdwn
index 5b23230..191d119 100644
--- a/wiki/src/doc/first_steps/reset/linux.mdwn
+++ b/wiki/src/doc/first_steps/reset/linux.mdwn
@@ -11,7 +11,7 @@ Using <span class="application">GNOME Disk Utility</span>
<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.
</div>
diff --git a/wiki/src/doc/first_steps/reset/windows.mdwn b/wiki/src/doc/first_steps/reset/windows.mdwn
index ce025cf..c1e069e 100644
--- a/wiki/src/doc/first_steps/reset/windows.mdwn
+++ b/wiki/src/doc/first_steps/reset/windows.mdwn
@@ -14,7 +14,7 @@ Using <span class="application">Diskpart</span>
<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.
</div>
diff --git a/wiki/src/doc/first_steps/start_tails.mdwn b/wiki/src/doc/first_steps/start_tails.mdwn
index 7ab2fc4..a5e4f9c 100644
--- a/wiki/src/doc/first_steps/start_tails.mdwn
+++ b/wiki/src/doc/first_steps/start_tails.mdwn
@@ -8,7 +8,7 @@ Tails without altering your existing operating system.
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.
If you don't get this menu, you can consult the Ubuntu documentation about