Commit 6f3f12d5 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/10848-unsupported-browser' (Closes: #10848)

parents fc0229c3 f7100c1e
......@@ -15,8 +15,6 @@
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
<a id="next"></a>
[[!inline pages="install/inc/steps/install_tails_installer.inline" raw="yes"]]
<div class="tip">
......
......@@ -3,6 +3,8 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download-only" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
......@@ -11,8 +11,6 @@
[[!inline pages="install/inc/steps/download.inline" raw="yes"]]
<a id="next"></a>
Burn a Tails DVD
================
......
......@@ -107,7 +107,7 @@ Restart and activate the persistent storage
<div class="state-image debian expert">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image windows linux mac-usb clone">[[!img install/inc/infography/final-tails-with-persistence.png link="no"]]</div>
<div class="state-image dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image mac-dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="trophy" id="recommendations">
......
......@@ -3,9 +3,12 @@ Download and verify the Tails ISO image
<div class="step-image">[[!img install/inc/infography/download-and-verify.png link="no"]]</div>
In this step you will download Tails as an ISO image: a single file containing the whole operating system.
<p>
<span class="windows mac-usb mac-dvd debian linux upgrade-tails dvd vm">In this step you</span>
<span class="download-only">You</span>
will download Tails as an ISO image: a single file containing the whole operating system.
For your security, it is very important to also verify your download. We propose you
two techniques to do this verification automatically.
two techniques to do this verification automatically.</p>
<div id="download-and-verify">
<div id="extension-version">0.2.7rc1</div>
......@@ -20,7 +23,15 @@ two techniques to do this verification automatically.
Tor Browser <span class="minver-tor">5</span>+</p>
<p>A Firefox add-on to download and verify Tails automatically.</p>
<p>Copy and paste this link in Firefox or Tor Browser:</p>
<code>https://tails.boum.org/download</code>
<span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
<span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
<span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
<span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
<span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
<span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
<span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
<span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
<span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
<a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
</div>
<div class="col-md-6 bittorrent">
......@@ -45,7 +56,15 @@ two techniques to do this verification automatically.
<p id="unsupported-firefox">You are running Firefox <span class="current-firefox">1.0</span>.
Please update to Firefox <span class="minver-firefox">38.0.1</span>, Tor Browser <span class="minver-tor">5</span>, or newer and visit this link:</p>
<p id="unsupported-other">Copy and paste this link in Firefox or Tor Browser:</p>
<code>https://tails.boum.org/download</code>
<span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
<span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
<span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
<span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
<span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
<span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
<span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
<span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
<span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
<a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
</div>
<div class="col-md-6 bittorrent">
......@@ -195,17 +214,15 @@ two techniques to do this verification automatically.
<div id="verify-text-success" class="bg-success">
<div class="trophy">
<p>You downloaded and verified the ISO image successfully!</p>
<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">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
<p class="windows mac-usb mac-dvd debian linux upgrade-tails dvd vm">You can now continue with the next step and
<span class="windows">[[Install an intermediary Tails|install/win/usb#next]].</span>
<span class="linux">[[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 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="dvd">[[Burn Tails on a DVD|install/dvd#next]].</span>
<span class="upgrade-clone">[[Open these instructions on another device|upgrade/clone#next]].</span>
<span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
<span class="debian">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
<span class="linux">[[Install an intermediary Tails|install/linux/usb#next]].</span>
<span class="upgrade-tails">[[Install an intermediary Tails|upgrade/tails#next]].</span>
<span class="dvd">[[Burn Tails on a DVD|install/dvd#next]].</span>
<span class="vm">read our [[Introduction to virtual machines|install/vm#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>
......@@ -220,3 +237,5 @@ two techniques to do this verification automatically.
</div>
</div>
</div>
<a id="next"></a>
<h1 class="debian expert install-clone mac-clone">Install Tails</h1>
<h1 class="windows linux mac-usb">Install the final Tails</h1>
<h1 class="dvd">Install Tails on a USB stick</h1>
<h1 class="mac-dvd">Install Tails on a USB stick</h1>
<h1 class="upgrade">Upgrade your Tails</h1>
<p class="debian windows linux mac expert">
......@@ -37,7 +37,7 @@
<div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="debian"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb install-clone mac-clone"]]
[[!img install/inc/infography/plug-tails-usb.png link="no" class="dvd"]]
[[!img install/inc/infography/plug-tails-usb.png link="no" class="mac-dvd"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails"]]
</div>
......@@ -45,7 +45,7 @@
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="upgrade">your Tails</span>
<span class="debian expert dvd">the</span>
<span class="debian expert mac-dvd">the</span>
USB stick in the computer.
1. <div class="windows linux mac upgrade install-clone"><p>
......@@ -78,7 +78,7 @@
<div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="debian"]]
[[!img install/inc/infography/clone-intermediary-tails.png link="no" class="windows linux mac-usb clone upgrade-tails"]]
[[!img install/inc/infography/clone-dvd.png link="no" class="dvd"]]
[[!img install/inc/infography/clone-dvd.png link="no" class="mac-dvd"]]
</div>
1. <p class="debian expert">Click <span class="button">Browse</span>
......@@ -87,7 +87,7 @@
Choose
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="debian expert dvd upgrade-clone">your</span>
<span class="debian expert mac-dvd upgrade-clone">your</span>
USB stick in the <span class="guilabel">Target Device</span> drop-down list.
1. To start the
......
<h1 class="windows linux mac-usb upgrade-tails">Restart on the intermediary Tails</h1>
<h1 class="clone">Restart on the other Tails</h1>
<h1 class="dvd">Restart on the Tails DVD</h1>
<h1 class="mac-dvd">Restart on the Tails DVD</h1>
<div class="step-image">
[[!img install/inc/infography/plug-source-usb.png link="no" class="install-clone mac-clone"]]
[[!img install/inc/infography/plug-other-usb.png link="no" class="upgrade-clone"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="debian"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no" class="clone windows linux mac-usb"]]
[[!img install/inc/infography/restart-on-dvd.png link="no" class="dvd"]]
[[!img install/inc/infography/restart-on-dvd.png link="no" class="mac-dvd"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails"]]
</div>
......@@ -24,10 +24,10 @@ from a Tails DVD in a similar way.</p>
</div>
1. <p>
<span class="dvd">Make sure that the DVD is inserted in the computer.</span>
<span class="mac-dvd">Make sure that the DVD is inserted in the computer.</span>
<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="mac-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>
......@@ -129,7 +129,7 @@ Now grab your second USB stick as it is time to install the final Tails on it.</
you to store some of your documents and configuration
and benefit from automatic security upgrades.</p>
<p class="clone dvd">This was a first but important step!
<p class="clone mac-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.</p>
</div>
<h1 class="usb">Restart on the final Tails</h1>
<h1 class="clone">Restart on the other Tails</h1>
<h1 class="dvd">Restart on the Tails USB stick</h1>
<h1 class="mac-dvd">Restart on the Tails USB stick</h1>
1. Shut down the computer.
<div class="step-image">
[[!img install/inc/infography/restart-on-final-tails.png link="no" class="usb clone"]]
[[!img install/inc/infography/restart-on-tails-usb.png link="no" class="dvd"]]
[[!img install/inc/infography/restart-on-tails-usb.png link="no" class="mac-dvd"]]
</div>
1. <p class="usb clone">
......@@ -18,7 +18,7 @@
<span class="clone">new</span>
USB stick plugged in.
</p>
<p class="dvd">Eject the DVD and leave the USB stick plugged in.</p>
<p class="mac-dvd">Eject the DVD and leave the USB stick plugged in.</p>
1. Switch on the computer.
......@@ -41,10 +41,10 @@
<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>
<span class="mac-dvd">Tails USB stick,</span>
you can continue using the
<span class="usb">intermediary Tails</span>
<span class="dvd">Tails DVD</span>.
<span class="mac-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>
......
<div class="state-image debian expert dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image debian expert mac-dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image windows linux mac-usb">[[!img install/inc/infography/final-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img install/inc/infography/new-tails.png link="no"]]</div>
......
......@@ -197,7 +197,7 @@ ul {
/* Hide all scenario-dependent bits by default. */
.clone, .usb, .dvd,
.clone, .usb, .dvd, .vm, .download-only,
.install-clone,
.windows, .windows-usb,
.mac, .mac-usb, .mac-dvd, .mac-clone,
......
span.download-only {
display: inline;
}
span.dvd, a.dvd {
display: inline;
}
/* This stylesheet applies to /install/dvd only and not to /install/mac/dvd. */
div.dvd, img.dvd, p.dvd, h1.dvd {
display: block;
}
li.dvd {
display: list-item;
span.dvd {
display: inline;
}
@import url("mac.css");
@import url("dvd.css");
/* We're not importing "dvd.css" as it applies to /install/dvd only. */
span.mac-dvd, a.mac-dvd {
display: inline;
......
span.vm {
display: inline;
}
......@@ -4,6 +4,7 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/vm" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/tails-installation-assistant.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