[deployment-guide/comm-rel: 22/23] (multiple) make buildable

dsilas dsilas at fedoraproject.org
Sun Jul 18 15:54:10 UTC 2010


commit 3f32fb3bb1a3e7ffcbff10e6f817a5d0f229e3d3
Author: Douglas Silas <dhensley at redhat.com>
Date:   Sun Jul 18 16:46:38 2010 +0200

    (multiple) make buildable

 en-US/Manually_Upgrading_the_Kernel.xml |  183 ++++++++++++++++------
 en-US/PackageKit.xml                    |  259 +++++++++++++++++++++++++------
 en-US/RPM.xml                           |  139 ++++++++++++-----
 en-US/Yum.xml                           |    5 -
 4 files changed, 444 insertions(+), 142 deletions(-)
---
diff --git a/en-US/Manually_Upgrading_the_Kernel.xml b/en-US/Manually_Upgrading_the_Kernel.xml
index 2f641ee..3cdae47 100644
--- a/en-US/Manually_Upgrading_the_Kernel.xml
+++ b/en-US/Manually_Upgrading_the_Kernel.xml
@@ -10,80 +10,132 @@
     <secondary>upgrading the kernel</secondary>
   </indexterm>
   <para>The &MAJOROS; kernel is custom-built by the &MAJOROS; kernel team to ensure its integrity and compatibility with supported hardware. Before Red Hat releases a kernel, it must first pass a rigorous set of quality assurance tests.</para>
-  <para>&MAJOROS; kernels are packaged in the RPM format <indexterm><primary>kernel</primary><secondary>package</secondary></indexterm>
-  <indexterm><primary>kernel</primary><secondary>RPM package</secondary></indexterm>
-  <indexterm><primary>package</primary><secondary>kernel RPM</secondary></indexterm>
+  <para>&MAJOROS; kernels are packaged in the RPM format <indexterm><primary>kernel</primary>
+      <secondary>package</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>kernel</primary>
+      <secondary>RPM package</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>package</primary>
+      <secondary>kernel RPM</secondary>
+    </indexterm>
   so that they are easy to upgrade and verify using the <application>Yum</application> or <application>PackageKit</application> package managers. <application>PackageKit</application> automatically queries the Red Hat Network servers and informs you of packages with available updates, including kernel packages.</para>
   <para>This chapter is therefore <emphasis>only</emphasis> useful for users who need to manually update a kernel package using the <command>rpm</command> command instead of <command>yum</command>.</para>
   <warning>
     <title>Use Yum to Install Kernels Whenever Possible</title>
-    <para>Whenever possible, use either the <application>Yum</application> or <application>PackageKit</application> package manager <indexterm><primary>kernel</primary><secondary>installing kernel packages</secondary></indexterm>
-    <indexterm><primary>installing the kernel</primary></indexterm> to install a new kernel because they always <emphasis>install</emphasis> a new kernel instead of replacing the current one, which could potentially leave your system unable to boot.</para>
+    <para>Whenever possible, use either the <application>Yum</application> or <application>PackageKit</application> package manager <indexterm><primary>kernel</primary>
+        <secondary>installing kernel packages</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>installing the kernel</primary>
+      </indexterm> to install a new kernel because they always <emphasis>install</emphasis> a new kernel instead of replacing the current one, which could potentially leave your system unable to boot.</para>
   </warning>
-  <para>For more information on installing kernel packages with <application>Yum</application>, refer to <xref
+  <para>For more information on installing kernel packages<indexterm><primary>kernel</primary>
+      <secondary>installing kernel packages</secondary>
+    </indexterm> with <application>Yum</application>, refer to <xref
       linkend="sec-Updating_Packages"/>.</para>
-  <warning>
-    <title>Important</title>
-    <para>Building a custom kernel is not supported by the Red Hat Global Services Support team, and therefore is not explored in this manual.</para>
-  </warning>
-  <para>For more information on installing kernel packages<indexterm><primary>kernel</primary><secondary>installing kernel packages</secondary></indexterm> with <application>Yum</application>, refer to <xref
-      linkend="sec-Updating_Packages"/>. For information on Red Hat Network, refer to <xref
-      linkend="ch-rhnetwork"/>.</para>
   <section
     id="s1-kernel-packages">
     <title>Overview of Kernel Packages</title>
-    <para>&MAJOROS; contains the following kernel packages: <indexterm><primary>kernel</primary><secondary>kernel packages</secondary></indexterm></para>
+    <para>&MAJOROS; contains the following kernel packages: <indexterm><primary>kernel</primary>
+        <secondary>kernel packages</secondary>
+      </indexterm>
+    </para>
     <itemizedlist>
       <listitem>
         <para>
           <package>kernel</package> —
-          <indexterm><primary>kernel package</primary><secondary>kernel</secondary><tertiary>for single,multicore and multiprocessor systems</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>kernel</secondary><tertiary>for single,multicore and multiprocessor systems</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>kernel</secondary>
+            <tertiary>for single,multicore and multiprocessor systems</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>kernel</secondary>
+            <tertiary>for single,multicore and multiprocessor systems</tertiary>
+          </indexterm>
           Contains the kernel for single, multicore and multiprocessor systems.</para>
       </listitem>
       <listitem>
         <para>
           <package>kernel-devel</package> —
-          <indexterm><primary>kernel package</primary><secondary>kernel-devel</secondary><tertiary>kernel headers and makefiles</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>kernel-devel</secondary><tertiary>kernel headers and makefiles</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>kernel-devel</secondary>
+            <tertiary>kernel headers and makefiles</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>kernel-devel</secondary>
+            <tertiary>kernel headers and makefiles</tertiary>
+          </indexterm>
            Contains the kernel headers and makefiles sufficient to build modules against the <package>kernel</package> package.</para>
       </listitem>
       <listitem>
         <para>
           <package>kernel-doc</package> —
-          <indexterm><primary>kernel package</primary><secondary>kernel-doc</secondary><tertiary>
-          documentation files</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>kernel-doc</secondary><tertiary>
-          documentation files</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>kernel-doc</secondary>
+            <tertiary>
+          documentation files</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>kernel-doc</secondary>
+            <tertiary>
+          documentation files</tertiary>
+          </indexterm>
           documentation files from the kernel source. Various portions of the Linux kernel and the device drivers shipped with it are documented in these files. Installation of this package provides a reference to the options that can be passed to Linux kernel modules at load time.</para>
         <para>By default, these files are placed in the <filename>/usr/share/doc/kernel-doc-<replaceable>&lt;kernel_version&gt;</replaceable>/</filename> directory.</para>
       </listitem>
       <listitem>
         <para>
           <package>kernel-headers</package> —
-          <indexterm><primary>kernel package</primary><secondary>kernel-headers</secondary><tertiary>
-          C header files files</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>kernel-headers</secondary><tertiary>
-          C header files files</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>kernel-headers</secondary>
+            <tertiary>
+          C header files files</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>kernel-headers</secondary>
+            <tertiary>
+          C header files files</tertiary>
+          </indexterm>
           Includes the C header files that specify the interface between the Linux kernel and user-space libraries and programs. The header files define structures and constants that are needed for building most standard programs.</para>
       </listitem>
       <listitem>
         <para>
           <package>kernel-firmware</package> —
-          <indexterm><primary>kernel package</primary><secondary>kernel-firmware</secondary><tertiary>
-          firmware files</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>kernel-firmware</secondary><tertiary>
-          firmware files</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>kernel-firmware</secondary>
+            <tertiary>
+          firmware files</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>kernel-firmware</secondary>
+            <tertiary>
+          firmware files</tertiary>
+          </indexterm>
           Contains all of the firmware files that are required by various devices to operate.</para>
       </listitem>
       <listitem>
         <para>
           <package>perf</package> —
           <package>kernel-firmware</package> —
-          <indexterm><primary>kernel package</primary><secondary>perf</secondary><tertiary>
-          firmware files</tertiary></indexterm>
-          <indexterm><primary>packages</primary><secondary>perf</secondary><tertiary>
-          firmware files</tertiary></indexterm>
+          <indexterm><primary>kernel package</primary>
+            <secondary>perf</secondary>
+            <tertiary>
+          firmware files</tertiary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>perf</secondary>
+            <tertiary>
+          firmware files</tertiary>
+          </indexterm>
           Technically a documentation instead of kernel package, <package>perf</package> contains supporting documentation for the perf tool shipped in each kernel image subpackage.</para>
       </listitem>
     </itemizedlist>
