yum-software-management/en_US customizing-yum.xml, 1.1, 1.2 introduction.xml, 1.1, 1.2 isolated-install.xml, 1.1, 1.2 manage-with-yum.xml, 1.1, 1.2 pirut.xml, 1.1, 1.2 pup.xml, 1.1, 1.2 search-with-yum.xml, 1.1, 1.2 tools.xml, 1.1, 1.2 update-with-yum.xml, 1.1, 1.2 yum-caching.xml, 1.1, 1.2 yum-proxy.xml, 1.1, 1.2

Jared Smith (jsmith) fedora-docs-commits at redhat.com
Tue Jan 22 03:34:07 UTC 2008


Author: jsmith

Update of /cvs/docs/yum-software-management/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3447

Modified Files:
	customizing-yum.xml introduction.xml isolated-install.xml 
	manage-with-yum.xml pirut.xml pup.xml search-with-yum.xml 
	tools.xml update-with-yum.xml yum-caching.xml yum-proxy.xml 
Log Message:
Fix up a bunch of formatting, make sure all documents have the proper doctype
and CVS Id line, wrap lines properly, and make sure all sections have an @id
attribute.



Index: customizing-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/customizing-yum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- customizing-yum.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ customizing-yum.xml	22 Jan 2008 03:34:04 -0000	1.2
@@ -1,228 +1,408 @@
-<?xml version="1.0"?>
-<section id="sn-CustomizingYum">
-    <title>Customizing <code>yum</code></title>
-    <para>To change the behavior of <code>yum</code>, you may either edit the configuration files, or install <emphasis>plugins</emphasis>. Plugins enable developers to add new features to <code>yum</code>. </para>
-    <anchor id="editing_the_yum_configuration"/>
-  <section>
-    <title>Editing the yum Configuration</title>
-    <para>The file <code>/etc/yum.conf</code> provides the main configuration for <code>yum</code>. Settings in a repository definition file override the main configuration for those operations that use the defined repository. </para>
-    <para>To edit <code>/etc/yum.conf</code>, run a text editor with <emphasis>root</emphasis> privileges. This command opens <code>/etc/yum.conf</code> with <emphasis role="strong">gedit</emphasis>, the default text editor for Fedora desktop systems: </para>
-    <para>
-      <code>su -c 'gedit /etc/yum.conf'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>The main configuration file provides the settings that apply to all <code>yum</code> operations. These include caching options, and proxy server settings. The directory <code>/etc/yum.repos.d/</code> holds definition files for each repository that <code>yum</code> uses. Plugins use the configuration files in the directory <code>/etc/yum/pluginconf.d/</code>. </para>
-    <para>The following sections in this document provide further information on configuring yum: </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <xref linkend="sn-ConfiguringRepositories"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sn-CustomizingYum"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sn-YumCaching"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sn-YumProxy"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    <note>
-      <title>Further Documentation</title>
-      <para> Refer to the <code>man</code> page for <code>yum.conf</code> for a complete list of the configuration options supported by <code>yum</code>. </para>
-    </note>
-    <para>
-      <anchor id="working_with_yum_plugins"/>
-    </para>
-  </section>
-  <section>
-    <title>Working with yum Plugins</title>
-    <para>Each yum plugin is a single file, written in the Python programming language. You may download plugins from the yum project Web site, or from third-party providers. The yum project maintains a list of plugins on the page <ulink url="http://wiki.linux.duke.edu/YumPlugins">http://wiki.linux.duke.edu/YumPlugins</ulink>. </para>
-    <note>
-      <title role="strong">Plugin File Extension</title>
-      <para> The names of <code>yum</code> plugin files end with <code>.py</code>, the standard extension for Python scripts. </para>
-    </note>
-    <para>To install a plugin, copy it to the directory <code>/usr/lib/yum-plugins/</code>. Create a configuration file for the plugin in the directory <code>/etc/yum/pluginconf.d/</code>. Save the configuration file with the same name as the plugin, but with the extension <code>.conf</code>. </para>
-    <note>
-      <title><emphasis role="strong">root</emphasis> Privileges Required</title>
-      <para> You must have <emphasis>root</emphasis> access to add files to the directories <code>/usr/lib/yum-plugins/</code> and <code>/etc/yum/pluginconf.d/</code>. </para>
-    </note>
-    <para>For example, to copy the plugin <code>exampleplugin.py</code>, enter the command: </para>
-    <para>
-      <code>su -c 'cp exampleplugin.py /usr/lib/yum-plugins/'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>You may then create a configuration file for the plugin with a text editor. This example uses <emphasis role="strong">gedit</emphasis>, the default text editor for Fedora desktop systems: </para>
-    <para>
-      <code>su -c 'gedit /etc/yum/pluginconf.d/exampleplugin.conf'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>Each plugin configuration file includes the enabled setting. Some plugins also require additional settings. To determine the correct settings, either refer to the documentation supplied with the plugin, or read the plugin file itself with any text editor. </para>
-    <para/>
-    <screen><![CDATA[[main]
-enabled=1
-anotheroption=0
-]]></screen>
-    <para>Example 3. Example Plugin Configuration File </para>
-    <para>
-      <anchor id="useful_plugins_for_fedora_users"/>
-    </para>
-  </section>
-  <section>
-    <title> Useful Plugins for Fedora Users</title>
-    <para>Yum is easily extensible through plugins and a number of plugins have been written by many developers.  These plugins advance the core capabilities of Yum and add more features. This section covers the plugins that are useful to Fedora users. </para>
-    <para/>
-    <section>
-      <title>Installonlyn Plugin</title>
-      <para>Usually software package updates work by removing the older package, retaining the configuration and installing the newer version of a package. Kernel packages are more unique since newer versions can be installed in parallel. Every release of Fedora usually receives a number of kernel updates during its lifecycle due to the general policy of staying close to upstream projects. Each of these kernel updates then occupy space and over time will clutter the initial boot loader options. To prevent this, the installonlyn plugin leaves "n" number of kernel packages by default removing the oldest ones first sequentially on updates. Fedora Core 5 onwards installs this plugin by default. In Fedora, this plugin retains the current kernel and two latest updates. You can disable this plugin or configure it to retain a different number of kernels by setting the value in the file /etc/yum/pluginconf.d/installonlyn.conf </para>
-      <para/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Id: -->
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+[
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+  <section id="sn-CustomizingYum">
+    <title>Customizing 
+    <code>yum</code></title>
+    <para>To change the behavior of 
+    <code>yum</code>, you may either edit the configuration files, or
+    install 
+    <emphasis>plugins</emphasis>. Plugins enable developers to add new
+    features to 
+    <code>yum</code>.</para>
+    <anchor id="editing_the_yum_configuration" />
+    <section id="sn-EditingYumConfig">
+      <title>Editing the yum Configuration</title>
+      <para>The file 
+      <code>/etc/yum.conf</code>provides the main configuration for 
+      <code>yum</code>. Settings in a repository definition file override
+      the main configuration for those operations that use the defined
+      repository.</para>
+      <para>To edit 
+      <code>/etc/yum.conf</code>, run a text editor with 
+      <emphasis>root</emphasis>privileges. This command opens 
+      <code>/etc/yum.conf</code>with 
+      <emphasis role="strong">gedit</emphasis>, the default text editor
+      for Fedora desktop systems:</para>
+      <para>
+        <code>su -c 'gedit /etc/yum.conf'</code>
+      </para>
+      <para>Enter the password for the 
+      <emphasis>root</emphasis>account when prompted.</para>
+      <para>The main configuration file provides the settings that apply
+      to all 
+      <code>yum</code>operations. These include caching options, and
+      proxy server settings. The directory 
+      <code>/etc/yum.repos.d/</code>holds definition files for each
+      repository that 
+      <code>yum</code>uses. Plugins use the configuration files in the
+      directory 
+      <code>/etc/yum/pluginconf.d/</code>.</para>
+      <para>The following sections in this document provide further
+      information on configuring yum:</para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            <xref linkend="sn-ConfiguringRepositories" />
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="sn-CustomizingYum" />
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="sn-YumCaching" />
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <xref linkend="sn-YumProxy" />
+          </para>
+        </listitem>
+      </itemizedlist>
+      <note>
+        <title>Further Documentation</title>
+        <para>Refer to the 
+        <code>man</code>page for 
+        <code>yum.conf</code>for a complete list of the configuration
+        options supported by 
+        <code>yum</code>.</para>
+      </note>
+      <para>
+        <anchor id="working_with_yum_plugins" />
+      </para>
     </section>
-    <section>
-      <title>Fastest Mirror Plugin</title>
-      <para>Yum in Fedora uses a dynamic server side <ulink url="http://fedoraproject.org/wiki/Infrastructure/MirrorManagement">mirror management infrastructure</ulink> that distributes the bandwidth consumptions on each of these mirrors by automatically directing the update to one of the geographically closest mirrors.  This mirror is automatically checked against the master server for consistency. </para>
-      <para>The fastest mirror plugin enhances the speed of updates by maintaining a local offline hostfile cache of the speed of the mirrors.  It sorts the mirror list by speed and prioritizes the faster ones for package downloads.  This plugin is not installed by default. For installing it, use the following command or from the <emphasis>Applications</emphasis> menu use <emphasis>Add/Remove Software". </emphasis></para><screen><![CDATA[su -c 'yum install yum-fastestmirror' 
-]]></screen><para>You can configure various settings of this plugin in the file /etc/yum/pluginconf.d/fastestmirror.conf </para>
+    <section id="sn-YumPlugins">
+      <title>Working with yum Plugins</title>
+      <para>Each yum plugin is a single file, written in the Python
+      programming language. You may download plugins from the yum project
+      Web site, or from third-party providers. The yum project maintains
+      a list of plugins on the page 
+      <ulink url="http://wiki.linux.duke.edu/YumPlugins">
+      http://wiki.linux.duke.edu/YumPlugins</ulink>.</para>
+      <note>
+        <title role="strong">Plugin File Extension</title>
+        <para>The names of 
+        <code>yum</code>plugin files end with 
+        <code>.py</code>, the standard extension for Python
+        scripts.</para>
+      </note>
+      <para>To install a plugin, copy it to the directory 
+      <code>/usr/lib/yum-plugins/</code>. Create a configuration file for
+      the plugin in the directory 
+      <code>/etc/yum/pluginconf.d/</code>. Save the configuration file
+      with the same name as the plugin, but with the extension 
+      <code>.conf</code>.</para>
+      <note>
+        <title>
+        <emphasis role="strong">root</emphasis>Privileges
+        Required</title>
+        <para>You must have 
+        <emphasis>root</emphasis>access to add files to the directories 
+        <code>/usr/lib/yum-plugins/</code>and 
+        <code>/etc/yum/pluginconf.d/</code>.</para>
+      </note>
+      <para>For example, to copy the plugin 
+      <code>exampleplugin.py</code>, enter the command:</para>
+      <para>
+        <code>su -c 'cp exampleplugin.py /usr/lib/yum-plugins/'</code>
+      </para>
+      <para>Enter the password for the 
+      <emphasis>root</emphasis>account when prompted.</para>
+      <para>You may then create a configuration file for the plugin with
+      a text editor. This example uses 
+      <emphasis role="strong">gedit</emphasis>, the default text editor
+      for Fedora desktop systems:</para>
+      <para>
+        <code>su -c 'gedit
+        /etc/yum/pluginconf.d/exampleplugin.conf'</code>
+      </para>
+      <para>Enter the password for the 
+      <emphasis>root</emphasis>account when prompted.</para>
+      <para>Each plugin configuration file includes the enabled setting.
+      Some plugins also require additional settings. To determine the
+      correct settings, either refer to the documentation supplied with
+      the plugin, or read the plugin file itself with any text
+      editor.</para>
+      <para />
+      <screen>
+        <![CDATA[[main]
+  enabled=1
+  anotheroption=0
+  ]]>
+  </screen>
+      <para>Example 3. Example Plugin Configuration File</para>
+      <para>
+        <anchor id="useful_plugins_for_fedora_users" />
+      </para>
     </section>
