2 commits - en_US/beginninginstallation.xml en_US/entities.xml en_US/new-users.xml en_US/other-instmethods.xml en_US/upgrading.xml en_US/welcome.xml
Karsten Wade
quaid at fedoraproject.org
Wed Nov 12 08:38:26 UTC 2008
en_US/beginninginstallation.xml | 8 ++++----
en_US/entities.xml | 2 +-
en_US/new-users.xml | 22 +++++++++++++---------
en_US/other-instmethods.xml | 8 ++++----
en_US/upgrading.xml | 25 ++++++++++++-------------
en_US/welcome.xml | 4 ++--
6 files changed, 36 insertions(+), 33 deletions(-)
New commits:
commit 001e41c64e0d49674919f1f4464ac267c01ee2f8
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date: Wed Nov 12 00:29:18 2008 -0800
Sweeping in last changes.
diff --git a/en_US/beginninginstallation.xml b/en_US/beginninginstallation.xml
index 2aad160..84c9953 100644
--- a/en_US/beginninginstallation.xml
+++ b/en_US/beginninginstallation.xml
@@ -39,9 +39,9 @@
<para>For a listing and explanation of common boot options, refer
to <xref linkend="ap-admin-options"/>.</para>
</tip>
- <para>When using Fedora Live media, press any key during the
- initial boot countdown to bring up the Boot Options menu. The
- boot options include:</para>
+ <para>When using Fedora Live media, press any key during the initial
+ boot countdown to bring up the <guilabel>Boot Options</guilabel>
+ menu. The boot options include:</para>
<itemizedlist>
<listitem>
<formalpara>
@@ -127,7 +127,7 @@
allows you to choose the installation source, such as the network
or a hard disk. If you are booting the distribution DVD and do
not want to install from the DVD, hit <keycap>Tab</keycap> at the
- boot menu. Add a space and the option <option>askmethod</option>
+ boot menu. Add a space and the option <option>linux askmethod</option>
to the end of the line that appears below the menu.</para>
<para>You can install &DISTRO; from the ISO images stored on hard
disk, or from a network using NFS, FTP, or HTTP methods.
diff --git a/en_US/entities.xml b/en_US/entities.xml
index cb2d4ff..ad40ce8 100644
--- a/en_US/entities.xml
+++ b/en_US/entities.xml
@@ -6,7 +6,7 @@
<group name="Local document and Fedora versions">
<entity name="FCLOCALVER">
<comment>Local version of Fedora</comment>
- <text>9</text>
+ <text>10</text>
</entity>
</group>
</entities>
diff --git a/en_US/new-users.xml b/en_US/new-users.xml
index 1d74861..9f6e633 100644
--- a/en_US/new-users.xml
+++ b/en_US/new-users.xml
@@ -209,13 +209,13 @@
<listitem>
<formalpara>
<title>Full Distribution on DVD</title>
- <para>If you have plenty of time, a fast Internet
- connection, and wish to install a broader choice
- of software, download the full DVD version. Once burned to DVD,
- the media is bootable and includes an installation program.
- The DVD version contains a mode to perform rescue operations on your &DISTRO;
- system in an emergency. You can download the DVD version
- directly from a mirror, or via BitTorrent.</para>
+ <para>If you have plenty of time, a fast Internet connection,
+ and wish a broader choice of software on the install media,
+ download the full DVD version. Once burned to DVD, the media
+ is bootable and includes an installation program. The DVD
+ version contains a mode to perform rescue operations on your
+ &DISTRO; system in an emergency. You can download the DVD
+ version directly from a mirror, or via BitTorrent.</para>
</formalpara>
</listitem>
<listitem>
@@ -223,7 +223,7 @@
<title>Live Image</title>
<para>If you want to try &DISTRO; before you install it on
your computer, download the Live image version. If your
- computer supports booting from CD, you can boot the
+ computer supports booting from CD or USB, you can boot the
operating system without making any changes to your hard
disk. The Live image also provides an <guiicon>Install to
Hard Disk</guiicon> desktop shortcut. If you decide you
@@ -312,6 +312,10 @@
<emphasis>nondestructive</emphasis>. Any existing data on the
media is not harmed.
</para>
+ <para>
+ <emphasis>It is always a good idea to back up important data
+ before performing sensitive disk operations.</emphasis>
+ </para>
</note>
<para>
To begin, make sure there is sufficient free space available on
@@ -451,7 +455,7 @@
<para>Insert the media in your computer and turn it on.</para>
</step>
</procedure>
- <para>You may need to hit a specific key or combination of keys to
+ <para>You may need to press a specific key or combination of keys to
boot from the media, or configure your system's <firstterm>Basic
Input/Output System</firstterm>, or <acronym>BIOS</acronym>, to
boot from the media. On most computers you must select the boot
diff --git a/en_US/upgrading.xml b/en_US/upgrading.xml
index 4e50ba0..1e0ae4e 100644
--- a/en_US/upgrading.xml
+++ b/en_US/upgrading.xml
@@ -40,10 +40,10 @@
<note>
<title>Manually Installed Software</title>
<para>
- Software which you have installed manually on your existing &FC;
- or &RHL; system may behave differently after an upgrade. You
- may need to manually recompile this software after an upgrade to
- ensure it performs correctly on the updated system.
+ Software you have installed manually on your existing &FC; or
+ &RHL; system may behave differently after an upgrade. You may
+ need to manually reinstall or recompile this software after an
+ upgrade to ensure it performs correctly on the updated system.
</para>
</note>
</section>
@@ -64,7 +64,7 @@
this way, make a list of your system's current packages for later
reference:</para>
- <screen><command><![CDATA[rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt']]></command></screen>
+ <screen><command><![CDATA[rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE} %{ARCH}\n' > ~/old-pkglist.txt]]></command></screen>
<para>After installation, consult this list to discover which
packages you may need to rebuild or retrieve from non-&DISTRO;
@@ -74,14 +74,13 @@
<screen><command><![CDATA[su -c 'tar czf /tmp/etc-`date +%F`.tar.gz /etc'
su -c 'mv /tmp/etc-*.tar.gz /home']]></command></screen>
- <para>You should also make a complete backup of any important data
- before performing an upgrade. Important data may include the
- contents of your entire <filename
- class="directory">/home</filename> directory as well as content
- from services such as an Apache, FTP, or SQL server, or a source
- code management system. Although upgrades are not destructive, if
- you perform one improperly there is a small possibility of data
- loss.</para>
+ <para>Make a complete backup of any important data before performing
+ an upgrade. Important data may include the contents of your
+ entire <filename class="directory">/home</filename> directory as
+ well as content from services such as an Apache, FTP, or SQL
+ server, or a source code management system. Although upgrades are
+ not destructive, if you perform one improperly there is a small
+ possibility of data loss.</para>
<warning>
<title>Storing Backups</title>
<para>Note that the above examples store backup materials in a
diff --git a/en_US/welcome.xml b/en_US/welcome.xml
index 7855af8..a533007 100644
--- a/en_US/welcome.xml
+++ b/en_US/welcome.xml
@@ -30,8 +30,8 @@
<section id="sn-raid-config">
<title>RAID or Other Nonstandard Configurations</title>
<para>Certain RAID systems or other nonstandard configurations may
- be unreadable to the installation program and the aforementioned
- prompt may appear. The installation program responds to the
+ be unreadable to the installation program and the prompt to
+ initialize the hard disk may appear. The installation program responds to the
physical disk structures it is able to detect.</para>
<warning>
<title>Detach Unneeded Disks</title>
commit b03d8b1edced39f735ae190b34bf92fd43861161
Author: Karsten 'quaid' Wade <kwade at calliope.phig.org>
Date: Mon Nov 10 19:23:54 2008 -0800
fixing bz#470187, bz#470192, bz#470190; other grammer tweaks.
diff --git a/en_US/other-instmethods.xml b/en_US/other-instmethods.xml
index 092319a..c50c83f 100644
--- a/en_US/other-instmethods.xml
+++ b/en_US/other-instmethods.xml
@@ -43,7 +43,7 @@
<title>Alternative Installation Methods</title>
<para>
Even if you booted from alternative media, you can still install
- &FC; from CD or DVD media. Alternately, you can install from ISO
+ &FC; from CD or DVD media. Alternately, install from ISO
images stored on your computer's hard disk, or from a network
server.
</para>
@@ -79,8 +79,8 @@
Once you have booted your computer, you may use ISO image files of
the &FED; discs to continue the installation process. The ISO
files must be located on a hard drive that is either internal to
- the computer, or attached to the machine by USB. You can use this
- option to install &FC; on computers that have neither a network
+ the computer, or attached to the machine by USB. Use this option
+ to install &FC; on computers that have neither a network
connection nor CD or DVD drives.
</para>
@@ -255,7 +255,7 @@
<section id="sn-nfs-install-settings">
<title>NFS Installation Setup</title>
<para>
- To install from a NFS server, select <guilabel>NFS</guilabel> from
+ To install from an NFS server, select <guilabel>NFS</guilabel> from
the <guilabel>Installation Method</guilabel> menu and select
<guilabel>OK</guilabel>. Enter the name or IP address of the NFS
server and the directory where the installation files reside.
More information about the Fedora-docs-commits
mailing list