@@ -103,11 +155,20 @@
       <primary>boot media</primary>
     </indexterm>
     <para>Before upgrading the kernel
-    <indexterm><primary>kernel</primary><secondary>upgrading</secondary><tertiary>preparing</tertiary></indexterm>
-    <indexterm><primary>kernel upgrading</primary><secondary>preparing</secondary></indexterm>
+    <indexterm><primary>kernel</primary>
+        <secondary>upgrading</secondary>
+        <tertiary>preparing</tertiary>
+      </indexterm>
+      <indexterm>
+        <primary>kernel upgrading</primary>
+        <secondary>preparing</secondary>
+      </indexterm>
     , it is recommended that you take some precautionary steps. </para>
     <para>In the first step, make sure working boot media exists
-    <indexterm><primary>kernel</primary><secondary>upgrading</secondary><tertiary>working boot media</tertiary></indexterm>for the system in case a problem occurs. If the boot loader is not configured properly to boot the new kernel, the system cannot be booted into &MAJOROS; without working boot media.</para>
+    <indexterm><primary>kernel</primary>
+        <secondary>upgrading</secondary>
+        <tertiary>working boot media</tertiary>
+      </indexterm>for the system in case a problem occurs. If the boot loader is not configured properly to boot the new kernel, the system cannot be booted into &MAJOROS; without working boot media.</para>
     <!--silas: the following instructions for making (USB) boot media are adapted from the RHEL6 beta Installation Guide, "Alternative Method to Make Minimal USB Boot Media" section-->
     <para>USB media often comes in the form of flash devices sometimes called <firstterm>pen drives</firstterm>, <firstterm>thumb disks</firstterm>, or <firstterm>keys</firstterm>, or as an externally-connected hard disk device. Almost all media of this type is formatted as a <systemitem
         class="filesystem">VFAT</systemitem> file system. You can create bootable USB media on media formatted as <systemitem
@@ -220,14 +281,22 @@ kernel-headers.x86_64           2.6.32-17.el6           installed
       <primary>kernel</primary>
       <secondary>downloading</secondary>
     </indexterm>
-    <para>There are several ways to determine<indexterm><primary>kernel</primary><secondary>upgrade kernel available</secondary></indexterm> if an updated kernel is available for the system.</para>
+    <para>There are several ways to determine<indexterm><primary>kernel</primary>
+        <secondary>upgrade kernel available</secondary>
+      </indexterm> if an updated kernel is available for the system.</para>
     <itemizedlist>
       <listitem>
-        <para>Security Errata — <indexterm><primary>kernel</primary><secondary>upgrade kernel available</secondary><tertiary>Security Errata</tertiary></indexterm>Refer to <ulink
+        <para>Security Errata — <indexterm><primary>kernel</primary>
+            <secondary>upgrade kernel available</secondary>
+            <tertiary>Security Errata</tertiary>
+          </indexterm>Refer to <ulink
             url="http://www.redhat.com/security/updates/"/> for information on security errata, including kernel upgrades that fix security issues.</para>
       </listitem>
       <listitem>
-        <para>Via Red Hat Network — <indexterm><primary>kernel</primary><secondary>upgrade kernel available</secondary><tertiary>via Red Hat network</tertiary></indexterm>Download and install the kernel RPM packages. Red Hat Network can download the latest kernel, upgrade the kernel on the system, create an initial RAM disk image if needed, and configure the boot loader to boot the new kernel. For more information, refer to <ulink
+        <para>Via Red Hat Network — <indexterm><primary>kernel</primary>
+            <secondary>upgrade kernel available</secondary>
+            <tertiary>via Red Hat network</tertiary>
+          </indexterm>Download and install the kernel RPM packages. Red Hat Network can download the latest kernel, upgrade the kernel on the system, create an initial RAM disk image if needed, and configure the boot loader to boot the new kernel. For more information, refer to <ulink
             url="http://www.redhat.com/docs/manuals/RHNetwork/"> http://www.redhat.com/docs/manuals/RHNetwork/</ulink>.</para>
       </listitem>
     </itemizedlist>
@@ -239,7 +308,9 @@ kernel-headers.x86_64           2.6.32-17.el6           installed
   <section
     id="s1-kernel-perform-upgrade">
     <title>Performing the Upgrade</title>
-    <para>After retrieving all of the necessary packages<indexterm><primary>kernel</primary><secondary>performing kernel upgrade</secondary></indexterm>, it is time to upgrade the existing kernel.</para>
+    <para>After retrieving all of the necessary packages<indexterm><primary>kernel</primary>
+        <secondary>performing kernel upgrade</secondary>
+      </indexterm>, it is time to upgrade the existing kernel.</para>
     <important>
       <title>Important</title>
       <para>It is strongly recommended that you keep the old kernel in case there are problems with the new kernel.</para>
@@ -255,7 +326,9 @@ kernel-headers.x86_64           2.6.32-17.el6           installed
     <title>Verifying the Initial RAM Disk Image</title>
 	<!--dracut  creates  an initial image used by the kernel for preloading the block device modules (such as
        IDE, SCSI or RAID) which are needed to access the root filesystem.-->
-    <para>The job of the initial RAM disk image <indexterm><primary>initial RAM disk image</primary><secondary>verifying</secondary></indexterm> is to preload the block device modules, such as for IDE, SCSI or RAID, so that the root file system, on which those modules normally reside, can then be accessed and mounted. On &MAJOROSVER; systems, whenever a new kernel is installed using either the <application>Yum</application>, <application>PackageKit</application>, or <application>RPM</application> package manager, the <application>Dracut</application> utility is always called by the installation scripts to create an <firstterm>initramfs</firstterm> (initial RAM disk image).</para>
+    <para>The job of the initial RAM disk image <indexterm><primary>initial RAM disk image</primary>
+        <secondary>verifying</secondary>
+      </indexterm> is to preload the block device modules, such as for IDE, SCSI or RAID, so that the root file system, on which those modules normally reside, can then be accessed and mounted. On &MAJOROSVER; systems, whenever a new kernel is installed using either the <application>Yum</application>, <application>PackageKit</application>, or <application>RPM</application> package manager, the <application>Dracut</application> utility is always called by the installation scripts to create an <firstterm>initramfs</firstterm> (initial RAM disk image).</para>
     <para>On all architectures other than <trademark
         class="registered">IBM</trademark>&#160;<trademark
         class="trade">eServer</trademark>&#160;<trademark
@@ -351,14 +424,19 @@ drwxr-xr-x   2 root     root            0 Apr 12 05:41 mount
     </procedure>
     <bridgehead
       id="bh-Verifying_the_Initial_RAM_Disk_Image_and_Kernel_on_IBM_eServer_System_i">Verifying the Initial RAM Disk Image and Kernel on IBM eServer System i</bridgehead>
-    <para>On IBM eSeries System i machines <indexterm><primary>initial RAM disk image</primary><secondary>verifying</secondary><tertiary>IBM eServer System i</tertiary></indexterm>, the initial RAM disk and kernel files are combined into a single file, which is created with the <command>addRamDisk</command> command. This step is performed automatically if the kernel and its associated packages are installed or upgraded from the RPM packages distributed by &OSORG;; thus, it does not need to be executed manually. To verify that it was created, use the command <command>ls -l /boot/</command> to make sure the <filename>/boot/vmlinitrd-<replaceable>&lt;kernel_version&gt;</replaceable>
+    <para>On IBM eSeries System i machines <indexterm><primary>initial RAM disk image</primary>
+        <secondary>verifying</secondary>
+        <tertiary>IBM eServer System i</tertiary>
+      </indexterm>, the initial RAM disk and kernel files are combined into a single file, which is created with the <command>addRamDisk</command> command. This step is performed automatically if the kernel and its associated packages are installed or upgraded from the RPM packages distributed by &OSORG;; thus, it does not need to be executed manually. To verify that it was created, use the command <command>ls -l /boot/</command> to make sure the <filename>/boot/vmlinitrd-<replaceable>&lt;kernel_version&gt;</replaceable>
       </filename> file already exists (the <filename><replaceable>&lt;kernel_version&gt;</replaceable>
       </filename> should match the version of the kernel just installed).</para>
   </section>
   <section
     id="s1-kernel-boot-loader">
     <title>Verifying the Boot Loader</title>
