yum-software-management/en_US configuring-repositories.xml, 1.4, 1.5 customizing-yum.xml, 1.2, 1.3 isolated-install.xml, 1.2, 1.3 manage-with-yum.xml, 1.3, 1.4 pirut.xml, 1.2, 1.3 pup.xml, 1.2, 1.3 update-with-yum.xml, 1.2, 1.3 yum-caching.xml, 1.2, 1.3 yum-proxy.xml, 1.2, 1.3

Jared Smith (jsmith) fedora-docs-commits at redhat.com
Thu Jan 24 03:18:06 UTC 2008


Author: jsmith

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

Modified Files:
	configuring-repositories.xml customizing-yum.xml 
	isolated-install.xml manage-with-yum.xml pirut.xml pup.xml 
	update-with-yum.xml yum-caching.xml yum-proxy.xml 
Log Message:
Finish up the tag cleanup started earlier... again, mostly replacing
<code> and <emphasis> tags with more meaningful tags.



Index: configuring-repositories.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/configuring-repositories.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configuring-repositories.xml	22 Jan 2008 03:04:01 -0000	1.4
+++ configuring-repositories.xml	24 Jan 2008 03:18:03 -0000	1.5
@@ -17,31 +17,31 @@
     repository. Members of the community also maintain repositories to
     provide packages for Fedora systems. For example, 
     <ulink url="http://www.jpackage.org/">
-    http://www.jpackage.org/</ulink>distributes popular Java software as
+    http://www.jpackage.org/</ulink> distributes popular Java software as
     packages.</para>
     <para />
     <section id="sn-AddingRepository">
       <title>Adding a Repository as a Package Source</title>
       <para>To add an extra repository, place a definition file in the 
-      <code>/etc/yum.repos.d/</code>directory on your system. Package
+      <filename class="directory">/etc/yum.repos.d/</filename> directory on your system. Package
       providers make the definition files for their repositories
       available on their web sites.</para>
       <note>
         <title>Definition File Extension</title>
         <para>The names of repository definition files end with 
-        <code>.repo</code>.</para>
+        <filename class="extension">.repo</filename>.</para>
       </note>
       <para>You must have 
-      <emphasis>root</emphasis>access to add a file to the definitions
+      <systemitem class="username">root</systemitem> access to add a file to the definitions
       directory. To copy the definition file 
-      <code>example.repo</code>, type this command:</para>
+      <filename>example.repo</filename>, type this command:</para>
       <para>
-        <code>su -c 'cp example.repo /etc/yum.repos.d/'</code>
+        <command>su -c 'cp example.repo /etc/yum.repos.d/'</command>
       </para>
       <para>At the prompt, enter the password for the 
-      <emphasis>root</emphasis>account.</para>
+      <systemitem class="username">root</systemitem> account.</para>
       <para>The configuration file for each repository should include a 
-      <code>gpgkey</code>setting. This setting specifies the location of
+      <literal>gpgkey</literal> setting. This setting specifies the location of
       a public key that verifies the packages provided by that
       repository. This public key is automatically imported the first
       time that you install software from the repository. If the
@@ -52,31 +52,31 @@
     <section id="sn-ManuallyAuthorizing">
       <title>Manually Authorizing Package Sources</title>
       <para>To manually add a public key to your 
-      <code>rpm</code>keyring, use the import feature of the 
-      <code>rpm</code>utility. To import the file 
-      <code>GPG-PUB-KEY.asc</code>, type the following command:</para>
+      <application>rpm</application> keyring, use the import feature of the 
+      <application>rpm</application> utility. To import the file 
+      <filename>GPG-PUB-KEY.asc</filename>, type the following command:</para>
       <para>
-        <code>su -c 'rpm --import GPG-PUB-KEY.asc'</code>
+        <command>su -c 'rpm --import GPG-PUB-KEY.asc'</command>
       </para>
       <para>At the prompt, enter the password for the 
-      <emphasis>root</emphasis>account.</para>
+      <systemitem class="username">root</systemitem> account.</para>
       <para>You may also import public keys directly from a web site. For
       example, to import the file 