-    <section>
-      <title>Downloadonly Plugin</title>
-      <para>FIXME: Figure out how plugin works and document that.  </para>
-      <para/>
+    <section id="sn-UsefulYumPlugins">
+      <title>Useful Plugins for Fedora Users</title>
+      <para>Yum is easily extensible through plugins and a number of
+      plugins have been written by many developers. These plugins advance
+      the core capabilities of Yum and add more features. This section
+      covers the plugins that are useful to Fedora users.</para>
+      <para />
+      <section id="sn-YumPluginInstallonlyn">
+        <title>Installonlyn Plugin</title>
+        <para>Usually software package updates work by removing the older
+        package, retaining the configuration and installing the newer
+        version of a package. Kernel packages are more unique since newer
+        versions can be installed in parallel. Every release of Fedora
+        usually receives a number of kernel updates during its lifecycle
+        due to the general policy of staying close to upstream projects.
+        Each of these kernel updates then occupy space and over time will
+        clutter the initial boot loader options. To prevent this, the
+        installonlyn plugin leaves "n" number of kernel packages by
+        default removing the oldest ones first sequentially on updates.
+        Fedora Core 5 onwards installs this plugin by default. In Fedora,
+        this plugin retains the current kernel and two latest updates.
+        You can disable this plugin or configure it to retain a different
+        number of kernels by setting the value in the file
+        /etc/yum/pluginconf.d/installonlyn.conf</para>
+        <para />
+      </section>
+      <section id="sn-YumPluginFastestMirror">
+        <title>Fastest Mirror Plugin</title>
+        <para>Yum in Fedora uses a dynamic server side 
+        <ulink url="http://fedoraproject.org/wiki/Infrastructure/MirrorManagement">
+        mirror management infrastructure</ulink>that distributes the
+        bandwidth consumptions on each of these mirrors by automatically
+        directing the update to one of the geographically closest
+        mirrors. This mirror is automatically checked against the master
+        server for consistency.</para>
+        <para>The fastest mirror plugin enhances the speed of updates by
+        maintaining a local offline hostfile cache of the speed of the
+        mirrors. It sorts the mirror list by speed and prioritizes the
+        faster ones for package downloads. This plugin is not installed
+        by default. For installing it, use the following command or from
+        the 
+        <emphasis>Applications</emphasis>menu use 
+        <emphasis>Add/Remove Software".</emphasis></para>
+        <screen>
+          <![CDATA[su -c 'yum install yum-fastestmirror' 
+  ]]>
+  </screen>
+        <para>You can configure various settings of this plugin in the
+        file /etc/yum/pluginconf.d/fastestmirror.conf</para>
+      </section>
+      <section id="sn-YumPluginDownloadonly">
+        <title>Downloadonly Plugin</title>
+        <para>FIXME: Figure out how plugin works and document
+        that.</para>
+        <para />
+      </section>
+      <section id="sn-YumPluginChangelog">
+        <title>Changelog Plugin</title>
+        <para>When Fedora developers provide a update to a existing
+        package, they describe the changes in the new update in the
+        software package change log. This plugin helps you see the
+        package changelog before doing a update. This plugin is not
+        installed by default. For installing it, use the following
+        command or from the Applications
+        <emphasis>menu use</emphasis>Add/Remove Software".</para>
+        <screen>
+          <![CDATA[su -c 'yum install yum-changelog' 
+  ]]>
+  </screen>
+        <para>Sample output:</para>
+        <screen>
+          <![CDATA[su -c 'yum update frysk --changelog' 
+  Loading "changelog" plugin
+  Setting up Update Process
+  Setting up repositories
+  Reading repository metadata in from local files
+  Resolving Dependencies
+  --> Populating transaction set with selected packages. Please wait.
+  ---> Package frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6 set to be updated
+  --> Running transaction check
+
+  Changes in packages about to be updated:
+
+  frysk - 0.0.1.2006.12.01.rh1-1.fc6.i686
+  * Sat Dec  2 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-1
+  - New upstream version.
+  - Resolves: #211288.
+
+
+  * Fri Dec  1 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.11.30.rh1-1
+  - New upstream version.
+  - The stamp file for glade files has been renamed.
+
+
+
+  Dependencies Resolved
+
+  =============================================================================
+   Package                 Arch       Version          Repository        Size
+  =============================================================================
+  Updating:
+   frysk                   i686       0.0.1.2006.12.01.rh1-1.fc6  updates           7.5 M
+
+  Transaction Summary
+  =============================================================================
+  Install      0 Package(s)
+  Update       1 Package(s)
+  Remove       0 Package(s)
+
+  Total download size: 7.5 M
+  Is this ok [y/N]:
+  ]]>
+  </screen>
+        <para>By default, the package changelog is showed before doing an
+        update. If you prefer to see the changelog after doing an update
+        instead, you can change the setting from when=pre to when=post in
+        the file /etc/yum/pluginconf.d/changelog.conf. A sample output
+        after the configuration has been changed from 'pre' to
+        'post'</para>
+        <para />
+        <screen>
+          <![CDATA[su -c 'yum update frysk --changelog' 
+  Loading "changelog" plugin
+  Setting up Update Process
+  Setting up repositories
+  Reading repository metadata in from local files
+  Resolving Dependencies
+  --> Populating transaction set with selected packages. Please wait.
+  ---> Package frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6 set to be updated
+  --> Running transaction check
+
+  Dependencies Resolved
+
+  =============================================================================
+   Package                 Arch       Version          Repository        Size
+  =============================================================================
+  Updating:
+   frysk                   i686       0.0.1.2006.12.01.rh1-1.fc6  updates           7.5 M
+
+  Transaction Summary
+  =============================================================================
+  Install      0 Package(s)
+  Update       1 Package(s)
+  Remove       0 Package(s)
+
+  Total download size: 7.5 M
+  Is this ok [y/N]: y
+  Downloading Packages:
+  (1/1): frysk-0.0.1.2006.1 100% |=========================| 7.5 MB    04:24
+  Running Transaction Test
+  Finished Transaction Test
+  Transaction Test Succeeded
+  Running Transaction
+    Updating  : frysk                        ######################### [1/2]
+    Cleanup   : frysk                        ######################### [2/2]
+
+  Changes in updated packages:
+
+  frysk - 0.0.1.2006.12.01.rh1-1.fc6.i686
+  * Sat Dec  2 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-1
+  - New upstream version.
+  - Resolves: #211288.
+
+
+  * Fri Dec  1 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.11.30.rh1-1
+  - New upstream version.
+  - The stamp file for glade files has been renamed.
+
+
+
+  Updated: frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6
+  Complete!
+  ]]>
+  </screen>
+      </section>
+      <section id="YumPluginSkipBroken">
+        <title>Skip-broken Plugin</title>
+        <para>Yum by default checks to make all dependencies are resolved
+        before doing a update, however on occasions like when testing the
+        Fedora development tree or when there is a known dependency issue
+        in the software repository it is useful to skip the broken
+        dependencies automatically instead of having to manually specify
+        the exact packages to ignore in the command line or yum
+        configuration file. The skip-broken plugin helps do that. This
+        plugin is not installed by default. For installing it, use the
+        following command or from the 
+        <emphasis>Applications</emphasis>menu use 
+        <emphasis>Add/Remove Software".</emphasis></para>
+        <screen>
+          <![CDATA[su -c 'yum install yum-skip-broken' 
+  ]]>
+  </screen>
+        <para>You can use this plugin doing a update by specifying the
+        following command line argument.</para>
+        <screen>
+          <![CDATA[su -c 'yum update --skip-broken' 
+  ]]>
+  </screen>
+        <para>You can disable this plugin by changing the option in the
+        file /etc/yum/pluginconf.d/skip-broken.conf</para>
+      </section>
+      <section id="sn-YumPluginAllowdowngrade">
+        <title>Allowdowngrade Plugin</title>
+        <para>The core Yum package manager does not have the
+        functionality to let users downgrade a package. This is a design
+        choice to favor robustness over the additional functionality.
+        Unlike package updates, downgrades are not tested usually and
+        hence may not have the desired effect. However advanced users
+        would still find this feature useful to recover out of a broken
+        update. This plugin adds the ability to perform downgrades of
+        packages in Fedora. This plugin is not installed by default. For
+        installing it, use the following command or from the 
+        <emphasis>Applications</emphasis>menu use 
+        <emphasis>Add/Remove Software</emphasis>.</para>
+        <screen>
+          <![CDATA[su -c 'yum install yum-allowdowngrade' 
+  ]]>
+  </screen>
+        <para>You can use this plugin doing a update by specifying the
+        following command line argument.</para>
+        <screen>
+          <![CDATA[su -c 'yum update -allow-downgrade' 
+  ]]>
+  </screen>
+        <para>You can disable this plugin by changing the option in the
+        file /etc/yum/pluginconf.d/allowdowngrade.conf</para>
+      </section>
+      <section id="sn-DisablingPlugins">
+        <title>Disabling All Plugins</title>
+        <para>If you would like to disable all the plugins while running
+        Yum, you can use the following command line argument</para>
+        <para />
+        <screen>
+          <![CDATA[su -c 'yum update --noplugins' 
+  ]]>
+  </screen>
+        <para />
+      </section>
+      <section id="sn-DevelopingPlugins">
+        <title>Developing New Plugins</title>
+        <para>If you are interested in developing your own plugins to add
+        new features or change the behavior of Yum, refer to the
+        guidelines at 
+        <ulink url="http://wiki.linux.duke.edu/WritingYumPlugins">
+        http://wiki.linux.duke.edu/WritingYumPlugins</ulink>. Join the
+        yum development list at 
+        <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum-devel">
+        https://lists.dulug.duke.edu/mailman/listinfo/yum-devel</ulink>to
+        collaborate with Yum developers.</para>
+      </section>
     </section>