-    <para>When you install a kernel using<command>rpm</command>, the kernel package creates an entry in the boot loader configuration file<indexterm><primary>boot loader</primary><secondary>verifying</secondary></indexterm> for that new kernel. However, <command>rpm</command> does <emphasis>not</emphasis> configure the new kernel to boot as the default kernel. You must do this manually when installing a new kernel with <command>rpm</command>.</para>
+    <para>When you install a kernel using<command>rpm</command>, the kernel package creates an entry in the boot loader configuration file<indexterm><primary>boot loader</primary>
+        <secondary>verifying</secondary>
+      </indexterm> for that new kernel. However, <command>rpm</command> does <emphasis>not</emphasis> configure the new kernel to boot as the default kernel. You must do this manually when installing a new kernel with <command>rpm</command>.</para>
     <!-- TBD6: insert link to Installation Guide -->
     <para>It is always recommended to double-check the boot loader configuration file after installing a new kernel with <command>rpm</command> to ensure that the configuration is correct. Otherwise, the system may not be able to boot into &MAJOROS; properly. If this happens, boot the system with the boot media created earlier and re-configure the boot loader.</para>
     <para>In the following table, find your system's architecture to determine the boot loader it uses, and then click on the "Refer to" link to jump to the correct instructions for your system.</para>
@@ -450,7 +528,13 @@ drwxr-xr-x   2 root     root            0 Apr 12 05:41 mount
     <section
       id="s3-kernel-boot-loader-grub">
       <title>Configuring the GRUB Boot Loader</title>
-      <para>GRUB's configuration file<indexterm><primary>GRUB boot loader</primary><secondary>configuring</secondary></indexterm><indexterm><primary>GRUB boot loader</primary><secondary>configuration file</secondary></indexterm>, <filename>/boot/grub/grub.conf</filename>, contains a few lines with directives, such as <computeroutput>default</computeroutput>, <computeroutput>timeout</computeroutput>, <computeroutput>splashimage</computeroutput> and <computeroutput>hiddenmenu</computeroutput> (the last directive has no argument). The remainder of the file contains 4-line <firstterm>stanzas</firstterm> that each refer to an installed kernel. These stanzas always start with a <computeroutput>title</computeroutput> entry, after which the associated <computeroutput>root</computeroutput>, <computeroutput>kernel</computeroutput> and <computeroutput>initrd</computeroutput> directives should always be indented. Ensure that each stanza starts with a <computeroutput>title</computeroutpu
 t> that contains a version number (in parentheses) that matches the version number in the <computeroutput>kernel /vmlinuz-<replaceable>&lt;version_number&gt;</replaceable>
+      <para>GRUB's configuration file<indexterm><primary>GRUB boot loader</primary>
+          <secondary>configuring</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>GRUB boot loader</primary>
+          <secondary>configuration file</secondary>
+        </indexterm>, <filename>/boot/grub/grub.conf</filename>, contains a few lines with directives, such as <computeroutput>default</computeroutput>, <computeroutput>timeout</computeroutput>, <computeroutput>splashimage</computeroutput> and <computeroutput>hiddenmenu</computeroutput> (the last directive has no argument). The remainder of the file contains 4-line <firstterm>stanzas</firstterm> that each refer to an installed kernel. These stanzas always start with a <computeroutput>title</computeroutput> entry, after which the associated <computeroutput>root</computeroutput>, <computeroutput>kernel</computeroutput> and <computeroutput>initrd</computeroutput> directives should always be indented. Ensure that each stanza starts with a <computeroutput>title</computeroutput> that contains a version number (in parentheses) that matches the version number in the <computeroutput>kernel /vmlinuz-<replaceable>&lt;version_number&gt;</replaceable>
         </computeroutput> line of the same stanza.</para>
       <example
         id="ex-_boot_grub_grub.conf">
@@ -529,8 +613,13 @@ title Fedora (2.6.32.9-70.fc12.x86_64)
           class="registered">OS/400</trademark> Boot Loader</title>
       <para>The <filename>/boot/vmlinitrd-<replaceable>&lt;kernel-version&gt;</replaceable>
         </filename> file
-        <indexterm><primary>OS/400 boot loader</primary><secondary>configuring</secondary></indexterm>
-        <indexterm><primary>OS/400 boot loader</primary><secondary>configuration file</secondary></indexterm> is installed when you upgrade the kernel. However, you must use the <command>dd</command> command to configure the system to boot the new kernel.</para>
+        <indexterm><primary>OS/400 boot loader</primary>
+          <secondary>configuring</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>OS/400 boot loader</primary>
+          <secondary>configuration file</secondary>
+        </indexterm> is installed when you upgrade the kernel. However, you must use the <command>dd</command> command to configure the system to boot the new kernel.</para>
       <orderedlist
         continuation="restarts"
         inheritnum="ignore">
diff --git a/en-US/PackageKit.xml b/en-US/PackageKit.xml
index 2a1f143..7c65fe0 100644
--- a/en-US/PackageKit.xml
+++ b/en-US/PackageKit.xml
@@ -8,22 +8,50 @@
     <primary>PackageKit</primary>
   </indexterm>
   <para>Red Hat provides <application>PackageKit</application> for viewing, managing, updating, installing and uninstalling packages<indexterm>
-    <primary>packages</primary><secondary>viewing packages with PackageKit</secondary></indexterm>
-    <indexterm><primary>packages</primary><secondary>managing packages with PackageKit</secondary></indexterm>
-    <indexterm><primary>packages</primary><secondary>updating packages with PackageKit</secondary></indexterm>
-    <indexterm><primary>packages</primary><secondary>installing packages with PackageKit</secondary></indexterm>
-    <indexterm><primary>packages</primary><secondary>uninstalling packages with PackageKit</secondary></indexterm>
-    <indexterm><primary>PackageKit</primary><secondary>viewing packages </secondary></indexterm>
-    <indexterm><primary>PackageKit</primary><secondary>managing packages </secondary></indexterm>
-    <indexterm><primary>PackageKit</primary><secondary>updating packages </secondary></indexterm>
-    <indexterm><primary>PackageKit</primary><secondary>installing packages </secondary></indexterm>
-    <indexterm><primary>PackageKit</primary><secondary>uninstalling packages </secondary></indexterm>
+    <primary>packages</primary>
+      <secondary>viewing packages with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>managing packages with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>updating packages with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>installing packages with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>uninstalling packages with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>viewing packages </secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>managing packages </secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>updating packages </secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>installing packages </secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>uninstalling packages </secondary>
+    </indexterm>
     compatible with your system. <application>PackageKit</application> consists of several graphical interfaces that can be opened from the GNOME panel menu, or from the Notification Area when <application>PackageKit</application> alerts you that updates are available. For more information on <application>PackageKit's</application> architecture and available front ends, refer to <xref
       linkend="sec-PackageKit_Architecture"/>.</para>
   <section
     id="sec-Updating_Packages_with_Software_Update">
     <title>Updating Packages with Software Update</title>
-
     <para>
       <application>PackageKit</application> displays a starburst icon in the Notification Area whenever updates are available to be installed on your system.</para>
     <mediaobject>
@@ -34,7 +62,17 @@
           format="PNG"/>
       </imageobject>
     </mediaobject>
-    <para>Clicking on the notification icon opens the <guilabel>Software Update</guilabel> <indexterm><primary>packages</primary><secondary>updating packages with PackageKit</secondary><tertiary>Software Update</tertiary></indexterm><indexterm><primary>updating packages with PackageKit</primary><secondary>PolicyKit</secondary></indexterm> window. Alternatively, you can open <guilabel>Software Updates</guilabel> by clicking <menuchoice><guimenu>System</guimenu> <guimenuitem>Administration</guimenuitem>
+    <para>Clicking on the notification icon opens the <guilabel>Software Update</guilabel>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>updating packages with PackageKit</secondary>
+        <tertiary>Software Update</tertiary>
+      </indexterm>
+      <indexterm>
+        <primary>updating packages with PackageKit</primary>
+        <secondary>PolicyKit</secondary>
+      </indexterm> window. Alternatively, you can open <guilabel>Software Updates</guilabel> by clicking <menuchoice><guimenu>System</guimenu>
+        <guimenuitem>Administration</guimenuitem>
         <guimenuitem>Software Update</guimenuitem>
       </menuchoice> from the GNOME panel, or running the <command>gpk-update-viewer</command> command at the shell prompt. In the <guilabel>Software Updates</guilabel> window, all available updates are listed along with the names of the packages being updated (minus the <filename>.rpm</filename> suffix, but including the CPU architecture), a short summary of the package, and, usually, short descriptions of the changes the update provides. Any updates you do not wish to install can be de-selected here by unchecking the checkbox corresponding to the update.</para>
     <figure
