commit 732e032b02d0c7e2c27de5f897a7ea5b625e1bc4 Author: Petr Bokoc pbokoc@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.