Merge branch 'web/10546-clone-upgrade' (Closes: #10546)

wiki/src/install/inc/steps/install_final.inline.mdwn

-Install <span class="windows-usb linux-usb mac-usb">the final</span> Tails<span class="dvd"> on a USB stick</span>
-==================================================================================================================
+<span class="debian windows linux mac expert">Install <span class="windows-usb linux-usb mac-usb">the final</span> Tails<span class="dvd"> on a USB stick</span></span><span class="upgrade">Upgrade your Tails</span>
+======================================================================================================================================================================================================================
 
-In this step, you will install <span class="windows-usb linux-usb mac-usb">the final</span> Tails
+<p class="debian windows linux mac">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="clone">new</span> USB stick
-using *Tails Installer*.
+using <span class="application">Tails Installer</span>.</p>
+<p class="upgrade">In this step, you will upgrade your Tails from the other Tails using <span class="application">Tails Installer</span>.</p>
 
-<div class="caution">
+<div class="caution debian windows linux mac">
 
 <p>All the data on this USB stick will be lost.</p>
 
 </div>
 
+<div class="note upgrade">
+
+<p>The persistent storage of your Tails USB stick will be preserved.</p>
+
+<p>The persistent storage of the other Tails will not be copied.</p>
+
+</div>
+
 <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 clone"]]
@@ -19,7 +28,7 @@ using *Tails Installer*.
 
 1. Plug the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick in the computer.
 
-1. <div class="windows linux mac"><p>
+1. <div class="windows linux mac upgrade"><p>
    Choose
    <span class="menuchoice">
      <span class="guimenu">Applications</span>&nbsp;▸
@@ -34,11 +43,12 @@ using *Tails Installer*.
    </p></div>
 
 1. Click on the
-   <span class="button windows linux mac">Clone & Install</span>
+   <span class="button windows linux mac">Install by cloning</span>
    <span class="button debian expert">Install</span>
+   <span class="button upgrade">Upgrade by cloning</span>
    button.
 
-   [[!img inc/screenshots/tails_installer_in_tails.png link=no class="windows linux mac"]]
+   [[!img inc/screenshots/tails_installer_in_tails.png link=no class="windows linux mac upgrade"]]
    [[!img inc/screenshots/tails_installer_in_debian.png link=no class="debian expert"]]
 
    <div class="step-image">
@@ -48,19 +58,28 @@ using *Tails Installer*.
    </div>
 
 1. Use the <span class="guilabel">Target Device</span> drop-down list to
-   specify the <span class="windows-usb linux-usb mac-usb">second</span><span class="clone">new</span> USB stick.
+   specify <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-clone">your</span> USB stick.
 
-1. To start the installation, click on the <span
+1. To start the <span class="debian windows linux mac">installation</span><span class="upgrade">upgrade</span>, click on the <span
    class="button">Install Tails</span> button.
-   The installation takes a few minutes.
+
+1. Read the warning message in the pop-up window. Click on the <span
+   class="button">Yes</span> button to confirm.
+
+   The <span class="debian windows linux mac">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
    while synchronizing data on disk.</p>
    </div>
 
-1. Read the warning message in the pop-up window. Click on the <span
-   class="button">Yes</span> button to confirm.
-
 <div class="state-image usb">[[!img inc/infography/final-tails.png link="no"]]</div>
-<div class="state-image clone">[[!img inc/infography/new-tails.png link="no"]]</div>
+<div class="state-image debian-clone windows-clone linux-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>Thanks for staying safe!</p>
+
+</div>

wiki/src/install/inc/steps/restart_first_time.inline.mdwn

@@ -11,7 +11,7 @@ Restart on <span class="windows-usb linux-usb win-usb">the temporary</span><span
 <div class="note clone">
 
 <p>The following instructions assume that the other Tails that you are
-installing from is on a USB stick. You can also install from a Tails DVD
+<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
 in a similar way.</p>
 
 </div>
@@ -21,7 +21,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">Shut down the computer.</p>
-   <p class="clone">Plug in the other Tails USB stick that you want to install from.</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>
 
 1. Switch on the computer.
 

wiki/src/install/inc/steps/switch.inline.mdwn

@@ -18,6 +18,7 @@ the rest of the instructions afterwards, we recommend you either:
    [[!img inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert-usb" link="no"]]
    [[!img inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux-usb" link="no"]]
    [[!img inc/qrcodes/tails_boum_org_install_linux_clone.png class="linux-clone" link="no"]]
+   [[!img inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone" link="no"]]
 
    - Print the rest of the instructions on paper.
 
@@ -33,3 +34,4 @@ the rest of the instructions afterwards, we recommend you either:
      <a class="expert-usb" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
      <a class="linux-usb" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
      <a class="linux-clone" href="https://tails.boum.org/install/linux/clone/">https://tails.boum.org/install/linux/clone/</a>
+     <a class="upgrade-clone" href="https://tails.boum.org/upgrade/clone/">https://tails.boum.org/upgrade/clone/</a>

wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn

 Verify that the other Tails is up-to-date
 =========================================
 
-To prevent installing an outdated version of Tails with known security
-issues, make sure that the Tails you are installing from is up-to-date:
+To prevent <span class="debian windows linux mac">installing</span><span class="upgrade">upgrading to</span> an outdated version of Tails with known security
+issues, make sure that the Tails you are <span class="debian windows linux mac">installing</span><span class="upgrade">upgrading</span> from is up-to-date:
 
 1. Choose <span class="menuchoice">
    <span class="guimenu">Applications</span>&nbsp;▸
@@ -26,4 +26,5 @@ issues, make sure that the Tails you are installing from is up-to-date:
    <span class="debian">[[choose a different installation method|debian]].</span>
    <span class="linux">[[choose a different installation method|linux]].</span>
    <span class="mac">[[choose a different installation method|mac]].</span>
+   <span class="upgrade">[[upgrade from Tails instead|upgrade/tails]].</span>
    </div>

wiki/src/install/inc/stylesheets/steps.css

@@ -28,6 +28,7 @@
 .mac, .mac-usb, .mac-dvd, .mac-clone,
 .debian, .debian-clone, .debian-usb,
 .expert, .expert-usb,
-.linux, .linux-clone, .linux-usb {
+.linux, .linux-clone, .linux-usb,
+.upgrade, .upgrade-clone {
   display: none;
 }

wiki/src/install/inc/stylesheets/upgrade-clone.css

+@import url("upgrade.css");
+@import url("clone.css");
+span.upgrade-clone, a.upgrade-clone {
+  display: inline;
+}
+div.upgrade-clone, img.upgrade-clone, p.upgrade-clone {
+  display: block;
+}
+li.upgrade-clone {
+  display: list-item;
+}

wiki/src/install/inc/stylesheets/upgrade.css

+span.upgrade, a.upgrade {
+  display: inline;
+}
+div.upgrade, img.upgrade, p.upgrade {
+  display: block;
+}
+li.upgrade {
+  display: list-item;
+}

wiki/src/upgrade/clone.mdwn

+[[!meta robots="noindex"]]
+[[!meta title="Upgrade from another Tails"]]
+[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="install/inc/stylesheets/upgrade-clone" rel="stylesheet" title=""]]
+
+[[Back|upgrade]]
+
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]