[install-guide/f21-branch: 2/2] Merge branch 'f21-branch' of ssh://git.fedorahosted.org/git/docs/install-guide into f21-branch
Pete Travis
immanetize at fedoraproject.org
Sat Dec 6 20:25:59 UTC 2014
commit 6144f61df8b68cd445d258002378cbb5e8d563ba
Merge: ba0a4ae 6c83cc7
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Sat Dec 6 13:24:10 2014 -0700
Merge branch 'f21-branch' of ssh://git.fedorahosted.org/git/docs/install-guide into f21-branch
en-US/CustomSpoke.xml | 32 +++++++++++---
en-US/CustomSpoke_AddBtrfs.xml | 16 +++++-
en-US/CustomSpoke_AddLVM.xml | 16 +++++-
en-US/CustomSpoke_AddPhysical.xml | 16 +++++-
en-US/CustomSpoke_FileSystems.xml | 2 +-
en-US/CustomSpoke_RecommendedScheme.xml | 2 +-
en-US/CustomSpoke_SoftwareRAID.xml | 16 +++++-
en-US/DateTimeSpoke.xml | 32 +++++++++++---
en-US/FilterSpoke.xml | 16 +++++-
en-US/InitialSetupHub.xml | 16 +++++-
en-US/KeyboardSpoke.xml | 16 +++++-
en-US/LangSupportSpoke.xml | 16 +++++-
en-US/NetworkSpoke.xml | 16 +++++-
en-US/NetworkSpoke_EditConnection.xml | 4 +-
en-US/PasswordSpoke.xml | 18 ++++++--
en-US/ProgressHub.xml | 16 +++++-
en-US/SoftwareSpoke.xml | 16 +++++-
en-US/SourceSpoke.xml | 16 +++++-
en-US/StorageSpoke.xml | 32 +++++++++++---
en-US/StorageSpoke_BootLoader.xml | 16 +++++-
en-US/SummaryHub.xml | 48 ++++++++++++++++----
en-US/UserSpoke.xml | 31 +++++++++++--
en-US/WelcomeSpoke.xml | 16 +++++-
en-US/images/anaconda/CustomSpoke.png | Bin 0 -> 112962 bytes
en-US/images/anaconda/CustomSpoke_AddBtrfs.png | Bin 0 -> 86907 bytes
en-US/images/anaconda/CustomSpoke_AddLVM.png | Bin 0 -> 89554 bytes
en-US/images/anaconda/CustomSpoke_AddPhysical.png | Bin 0 -> 83841 bytes
en-US/images/anaconda/CustomSpoke_RescanDisks.png | Bin 0 -> 47162 bytes
en-US/images/anaconda/CustomSpoke_SoftwareRAID.png | Bin 0 -> 27847 bytes
en-US/images/anaconda/DateTimeSpoke.png | Bin 0 -> 193476 bytes
en-US/images/anaconda/DateTimeSpoke_AddNTP.png | Bin 0 -> 22558 bytes
en-US/images/anaconda/FilterSpoke.png | Bin 0 -> 55181 bytes
en-US/images/anaconda/InitialSetupHub.png | Bin 0 -> 87255 bytes
en-US/images/anaconda/KeyboardSpoke.png | Bin 0 -> 58886 bytes
en-US/images/anaconda/LangSupportSpoke.png | Bin 0 -> 79695 bytes
en-US/images/anaconda/NetworkSpoke.png | Bin 0 -> 61703 bytes
en-US/images/anaconda/PasswordSpoke.png | Bin 0 -> 35651 bytes
en-US/images/anaconda/ProgressHub.png | Bin 0 -> 124105 bytes
en-US/images/anaconda/SoftwareSpoke.png | Bin 0 -> 208279 bytes
en-US/images/anaconda/SourceSpoke.png | Bin 0 -> 74742 bytes
en-US/images/anaconda/StorageSpoke.png | Bin 0 -> 84150 bytes
en-US/images/anaconda/StorageSpoke_BootLoader.png | Bin 0 -> 31851 bytes
en-US/images/anaconda/StorageSpoke_Selected.png | Bin 0 -> 21577 bytes
en-US/images/anaconda/SummaryHub.png | Bin 0 -> 117120 bytes
en-US/images/anaconda/SummaryHub_Mouseover.png | Bin 0 -> 14177 bytes
en-US/images/anaconda/SummaryHub_States.png | Bin 0 -> 54008 bytes
en-US/images/anaconda/UserSpoke.png | Bin 0 -> 46540 bytes
en-US/images/anaconda/UserSpoke_Advanced.png | Bin 0 -> 91884 bytes
en-US/images/anaconda/WelcomeSpoke.png | Bin 0 -> 124854 bytes
prepare_anaconda_help_content.py | 2 +
50 files changed, 346 insertions(+), 81 deletions(-)
---
diff --cc en-US/StorageSpoke_BootLoader.xml
index 1cd1d52,9d2785b..0c1c416
--- a/en-US/StorageSpoke_BootLoader.xml
+++ b/en-US/StorageSpoke_BootLoader.xml
@@@ -17,11 -17,21 +17,21 @@@
If you have other operating systems already installed, the &PRODUCT; installer will attempt to automatically detect and configure the boot loader to start them. You can manually configure any additional operating systems after you finish the installation, if they are not detected properly. For instructions on editing <application>GRUB2</application> configuration, see the <citetitle>&PRODUCT; System Administrator's Guide</citetitle>, available at <ulink url="http://docs.fedoraproject.org/" />
</para>
<para>
- To specify which device the boot loader should be installed on, click the <guilabel>Full disk summary and bootloader</guilabel> link at the bottom of the <guilabel>Installation Destination</guilabel> screen. The <guilabel>Selected Disks</guilabel> dialog will appear. If you are configuring your partitioning layout manually, the same dialog can be accessed from <xref linkend="sect-installation-gui-manual-partitioning" /> using the <guilabel><replaceable>X</replaceable> storage devices selected</guilabel> link in the bottom left corner of the screen.
+ If you are installing Fedora on a non-UEFI system with more than one disk, you may want to manually specify where the bootloader should be installed. Click the <guilabel>Full disk summary and bootloader</guilabel> link at the bottom of the <guilabel>Installation Destination</guilabel> screen. The <guilabel>Selected Disks</guilabel> dialog will appear. If you are configuring your partitioning layout manually, the same dialog can be accessed from <xref linkend="sect-installation-gui-manual-partitioning" /> using the <guilabel><replaceable>X</replaceable> storage devices selected</guilabel> link in the bottom left corner of the screen.
</para>
- <para>
- <remark>TODO: screen</remark>
- </para>
+ <figure>
+ <title>Boot Device Selection</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/anaconda/StorageSpoke_BootLoader.png" format="PNG" scalefit="0" />
+ </imageobject>
+ <textobject>
+ <para>
+ The Selected Disks dialog, displaying all disks selected as installation targets and allowing you to set one of them as a boot device. The boot loader will be installed onto that device.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
<para>
In the <guilabel>Boot</guilabel> column, a "tick" icon marks one of the devices as the intended boot device. To change the boot device, select a device from the list and click the <guilabel>Set as Boot Device</guilabel> button to install the boot loader there instead. Only one device can be set as the boot device.
</para>
More information about the docs-commits
mailing list