Commit f8c29dc5 authored by sajolida's avatar sajolida
Browse files

Adjust the rest of the mac-usb instructions

parent 6b3f8325
......@@ -31,15 +31,15 @@ the rest of the instructions afterwards, we recommend you either:
<span class="upgrade-clone">`https://tails.boum.org/upgrade/clone/#back`</span>
<span class="upgrade-tails">`https://tails.boum.org/upgrade/tails/#back`</span>
<h1 id="start-intermediary" class="windows mac-usb upgrade-tails">Restart on the intermediary Tails</h1>
<h1 id="start-intermediary" class="windows upgrade-tails">Restart on the intermediary Tails</h1>
<h1 id="start-other" class="clone">Restart on the other Tails</h1>
<h1 id="start-dvd" class="mac-dvd">Restart on the Tails DVD</h1>
<h1 id="start-tails" class="linux expert">Restart on Tails</h1>
<h1 id="start-tails" class="linux mac-usb expert">Restart on Tails</h1>
<div class="step-image">
[[!img install/inc/infography/plug-source-usb.png link="no" class="clone" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="linux" alt="Computer restarted on USB stick on the right"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no" class="clone windows mac-usb" alt="Computer restarted on USB stick on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="linux mac-usb" alt="Computer restarted on USB stick on the right"]]
[[!img install/inc/infography/restart-on-intermediary-tails.png link="no" class="clone windows" alt="Computer restarted on USB stick on the left"]]
[[!img install/inc/infography/restart-on-dvd.png link="no" class="mac-dvd" alt="Computer restarted on DVD"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]]
</div>
......@@ -58,7 +58,7 @@ from a Tails DVD in a similar way.</p>
1. <p>
<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 mac">first</span> USB stick plugged in.</span>
<span class="usb">Shut down the computer while leaving the <span class="windows">first</span> USB stick plugged in.</span>
</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
......@@ -85,12 +85,6 @@ from a Tails DVD in a similar way.</p>
[[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes" sort="age"]]
</div>
<div class="bug mac">
<p>If only your Macintosh hard drive appears, you can try
reinstalling an intermediary Tails from [[Windows using
<span class="application">Universal USB Installer</span>|win/usb]].</p>
</div>
1. If the computer starts on Tails, the <span class="application">Boot Loader Menu</span>
appears and Tails starts automatically after 4 seconds.</p>
......@@ -118,16 +112,7 @@ from a Tails DVD in a similar way.</p>
[[!img install/inc/screenshots/tails_boot_menu.png link="no" alt="Black screen with Tails artwork. Boot Loader Menu with two options 'Tails' and 'Tails (Troubleshooting Mode)'."]]
<div class="bug mac-usb mac-clone">
<p>If your computer fails to start on the intermediary Tails, you can
try these other two methods:</p>
<ul>
<li class="mac-usb">[[Install from another operating system|install]]</li>
<li class="mac-usb mac-clone">[[Burn a DVD and then install|mac/dvd]]</li>
<li class="mac-clone">[[Install from the command line|mac/usb]]</li>
</ul>
<p>If you tried them already but failed as well, then it might
<p>If your computer fails to start on the USB stick, then it might
currently be impossible to start Tails on your Mac model.</p>
</div>
......@@ -221,7 +206,7 @@ Click <span class="button">Start Tails</span>.
[[!img install/inc/screenshots/desktop.png link="no" alt="Tails desktop"]]
<div class="trophy windows mac">
<div class="trophy windows">
<p 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.</p>
......
......@@ -14,5 +14,5 @@ li.mac-usb {
}
h1:before, span.next-counter:before {
content: counter(step)'/7';
content: counter(step)'/5';
}
......@@ -84,8 +84,4 @@ Install Tails
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_final.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_second_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes" sort="age"]]
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