-      <code>GPG-PUB-KEY.asc</code>on the web site 
-      <emphasis>www.therepository.com</emphasis>, use this
+      <filename>GPG-PUB-KEY.asc</filename> on the web site 
+      <replaceable>www.therepository.com</replaceable>, use this
       command:</para>
       <para>
-        <code>su -c 'rpm --import
-        http://www.therepository.com/GPG-PUB-KEY.asc'</code>
+        <command>su -c 'rpm --import
+        http://<replaceable>www.therepository.com</replaceable>/GPG-PUB-KEY.asc'</command>
       </para>
       <para>At the prompt, enter the 
-      <emphasis>root</emphasis>password.</para>
+      <systemitem class="username">root</systemitem> password.</para>
       <important>
         <title>Importing the Fedora Key</title>
         <para>To add the Fedora public key to the 
-        <code>rpm</code>keyring on Fedora systems, run the command 
-        <code>su -c 'rpm --import
-        /usr/share/rhn/RPM-GPG-KEY-fedora'</code>.</para>
+        <application>rpm</application> keyring on Fedora systems, run the command 
+        <command>su -c 'rpm --import
+        /usr/share/rhn/RPM-GPG-KEY-fedora'</command>.</para>
       </important>
       <para />
     </section>
@@ -110,31 +110,31 @@
         <title>Old Versions of yum and Current Repositories</title>
         <para>The data format for repository indexes changed with version
         2.1 of 
-        <code>yum</code>. This was the version supplied with Fedora Core
+        <application>yum</application>. This was the version supplied with Fedora Core
         3. Repository providers should specify the versions of Fedora
         that they support. To confirm that an unlabeled repository is
         compatible with current versions of 
-        <code>yum</code>, check that it has a sub-directory called 
-        <code>repodata/</code>.</para>
+        <application>yum</application>, check that it has a sub-directory called 
+        <filename class="directory">repodata/</filename>.</para>
       </note>
       <para />
     </section>
     <section id="sn-DisablingSources">
       <title>Disabling or Removing Package Sources</title>
       <para>Set 
-      <code>enable=0</code>in a definition file to prevent 
-      <code>yum</code>from using that repository. The 
-      <code>yum</code>utility ignores any definition file with this
+      <literal>enable=0</literal> in a definition file to prevent 
+      <application>yum</application> from using that repository. The 
+      <application>yum</application> utility ignores any definition file with this
       setting.</para>
       <para>To completely remove access to a repository:</para>
       <orderedlist numeration="arabic">
         <listitem>
           <para>Delete the relevant file from 
-          <code>/etc/yum.repos.d/</code>.</para>
+          <filename class="directory">/etc/yum.repos.d/</filename>.</para>
         </listitem>
         <listitem>
           <para>Delete the cache directory from 
-          <code>/var/cache/yum/</code>.</para>
+          <filename class="directory">/var/cache/yum/</filename>.</para>
         </listitem>
       </orderedlist>
     </section>


Index: customizing-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/customizing-yum.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- customizing-yum.xml	22 Jan 2008 03:34:04 -0000	1.2
+++ customizing-yum.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -10,41 +10,41 @@
 ]>
   <section id="sn-CustomizingYum">
     <title>Customizing 
-    <code>yum</code></title>
+    <application>yum</application></title>
     <para>To change the behavior of 
-    <code>yum</code>, you may either edit the configuration files, or
+    <application>yum</application>, you may either edit the configuration files, or
     install 
-    <emphasis>plugins</emphasis>. Plugins enable developers to add new
+    <firstterm>plugins</firstterm>. Plugins enable developers to add new
     features to 
-    <code>yum</code>.</para>
+    <application>yum</application>.</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
+      <filename>/etc/yum.conf</filename> provides the main configuration for 
+      <application>yum</application>. 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
+      <filename>/etc/yum.conf</filename>, run a text editor with 
+      <systemitem class="username">root</systemitem> privileges. This command opens 
+      <filename>/etc/yum.conf</filename> with 
+      <application>gedit</application>, the default text editor
       for Fedora desktop systems:</para>
       <para>
-        <code>su -c 'gedit /etc/yum.conf'</code>
+        <command>su -c 'gedit /etc/yum.conf'</command>
       </para>
       <para>Enter the password for the 