-    <section>
-      <title>Changelog Plugin</title>
-      <para>When Fedora developers provide a update to a existing package, they describe the changes in the new update in the software package change log. This plugin helps you see the package changelog before doing a update. This plugin is not installed by default. For installing it, use the following command or from the Applications<emphasis> menu use </emphasis>Add/Remove Software".</para>
-    <screen><![CDATA[su -c 'yum install yum-changelog' 
-]]></screen>
-    <para>Sample output: </para>
-    <screen><![CDATA[su -c 'yum update frysk --changelog' 
-Loading "changelog" plugin
-Setting up Update Process
-Setting up repositories
-Reading repository metadata in from local files
-Resolving Dependencies
---> Populating transaction set with selected packages. Please wait.
----> Package frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6 set to be updated
---> Running transaction check
-
-Changes in packages about to be updated:
-
-frysk - 0.0.1.2006.12.01.rh1-1.fc6.i686
-* Sat Dec  2 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-1
-- New upstream version.
-- Resolves: #211288.
-
-
-* Fri Dec  1 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.11.30.rh1-1
-- New upstream version.
-- The stamp file for glade files has been renamed.
-
-
-
-Dependencies Resolved
-
-=============================================================================
- Package                 Arch       Version          Repository        Size
-=============================================================================
-Updating:
- frysk                   i686       0.0.1.2006.12.01.rh1-1.fc6  updates           7.5 M
-
-Transaction Summary
-=============================================================================
-Install      0 Package(s)
-Update       1 Package(s)
-Remove       0 Package(s)
-
-Total download size: 7.5 M
-Is this ok [y/N]:
-]]></screen>
-    <para>By default, the package changelog is showed before doing an update. If you prefer to see the changelog after doing an update instead, you can change the setting from when=pre to when=post in the file /etc/yum/pluginconf.d/changelog.conf. A sample output after the configuration has been changed from 'pre' to 'post' </para>
-    <para/>
-    <screen><![CDATA[su -c 'yum update frysk --changelog' 
-Loading "changelog" plugin
-Setting up Update Process
-Setting up repositories
-Reading repository metadata in from local files
-Resolving Dependencies
---> Populating transaction set with selected packages. Please wait.
----> Package frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6 set to be updated
---> Running transaction check
-
-Dependencies Resolved
-
-=============================================================================
- Package                 Arch       Version          Repository        Size
-=============================================================================
-Updating:
- frysk                   i686       0.0.1.2006.12.01.rh1-1.fc6  updates           7.5 M
-
-Transaction Summary
-=============================================================================
-Install      0 Package(s)
-Update       1 Package(s)
-Remove       0 Package(s)
-
-Total download size: 7.5 M
-Is this ok [y/N]: y
-Downloading Packages:
-(1/1): frysk-0.0.1.2006.1 100% |=========================| 7.5 MB    04:24
-Running Transaction Test
-Finished Transaction Test
-Transaction Test Succeeded
-Running Transaction
-  Updating  : frysk                        ######################### [1/2]
-  Cleanup   : frysk                        ######################### [2/2]
-
-Changes in updated packages:
-
-frysk - 0.0.1.2006.12.01.rh1-1.fc6.i686
-* Sat Dec  2 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.12.01.rh1-1
-- New upstream version.
-- Resolves: #211288.
-
-
-* Fri Dec  1 03:30:00 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.11.30.rh1-1
-- New upstream version.
-- The stamp file for glade files has been renamed.
-
-
-
-Updated: frysk.i686 0:0.0.1.2006.12.01.rh1-1.fc6
-Complete!
-]]></screen>
-  </section>
-  <section>
-    <title>Skip-broken Plugin</title>
-    <para>Yum by default checks to make all dependencies are resolved before doing a update, however on occasions like when testing the Fedora development tree or when there is a known dependency issue in the software repository it is useful to skip the broken dependencies automatically instead of having to manually specify the exact packages to ignore in the command line or yum configuration file. The skip-broken plugin helps do that. This plugin is not installed by default. For installing it, use the following command or from the <emphasis>Applications</emphasis> menu use <emphasis>Add/Remove Software". </emphasis></para><screen><![CDATA[su -c 'yum install yum-skip-broken' 
-]]></screen><para>You can use this plugin doing a update by specifying the following command line argument. </para><screen><![CDATA[su -c 'yum update --skip-broken' 
-]]></screen><para>You can disable this plugin by changing the option in the file /etc/yum/pluginconf.d/skip-broken.conf </para>
-  </section>
-  <section><title>Allowdowngrade Plugin</title><para>The core Yum package manager does not have the functionality to let users downgrade a package. This is a design choice to favor robustness over the additional functionality. Unlike package updates, downgrades are not tested usually and hence may not have the desired effect. However advanced users would still find this feature useful to recover out of a broken update.  This plugin adds the ability to perform downgrades of packages in Fedora. This plugin is not installed by default. For installing it, use the following command or from the <emphasis>Applications</emphasis> menu use <emphasis>Add/Remove Software</emphasis>.</para>
-  <screen><![CDATA[su -c 'yum install yum-allowdowngrade' 
-]]></screen>
-  <para>You can use this plugin doing a update by specifying the following command line argument. </para>
-  <screen><![CDATA[su -c 'yum update -allow-downgrade' 
-]]></screen>
-  <para>You can disable this plugin by changing the option in the file /etc/yum/pluginconf.d/allowdowngrade.conf </para>
-  </section>
-  <section>
-    <title>Disabling All Plugins</title>
-    <para>If you would like to disable all the plugins while running Yum, you can use the following command line argument </para>
-    <para/>
-    <screen><![CDATA[su -c 'yum update --noplugins' 
-]]></screen>
-    <para/>
-  </section>
-  <section>
-    <title>Developing New Plugins</title>
-    <para>If you are interested in developing your own plugins to add new features or change the behavior of Yum, refer to the guidelines at <ulink url="http://wiki.linux.duke.edu/WritingYumPlugins">http://wiki.linux.duke.edu/WritingYumPlugins</ulink>. Join the yum development list at <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum-devel">https://lists.dulug.duke.edu/mailman/listinfo/yum-devel</ulink> to collaborate with Yum developers. </para>
   </section>
