summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-05-22 12:45:53 +0000
committersajolida <sajolida@pimienta.org>2018-06-01 18:22:13 +0000
commitde892614942b14f5e61ca5c2c91b23f8b71b29d3 (patch)
tree610e6c6a187696455842675f36e48d7510c44477
parent600f28a687d7130fad066218fa222f2a30856046 (diff)
Point to /doc instead of /getting_started (Will-fix: #15575)
- /getting_started is very old and needs a serious lifting. - During the user testing of the Additional Software beta, 3 out of 5 participants ended up on this page. None of them read it. 2 used it to reach /doc which is what they were looking for. 1 got lost and ended up on /design.
-rwxr-xr-xconfig/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-documentation2
-rw-r--r--config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in2
-rw-r--r--features/documentation.feature4
-rw-r--r--features/step_definitions/browser.rb4
-rw-r--r--features/step_definitions/checks.rb2
6 files changed, 8 insertions, 8 deletions
diff --git a/config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in b/config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in
index 0699565..f59204b 100755
--- a/config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in
+++ b/config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in
@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=Tails documentation
Type=Application
Terminal=false
-Exec=/usr/local/bin/tails-documentation getting_started
+Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
diff --git a/config/chroot_local-includes/usr/local/bin/tails-documentation b/config/chroot_local-includes/usr/local/bin/tails-documentation
index f8cfaf7..f14ecad 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-documentation
+++ b/config/chroot_local-includes/usr/local/bin/tails-documentation
@@ -87,7 +87,7 @@ class DocumentationWindow(tailsgreeter.gui.GreeterHelpWindow):
try:
page = sys.argv[1]
except IndexError:
- page = 'getting_started'
+ page = 'doc'
try:
anchor = sys.argv[2]
diff --git a/config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in b/config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in
index 71d1dd9..da1d900 100644
--- a/config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in
+++ b/config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in
@@ -6,5 +6,5 @@ _Comment=Learn how to use Tails
Categories=Documentation;Tails;
Type=Application
Terminal=false
-Exec=/usr/local/bin/tails-documentation getting_started
+Exec=/usr/local/bin/tails-documentation doc
Icon=/usr/share/icons/gnome/48x48/categories/system-help.png
diff --git a/features/documentation.feature b/features/documentation.feature
index 309e1db..8435e61 100644
--- a/features/documentation.feature
+++ b/features/documentation.feature
@@ -6,7 +6,7 @@ Feature: Tails documentation
Scenario: The Tails documentation launcher on the desktop works when offline
Given I have started Tails from DVD without network and logged in
When I double-click on the Tails documentation launcher on the desktop
- Then the documentation viewer opens the "Getting started" page
+ Then the documentation viewer opens the "Documentation" page
#15514
@fragile
@@ -14,7 +14,7 @@ Feature: Tails documentation
Given I have started Tails from DVD and logged in and the network is connected
When I double-click on the Tails documentation launcher on the desktop
Then the Tor Browser starts
- And the Tor Browser opens the Getting started page
+ And the Tor Browser opens the "Documentation" page
#15321
@fragile
diff --git a/features/step_definitions/browser.rb b/features/step_definitions/browser.rb
index 48d9f7b..d152428 100644
--- a/features/step_definitions/browser.rb
+++ b/features/step_definitions/browser.rb
@@ -220,10 +220,10 @@ end
# python2 (#12185) we have terrible unicode support; for instance
# `.child('Tails - Getting started…')` will fail since Dogtail expects
# ascii and cannot decode "…".
-Then /^the Tor Browser opens the Getting started page$/ do
+Then /^the Tor Browser opens the "Documentation" page$/ do
try_for(60) do
@torbrowser
.children(roleName: "document frame")
- .any? { |f| f.name == 'Tails - Getting started…' }
+ .any? { |f| f.name == 'Tails - Documentation' }
end
end
diff --git a/features/step_definitions/checks.rb b/features/step_definitions/checks.rb
index 0dba630..c3bd942 100644
--- a/features/step_definitions/checks.rb
+++ b/features/step_definitions/checks.rb
@@ -94,7 +94,7 @@ Then /^the VirtualBox guest modules are available$/ do
"The vboxguest module is not available.")
end
-Then /^the documentation viewer opens the "(Support|Getting started)" page$/ do |page|
+Then /^the documentation viewer opens the "(Support|Documentation)" page$/ do |page|
if @language == 'German'
expected_title = 'Tails-Dokumentation'
if page == 'Support'