summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-05 18:56:41 +0000
committerintrigeri <intrigeri@boum.org>2016-12-05 19:01:09 +0000
commit860a483558a84303e1528b18f0f8145bf7531c3f (patch)
treee9b44d32b2cec0e753837febd4f6561105637120
parent3efaa0cf29c8fceb03e25d94d12c714348b3d47b (diff)
Replace "Boot Tails" with "boot loader menu", and adjust styling to the fact this name is not displayed anymore (refs: #11975).
I've used the same styling that was already used in one place for "boot loader menu" in startup_options.mdwn, for consistency.
-rw-r--r--wiki/src/doc/first_steps/startup_options.mdwn2
-rw-r--r--wiki/src/install/inc/steps/not_at_all.inline.mdwn6
-rw-r--r--wiki/src/install/inc/steps/restart_first_time.inline.mdwn16
-rw-r--r--wiki/src/install/inc/steps/restart_second_time.inline.mdwn4
4 files changed, 8 insertions, 20 deletions
diff --git a/wiki/src/doc/first_steps/startup_options.mdwn b/wiki/src/doc/first_steps/startup_options.mdwn
index c9ebb29..be21b0f 100644
--- a/wiki/src/doc/first_steps/startup_options.mdwn
+++ b/wiki/src/doc/first_steps/startup_options.mdwn
@@ -23,7 +23,7 @@ starting Tails.
</div>
1. To add a boot option, press <span class="keycap">Tab</span> when the
- <span class="application">boot menu</span> appears. A list of boot options
+ <span class="application">boot loader menu</span> appears. A list of boot options
appears at the bottom of the screen.
XXX: update screenshot and alt text
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 b7d8a58..5fa1ee6 100644
--- a/wiki/src/install/inc/steps/not_at_all.inline.mdwn
+++ b/wiki/src/install/inc/steps/not_at_all.inline.mdwn
@@ -1,10 +1,8 @@
Tails does not start at all
---------------------------
- XXX: "Boot Tails" isn't there anymore.
-
- The following section applies if the <span class="guilabel">Boot Tails</span>
- menu does not appear when starting on a USB stick.
+ The following section applies if the <span class="application">boot loader menu</span>
+ does not 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 some troubleshooting techniques. You should try them
diff --git a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
index 5d9bf29..be6d5c4 100644
--- a/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_first_time.inline.mdwn
@@ -88,9 +88,7 @@ from a Tails DVD in a similar way.</p>
[[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes"]]
</div>
- XXX: "Boot Tails" isn't there anymore.
-
-1. If the computer starts on Tails, the <span class="guilabel">Boot Tails</span> menu
+1. If the computer starts on Tails, the <span class="application">boot loader menu</span>
appears. Choose <span class="guilabel">Tails</span> and press <span class="keycap">Enter</span>.
<div class="note install-clone debian expert windows linux">
@@ -155,25 +153,19 @@ XXX: update screenshot
Tails does not start entirely
-----------------------------
- XXX: "Boot Tails" isn't there anymore.
-
- The following section applies if the <span class="guilabel">Boot Tails</span> menu appears but not
+ The following section applies if the <span class="application">boot loader menu</span> appears but not
<span class="application">Tails Greeter</span> when starting Tails.
1. Restart the computer on the first USB stick.
- XXX: "Boot Tails" isn't there anymore.
-
- 1. In the <span class="guilabel">Boot Tails</span> menu, choose the
+ 1. In the <span class="application">boot loader menu</span>, choose the
<span class="guilabel">troubleshooting mode</span>
which might work better on some computers.
1. If the <span class="guilabel">troubleshooting mode</span> does not work
better, restart the computer again on the first USB stick.
- XXX: "Boot Tails" isn't there anymore.
-
- 1. In the <span class="guilabel">Boot Tails</span> menu, press
+ 1. In the <span class="application">boot loader menu</span>, press
<span class="keycap">TAB</span>. A command line with a list
of boot options appears at the bottom of the screen.
diff --git a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
index 4846fd5..7a68d64 100644
--- a/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
+++ b/wiki/src/install/inc/steps/restart_second_time.inline.mdwn
@@ -56,9 +56,7 @@
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span></p>
</div>
-XXX: "Boot Tails" isn't there anymore.
-
-1. In the <span class="guilabel">Boot Tails</span> menu, choose
+1. In the <span class="application">boot loader menu</span>, choose
<span class="guilabel">Tails</span> and press <span class="keycap">Enter</span>.
1. After 30&ndash;60 seconds, <span class="application">Tails Greeter</span> appears.