Commit 0dc408bf authored by sajolida's avatar sajolida
Browse files

Merge branch 'web/105454-proof-read'

parents d181cb78 5544fd79
......@@ -13,4 +13,6 @@
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -13,4 +13,6 @@
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -28,7 +28,7 @@ key.</p>
<p>To learn how to create yourself an OpenPGP key, see
<a href="https://help.riseup.net/en/security/message-security/openpgp/gpg-keys">Managing
OpenPGP Keys</a> by Riseup.</p>
OpenPGP Keys</a> by <em>Riseup</em>.</p>
</div>
......@@ -121,4 +121,6 @@ using the Tails signing key.
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -4,7 +4,7 @@ Create an encrypted persistent storage (optional)
<div class="step-image">[[!img inc/infography/create-persistence.png link="no"]]</div>
You can optionally create an *encrypted persistent storage* in the
remaining free space on the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> Tails USB stick to store any of the
remaining free space on the <span class="windows-usb linux-usb mac-usb">final</span><span class="clone">new</span> Tails USB stick to store any of the
following:
- Your personal files and working documents
......@@ -19,13 +19,6 @@ The data in the encrypted persistent storage:
Once the encrypted persistent storage is created, you can choose whether
to activate it or not each time you start Tails.
<div class="tip">
<p>If you don't want to store any data in Tails you can stop following
these instructions and start enjoying Tails right now.</p>
</div>
<div class="caution">
<p>The encrypted persistent storage is not hidden. An attacker in possession of
......@@ -61,9 +54,9 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
rather than a single password. For example, "<em>bank violin thread duck knob
train</em>" is a very strong passphrase.</p>
<p>To learn how to choose a good passphrase, read
<p>To learn how to choose a good passphrase, you can read
<a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">this
article from The Intercept</a>.</p>
article from <em>The Intercept</em></a>.</p>
</div>
3. Wait for the creation to finish.
......@@ -72,8 +65,7 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<p>If the creation is interrupted before it finishes, you might not
be able to start Tails from this USB stick anymore. This can happen if you
close the window of the assistant or unplug the USB stick during the creation of
the encrypted persistent storage. Reinstall Tails from the
<span class="usb">temporary</span><span class="clone">other</span> Tails <span class="dvd">DVD</span> to fix this issue.</p>
the encrypted persistent storage. Reinstall Tails on this USB stick to fix this issue.</p>
</div>
4. The assistant shows a list of the possible persistence features. Each
......@@ -98,7 +90,7 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<div class="step-image">[[!img inc/infography/restart-on-tails.png link="no"]]</div>
1. Shut down the computer and restart on <span class="windows-usb linux-usb mac-usb">the final</span><span class="clone">the new</span> Tails<span class="dvd"> USB stick</span>.
1. Shut down the computer and restart on <span class="windows-usb linux-usb mac-usb">the final</span><span class="clone">the new</span><span class="debian-usb expert dvd">the</span> Tails USB stick.
1. In *Tails Greeter*:
......@@ -126,7 +118,8 @@ it but the changes are not be saved.
<span class="guimenu">Places</span>&nbsp;▸
<span class="guimenuitem">Persistent</span></span>.
<div class="state-image usb clone">[[!img inc/infography/final-tails-with-persistence.png link="no"]]</div>
<div class="state-image debian-usb expert">[[!img inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image windows-usb linux-usb mac-usb clone">[[!img inc/infography/final-tails-with-persistence.png link="no"]]</div>
<div class="state-image dvd">[[!img inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="trophy" id="recommendations">
......
......@@ -23,12 +23,12 @@ using <span class="application">Tails Installer</span>.</p>
<div class="step-image">
[[!img inc/infography/plug-usb.png link="no" class="debian-usb"]]
[[!img inc/infography/plug-second-usb.png link="no" class="windows-usb linux-usb mac-usb debian-clone windows-clone linux-clone mac-clone"]]
[[!img inc/infography/plug-second-usb.png link="no" class="windows-usb linux-usb mac-usb install-clone mac-clone"]]
[[!img inc/infography/plug-tails-usb.png link="no" class="dvd"]]
[[!img inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails"]]
</div>
1. Plug <span class="windows-usb linux-usb mac-usb">the second</span><span class="debian-clone windows-clone linux-clone mac-clone">the new</span><span class="upgrade">your Tails</span> USB stick in the computer.
1. Plug <span class="windows-usb linux-usb mac-usb">the second</span><span class="install-clone mac-clone">the new</span><span class="upgrade">your Tails</span><span class="debian-usb expert dvd">the</span> USB stick in the computer.
1. <div class="windows linux mac upgrade install-clone"><p>
Choose
......@@ -65,16 +65,16 @@ using <span class="application">Tails Installer</span>.</p>
Choose
<span class="windows-usb linux-usb mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="debian upgrade-clone">your</span>
<span class="debian-usb expert dvd upgrade-clone">your</span>
USB stick in the <span class="guilabel">Target Device</span> drop-down list.
1. To start the <span class="debian windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span>, click on the <span
1. To start the <span class="debian expert windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span>, click on the <span
class="button">Install Tails</span> button.
1. Read the warning message in the pop-up window. Click <span
class="button">Yes</span> to confirm.
The <span class="debian windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span> takes a few minutes.
The <span class="debian expert windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span> takes a few minutes.
<div class="bug">
<p>The progress bar usually freezes for some time around 95 percent
......@@ -83,12 +83,9 @@ using <span class="application">Tails Installer</span>.</p>
1. Close <span class="application">Tails Installer</span>.
<div class="state-image usb">[[!img inc/infography/final-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img inc/infography/new-tails.png link="no"]]</div>
<div class="trophy upgrade">
<p>You are done upgrading Tails. You can now shutdown and restart on your Tais USB stick.</p>
<p>You are done upgrading Tails. You can now shutdown and restart on your Tails USB stick.</p>
<p>Thank you for staying safe!</p>
......
......@@ -34,7 +34,7 @@ Installer</span>.</p>
echo "deb http://deb.tails.boum.org/ feature-jessie main" | \
sudo tee /etc/apt/sources.list.d/tails.list
1. Installer the <span class="code">tails-installer</span> package:
1. Install the <span class="code">tails-installer</span> package:
sudo apt update
sudo apt install tails-installer
......@@ -21,5 +21,3 @@ storage to store some of your personal files.</p>
<p>All the data on this USB stick will be lost.</p>
</div>
<div class="step-image windows linux">[[!img inc/infography/plug-first-usb.png link="no"]]</div>
......@@ -3,7 +3,7 @@
<div class="trophy">
<p>Cool, you now have a temporary Tails on your first USB stick. You
will soon have to reboot your computer on this USB stick.
will soon have to restart your computer on this USB stick.
<span class="windows linux">It can be a bit tricky, so good luck!</span>
<span class="mac">But it might not work on your Mac model, so good luck!</span>
</p>
......
......@@ -3,6 +3,6 @@
disks appears.</p>
<p class="mac">Choose the USB stick and press
<span class="keycap">Enter</span>. The USB stick appears as an external hard disk and might be labelled <span class="guilabel">Windows</span> like in the following screenshot:</p>
<span class="keycap">Enter</span>. The USB stick appears as an external hard disk and might be labelled <span class="guilabel">EFI</span> or <span class="guilabel">Windows</span> like in the following screenshot:</p>
[[!img inc/screenshots/mac_startup_usb.png class="mac" link="no" alt="Screen with the logo of an internal hard disk labelled 'Macintosh HD' and an external hard disk labelled 'Windows' (selected)"]]
......@@ -2,7 +2,7 @@ Restart on <span class="windows-usb linux-usb mac-usb upgrade-tails">the tempora
================================================================================================================================================================
<div class="step-image">
[[!img inc/infography/plug-source-usb.png link="no" class="debian-clone windows-clone linux-clone mac-clone"]]
[[!img inc/infography/plug-source-usb.png link="no" class="install-clone mac-clone"]]
[[!img inc/infography/plug-other-usb.png link="no" class="upgrade-clone"]]
[[!img inc/infography/restart-on-tails.png link="no" class="debian-usb"]]
[[!img inc/infography/restart-on-temporary-tails.png link="no" class="clone windows-usb linux-usb mac-usb"]]
......@@ -13,7 +13,7 @@ Restart on <span class="windows-usb linux-usb mac-usb upgrade-tails">the tempora
<div class="note clone">
<p>The following instructions assume that the other Tails that you are
<span class="debian windows linux mac">installing</span><span class="upgrade">upgrading</span> from is on a USB stick. You can also <span class="debian windows linux mac">install</span><span class="upgrade">upgrade</span> from a Tails DVD
<span class="install-clone debian windows linux mac">installing</span><span class="upgrade">upgrading</span> from is on a USB stick. You can also <span class="install-clone debian windows linux mac">install</span><span class="upgrade">upgrade</span> from a Tails DVD
in a similar way.</p>
</div>
......@@ -23,7 +23,7 @@ in a similar way.</p>
<span class="usb">Shut down the computer while leaving the <span class="windows linux mac">first</span> USB stick plugged in.</span>
</p>
<p class="dvd clone upgrade-tails">Shut down the computer.</p>
<p class="clone">Plug in the other Tails USB stick that you want to <span class="debian windows linux mac">install</span><span class="upgrade">upgrade</span> from.</p>
<p class="clone">Plug in the other Tails USB stick that you want to <span class="install-clone debian windows linux mac">install</span><span class="upgrade">upgrade</span> from.</p>
<p class="upgrade-tails">Unplug your Tails USB stick while leaving the temporary USB stick plugged in.</p>
1. Switch on the computer.
......@@ -47,12 +47,14 @@ in a similar way.</p>
[[!img doc/first_steps/start_tails/tails_boot_menu.png link=no alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
<div class="note debian expert windows linux">
<div class="note install-clone debian expert windows linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
<span class="debian expert">Debian or Ubuntu,</span>
<span class="windows">Windows,</span>
<span class="linux">Linux,</span> refer to the
<span class="linux">Linux,</span>
<span class="install-clone">Windows or Linux,</span>
refer to the
troubleshooting section about [[!toggle id="not_at_all" text="Tails
not starting at all"]].</p>
</div>
......
......@@ -47,20 +47,3 @@ Restart on the <span class="usb">final</span><span class="clone">new</span> Tail
list on the bottom left of the screen. Click **Login**.
1. After 15&ndash;30 seconds, the Tails desktop appears.
<div class="trophy">
<p>Yeah, you are done installing Tails!</p>
<p>If you want to save some documents
and configuration in an encrypted storage on the <span class="usb">second</span><span class="clone">new</span> Tails USB stick, follow
our instructions until the end. Otherwise, have a look at our
<span class="install-clone">[[final recommendations|clone#recommendations]].</span>
<span class="windows-usb">[[final recommendations|win/usb#recommendations]].</span>
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-clone">[[final recommendations|mac/clone#recommendations]].</span>
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
<span class="linux-usb">[[final recommendations|linux/usb#recommendations]].</span>
</p>
</div>
......@@ -8,7 +8,7 @@ the rest of the instructions afterwards, we recommend you either:
- Open this page on your smartphone, tablet, or another computer (recommended).
[[!img inc/qrcodes/tails_boum_org_install_clone.png class="clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_clone.png class="install-clone" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_win_usb.png class="windows-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
[[!img inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone" link="no"]]
......@@ -23,7 +23,7 @@ the rest of the instructions afterwards, we recommend you either:
- Take note of the URL of this page to be able to come back later:
<a class="clone" href="https://tails.boum.org/install/clone/">https://tails.boum.org/install/clone/</a>
<a class="install-clone" href="https://tails.boum.org/install/clone/">https://tails.boum.org/install/clone/</a>
<a class="windows-usb" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
<a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
<a class="mac-clone" href="https://tails.boum.org/install/mac/clone/">https://tails.boum.org/install/mac/clone/</a>
......
......@@ -17,7 +17,7 @@ issues, make sure that the Tails you are <span class="install-clone">installing<
and wait until Tor is ready. After a minute or two, *Tails Upgrader*
appears with instructions on how to upgrade.
Apply all upgrades as suggested.
Apply all upgrades as requested.
<div class="bug">
<p>If at some point it is impossible to automatically upgrade, then
......
<div class="state-image debian-usb expert dvd">[[!img inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image windows-usb linux-usb mac-usb">[[!img inc/infography/final-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img inc/infography/new-tails.png link="no"]]</div>
<div class="trophy">
<p>Yeah, you are done installing Tails!</p>
<p>If you want to save some documents
and configuration in an encrypted storage on the <span class="usb">final</span><span class="clone">new</span> Tails USB stick, follow
our instructions until the end. Otherwise, have a look at our
<span class="install-clone">[[final recommendations|clone#recommendations]].</span>
<span class="expert">[[final recommendations|expert/usb#recommendations]].</span>
<span class="debian-usb">[[final recommendations|debian/usb#recommendations]].</span>
<span class="windows-usb">[[final recommendations|win/usb#recommendations]].</span>
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-clone">[[final recommendations|mac/clone#recommendations]].</span>
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
<span class="linux-usb">[[final recommendations|linux/usb#recommendations]].</span>
</p>
</div>
......@@ -17,7 +17,7 @@ li.expert {
}
.state-image {
display: none !important;
margin-right: 20em;
}
pre, p.pre {
......
......@@ -13,16 +13,20 @@
installed by default.
- Otherwise, install the `gnome-disk-utility` package using the
usual installation method of your Linux distribution.
usual installation method for your Linux distribution.
1. Start *GNOME Disks*.
<div class="step-image">[[!img inc/infography/plug-first-usb.png link="no"]]</div>
1. Plug the first USB stick in the computer.
A new drive appears in the left pane. Click on it.
[[!img inc/screenshots/gnome_disks.png link="no"]]
<div class="step-image">[[!img inc/infography/install-temporary-tails.png link="no"]]</div>
1. Click on the [[!img lib/emblem-system.png alt="System" class="symbolic" link="no"]]
button and choose **Restore Disk Image&hellip;**.
......@@ -47,4 +51,6 @@
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -15,4 +15,6 @@
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -56,4 +56,6 @@ image on a DVD.
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -66,6 +66,8 @@
diskutil unmountDisk [device]
<div class="step-image">[[!img inc/infography/install-temporary-tails.png link="no"]]</div>
1. Execute the following command to copy the ISO image that you
downloaded earlier to the USB stick. Replace:
......@@ -113,4 +115,6 @@ downloaded earlier to the USB stick. Replace:
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes"]]
[[!inline pages="install/inc/steps/you_are_done.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
Markdown is supported
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