From 63da7da0ec390f129f4479820912a8492a6b9a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 23 Mar 2015 19:42:12 +0100 Subject: [PATCH] anaconda: update Qubes-specific code for Fedora 21 version --- anaconda/data/help/en-US/FedoraPlaceholder.html | 5 ----- anaconda/data/help/en-US/QubesPlaceholder.html | 5 +++++ ...thLinks.html => QubesPlaceholderWithLinks.html} | 4 ++-- anaconda/data/help/en-US/RHEL7Placeholder.html | 5 ----- .../data/help/en-US/RHEL7PlaceholderWithLinks.html | 11 ----------- anaconda/pyanaconda/bootloader.py | 2 +- anaconda/pyanaconda/installclasses/qubes.py | 14 ++++++++++---- 7 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 anaconda/data/help/en-US/FedoraPlaceholder.html create mode 100644 anaconda/data/help/en-US/QubesPlaceholder.html rename anaconda/data/help/en-US/{FedoraPlaceholderWithLinks.html => QubesPlaceholderWithLinks.html} (62%) delete mode 100644 anaconda/data/help/en-US/RHEL7Placeholder.html delete mode 100644 anaconda/data/help/en-US/RHEL7PlaceholderWithLinks.html diff --git a/anaconda/data/help/en-US/FedoraPlaceholder.html b/anaconda/data/help/en-US/FedoraPlaceholder.html deleted file mode 100644 index 4d1781a..0000000 --- a/anaconda/data/help/en-US/FedoraPlaceholder.html +++ /dev/null @@ -1,5 +0,0 @@ - -

The Anaconda built-in help

-

...is not yet available for this screen.

-

You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead.

- diff --git a/anaconda/data/help/en-US/QubesPlaceholder.html b/anaconda/data/help/en-US/QubesPlaceholder.html new file mode 100644 index 0000000..6811a38 --- /dev/null +++ b/anaconda/data/help/en-US/QubesPlaceholder.html @@ -0,0 +1,5 @@ + +

The Anaconda built-in help

+

...is not yet available for this screen.

+

You can check the Anaconda wiki page, the Qubes Installation Guide or other online help resources instead.

+ diff --git a/anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html b/anaconda/data/help/en-US/QubesPlaceholderWithLinks.html similarity index 62% rename from anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html rename to anaconda/data/help/en-US/QubesPlaceholderWithLinks.html index 5fe0485..0f7d7dc 100644 --- a/anaconda/data/help/en-US/FedoraPlaceholderWithLinks.html +++ b/anaconda/data/help/en-US/QubesPlaceholderWithLinks.html @@ -1,10 +1,10 @@

The Anaconda built-in help

...is not yet available for this screen.

-

You can check the Anaconda wiki page, the Fedora Installation Guide or other online help resources instead:

+

You can check the Anaconda wiki page, the Qubes Installation Guide or other online help resources instead: