summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-11-10 10:19:33 +0000
committersajolida <sajolida@pimienta.org>2015-11-10 10:19:33 +0000
commit058bfd174407c2de674b89683825020c350496c9 (patch)
treeb20223f7fa603487665f8a24c3797cbadbf0fbf4
parentccc94e15ba173671d798098b46fc3d4e84918422 (diff)
parent1e2fc1f4851f335518606fbb8499f3681ebee0d8 (diff)
Merge remote-tracking branch 'origin/web/assistant' into web/9385-download-and-verify-cssweb/9385-download-and-verify-css
-rw-r--r--wiki/src/install/debian.mdwn2
-rw-r--r--wiki/src/install/debian/clone.mdwn16
-rw-r--r--wiki/src/install/inc/infography/clone-dvd.pngbin0 -> 3699 bytes
-rw-r--r--wiki/src/install/inc/infography/insert-dvd.pngbin0 -> 2201 bytes
-rw-r--r--wiki/src/install/inc/infography/new-tails.pngbin0 -> 3615 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-source-usb.pngbin0 -> 3093 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-tails-usb.pngbin0 -> 3570 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-dvd.pngbin0 -> 2572 bytes
-rw-r--r--wiki/src/install/inc/infography/restart-on-tails-usb.pngbin0 -> 3831 bytes
-rw-r--r--wiki/src/install/inc/infography/tails-usb-with-persistence.pngbin0 -> 7856 bytes
-rw-r--r--wiki/src/install/inc/infography/temporary-tails-on-dvd.pngbin0 -> 4435 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_clone.pngbin0 -> 407 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_clone.pngbin0 -> 413 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_dvd.pngbin0 -> 408 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb.pngbin0 -> 414 bytes
-rw-r--r--wiki/src/install/inc/qrcodes/tails_boum_org_install_win_clone.pngbin0 -> 409 bytes
-rw-r--r--wiki/src/install/inc/router/clone.mdwn4
-rw-r--r--wiki/src/install/inc/screenshots/bios_boot_menu.pngbin0 -> 1123 bytes
-rw-r--r--wiki/src/install/inc/screenshots/mac_startup_dvd.pngbin0 -> 42667 bytes
-rw-r--r--wiki/src/install/inc/screenshots/mac_startup_usb.pngbin0 -> 34587 bytes
-rw-r--r--wiki/src/install/inc/steps/create_persistence.inline.mdwn15
-rw-r--r--wiki/src/install/inc/steps/install_final.inline.mdwn34
-rw-r--r--wiki/src/install/inc/steps/install_temporary_intro.inline.mdwn9
-rw-r--r--wiki/src/install/inc/steps/install_temporary_outro.inline.mdwn6
-rw-r--r--wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn8
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn12
-rw-r--r--wiki/src/install/inc/steps/not_entirely.inline.mdwn5
-rw-r--r--wiki/src/install/inc/steps/restart_final.inline.mdwn58
-rw-r--r--wiki/src/install/inc/steps/restart_temporary.inline.mdwn70
-rw-r--r--wiki/src/install/inc/steps/switch.inline.mdwn18
-rw-r--r--wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn28
-rw-r--r--wiki/src/install/inc/stylesheets/clone.css6
-rw-r--r--wiki/src/install/inc/stylesheets/debian-clone.css8
-rw-r--r--wiki/src/install/inc/stylesheets/debian.css6
-rw-r--r--wiki/src/install/inc/stylesheets/dvd.css6
-rw-r--r--wiki/src/install/inc/stylesheets/linux-clone.css8
-rw-r--r--wiki/src/install/inc/stylesheets/linux-usb.css8
-rw-r--r--wiki/src/install/inc/stylesheets/linux.css7
-rw-r--r--wiki/src/install/inc/stylesheets/mac-dvd.css8
-rw-r--r--wiki/src/install/inc/stylesheets/mac-usb.css8
-rw-r--r--wiki/src/install/inc/stylesheets/mac.css6
-rw-r--r--wiki/src/install/inc/stylesheets/steps.css12
-rw-r--r--wiki/src/install/inc/stylesheets/usb.css6
-rw-r--r--wiki/src/install/inc/stylesheets/windows-clone.css8
-rw-r--r--wiki/src/install/inc/stylesheets/windows-usb.css8
-rw-r--r--wiki/src/install/inc/stylesheets/windows.css6
-rw-r--r--wiki/src/install/linux.mdwn2
-rw-r--r--wiki/src/install/linux/clone.mdwn16
-rw-r--r--wiki/src/install/linux/usb.mdwn2
-rw-r--r--wiki/src/install/mac.mdwn4
-rw-r--r--wiki/src/install/mac/dvd.mdwn57
-rw-r--r--wiki/src/install/mac/usb.mdwn114
-rw-r--r--wiki/src/install/win.mdwn2
-rw-r--r--wiki/src/install/win/clone.mdwn16
-rw-r--r--wiki/src/install/win/usb.mdwn5
-rw-r--r--wiki/src/local.css2
56 files changed, 530 insertions, 86 deletions
diff --git a/wiki/src/install/debian.mdwn b/wiki/src/install/debian.mdwn
index 8be7e61..0aa4157 100644
--- a/wiki/src/install/debian.mdwn
+++ b/wiki/src/install/debian.mdwn
@@ -14,7 +14,7 @@ Download and install
You need:
- - 1 flash memory (USB stick or SD card of at least 4 GB)
+ - 1 USB stick (at least 4 GB)
- 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- 25 minutes to install
diff --git a/wiki/src/install/debian/clone.mdwn b/wiki/src/install/debian/clone.mdwn
index 92b051b..da2ce4f 100644
--- a/wiki/src/install/debian/clone.mdwn
+++ b/wiki/src/install/debian/clone.mdwn
@@ -1,5 +1,17 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta title="Install from another Tails"]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/debian-clone" rel="stylesheet" title=""]]
[[Back|install/debian]]
-[[!inline pages="install/inc/overview/clone" raw="yes"]]
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_temporary.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"]]
+
+[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
diff --git a/wiki/src/install/inc/infography/clone-dvd.png b/wiki/src/install/inc/infography/clone-dvd.png
new file mode 100644
index 0000000..41b98dd
--- /dev/null
+++ b/wiki/src/install/inc/infography/clone-dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/insert-dvd.png b/wiki/src/install/inc/infography/insert-dvd.png
new file mode 100644
index 0000000..3e7c0f0
--- /dev/null
+++ b/wiki/src/install/inc/infography/insert-dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/new-tails.png b/wiki/src/install/inc/infography/new-tails.png
new file mode 100644
index 0000000..3f05437
--- /dev/null
+++ b/wiki/src/install/inc/infography/new-tails.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/plug-source-usb.png b/wiki/src/install/inc/infography/plug-source-usb.png
new file mode 100644
index 0000000..ae43d56
--- /dev/null
+++ b/wiki/src/install/inc/infography/plug-source-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/plug-tails-usb.png b/wiki/src/install/inc/infography/plug-tails-usb.png
new file mode 100644
index 0000000..5581355
--- /dev/null
+++ b/wiki/src/install/inc/infography/plug-tails-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/restart-on-dvd.png b/wiki/src/install/inc/infography/restart-on-dvd.png
new file mode 100644
index 0000000..f6d0122
--- /dev/null
+++ b/wiki/src/install/inc/infography/restart-on-dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/restart-on-tails-usb.png b/wiki/src/install/inc/infography/restart-on-tails-usb.png
new file mode 100644
index 0000000..306ca64
--- /dev/null
+++ b/wiki/src/install/inc/infography/restart-on-tails-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/tails-usb-with-persistence.png b/wiki/src/install/inc/infography/tails-usb-with-persistence.png
new file mode 100644
index 0000000..c32e562
--- /dev/null
+++ b/wiki/src/install/inc/infography/tails-usb-with-persistence.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/temporary-tails-on-dvd.png b/wiki/src/install/inc/infography/temporary-tails-on-dvd.png
new file mode 100644
index 0000000..2eba184
--- /dev/null
+++ b/wiki/src/install/inc/infography/temporary-tails-on-dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_clone.png b/wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_clone.png
new file mode 100644
index 0000000..739a35c
--- /dev/null
+++ b/wiki/src/install/inc/qrcodes/tails_boum_org_install_debian_clone.png
Binary files differ
diff --git a/wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_clone.png b/wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_clone.png
new file mode 100644
index 0000000..cecc046
--- /dev/null
+++ b/wiki/src/install/inc/qrcodes/tails_boum_org_install_linux_clone.png
Binary files differ
diff --git a/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_dvd.png b/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_dvd.png
new file mode 100644
index 0000000..31f514f
--- /dev/null
+++ b/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb.png b/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb.png
new file mode 100644
index 0000000..968007f
--- /dev/null
+++ b/wiki/src/install/inc/qrcodes/tails_boum_org_install_mac_usb.png
Binary files differ
diff --git a/wiki/src/install/inc/qrcodes/tails_boum_org_install_win_clone.png b/wiki/src/install/inc/qrcodes/tails_boum_org_install_win_clone.png
new file mode 100644
index 0000000..3a8841c
--- /dev/null
+++ b/wiki/src/install/inc/qrcodes/tails_boum_org_install_win_clone.png
Binary files differ
diff --git a/wiki/src/install/inc/router/clone.mdwn b/wiki/src/install/inc/router/clone.mdwn
index a01d3ac..7d72ccd 100644
--- a/wiki/src/install/inc/router/clone.mdwn
+++ b/wiki/src/install/inc/router/clone.mdwn
@@ -6,6 +6,6 @@ Tails is up-to-date.
You need:
- - 1 friend with Tails
- - 1 flash memory (USB stick or SD card of at least 4 GB)
+ - 1 other Tails (USB stick or DVD)
+ - 1 USB stick (at least 4 GB)
- 15 minutes to install
diff --git a/wiki/src/install/inc/screenshots/bios_boot_menu.png b/wiki/src/install/inc/screenshots/bios_boot_menu.png
new file mode 100644
index 0000000..186d528
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/bios_boot_menu.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/mac_startup_dvd.png b/wiki/src/install/inc/screenshots/mac_startup_dvd.png
new file mode 100644
index 0000000..8852ffe
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/mac_startup_dvd.png
Binary files differ
diff --git a/wiki/src/install/inc/screenshots/mac_startup_usb.png b/wiki/src/install/inc/screenshots/mac_startup_usb.png
new file mode 100644
index 0000000..7959d7d
--- /dev/null
+++ b/wiki/src/install/inc/screenshots/mac_startup_usb.png
Binary files differ
diff --git a/wiki/src/install/inc/steps/create_persistence.inline.mdwn b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
index 1421359..641c74c 100644
--- a/wiki/src/install/inc/steps/create_persistence.inline.mdwn
+++ b/wiki/src/install/inc/steps/create_persistence.inline.mdwn
@@ -4,7 +4,7 @@ Create an encrypted persistent storage (optional)
<div class="step-image">[[!img inc/infography/create-persistence.png link="no"]]</div>
You can optionally create an *encrypted persistent storage* in the
-remaining free space on the second USB stick to store any of the
+remaining free space on the <span class="usb">second</span><span class="clone">new</span> Tails USB stick to store any of the
following:
- Your personal files and working documents
@@ -58,8 +58,8 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<div class="tip">
<p>We recommend choosing a long passphrase made of several random words
- rather than a single password. For example "bank violin thread duck knob
- train" is a very strong passphrase.</p>
+ rather than a single password. For example "<em>bank violin thread duck knob
+ train</em>" is a very strong passphrase.</p>
<p>To learn how to choose a good passphrase, read
<a href="https://theintercept.com/2015/03/26/passphrases-can-memorize-attackers-cant-guess/">this
@@ -72,8 +72,8 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<p>If the creation is interrupted before it finishes, you might not
be able to start Tails from this USB stick anymore. This can happen if you
close the window of the assistant or unplug the USB stick during the creation of
- the encrypted persistent storage. Reinstall the final Tails from the
- temporary Tails to fix this issue.</p>
+ the encrypted persistent storage. Reinstall Tails from the
+ <span class="usb">temporary</span><span class="clone">other</span> Tails <span class="dvd">DVD</span> to fix this issue.</p>
</div>
4. The assistant shows a list of the possible persistence features. Each
@@ -98,7 +98,7 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<div class="step-image">[[!img inc/infography/restart-on-final-tails-with-persistence.png link="no"]]</div>
-1. Shut down the computer and restart on the final Tails.
+1. Shut down the computer and restart on the <span class="usb">final</span><span class="clone">new</span> Tails<span class="dvd"> USB stick</span>.
1. In *Tails Greeter*:
@@ -126,7 +126,8 @@ it but the changes are not be saved.
<span class="guimenu">Places</span>&nbsp;▸
<span class="guimenuitem">Persistent</span></span>.
-<div class="state-image">[[!img inc/infography/final-tails-with-persistence.png link="no"]]</div>
+<div class="state-image usb clone">[[!img inc/infography/final-tails-with-persistence.png link="no"]]</div>
+<div class="state-image dvd">[[!img inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="trophy" id="recommendations">
diff --git a/wiki/src/install/inc/steps/install_final.inline.mdwn b/wiki/src/install/inc/steps/install_final.inline.mdwn
index b6b7051..b651ead 100644
--- a/wiki/src/install/inc/steps/install_final.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_final.inline.mdwn
@@ -1,7 +1,7 @@
-Install the final Tails
-=======================
+Install <span class="usb">the final</span> Tails<span class="dvd"> on a USB stick</span>
+========================================================================================
-In this step, you will install the final Tails on a second USB stick
+In this step, you will install <span class="usb">the final</span> Tails on a <span class="usb">second</span><span class="clone">new</span> USB stick
using *Tails Installer*.
<div class="caution">
@@ -10,9 +10,12 @@ using *Tails Installer*.
</div>
-<div class="step-image">[[!img inc/infography/plug-second-usb.png link="no"]]</div>
+<div class="step-image">
+[[!img inc/infography/plug-second-usb.png link="no" class="usb clone"]]
+[[!img inc/infography/plug-tails-usb.png link="no" class="dvd"]]
+</div>
-1. Plug the second USB stick in the computer.
+1. Plug the <span class="usb">second</span><span class="clone">new</span> USB stick in the computer.
1. Choose
<span class="menuchoice">
@@ -26,10 +29,13 @@ using *Tails Installer*.
[[!img inc/screenshots/tails_installer.png link=no]]
- <div class="step-image">[[!img inc/infography/clone-temporary-tails.png link="no"]]</div>
+ <div class="step-image">
+ [[!img inc/infography/clone-temporary-tails.png link="no" class="usb clone"]]
+ [[!img inc/infography/clone-dvd.png link="no" class="dvd"]]
+ </div>
1. Use the <span class="guilabel">Target Device</span> drop-down list to
- specify the second USB stick.
+ specify the <span class="usb">second</span><span class="clone">new</span> USB stick.
1. To start the installation, click on the <span
class="button">Install Tails</span> button.
@@ -43,15 +49,5 @@ using *Tails Installer*.
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">[[!img inc/infography/final-tails.png link="no"]]</div>
-
-<div class="trophy">
-
-<p>Yeah, you are done installing Tails!</p>
-
-<p>If you want to save some documents
-and configuration in an encrypted storage on your USB stick, follow
-our instructions until the end. Otherwise, have a look at our [[final
-recommendations|windows#recommendations]].</p>
-
-</div>
+<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>
diff --git a/wiki/src/install/inc/steps/install_temporary_intro.inline.mdwn b/wiki/src/install/inc/steps/install_temporary_intro.inline.mdwn
index 22a1125..a0d6747 100644
--- a/wiki/src/install/inc/steps/install_temporary_intro.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_temporary_intro.inline.mdwn
@@ -2,9 +2,10 @@ Install a temporary Tails
=========================
In this step, you will install a temporary Tails by copying the Tails ISO image on a first USB
-stick using a program called
-<span class="application windows">Universal USB Installer.</span>
-<span class="application linux">GNOME Disks.</span>
+stick using
+<span class="windows">a program called <span class="application">Universal USB Installer</span>.</span>
+<span class="mac">the command line.</span>
+<span class="linux">a program called <span class="application">GNOME Disks</span>.</span>
<div class="note">
@@ -21,4 +22,4 @@ storage to store some of your personal files.</p>
</div>
-<div class="step-image">[[!img inc/infography/plug-first-usb.png link="no"]]</div>
+<div class="step-image windows linux">[[!img inc/infography/plug-first-usb.png link="no"]]</div>
diff --git a/wiki/src/install/inc/steps/install_temporary_outro.inline.mdwn b/wiki/src/install/inc/steps/install_temporary_outro.inline.mdwn
index 5a012d0..deff9c2 100644
--- a/wiki/src/install/inc/steps/install_temporary_outro.inline.mdwn
+++ b/wiki/src/install/inc/steps/install_temporary_outro.inline.mdwn
@@ -3,7 +3,9 @@
<div class="trophy">
<p>Cool, you now have a temporary Tails on your first USB stick. You
-will soon have to reboot your computer on this USB stick. It can be a
-bit tricky, so good luck!</p>
+will soon have to reboot your computer on this USB stick.
+<span class="windows linux">It can be a bit tricky, so good luck!</span>
+<span class="mac">But it might not work on your Mac model, so good luck!</span>
+</p>
</div>
diff --git a/wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn b/wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn
new file mode 100644
index 0000000..d8ce4a0
--- /dev/null
+++ b/wiki/src/install/inc/steps/mac_startup_disks.inline.mdwn
@@ -0,0 +1,8 @@
+ <p class="mac">Immediately press-and-hold the
+ <span class="keycap">Option</span> key until a list of possible startup
+ disks appears.</p>
+
+ <p class="mac">Choose the USB stick and press
+ <span class="keycap">Enter</span>. The USB stick appears as an external hard disk and might be labelled <span class="guilabel">Windows</span> like in the following screenshot:</p>
+
+ [[!img inc/screenshots/mac_startup_usb.png class="mac" link="no" alt="Screen with the logo of an internal hard disk labelled 'Macintosh HD' and an external hard disk labelled 'Windows' (selected)"]]
diff --git a/wiki/src/install/inc/steps/not_at_all.inline.mdwn b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
index 7df94d2..e882f8a 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.mdwn
+++ b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
@@ -2,7 +2,7 @@
---------------------------------------------
The following section applies if the **Boot Tails** menu does not
- appear when starting on the USB stick.
+ appear when starting on a USB stick.
It is quite common for computers not to start automatically on a
USB stick with Tails installed. Here are two troubleshooting techniques. You should try them
@@ -15,7 +15,7 @@
to display the boot menu and start on the USB stick. The following
screenshot is an example of such boot menu:
- [[!img bios_boot_menu.png link=no]]
+ [[!img inc/screenshots/bios_boot_menu.png link=no]]
1. Identify the potential boot menu keys for the computer depending on
the computer manufacturer in the following list:
@@ -60,10 +60,8 @@
You might need to edit the BIOS settings of the computer.
<div class="tip">
-
<p>Search for the user guide of the computer on the website of its
manufacturer to learn how to edit the BIOS settings.</p>
-
</div>
In the BIOS settings, try to apply the following changes one by one and
@@ -71,12 +69,10 @@
apply to certain computer models.
<div class="caution">
-
<p>Take note of the changes that you apply to the BIOS settings, to be
able to revert them if they prevent the computer to start on
<span class="windows">Windows.</span>
<span class="linux">Linux.</span></p>
-
</div>
1. Edit the **Boot Order**. Depending on the computer model you might
@@ -101,4 +97,6 @@
If none of these options work, please [[report the problem to our
support team|doc/first_steps/bug_reporting/tails_does_not_start]].
- We're sorry but you might not be able to use Tails on this computer.
+ <div class="bug">
+ <p>We're sorry but you might not be able to use Tails on this computer.</p>
+ </div>
diff --git a/wiki/src/install/inc/steps/not_entirely.inline.mdwn b/wiki/src/install/inc/steps/not_entirely.inline.mdwn
index 835391a..c2e3ddb 100644
--- a/wiki/src/install/inc/steps/not_entirely.inline.mdwn
+++ b/wiki/src/install/inc/steps/not_entirely.inline.mdwn
@@ -39,13 +39,8 @@
Then try installing Tails on another USB stick.
<div class="caution">
-
<p>Removing the <span class="code">live-media=removable</span> option
might be dangerous. If an adversary had access to the computer and
installed a malicious Tails on an internal hard disk, the computer
might start on the malicious Tails instead of on the USB stick.</p>
-
</div>
-
- 1. In *Tails Greeter*, select your preferred language in the drop-down
- list on the bottom left of the screen. Click **Login**.
diff --git a/wiki/src/install/inc/steps/restart_final.inline.mdwn b/wiki/src/install/inc/steps/restart_final.inline.mdwn
index 0b77808..861713b 100644
--- a/wiki/src/install/inc/steps/restart_final.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_final.inline.mdwn
@@ -1,14 +1,44 @@
-Restart on the final Tails
-==========================
-
-<div class="step-image">[[!img inc/infography/restart-on-final-tails.png link="no"]]</div>
+Restart on the <span class="usb">final</span><span class="clone">new</span> Tails<span class="dvd"> USB stick</span>
+====================================================================================================================
1. Shut down the computer.
-1. Unplug the first USB stick and leave the second USB stick plugged in.
+ <div class="step-image">
+ [[!img inc/infography/restart-on-final-tails.png link="no" class="usb clone"]]
+ [[!img inc/infography/restart-on-tails-usb.png link="no" class="dvd"]]
+ </div>
+
+1. <p class="usb clone">Unplug the <span class="usb">first</span><span class="clone">other</span> USB stick and leave the <span class="usb">second</span><span class="clone">new</span> USB stick plugged in.</p>
+ <p class="dvd">Eject the DVD and leave the USB stick plugged in.</p>
1. Switch on the computer.
+ [[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes"]]
+
+ <div class="note windows-usb linux-usb">
+ <p>Some computers start successfully on the temporary Tails but fail
+ to start on the final Tails. If this is your case, refer to the
+ troubleshooting section about [[!toggle id="not_at_all" text="Tails
+ not starting at all"]].</p>
+ </div>
+
+ [[!toggleable id="not_at_all" text="""
+ <span class="hide">[[!toggle id="not_at_all" text=""]]</span>
+
+ [[!inline pages="install/inc/steps/not_at_all.inline" raw="yes"]]
+
+ """]]
+
+ <div class="bug mac">
+ <p>If your computer fails to start on the <span class="usb">final Tails,</span><span class="dvd">Tails USB stick,</span> you can
+ continue using the <span class="usb">temporary Tails</span><span class="dvd">Tails DVD</span>. <span class="usb">On this temporary Tails you
+ cannot benefit from automatic upgrades or create an encrypted
+ persistent storage.</span></p>
+ <p>You should still have a look at our
+ <span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
+ <span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span></p>
+ </div>
+
1. In the **Boot Tails** menu, choose **Live** and press **Enter**.
1. After 30&ndash;60 seconds, *Tails Greeter* appears.
@@ -17,3 +47,21 @@ Restart on the final Tails
list on the bottom left of the screen. Click **Login**.
1. After 15&ndash;30 seconds, the Tails desktop appears.
+
+<div class="trophy">
+
+<p>Yeah, you are done installing Tails!</p>
+
+<p>If you want to save some documents
+and configuration in an encrypted storage on the <span class="usb">second</span><span class="clone">new</span> Tails USB stick, follow
+our instructions until the end. Otherwise, have a look at our
+<span class="windows-usb">[[final recommendations|win/usb#recommendations]].</span>
+<span class="windows-clone">[[final recommendations|win/clone#recommendations]].</span>
+<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
+<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
+<span class="debian-clone">[[final recommendations|debian/clone#recommendations]].</span>
+<span class="linux-usb">[[final recommendations|linux/usb#recommendations]].</span>
+<span class="linux-clone">[[final recommendations|linux/clone#recommendations]].</span>
+</p>
+
+</div>
diff --git a/wiki/src/install/inc/steps/restart_temporary.inline.mdwn b/wiki/src/install/inc/steps/restart_temporary.inline.mdwn
index f3d8290..f391f91 100644
--- a/wiki/src/install/inc/steps/restart_temporary.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_temporary.inline.mdwn
@@ -1,18 +1,49 @@
-Restart on the temporary Tails
-==============================
+Restart on the <span class="usb">temporary</span><span class="clone">other</span> Tails<span class="dvd"> DVD</span>
+====================================================================================================================
-<div class="step-image">[[!img inc/infography/restart-on-temporary-tails.png link="no"]]</div>
+<div class="step-image">
+[[!img inc/infography/plug-source-usb.png link="no" class="clone"]]
+[[!img inc/infography/restart-on-temporary-tails.png link="no" class="clone usb"]]
+[[!img inc/infography/restart-on-dvd.png link="no" class="dvd"]]
+</div>
+
+<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
+in a similar way.</p>
+
+</div>
-1. Shut down the computer while leaving the first USB stick plugged in.
+1. <p>
+ <span class="dvd">Make sure that the DVD is inserted in the computer.</span>
+ <span class="usb">Shut down the computer while leaving the first 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>
1. Switch on the computer.
- If the computer starts on Tails, the **Boot Tails** menu
+ <p class="mac-dvd">Immediately press-and-hold the
+ <span class="keycap">Option</span> key until a list of possible startup
+ disks appears.</p>
+
+ <p class="mac-dvd">Choose the DVD and press
+ <span class="keycap">Enter</span>. The DVD
+ might be labelled <span class="guilabel">Windows</span> like in the following screenshot:</p>
+
+ [[!img inc/screenshots/mac_startup_dvd.png class="mac-dvd" link="no" alt="Screen with the logo of an internal hard disk labelled 'Macintosh HD' and a DVD labelled 'Windows' (selected)"]]
+
+ <div class="mac-usb">
+ [[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes"]]
+ </div>
+
+1. If the computer starts on Tails, the **Boot Tails** menu
appears. Choose **Live** and press **Enter**.
[[!img doc/first_steps/start_tails/tails_boot_menu.png link=no alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
- <div class="note">
+ <div class="note windows debian linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
<span class="windows">Windows,</span>
@@ -28,6 +59,22 @@ Restart on the temporary Tails
"""]]
+ <div class="bug mac">
+ <p>If your computer fails to start on the temporary Tails, you can
+ try these other two methods:</p>
+
+ <ul>
+ <li>[[Install from another operating system|os]]</li>
+ <li>
+ <span class="usb">[[Burn a DVD|mac/dvd]]</span>
+ <span class="dvd">[[Install from the command line|mac/usb]]</span>
+ </li>
+ </ul>
+
+ <p>If you tried them already but failed as well, then it might
+ currently be impossible to start Tails on your Mac model.</p>
+ </div>
+
1. After 30&ndash;60 seconds, another screen called *Tails Greeter*, appears.
[[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png link=no]]
@@ -46,13 +93,20 @@ Restart on the temporary Tails
"""]]
+1. In *Tails Greeter*, select your preferred language in the drop-down
+list on the bottom left of the screen. Click **Login**.
+
1. After 15&ndash;30 seconds, the Tails desktop appears.
[[!img inc/screenshots/desktop.png size=640x480 link=no]]
<div class="trophy">
-<p>The most difficult part is over. Now grab your second USB stick as it is time to
-install the final Tails.</p>
+<p>
+<span class="usb">The most difficult part is over! Now grab your second USB stick as it is time to
+install the final Tails on it.</span>
+<span class="clone 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.</span>
+</p>
</div>
diff --git a/wiki/src/install/inc/steps/switch.inline.mdwn b/wiki/src/install/inc/steps/switch.inline.mdwn
index b296818..28748c8 100644
--- a/wiki/src/install/inc/steps/switch.inline.mdwn
+++ b/wiki/src/install/inc/steps/switch.inline.mdwn
@@ -8,12 +8,22 @@ the rest of the instructions afterwards, we recommend you either:
- Open this page on your smartphone, tablet, or another computer (recommended).
- [[!img inc/qrcodes/tails_boum_org_install_win_usb.png class="windows" link="no"]]
- [[!img inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux" link="no"]]
+ [[!img inc/qrcodes/tails_boum_org_install_win_usb.png class="windows-usb" link="no"]]
+ [[!img inc/qrcodes/tails_boum_org_install_win_clone.png class="windows-clone" link="no"]]
+ [[!img inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
+ [[!img inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd" link="no"]]
+ [[!img inc/qrcodes/tails_boum_org_install_debian_clone.png class="debian-clone" 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"]]
- Print the rest of the instructions on paper.
- Take note of the URL of this page to be able to come back later:
- <a class="windows" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
- <a class="linux" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
+ <a class="windows-usb" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
+ <a class="windows-clone" href="https://tails.boum.org/install/win/clone/">https://tails.boum.org/install/win/clone/</a>
+ <a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
+ <a class="mac-dvd" href="https://tails.boum.org/install/mac/dvd/">https://tails.boum.org/install/mac/dvd/</a>
+ <a class="debian-clone" href="https://tails.boum.org/install/debian/clone/">https://tails.boum.org/install/debian/clone/</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>
diff --git a/wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn b/wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn
new file mode 100644
index 0000000..08a9ed8
--- /dev/null
+++ b/wiki/src/install/inc/steps/verify_up-to-date.inline.mdwn
@@ -0,0 +1,28 @@
+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:
+
+1. Choose <span class="menuchoice">
+ <span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Tails</span>&nbsp;▸
+ <span class="guimenuitem">About Tails</span></span>.
+
+1. Verify that you are running
+ <span class="guilabel">Tails [[!inline pages="inc/stable_i386_version" raw="yes"]]</span>
+ which is the latest version.
+
+1. If you are not running the latest version, connect to the Internet
+ and wait until Tor is ready. After a minute or two, *Tails Upgrader*
+ appears with instructions on how to upgrade.
+
+ Apply all upgrades as suggested.
+
+ <div class="bug">
+ <p>If at some point it is impossible to automatically upgrade, then
+ we recommend you
+ <span class="windows">[[choose a different installation scenario|win]].</span>
+ <span class="debian">[[choose a different installation scenario|debian]].</span>
+ <span class="linux">[[choose a different installation scenario|linux]].</span>
+ </div>
diff --git a/wiki/src/install/inc/stylesheets/clone.css b/wiki/src/install/inc/stylesheets/clone.css
new file mode 100644
index 0000000..0fa6cb6
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/clone.css
@@ -0,0 +1,6 @@
+span.clone, a.clone {
+ display: inline;
+}
+div.clone, img.clone, p.clone {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/debian-clone.css b/wiki/src/install/inc/stylesheets/debian-clone.css
new file mode 100644
index 0000000..d3fe629
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/debian-clone.css
@@ -0,0 +1,8 @@
+@import url("debian.css");
+@import url("clone.css");
+span.debian-clone, a.debian-clone {
+ display: inline;
+}
+div.debian-clone, img.debian-clone, p.debian-clone {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/debian.css b/wiki/src/install/inc/stylesheets/debian.css
new file mode 100644
index 0000000..a41c54a
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/debian.css
@@ -0,0 +1,6 @@
+span.debian, a.debian {
+ display: inline;
+}
+div.debian, img.debian, p.debian {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/dvd.css b/wiki/src/install/inc/stylesheets/dvd.css
new file mode 100644
index 0000000..cde25fc
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/dvd.css
@@ -0,0 +1,6 @@
+span.dvd, a.dvd {
+ display: inline;
+}
+div.dvd, img.dvd, p.dvd {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/linux-clone.css b/wiki/src/install/inc/stylesheets/linux-clone.css
new file mode 100644
index 0000000..60bcb7d
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/linux-clone.css
@@ -0,0 +1,8 @@
+@import url("linux.css");
+@import url("clone.css");
+span.linux-clone, a.linux-clone {
+ display: inline;
+}
+div.linux-clone, img.linux-clone, p.linux-clone {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/linux-usb.css b/wiki/src/install/inc/stylesheets/linux-usb.css
new file mode 100644
index 0000000..9d08f7e
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/linux-usb.css
@@ -0,0 +1,8 @@
+@import url("linux.css");
+@import url("usb.css");
+span.linux-usb, a.linux-usb {
+ display: inline;
+}
+div.linux-usb, img.linux-usb, p.linux-usb {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/linux.css b/wiki/src/install/inc/stylesheets/linux.css
index 35a85f9..e209ba5 100644
--- a/wiki/src/install/inc/stylesheets/linux.css
+++ b/wiki/src/install/inc/stylesheets/linux.css
@@ -1 +1,6 @@
-.windows { display: none; }
+span.linux, a.linux {
+ display: inline;
+}
+div.linux, img.linux, p.linux {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/mac-dvd.css b/wiki/src/install/inc/stylesheets/mac-dvd.css
new file mode 100644
index 0000000..62f23bd
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/mac-dvd.css
@@ -0,0 +1,8 @@
+@import url("mac.css");
+@import url("dvd.css");
+span.mac-dvd, a.mac-dvd {
+ display: inline;
+}
+div.mac-dvd, img.mac-dvd, p.mac-dvd {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/mac-usb.css b/wiki/src/install/inc/stylesheets/mac-usb.css
new file mode 100644
index 0000000..b518b33
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/mac-usb.css
@@ -0,0 +1,8 @@
+@import url("mac.css");
+@import url("usb.css");
+span.mac-usb, a.mac-usb {
+ display: inline;
+}
+div.mac-usb, img.mac-usb, p.mac-usb {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/mac.css b/wiki/src/install/inc/stylesheets/mac.css
new file mode 100644
index 0000000..2a29954
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/mac.css
@@ -0,0 +1,6 @@
+span.mac, a.mac {
+ display: inline;
+}
+div.mac, img.mac, p.mac {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/steps.css b/wiki/src/install/inc/stylesheets/steps.css
index 6147e66..6db46f2 100644
--- a/wiki/src/install/inc/stylesheets/steps.css
+++ b/wiki/src/install/inc/stylesheets/steps.css
@@ -10,13 +10,23 @@
position: absolute;
left: 2.5em;
height: 200px;
+ width: 200px;
}
.step-image img {
position: relative;
- display: block;
}
.state-image {
text-align: center;
}
+
+/* Hide all scenario-dependent bits by default. */
+
+.clone, .usb, .dvd,
+.windows, .windows-clone, .windows-usb,
+.mac, .mac-usb, .mac-dvd,
+.debian, .debian-clone, .debian-usb,
+.linux, .linux-clone, .linux-usb {
+ display: none;
+}
diff --git a/wiki/src/install/inc/stylesheets/usb.css b/wiki/src/install/inc/stylesheets/usb.css
new file mode 100644
index 0000000..5b5f0e9
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/usb.css
@@ -0,0 +1,6 @@
+span.usb, a.usb {
+ display: inline;
+}
+div.usb, img.usb, p.usb {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/windows-clone.css b/wiki/src/install/inc/stylesheets/windows-clone.css
new file mode 100644
index 0000000..bb82f22
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/windows-clone.css
@@ -0,0 +1,8 @@
+@import url("windows.css");
+@import url("clone.css");
+span.windows-clone, a.windows-clone {
+ display: inline;
+}
+div.windows-clone, img.windows-clone, p.windows-clone {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/windows-usb.css b/wiki/src/install/inc/stylesheets/windows-usb.css
new file mode 100644
index 0000000..329c3be
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/windows-usb.css
@@ -0,0 +1,8 @@
+@import url("windows.css");
+@import url("usb.css");
+span.windows-usb, a.windows-usb {
+ display: inline;
+}
+div.windows-usb, img.windows-usb, p.windows-usb {
+ display: block;
+}
diff --git a/wiki/src/install/inc/stylesheets/windows.css b/wiki/src/install/inc/stylesheets/windows.css
new file mode 100644
index 0000000..5a9d16b
--- /dev/null
+++ b/wiki/src/install/inc/stylesheets/windows.css
@@ -0,0 +1,6 @@
+span.windows, a.windows {
+ display: inline;
+}
+div.windows, img.windows, p.windows {
+ display: block;
+}
diff --git a/wiki/src/install/linux.mdwn b/wiki/src/install/linux.mdwn
index 50fe2d7..74cb26f 100644
--- a/wiki/src/install/linux.mdwn
+++ b/wiki/src/install/linux.mdwn
@@ -14,7 +14,7 @@ Download and install
You need:
- - 2 flash memories (USB sticks or SD cards of at least 4 GB)
+ - 2 USB sticks (at least 4 GB)
- 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- 45 minutes to install
diff --git a/wiki/src/install/linux/clone.mdwn b/wiki/src/install/linux/clone.mdwn
index fe38b9d..ff4fe01 100644
--- a/wiki/src/install/linux/clone.mdwn
+++ b/wiki/src/install/linux/clone.mdwn
@@ -1,5 +1,17 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta title="Install from another Tails"]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/linux-clone" rel="stylesheet" title=""]]
[[Back|install/linux]]
-[[!inline pages="install/inc/overview/clone" raw="yes"]]
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_temporary.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"]]
+
+[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
diff --git a/wiki/src/install/linux/usb.mdwn b/wiki/src/install/linux/usb.mdwn
index 8bbcf2a..558db23 100644
--- a/wiki/src/install/linux/usb.mdwn
+++ b/wiki/src/install/linux/usb.mdwn
@@ -1,6 +1,6 @@
[[!meta title="Installing Tails on a USB stick from Linux"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
-[[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/linux-usb" rel="stylesheet" title=""]]
[[Back|install/linux]]
diff --git a/wiki/src/install/mac.mdwn b/wiki/src/install/mac.mdwn
index 054fd40..b7ff91e 100644
--- a/wiki/src/install/mac.mdwn
+++ b/wiki/src/install/mac.mdwn
@@ -23,13 +23,13 @@ Anyway, ready to give it a try?
your USB stick by copying from it. Make sure that this Tails is up-to-date.
- If you don't know anyone who uses Tails or if you tried to clone and
- failed starting, then you can try this other 3 methods:
+ failed starting, then you can try these other three methods:
- [[Install from another operating system|os]]
The easiest might be to install Tails from a Windows or Linux computer.
- - [[Burn a DVD|mac/dvd]]
+ - [[Burn a DVD and then install|mac/dvd]]
- [[Install using the command line|mac/usb]]
diff --git a/wiki/src/install/mac/dvd.mdwn b/wiki/src/install/mac/dvd.mdwn
index ee74776..260e2ee 100644
--- a/wiki/src/install/mac/dvd.mdwn
+++ b/wiki/src/install/mac/dvd.mdwn
@@ -1,5 +1,58 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta title="Installing Tails on a USB stick from Mac by burning a DVD first"]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/mac-dvd" rel="stylesheet" title=""]]
[[Back|install/mac]]
-Mac to DVD
+Burn a Tails DVD
+================
+
+In this step, you will create a temporary Tails by burning the Tails ISO
+image on a DVD.
+
+ 1. Open <span class="application">Disk Utility</span> from
+ <span class="menuchoice">
+ <span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Disk Utility.app</span></span>.
+
+ <div class="step-image">[[!img inc/infography/insert-dvd.png link="no"]]</div>
+
+ 1. Insert a blank DVD. If the <span class="guilabel">You inserted a
+ blank DVD</span> dialog appears, choose
+ <span class="guilabel">Action</span>&nbsp;▸
+ <span class="guilabel">Open Disk Utility</span> to go back to
+ <span class="application">Disk Utility</span>.
+
+ 1. Choose
+ <span class="menuchoice">
+ <span class="guimenu">File</span>&nbsp;▸
+ <span class="guimenuitem">Open Disk Image&hellip;</span></span>
+ and choose the ISO image that you downloaded earlier.
+
+ 1. Click on the ISO image in the left pane.
+
+ 1. Click on the <span class="guilabel">Burn</span> button.
+
+ 1. In the confirmation dialog click
+ <span class="guilabel">Burn</span>.
+
+ 1. Wait until the DVD is burnt.
+
+<div class="state-image">[[!img inc/infography/temporary-tails-on-dvd.png link="no"]]</div>
+
+<div class="trophy">
+
+<p>Cool, you now have a temporary Tails on a DVD.</p>
+
+</div>
+
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_temporary.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
diff --git a/wiki/src/install/mac/usb.mdwn b/wiki/src/install/mac/usb.mdwn
index eb1e7e4..4b98b9e3 100644
--- a/wiki/src/install/mac/usb.mdwn
+++ b/wiki/src/install/mac/usb.mdwn
@@ -1,5 +1,115 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta title="Installing Tails on a USB stick from Mac using the command line"]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/mac-usb" rel="stylesheet" title=""]]
[[Back|install/mac]]
-Mac to USB using command line
+[[!inline pages="install/inc/steps/install_temporary_intro.inline" raw="yes"]]
+
+ 1. Open <span class="application">Terminal</span> from
+ <span class="menuchoice">
+ <span class="guimenu">Applications</span>&nbsp;▸
+ <span class="guisubmenu">Utilities</span>&nbsp;▸
+ <span class="guimenuitem">Terminal.app</span></span>.
+
+ 1. Execute the following command:
+
+ diskutil list
+
+ It returns a list of the storage devices on the system. For example:
+
+ $ diskutil list
+ /dev/disk0
+ #: TYPE NAME SIZE IDENTIFIER
+ 0: GUID_partition_scheme *500.1 GB disk0
+ 1: EFI 209.7 MB disk0s1
+ 2: Apple_HFS MacDrive 250.0 GB disk0s2
+ 3: EFI 134.1 GB disk0s3
+ 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4
+
+ <div class="step-image">[[!img inc/infography/plug-first-usb.png link="no"]]</div>
+
+ 1. Plug the first USB stick in the computer.
+
+ 1. Execute again the same command:
+
+ diskutil list
+
+ Your USB stick appears as a new device in the list. Check
+ that its size corresponds to the size of your USB stick.
+
+ $ diskutil list
+ /dev/disk0
+ #: TYPE NAME SIZE IDENTIFIER
+ 0: GUID_partition_scheme *500.1 GB disk0
+ 1: EFI 209.7 MB disk0s1
+ 2: Apple_HFS MacDrive 250.0 GB disk0s2
+ 3: EFI 134.1 GB disk0s3
+ 4: Microsoft Basic Data BOOTCAMP 115.5 GB disk0s4
+ /dev/disk1
+ #: TYPE NAME SIZE IDENTIFIER
+ 0: FDisk_partition_scheme *4.0 GB disk1
+ 1: Apple_HFS Untitled 1 4.0 GB disk1s1
+
+ 1. Take note of the *device name* of your USB stick.
+ In this example, the USB stick is 4.0 GB and its device name is `/dev/disk1`.
+ Yours might be different.
+
+ <div class="caution">
+ <p>If you are unsure about the device name, you should stop proceeding or
+ <strong>you risk overwriting any hard disk on the system</strong>.</p>
+ </div>
+
+ 1. Execute the following command to safely remove the USB stick. Replace `[device]`
+ with the device name found in step 5.
+
+ diskutil unmountDisk [device]
+
+ 1. Execute the following command to copy the ISO image that you
+downloaded earlier to the USB stick. Replace:
+
+ - `[tails.iso]` with the path to the ISO image
+
+ <div class="tip">
+ <p>If you are unsure about the path to the ISO image, you can insert the
+ correct path by dragging and dropping the icon of the ISO image from
+ <span class="application">Finder</span> onto <span class="application">
+ Terminal</span>.</p>
+ </div>
+
+ - `[device]` with the device name found in step 5
+
+ <div class="tip">
+ <p>You can add `r` before `disk` to make the installation faster.</p>
+ </div>
+
+ <pre>dd if=[tails.iso] of=[device] bs=16m && sync</pre>
+
+ You should get something like this:
+
+ dd if=/Users/me/tails-i386-1.3.iso of=/dev/rdisk9 bs=16m && sync
+
+ If no error message is returned, Tails is being copied on the USB
+ stick. The copy takes some time, generally a few minutes.
+
+ <div class="tip">
+ <p>If you get a <span class="guilabel">Permission denied</span> error, try
+ adding <code>sudo</code> at the beginning of the command:</p>
+
+ <pre>sudo dd if=[tails.iso] of=[device] bs=16m && sync</pre>
+
+ </div>
+
+ The installation is complete once the command prompt reappeared.
+
+[[!inline pages="install/inc/steps/install_temporary_outro.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_temporary.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
diff --git a/wiki/src/install/win.mdwn b/wiki/src/install/win.mdwn
index 46d3904..e66973a 100644
--- a/wiki/src/install/win.mdwn
+++ b/wiki/src/install/win.mdwn
@@ -14,7 +14,7 @@ Download and install
You need:
- - 2 flash memories (USB sticks or SD cards of at least 4 GB)
+ - 2 USB sticks (at least 4 GB)
- 30&ndash;60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- 45 minutes to install
diff --git a/wiki/src/install/win/clone.mdwn b/wiki/src/install/win/clone.mdwn
index a41e971..3e46559 100644
--- a/wiki/src/install/win/clone.mdwn
+++ b/wiki/src/install/win/clone.mdwn
@@ -1,5 +1,17 @@
-[[!meta stylesheet="bootstrap" rel="stylesheet"]]
+[[!meta title="Install from another Tails"]]
+[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
+[[!meta stylesheet="inc/stylesheets/windows-clone" rel="stylesheet" title=""]]
[[Back|install/win]]
-[[!inline pages="install/inc/overview/clone" raw="yes"]]
+[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/restart_temporary.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"]]
+
+[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
+
+[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
diff --git a/wiki/src/install/win/usb.mdwn b/wiki/src/install/win/usb.mdwn
index 7537364..f300093 100644
--- a/wiki/src/install/win/usb.mdwn
+++ b/wiki/src/install/win/usb.mdwn
@@ -1,9 +1,6 @@
[[!meta title="Installing Tails on a USB stick from Windows"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
-
-<style>
-.linux { display: none; }
-</style>
+[[!meta stylesheet="inc/stylesheets/windows-usb" rel="stylesheet" title=""]]
[[Back|install/win]]
diff --git a/wiki/src/local.css b/wiki/src/local.css
index a2f2db2..cbb1e14 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -109,7 +109,7 @@ code, kbd, samp, pre, tt, var, p.pre, p.code {
font-family: "Courier", monospace;
font-size: 1.071em; /* 14×1.071=15px */
}
-pre code { font-size: 1em; } /* ikiwiki adds <code> tags inside <pre>
+pre code { font-size: 1em; } /* ikiwiki adds <code> tags inside <pre> */
p+p {
text-indent: 1.5em;