Commit 8d20b1f1 authored by sajolida's avatar sajolida
Browse files

Rewrap scenario-dependent bits to be easier to read

parent f7c879e9
......@@ -4,8 +4,10 @@ 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">final</span><span class="clone">new</span> Tails USB stick to store any of the
following:
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
- Some of your settings
......
......@@ -3,11 +3,22 @@
<h1 class="dvd">Install Tails on a USB stick</span>
<h1 class="upgrade">Upgrade your Tails</span>
<p class="debian windows linux mac expert">In this step, you will install <span class="windows-usb linux-usb mac-usb">the final</span> Tails
on a <span class="windows-usb linux-usb mac-usb">second</span><span class="install-clone mac-clone">new</span> USB stick
using <span class="application">Tails Installer</span>.</p>
<p class="upgrade-clone">In this step, you will upgrade your Tails from the other Tails using <span class="application">Tails Installer</span>.</p>
<p class="upgrade-tails">In this step, you will upgrade your Tails from the temporary Tails using <span class="application">Tails Installer</span> one last time.</p>
<p class="debian windows linux mac expert">
In this step, you will install
<span class="windows-usb linux-usb mac-usb">the final</span>
Tails on a
<span class="windows-usb linux-usb mac-usb">second</span>
<span class="install-clone mac-clone">new</span>
USB stick using
<span class="application">Tails Installer</span>.
</p>
<p class="upgrade">In this step, you will upgrade your Tails from the
<span class="upgrade-clone">other</span>
<span class="upgrade-tails">temporary</span>
Tails using
<span class="application">Tails Installer</span><span class="upgrade-tails"> one last time</span>.
</p>
<div class="caution debian windows linux mac">
......@@ -30,7 +41,12 @@ using <span class="application">Tails Installer</span>.</p>
[[!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="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. 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
......@@ -70,13 +86,18 @@ using <span class="application">Tails Installer</span>.</p>
<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 expert windows linux mac install-clone">installation</span><span class="upgrade">upgrade</span>, click on the <span
class="button">Install Tails</span> button.
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 expert 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
......
......@@ -49,8 +49,9 @@
- If the computer starts on
<span class="windows">Windows,</span>
<span class="linux">Linux,</span> repeat steps
2 and 3 for all the potential boot menu keys identified in step 1.
<span class="linux">Linux,</span>
repeat steps 2 and 3 for all the potential boot menu keys
identified in step 1.
If none of the potential boot menu keys identified in step 1 work or if
the USB stick does not appear in the list, then try the second
......
......@@ -14,8 +14,12 @@
<div class="note clone">
<p>The following instructions assume that the other Tails that you are
<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>
<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>
......@@ -24,7 +28,10 @@ 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="install-clone 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.
......@@ -114,10 +121,10 @@ list on the bottom left of the screen. Click <span class="button">Login</span>.
<div class="trophy windows linux mac">
<p>
<span class="usb">The most difficult part is over! Now grab your second USB stick as it is time to
install the final Tails on it.</span>
<span class="clone dvd">This was a first but important step! Now grab the <span class="clone">new</span> USB stick
on which you want to install Tails.</span>
<span class="usb">The most difficult part is over!
Now grab your second USB stick as it is time to install the final Tails on it.</span>
<span class="clone dvd">This was a first but important step!
Now grab the <span class="clone">new</span> USB stick on which you want to install Tails.</span>
</p>
</div>
......@@ -9,7 +9,15 @@
[[!img inc/infography/restart-on-tails-usb.png link="no" class="dvd"]]
</div>
1. <p class="usb clone">Unplug the <span class="usb">first</span><span class="clone">other</span> USB stick and leave the <span class="usb">second</span><span class="clone">new</span> USB stick plugged in.</p>
1. <p class="usb clone">
Unplug the
<span class="usb">first</span>
<span class="clone">other</span>
USB stick and leave the
<span class="usb">second</span>
<span class="clone">new</span>
USB stick plugged in.
</p>
<p class="dvd">Eject the DVD and leave the USB stick plugged in.</p>
1. Switch on the computer.
......@@ -31,10 +39,15 @@
"""]]
<div class="bug mac-usb mac-dvd">
<p>If your computer fails to start on the <span class="usb">final Tails,</span><span class="dvd">Tails USB stick,</span> you can
continue using the <span class="usb">temporary Tails</span><span class="dvd">Tails DVD</span>. <span class="usb">On this temporary Tails you
cannot benefit from automatic upgrades or create an encrypted
persistent storage.</span></p>
<p>If your computer fails to start on the
<span class="usb">final Tails,</span>
<span class="dvd">Tails USB stick,</span>
you can continue using the
<span class="usb">temporary Tails</span>
<span class="dvd">Tails DVD</span>.
<span class="usb">On this temporary Tails you cannot benefit from
automatic upgrades or create an encrypted persistent storage.</span></p>
<p>You should still have a look at our
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span></p>
......
Verify that the other Tails is up-to-date
=========================================
To prevent <span class="install-clone mac-clone">installing</span><span class="upgrade-clone">upgrading to</span> an outdated version of Tails with known security
issues, make sure that the Tails you are <span class="install-clone mac-clone">installing</span><span class="upgrade-clone">upgrading</span> from is up-to-date:
To prevent
<span class="install-clone mac-clone">installing</span>
<span class="upgrade-clone">upgrading to</span>
an outdated version of Tails with known security issues, make sure that the Tails you are
<span class="install-clone mac-clone">installing</span>
<span class="upgrade-clone">upgrading</span>
from is up-to-date:
1. Choose <span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
......
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