[install-guide] First overhaul of Software Selection sections
Jack Reed
jjr at fedoraproject.org
Thu Oct 25 02:02:33 UTC 2012
commit b7dd11b835c8e4487e3e13d5ae65add95fc5ceee
Author: Jack Reed <jreed at redhat.com>
Date: Thu Oct 25 12:02:12 2012 +1000
First overhaul of Software Selection sections
en-US/Package_Selection-x86.xml | 32 ++++++----
en-US/Package_Selection_common-imagecap-1.xml | 2 +-
en-US/Package_Selection_common-list-1.xml | 78 +++++++++++++++++++++++--
en-US/Package_Selection_common-para-10.xml | 8 +++
en-US/Package_Selection_common-para-11.xml | 8 +++
en-US/Package_Selection_common-para-7.xml | 2 +-
en-US/Package_Selection_common-para-8.xml | 9 +++
en-US/Package_Selection_common-para-9.xml | 8 +++
en-US/Package_Selection_common-title-1.xml | 2 +-
en-US/images/pkgselection/pkg-group.png | Bin 45251 -> 100969 bytes
10 files changed, 128 insertions(+), 21 deletions(-)
---
diff --git a/en-US/Package_Selection-x86.xml b/en-US/Package_Selection-x86.xml
index 6a6b5e8..266dc55 100644
--- a/en-US/Package_Selection-x86.xml
+++ b/en-US/Package_Selection-x86.xml
@@ -11,11 +11,11 @@
<xi:include href="Package_Selection_common-indexterm-4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Package_Selection_common-indexterm-5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Package_Selection_common-indexterm-6.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- End Index terms --> <xi:include href="Package_Selection_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Now that you have made most of the choices.. --> <xi:include href="Package_Selection_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- End Index terms --> <!-- <xi:include href="Package_Selection_common-para-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Now that you have made most of the choices.. --> <!-- <xi:include href="Package_Selection_common-para-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
<!-- The Package Installation Defaults screen... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-note-1.xml"/> --> <!-- Fedora --> <!-- Installing from a Live Image --> <xi:include href="Package_Selection_common-note-2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<!-- Installing in text mode --> <figure float="0" id="fig-pkgselection-group-x86">
- <title>Package Group Selection</title>
+ <title>Software Selection</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/pkgselection/pkg-group.png" format="PNG" width="444" />
@@ -29,19 +29,27 @@
</figure>
<xi:include href="Package_Selection_common-para-7.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- By default, the Fedora Installation process loads... --> <xi:include href="Package_Selection_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Office and Productivity
- Software Development
- Web server --> <para>
+ <!-- By default, Fedora installs the GNOME... --> <xi:include href="Package_Selection_common-list-1.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Graphical Desktops
+ GNOME Desktop
+ KDE Plasma Workspaces --> <xi:include href="Package_Selection_common-para-8.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Fedora will automatically install the base... --> <xi:include href="Package_Selection_common-para-9.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- To specify add-ons for installation... --> <xi:include href="Package_Selection_common-para-10.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- Once you have selected an environment... --> <xi:include href="Package_Selection_common-para-11.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- The packages that you select are not permanent... -->
+
+
+
+ <!-- <para>
If you choose to accept the current package list, skip ahead to <xref linkend="s1-installpkgs-x86" />.
</para>
<para>
To select a component, click on the checkbox beside it (refer to <xref linkend="fig-pkgselection-group-x86" />).
- </para>
- <xi:include href="Package_Selection_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- To customize your package set further, select... --> <xi:include href="Package_Selection_Repositories-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- You can define additional repositories to increase the software... --> <xi:include href="Package_Selection_Customizing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Select Customize now to specify the software packages for your final... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-5.xml"/> --> <!-- Select each component you wish to install. Selecting... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-6.xml"/> --> <!-- Once a package group has been selected, click on... -->
+ </para>
+ <xi:include href="Package_Selection_common-para-3.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- To customize your package set further, select... --> <!-- <xi:include href="Package_Selection_Customizing-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <!-- Select Customize now to specify the software packages for your final... --> <xi:include href="Package_Selection_Repositories-x86.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- You can define additional repositories to increase the software... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-5.xml"/> --> <!-- Select each component you wish to install. Selecting... --> <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Package_Selection_common-para-6.xml"/> --> <!-- Once a package group has been selected, click on... -->
</section>
diff --git a/en-US/Package_Selection_common-imagecap-1.xml b/en-US/Package_Selection_common-imagecap-1.xml
index 048df97..42739e8 100644
--- a/en-US/Package_Selection_common-imagecap-1.xml
+++ b/en-US/Package_Selection_common-imagecap-1.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- Choose which package groups you want to install.
+ Choose which environment and add-ons you want to install.
</para>
diff --git a/en-US/Package_Selection_common-list-1.xml b/en-US/Package_Selection_common-list-1.xml
index 12647d3..acee6e6 100644
--- a/en-US/Package_Selection_common-list-1.xml
+++ b/en-US/Package_Selection_common-list-1.xml
@@ -24,25 +24,74 @@
</varlistentry> -->
<varlistentry>
- <term>Graphical Desktop</term>
+ <term>Graphical Desktops (multiple options)</term>
<listitem>
<para>
- This option provides the <application>OpenOffice.org</application> productivity suite, graphical tools such as the <application>GIMP</application>, and multimedia applications.
+ Fedora offers a variety of graphical desktop environments, which can be enhanced with add-ons such as the <application>LibreOffice</application> productivity suite, graphical tools such as the <application>GIMP</application>, and multimedia applications. The available environments are:
</para>
+
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ GNOME Desktop
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ KDE Plasma Workspaces
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Xfce Desktop
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ LXDE Desktop
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Cinnamon Desktop
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ MATE Desktop
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ Sugar Desktop Environment
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
</listitem>
+
</varlistentry>
<varlistentry>
- <term>Software Development</term>
+ <term>Development and Creative Workstation</term>
<listitem>
<para>
- This option provides the necessary tools to compile software on your Fedora system.
+ This option provides the necessary tools to compile software and develop graphics and other content on your Fedora system.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Web server</term>
+ <term>Web Server</term>
<listitem>
<para>
This option provides the <application>Apache</application> web server.
@@ -50,9 +99,26 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Infrastructure Server</term>
+ <listitem>
+ <para>
+ This option provides a server for operating network infrastructure services.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Basic X Window System</term>
+ <listitem>
+ <para>
+ This option provides the X Window System without a full graphical desktop environment.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry>
- <term>Minimal</term>
+ <term>Minimal Install</term>
<listitem>
<para>
This option provides only the packages essential to run Fedora. A minimal installation provides the basis for a single-purpose server or desktop appliance and maximizes performance and security on such an installation.
diff --git a/en-US/Package_Selection_common-para-10.xml b/en-US/Package_Selection_common-para-10.xml
new file mode 100644
index 0000000..f8d6eaf
--- /dev/null
+++ b/en-US/Package_Selection_common-para-10.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Once you have selected an environment and any additional packages you may wish to install, click <guibutton>Done</guibutton> to return to the pre-installation hub.
+</para>
diff --git a/en-US/Package_Selection_common-para-11.xml b/en-US/Package_Selection_common-para-11.xml
new file mode 100644
index 0000000..e2b2489
--- /dev/null
+++ b/en-US/Package_Selection_common-para-11.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ The packages that you select are not permanent. After you boot your system, use the <application>Add/Remove Software</application> tool to either install new software or remove installed packages. To run this tool, from the main menu, select <menuchoice> <guimenu>System</guimenu> <guisubmenu>Administration</guisubmenu> <guimenuitem>Add/Remove Software</guimenuitem> </menuchoice>. The Fedora software management system downloads the latest packages from network servers, rather than using those on the installation discs.
+</para>
diff --git a/en-US/Package_Selection_common-para-7.xml b/en-US/Package_Selection_common-para-7.xml
index 3a8af44..99b2663 100644
--- a/en-US/Package_Selection_common-para-7.xml
+++ b/en-US/Package_Selection_common-para-7.xml
@@ -4,6 +4,6 @@
%BOOK_ENTITIES;
]>
<para>
- By default, the Fedora installation process loads a selection of software that is suitable for a system deployed as a basic server. Note that this installation does not include a graphical environment. To include a selection of software suitable for other roles, click the radio button that corresponds to one of the following options:
+ By default, Fedora installs the GNOME Desktop Environment, but in <guilabel>Software Selection</guilabel> you can choose from a range of other environments and customise additional packages to be installed as add-ons. Available environments are listed in the left-hand pane. To select an environment, click the radio button that corresponds to one of the following options:
</para>
diff --git a/en-US/Package_Selection_common-para-8.xml b/en-US/Package_Selection_common-para-8.xml
new file mode 100644
index 0000000..a45a00f
--- /dev/null
+++ b/en-US/Package_Selection_common-para-8.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ Fedora will automatically install the base and mandatory packages for the environment you select, but you can select additional package groups, or add-ons, from the right-hand pane. The list of add-ons is refreshed when a new environment is selected. Add-ons range from common utilities such as <application>Administrative Tools</application> and <application>LibreOffice</application> to specialist tools such as <application>Medical Applications</application> and <application>Robotics</application>
+</para>
+
diff --git a/en-US/Package_Selection_common-para-9.xml b/en-US/Package_Selection_common-para-9.xml
new file mode 100644
index 0000000..0318c3a
--- /dev/null
+++ b/en-US/Package_Selection_common-para-9.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE para 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;
+]>
+<para>
+ To specify add-ons for installation as part of the environment, select the check box next to each add-on.
+</para>
diff --git a/en-US/Package_Selection_common-title-1.xml b/en-US/Package_Selection_common-title-1.xml
index 390c83a..d6a3916 100644
--- a/en-US/Package_Selection_common-title-1.xml
+++ b/en-US/Package_Selection_common-title-1.xml
@@ -3,5 +3,5 @@
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
]>
-<title>Package Group Selection</title>
+<title>Software Selection</title>
diff --git a/en-US/images/pkgselection/pkg-group.png b/en-US/images/pkgselection/pkg-group.png
index 5b44bd0..ce611cb 100644
Binary files a/en-US/images/pkgselection/pkg-group.png and b/en-US/images/pkgselection/pkg-group.png differ
More information about the docs-commits
mailing list