-      <emphasis>root</emphasis>account when prompted.</para>
+      <systemitem class="username">root</systemitem> 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
+      <application>yum</application> operations. These include caching options, and
       proxy server settings. The directory 
-      <code>/etc/yum.repos.d/</code>holds definition files for each
+      <filename class="directory">/etc/yum.repos.d/</filename> holds definition files for each
       repository that 
-      <code>yum</code>uses. Plugins use the configuration files in the
+      <application>yum</application> uses. Plugins use the configuration files in the
       directory 
-      <code>/etc/yum/pluginconf.d/</code>.</para>
+      <filename class="directory">/etc/yum/pluginconf.d/</filename>.</para>
       <para>The following sections in this document provide further
       information on configuring yum:</para>
       <itemizedlist>
@@ -72,10 +72,10 @@
       <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
+        <application>man</application> page for 
+        <filename>yum.conf</filename> for a complete list of the configuration
         options supported by 
-        <code>yum</code>.</para>
+        <application>yum</application>.</para>
       </note>
       <para>
         <anchor id="working_with_yum_plugins" />
@@ -92,42 +92,43 @@
       <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
+        <application>yum</application> plugin files end with 
+        <filename class="extension">.py</filename>, 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
+      <filename class="directory">/usr/lib/yum-plugins/</filename>. Create a configuration file for
       the plugin in the directory 
-      <code>/etc/yum/pluginconf.d/</code>. Save the configuration file
+      <filename class="directory">/etc/yum/pluginconf.d/</filename>. Save the configuration file
       with the same name as the plugin, but with the extension 
-      <code>.conf</code>.</para>
+      <filename class="extension">.conf</filename>.</para>
       <note>
         <title>
-        <emphasis role="strong">root</emphasis>Privileges
+        <systemitem class="username">root</systemitem> 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>
+        <systemitem class="username">root</systemitem> access to add files to the directories 
+        <filename class="directory">/usr/lib/yum-plugins/</filename> and 
+        <filename class="directory">/etc/yum/pluginconf.d/</filename>.</para>
       </note>
       <para>For example, to copy the plugin 
-      <code>exampleplugin.py</code>, enter the command:</para>
+      <filename>exampleplugin.py</filename>, enter the command:</para>
       <para>
-        <code>su -c 'cp exampleplugin.py /usr/lib/yum-plugins/'</code>
+        <command>su -c 'cp exampleplugin.py
+        /usr/lib/yum-plugins/'</command>
       </para>
       <para>Enter the password for the 
-      <emphasis>root</emphasis>account when prompted.</para>
+      <systemitem class="username">root</systemitem> 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
+      <application>gedit</application>, the default text editor
       for Fedora desktop systems:</para>
       <para>
-        <code>su -c 'gedit
-        /etc/yum/pluginconf.d/exampleplugin.conf'</code>
+        <command>su -c 'gedit
+        /etc/yum/pluginconf.d/exampleplugin.conf'</command>
       </para>
       <para>Enter the password for the 
-      <emphasis>root</emphasis>account when prompted.</para>
+      <systemitem class="username">root</systemitem> 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
@@ -140,10 +141,6 @@
   anotheroption=0
   ]]>
   </screen>
-      <para>Example 3. Example Plugin Configuration File</para>
-      <para>
-        <anchor id="useful_plugins_for_fedora_users" />
-      </para>
     </section>
     <section id="sn-UsefulYumPlugins">
       <title>Useful Plugins for Fedora Users</title>
@@ -175,7 +172,7 @@
         <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
+        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
@@ -186,14 +183,12 @@
         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>
+        <guimenu>Applications</guimenu> menu use 
+        <guimenuitem>Add/Remove Software"</guimenuitem>.</para>
+        <para><command>su -c 'yum install
+        yum-fastestmirror'</command></para>
+        <para>You can configure various settings of this plugin in the file
+        <filename>/etc/yum/pluginconf.d/fastestmirror.conf</filename></para>
       </section>
       <section id="sn-YumPluginDownloadonly">
         <title>Downloadonly Plugin</title>
@@ -208,12 +203,11 @@
         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>