@@ -52,9 +90,31 @@
         </textobject>
       </mediaobject>
     </figure>
-    <para>The updates presented in the <guilabel>Software Updates</guilabel> window only represent the currently-installed packages on your system for which updates are available<indexterm><primary>packages</primary><secondary>updating currently installed packages</secondary><tertiary>available updates</tertiary></indexterm><indexterm><primary>updating currently installed packages</primary><secondary>available updates</secondary></indexterm>; dependencies of those packages, whether they are existing packages on your system or new ones, are not shown until you click <guibutton>Install Updates</guibutton>.</para>
+    <para>The updates presented in the <guilabel>Software Updates</guilabel> window only represent the currently-installed packages on your system for which updates are available<indexterm><primary>packages</primary>
+        <secondary>updating currently installed packages</secondary>
+        <tertiary>available updates</tertiary>
+      </indexterm>
+      <indexterm>
+        <primary>updating currently installed packages</primary>
+        <secondary>available updates</secondary>
+      </indexterm>; dependencies of those packages, whether they are existing packages on your system or new ones, are not shown until you click <guibutton>Install Updates</guibutton>.</para>
     <para>
-      <application>PackageKit</application> <indexterm><primary>packages</primary><secondary>updating packages with PackageKit</secondary><tertiary>PolicyKit</tertiary></indexterm><indexterm><primary>updating packages with PackageKit</primary><secondary>PolicyKit</secondary></indexterm><indexterm><primary>PolicyKit</primary></indexterm>utilizes the fine-grained user authentication<indexterm><primary>PackageKit</primary><secondary>PolicyKit</secondary><tertiary>authentication</tertiary></indexterm> capabilities provided by the <application>PolicyKit</application> toolkit whenever you request it to make changes to the system. Whenever you instruct <application>PackageKit</application> to update, install or remove packages, you will be prompted to enter the superuser password before changes are made to the system.</para>
+      <application>PackageKit</application>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>updating packages with PackageKit</secondary>
+        <tertiary>PolicyKit</tertiary>
+      </indexterm>
+      <indexterm>
+        <primary>updating packages with PackageKit</primary>
+        <secondary>PolicyKit</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>PolicyKit</primary>
+      </indexterm>utilizes the fine-grained user authentication<indexterm><primary>PackageKit</primary>
+        <secondary>PolicyKit</secondary>
+        <tertiary>authentication</tertiary>
+      </indexterm> capabilities provided by the <application>PolicyKit</application> toolkit whenever you request it to make changes to the system. Whenever you instruct <application>PackageKit</application> to update, install or remove packages, you will be prompted to enter the superuser password before changes are made to the system.</para>
     <figure
       id="fig-Graphical_Package_Management-authenticate">
       <title>PackageKit uses PolicyKit to authenticate</title>
@@ -73,7 +133,11 @@
     <para>If you instruct <application>PackageKit</application> to update the <filename>kernel</filename> package, then it will prompt you after installation, asking you whether you want to reboot the system and thereby boot into the newly-installed kernel.</para>
     <bridgehead
       id="bh-Setting_preferences_for_checking_for_updates">Setting the Update-Checking Interval</bridgehead>
-      <indexterm><primary>packages</primary><secondary>setting packages with PackageKit</secondary><tertiary>checking interval</tertiary></indexterm>
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>setting packages with PackageKit</secondary>
+      <tertiary>checking interval</tertiary>
+    </indexterm>
     <para>Right-clicking on <application>PackageKit</application>'s Notification Area icon and clicking <guimenuitem>Preferences</guimenuitem> opens the <guilabel>Software Update Preferences</guilabel> window, where you can define the interval at which <application>PackageKit</application> checks for package updates, as well as whether or not to automatically install all updates or only security updates, and how often to check for major upgrades. Leaving the <guilabel>Check for updates when using mobile broadband</guilabel> box unchecked is handy for avoiding extraneous bandwidth usage when using a wireless connection on which you are charged for the amount of data you download.</para>
     <figure
       id="fig-Graphical_Package_Management-Software_Update_Preferences">
@@ -91,10 +155,17 @@
       </mediaobject>
     </figure>
   </section>
-  <section id="sec-Using_Add_Remove_Software">
+  <section
+    id="sec-Using_Add_Remove_Software">
     <title>Using Add/Remove Software</title>
-    <indexterm><primary>packages</primary><secondary>adding and removing with PackageKit</secondary></indexterm><indexterm><primary>PackageKit</primary><secondary>adding and removing</secondary></indexterm>
-
+    <indexterm>
+      <primary>packages</primary>
+      <secondary>adding and removing with PackageKit</secondary>
+    </indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>adding and removing</secondary>
+    </indexterm>
     <para>
       <application>PackageKit</application>'s <application>Software Update</application> GUI window is a separate application from its <guilabel>Add/Remove Software</guilabel> application, although the two have intuitively similar interfaces. To find and install a new package, on the GNOME panel click on <menuchoice><guimenu>System</guimenu>
         <guimenuitem>Administration</guimenuitem>
@@ -120,8 +191,13 @@
       <title>Refreshing Software Sources (Yum Repositories)</title>
       <para>
         <application>PackageKit</application> refers to <application>Yum</application> repositories as <indexterm>
-        <primary>packages</primary><secondary>viewing Yum repositories with PackageKit</secondary></indexterm><indexterm>
-        <primary>Yum repositories</primary><secondary>viewing Yum repositories with PackageKit</secondary></indexterm>software sources. It obtains all packages from enabled software sources. You can view the list of all <emphasis>configured</emphasis> and unfiltered (see below)
+        <primary>packages</primary>
+          <secondary>viewing Yum repositories with PackageKit</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>Yum repositories</primary>
+          <secondary>viewing Yum repositories with PackageKit</secondary>
+        </indexterm>software sources. It obtains all packages from enabled software sources. You can view the list of all <emphasis>configured</emphasis> and unfiltered (see below)
         <application>Yum</application> repositories by opening  <guilabel>Add/Remove Software</guilabel> and clicking <menuchoice><guimenu>System</guimenu>
           <guimenuitem>Software sources</guimenuitem>
         </menuchoice>. The <guilabel>Software Sources</guilabel> dialog shows the repository name, as written on the <computeroutput>name=<replaceable>&lt;My Repository Name&gt;</replaceable>
@@ -142,16 +218,38 @@
     <section
       id="sec-Finding_Packages_with_Filters">
       <title>Finding Packages with Filters</title>
-          <indexterm><primary>packages</primary><secondary>filtering with PackageKit for packages</secondary></indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>filtering with PackageKit for packages</secondary>
+      </indexterm>
       <para>Once the software sources have been updated, it is often beneficial to apply some filters so that <application>PackageKit</application> retrieves the results of our <guilabel>Find</guilabel> queries faster. This is especially helpful when performing many package searches. Four of the filters in the <guimenu>Filters</guimenu> drop-down menu are used to split results by matching or not matching a single criterion. By default when <application>PackageKit</application> starts, these filters are all unapplied (<guibutton>No filter</guibutton>), but once you do filter by one of them, that filter remains set until you either change it or close <application>PackageKit</application>.</para>
       <para>Because you are usually searching for available packages that are <emphasis>not</emphasis> installed on the system, click <menuchoice><guimenu>Filters</guimenu>
           <guimenuitem>Installed</guimenuitem>
         </menuchoice> and select the <guimenuitem>Only available</guimenuitem> radio button.
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>installed</tertiary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only installed</tertiary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only available</tertiary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>no filter</tertiary></indexterm></para>
+      <indexterm><primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>installed</tertiary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>only installed</tertiary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>only available</tertiary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>no filter</tertiary>
+        </indexterm>
+      </para>
       <figure
         id="Graphical_Package_Management-filters-only_available">
         <title>Filtering out already-installed packages</title>
@@ -168,10 +266,23 @@
         </mediaobject>
       </figure>
       <para>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>Development</tertiary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only development</tertiary></indexterm>
-      <indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only end user files</tertiary></indexterm> Also, unless we require development files such as C header files, we can filter for <guimenu>Only end user files</guimenu> and, in doing so, filter out all of the <filename><replaceable>&lt;package_name&gt;</replaceable>-devel</filename> packages we are not interested in.</para>
-      <figure id="fig-Graphical_Package_Management-filters-only_end_user">
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>Development</tertiary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>only development</tertiary>
+        </indexterm>
+        <indexterm>
+          <primary>packages</primary>
+          <secondary>filtering with PackageKit</secondary>
+          <tertiary>only end user files</tertiary>
+        </indexterm> Also, unless we require development files such as C header files, we can filter for <guimenu>Only end user files</guimenu> and, in doing so, filter out all of the <filename><replaceable>&lt;package_name&gt;</replaceable>-devel</filename> packages we are not interested in.</para>
+      <figure
+        id="fig-Graphical_Package_Management-filters-only_end_user">
         <title>Filtering out development packages from the list of Find results</title>
         <mediaobject>
           <imageobject>
