Commit 1028bf37 authored by tchou's avatar tchou
Browse files

Merge remote-tracking branch 'origin/master' into web/10580-upgrade-overview

parents b5da21c6 531c62b1
[[!meta robots="noindex"]]
[[!meta title="Choose your upgrade scenario"]]
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
<h1 class="text-center">Choose your <strong>upgrade</strong> scenario</h1>
<div class="row">
<div class="col-md-6">
<h3>Upgrade from another Tails</h3>
<p>If you know someone of trust who already did the upgrade, you can
upgrade your Tails by cloning from it.</p>
<h4>You need:</h4>
<ul>
<li>Your USB stick</li>
<li>Another USB stick with Tails up-to-date</li>
<li>10 minutes to upgrade</li>
</ul>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Upgrade from another Tails</h3>
</div>
</div>
|upgrade/clone/overview]]
</div>
<div class="col-md-6">
<h3>Upgrade inside Tails</h3>
<h4>You need:</h4>
<ul>
<li>Your USB stick</li>
<li>Another empty USB stick <small>(at least 4 GB)</small></li>
<li>30&ndash;60 minutes to download Tails <small>[[!inline pages="inc/stable_i386_iso_size" raw="yes"]]</small></li>
<li>20 minutes to upgrade</li>
</ul>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Upgrade inside Tails</h3>
</div>
</div>
|upgrade/tails/overview]]
</div>
</div>
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
<small>
You can also:
<ul>
<li>[[Upgrade from another operating system|upgrade#os]]</li>
<li>[[Burn a new Tails DVD|upgrade#dvd]]</li>
<li>[[Upgrade your virtual machine|upgrade#vm]]</li>
</ul>
</small>
</div>
</div>
[[!meta robots="noindex"]]
[[!meta title="Clone from another Tails"]]
[[!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/dave" rel="stylesheet" title=""]]
......
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