+        command or from the <guimenu>Applications
+        </guimenu>menu use<guimenuitem>Add/Remove
+        Software"</guimenuitem>.</para>
+        <para><command>su -c 'yum install
+        yum-changelog'</command></para>
         <para>Sample output:</para>
         <screen>
           <![CDATA[su -c 'yum update frysk --changelog' 
@@ -331,20 +325,15 @@
         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>
+        <guimenu>Applications</guimenu> menu use 
+        <guimenuitem>Add/Remove Software".</guimenuitem></para>
+        <para><command>su -c 'yum install
+        yum-skip-broken'</command></para>
         <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><command>su -c 'yum update --skip-broken'</command></para>
         <para>You can disable this plugin by changing the option in the
-        file /etc/yum/pluginconf.d/skip-broken.conf</para>
+        file <filename>/etc/yum/pluginconf.d/skip-broken.conf</filename></para>
       </section>
       <section id="sn-YumPluginAllowdowngrade">
         <title>Allowdowngrade Plugin</title>
@@ -357,31 +346,22 @@
         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>
+        <guimenu>Applications</guimenu> menu use 
+        <guimenuitem>Add/Remove Software</guimenuitem>.</para>
+        <para><command>su -c 'yum install
+        yum-allowdowngrade'</command></para>
         <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><command>su -c 'yum update
+        -allow-downgrade'</command></para>
         <para>You can disable this plugin by changing the option in the
-        file /etc/yum/pluginconf.d/allowdowngrade.conf</para>
+        file <filename>/etc/yum/pluginconf.d/allowdowngrade.conf</filename></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 />
+        <para><command>su -c 'yum update --noplugins'</command></para>
       </section>
       <section id="sn-DevelopingPlugins">
         <title>Developing New Plugins</title>
@@ -392,7 +372,7 @@
         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
+        https://lists.dulug.duke.edu/mailman/listinfo/yum-devel</ulink> to
         collaborate with Yum developers.</para>
       </section>
     </section>


Index: isolated-install.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/isolated-install.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isolated-install.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ isolated-install.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -12,10 +12,10 @@
 	<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
+	  <application>yum</application> 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
+	  <literal>localinstall</literal> function to install the software from the
 	  package file.</para>
 	  <important>
 		 <title>Public Key is Required</title>
@@ -25,21 +25,22 @@
 		 <xref linkend="sn-ManuallyAuthorizing" />.</para>
 	  </important>
 	  <para>Enter this command to install the package 
-	  <code>tsclient-0.132-4.i386.rpm</code>:</para>
+	  <package>tsclient-0.132-4.i386.rpm</package>:</para>
 	  <para>
-		 <code>su -c 'yum localinstall tsclient-0.132-4.i386.rpm'</code>
+		 <command>su -c 'yum localinstall
+       tsclient-0.132-4.i386.rpm'</command>
 	  </para>
 	  <para>At the prompt, enter the 
-	  <emphasis>root</emphasis>password.</para>
+	  <systemitem class="username">root</systemitem> 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>
+		 <application>yum</application> 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
+	  <application>yum</application> 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>
@@ -47,7 +48,7 @@
 		 <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
+		 <command>yum update</command> 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>


Index: manage-with-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/manage-with-yum.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- manage-with-yum.xml	24 Jan 2008 01:48:01 -0000	1.3
+++ manage-with-yum.xml	24 Jan 2008 03:18:03 -0000	1.4
@@ -71,8 +71,6 @@
 	Total download size: 355 k
 	Is this ok [y/N]:]]>
 	</screen>
-	  <para>Example 1. Format of 
-	  <application>yum</application> Transaction Reports</para>
 	  <para>Review the list of changes, and then press 
 	  <keycap>Y</keycap> to accept and begin the
 	  process. If you press 
@@ -97,8 +95,6 @@
 	Importing GPG key 0x4F2A6FD2 "Fedora Project <fedora at redhat.com>"
 	Is this ok [y/N]:]]>
 	</screen>
-	  <para>Example 2. Format of 
-	  <application>yum</application> Public Key Import</para>
 	  <para>Check the public key, and then press 
 	  <keycap>Y</keycap> to import the key and authorize
 	  the key for use. If you press 


Index: pirut.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/pirut.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pirut.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ pirut.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -12,55 +12,55 @@
 	<section id="sn-Pirut">
 	  <title>Managing Software with Pirut</title>
 	  <para>This section explains 
