Commit fe34bfad authored by sajolida's avatar sajolida
Browse files

Rename 'temporary' Tails as 'intermediary' Tails

parent 737c89e7
......@@ -96,11 +96,11 @@
<li>
<h4>
First you will
<span class="windows-usb linux-usb mac-usb">install a temporary Tails on the first USB stick.</span>
<span class="mac-dvd">burn a temporary Tails on a DVD.</span>
<span class="windows-usb linux-usb mac-usb">install an intermediary Tails on the first USB stick.</span>
<span class="mac-dvd">burn an intermediary Tails on a DVD.</span>
<span class="debian expert">install a Tails on your USB stick.</span>
<span class="install-clone upgrade-clone">restart on the other Tails.</span>
<span class="upgrade-tails">install and upgrade a temporary Tails.</span>
<span class="upgrade-tails">install and upgrade an intermediary Tails.</span>
</h4>
<div class="row">
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-tails">
......@@ -113,7 +113,7 @@
</div>
<div class="col-md-3 col-md-offset-1 install-clone upgrade-clone">
<div class="thumbnail step">
[[!img install/inc/infography/restart-on-temporary-tails.png link="no"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no"]]
<div class="caption">
<h5><span class="step-number"></span>Restart</h5>
</div>
......@@ -121,7 +121,7 @@
</div>
<div class="col-md-3 windows-usb linux-usb mac-usb debian expert">
<div class="thumbnail step">
[[!img install/inc/infography/install-temporary-tails.png link="no"]]
[[!img install/inc/infography/install-intermediary-tails.png link="no"]]
<div class="caption">
<h5>Install</h5>
</div>
......@@ -181,7 +181,7 @@
</div>
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb upgrade-tails upgrade-clone install-clone">
<div class="thumbnail step">
[[!img install/inc/infography/clone-temporary-tails.png link="no"]]
[[!img install/inc/infography/clone-intermediary-tails.png link="no"]]
<div class="caption">
<h5>
<span class="install-clone windows-usb linux-usb mac-usb">Install</span>
......
......@@ -170,13 +170,13 @@ Download and verify
<p>You can now continue with the next step and
<span class="install-clone">[[Open these instructions on another device|install/clone#next]].</span>
<span class="debian-usb">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
<span class="windows-usb">[[Install a temporary Tails|install/win/usb#next]].</span>
<span class="linux-usb">[[Install a temporary Tails|install/linux/usb#next]].</span>
<span class="windows-usb">[[Install an intermediary Tails|install/win/usb#next]].</span>
<span class="linux-usb">[[Install an intermediary Tails|install/linux/usb#next]].</span>
<span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
<span class="mac-usb">[[Install a temporary Tails|install/mac/usb#next]].</span>
<span class="mac-usb">[[Install an intermediary Tails|install/mac/usb#next]].</span>
<span class="mac-clone">[[Open these instructions on another device|install/mac/clone#next]].</span>
<span class="upgrade-clone">[[Open these instructions on another device|upgrade/clone#next]].</span>
<span class="upgrade-tails">[[Install a temporary Tails|upgrade/tails#next]].</span>
<span class="upgrade-tails">[[Install an intermediary Tails|upgrade/tails#next]].</span>
</p>
<p class="openpgp">If you are knowledgeable about OpenPGP, you can do additional verification using the <a href='[[!inline pages="inc/stable_i386_iso_sig_url" raw="yes"]]'>OpenPGP signature</a>.</p>
</div>
......
......@@ -5,7 +5,7 @@
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="upgrade-tails">In this step, you will upgrade your Tails from the intermediary Tails using <span class="application">Tails Installer</span> one last time.</p>
<div class="caution debian windows linux mac">
......@@ -55,7 +55,7 @@ using <span class="application">Tails Installer</span>.</p>
<div class="step-image">
[[!img inc/infography/install-tails.png link="no" class="debian-usb"]]
[[!img inc/infography/clone-temporary-tails.png link="no" class="windows-usb linux-usb mac-usb clone upgrade-tails"]]
[[!img inc/infography/clone-intermediary-tails.png link="no" class="windows-usb linux-usb mac-usb clone upgrade-tails"]]
[[!img inc/infography/clone-dvd.png link="no" class="dvd"]]
</div>
......
Install a temporary Tails
=========================
Install an intermediary Tails
=============================
In this step, you will install a temporary Tails by copying the Tails ISO image on a first USB
In this step, you will install an intermediary Tails by copying the Tails ISO image on a first USB
stick using
<span class="windows">a program called <span class="application">Universal USB Installer</span>.</span>
<span class="mac">the command line.</span>
......@@ -10,7 +10,7 @@ stick using
<div class="note">
<p>On
this temporary Tails you won't benefit from important features like
this intermediary Tails you won't benefit from important features like
automatic upgrades or the possibility to create an encrypted persistent
storage to store some of your personal files.</p>
......
<div class="state-image">[[!img inc/infography/temporary-tails.png link="no"]]</div>
<div class="state-image">[[!img inc/infography/intermediary-tails.png link="no"]]</div>
<div class="trophy">
<p>Cool, you now have a temporary Tails on your first USB stick. You
<p>Cool, you now have an intermediary Tails on your first USB stick. You
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>
......
Restart on <span class="windows-usb linux-usb mac-usb upgrade-tails">the temporary</span><span class="clone">the other</span> Tails<span class="dvd">the DVD</span>
===================================================================================================================================================================
Restart on <span class="windows-usb linux-usb mac-usb upgrade-tails">the intermediary</span><span class="clone">the other</span> Tails<span class="dvd">the DVD</span>
======================================================================================================================================================================
<div class="step-image">
[[!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"]]
[[!img inc/infography/restart-on-intermediary-tails.png link="no" class="clone windows-usb linux-usb mac-usb"]]
[[!img inc/infography/restart-on-dvd.png link="no" class="dvd"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails"]]
</div>
......@@ -24,7 +24,7 @@ in a similar way.</p>
</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="upgrade-tails">Unplug your Tails USB stick while leaving the temporary USB stick plugged in.</p>
<p class="upgrade-tails">Unplug your Tails USB stick while leaving the intermediary USB stick plugged in.</p>
1. Switch on the computer.
......@@ -67,7 +67,7 @@ in a similar way.</p>
"""]]
<div class="bug mac">
<p>If your computer fails to start on the temporary Tails, you can
<p>If your computer fails to start on the intermediary Tails, you can
try these other two methods:</p>
<ul>
......
......@@ -16,7 +16,7 @@ Restart on the <span class="usb">final</span><span class="clone">new</span> Tail
[[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes"]]
<div class="note windows-usb linux-usb">
<p>Some computers start successfully on the temporary Tails but fail
<p>Some computers start successfully on the intermediary Tails but fail
to start on the final Tails. If this is your case, refer to the
troubleshooting section about [[!toggle id="not_at_all" text="Tails
not starting at all"]].</p>
......@@ -31,7 +31,7 @@ Restart on the <span class="usb">final</span><span class="clone">new</span> Tail
<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
continue using the <span class="usb">intermediary Tails</span><span class="dvd">Tails DVD</span>. <span class="usb">On this intermediary Tails you
cannot benefit from automatic upgrades or create an encrypted
persistent storage.</span></p>
<p>You should still have a look at our
......
......@@ -11,7 +11,7 @@
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_intermediary_intro.inline" raw="yes"]]
1. Install *GNOME Disks*.
......@@ -31,7 +31,7 @@
[[!img inc/screenshots/gnome_disks.png class="screenshot" link="no"]]
<div class="step-image">[[!img inc/infography/install-temporary-tails.png link="no"]]</div>
<div class="step-image">[[!img inc/infography/install-intermediary-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,7 +47,7 @@
1. After the installation is finished, click on the
[[!img lib/media-eject.png alt="Eject" class="symbolic" link="no"]] button.
[[!inline pages="install/inc/steps/install_temporary_outro.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_intermediary_outro.inline" raw="yes"]]
[[!inline pages="install/inc/steps/switch.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