@@ -189,7 +300,12 @@
       <variablelist>
         <varlistentry>
           <term>
-            <guisubmenu>Graphical</guisubmenu><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>Graphical</tertiary></indexterm>
+            <guisubmenu>Graphical</guisubmenu>
+            <indexterm>
+              <primary>packages</primary>
+              <secondary>filtering with PackageKit</secondary>
+              <tertiary>Graphical</tertiary>
+            </indexterm>
           </term>
           <listitem>
             <para>Narrows the search to either applications which provide a GUI interface or those that do not (<guibutton>Only text</guibutton>). This filter is useful when browsing for GUI applications that perform a specific function.</para>
@@ -197,9 +313,13 @@
         </varlistentry>
         <varlistentry>
           <term>
-            <guisubmenu>Free</guisubmenu><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>Free</tertiary></indexterm>
+            <guisubmenu>Free</guisubmenu>
+            <indexterm>
+              <primary>packages</primary>
+              <secondary>filtering with PackageKit</secondary>
+              <tertiary>Free</tertiary>
+            </indexterm>
           </term>
-
           <listitem>
             <para>Search for packages which are considered to be free software Refer to the <ulink
                 url="https://fedoraproject.org/wiki/Licensing#SoftwareLicenses">Fedora Licensing List</ulink> for details on approved licenses.</para>
@@ -213,7 +333,12 @@
             <guimenuitem>Hide subpackages</guimenuitem>
           </term>
           <listitem>
-            <para>Checking the <guimenuitem>Hide subpackages</guimenuitem><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>hide subpackages</tertiary></indexterm> checkbox filters out generally-uninteresting packages that are typically only dependencies of other packages that we want. For example, checking <guimenuitem>Hide subpackages</guimenuitem> and searching for <filename><replaceable>&lt;package&gt;</replaceable>
+            <para>Checking the <guimenuitem>Hide subpackages</guimenuitem>
+              <indexterm>
+                <primary>packages</primary>
+                <secondary>filtering with PackageKit</secondary>
+                <tertiary>hide subpackages</tertiary>
+              </indexterm> checkbox filters out generally-uninteresting packages that are typically only dependencies of other packages that we want. For example, checking <guimenuitem>Hide subpackages</guimenuitem> and searching for <filename><replaceable>&lt;package&gt;</replaceable>
               </filename> would cause the following related packages to be filtered out of the <guibutton>Find</guibutton> results (if it exists):</para>
             <itemizedlist>
               <listitem>
@@ -248,7 +373,12 @@
             <guimenuitem>Only newest items</guimenuitem>
           </term>
           <listitem>
-            <para>Checking <guimenuitem>Only newest items</guimenuitem><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only newest items</tertiary></indexterm> filters out all older versions of the same package from the list of results, which is generally what we want.</para>
+            <para>Checking <guimenuitem>Only newest items</guimenuitem>
+              <indexterm>
+                <primary>packages</primary>
+                <secondary>filtering with PackageKit</secondary>
+                <tertiary>only newest items</tertiary>
+              </indexterm> filters out all older versions of the same package from the list of results, which is generally what we want.</para>
             <important
               id="important-Using_the_Only_newest_items_filter">
               <title>Important: Using the Only newest items filter</title>
@@ -259,7 +389,12 @@
         <varlistentry>
           <term>Only native packages</term>
           <listitem>
-            <para>Checking the <guimenuitem>Only native packages</guimenuitem><indexterm><primary>packages</primary><secondary>filtering with PackageKit</secondary><tertiary>only native packages</tertiary></indexterm> box on a multilib system causes <application>PackageKit</application> to omit listing results for packages compiled for the architecture that runs in <emphasis>compatibility mode</emphasis>. For example, enabling this filter on a 64-bit system with an AMD64 CPU would cause all packages built for the 32-bit x86 CPU architecture not to be shown in the list of results, even though those packages are able to run on an AMD64 machine. Packages which are architecture-agnostic (i.e. <firstterm>noarch</firstterm> packages such as <filename>crontabs-1.10-32.1.el6.noarch.rpm</filename>) are never filtered out by checking <guimenuitem>Only native packages</guimenuitem>. This filter has no affect on non-multilib systems, such as <replaceable>x</replaceable>86 machines.</par
 a>
+            <para>Checking the <guimenuitem>Only native packages</guimenuitem>
+              <indexterm>
+                <primary>packages</primary>
+                <secondary>filtering with PackageKit</secondary>
+                <tertiary>only native packages</tertiary>
+              </indexterm> box on a multilib system causes <application>PackageKit</application> to omit listing results for packages compiled for the architecture that runs in <emphasis>compatibility mode</emphasis>. For example, enabling this filter on a 64-bit system with an AMD64 CPU would cause all packages built for the 32-bit x86 CPU architecture not to be shown in the list of results, even though those packages are able to run on an AMD64 machine. Packages which are architecture-agnostic (i.e. <firstterm>noarch</firstterm> packages such as <filename>crontabs-1.10-32.1.el6.noarch.rpm</filename>) are never filtered out by checking <guimenuitem>Only native packages</guimenuitem>. This filter has no affect on non-multilib systems, such as <replaceable>x</replaceable>86 machines.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -267,8 +402,14 @@
     <section
       id="sec-Installing_and_Removing_Packages_and_Dependencies">
       <title>Installing and Removing Packages (and Dependencies)</title>
-      <indexterm><primary>packages</primary><secondary>installing packages with PackageKit</secondary></indexterm>
-      <indexterm><primary>packages</primary><secondary>removing packages with PackageKit</secondary></indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>installing packages with PackageKit</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>removing packages with PackageKit</secondary>
+      </indexterm>
       <para>With the two filters selected, <guibutton>Only available</guibutton> and <guibutton>Only end user files</guibutton>, search for the <application>htop</application> interactive process viewer and highlight the package. You now have access to some very useful information about it, including: a clickable link to the project homepage; the <application>Yum</application> package group it is found in, if any; the license of the package; a pointer to the GNOME menu location from where the application can be opened, if applicable (<menuchoice><guimenu>Applications</guimenu>
           <guimenuitem>System Tools</guimenuitem>
           <guimenuitem>Htop</guimenuitem>
@@ -288,7 +429,10 @@
           </textobject>
         </mediaobject>
       </figure>
-      <para>When the checkbox next to a package or group is checked, then that item is already installed on the system. Checking an unchecked box causes it to be <emphasis>marked</emphasis> for installation, which only occurs when the <guibutton>Apply</guibutton> button is clicked. In this way, you can search for and select multiple packages or package groups before performing the actual installation transactions. Additionally, you can remove installed packages by unchecking the checked box, and the removal will occur along with any pending installations when <guibutton>Apply</guibutton> is pressed. Dependency resolution <indexterm><primary>packages</primary><secondary>installing packages with PackageKit</secondary><tertiary>dependencies</tertiary></indexterm>, which may add additional packages to be installed or removed, is performed after pressing <guibutton>Apply</guibutton>. <application>PackageKit</application> will then display a window listing those additional package
 s to install or remove, and ask for confirmation to proceed.</para>
+      <para>When the checkbox next to a package or group is checked, then that item is already installed on the system. Checking an unchecked box causes it to be <emphasis>marked</emphasis> for installation, which only occurs when the <guibutton>Apply</guibutton> button is clicked. In this way, you can search for and select multiple packages or package groups before performing the actual installation transactions. Additionally, you can remove installed packages by unchecking the checked box, and the removal will occur along with any pending installations when <guibutton>Apply</guibutton> is pressed. Dependency resolution <indexterm><primary>packages</primary>
+          <secondary>installing packages with PackageKit</secondary>
+          <tertiary>dependencies</tertiary>
+        </indexterm>, which may add additional packages to be installed or removed, is performed after pressing <guibutton>Apply</guibutton>. <application>PackageKit</application> will then display a window listing those additional packages to install or remove, and ask for confirmation to proceed.</para>
       <para>Check <application>htop</application> and click the <guibutton>Apply</guibutton> button. You will then be prompted for the superuser password; enter it, and <application>PackageKit</application> will install <application>htop</application>. One nice feature of <application>PackageKit</application> is that, following installation, it sometimes presents you with a list of your newly-installed applications and offer you the choice of running them immediately. Alternatively, you will remember that finding a package and selecting it in the <guilabel>Add/Remove Software</guilabel> window shows you the <guilabel>Location</guilabel> of where in the GNOME menus its application shortcut is located, which is helpful when you want to run it.</para>
       <para>Once it is installed, you can run <command>htop</command>, an colorful and enhanced version of the <command>top</command> process viewer, by opening a shell prompt and entering:</para>
       <screen>~]$ <command>htop</command>