-	  <emphasis role="strong">Pirut</emphasis>, Fedora's graphical package
+	  <application>Pirut</application>, Fedora's graphical package
 	  management program. It demonstrates the different search facilities
 	  within 
-	  <emphasis role="strong">Pirut</emphasis>and how to install a package.
+	  <application>Pirut</application> and how to install a package.
 	  The 
-	  <emphasis role="strong">Banshee</emphasis>music management package is
+	  <application>Banshee</application> 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>
+		 <application>Pirut</application> by selecting the 
+		 <guimenuitem>Add/Remove Programs</guimenuitem> entry in the 
+		 <guimenu>Applications</guimenu> menu, entering your 
+		 <systemitem class="username">root</systemitem> password when prompted.</para>
 		 <para>The program starts in 
-		 <emphasis>Browse</emphasis>view by default. This view organizes
+		 <literal>Browse</literal> 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
+		 <application>Banshee</application>, select the 
+		 <literal>Sound and Video</literal> sub-category and press the 
+		 <guibutton>Optional Packages</guibutton> button. Locate 
+		 <application>Banshee</application> 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
+		 <guibutton>Optional Packages</guibutton> 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>
+		 <guibutton>Apply</guibutton> button.</para>
 		 <note>
 			<title>Removing packages</title>
 			<para>Remove packages by un-ticking the appropriate boxes and
 			pressing the 
-			<emphasis>Apply</emphasis>button.</para>
+			<guibutton>Apply</guibutton> button.</para>
 		 </note>
 	  </section>
 	  <section id="sn-Dependencies">
 		 <title>Dependencies</title>
 		 <para>After applying changes, 
-		 <emphasis role="strong">Pirut</emphasis>prompts to confirm the
+		 <application>Pirut</application> prompts to confirm the
 		 packages you have selected. Proceed if the list is correct,
 		 otherwise cancel and refine the selection.</para>
 		 <note>
@@ -69,7 +69,7 @@
 			package to function correctly.</para>
 		 </note>
 		 <para>
-		 <emphasis role="strong">Pirut</emphasis>now resolves any
+		 <application>Pirut</application> 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>
@@ -77,7 +77,7 @@
 			<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
+			<application>Pirut</application> 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>
@@ -86,19 +86,19 @@
 	  <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>
+		 <literal>Search</literal> tab is more efficient.</para>
 		 <para>Select the 
-		 <emphasis>Search</emphasis>tab from the top of the window and enter
+		 <literal>Search</literal> tab from the top of the window and enter
 		 
-		 <emphasis role="strong">Banshee</emphasis>into the search box.
+		 <literal>Banshee</literal> 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>
+		 <literal>Package Details</literal> 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>
+		 <guibutton>Apply</guibutton>.</para>
 		 <para />
 	  </section>
 	  <section id="sn-ListSoftware">
@@ -106,7 +106,7 @@
 		 <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>
+		 <guibutton>Apply</guibutton> button to commit the changes.</para>
 	  </section>
 	</section>
 <!--


Index: pup.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/pup.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pup.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ pup.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -12,15 +12,15 @@
 	<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
+	  <application>Pup</application> graphical update program, and
 	  how 
-	  <emphasis role="strong">Puplet</emphasis>works to provide
+	  <application>Puplet</application> 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
+		 <application>Puplet</application> 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
@@ -31,24 +31,24 @@
 		 <itemizedlist>
 			<listitem>
 			  <para>
-			  <emphasis>Refresh</emphasis>will check for new updates</para>
+			  <literal>Refresh</literal> will check for new updates</para>
 			</listitem>
 			<listitem>
 			  <para>
-			  <emphasis>View Updates</emphasis>launches 
-			  <emphasis role="strong">Pup</emphasis>and allows you to find
+			  <literal>View Updates</literal> launches 
+			  <application>Pup</application> 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>
+				 <literal>Apply Updates</literal>
 			  </para>
 			</listitem>
 			<listitem>
 			  <para>
-			  <emphasis>Quit</emphasis>closes 
-			  <emphasis role="strong">Puplet</emphasis>until the next time
+			  <literal>Quit</literal> closes 
+			  <application>Puplet</application> until the next time
 			  the system starts</para>
 			</listitem>
 		 </itemizedlist>
