summaryrefslogtreecommitdiffstats
path: root/wiki/src/install/inc/steps/download.inline.html
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/install/inc/steps/download.inline.html')
-rw-r--r--wiki/src/install/inc/steps/download.inline.html42
1 files changed, 18 insertions, 24 deletions
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index f94a285..3eae1ef 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -1,7 +1,7 @@
<div id="activate-tails-verification"></div> <!-- Needed to activate the verification extension -->
<div id="extension-version">1.0</div> <!-- Minimum version of the extension -->
-<h1 class="windows linux mac-usb mac-dvd dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
+<h1 class="windows linux mac-usb dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<div class="row">
@@ -10,12 +10,12 @@
<div class="supported-browser no-js">
<div id="step-download-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>1</span>Download Tails</h3>
<div class="windows linux mac-usb upgrade-tails download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
</div>
- <div class="mac-dvd dvd vm download-only-iso">
+ <div class="dvd vm download-only-iso">
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
<a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</span>)</a>
</div>
@@ -23,7 +23,7 @@
</div>
<div id="step-verify-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using your browser</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>2</span>Verify your download using your browser</h3>
<div class="caution indent">
<p><b>For your security,<br/>always verify your download!</b></p>
<p class="floating-toggleable-link why-verify-link">[[!toggle id="why-verify-supported" text="Why?"]]</p>
@@ -94,7 +94,7 @@
"""]]
</div>
<p class="windows linux mac-usb upgrade-tails download-only-img"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
- <p class="mac-dvd dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
+ <p class="dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
</div>
<div id="verification-failed-again" class="block">
<p><b>Verification failed again!</b></p>
@@ -117,8 +117,8 @@
</div>
<div id="step-continue-direct">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>3</span>Continue
- <span class="windows linux mac-usb mac-dvd">installing</span>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>3</span>Continue
+ <span class="windows linux mac-usb">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
</div>
@@ -127,7 +127,6 @@
<span class="windows">[[Skip download|win/usb]]</span>
<span class="linux">[[Skip download|linux/usb]]</span>
<span class="mac-usb">[[Skip download|mac/usb]]</span>
- <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
<span class="dvd">[[Skip download|dvd]]</span>
<span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
@@ -136,7 +135,6 @@
<div class="windows">[[Skip verification!|win/usb]]</div>
<div class="linux">[[Skip verification!|linux/usb]]</div>
<div class="mac-usb">[[Skip verification!|mac/usb]]</div>
- <div class="mac-dvd">[[Skip verification!|mac/dvd]]</div>
<div class="dvd">[[Skip verification!|dvd]]</div>
<div class="vm">[[Skip verification!|doc/advanced_topics/virtualization]]</div>
<div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div>
@@ -145,7 +143,6 @@
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac-usb">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
- <div class="mac-dvd">[[<div class="btn btn-primary inline-block">Next: Burn a Tails DVD (<span class="next-counter"></span>)</div>|mac/dvd]]</div>
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
@@ -201,7 +198,6 @@
<p class="windows"><code>https://tails.boum.org/install/win/usb-download/</code></p>
<p class="linux"><code>https://tails.boum.org/install/linux/usb-download/</code></p>
<p class="mac-usb"><code>https://tails.boum.org/install/mac/usb-download/</code></p>
- <p class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd-download/</code></p>
<p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
<p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
<p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
@@ -228,30 +224,30 @@
</div>
<div id="step-download-torrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="windows linux mac-usb upgrade-tails download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" id="download-img-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for USB image</a>
</div>
- <div class="mac-dvd dvd vm download-only-iso">
+ <div class="dvd vm download-only-iso">
<a href="[[!inline pages="inc/stable_amd64_iso_torrent_url" raw="yes" sort="age"]]" id="download-iso-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for ISO image</a>
</div>
</div>
<div id="step-verify-bittorrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd upgrade-tails">1.</span>2</span>Verify your download using BitTorrent</h3>
+ <h3><span class="step-number"><span class="windows linux mac-usb upgrade-tails">1.</span>2</span>Verify your download using BitTorrent</h3>
<p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
</div>
<div id="step-continue-bittorrent">
- <h3><span class="step-number"><span class="windows linux mac-usb mac-dvd dvd vm upgrade-tails">1.</span>3</span>Continue
- <span class="windows linux mac-usb mac-dvd">installing</span>
+ <h3><span class="step-number"><span class="windows linux mac-usb dvd vm upgrade-tails">1.</span>3</span>Continue
+ <span class="windows linux mac-usb">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
- <p class="windows linux mac-usb mac-dvd dvd vm upgrade-tails indent">Open and download
+ <p class="windows linux mac-usb dvd vm upgrade-tails indent">Open and download
the Torrent file with your BitTorrent client. It contains the
Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]
<span class="windows linux mac-usb upgrade-tails">USB</span>
- <span class="mac-dvd dvd vm">ISO</span>
+ <span class="dvd vm">ISO</span>
image that you will use in the next step.</p>
</div>
<div id="continue-link-bittorrent" class="indent">
@@ -259,7 +255,6 @@
<span class="windows">[[Skip download|win/usb]]</span>
<span class="linux">[[Skip download|linux/usb]]</span>
<span class="mac-usb">[[Skip download|mac/usb]]</span>
- <span class="mac-dvd">[[Skip download|mac/dvd]]</span>
<span class="dvd">[[Skip download|dvd]]</span>
<span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
@@ -268,7 +263,6 @@
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac-usb">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
- <div class="mac-dvd">[[<div class="btn btn-primary inline-block">Next: Burn a Tails DVD (<span class="next-counter"></span>)</div>|mac/dvd]]</div>
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
<div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
@@ -305,7 +299,7 @@ BitTorrent.</p>
<li>
<p>Download the
<a class="windows linux mac-usb upgrade-tails" href='[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
- <a class="mac-dvd dvd vm" href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
+ <a class="dvd vm" href='[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]'>OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
</li>
@@ -393,7 +387,7 @@ signing key through the OpenPGP Web of Trust</a>.</p>
signature is good:
<p class="windows linux mac-usb upgrade-tails">[[!img install/inc/screenshots/verifying_in_tails_img_notification.png link="no"]]</p>
- <p class="mac-dvd dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
+ <p class="dvd vm">[[!img install/inc/screenshots/verifying_in_tails_iso_notification.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>
@@ -415,12 +409,12 @@ signing key through the OpenPGP Web of Trust</a>.</p>
<p>Execute:</p>
<p class="windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
- <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
+ <p class="dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
<p class="windows linux mac-usb upgrade-tails pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
- <p class="mac-dvd dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
+ <p class="dvd vm pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
earlier than the latest version: [[!inline pages="inc/stable_amd64_date" raw="yes" sort="age"]].</p>