@@ -332,12 +476,22 @@
     <section
       id="sec-Installing_and_Removing_Package_Groups">
       <title>Installing and Removing Package Groups</title>
-      <indexterm><primary>packages</primary><secondary>installing and removing package groups</secondary></indexterm>
-      <indexterm><primary>PackageKit</primary><secondary>installing and removing package groups</secondary></indexterm>
-<indexterm><primary>installing package groups</primary><secondary>installing package groups with PackageKit</secondary>
-</indexterm>
-<indexterm><primary>removing package groups</primary><secondary>removing package groups with PackageKit</secondary>
-</indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>installing and removing package groups</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>PackageKit</primary>
+        <secondary>installing and removing package groups</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>installing package groups</primary>
+        <secondary>installing package groups with PackageKit</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>removing package groups</primary>
+        <secondary>removing package groups with PackageKit</secondary>
+      </indexterm>
       <para>
         <application>PackageKit</application> also has the ability to install <application>Yum</application> package groups, which it calls <guilabel>Package collections</guilabel>. Clicking on <guilabel>Package collections</guilabel> in the top-left list of categories in the <guilabel>Software Updates</guilabel> window allows us to scroll through and find the package group we want to install. In this case, we want to install Czech language support (the <guilabel>Czech Support</guilabel> group). Checking the box and clicking <guibutton>apply</guibutton> informs us how many <emphasis>additional</emphasis> packages must be installed in order to fulfill the dependencies of the package group.</para>
       <figure
@@ -362,8 +516,13 @@
       <title>Viewing the Transaction Log</title>
       <para>
         <application>PackageKit</application> maintains a log of the transactions
-        <indexterm><primary>packages</primary><secondary>viewing transaction log</secondary></indexterm>
-        <indexterm><primary>PackageKit</primary><secondary>viewing transaction log</secondary></indexterm>that it performs. To view the log, from the <guilabel>Add/Remove Software</guilabel> window, click <menuchoice><guimenu>System</guimenu>
+        <indexterm><primary>packages</primary>
+          <secondary>viewing transaction log</secondary>
+        </indexterm>
+        <indexterm>
+          <primary>PackageKit</primary>
+          <secondary>viewing transaction log</secondary>
+        </indexterm>that it performs. To view the log, from the <guilabel>Add/Remove Software</guilabel> window, click <menuchoice><guimenu>System</guimenu>
           <guimenuitem>Software log</guimenuitem>
         </menuchoice>, or run the <command>gpk-log</command> command at the shell prompt.</para>
       <para>The <guilabel>Software Log Viewer</guilabel> shows the <guilabel>Action</guilabel>, such as <replaceable>Updated System</replaceable> or <replaceable>Installed Packages</replaceable>, the <guilabel>Date</guilabel> on which that action was performed, the <guilabel>Username</guilabel> of the user who performed the action, and the front end <guilabel>Application</guilabel> the user used (such as <replaceable>Update Icon</replaceable>, or <replaceable>kpackagekit</replaceable>). The <guilabel>Details</guilabel> column provides the types of the transactions, such as <replaceable>Updated</replaceable>, <replaceable>Installed</replaceable> or <replaceable>Removed</replaceable>, as well as the list of packages the transactions were performed on.</para>
@@ -388,7 +547,10 @@
   <section
     id="sec-PackageKit_Architecture">
     <title>PackageKit Architecture</title>
-    <indexterm><primary>PackageKit</primary><secondary>architecture</secondary></indexterm>
+    <indexterm>
+      <primary>PackageKit</primary>
+      <secondary>architecture</secondary>
+    </indexterm>
     <para>Red Hat provides the <application>PackageKit</application> suite of applications for viewing, updating, installing and uninstalling packages and package groups compatible with your system. Architecturally, <application>PackageKit</application> consists of several graphical front ends that communicate with the <command>packagekitd</command> daemon back end, which communicates with a package manager-specific back end that utilizes <application>Yum</application> to perform the actual transactions, such as installing and removing packages, etc.</para>
     <para>
       <xref
@@ -540,4 +702,3 @@
     </variablelist>
   </section>
 </chapter>
-
diff --git a/en-US/RPM.xml b/en-US/RPM.xml
index e87cbfb..70005d0 100644
--- a/en-US/RPM.xml
+++ b/en-US/RPM.xml
@@ -12,12 +12,16 @@
   <indexterm>
     <primary>RPM</primary>
   </indexterm>
-  <para>The <firstterm>RPM Package Manager</firstterm> (RPM) is an open packaging system<indexterm><primary>packages</primary><secondary>RPM</secondary></indexterm>, which runs on &MAJOROS; as well as other Linux and UNIX systems. Red Hat, Inc. and the Fedora Project encourage other vendors to use RPM for their own products. RPM is distributed under the terms of the <firstterm>GPL</firstterm> (<firstterm>GNU General Public License</firstterm>).</para>
+  <para>The <firstterm>RPM Package Manager</firstterm> (RPM) is an open packaging system<indexterm><primary>packages</primary>
+      <secondary>RPM</secondary>
+    </indexterm>, which runs on &MAJOROS; as well as other Linux and UNIX systems. Red Hat, Inc. and the Fedora Project encourage other vendors to use RPM for their own products. RPM is distributed under the terms of the <firstterm>GPL</firstterm> (<firstterm>GNU General Public License</firstterm>).</para>
   <para>The RPM Package Manager only works with packages built to work with the <emphasis>RPM format</emphasis>. RPM is itself provided as a pre-installed <package>rpm</package> package. For the end user, RPM makes system updates easy. Installing, uninstalling and upgrading RPM packages can be accomplished with short commands. RPM maintains a database of installed packages and their files, so you can invoke powerful queries and verifications on your system.</para>
   <warning
     id="warning-Use_Yum_Instead_of_RPM_Whenever_Possible">
     <title>Use Yum Instead of RPM Whenever Possible</title>
-    <para>For most package management tasks, the <application>Yum</application> package manager offers equal and often greater capabilities and utility than RPM<indexterm><primary>packages</primary><secondary>Yum insead of RPM</secondary></indexterm>. <application>Yum</application> also performs and tracks complicated system dependency resolution, and will complain and force system integrity checks if you use RPM as well to install and remove packages. For these reasons, it is highly recommended that you use <application>Yum</application> instead of RPM whenever possible to perform package management tasks. Refer to <xref
+    <para>For most package management tasks, the <application>Yum</application> package manager offers equal and often greater capabilities and utility than RPM<indexterm><primary>packages</primary>
+        <secondary>Yum insead of RPM</secondary>
+      </indexterm>. <application>Yum</application> also performs and tracks complicated system dependency resolution, and will complain and force system integrity checks if you use RPM as well to install and remove packages. For these reasons, it is highly recommended that you use <application>Yum</application> instead of RPM whenever possible to perform package management tasks. Refer to <xref
         linkend="ch-yum"/>.</para>
     <para>If you prefer a graphical interface, you can use the <application>PackageKit</application> GUI application, which uses <application>Yum</application> as its back end, to manage your system's packages. Refer to <xref
         linkend="ch-PackageKit"/> for details.</para>
@@ -27,8 +31,11 @@
     <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&#8212;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.<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>
+  <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>
@@ -43,25 +50,41 @@
     <para>To understand how to use RPM, it can be helpful to understand the design goals of RPM:</para>
     <variablelist>
       <varlistentry>
-        <term>Upgradability<indexterm><primary>RPM</primary><secondary>design goals</secondary><tertiary>upgradability</tertiary></indexterm></term>
+        <term>Upgradability<indexterm><primary>RPM</primary>
+            <secondary>design goals</secondary>
+            <tertiary>upgradability</tertiary>
+          </indexterm>
+        </term>
         <listitem>
           <para>With RPM, you can upgrade individual components of your system without completely reinstalling. When you get a new release of an operating system based on RPM, such as &MAJOROS;, you do not need to reinstall a fresh copy of the operating system your machine (as you might need to with operating systems based on other packaging systems). RPM allows intelligent, fully-automated, in-place upgrades of your system. In addition, configuration files in packages are preserved across upgrades, so you do not lose your customizations. There are no special upgrade files needed to upgrade a package because the same RPM file is used to both install and upgrade the package on your system.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Powerful Querying<indexterm><primary>RPM</primary><secondary>design goals</secondary><tertiary>powerful querying</tertiary></indexterm></term>