-</section>
-</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: introduction.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/introduction.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- introduction.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ introduction.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,86 +1,177 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Id: -->
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+[
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
   <section id="sn-Introduction">
     <title>Introduction</title>
-    <section>
-		<title>About this Document</title>
-    <para><emphasis>Purpose</emphasis>: How to install and update software packages from the desktop and the CLI. </para>
-    <para><emphasis>Audience</emphasis>: Individuals who are unfamiliar with software package management in Fedora. </para>
-    <para><emphasis>Approach</emphasis>: Explain basic principles; explain one principle at a time; do not assume familiarity with any Linux/UNIX-specific terminology or concepts; compare functionality where appropriate to what the reader may know from other operating systems, particularly Microsoft Windows. </para>
-    <para><emphasis>Assumptions:</emphasis> The reader has a default installation of Fedora which includes the desktop components. The reader has a user account with the default settings. The reader <emphasis role="strong">does</emphasis> have access to the <emphasis>root</emphasis> password. The user does not have a degree in Computer Science. </para>
-	</section>
-    <section>
+    <section id="sn-AboutDocument">
+      <title>About this Document</title>
+      <para>
+      <emphasis>Purpose</emphasis>: How to install and update software
+      packages from the desktop and the CLI.</para>
+      <para>
+      <emphasis>Audience</emphasis>: Individuals who are unfamiliar with
+      software package management in Fedora.</para>
+      <para>
+      <emphasis>Approach</emphasis>: Explain basic principles; explain
+      one principle at a time; do not assume familiarity with any
+      Linux/UNIX-specific terminology or concepts; compare functionality
+      where appropriate to what the reader may know from other operating
+      systems, particularly Microsoft Windows.</para>
+      <para>
+      <emphasis>Assumptions:</emphasis>The reader has a default
+      installation of Fedora which includes the desktop components. The
+      reader has a user account with the default settings. The reader 
+      <emphasis role="strong">does</emphasis>have access to the 
+      <emphasis>root</emphasis>password. The user does not have a degree
+      in Computer Science.</para>
+    </section>
+    <section id="sn-UsingDocument">
       <title>Using This Document</title>
-      <para>This document is a reference for managing software with Fedora. You may wish to read some or all of the sections, depending upon your needs and level of experience. If you are a new user, start with:      </para>
+      <para>This document is a reference for managing software with
+      Fedora. You may wish to read some or all of the sections, depending
+      upon your needs and level of experience. If you are a new user,
+      start with:</para>
       <itemizedlist>
         <listitem>
           <para>
-            <xref linkend="sn-Concepts"/>
+            <xref linkend="sn-Concepts" />
           </para>
         </listitem>
         <listitem>
           <para>
-            <xref linkend="sn-Pirut"/>
+            <xref linkend="sn-Pirut" />
           </para>
         </listitem>
         <listitem>
           <para>
-            <xref linkend="sn-Pup"/>
+            <xref linkend="sn-Pup" />
           </para>
         </listitem>
       </itemizedlist>
-      <para>These guides explain basic concepts of software management in Fedora, and introduce the various graphical interfaces for yum. Experienced Linux users should start with <xref linkend="sn-ManageWithYum"/>.</para>
-		<tip>
-			<title>Previous Versions of Fedora</title>
-			<para> This document describes the configuration of <code>yum</code> on current versions of Fedora. You must perform the additional step noted in <xref linkend="sn-ManuallyAuthorizing"/> to enable <code>yum</code> on earlier versions Fedora. </para>
-		</tip>
-		<warning>
-			<title>Warning: Avoid Logging in with the Root Account</title>
-			<para> You do not need to log in with the <code>root</code> account in order to manage your Fedora system. All of the commands shown in this tutorial that require <code>root</code> access will prompt you for the <code>root</code> password. The example terminal commands use <code>su -c</code> to provide this facility. Graphical applications that require root access will automatically prompt for the root password when launched. </para>
+      <para>These guides explain basic concepts of software management in
+      Fedora, and introduce the various graphical interfaces for yum.
+      Experienced Linux users should start with 
+      <xref linkend="sn-ManageWithYum" />.</para>
+      <tip>
+        <title>Previous Versions of Fedora</title>
+        <para>This document describes the configuration of 
+        <code>yum</code>on current versions of Fedora. You must perform
+        the additional step noted in 
+        <xref linkend="sn-ManuallyAuthorizing" />to enable 
+        <code>yum</code>on earlier versions Fedora.</para>
+      </tip>
+      <warning>
+        <title>Warning: Avoid Logging in with the Root Account</title>
+        <para>You do not need to log in with the 
+        <code>root</code>account in order to manage your Fedora system.
+        All of the commands shown in this tutorial that require 
+        <code>root</code>access will prompt you for the 
+        <code>root</code>password. The example terminal commands use 
+        <code>su -c</code>to provide this facility. Graphical
+        applications that require root access will automatically prompt
+        for the root password when launched.</para>
       </warning>
-      <para>Most of the examples in this document use the package <code>tsclient</code>, which is included with Fedora. The <code>tsclient</code> package provides an application for remote desktop access. The example commands for Fedora package groups use the <code>MySQL Database</code> group. To use the examples, substitute the name of the relevant package for <code>tsclient</code>.  </para>
-      <para>Fedora includes a <code>yum</code> configuration that is suitable for independent systems with Internet access. You may use <code>yum</code> and related software on such systems without any additional configuration. </para>
-      <para>If your system is part of a managed network, consult your network administrators for advice. You may need to configure <code>yum</code> to use a network proxy server. 
-      <xref linkend="sn-YumProxy"/> explains how to configure <code>yum</code> to use a proxy server. Administrators may also suggest or require that <code>yum</code> clients use specific package repositories. Refer to <xref linkend="sn-ConfiguringRepositories"/> for instructions on how to configure access to repositories. </para>
-      <para>To improve performance and enable disconnected operations, activate the <code>yum</code> caches on your system. Refer to <xref linkend="sn-YumCaching"/> for more information on the caching option. </para>
-      <para/>
+      <para>Most of the examples in this document use the package 
+      <code>tsclient</code>, which is included with Fedora. The 
+      <code>tsclient</code>package provides an application for remote
+      desktop access. The example commands for Fedora package groups use
+      the 
+      <code>MySQL Database</code>group. To use the examples, substitute
+      the name of the relevant package for 
+      <code>tsclient</code>.</para>
+      <para>Fedora includes a 
+      <code>yum</code>configuration that is suitable for independent
+      systems with Internet access. You may use 
+      <code>yum</code>and related software on such systems without any
+      additional configuration.</para>
+      <para>If your system is part of a managed network, consult your
+      network administrators for advice. You may need to configure 
+      <code>yum</code>to use a network proxy server. 
+      <xref linkend="sn-YumProxy" />explains how to configure 
+      <code>yum</code>to use a proxy server. Administrators may also
+      suggest or require that 
+      <code>yum</code>clients use specific package repositories. Refer to
+      
+      <xref linkend="sn-ConfiguringRepositories" />for instructions on
+      how to configure access to repositories.</para>
+      <para>To improve performance and enable disconnected operations,
+      activate the 
+      <code>yum</code>caches on your system. Refer to 
+      <xref linkend="sn-YumCaching" />for more information on the caching
+      option.</para>
+      <para />
     </section>
-    <section>
+    <section id="sn-AdditionalResources">
       <title>Additional Resources</title>
-      <para>The <code>yum</code> utility has features and options not discussed in this document. Read the <code>man</code> pages for <code>yum(8)</code> and <code>yum.conf(5)</code> to learn more, using the following commands: </para>
+      <para>The 
+      <code>yum</code>utility has features and options not discussed in
+      this document. Read the 
+      <code>man</code>pages for 
+      <code>yum(8)</code>and 
+      <code>yum.conf(5)</code>to learn more, using the following
+      commands:</para>
       <para>
         <code>man yum</code>
       </para>
       <para>
         <code>man yum.conf</code>
       </para>
-      <para>Other useful <code>yum</code> resources on the Internet include: </para>
-      <para>Project Web site </para>
+      <para>Other useful 
+      <code>yum</code>resources on the Internet include:</para>
+      <para>Project Web site</para>
       <itemizedlist>
         <listitem>
           <para>
-            <ulink url="http://linux.duke.edu/projects/yum/">http://linux.duke.edu/projects/yum/</ulink>
+            <ulink url="http://linux.duke.edu/projects/yum/">
+            http://linux.duke.edu/projects/yum/</ulink>
           </para>
         </listitem>
       </itemizedlist>
-      <para>Users mailing list </para>
+      <para>Users mailing list</para>
       <itemizedlist>
         <listitem>
           <para>
-            <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum/">https://lists.dulug.duke.edu/mailman/listinfo/yum/</ulink>
+            <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum/">
+            https://lists.dulug.duke.edu/mailman/listinfo/yum/</ulink>
           </para>
         </listitem>
       </itemizedlist>
-      <para>Development mailing list </para>
+      <para>Development mailing list</para>
       <itemizedlist>
         <listitem>
           <para>
-            <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum-devel/">https://lists.dulug.duke.edu/mailman/listinfo/yum-devel/</ulink>
+            <ulink url="https://lists.dulug.duke.edu/mailman/listinfo/yum-devel/">
+            https://lists.dulug.duke.edu/mailman/listinfo/yum-devel/</ulink>
           </para>
         </listitem>
       </itemizedlist>
       <important>
-			<title>Note: Check Bugzilla First</title>
-			<para> If you encounter a persistent error with a specific operation, visit <ulink url="https://bugzilla.redhat.com">https://bugzilla.redhat.com</ulink> and review the bug reports for the package or packages involved. An error in a package may cause all <code>yum</code> operations that rely on that package to fail. Please file bug reports for Fedora packages, including <code>yum</code>, on this Bugzilla web site. </para>
+        <title>Note: Check Bugzilla First</title>
+        <para>If you encounter a persistent error with a specific
+        operation, visit 
+        <ulink url="https://bugzilla.redhat.com">
+        https://bugzilla.redhat.com</ulink>and review the bug reports for
+        the package or packages involved. An error in a package may cause
+        all 
+        <code>yum</code>operations that rely on that package to fail.
+        Please file bug reports for Fedora packages, including 
+        <code>yum</code>, on this Bugzilla web site.</para>
       </important>
     </section>
   </section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: isolated-install.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/isolated-install.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- isolated-install.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ isolated-install.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,23 +1,64 @@
-<?xml version="1.0"?>
-<section id="sn-IsolatedInstall">
-    <title>Installing Software from an Isolated Package</title>
-    <para>Use repositories and the standard <code>yum</code> commands to locate and install new software, unless the software package is not available from any repository. In these cases, use the <code>localinstall</code> function to install the software from the package file. </para>
-    <important>
-      <title>Public Key is Required</title>
-      <para> Ensure that the public key for the package source has been imported before you install a package without a repository. Refer to <xref linkend="sn-ManuallyAuthorizing"/>. </para>
-    </important>
-    <para>Enter this command to install the package <code>tsclient-0.132-4.i386.rpm</code>: </para>
-    <para>
-      <code>su -c 'yum localinstall tsclient-0.132-4.i386.rpm'</code>
-    </para>
-    <para>At the prompt, enter the <emphasis>root</emphasis> password. </para>
-    <note>
-      <title>Previously Installed Software is Updated</title>
-      <para> If the package provides a later version of software that is already installed on your system, <code>yum</code> updates the installed software. </para>
-    </note>
-    <para>If the package requires software that is not installed on your system, <code>yum</code> attempts to meet the dependencies with packages from the configured repositories. You may need to manually download and install additional packages in order to satisfy all of the dependencies. </para>
-    <warning>
-      <title>Maintaining Manually Installed Software</title>
-      <para> If you install software that is not provided by a repository, <code>yum update</code> cannot automatically upgrade it as new versions become available. To ensure that you have the latest packages, subscribe to e-mail or RSS services that notify you when new versions are released. </para>
-    </warning>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-IsolatedInstall">
+	  <title>Installing Software from an Isolated Package</title>
+	  <para>Use repositories and the standard 
+	  <code>yum</code>commands to locate and install new software, unless
+	  the software package is not available from any repository. In these
+	  cases, use the 
+	  <code>localinstall</code>function to install the software from the
+	  package file.</para>
+	  <important>
+		 <title>Public Key is Required</title>
+		 <para>Ensure that the public key for the package source has been
+		 imported before you install a package without a repository. Refer
+		 to 
+		 <xref linkend="sn-ManuallyAuthorizing" />.</para>
+	  </important>
+	  <para>Enter this command to install the package 
+	  <code>tsclient-0.132-4.i386.rpm</code>:</para>
+	  <para>
+		 <code>su -c 'yum localinstall tsclient-0.132-4.i386.rpm'</code>
+	  </para>
+	  <para>At the prompt, enter the 
+	  <emphasis>root</emphasis>password.</para>
+	  <note>
+		 <title>Previously Installed Software is Updated</title>
+		 <para>If the package provides a later version of software that is
+		 already installed on your system, 
+		 <code>yum</code>updates the installed software.</para>
+	  </note>
+	  <para>If the package requires software that is not installed on your
+	  system, 
+	  <code>yum</code>attempts to meet the dependencies with packages from
+	  the configured repositories. You may need to manually download and
+	  install additional packages in order to satisfy all of the
+	  dependencies.</para>
+	  <warning>
+		 <title>Maintaining Manually Installed Software</title>
+		 <para>If you install software that is not provided by a repository,
+		 
+		 <code>yum update</code>cannot automatically upgrade it as new
+		 versions become available. To ensure that you have the latest
+		 packages, subscribe to e-mail or RSS services that notify you when
+		 new versions are released.</para>
+	  </warning>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: manage-with-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/manage-with-yum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manage-with-yum.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ manage-with-yum.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,119 +1,228 @@
-<?xml version="1.0"?>
-<section id="sn-ManageWithYum">
-    <title>Managing Software with yum</title>
-    <para>Use the <code>yum</code> utility to modify the software on your system in four ways: </para>
-    <itemizedlist>
-      <listitem><para>install new software from package repositories </para></listitem>
-      <listitem><para>install new software from an individual package file </para></listitem>
-      <listitem><para>update existing software on your system </para></listitem>
-      <listitem><para>remove unwanted software from your system  </para></listitem>
-    </itemizedlist>
-    <note>
-      <title>Installing Software from a Package File</title>
-      <para> The <code>yum</code> commands shown in this section use repositories as package sources. Refer to <xref linkend="sn-IsolatedInstall"/> for details of using <code>yum</code> to install software from an individual package file. </para>
-    </note>
-    <para>To use <code>yum</code>, specify a function and one or more packages or package groups. Each section below gives some examples. </para>
-    <para>For each operation, <code>yum</code> downloads the latest package information from the configured repositories. If your system uses a slow network connection yum may require several seconds to download the repository indexes and the header files for each package. </para>
-    <para>The <code>yum</code> utility searches these data files to determine the best set of actions to produce the required result, and displays the transaction for you to approve. The transaction may include the installation, update, or removal of additional packages, in order to resolve software dependencies. </para>
-    <para>This is an example of the transaction for installing <code>tsclient</code>: </para>
-    <para/>
-    <screen><![CDATA[============================================================================= 
- Package                 Arch       Version          Repository        Size
-=============================================================================
-Installing:
- tsclient                i386       0.132-6          base              247 k
-Installing for dependencies:
- rdesktop                i386       1.4.0-2          base              107 k
+<?xml version="1.0" encoding="UTF-8"?>
 
-Transaction Summary
-=============================================================================
-Install      2 Package(s)
-Update       0 Package(s)
-Remove       0 Package(s)
-Total download size: 355 k
-Is this ok [y/N]:]]></screen>
-    <para>Example 1. Format of <code>yum</code> Transaction Reports </para>
-    <para>Review the list of changes, and then press <emphasis role="strong">[y]</emphasis> to accept and begin the process. If you press <emphasis role="strong">[N]</emphasis> or <emphasis role="strong">[Enter]</emphasis>, <code>yum</code> does not download or change any packages. </para>
-    <note>
-      <title>Package Versions</title>
-      <para> The <code>yum</code> utility only displays and uses the newest version of each package, unless you specify an older version. </para>
-    </note>
-    <para>The <code>yum</code> utility also imports the repository public key if it is not already installed on the rpm keyring. </para>
-    <para>This is an example of the public key import: </para>
-    <para/>
-    <screen><![CDATA[warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 
-public key not available for tsclient-0.132-6.i386.rpm
-Retrieving GPG key from file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-Importing GPG key 0x4F2A6FD2 "Fedora Project <fedora at redhat.com>"
-Is this ok [y/N]:]]></screen>
-    <para>Example 2. Format of <code>yum</code> Public Key Import </para>
-    <para>Check the public key, and then press <emphasis role="strong">[y]</emphasis> to import the key and authorize the key for use. If you press <emphasis role="strong">[N]</emphasis> or <emphasis role="strong">[Enter]</emphasis>, <code>yum</code> stops without installing any packages. </para>
-    <para>To ensure that downloaded packages are genuine, <code>yum</code> verifies the digital signature of each package against the public key of the provider. Once all of the packages required for the transaction are successfully downloaded and verified, <code>yum</code> applies them to your system. </para>
-    <note>
-      <title>Transaction Log</title>
-      <para> Every completed transaction records the affected packages in the log file <code>/var/log/yum.log</code>. You may only read this file with <emphasis>root</emphasis> access. </para>
-    </note>
-    <para/>
-  <section>
-    <title>Installing New Software with yum</title>
-    <para>To install the package <code>tsclient</code>, enter the command: </para>
-    <para>
-      <code>su -c 'yum install tsclient'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>To install the package group <code>MySQL Database</code>, enter the command: </para>
-    <para>
-      <code>su -c 'yum groupinstall "MySQL Database"'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <important>
-       <title>New Services Require Activation</title>
-       <para> When you install a service, Fedora does not activate or start it. To configure a new service to run on bootup, choose <emphasis>System &#x2192; Administration &#x2192; Services</emphasis> from the top desktop panel, or use the <code>chkconfig</code> and <code>service</code> command-line utilities. </para>
-    </important>
-      <anchor id="updating_software"/>
-  </section>
-  <section>
-    <title>Updating Software with yum</title>
-    <para>To update the <code>tsclient package</code> to the latest version, type: </para>
-    <para>
-      <code>su -c 'yum update tsclient'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <important>
-      <title>New Software Versions Require Reloading</title>
-      <para> If a piece of software is in use when you update it, the old version remains active until the application or service is restarted. Kernel updates take effect when you reboot the system. </para>
-    </important>
-    <note>
-      <title>Kernel Packages</title>
-      <para> Kernel packages remain on the system after they have been superseded by newer versions. This enables you to boot your system with an older kernel if an error occurs with the current kernel. To minimize maintenance, yum automatically removes obsolete kernel packages from your system, retaining only the current kernel and the previous version. </para>
-    </note>
-    <para>To update all of the packages in the package group <code>MySQL Database</code>, enter the command: </para>
-    <para>
-      <code>su -c 'yum groupupdate "MySQL Database"'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <note>
-       <title>Updating the Entire System</title>
-       <para> To update all of the packages on your Fedora system, use the commands described in <xref linkend="sn-UpdateWithYum"/>. </para>
-    </note>
-    <para/>
-  </section>
-  <section>
-    <title>Removing Software with yum</title>
-    <para>To remove software, <code>yum</code> examines your system for both the specified software, and any software which claims it as a dependency. The transaction to remove the software deletes both the software and the dependencies. </para>
-    <para>To remove the <code>tsclient</code> package from your system, use the command: </para>
-    <para>
-      <code>su -c 'yum remove tsclient'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>To remove all of the packages in the package group <code>MySQL Database</code>, enter the command: </para>
-    <para>
-      <code>su -c 'yum groupremove "MySQL Database"'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <note>
-       <title>Data and Configuration File Retention</title>
-       <para> The removal process leaves user data in place but may remove configuration files in some cases. If a package removal does not include the configuration file, and you reinstall the package later, it may reuse the old configuration file. </para>
-    </note>
-  </section>
-</section>
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-ManageWithYum">
+	  <title>Managing Software with yum</title>
+	  <para>Use the 
+	  <code>yum</code>utility to modify the software on your system in four
+	  ways:</para>
+	  <itemizedlist>
+		 <listitem>
+			<para>install new software from package repositories</para>
+		 </listitem>
+		 <listitem>
+			<para>install new software from an individual package file</para>
+		 </listitem>
+		 <listitem>
+			<para>update existing software on your system</para>
+		 </listitem>
+		 <listitem>
+			<para>remove unwanted software from your system</para>
+		 </listitem>
+	  </itemizedlist>
+	  <note>
+		 <title>Installing Software from a Package File</title>
+		 <para>The 
+		 <code>yum</code>commands shown in this section use repositories as
+		 package sources. Refer to 
+		 <xref linkend="sn-IsolatedInstall" />for details of using 
+		 <code>yum</code>to install software from an individual package
+		 file.</para>
+	  </note>
+	  <para>To use 
+	  <code>yum</code>, specify a function and one or more packages or
+	  package groups. Each section below gives some examples.</para>
+	  <para>For each operation, 
+	  <code>yum</code>downloads the latest package information from the
+	  configured repositories. If your system uses a slow network
+	  connection yum may require several seconds to download the repository
+	  indexes and the header files for each package.</para>
+	  <para>The 
+	  <code>yum</code>utility searches these data files to determine the
+	  best set of actions to produce the required result, and displays the
+	  transaction for you to approve. The transaction may include the
+	  installation, update, or removal of additional packages, in order to
+	  resolve software dependencies.</para>
+	  <para>This is an example of the transaction for installing 
+	  <code>tsclient</code>:</para>
+	  <para />
+	  <screen>
+		 <![CDATA[============================================================================= 
+	 Package                 Arch       Version          Repository        Size
+	=============================================================================
+	Installing:
+	 tsclient                i386       0.132-6          base              247 k
+	Installing for dependencies:
+	 rdesktop                i386       1.4.0-2          base              107 k
+
+	Transaction Summary
+	=============================================================================
+	Install      2 Package(s)
+	Update       0 Package(s)
+	Remove       0 Package(s)
+	Total download size: 355 k
+	Is this ok [y/N]:]]>
+	</screen>
+	  <para>Example 1. Format of 
+	  <code>yum</code>Transaction Reports</para>
+	  <para>Review the list of changes, and then press 
+	  <emphasis role="strong">[y]</emphasis>to accept and begin the
+	  process. If you press 
+	  <emphasis role="strong">[N]</emphasis>or 
+	  <emphasis role="strong">[Enter]</emphasis>, 
+	  <code>yum</code>does not download or change any packages.</para>
+	  <note>
+		 <title>Package Versions</title>
+		 <para>The 
+		 <code>yum</code>utility only displays and uses the newest version
+		 of each package, unless you specify an older version.</para>
+	  </note>
+	  <para>The 
+	  <code>yum</code>utility also imports the repository public key if it
+	  is not already installed on the rpm keyring.</para>
+	  <para>This is an example of the public key import:</para>
+	  <para />
+	  <screen>
+		 <![CDATA[warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID 4f2a6fd2 
+	public key not available for tsclient-0.132-6.i386.rpm
+	Retrieving GPG key from file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+	Importing GPG key 0x4F2A6FD2 "Fedora Project <fedora at redhat.com>"
+	Is this ok [y/N]:]]>
+	</screen>
+	  <para>Example 2. Format of 
+	  <code>yum</code>Public Key Import</para>
+	  <para>Check the public key, and then press 
+	  <emphasis role="strong">[y]</emphasis>to import the key and authorize
+	  the key for use. If you press 
+	  <emphasis role="strong">[N]</emphasis>or 
+	  <emphasis role="strong">[Enter]</emphasis>, 
+	  <code>yum</code>stops without installing any packages.</para>
+	  <para>To ensure that downloaded packages are genuine, 
+	  <code>yum</code>verifies the digital signature of each package
+	  against the public key of the provider. Once all of the packages
+	  required for the transaction are successfully downloaded and
+	  verified, 
+	  <code>yum</code>applies them to your system.</para>
+	  <note>
+		 <title>Transaction Log</title>
+		 <para>Every completed transaction records the affected packages in
+		 the log file 
+		 <code>/var/log/yum.log</code>. You may only read this file with 
+		 <emphasis>root</emphasis>access.</para>
+	  </note>
+	  <para />
+	  <section id="sn-InstallingNewSoftware">
+		 <title>Installing New Software with yum</title>
+		 <para>To install the package 
+		 <code>tsclient</code>, enter the command:</para>
+		 <para>
+			<code>su -c 'yum install tsclient'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <para>To install the package group 
+		 <code>MySQL Database</code>, enter the command:</para>
+		 <para>
+			<code>su -c 'yum groupinstall "MySQL Database"'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <important>
+			<title>New Services Require Activation</title>
+			<para>When you install a service, Fedora does not activate or
+			start it. To configure a new service to run on bootup, choose 
+			<emphasis>System &#8594; Administration &#8594;
+			Services</emphasis>from the top desktop panel, or use the 
+			<code>chkconfig</code>and 
+			<code>service</code>command-line utilities.</para>
+		 </important>
+		 <anchor id="updating_software" />
+	  </section>
+	  <section id="UpdatingSoftware">
+		 <title>Updating Software with yum</title>
+		 <para>To update the 
+		 <code>tsclient package</code>to the latest version, type:</para>
+		 <para>
+			<code>su -c 'yum update tsclient'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <important>
+			<title>New Software Versions Require Reloading</title>
+			<para>If a piece of software is in use when you update it, the
+			old version remains active until the application or service is
+			restarted. Kernel updates take effect when you reboot the
+			system.</para>
+		 </important>
+		 <note>
+			<title>Kernel Packages</title>
+			<para>Kernel packages remain on the system after they have been
+			superseded by newer versions. This enables you to boot your
+			system with an older kernel if an error occurs with the current
+			kernel. To minimize maintenance, yum automatically removes
+			obsolete kernel packages from your system, retaining only the
+			current kernel and the previous version.</para>
+		 </note>
+		 <para>To update all of the packages in the package group 
+		 <code>MySQL Database</code>, enter the command:</para>
+		 <para>
+			<code>su -c 'yum groupupdate "MySQL Database"'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <note>
+			<title>Updating the Entire System</title>
+			<para>To update all of the packages on your Fedora system, use
+			the commands described in 
+			<xref linkend="sn-UpdateWithYum" />.</para>
+		 </note>
+		 <para />
+	  </section>
+	  <section id="sn-RemovingSoftware">
+		 <title>Removing Software with yum</title>
+		 <para>To remove software, 
+		 <code>yum</code>examines your system for both the specified
+		 software, and any software which claims it as a dependency. The
+		 transaction to remove the software deletes both the software and
+		 the dependencies.</para>
+		 <para>To remove the 
+		 <code>tsclient</code>package from your system, use the
+		 command:</para>
+		 <para>
+			<code>su -c 'yum remove tsclient'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <para>To remove all of the packages in the package group 
+		 <code>MySQL Database</code>, enter the command:</para>
+		 <para>
+			<code>su -c 'yum groupremove "MySQL Database"'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <note>
+			<title>Data and Configuration File Retention</title>
+			<para>The removal process leaves user data in place but may
+			remove configuration files in some cases. If a package removal
+			does not include the configuration file, and you reinstall the
+			package later, it may reuse the old configuration file.</para>
+		 </note>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: pirut.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/pirut.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pirut.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ pirut.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,42 +1,120 @@
-<?xml version="1.0"?>
-<section id="sn-Pirut">
-    <title>Managing Software with Pirut</title>
-    <para>This section explains <emphasis role="strong">Pirut</emphasis>, Fedora's graphical package management program. It demonstrates the different search facilities within <emphasis role="strong">Pirut</emphasis> and how to install a package. The <emphasis role="strong">Banshee</emphasis> music management package is used as an example.  </para>
-    <para/>
-  <section>
-    <title>Browse Software</title>
-    <para>Start <emphasis role="strong">Pirut</emphasis> by selecting the <emphasis>Add/Remove Programs</emphasis> entry in the <emphasis>Applications</emphasis> menu, entering your <code>root</code> password when prompted. </para>
-    <para>The program starts in <emphasis>Browse</emphasis> view by default. This view organizes packages into related groups, displaying top level groups on the left and sub-categories on the right. When a tick is present next to a sub-category, it indicates applications from that group are installed.  </para>
-    <para>To install <emphasis role="strong">Banshee</emphasis>, select the <emphasis>Sound and Video</emphasis> sub-category and press the <emphasis>Optional Packages</emphasis> button. Locate <emphasis role="strong">Banshee</emphasis> in the list and queue it for installation by ticking its box with a left-click. As many packages as desired can be queued for installation by ticking the appropriate boxes.  </para>
-    <para>To add packages from other groups or sub-categories to the queue, browse to the desired group or sub-category and proceed as before. The <emphasis>Optional Packages</emphasis> button is only available when the desired sub-category is ticked. Ticking a previously un-ticked sub-category automatically queues for installation any packages required for that sub-category.  </para>
-    <para>To install the queued packages press the <emphasis>Apply</emphasis> button. </para>
-    <note>
-      <title>Removing packages</title>
-      <para> Remove packages by un-ticking the appropriate boxes and pressing the <emphasis>Apply</emphasis> button. </para>
-    </note>
-  </section>
-  <section>
-    <title>Dependencies</title>
-    <para>After applying changes, <emphasis role="strong">Pirut</emphasis> prompts to confirm the packages you have selected. Proceed if the list is correct, otherwise cancel and refine the selection.  </para>
-    <note>
-      <title>Dependencies</title>
-      <para> Dependenices are packages that are required by another package to function correctly. </para>
-    </note>
-    <para><emphasis role="strong">Pirut</emphasis> now resolves any dependencies. A dialog informs you which dependencies have been found, and are automatically marked for installation. Confirm this list to proceed.  </para>
-    <warning>
-      <title>Dependencies can be removed</title>
-              <para> When a package is removed it is possible other packages may have relied on it to function correctly. If this is the case <emphasis role="strong">Pirut</emphasis> also removes these other applications. Check the dependency dialog and cancel if any of the packages marked for removal are still needed. This can be corrected by refining your package selection. </para>
-    </warning>
-  </section>
-  <section>
-    <title>Search Software</title>
-    <para>When the desired application's name is known, the <emphasis>Search</emphasis> tab is more efficient.  </para>
-    <para>Select the <emphasis>Search</emphasis> tab from the top of the window and enter <emphasis role="strong">Banshee</emphasis> into the search box. Press enter to begin the search. Results, including related packages, are shown in the box below. To find more information about a package before installation, highlight it with a left-click and press the <emphasis>Package Details</emphasis> text below.  </para>
-    <para>To queue a package for installation or removal, toggle its box as appropriate. Once all the packages have been selected press <emphasis>Apply</emphasis>.  </para>
-    <para/>
-  </section>
-  <section>
-    <title>List Software</title>
-    <para>The list tab displays all available packages. Packages can be queued for installation or removal in the same manner as before. Once satisfied with the selections, press the <emphasis>Apply</emphasis> button to commit the changes.  </para>
-  </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-Pirut">
+	  <title>Managing Software with Pirut</title>
+	  <para>This section explains 
+	  <emphasis role="strong">Pirut</emphasis>, Fedora's graphical package
+	  management program. It demonstrates the different search facilities
+	  within 
+	  <emphasis role="strong">Pirut</emphasis>and how to install a package.
+	  The 
+	  <emphasis role="strong">Banshee</emphasis>music management package is
+	  used as an example.</para>
+	  <para />
+	  <section id="sn-BrowseSoftware">
+		 <title>Browse Software</title>
+		 <para>Start 
+		 <emphasis role="strong">Pirut</emphasis>by selecting the 
+		 <emphasis>Add/Remove Programs</emphasis>entry in the 
+		 <emphasis>Applications</emphasis>menu, entering your 
+		 <code>root</code>password when prompted.</para>
+		 <para>The program starts in 
+		 <emphasis>Browse</emphasis>view by default. This view organizes
+		 packages into related groups, displaying top level groups on the
+		 left and sub-categories on the right. When a tick is present next
+		 to a sub-category, it indicates applications from that group are
+		 installed.</para>
+		 <para>To install 
+		 <emphasis role="strong">Banshee</emphasis>, select the 
+		 <emphasis>Sound and Video</emphasis>sub-category and press the 
+		 <emphasis>Optional Packages</emphasis>button. Locate 
+		 <emphasis role="strong">Banshee</emphasis>in the list and queue it
+		 for installation by ticking its box with a left-click. As many
+		 packages as desired can be queued for installation by ticking the
+		 appropriate boxes.</para>
+		 <para>To add packages from other groups or sub-categories to the
+		 queue, browse to the desired group or sub-category and proceed as
+		 before. The 
+		 <emphasis>Optional Packages</emphasis>button is only available when
+		 the desired sub-category is ticked. Ticking a previously un-ticked
+		 sub-category automatically queues for installation any packages
+		 required for that sub-category.</para>
+		 <para>To install the queued packages press the 
+		 <emphasis>Apply</emphasis>button.</para>
+		 <note>
+			<title>Removing packages</title>
+			<para>Remove packages by un-ticking the appropriate boxes and
+			pressing the 
+			<emphasis>Apply</emphasis>button.</para>
+		 </note>
+	  </section>
+	  <section id="sn-Dependencies">
+		 <title>Dependencies</title>
+		 <para>After applying changes, 
+		 <emphasis role="strong">Pirut</emphasis>prompts to confirm the
+		 packages you have selected. Proceed if the list is correct,
+		 otherwise cancel and refine the selection.</para>
+		 <note>
+			<title>Dependencies</title>
+			<para>Dependenices are packages that are required by another
+			package to function correctly.</para>
+		 </note>
+		 <para>
+		 <emphasis role="strong">Pirut</emphasis>now resolves any
+		 dependencies. A dialog informs you which dependencies have been
+		 found, and are automatically marked for installation. Confirm this
+		 list to proceed.</para>
+		 <warning>
+			<title>Dependencies can be removed</title>
+			<para>When a package is removed it is possible other packages may
+			have relied on it to function correctly. If this is the case 
+			<emphasis role="strong">Pirut</emphasis>also removes these other
+			applications. Check the dependency dialog and cancel if any of
+			the packages marked for removal are still needed. This can be
+			corrected by refining your package selection.</para>
+		 </warning>
+	  </section>
+	  <section id="sn-SearchSoftware">
+		 <title>Search Software</title>
+		 <para>When the desired application's name is known, the 
+		 <emphasis>Search</emphasis>tab is more efficient.</para>
+		 <para>Select the 
+		 <emphasis>Search</emphasis>tab from the top of the window and enter
+		 
+		 <emphasis role="strong">Banshee</emphasis>into the search box.
+		 Press enter to begin the search. Results, including related
+		 packages, are shown in the box below. To find more information
+		 about a package before installation, highlight it with a left-click
+		 and press the 
+		 <emphasis>Package Details</emphasis>text below.</para>
+		 <para>To queue a package for installation or removal, toggle its
+		 box as appropriate. Once all the packages have been selected press 
+		 <emphasis>Apply</emphasis>.</para>
+		 <para />
+	  </section>
+	  <section id="sn-ListSoftware">
+		 <title>List Software</title>
+		 <para>The list tab displays all available packages. Packages can be
+		 queued for installation or removal in the same manner as before.
+		 Once satisfied with the selections, press the 
+		 <emphasis>Apply</emphasis>button to commit the changes.</para>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: pup.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/pup.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pup.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ pup.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,36 +1,91 @@
-<?xml version="1.0"?>
-<section id="sn-Pup">
-    <title>Updating Software With Pup</title>
-    <para>This chapter explains how to use the <emphasis role="strong">Pup</emphasis> graphical update program, and how <emphasis role="strong">Puplet</emphasis> works to provide notifications of available updates.  </para>
-    <para/>
-    <section>
-      <title>Update Notifications</title>
-      <para><emphasis role="strong">Puplet</emphasis> works constantly in the background, checking for available software updates from the enabled repositories. When updates become available a package icon appears in the notification area, along with an alert which appears for a short time and reveals the number of updates available.  </para>
-      <para>Once the notification tray icon is present, there are a number of possible actions it can perform: </para>
-      <itemizedlist>
-        <listitem>
-          <para><emphasis>Refresh</emphasis> will check for new updates </para>
-        </listitem>
-        <listitem>
-          <para><emphasis>View Updates</emphasis> launches <emphasis role="strong">Pup</emphasis> and allows you to find more details about the packages to be updated, to de-select some updates, and to start the update process </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis>Apply Updates</emphasis>
-          </para>
-        </listitem>
-        <listitem>
-          <para><emphasis>Quit</emphasis> closes <emphasis role="strong">Puplet</emphasis> until the next time the system starts </para>
-        </listitem>
-      </itemizedlist>
-      <para/>
-    </section>
-    <section>
-      <title>The Package Updater</title>
-      <para>This program features a scrollable text window under the heading <emphasis>Updates available</emphasis>. In this text window all of the available updates are listed, and all are selected by default. If you want to remove any of the packages queued for update, left click the ticked box next to the relevant package.  </para>
-      <para>Some updates have a circular arrow icon next to them, indicating that these changes won't be applied until the next system reboot.  </para>
-      <para>Further information about the updates can be found by selecting the desired package, then left clicking the <emphasis>Update Details</emphasis> text.  </para>
-      <para>Once satisfied with the package selection left click the <emphasis>Apply Updates</emphasis> button. Pup checks for dependencies, ensuring that the updated packages will have everything required to function correctly. If dependencies are added a dialogue will be displayed informing you which new packages are set to be installed. Review this dialog and click <emphasis>Continue</emphasis> if it is OK.  </para>
-      <para>The packages will then be downloaded and installed. If a reboot is needed for some of the changes to take place, you will be informed of this at the end of the updates.  </para>
-    </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-Pup">
+	  <title>Updating Software With Pup</title>
+	  <para>This chapter explains how to use the 
+	  <emphasis role="strong">Pup</emphasis>graphical update program, and
+	  how 
+	  <emphasis role="strong">Puplet</emphasis>works to provide
+	  notifications of available updates.</para>
+	  <para />
+	  <section id="sn-UpdateNotifications">
+		 <title>Update Notifications</title>
+		 <para>
+		 <emphasis role="strong">Puplet</emphasis>works constantly in the
+		 background, checking for available software updates from the
+		 enabled repositories. When updates become available a package icon
+		 appears in the notification area, along with an alert which appears
+		 for a short time and reveals the number of updates
+		 available.</para>
+		 <para>Once the notification tray icon is present, there are a
+		 number of possible actions it can perform:</para>
+		 <itemizedlist>
+			<listitem>
+			  <para>
+			  <emphasis>Refresh</emphasis>will check for new updates</para>
+			</listitem>
+			<listitem>
+			  <para>
+			  <emphasis>View Updates</emphasis>launches 
+			  <emphasis role="strong">Pup</emphasis>and allows you to find
+			  more details about the packages to be updated, to de-select
+			  some updates, and to start the update process</para>
+			</listitem>
+			<listitem>
+			  <para>
+				 <emphasis>Apply Updates</emphasis>
+			  </para>
+			</listitem>
+			<listitem>
+			  <para>
+			  <emphasis>Quit</emphasis>closes 
+			  <emphasis role="strong">Puplet</emphasis>until the next time
+			  the system starts</para>
+			</listitem>
+		 </itemizedlist>
+		 <para />
+	  </section>
+	  <section id="sn-PackageUpdater">
+		 <title>The Package Updater</title>
+		 <para>This program features a scrollable text window under the
+		 heading 
+		 <emphasis>Updates available</emphasis>. In this text window all of
+		 the available updates are listed, and all are selected by default.
+		 If you want to remove any of the packages queued for update, left
+		 click the ticked box next to the relevant package.</para>
+		 <para>Some updates have a circular arrow icon next to them,
+		 indicating that these changes won't be applied until the next
+		 system reboot.</para>
+		 <para>Further information about the updates can be found by
+		 selecting the desired package, then left clicking the 
+		 <emphasis>Update Details</emphasis>text.</para>
+		 <para>Once satisfied with the package selection left click the 
+		 <emphasis>Apply Updates</emphasis>button. Pup checks for
+		 dependencies, ensuring that the updated packages will have
+		 everything required to function correctly. If dependencies are
+		 added a dialogue will be displayed informing you which new packages
+		 are set to be installed. Review this dialog and click 
+		 <emphasis>Continue</emphasis>if it is OK.</para>
+		 <para>The packages will then be downloaded and installed. If a
+		 reboot is needed for some of the changes to take place, you will be
+		 informed of this at the end of the updates.</para>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: search-with-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/search-with-yum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- search-with-yum.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ search-with-yum.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,58 +1,121 @@
-<?xml version="1.0"?>
-<section>
-  <title>Searching for Packages with <code>yum</code></title>
-  <para/>
-  <section>
-    <title>Searching for Packages with yum</title>
-    <para>Use the search features of <code>yum</code> to find software that is available from the configured repositories, or already installed on your system. Searches automatically include both installed and available packages. </para>
-    <para>The format of the results depends upon the option. If the query produces no information, there are no packages matching the criteria. </para>
-    <para/>
-  </section>
-  <section>
-    <title>Searching by Package Name and Attributes</title>
-    <para>To search for a specific package by name, use the list function. To search for the package <code>tsclient</code>, use the command: </para>
-    <para>
-      <code>su -c 'yum list tsclient'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>To make your queries more precise, specify packages with a name that include other attributes, such as version or hardware architecture. To search for version 0.132 of the application, use the command: </para>
-    <para>
-      <code>su -c 'yum list tsclient-0.132'</code>
-    </para>
-    <note>
-       <title>Valid Package Attributes</title>
-       <para> Refer to <xref linkend="sn-Concepts"/> for information on package name formats and the attributes that they include. </para>
-    </note>
-    <para/>
-  </section>
-  <section>
-    <title>Advanced Searches</title>
-    <para>If you do not know the name of the package, use the search or provides options. Alternatively, use wild cards with any <code>yum</code> search option to broaden the search criteria. </para>
-    <para>The search option checks the names, descriptions, summaries and listed package maintainers of all of the available packages to find those that match. For example, to search for all packages that relate to Palm Pilots, type: </para>
-    <para>
-      <code>su -c 'yum search PalmPilot'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <para>The provides function checks both the files included in the packages and the functions that the software provides. This option requires <code>yum</code> to download and read much larger index files than with the search option. </para>
-    <para>To search for all packages that include files called <code>libneon</code>, type: </para>
-    <para>
-      <code>su -c 'yum provides libneon'</code>
-    </para>
-    <para>To search for all packages that either provide a MTA (Mail Transport Agent) service, or include files with <code>mta</code> in their name: </para>
-    <para>
-      <code>su -c 'yum provides MTA'</code>
-    </para>
-    <para>For each command, at the prompt enter the password for the <emphasis>root</emphasis> account. </para>
-    <para>Use the standard wild-card characters to run any search option with a partial word or name: <code>?</code> to represent any one character, and <code>*</code> to mean zero or more characters. Always add the escape character <code>\</code> before wild-cards. </para>
-    <para>To list all packages with names that begin with <code>tsc</code>, type: </para>
-    <para>
-      <code>su -c 'yum list tsc\*'</code>
-    </para>
-    <para/>
-  </section>
-  <section>
-    <title>Understanding Matches</title>
-    <para>Searches with <code>yum</code> show all of the packages that match your criteria. Packages must meet the terms of the search exactly to be considered matches, unless you use wild-cards. </para>
-    <para>For example, a search query for <code>shadowutils</code> or <code>shadow-util</code> would not produce the package <code>shadow-utils</code>. This package would match and be shown if the query was <code>shadow-util\?</code>, or <code>shadow\*</code>.  </para>
-  </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-SearchingForPackagesWithYum">
+	  <title>Searching for Packages with 
+	  <code>yum</code></title>
+	  <section id="sn-SearchingForPackages">
+		 <title>Searching for Packages with yum</title>
+		 <para>Use the search features of 
+		 <code>yum</code>to find software that is available from the
+		 configured repositories, or already installed on your system.
+		 Searches automatically include both installed and available
+		 packages.</para>
+		 <para>The format of the results depends upon the option. If the
+		 query produces no information, there are no packages matching the
+		 criteria.</para>
+		 <para />
+	  </section>
+	  <section id="sn-SearchingByName">
+		 <title>Searching by Package Name and Attributes</title>
+		 <para>To search for a specific package by name, use the list
+		 function. To search for the package 
+		 <code>tsclient</code>, use the command:</para>
+		 <para>
+			<code>su -c 'yum list tsclient'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <para>To make your queries more precise, specify packages with a
+		 name that include other attributes, such as version or hardware
+		 architecture. To search for version 0.132 of the application, use
+		 the command:</para>
+		 <para>
+			<code>su -c 'yum list tsclient-0.132'</code>
+		 </para>
+		 <note>
+			<title>Valid Package Attributes</title>
+			<para>Refer to 
+			<xref linkend="sn-Concepts" />for information on package name
+			formats and the attributes that they include.</para>
+		 </note>
+		 <para />
+	  </section>
+	  <section id="sn-AdvancedSearches">
+		 <title>Advanced Searches</title>
+		 <para>If you do not know the name of the package, use the search or
+		 provides options. Alternatively, use wild cards with any 
+		 <code>yum</code>search option to broaden the search
+		 criteria.</para>
+		 <para>The search option checks the names, descriptions, summaries
+		 and listed package maintainers of all of the available packages to
+		 find those that match. For example, to search for all packages that
+		 relate to Palm Pilots, type:</para>
+		 <para>
+			<code>su -c 'yum search PalmPilot'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <para>The provides function checks both the files included in the
+		 packages and the functions that the software provides. This option
+		 requires 
+		 <code>yum</code>to download and read much larger index files than
+		 with the search option.</para>
+		 <para>To search for all packages that include files called 
+		 <code>libneon</code>, type:</para>
+		 <para>
+			<code>su -c 'yum provides libneon'</code>
+		 </para>
+		 <para>To search for all packages that either provide a MTA (Mail
+		 Transport Agent) service, or include files with 
+		 <code>mta</code>in their name:</para>
+		 <para>
+			<code>su -c 'yum provides MTA'</code>
+		 </para>
+		 <para>For each command, at the prompt enter the password for the 
+		 <emphasis>root</emphasis>account.</para>
+		 <para>Use the standard wild-card characters to run any search
+		 option with a partial word or name: 
+		 <code>?</code>to represent any one character, and 
+		 <code>*</code>to mean zero or more characters. Always add the
+		 escape character 
+		 <code>\</code>before wild-cards.</para>
+		 <para>To list all packages with names that begin with 
+		 <code>tsc</code>, type:</para>
+		 <para>
+			<code>su -c 'yum list tsc\*'</code>
+		 </para>
+		 <para />
+	  </section>
+	  <section id="sn-UnderstandingMatches">
+		 <title>Understanding Matches</title>
+		 <para>Searches with 
+		 <code>yum</code>show all of the packages that match your criteria.
+		 Packages must meet the terms of the search exactly to be considered
+		 matches, unless you use wild-cards.</para>
+		 <para>For example, a search query for 
+		 <code>shadowutils</code>or 
+		 <code>shadow-util</code>would not produce the package 
+		 <code>shadow-utils</code>. This package would match and be shown if
+		 the query was 
+		 <code>shadow-util\?</code>, or 
+		 <code>shadow\*</code>.</para>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: tools.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/tools.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tools.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ tools.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,16 +1,71 @@
-<?xml version="1.0"?>
-<section>
-    <title>Software Management Tools in Fedora</title>
-    <para>The <code>yum</code> command-line utility is a complete software management system. Fedora also includes two graphical applications for software management that use <code>yum</code>. The <emphasis role="strong">pup</emphasis> utility provides an interface for updating software, and the <emphasis role="strong">pirut</emphasis> application enables you to add or remove software. </para>
-    <para>Both graphical tools appear in the <emphasis>Applications</emphasis> desktop menu. To update your system with <emphasis role="strong">pup</emphasis>, select <emphasis>Applications &#x2192; System Tools &#x2192; Software Updater</emphasis>. To add or remove software with <emphasis role="strong">pirut</emphasis>, select <emphasis>Applications &#x2192; Add/Remove Software</emphasis>. </para>
-    <warning>
-      <title>Root Access Needed</title>
-      <para> When using <emphasis role="strong">pup</emphasis> or <emphasis role="strong">pirut</emphasis> you will be asked for the root password when starting these programs. </para>
-    </warning>
-    <para>There is also <emphasis role="strong">puplet</emphasis> which automatically checks for, and alerts you to, updates for your system. It appears as an icon in the notification area when new updates are available. Click this icon to launch <emphasis role="strong">pup</emphasis> and update your system.  </para>
-    <para>The <code>rpm</code> command-line utility has many functions for working with individual RPM packages. You may use it to manually install and remove packages from your system. If you install software with the <code>rpm</code> utility, you must manually check and install any dependencies. For this reason, <emphasis role="strong">pirut</emphasis> and <code>yum</code> are the recommended methods for installing software. </para>
-    <warning>
-      <title>Current Package Versions</title>
-      <para> The <emphasis role="strong">pirut</emphasis> and <code>yum</code> utilities ensure that you have the most recent version of software packages. Other methods do not guarantee that the packages are current. </para>
-    </warning>
-  </section>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+[
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+<section id="sn-Tools">
+  <title>Software Management Tools in Fedora</title>
+  <para>The 
+  <code>yum</code>command-line utility is a complete software
+  management system. Fedora also includes two graphical applications
+  for software management that use 
+  <code>yum</code>. The 
+  <emphasis role="strong">pup</emphasis>utility provides an interface
+  for updating software, and the 
+  <emphasis role="strong">pirut</emphasis>application enables you to
+  add or remove software.</para>
+  <para>Both graphical tools appear in the 
+  <emphasis>Applications</emphasis>desktop menu. To update your system
+  with 
+  <emphasis role="strong">pup</emphasis>, select 
+  <emphasis>Applications &#8594; System Tools &#8594; Software
+  Updater</emphasis>. To add or remove software with 
+  <emphasis role="strong">pirut</emphasis>, select 
+  <emphasis>Applications &#8594; Add/Remove Software</emphasis>.</para>
+  <warning>
+    <title>Root Access Needed</title>
+    <para>When using 
+    <emphasis role="strong">pup</emphasis>or 
+    <emphasis role="strong">pirut</emphasis>you will be asked for the
+    root password when starting these programs.</para>
+  </warning>
+  <para>There is also 
+  <emphasis role="strong">puplet</emphasis>which automatically checks
+  for, and alerts you to, updates for your system. It appears as an
+  icon in the notification area when new updates are available. Click
+  this icon to launch 
+  <emphasis role="strong">pup</emphasis>and update your system.</para>
+  <para>The 
+  <code>rpm</code>command-line utility has many functions for working
+  with individual RPM packages. You may use it to manually install and
+  remove packages from your system. If you install software with the 
+  <code>rpm</code>utility, you must manually check and install any
+  dependencies. For this reason, 
+  <emphasis role="strong">pirut</emphasis>and 
+  <code>yum</code>are the recommended methods for installing
+  software.</para>
+  <warning>
+    <title>Current Package Versions</title>
+    <para>The 
+    <emphasis role="strong">pirut</emphasis>and 
+    <code>yum</code>utilities ensure that you have the most recent
+    version of software packages. Other methods do not guarantee that
+    the packages are current.</para>
+  </warning>
+</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: update-with-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/update-with-yum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-with-yum.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ update-with-yum.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,19 +1,46 @@
-<?xml version="1.0"?>
-<section id="sn-UpdateWithYum">
-  <title>Updating Your System with <code>yum</code></title>
-    <para>Use the update option to upgrade all of your Fedora system software to the latest version with one operation. </para>
-    <para>To perform a full system update, type this command: </para>
-    <para>
-      <code>su -c 'yum update'</code>
-    </para>
-    <para>At the prompt, enter the <emphasis>root</emphasis> password. </para>
-    <para/>
-  <section>
-    <title>Automatically Updating Your System</title>
-    <para>The <code>yum</code> package supplied with Fedora includes scripts to perform full system updates every day. To activate automatic daily updates, enter this command: </para>
-    <para>
-      <code>su -c '/sbin/chkconfig --level 345 yum-updatesd on; /sbin/service yum-updatesd start'</code>
-    </para>
-    <para>At the prompt, enter the password for the <emphasis>root</emphasis> account. </para>
-  </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-UpdateWithYum">
+	  <title>Updating Your System with 
+	  <code>yum</code></title>
+	  <para>Use the update option to upgrade all of your Fedora system
+	  software to the latest version with one operation.</para>
+	  <para>To perform a full system update, type this command:</para>
+	  <para>
+		 <command>su -c 'yum update'</command>
+	  </para>
+	  <para>At the prompt, enter the 
+	  <emphasis>root</emphasis>password.</para>
+	  <para />
+	  <section id="sn-AutoUpdates">
+		 <title>Automatically Updating Your System</title>
+		 <para>The 
+		 <package>yum</package> package supplied with Fedora includes scripts to
+		 perform full system updates every day. To activate automatic daily
+		 updates, enter this command:</para>
+		 <para>
+			<command>su -c '/sbin/chkconfig --level 345 yum-updatesd on;
+			/sbin/service yum-updatesd start'</command>
+		 </para>
+		 <para>At the prompt, enter the password for the 
+		 <emphasis>root</emphasis>account.</para>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: yum-caching.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/yum-caching.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yum-caching.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ yum-caching.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,58 +1,135 @@
-<?xml version="1.0"?>
-<section id="sn-YumCaching">
-    <title>Working with yum Caching</title>
-    <para>By default, current versions of <code>yum</code> delete the data files and packages that they download, after these have been successfully used for an operation. This minimizes the amount of storage space that <code>yum</code> uses. You may enable caching, so that <code>yum</code> retains the files that it downloads in cache directories. </para>
-    <para>Caches provide three advantages: </para>
-    <itemizedlist>
-      <listitem>
-        <para>The performance of <code>yum</code> increases </para>
-      </listitem>
-      <listitem>
-        <para>You may carry out <code>yum</code> operations without a network connection, by using only the caches </para>
-      </listitem>
-      <listitem><para>You may copy packages from the caches and reuse them elsewhere  </para></listitem>
-    </itemizedlist>
-    <para>By default, <code>yum</code> stores temporary files under the directory <code>/var/cache/yum/</code>, with one subdirectory for each configured repository. The <code>packages/</code> directory within each repository directory holds the cached packages. For example, the directory <code>/var/cache/yum/development/packages/</code> holds packages downloaded from the development repository. </para>
-    <note>
-      <title role="strong">Clearing the <code>yum</code> Caches</title>
-      <para> Cached files use disk space until removed. You may wish to periodically clear the <code>yum</code> caches to recover capacity. Refer to <xref linkend="sn-YumCaching"/> for information on clearing the caches. </para>
-    </note>
-    <para>If you remove a package from the cache, you do not affect the copy of the software installed on your system. </para>
-  <section>
-    <title>Enabling the Caches</title>
-    <para>To configure <code>yum</code> to retain downloaded files rather than discarding them, set the <code>keepcache</code> option in <code>/etc/yum.conf</code> to <code>1</code>: </para>
-    <para>
-      <code>keepcache=1</code>
-    </para>
-    <para>Refer to <xref linkend="sn-CustomizingYum"/> for more information on editing the <code>yum</code> configuration file. </para>
-    <para>Once you enable caching, every <code>yum</code> operation may download package data from the configured repositories. To ensure that the caches have a set of package data, carry out an operation after you enable caching. Use a list or search query to download package data without modifying your system. </para>
-    <para/>
-  </section>
-  <section>
-    <title>Using yum in Cache-only Mode</title>
-    <para>To carry out a <code>yum</code> command without a network connection, add the <code>-C</code> option. This causes <code>yum</code> to proceed without checking any network repositories, and use only cached files. In this mode, yum may only install packages that have been downloaded and cached by a previous operation. </para>
-    <para>To search for the package <code>tsclient</code> without using a network connection, enter the command: </para>
-    <para>
-      <code>su -c 'yum -C list tsclient'</code>
-    </para>
-    <para>Enter the password for the <emphasis>root</emphasis> account when prompted. </para>
-    <note>
-      <title>Cache-only Mode Requires Cached Data</title>
-      <para> Cache-only mode requires package data to exist in the caches. If you enable caching, every <code>yum</code> operation may update the data files, unless cache-only mode is specified for the operation. </para>
-    </note>
-    <anchor id="clearing_the_yum_caches"/>
-  </section>
-  <section>
-    <title>Clearing the yum Caches</title>
-    <para>If you configure it to do so, <code>yum</code> retains the packages and package data files that it downloads, so that they may be reused in future operations without being downloaded again. To purge the package data files, use this command: </para>
-    <para>
-      <code>su -c 'yum clean headers'</code>
-    </para>
-    <para>Run this command to remove all of the packages held in the caches: </para>
-    <para>
-      <code>su -c 'yum clean packages'</code>
-    </para>
-    <para>When using these commands, at the prompt, enter the password for the <emphasis>root</emphasis> account. </para>
-    <para>Purging cached files causes those files to downloaded again the next time that they are required. This increases the amount of time required to complete the operation.  </para>
-  </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-YumCaching">
+	  <title>Working with yum Caching</title>
+	  <para>By default, current versions of 
+	  <code>yum</code>delete the data files and packages that they
+	  download, after these have been successfully used for an operation.
+	  This minimizes the amount of storage space that 
+	  <code>yum</code>uses. You may enable caching, so that 
+	  <code>yum</code>retains the files that it downloads in cache
+	  directories.</para>
+	  <para>Caches provide three advantages:</para>
+	  <itemizedlist>
+		 <listitem>
+			<para>The performance of 
+			<code>yum</code>increases</para>
+		 </listitem>
+		 <listitem>
+			<para>You may carry out 
+			<code>yum</code>operations without a network connection, by using
+			only the caches</para>
+		 </listitem>
+		 <listitem>
+			<para>You may copy packages from the caches and reuse them
+			elsewhere</para>
+		 </listitem>
+	  </itemizedlist>
+	  <para>By default, 
+	  <code>yum</code>stores temporary files under the directory 
+	  <code>/var/cache/yum/</code>, with one subdirectory for each
+	  configured repository. The 
+	  <code>packages/</code>directory within each repository directory
+	  holds the cached packages. For example, the directory 
+	  <code>/var/cache/yum/development/packages/</code>holds packages
+	  downloaded from the development repository.</para>
+	  <note>
+		 <title role="strong">Clearing the 
+		 <code>yum</code>Caches</title>
+		 <para>Cached files use disk space until removed. You may wish to
+		 periodically clear the 
+		 <code>yum</code>caches to recover capacity. Refer to 
+		 <xref linkend="sn-YumCaching" />for information on clearing the
+		 caches.</para>
+	  </note>
+	  <para>If you remove a package from the cache, you do not affect the
+	  copy of the software installed on your system.</para>
+	  <section id="sn-EnablingCaches">
+		 <title>Enabling the Caches</title>
+		 <para>To configure 
+		 <code>yum</code>to retain downloaded files rather than discarding
+		 them, set the 
+		 <code>keepcache</code>option in 
+		 <code>/etc/yum.conf</code>to 
+		 <code>1</code>:</para>
+		 <para>
+			<code>keepcache=1</code>
+		 </para>
+		 <para>Refer to 
+		 <xref linkend="sn-CustomizingYum" />for more information on editing
+		 the 
+		 <code>yum</code>configuration file.</para>
+		 <para>Once you enable caching, every 
+		 <code>yum</code>operation may download package data from the
+		 configured repositories. To ensure that the caches have a set of
+		 package data, carry out an operation after you enable caching. Use
+		 a list or search query to download package data without modifying
+		 your system.</para>
+		 <para />
+	  </section>
+	  <section id="sn-CacheOnlyMode">
+		 <title>Using yum in Cache-only Mode</title>
+		 <para>To carry out a 
+		 <code>yum</code>command without a network connection, add the 
+		 <code>-C</code>option. This causes 
+		 <code>yum</code>to proceed without checking any network
+		 repositories, and use only cached files. In this mode, yum may only
+		 install packages that have been downloaded and cached by a previous
+		 operation.</para>
+		 <para>To search for the package 
+		 <code>tsclient</code>without using a network connection, enter the
+		 command:</para>
+		 <para>
+			<code>su -c 'yum -C list tsclient'</code>
+		 </para>
+		 <para>Enter the password for the 
+		 <emphasis>root</emphasis>account when prompted.</para>
+		 <note>
+			<title>Cache-only Mode Requires Cached Data</title>
+			<para>Cache-only mode requires package data to exist in the
+			caches. If you enable caching, every 
+			<code>yum</code>operation may update the data files, unless
+			cache-only mode is specified for the operation.</para>
+		 </note>
+	  </section>
+	  <section id="sn-ClearingCaches">
+		 <title>Clearing the yum Caches</title>
+		 <para>If you configure it to do so, 
+		 <code>yum</code>retains the packages and package data files that it
+		 downloads, so that they may be reused in future operations without
+		 being downloaded again. To purge the package data files, use this
+		 command:</para>
+		 <para>
+			<code>su -c 'yum clean headers'</code>
+		 </para>
+		 <para>Run this command to remove all of the packages held in the
+		 caches:</para>
+		 <para>
+			<code>su -c 'yum clean packages'</code>
+		 </para>
+		 <para>When using these commands, at the prompt, enter the password
+		 for the 
+		 <emphasis>root</emphasis>account.</para>
+		 <para>Purging cached files causes those files to downloaded again
+		 the next time that they are required. This increases the amount of
+		 time required to complete the operation.</para>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->


Index: yum-proxy.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/yum-proxy.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yum-proxy.xml	21 Jan 2008 22:21:19 -0000	1.1
+++ yum-proxy.xml	22 Jan 2008 03:34:05 -0000	1.2
@@ -1,50 +1,123 @@
-<?xml version="1.0"?>
-<section id="sn-YumProxy">
-    <title>Using yum with a Proxy Server</title>
-    <para>By default, <code>yum</code> accesses network repositories with HTTP. All <code>yum</code> HTTP operations use HTTP/1.1, and are compatible with web proxy servers that support this standard. You may also access FTP repositories, and configure <code>yum</code> to use an FTP proxy server. The <code>squid</code> package provides a proxy service for both HTTP/1.1 and FTP connections. </para>
-    <note>
-      <title>Modifying <code>yum</code> for Network Compatibility</title>
-      <para> Refer to the <code>man</code> page for <code>yum.conf</code> for information on HTTP settings that may be modified for compatibility with nonstandard web proxy servers. Alternatively, configure <code>yum</code> to use an FTP proxy server, and access repositories that support FTP. The Fedora repositories support both HTTP and FTP. </para>
-    </note>
-  <section>
-    <title>Configuring Proxy Server Access</title>
-    <para>To enable all <code>yum</code> operations to use a proxy server, specify the proxy server details in <code>/etc/yum.conf</code>. The proxy setting must specify the proxy server as a complete URL, including the TCP port number. If your proxy server requires a username and password, specify these by adding <code>proxy_username</code> and <code>proxy_password</code> settings. </para>
-    <para>The settings below enable yum to use the proxy server <code>mycache.mydomain.com</code>, connecting to port 3128, with the username <code>yum-user</code> and the password <code>qwerty</code>. </para>
-    <para/>
-    <screen><![CDATA[# The proxy server - proxy server:port number
-proxy=http://mycache.mydomain.com:3128
-# The account details for yum connections
-proxy_username=yum-user
-proxy_password=qwerty
-]]></screen>
-    <para>Example 4. Configuration File Settings for Using A Proxy Server </para>
-    <note>
-      <para>Older versions of yum may require a "/" after the port number:  <code> proxy=http://mycache.mydomain.com:3128/</code> </para>
-    </note>
-    <note>
-      <title>Global Settings</title>
-      <para> If you define a proxy server in <code>/etc/yum.conf</code>, all users connect to the proxy server with those details when using <code>yum</code>. </para>
-    </note>
-    <para/>
-  </section>
-  <section>
-    <title>Configuring Proxy Server Access for a Single User</title>
-    <para>To enable proxy access for a specific user, add the lines in the example box below to the user's shell profile. For the default <code>bash shell</code>, the profile is the file <code>~/.bash_profile</code>. The settings below enable <code>yum</code> to use the proxy server <code>mycache.mydomain.com</code>, connecting to port 3128. </para>
-    <para/>
-    <screen><![CDATA[# The Web proxy server used by this account
-http_proxy="http://mycache.mydomain.com:3128"
-export http_proxy
-]]></screen>
-    <para>Example 5. Profile Settings for Using a Proxy Server </para>
-    <para>If the proxy server requires a username and password, add these to the URL. To include the username <code>yum-user</code> and the password <code>qwerty</code>, add these settings: </para>
-    <para/>
-    <screen><![CDATA[# The Web proxy server, with the username and password for this account 
-http_proxy="http://yum-user:qwerty@mycache.mydomain.com:3128"
-export http_proxy ]]></screen>
-    <para>Example 6. Profile Settings for a Secured Proxy Server </para>
-    <note>
-      <title>The <code>http_proxy</code> Environment Variable</title>
-      <para> The <code>http_proxy</code> environment variable is also used by <code>curl</code> and other utilities. Although <code>yum</code> itself may use <code>http_proxy</code> in either upper-case or lower-case, <code>curl</code> requires the name of the variable to be in lower-case. </para>
-    </note>
-  </section>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: -->
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- *************** COMMON FDP entities *************** -->
+<!ENTITY % FDP-ENTITIES SYSTEM "fdp-entities.ent">
+ %FDP-ENTITIES;
+]>
+	<section id="sn-YumProxy">
+	  <title>Using yum with a Proxy Server</title>
+	  <para>By default, 
+	  <code>yum</code>accesses network repositories with HTTP. All 
+	  <code>yum</code>HTTP operations use HTTP/1.1, and are compatible with
+	  web proxy servers that support this standard. You may also access FTP
+	  repositories, and configure 
+	  <code>yum</code>to use an FTP proxy server. The 
+	  <code>squid</code>package provides a proxy service for both HTTP/1.1
+	  and FTP connections.</para>
+	  <note>
+		 <title>Modifying 
+		 <code>yum</code>for Network Compatibility</title>
+		 <para>Refer to the 
+		 <code>man</code>page for 
+		 <code>yum.conf</code>for information on HTTP settings that may be
+		 modified for compatibility with nonstandard web proxy servers.
+		 Alternatively, configure 
+		 <code>yum</code>to use an FTP proxy server, and access repositories
+		 that support FTP. The Fedora repositories support both HTTP and
+		 FTP.</para>
+	  </note>
+	  <section id="sn-ConfiguringProxy">
+		 <title>Configuring Proxy Server Access</title>
+		 <para>To enable all 
+		 <code>yum</code>operations to use a proxy server, specify the proxy
+		 server details in 
+		 <code>/etc/yum.conf</code>. The proxy setting must specify the
+		 proxy server as a complete URL, including the TCP port number. If
+		 your proxy server requires a username and password, specify these
+		 by adding 
+		 <code>proxy_username</code>and 
+		 <code>proxy_password</code>settings.</para>
+		 <para>The settings below enable yum to use the proxy server 
+		 <code>mycache.mydomain.com</code>, connecting to port 3128, with
+		 the username 
+		 <code>yum-user</code>and the password 
+		 <code>qwerty</code>.</para>
+		 <para />
+		 <screen>
+			<![CDATA[# The proxy server - proxy server:port number
+	proxy=http://mycache.mydomain.com:3128
+	# The account details for yum connections
+	proxy_username=yum-user
+	proxy_password=qwerty
+	]]>
+	</screen>
+		 <para>Example 4. Configuration File Settings for Using A Proxy
+		 Server</para>
+		 <note>
+			<para>Older versions of yum may require a "/" after the port
+			number: 
+			<code>proxy=http://mycache.mydomain.com:3128/</code></para>
+		 </note>
+		 <note>
+			<title>Global Settings</title>
+			<para>If you define a proxy server in 
+			<code>/etc/yum.conf</code>, all users connect to the proxy server
+			with those details when using 
+			<code>yum</code>.</para>
+		 </note>
+		 <para />
+	  </section>
+	  <section id="sn-ConfiguringProxyForSingleUser">
+		 <title>Configuring Proxy Server Access for a Single User</title>
+		 <para>To enable proxy access for a specific user, add the lines in
+		 the example box below to the user's shell profile. For the default 
+		 <code>bash shell</code>, the profile is the file 
+		 <code>~/.bash_profile</code>. The settings below enable 
+		 <code>yum</code>to use the proxy server 
+		 <code>mycache.mydomain.com</code>, connecting to port 3128.</para>
+		 <para />
+		 <screen>
+			<![CDATA[# The Web proxy server used by this account
+	http_proxy="http://mycache.mydomain.com:3128"
+	export http_proxy
+	]]>
+	</screen>
+		 <para>Example 5. Profile Settings for Using a Proxy Server</para>
+		 <para>If the proxy server requires a username and password, add
+		 these to the URL. To include the username 
+		 <code>yum-user</code>and the password 
+		 <code>qwerty</code>, add these settings:</para>
+		 <para />
+		 <screen>
+			<![CDATA[# The Web proxy server, with the username and password for this account 
+	http_proxy="http://yum-user:qwerty@mycache.mydomain.com:3128"
+	export http_proxy ]]>
+	</screen>
+		 <para>Example 6. Profile Settings for a Secured Proxy Server</para>
+		 <note>
+			<title>The 
+			<code>http_proxy</code>Environment Variable</title>
+			<para>The 
+			<code>http_proxy</code>environment variable is also used by 
+			<code>curl</code>and other utilities. Although 
+			<code>yum</code>itself may use 
+			<code>http_proxy</code>in either upper-case or lower-case, 
+			<code>curl</code>requires the name of the variable to be in
+			lower-case.</para>
+		 </note>
+	  </section>
+	</section>
+<!--
+Local variables:
+mode: xml
+fill-column: 72
+End:
+-->
+<!-- 
+vim: softtabstop=2:shiftwidth=2:expandtab:textwidth=72 
+-->




More information about the docs-commits mailing list