Commit c3a17703 authored by Ulrike Uhlig's avatar Ulrike Uhlig
Browse files

Merge branch 'master' into feature/12035+teardown

parents b994e639 36cb75c7
......@@ -68,7 +68,6 @@
./install/inc/steps/restart_first_time.inline
./install/inc/steps/restart_second_time.inline
./install/inc/steps/verify_up-to-date.inline
./install/inc/tails-installation-assistant.inline
./install/linux/clone-overview
./install/linux
./install/linux/usb
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes" sort="age"]]
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-debian-ubuntu.png link="no" alt=""]]</div>
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-linux.png link="no" alt=""]]</div>
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/mac-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes" sort="age"]]
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/mac-dvd" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-mac.png link="no" alt=""]]</div>
......
......@@ -11,8 +11,6 @@
<p class="start">Start in macOS.</p>
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_intermediary_intro.inline" raw="yes" sort="age"]]
1. Make sure that the first USB stick is unplugged.
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-windows.png link="no" alt=""]]</div>
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes" sort="age"]]
......
......@@ -5,8 +5,6 @@
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-tails" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div class="hidden-step-1"></div>
<div class="step-image">[[!img install/inc/infography/os-tails.png link="no" alt=""]]</div>
......
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