+        <term>Powerful Querying<indexterm><primary>RPM</primary>
+            <secondary>design goals</secondary>
+            <tertiary>powerful querying</tertiary>
+          </indexterm>
+        </term>
         <listitem>
           <para>RPM is designed to provide powerful querying options. You can perform searches on your entire database for packages or even just certain files. You can also easily find out what package a file belongs to and from where the package came. The files an RPM package contains are in a compressed archive, with a custom binary header containing useful information about the package and its contents, allowing you to query individual packages quickly and easily.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term> System Verification<indexterm><primary>RPM</primary><secondary>design goals</secondary><tertiary>system verification</tertiary></indexterm></term>
+        <term> System Verification<indexterm><primary>RPM</primary>
+            <secondary>design goals</secondary>
+            <tertiary>system verification</tertiary>
+          </indexterm>
+        </term>
         <listitem>
           <para>Another powerful RPM feature is the ability to verify packages. If you are worried that you deleted an important file for some package, you can verify the package. You are then notified of anomalies, if any&#8212;at which point you can reinstall the package, if necessary. Any configuration files that you modified are preserved during reinstallation.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Pristine Sources <indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>prisitne sources</tertiary></indexterm></term>
+        <term>Pristine Sources <indexterm><primary>packages</primary>
+            <secondary>RPM</secondary>
+            <tertiary>prisitne sources</tertiary>
+          </indexterm>
+        </term>
         <listitem>
           <para>A crucial design goal was to allow the use of <emphasis>pristine </emphasis> software sources, as distributed by the original authors of the software. With RPM, you have the pristine sources along with any patches that were used, plus complete build instructions. This is an important advantage for several reasons. For instance, if a new version of a program is released, you do not necessarily have to start from scratch to get it to compile. You can look at the patch to see what you <emphasis>might</emphasis> need to do. All the compiled-in defaults, and all of the changes that were made to get the software to build properly, are easily visible using this technique.</para>
           <para>The goal of keeping sources pristine may seem important only for developers, but it results in higher quality software for end users, too.</para>
@@ -72,31 +95,45 @@
   <section
     id="s1-rpm-using">
     <title>Using RPM</title>
-    <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
+    <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">
       <title>Finding RPM Packages</title>
-      <indexterm><primary>packages</primary><secondary>finding RPM packages</secondary></indexterm>
-      <indexterm><primary>RPM</primary><secondary>finding RPM packages</secondary></indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>finding RPM packages</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>RPM</primary>
+        <secondary>finding RPM packages</secondary>
+      </indexterm>
       <para>Before using any RPM packages, you must know where to find them. An Internet search returns many RPM repositories, but if you are looking for Red Hat RPM packages, they can be found at the following locations:</para>
       <itemizedlist>
         <listitem>
-          <para>The &MAJOROS; installation media <indexterm><primary>&MAJOROS; installation media</primary><secondary>installable packages</secondary></indexterm><indexterm><primary> packages</primary><secondary>i&MAJOROS; installation media</secondary></indexterm> contain many installable RPMs.</para>
-        </listitem>
-        <listitem>
-          <para>The initial RPM repositories provided with the YUM package manager<indexterm><primary>initial RPM repositories</primary><secondary>installable packages</secondary></indexterm><indexterm><primary> packages</primary><secondary>initial RPM repositories</secondary></indexterm>. Refer to <xref
+          <para>The &MAJOROS; installation media <indexterm><primary>&MAJOROS; installation media</primary>
+              <secondary>installable packages</secondary>
+            </indexterm>
+            <indexterm>
+              <primary> packages</primary>
+              <secondary>i&MAJOROS; installation media</secondary>
+            </indexterm> contain many installable RPMs.</para>
+        </listitem>
+        <listitem>
+          <para>The initial RPM repositories provided with the YUM package manager<indexterm><primary>initial RPM repositories</primary>
+              <secondary>installable packages</secondary>
+            </indexterm>
+            <indexterm>
+              <primary> packages</primary>
+              <secondary>initial RPM repositories</secondary>
+            </indexterm>. Refer to <xref
               linkend="ch-yum"/> for details on how to use the official &MAJOROS; package repositories.</para>
         </listitem>
         <listitem>
-<<<<<<< HEAD
           <para>The active &MAJOROS; mirrors contains many installable RPMs: <ulink
               url="http://mirrors.fedoraproject.org/publiclist/"/>.</para>
-=======
-          <para>The Extra Packages for Enterprise Linux (EPEL) is a community effort to provide high-quality add-on packages for Red Hat Enterprise Linux<indexterm><primary>extra packages for Enterprise Linux (EPEL)</primary><secondary>installable packages</secondary></indexterm><indexterm><primary> packages</primary><secondary>extra packages for Enterprise Linux (EPEL)</secondary></indexterm>. Refer to <ulink
-              url="http://fedoraproject.org/wiki/EPEL"/> for details on EPEL RPM packages.</para>
->>>>>>> master
         </listitem>
         <listitem>
           <para>Unofficial, third-party repositories not ahffiliated Red Hat also provide RPM packages.</para>
@@ -105,21 +142,7 @@
             <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>
           </important>
         </listitem>
-<<<<<<< HEAD
-        </itemizedlist>
-=======
-        <listitem>
-          <para>The Red Hat Errata Page, available at <ulink
-              url="http://www.redhat.com/apps/support/errata/"/>
-          </para>
-        </listitem>
-				<!-- TBD6: re-include for RHEL once RHN chapter is incorporated
-				<listitem>
-					<para>Red Hat Network — Refer to <xref
-							linkend="ch-rhnetwork"/> for more details on Red Hat Network.</para>
-				</listitem>-->
       </itemizedlist>
->>>>>>> master
     </section>
     <section
       id="sec-Installing_and_Upgrading">
@@ -140,7 +163,9 @@
         <primary>packages</primary>
         <secondary>upgrading RPM</secondary>
       </indexterm>
-      <para>RPM packages typically have file names <indexterm><primary>RPM</primary><secondary>file name</secondary></indexterm>
+      <para>RPM packages typically have file names <indexterm><primary>RPM</primary>
+          <secondary>file name</secondary>
+        </indexterm>
         like <filename>tree-1.5.3-2.&PKGOS;.x86_64.rpm</filename>. The file name includes the package name (<filename>tree</filename>), version (<filename>1.5.3</filename>), release (<filename>2</filename>), operating system major version (<filename>&PKGOS;</filename>) and CPU architecture (<filename>x86_64</filename>).</para>
       <para>You can use <command>rpm</command>'s <option>-U</option> option to:</para>
       <itemizedlist>
@@ -171,7 +196,8 @@
         <title>Always use the -i (install) option to install new kernel packages!</title>
         <para>
           <command>rpm</command> provides two different options for installing packages: the aforementioned <option>-U</option> option (which historically stands for <emphasis>upgrade</emphasis>), and the <option>-i</option> option, historically standing for <emphasis>install</emphasis>. Because the <option>-U</option> option subsumes both install and upgrade functions, we recommend to use <command>rpm -Uvh</command> with all packages <emphasis>except <package>kernel</package> packages</emphasis>.</para>
-        <para>You should always use the <option>-i</option> option to simply <emphasis>install</emphasis> a new kernel package instead of upgrading it. This is because using the <option>-U</option> option to upgrade a kernel package removes the previous (older) kernel package, which could render the system unable to boot if there is a problem with the new kernel. Therefore, use the <command>rpm -i <replaceable>&lt;kernel_package&gt;</replaceable></command> command to install a new kernel <emphasis>without replacing any older <package>kernel</package> packages</emphasis>. For more information on installing <package>kernel</package> packages, refer to <xref
+        <para>You should always use the <option>-i</option> option to simply <emphasis>install</emphasis> a new kernel package instead of upgrading it. This is because using the <option>-U</option> option to upgrade a kernel package removes the previous (older) kernel package, which could render the system unable to boot if there is a problem with the new kernel. Therefore, use the <command>rpm -i <replaceable>&lt;kernel_package&gt;</replaceable>
+            </command> command to install a new kernel <emphasis>without replacing any older <package>kernel</package> packages</emphasis>. For more information on installing <package>kernel</package> packages, refer to <xref
             linkend="ch-Manually_Upgrading_the_Kernel"/>.</para>
       </warning>
       <para>The signature of a package is checked automatically when installing or upgrading a package. The signature confirms that the package was signed by an authorized party. For example, if the verification of the signature fails, an error message such as the following is displayed:</para>