@@ -58,7 +58,7 @@
 		 <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
+		 <literal>Updates available</literal>. 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>
@@ -67,14 +67,14 @@
 		 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>
+		 <literal>Update Details</literal> text.</para>
 		 <para>Once satisfied with the package selection left click the 
-		 <emphasis>Apply Updates</emphasis>button. Pup checks for
+		 <guibutton>Apply Updates</guibutton> 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>
+		 <guibutton>Continue</guibutton> 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>


Index: update-with-yum.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/update-with-yum.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update-with-yum.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ update-with-yum.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -11,7 +11,7 @@
 ]>
 	<section id="sn-UpdateWithYum">
 	  <title>Updating Your System with 
-	  <code>yum</code></title>
+	  <application>yum</application></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>
@@ -19,7 +19,7 @@
 		 <command>su -c 'yum update'</command>
 	  </para>
 	  <para>At the prompt, enter the 
-	  <emphasis>root</emphasis>password.</para>
+	  <systemitem class="username">root</systemitem> password.</para>
 	  <para />
 	  <section id="sn-AutoUpdates">
 		 <title>Automatically Updating Your System</title>
@@ -32,7 +32,7 @@
 			/sbin/service yum-updatesd start'</command>
 		 </para>
 		 <para>At the prompt, enter the password for the 
-		 <emphasis>root</emphasis>account.</para>
+		 <systemitem class="username">root</systemitem> account.</para>
 	  </section>
 	</section>
 <!--


Index: yum-caching.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/yum-caching.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-caching.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ yum-caching.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -12,21 +12,21 @@
 	<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
+	  <application>yum</application> 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
+	  <application>yum</application> uses. You may enable caching, so that 
+	  <application>yum</application> 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>
+			<application>yum</application> increases</para>
 		 </listitem>
 		 <listitem>
 			<para>You may carry out 
-			<code>yum</code>operations without a network connection, by using
+			<application>yum</application> operations without a network connection, by using
 			only the caches</para>
 		 </listitem>
 		 <listitem>
@@ -35,19 +35,20 @@
 		 </listitem>
 	  </itemizedlist>
 	  <para>By default, 
-	  <code>yum</code>stores temporary files under the directory 
-	  <code>/var/cache/yum/</code>, with one subdirectory for each
+	  <application>yum</application> stores temporary files under the directory 
+	  <filename class="directory">/var/cache/yum/</filename>, with one subdirectory for each
 	  configured repository. The 
-	  <code>packages/</code>directory within each repository directory
+	  <filename class="directory">packages/</filename> directory within each repository directory
 	  holds the cached packages. For example, the directory 
-	  <code>/var/cache/yum/development/packages/</code>holds packages
+	  <filename
+     class="directory">/var/cache/yum/development/packages/</filename> holds packages
 	  downloaded from the development repository.</para>
 	  <note>
 		 <title role="strong">Clearing the 
-		 <code>yum</code>Caches</title>
+		 <application>yum</application> 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 
+		 <application>yum</application> caches to recover capacity. Refer to 
 		 <xref linkend="sn-YumCaching" />for information on clearing the
 		 caches.</para>
 	  </note>
@@ -56,20 +57,21 @@
 	  <section id="sn-EnablingCaches">
 		 <title>Enabling the Caches</title>
 		 <para>To configure 
-		 <code>yum</code>to retain downloaded files rather than discarding
+		 <application>yum</application> 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>
+		 <literal>keepcache</literal> option in 
+		 <filename>/etc/yum.conf</filename> to 
+		 <literal>1</literal>:</para>
+       <screen>
+         <![CDATA[keepcache=1
+       ]]>
+       </screen>
 		 <para>Refer to 
 		 <xref linkend="sn-CustomizingYum" />for more information on editing
 		 the 
-		 <code>yum</code>configuration file.</para>
+		 <application>yum</application> configuration file.</para>
 		 <para>Once you enable caching, every 
-		 <code>yum</code>operation may download package data from the
+		 <application>yum</application> 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
@@ -79,46 +81,46 @@
 	  <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
