[install-guide] Adding Software Spoke
by pbokoc
commit 5076b43a3e479a6af6dac84d378459c2e7b6a90c
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Thu Nov 6 17:12:29 2014 +0100
Adding Software Spoke
en-US/SoftwareSpoke.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/en-US/SoftwareSpoke.xml b/en-US/SoftwareSpoke.xml
index 398783a..ac129c7 100644
--- a/en-US/SoftwareSpoke.xml
+++ b/en-US/SoftwareSpoke.xml
@@ -6,6 +6,32 @@
<section id="sect-installation-gui-software-selection">
<title>Software Selection</title>
<para>
- text
+ The <guilabel>Software Selection</guilabel> screen allows you to choose a <firstterm>Base Environment</firstterm> and <firstterm>Add-ons</firstterm>. These options control which software packages will be installed on your system during the installation process.
+ </para>
+ <para>
+ This screen is only available if there is an installation source configured in <xref linkend="sect-installation-gui-installation-source" />.
+ </para>
+ <note>
+ <para>
+ It is not possible to select specific packages during a manual installation. You can only select pre-defined environments and add-ons. If you need to control exactly which packages are installed, you must use a Kickstart file and define the packages in the <command>%packages</command> section. See <xref linkend="chap-kickstart-installations" /> for information about Kickstart installations.
+ </para>
+ </note>
+ <para>
+ The availability of environments and add-ons depends on the installation source specified in <xref linkend="sect-installation-gui-installation-source" />. By default, the selection depends on the installation media you used to start the installation; Fedora Server installation image will have different environments and add-ons available for selection than, for example, the Fedora Cloud image. You can change this by configuring a different installation source containing different environments.
+ </para>
+ <para>
+ <remark>TODO: screen</remark>
+ </para>
+ <para>
+ Select an environment on the left side of the screen. Only one environment can be selected, even if more are available. Then, on the right side of the screen, select one or more add-ons which you want to install by marking the check boxes next to each add-on.
+ </para>
+ <para>
+ The list of add-ons is divided into two parts by a horizontal line. Add-ons above this line are defined as part of your chosen environment; if you select a different environment, the add-ons available here will change. The add-ons displayed below the separator are not specific to your chosen environment.
+ </para>
+ <para>
+ Environments and add-ons are defined using a <filename>comps.xml</filename> file in your installation source (for example, in the <filename class="directory">repodata/</filename> directory on the full Fedora Server installation DVD). Review this file to see exactly which packages will be installed as part of a certain environment or add-on. For more information about the <filename>comps.xml</filename> file, see <xref linkend="sect-kickstart-packages" />.
+ </para>
+ <para>
+ After you finish configuring your software selection, click <guilabel>Done</guilabel> in the top left corner to return to <xref linkend="sect-installation-gui-installation-summary" />.
</para>
</section>
9 years, 7 months
[install-guide] Cleaning up references to comps.xml in Kickstart %packages section
by pbokoc
commit 732e032b02d0c7e2c27de5f897a7ea5b625e1bc4
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Thu Nov 6 17:12:12 2014 +0100
Cleaning up references to comps.xml in Kickstart %packages section
en-US/Kickstart_Syntax_Reference.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/en-US/Kickstart_Syntax_Reference.xml b/en-US/Kickstart_Syntax_Reference.xml
index 0b67c1b..023bc8f 100644
--- a/en-US/Kickstart_Syntax_Reference.xml
+++ b/en-US/Kickstart_Syntax_Reference.xml
@@ -3396,10 +3396,10 @@
Use the <command>%packages</command> command to begin a Kickstart section which describes the software packages to be installed. This section must end with an <command>%end</command> statement.
</para>
<para>
- You can specify packages by <firstterm>environment</firstterm>, <firstterm>group</firstterm>, or by their package names. Several environments and groups that contain related packages are defined. See the <filename>repodata/*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file <remark>TODO: where's comps.xml?</remark>
+ You can specify packages by <firstterm>environment</firstterm>, <firstterm>group</firstterm>, or by their package names. Several environments and groups that contain related packages are defined. See the <filename>repodata/comps.xml</filename> file in your installation source for environment and group definitions.
</para>
<para>
- The <filename>*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file contains a structure describing available environments (marked by the <literal><environment></literal> tag) and groups (the <literal><group></literal> tag). Each entry has an ID, user visibility value, name, description, and package list. If the group is selected for installation, the packages marked <literal>mandatory</literal> in the package list are always installed, the packages marked <literal>default</literal> are installed if they are not specifically excluded, and the packages marked <literal>optional</literal> must be specifically included even when the group is selected.
+ The <filename>comps.xml</filename> file contains a structure describing available environments (marked by the <literal><environment></literal> tag) and groups (the <literal><group></literal> tag). Each entry has an ID, user visibility value, name, description, and package list. If the group is selected for installation, the packages marked <literal>mandatory</literal> in the package list are always installed, the packages marked <literal>default</literal> are installed if they are not specifically excluded, and the packages marked <literal>optional</literal> must be specifically included even when the group is selected.
</para>
<para>
You can specify a package group or environment using either its ID (the <literal><id></literal> tag) or name (the <literal><name></literal> tag).
@@ -3428,7 +3428,7 @@
<command>%end</command>
</programlisting>
<para>
- This command will install all packages which are part of the <guilabel>Infrastracture Server</guilabel> environment. All available environments are described in the <filename>repodata/*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file.
+ This command will install all packages which are part of the <guilabel>Infrastracture Server</guilabel> environment. All available environments are described in the <filename>comps.xml</filename> file.
</para>
</listitem>
</varlistentry>
@@ -3436,7 +3436,7 @@
<term>Specifying Groups</term>
<listitem>
<para>
- Specify groups, one entry to a line, starting with an <literal>@</literal> symbol, and then the full group name or group id as given in the <filename>*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file. For example:
+ Specify groups, one entry to a line, starting with an <literal>@</literal> symbol, and then the full group name or group id as given in the <filename>comps.xml</filename> file. For example:
</para>
<programlisting>
<command>%packages</command>
@@ -3449,7 +3449,7 @@
The <literal>Core</literal> and <literal>Base</literal> groups are always selected - it is not necessary to specify them in the <command>%packages</command> section.
</para>
<para>
- The <filename>*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file also defines groups called <literal>Conflicts (<replaceable>variant</replaceable>)</literal> for each variant of &PRODUCT;. This group contains all packages which are known to cause file conflicts, and is intended to be excluded.
+ The <filename>comps.xml</filename> file also defines groups called <literal>Conflicts (<replaceable>variant</replaceable>)</literal> for each variant of &PRODUCT;. This group contains all packages which are known to cause file conflicts, and is intended to be excluded.
</para>
</listitem>
</varlistentry>
@@ -3577,7 +3577,7 @@ docbook*
</term>
<listitem>
<para>
- Install packages marked as optional in the group definition in the <filename>*-comps-<replaceable>variant</replaceable>.<replaceable>architecture</replaceable>.xml</filename> file, in addition to installing the default selections. <remark>TODO: where are comps in Fedora?</remark>
+ Install packages marked as optional in the group definition in the <filename>comps.xml</filename> file, in addition to installing the default selections.
</para>
<para>
Note that some package groups, such as <literal>Scientific Support</literal>, do not have any mandatory or default packages specified - only optional packages. In this case the <option>--optional</option> option must always be used, otherwise no packages from this group will be installed.
9 years, 7 months
[install-guide] Small adjustments in Language Support
by pbokoc
commit 1bba0bf8fa0c8769b15ee075c7669cf5555c35bc
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Thu Nov 6 15:16:13 2014 +0100
Small adjustments in Language Support
en-US/LangSupportSpoke.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/en-US/LangSupportSpoke.xml b/en-US/LangSupportSpoke.xml
index fae9c31..ca1da58 100644
--- a/en-US/LangSupportSpoke.xml
+++ b/en-US/LangSupportSpoke.xml
@@ -20,11 +20,16 @@
<remark>TODO: screen</remark>
</para>
<para>
- The left panel contains a list of available language groups such as <guilabel>English</guilabel> or <guilabel>Bulgarian</guilabel>. If at least one language from a group is selected, the group name will be displayed in bold letters.
+ The left panel contains a list of available language groups such as <guilabel>English</guilabel> or <guilabel>Bulgarian</guilabel>. If at least one language from a group is selected, a check mark will be displayed next to the group, and the list entry will be highlighted. This allows you to easily see which languages you have configured support for.
</para>
<para>
- To add support for one or more additional language, click a group in the left panel, and then select one or more regional variations in the right panel using check boxes next to list entries. Repeat this process for all languages you want to be available on the installed system.
+ To add support for one or more additional languages, click a group in the left panel, and then select one or more regional variations in the right panel using check boxes next to list entries. Repeat this process for all languages you want to install support for.
</para>
+ <note>
+ <para>
+ Enabling support for some languages (typically languages which use non-Latin script) will install additional packages - for example, enabling support for one or more languages from the <guilabel>Arabic</guilabel> group will also install the <literal>arabic-support</literal> package group. For more information about packages, see <xref linkend="sect-installation-gui-language-support" />.
+ </para>
+ </note>
<para>
Once you have made your selections, click <guilabel>Done</guilabel> in the top left corner to return to <xref linkend="sect-installation-gui-installation-summary" />.
</para>
9 years, 7 months
[install-guide/f21-branch] Updating a btrfs and cmdline in Kickstart
by pbokoc
commit b87cde390da93a4f04f42952f9db9bb12a45f427
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Wed Nov 5 17:43:22 2014 +0100
Updating a btrfs and cmdline in Kickstart
en-US/Kickstart_Syntax_Reference.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/en-US/Kickstart_Syntax_Reference.xml b/en-US/Kickstart_Syntax_Reference.xml
index e0ab490..0b67c1b 100644
--- a/en-US/Kickstart_Syntax_Reference.xml
+++ b/en-US/Kickstart_Syntax_Reference.xml
@@ -709,7 +709,7 @@
<term><option>--data=</option></term>
<listitem>
<para>
- RAID level to use for file system <emphasis>data</emphasis> (such as <literal>0</literal>, <literal>1</literal>, or <literal>10</literal>). This parameter is optional and has no meaning for subvolumes.
+ RAID level to use for file system <emphasis>data</emphasis> (such as <literal>0</literal>, <literal>1</literal>, or <literal>10</literal>). This parameter is optional, has no meaning for subvolumes, and requires more than one physical disk.
</para>
</listitem>
</varlistentry>
@@ -717,7 +717,7 @@
<term><option>--metadata=</option></term>
<listitem>
<para>
- RAID level to use for file system/volume <emphasis>metadata</emphasis> (such as <literal>0</literal>, <literal>1</literal>, or <literal>10</literal>). This parameter is optional and has no meaning for subvolumes.
+ RAID level to use for file system/volume <emphasis>metadata</emphasis> (such as <literal>0</literal>, <literal>1</literal>, or <literal>10</literal>). This parameter is optional, has no meaning for subvolumes, and requires more than one physical disk.
</para>
</listitem>
</varlistentry>
@@ -3065,7 +3065,7 @@
<section id="sect-kickstart-commands-cmdline">
<title>cmdline (optional) - Perform Installation in Command Line Mode</title>
<para>
- Perform the installation in a completely non-interactive command line mode. Any prompts for interaction halts the install. This mode is useful on IBM System z systems with the x3270 terminal. The recommended use is in conjunction with the <option>RUNKS=1</option> and <option>inst.ks=</option> parameters.
+ Perform the installation in a completely non-interactive command line mode. Any prompts for interaction halts the install. This mode is useful on IBM System z systems with the x3270 terminal.
</para>
</section>
9 years, 7 months
[install-guide] Adding entity defs into a few files
by pbokoc
commit a8139dd04d10675864441b8fadb482dade07eff0
Author: Petr Bokoc <pbokoc(a)redhat.com>
Date: Tue Nov 4 13:19:01 2014 +0100
Adding entity defs into a few files
en-US/Author_Group.xml | 8 +++++---
en-US/Book_Info.xml | 8 +++++---
en-US/Revision_History.xml | 5 +++--
3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/en-US/Author_Group.xml b/en-US/Author_Group.xml
index 08c0b5e..14bf937 100644
--- a/en-US/Author_Group.xml
+++ b/en-US/Author_Group.xml
@@ -1,6 +1,8 @@
-<?xml version='1.0'?>
-<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
<authorgroup>
<author>
<firstname>Fedora</firstname>
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 3edaf1c..9290a7e 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -1,6 +1,8 @@
-<?xml version='1.0'?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
<bookinfo id="Installation_Guide">
<title>Installation Guide</title>
<subtitle>Installing &PRODUCT; &PRODVER; on 32 and 64-bit Intel-compatible systems and ARM systems</subtitle>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 9b9b47e..fad7590 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -1,7 +1,8 @@
-<?xml version='1.0'?>
+<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
]>
-
<appendix id="appe-Publican-Revision_History">
<title>Revision History</title>
<para>
9 years, 7 months