@@ -188,7 +214,14 @@ key ID d22e77f2</screen>
       <section
         id="s3-rpm-errors">
         <title>Package Already Installed</title>
-        <para>If a package of the same name and version is already installed<indexterm><primary>RPM</primary><secondary>already installed</secondary></indexterm><indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>already installed</tertiary></indexterm>, the following output is displayed:</para>
+        <para>If a package of the same name and version is already installed<indexterm><primary>RPM</primary>
+            <secondary>already installed</secondary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>RPM</secondary>
+            <tertiary>already installed</tertiary>
+          </indexterm>, the following output is displayed:</para>
         <screen>Preparing...                ########################################### [100%]
 	package tree-1.5.3-2.&PKGOS;.x86_64 is already installed</screen>
         <para>However, if you want to install the package anyway, you can use the <command>--replacepkgs</command> option, which tells RPM to ignore the error:</para>
@@ -205,7 +238,14 @@ key ID d22e77f2</screen>
           <secondary>file conflicts</secondary>
           <tertiary>resolving</tertiary>
         </indexterm>
-        <para>If you attempt to install a package that contains a file which has already been installed by another package<indexterm><primary>RPM</primary><secondary>conflicts</secondary></indexterm><indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>conflict</tertiary></indexterm>, the following is displayed:</para>
+        <para>If you attempt to install a package that contains a file which has already been installed by another package<indexterm><primary>RPM</primary>
+            <secondary>conflicts</secondary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>RPM</secondary>
+            <tertiary>conflict</tertiary>
+          </indexterm>, the following is displayed:</para>
         <screen>Preparing... ##################################################
  file /usr/bin/foobar from install of foo-1.0-1.&PKGOS;.x86_64 conflicts
 with file from package bar-3.1.1.&PKGOS;.x86_64</screen>
@@ -225,7 +265,14 @@ with file from package bar-3.1.1.&PKGOS;.x86_64</screen>
           <primary>packages</primary>
           <secondary>dependencies</secondary>
         </indexterm>
-        <para>RPM packages may sometimes depend on other packages<indexterm><primary>RPM</primary><secondary>failed dependancies</secondary></indexterm><indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>failed dependancies</tertiary></indexterm>, which means that they require other packages to be installed to run properly. If you try to install a package which has an unresolved dependency, output similar to the following is displayed:</para>
+        <para>RPM packages may sometimes depend on other packages<indexterm><primary>RPM</primary>
+            <secondary>failed dependancies</secondary>
+          </indexterm>
+          <indexterm>
+            <primary>packages</primary>
+            <secondary>RPM</secondary>
+            <tertiary>failed dependancies</tertiary>
+          </indexterm>, which means that they require other packages to be installed to run properly. If you try to install a package which has an unresolved dependency, output similar to the following is displayed:</para>
         <!-- Silas: original format:
         <screen> error: Failed dependencies: bar.so.2 is needed by foo-1.0-1 Suggested resolutions: bar-2.0.20-3.i386.rpm</screen>-->
         <screen>error: Failed dependencies:
@@ -255,9 +302,19 @@ with file from package bar-3.1.1.&PKGOS;.x86_64</screen>
     <section
       id="sec-Configuration_File_Changes">
       <title>Configuration File Changes</title>
-      <indexterm><primary>RPM</primary><secondary>configuration file changes</secondary></indexterm>
-      <indexterm><primary>packages</primary><secondary>RPM</secondary><tertiary>configuration file changes</tertiary></indexterm>
-      <para>Because RPM performs intelligent upgrading of packages with configuration files<indexterm><primary>RPM</primary><secondary>configuration file changes</secondary><tertiary>conf.rpmsave</tertiary></indexterm>, you may see one or the other of the following messages:</para>
+      <indexterm>
+        <primary>RPM</primary>
+        <secondary>configuration file changes</secondary>
+      </indexterm>
+      <indexterm>
+        <primary>packages</primary>
+        <secondary>RPM</secondary>
+        <tertiary>configuration file changes</tertiary>
+      </indexterm>
+      <para>Because RPM performs intelligent upgrading of packages with configuration files<indexterm><primary>RPM</primary>
+          <secondary>configuration file changes</secondary>
+          <tertiary>conf.rpmsave</tertiary>
+        </indexterm>, you may see one or the other of the following messages:</para>
       <screen>saving /etc/foo.conf as /etc/foo.conf.rpmsave</screen>
       <para>This message means that changes you made to the configuration file may not be <emphasis>forward-compatible</emphasis> with the new configuration file in the package, so RPM saved your original file and installed a new one. You should investigate the differences between the two configuration files and resolve them as soon as possible, to ensure that your system continues to function properly.</para>
       <para>Alternatively, RPM may save the package's <emphasis>new</emphasis> configuration file as, for example, <filename>foo.conf.rpmnew</filename>, and leave the configuration file you modified untouched. You should still resolve any conflicts between your modified configuration file and the new one, usually by merging changes from the old one to the new one with a <command>diff</command> program.</para>
diff --git a/en-US/Yum.xml b/en-US/Yum.xml
index 8645211..31b498f 100644
--- a/en-US/Yum.xml
+++ b/en-US/Yum.xml
@@ -593,7 +593,6 @@ KDE Software Development (kde-software-development)
           </listitem>
         </itemizedlist>
       </para>
-
       <warning
         id="warning-WarningRemoving_a_Package_when_Other_Packages_Depend_On_It">
         <title>Warning: Removing a Package when Other Packages Depend On It</title>
@@ -878,7 +877,6 @@ baseurl=http://path/to/repo or ftp://path/to/repo or file://path/to/local/repo
       <para>To set up a <application>Yum</application> repository, follow these steps:</para>
       <procedure
         id="procedure-Setting_Up_a_Yum_repository">
-
         <title>Setting Up a <application>Yum</application> repository</title>
         <step>
           <para>Install the <filename>createrepo</filename> package:</para>
@@ -928,7 +926,6 @@ Loaded plugins: presto, refresh-packagekit, security
         <primary>Yum</primary>
         <secondary>disabling plugins</secondary>
       </indexterm>
-
       <para>To enable <application>Yum</application> plugins, ensure that a line beginning with <command>plugins=</command> is present in the <literal>[main]</literal> section of <filename>/etc/yum.conf</filename>, and that its value is set to <constant>1</constant>:</para>
       <screen>
 plugins=1
@@ -977,7 +974,6 @@ enabled=1
         <tertiary>yum-presto</tertiary>
       </indexterm>
       <para>The <application>presto</application> plugin adds support to <application>Yum</application> for downloading <firstterm>delta RPM</firstterm> packages, during updates, from repositories which have <application>presto</application> metadata enabled. Delta RPMs contain only the differences between the version of the the package installed on the client requesting the RPM package and the updated version in the repository. Downloading a delta RPM is much quicker than downloading the entire updated package, and can speed up updates considerably. Once the delta RPMs are downloaded, they must be rebuilt (the difference applied to the currently-installed package to create the full updated package) on the installing machine, which takes CPU time. Using delta RPMs is therefore a tradeoff between time-to-download, which depends on the network connection, and time-to-rebuild, which is CPU-bound. Using the <application>presto</application> plugin is recommended for fast machine
 s and systems with slower network connections, while slower machines on very fast connections <emphasis>may</emphasis> benefit more from downloading normal RPM packages, i.e. by disabling <application>presto</application>. The <application>presto</application> plugin is enabled by default.</para>
-
       <bridgehead
         id="bh-protect-packages_yum-plugin-protect-packages">protect-packages (yum-plugin-protect-packages)</bridgehead>
       <indexterm>
@@ -997,7 +993,6 @@ enabled=1
         <tertiary>PackageKit-yum-plugin</tertiary>
       </indexterm>
       <para>This plugin updates metadata for <application>PackageKit</application> whenever <application>yum</application> is run. The <application>refresh-packagkit</application> plugin is installed by default.</para>
-
       <bridgehead
         id="bh-security_yum-plugin-security">security (yum-plugin-security)</bridgehead>
       <indexterm>


More information about the docs-commits mailing list