commit 5d7246f9d080f18941ce74ef7c38feceb76e513a
Merge: 5ebf33b... 260b4cb...
Author: Douglas Silas <dhensley(a)redhat.com>
Date: Wed Jun 23 16:53:12 2010 +0200
Merge branch 'flo'
Conflicts:
en-US/RPM.xml
en-US/PackageKit.xml | 87 +++++++++++++++++++++++++++++++----------------
en-US/RPM.xml | 91 ++++++++++++++++++++++++++------------------------
en-US/Yum.xml | 4 +--
3 files changed, 105 insertions(+), 77 deletions(-)
---
diff --cc en-US/RPM.xml
index f1eecde,481111a..39cb83c
--- a/en-US/RPM.xml
+++ b/en-US/RPM.xml
@@@ -27,7 -27,8 +27,8 @@@
<para>When installing a package, ensure it is compatible with your operating
system and processor architecture. This can usually be determined by checking the package
name. Many of the following examples show RPM packages compiled for the AMD64/Intel 64
computer architectures; thus, the RPM file name ends in
<filename>x86_64.rpm</filename>.</para>
</important>
<para>During upgrades, RPM handles configuration files carefully, so that you
never lose your customizations—something that you cannot accomplish with regular
<filename>.tar.gz</filename> files.</para>
- <para>For the developer, RPM allows you to take software source code and package
it into source and binary packages for end users. This process is quite simple and is
driven from a single file and optional patches that you create. This clear delineation
between <firstterm>pristine</firstterm> sources and your patches along with
build instructions eases the maintenance of the package as new versions of the software
are released.</para>
- <para>For the developer, RPM allows you to take software source code and package
it into source and binary packages for end
users.<indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>source
and
++ <para>For the developer, RPM allows you to take software source code and package
it into source and binary packages for end
users.<indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>source
and
+ binary packages</tertiary></indexterm> This process is quite simple and is
driven from a single file and optional patches that you create. This clear delineation
between <firstterm>pristine</firstterm> sources and your patches along with
build instructions eases the maintenance of the package as new versions of the software
are released.</para>
<note>
<title>Note</title>
<para>Because RPM makes changes to your system, you must be logged in as root
to install, remove, or upgrade an RPM package.</para>
@@@ -71,11 -72,9 +72,8 @@@
<section
id="s1-rpm-using">
<title>Using RPM</title>
- <indexterm>
- <primary>RPM</primary>
- <secondary>using</secondary>
- </indexterm>
- <para>RPM is able to upgrade and install, uninstall query, and verify RPM
packages, as well as preserve configuration file changes. This section provides an
overview of all of these functions. For complete details and options, try
<command>rpm --help</command> or <command>man rpm</command>. You
can also refer to <xref
-
+ <para>RPM has five basic modes of
operation<indexterm><primary>RPM</primary><secondary>basic
modes</secondary>
+ </indexterm> (not counting package building): installing, uninstalling,
upgrading, querying, and verifying. This section contains an overview of each mode. For
complete details and options, try <command>rpm --help</command> or
<command>man rpm</command>. You can also refer to <xref
linkend="s1-rpm-additional-resources"/> for more information on
RPM.</para>
<section
id="s2-rpm-finding">
@@@ -94,7 -95,7 +94,7 @@@
url="http://fedoraproject.org/wiki/EPEL"/> for details on
EPEL RPM packages.</para>
</listitem>
<listitem>
-- <para>Unofficial, third-party repositories not affiliated Red Hat also
provide RPM packages.</para>
++ <para>Unofficial, third-party repositories not ahffiliated Red Hat also
provide RPM packages.</para>
<important>
<title>Important</title>
<para>When considering third-party repositories for use with your
&MAJOROS; system, pay close attention to the repository's web site with regard to
package compatibility before adding the repository as a package source. Alternate package
repositories may offer different, incompatible versions of the same software, including
packages already included in the &MAJOROS; repositories.</para>