+		 <application>yum</application> command without a network connection, add the 
+		 <literal>-C</literal> option. This causes 
+		 <application>yum</application> 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
+		 <package>tsclient</package> without using a network connection, enter the
 		 command:</para>
 		 <para>
-			<code>su -c 'yum -C list tsclient'</code>
+			<command>su -c 'yum -C list tsclient'</command>
 		 </para>
 		 <para>Enter the password for the 
-		 <emphasis>root</emphasis>account when prompted.</para>
+		 <systemitem class="username">root</systemitem> 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
+			<application>yum</application> 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
+		 <application>yum</application> 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>
+			<command>su -c 'yum clean headers'</command>
 		 </para>
 		 <para>Run this command to remove all of the packages held in the
 		 caches:</para>
 		 <para>
-			<code>su -c 'yum clean packages'</code>
+			<command>su -c 'yum clean packages'</command>
 		 </para>
 		 <para>When using these commands, at the prompt, enter the password
 		 for the 
-		 <emphasis>root</emphasis>account.</para>
+		 <systemitem class="username">root</systemitem> 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>


Index: yum-proxy.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/en_US/yum-proxy.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- yum-proxy.xml	22 Jan 2008 03:34:05 -0000	1.2
+++ yum-proxy.xml	24 Jan 2008 03:18:03 -0000	1.3
@@ -12,42 +12,42 @@
 	<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
+	  <application>yum</application> accesses network repositories with HTTP. All 
+	  <application>yum</application> 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
+	  <application>yum</application> to use an FTP proxy server. The 
+	  <package>squid</package> package provides a proxy service for both HTTP/1.1
 	  and FTP connections.</para>
 	  <note>
 		 <title>Modifying 
-		 <code>yum</code>for Network Compatibility</title>
+		 <application>yum</application> 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
+		 <application>man</application> page for 
+		 <filename>yum.conf</filename> 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
+		 <application>yum</application> 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
+		 <application>yum</application> operations to use a proxy server, specify the proxy
 		 server details in 
-		 <code>/etc/yum.conf</code>. The proxy setting must specify the
+		 <filename>/etc/yum.conf</filename>. 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>
+		 <literal>proxy_username</literal> and 
+		 <literal>proxy_password</literal> settings.</para>
 		 <para>The settings below enable yum to use the proxy server 
-		 <code>mycache.mydomain.com</code>, connecting to port 3128, with
+		 <replaceable>mycache.mydomain.com</replaceable>, connecting to
+       port <replaceable>3128</replaceable>, with
 		 the username 
-		 <code>yum-user</code>and the password 
-		 <code>qwerty</code>.</para>
-		 <para />
+		 <replaceable>yum-user</replaceable> and the password 
+		 <replaceable>qwerty</replaceable>.</para>
 		 <screen>
 			<![CDATA[# The proxy server - proxy server:port number
 	proxy=http://mycache.mydomain.com:3128
@@ -56,19 +56,17 @@
 	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>
+			<literal>proxy=http://mycache.mydomain.com:3128/</literal></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
+			<filename>/etc/yum.conf</filename>, all users connect to the proxy server
 			with those details when using 
-			<code>yum</code>.</para>
+			<application>yum</application>.</para>
 		 </note>
 		 <para />
 	  </section>
@@ -76,10 +74,11 @@
 		 <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>
+		 <application>bash shell</application>, the profile is the file 
+		 <filename>~/.bash_profile</filename>. The settings below enable 
+		 <application>yum</application> to use the proxy server 
+		 <replaceable>mycache.mydomain.com</replaceable>, connecting to
+       port <replaceable>3128</replaceable>.</para>
 		 <para />
 		 <screen>
 			<![CDATA[# The Web proxy server used by this account
@@ -87,27 +86,25 @@
 	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>
+		 <replaceable>yum-user</replaceable> and the password 
+		 <replaceable>qwerty</replaceable>, 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>
+			<literal>http_proxy</literal> 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
+			<literal>http_proxy</literal> environment variable is also used by 
+			<application>curl</application> and other utilities. Although 
+			<application>yum</application> itself may use 
+			<literal>http_proxy</literal> in either upper-case or lower-case, 
+			<application>curl</application> requires the name of the variable to be in
 			lower-case.</para>
 		 </note>
 	  </section>




More information about the Fedora-docs-commits mailing list