Commit 354bf8b2 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'tchou/web/10580-upgrade-overview'

Conflicts:
	wiki/src/install/inc/overview.html
parents 2c90da32 caf7aade
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/clone" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -8,17 +8,17 @@
<h4>
<span class="windows-usb linux-usb mac-usb mac-dvd">1 or 2 hours</span>
<span class="debian expert">1 hour</span>
<span class="clone">15 minutes</span>
<span class="install-clone">15 minutes</span>
<span class="upgrade-clone">10 minutes</span>
<br />
<span class="windows-usb linux-usb mac-usb mac-dvd debian expert">
<span class="windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-tails">
<small>[[!inline pages="inc/stable_i386_iso_size_mib" raw="yes"]] to download</small><br />
</span>
<span class="windows-usb linux-usb mac-usb mac-dvd"><small>45 minutes to install</small></span>
<span class="debian expert"><small>25 minutes to install</small></span>
<span class="upgrade-tails"><small>20 minutes to upgrade</small></span>
</h4>
</div>
</div>
......@@ -34,7 +34,16 @@
</div>
</div>
</div>
<div class="col-sm-6 col-md-3 debian expert clone mac-dvd">
<div class="col-sm-6 col-md-3 upgrade-clone upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no"]]
<div class="caption">
<h4>Your Tails
</h4>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3 debian expert clone mac-dvd upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no"]]
<div class="caption">
......@@ -55,7 +64,7 @@
</div>
</div>
</div>
<div class="col-sm-6 col-md-3 clone">
<div class="col-sm-6 col-md-3 install-clone">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no"]]
<div class="caption">
......@@ -90,10 +99,11 @@
<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="debian expert">install a Tails on your USB stick.</span>
<span class="clone">restart on the other Tails.</span>
<span class="install-clone upgrade-clone">restart on the other Tails.</span>
<span class="upgrade-tails">install and upgrade a temporary 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">
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-tails">
<div class="thumbnail step">
[[!img install/inc/infography/download-and-verify.png link="no"]]
<div class="caption">
......@@ -101,7 +111,7 @@
</div>
</div>
</div>
<div class="col-md-3 col-md-offset-1 clone">
<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"]]
<div class="caption">
......@@ -117,6 +127,14 @@
</div>
</div>
</div>
<div class="col-md-3 upgrade-tails">
<div class="thumbnail step">
[[!img install/inc/infography/install-upgrade-usb.png link="no"]]
<div class="caption">
<h5>Install</h5>
</div>
</div>
</div>
<div class="col-md-3 mac-dvd">
<div class="thumbnail step">
[[!img install/inc/infography/insert-dvd.png link="no"]]
......@@ -125,6 +143,14 @@
</div>
</div>
</div>
<div class="col-md-3 upgrade-tails">
<div class="thumbnail step">
[[!img install/inc/infography/upgrade-upgrade-usb.png link="no"]]
<div class="caption">
<h5>Upgrade</h5>
</div>
</div>
</div>
<div class="col-md-2 windows-usb linux-usb mac-usb mac-dvd debian expert">
<div class="thumbnail">
[[!img install/inc/icons/restart.png link="no"]]
......@@ -140,15 +166,27 @@
Then you will
<span class="windows-usb linux-usb mac-usb">install the final Tails on the second USB stick.</span>
<span class="mac-dvd">install the final Tails on your USB stick.</span>
<span class="clone">install Tails on your USB stick.</span>
<span class="install-clone">install Tails on your USB stick.</span>
<span class="debian expert">configure it.</span>
<span class="upgrade-tails">upgrade your Tails.</span>
</h4>
<div class="row">
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb clone">
<div class="col-md-2 col-md-offset-1 upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/restart.png link="no"]]
<div class="caption">
<h5>Restart</h5>
</div>
</div>
</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"]]
<div class="caption">
<h5><span class="step-number"></span>Install </h5>
<h5>
<span class="install-clone">Install</span>
<span class="upgrade">Upgrade</span>
</h5>
</div>
</div>
</div>
......@@ -160,7 +198,7 @@
</div>
</div>
</div>
<div class="col-md-2 windows-usb linux-usb mac-usb mac-dvd clone">
<div class="col-md-2 windows-usb linux-usb mac-usb mac-dvd install-clone">
<div class="thumbnail">
[[!img install/inc/icons/restart.png link="no"]]
<div class="caption">
......@@ -170,7 +208,7 @@
</div>
<div class="col-md-1 debian expert">
</div>
<div class="col-md-3">
<div class="col-md-3 windows-usb linux-usb mac-usb mac-dvd install-clone debian expert">
<div class="thumbnail step">
[[!img install/inc/infography/create-persistence.png link="no"]]
<div class="caption">
......
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/clone" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/clone" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/clone" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
[[!meta robots="noindex"]]
[[!meta title="Upgrade from another Tails"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|upgrade]]
<h1 class="text-center">Upgrade from <strong>another Tails</strong></h1>
[[!inline pages="install/inc/overview" raw="yes"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
</div>
|upgrade/clone]]
<div class="clearfix"></div>
[[!meta robots="noindex"]]
[[!meta title="Upgrade inside Tails"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-tails" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|upgrade]]
<h1 class="text-center">Upgrade <strong>inside</strong>Tails</h1>
[[!inline pages="install/inc/overview" raw="yes"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
</div>
|upgrade/tails]]
<div class="clearfix"></div>
Supports Markdown
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