yum-software-management yum-software-management-en.xml,1.22,1.23

Paul W. Frields (pfrields) fedora-docs-commits at redhat.com
Sun Jul 24 17:28:27 UTC 2005


Author: pfrields

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

Modified Files:
	yum-software-management-en.xml 
Log Message:
More style editing, nearing completion...


Index: yum-software-management-en.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/yum-software-management-en.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- yum-software-management-en.xml	23 Jul 2005 20:47:23 -0000	1.22
+++ yum-software-management-en.xml	24 Jul 2005 17:28:24 -0000	1.23
@@ -232,7 +232,8 @@
     <section id="sn-about-repositories">
       <title>About Repositories</title>
       <indexterm>
-        <primary>repositories, defined</primary>
+        <primary>repositories</primary>
+	<secondary>defined</secondary>
       </indexterm>
       <para>
         A <firstterm>repository</firstterm> is a prepared directory or
@@ -387,8 +388,9 @@
             Package name with version number:
             <filename>tsclient-0.132-4</filename>
           </para>
-<!-- I'm pretty sure the release number is needed; feel free to check -->
-<!-- this. [PWF] -->
+<!-- In what instances is the release number not needed?  For many -->
+<!-- package updates, only the release number might change. Although it -->
+<!-- might be superfluous, it's never *bad* to include it, right? [PWF] -->
         </listitem>
         <listitem>
           <para>
@@ -600,32 +602,35 @@
       <title>Package Versions</title>
 
       <para>
-        Only the newest version of each package is displayed and used by
-        <command>yum</command>, unless you specify an older version of a
-        package.
+        The <command>yum</command> utility only displays and uses the
+	newest version of each package, unless you specify an older
+	version.
       </para>
     </note>
     <tip>
       <title>Downloads are Cached</title>
       <para>
-        Downloaded data files and packages are kept for reuse. You may
-        copy packages from the repository cache directories under
-        <filename>/var/cache/yum/</filename>, and use them elsewhere if
-        you wish. Removing a package from the cache does not affect the
-        copy of the software installed on your system.
+        The <command>yum</command> utility keeps Downloaded data files
+	and packages for reuse. You may copy packages from the
+	repository cache directories under
+	<filename>/var/cache/yum/</filename>, and use them elsewhere if
+	you wish. If you remove a package from the cache, you do not
+	affect the copy of the software installed on your system.
       </para>
     </tip>
     <section id="sn-yum-installing-withrepositories">
       <title>Installing New Software with <command>yum</command></title>
       <indexterm>
-        <primary>installing software with yum</primary>
+	<primary>installing software</primary>
+	<see>software, installing</see>
       </indexterm>
       <indexterm>
-        <primary>software, installing</primary>
+        <primary>software</primary>
+	<secondary>installing</secondary>
       </indexterm>
       <para>
         To install the package <filename>tsclient</filename>, enter the
-        command:
+	command:
       </para>
 <screen>
 <userinput>su -c 'yum install <replaceable>tsclient</replaceable>'</userinput>
@@ -653,12 +658,15 @@
         <title>New Services Require Activation</title>
 
         <para>
-          Installing a service does not activate or start it. To
-          configure a new service to run on bootup, choose <menuchoice>
-          <guimenu>Desktop</guimenu><guisubmenu>System
-          Settings</guisubmenu> <guisubmenu>Server Settings</guisubmenu>
-          <guimenuitem>Services</guimenuitem></menuchoice>, or use the
-          <command>chkconfig</command> command-line utility.
+          When you install a service, &FED; does not activate or start
+	  it. To configure a new service to run on bootup, choose
+	  <menuchoice>
+	    <guimenu>Desktop</guimenu>
+	    <guisubmenu>System Settings</guisubmenu> 
+	    <guisubmenu>Server Settings</guisubmenu>
+	    <guimenuitem>Services</guimenuitem>
+	  </menuchoice>, or use the <command>chkconfig</command>
+	  and <command>service</command> command-line utilities.
         </para>
       </important>
     </section>
@@ -666,10 +674,12 @@
     <section id="sn-yum-updating-withrepositories">
       <title>Updating Software with <command>yum</command></title>
       <indexterm>
-        <primary>updating software with yum</primary>
+	<primary>updating</primary>
+	<secondary>software packages</secondary>
       </indexterm>
       <indexterm>
-        <primary>software, updating</primary>
+        <primary>software</primary>
+	<secondary>updating</secondary>
       </indexterm>
       <para>
         To update the <filename>tsclient</filename> package to the
@@ -688,10 +698,9 @@
         <title>New Software Versions Require Reloading</title>
 
         <para>
-          If a piece of software is in use whilst it is updated then the
-          old version remains active until the software is next loaded.
-          Services are reloaded by restarting the service. Kernel
-          updates take effect the next time that the system is booted.
+          If a piece of software is in use when you update it, the old
+	  version remains active until the software is restarted. Kernel
+	  updates take effect when you reboot the system.
         </para>
       </important>
 
@@ -712,8 +721,8 @@
         <title>Updating the Entire System</title>
 
         <para>
-          To update all of the packages that make up your &FED; system,
-          use the commands described in
+          To update all of the packages on your &FED; system, use the
+	  commands described in
           <xref
       linkend="sn-updating-your-system"/>.
         </para>
@@ -723,20 +732,21 @@
     <section id="sn-yum-removing-software">
       <title>Removing Software with <command>yum</command></title>
       <indexterm>
-        <primary>removing software with yum</primary>
+        <primary>removing software</primary>
       </indexterm>
       <indexterm>
-        <primary>software, removing</primary>
+        <primary>software</primary>
+	<secondary>removing</secondary>
       </indexterm>
       <para>
         To remove software, <command>yum</command> examines your system
-        for both the specified software, and any other software that
-        must also be removed in order to safely uninstall it.
+        for both the specified software, and any software which claims
+        it as a dependency.
       </para>
 
       <para>
         To remove the <filename>tsclient</filename> package from your
-        system the full command is:
+        system, use the command:
       </para>
 <screen>
 <userinput>su -c 'yum remove <replaceable>tsclient</replaceable>'</userinput>
@@ -765,14 +775,16 @@
   <section id="sn-searching-packages">
     <title>Searching for Packages with <command>yum</command></title>
     <indexterm>
-      <primary>packages, locating</primary>
+      <primary>packages</primary>
+      <secondary>locating</secondary>
     </indexterm>
     <indexterm>
-      <primary>searching for packages</primary>
+      <primary>searching</primary>
+      <secondary>for packages</secondary>
     </indexterm>
     <para>
       Use the search features of <command>yum</command> to find software
-      that is available from the defined repositories, or is already
+      that is available from the configured repositories, or already
       installed on your system. Searches automatically include both
       installed and available packages.
     </para>
@@ -782,16 +794,16 @@
 
       <para>
         The <option>search</option> and <option>list</option> options of
-        <command>yum</command> are not case-sensitive. For example, a
-        query for <filename>palmpilot</filename> will automatically find
-        <filename>PalmPilot</filename> packages.
+	<command>yum</command> are not case-sensitive. A query for
+	<filename>palmpilot</filename> automatically finds
+	<filename>PalmPilot</filename> packages.
       </para>
     </note>
 
     <para>
       The format of the results depends upon the option. If the query
-      produces no information then no packages matching the criteria
-      have been found.
+      produces no information, there are no packages matching the
+      criteria.
     </para>
 
     <section id="sn-searching-packages-byname">
@@ -799,8 +811,8 @@
 
       <para>
         To search for a specific package by name, use the
-        <option>list</option> function. For example, to search for the
-        package <filename>tsclient</filename> the command would be:
+	<option>list</option> function. To search for the package
+	<filename>tsclient</filename>, use the command:
       </para>
 <screen>
 <userinput>su -c 'yum list <replaceable>tsclient</replaceable>'</userinput>
@@ -813,8 +825,8 @@
 
       <para>
         To make your queries more specific, add other package
-        attributes. For example, to search for version 0.132 of the
-        application the command would be:
+	attributes. To search for version 0.132 of the application, use
+	the command:
       </para>
 <screen>
 <userinput>su -c 'yum list <replaceable>tsclient-0.132</replaceable>'</userinput>
@@ -830,10 +842,10 @@
       </para>
 
       <para>
-        <option>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 PalmPilots, type:
+        The <option>search</option> 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 PalmPilots, type:
       </para>
 <screen>
 <userinput>su -c 'yum search <replaceable>PalmPilot</replaceable>'</userinput>
@@ -848,8 +860,8 @@
         The <option>provides</option> function checks both the files
         included in the packages and the functions that the software
         provides. This option requires <command>yum</command> to
-        download and read much larger index files than other types of
-        search.
+        download and read much larger index files than with the
+        <option>search</option> option.
       </para>
 
       <para>
@@ -860,25 +872,25 @@
 <userinput>su -c 'yum provides <replaceable>libneon</replaceable>'</userinput>
 </screen>
       <para>
-        To search for all packages that either provide an MTA (Mail
-        Transport Agent) service, or include files with
-        <filename>mta</filename> in their name:
+        To search for all packages that either provide a MTA (Mail
+	Transport Agent) service, or include files with
+	<filename>mta</filename> in their name:
       </para>
 <screen>
 <userinput>su -c 'yum provides <replaceable>MTA</replaceable>'</userinput>
 </screen>
       <para>
-        For each command, enter the password for the
-        <systemitem class="username">root</systemitem> account when
-        prompted.
+        For each command, at the prompt enter the password for the
+        <systemitem class="username">root</systemitem> account.
       </para>
       <tip>
         <title>Wildcards and Regular Expressions</title>
         <para>
           You may use the standard wildcard characters in search
-          criteria: <option>?</option> to represent any one character,
-          and <option>*</option> to mean any characters. Use Perl or
-          Python regular expressions to carry out more complex queries.
+	  criteria: <option>?</option> to represent any one character,
+	  and <option>*</option> to mean zero or more characters. Use
+	  Perl or Python regular expressions to carry out more complex
+	  queries.
         </para>
       </tip>
     </section>
@@ -887,19 +899,19 @@
       <title>Understanding Matches</title>
 
       <para>
-        When carrying out a search <command>yum</command> shows all of
-        the packages that match your criteria. Packages must meet the
-        terms of the search exactly to be considered matches, unless you
-        have used wildcards or a regular expression.
+        Searches with <command>yum</command> 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
+	wildcards or a regular expression.
       </para>
 
       <para>
-        For example, querying for <filename>shadowutils</filename> or
-        <filename>shadow-util</filename> would not produce the package
-        <filename>shadow-utils</filename>. This package would match and
-        be shown if the query was either
-        <filename>shadow-util?</filename> or
-        <filename>Shadow*</filename>.
+        For example, a search query for <filename>shadowutils</filename>
+	or <filename>shadow-util</filename> would not produce the
+	package <filename>shadow-utils</filename>. This package would
+	match and be shown if the query was either
+	<filename>shadow-util?</filename> or
+	<filename>Shadow*</filename>.
       </para>
     </section>
   </section>
@@ -907,26 +919,27 @@
   <section id="sn-updating-your-system">
     <title>Updating Your System with <command>yum</command></title>
     <indexterm>
-      <primary>updating, full system</primary>
+      <primary>updating</primary>
+      <secondary>full system</secondary>
     </indexterm>
     <indexterm>
-      <primary>yum, updating full system</primary>
+      <primary>yum</primary>
+      <secondary>updating full system</secondary>
     </indexterm>
     <para>
-      Use the <option>update</option> option to upgrade all of the
-      software on your &FED; system to the latest version with one
-      operation.
+      Use the <option>update</option> option to upgrade all of your
+      &FED; system software to the latest version with one operation.
     </para>
 
     <para>
-      To carry out a full system update, type this command:
+      To perform a full system update, type this command:
     </para>
 <screen>
 <userinput>su -c 'yum update'</userinput>
 </screen>
     <para>
-      Enter the <systemitem class="username">root</systemitem> password
-      when prompted.
+      At the prompt, enter the <systemitem
+	class="username">root</systemitem> password.
     </para>
 
     <section id="sn-automatic-updating">
@@ -936,16 +949,15 @@
       </indexterm>
       <para>
         The <filename>yum</filename> package supplied with &FC; includes
-        scripts to carry out full system updates every day. To activate
-        automatic daily updates, enter this command:
+	scripts to perform full system updates every day. To activate
+	automatic daily updates, enter this command:
       </para>
 <screen>
 <userinput>su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start'</userinput>
 </screen>
       <para>
-        Enter the password for the
-        <systemitem class="username">root</systemitem> account when
-        prompted.
+        At the prompt, enter the password for the
+        <systemitem class="username">root</systemitem> account.
       </para>
 
       <note>
@@ -953,12 +965,12 @@
 
         <para>
           There is no separate <command>yum</command> service that runs
-          on your system. The command given above enables the control
-          script <filename>/etc/rc.d/init.d/yum</filename>. This control
-          script activates the script
-          <filename>/etc/cron.daily/yum.cron</filename>, so that the
-          <command>cron</command> service will perform the system update
-          as one of the tasks that are automatically run each day.
+	  on your system. The command given above enables the control
+	  script <filename>/etc/rc.d/init.d/yum</filename>. This control
+	  script activates the script
+	  <filename>/etc/cron.daily/yum.cron</filename>, which causes
+	  the <command>cron</command> service to perform the system
+	  update automatically each day.
         </para>
       </note>
     </section>
@@ -970,10 +982,12 @@
       <primary>&FEX;</primary>
     </indexterm>
     <indexterm>
-      <primary>repositories, finding</primary>
+      <primary>repositories</primary>
+      <secondary>finding</secondary>
     </indexterm>
     <indexterm>
-      <primary>searching for repositories</primary>
+      <primary>searching</primary>
+      <secondary>for repositories</secondary>
     </indexterm>
     <para>
       &FED; systems automatically use the &FP; repositories. These
@@ -986,35 +1000,32 @@
 
       <para>
         You must manually configure &FED; 3 systems to use &FEX;, using
-        the instructions at:
-        <ulink url="http://fedora.redhat.com/projects/extras/">http://fedora.redhat.com/projects/extras/</ulink>.
-        Refer to this Website for additional packages for &FED; 1 and
-        &FED; 2:
-        <ulink url="http://www.fedora.us/">http://www.fedora.us/</ulink>.
+	the instructions at <ulink
+	  url="http://fedora.redhat.com/projects/extras/"/>. For
+	additional packages for &FED; 1 and &FED; 2, refer to <ulink
+	  url="http://www.fedora.us/"/>.
       </para>
     </note>
 
     <para>
-      If the &FP; does not provide packages for a specific piece of
-      software, the manufacturer of the software may provide or
-      recommend a separate repository. Members of the community also
-      maintain repositories to provide packages for &FED; systems.
-      Third-party repositories provide information on their Websites.
+      If the &FP; does not provide a specific software package, the
+      manufacturer of the software may provide or recommend a separate
+      repository. Members of the community also maintain repositories to
+      provide packages for &FED; systems. Third-party repositories
+      provide information on their web sites.
     </para>
 
     <section id="sn-adding-repositories">
       <title>Adding a Repository as a Package Source</title>
       <indexterm>
-        <primary>repositories, adding to yum</primary>
-      </indexterm>
-      <indexterm>
-        <primary>repository definition files, installing</primary>
+        <primary>repositories</primary>
+	<secondary>adding to yum</secondary>
       </indexterm>
       <para>
         To add an extra repository, place a definition file in the
         <filename>/etc/yum.repos.d/</filename> directory on your system.
         Package providers make the definition files for their
-        repositories available on their Websites.
+        repositories available on their web sites.
       </para>
       <tip>
         <title>Definition File Extension</title>
@@ -1024,39 +1035,39 @@
         </para>
       </tip>
       <para>
-        Adding a file to the definitions directory requires
-        <systemitem class="username">root</systemitem> access. To copy
-        the definition file <filename>example.repo</filename>, type the
-        command:
+        You must have <systemitem class="username">root</systemitem>
+	access to add a file to the definitions directory. To copy the
+	definition file <filename>example.repo</filename>, type this
+	command:
       </para>
 <screen>
 <userinput>su -c 'cp example.repo /etc/yum.repos.d/'</userinput>
 </screen>
       <para>
-        Enter the password for the
-        <systemitem class="username">root</systemitem> account when
-        prompted.
+        At the prompt, enter the password for the
+        <systemitem class="username">root</systemitem> account.
       </para>
 
       <para>
         The configuration file for each repository should include a
-        <command>gpgkey</command> setting to specify the location of the
-        public key that verifies the packages it provides. This public
-        key is automatically imported the first time that you install
-        software from the repository. If the configuration file provided
-        does not include this setting, refer to
-        <xref linkend="sn-authorizing-package-sources"/>.
+	<command>gpgkey</command> 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 you install software from the repository. If the
+	configuration file provided does not include this setting, refer
+	to <xref linkend="sn-authorizing-package-sources"/>.
       </para>
 
       <note>
         <title>Repositories and <application>up2date</application> Channels</title>
 
         <para>
-          On &FED; &FCLOCALVER; systems <command>yum</command>
-          repositories are automatically used as
-          <application>up2date</application> channels. Repositories must
-          be separately configured as channels on &FED; 3 and earlier
-          systems.
+          Starting with &FED; 4, <command>yum</command> repositories are
+	  automatically used as <application>up2date</application>
+	  channels. On &FED; 3 and earlier systems, you must manually
+	  configure <application>up2date</application> to use these
+	  channels.  To do so, edit the
+	  <filename>/etc/sysconfig/rhn/sources</filename> file.
         </para>
       </note>
     </section>
@@ -1064,28 +1075,29 @@
     <section id="sn-authorizing-package-sources">
       <title>Manually Authorizing Package Sources</title>
       <indexterm>
-        <primary>public keys, adding</primary>
+        <primary>public keys</primary>
+	<secondary>adding</secondary>
       </indexterm>
       <para>
         To manually add a public key to your <command>rpm</command>
-        keyring, use the <option>import</option> feature of the
-        <command>rpm</command> utility. For example, to import the file
-        <filename>GPG-PUB-KEY.asc</filename>, type the following:
+	keyring, use the <option>import</option> feature of the
+	<command>rpm</command> utility. To import the file
+	<filename>GPG-PUB-KEY.asc</filename>, type the following
+	command:
       </para>
 <screen>
 <userinput>su -c 'rpm --import <replaceable>GPG-PUB-KEY.asc</replaceable>'</userinput>
 </screen>
       <para>
-        Enter the password for the
-        <systemitem class="username">root</systemitem> account when
-        prompted.
+        At the prompt, enter the password for the
+        <systemitem class="username">root</systemitem> account.
       </para>
 
       <para>
-        You may also import public keys directly from a Website. For
+        You may also import public keys directly from a web site. For
         example, to import the file <filename>GPG-PUB-KEY.asc</filename>
-        on the website <wordasword>www.therepository.com</wordasword>
-        the command would be:
+        on the web site <wordasword>www.therepository.com</wordasword>
+        use this command:
       </para>
 <screen>
 <userinput>su -c 'rpm --import <replaceable>http://www.therepository.com/GPG-PUB-KEY.asc</replaceable>'</userinput>
@@ -1095,45 +1107,47 @@
     <section id="sn-compat-repositories">
       <title>Understanding Repository Compatibility</title>
       <indexterm>
-        <primary>packages, software compatibility</primary>
+        <primary>packages</primary>
+	<secondary>software compatibility</secondary>
       </indexterm>
       <indexterm>
-        <primary>repositories, compatibility</primary>
+        <primary>repositories</primary>
+	<secondary>compatibility</secondary>
       </indexterm>
       <para>
-        The &FEX; project provides packages that are built to the same
-        standards as the packages that are part of &FC;. Third-party
-        packages should be compatible with these official packages,
-        unless the provider specifically states otherwise.
+        The &FEX; project provides packages which are built to the same
+	standards as &FC; packages. Third-party packages should be
+	compatible with these official packages, unless the provider
+	specifically states otherwise.
       </para>
 
       <para>
-        Refer to the Website of the repository for information on
-        package compatibility before adding it as a package source.
-        Repositories often provide packages that are specifically
-        intended for use with packages that are supplied by other
-        repositories. In some cases separate third-party repository
-        providers may each offer different versions of the same
-        software, preventing those repositories from being safely used
-        together by your &FED; system.
+        Refer to the web site of the repository for information on
+	package compatibility before you add it as a package source.
+	Repositories often provide packages specifically intended for
+	use with packages supplied by other repositories. In some cases,
+	separate third-party repository providers may each offer
+	different versions of the same software. This situation may
+	prevent you from safely using those repositories together on
+	your &FED; system.
       </para>
 
       <para>
-        Packages that have been made for one version of &FED; are
-        usually not compatible with other versions of &FED;. The Website
-        of the provider should specifically state which versions of
-        &FED; they support.
+        Packages built for one version of &FED; are usually not
+	compatible with other versions of &FED;. The web site of the
+	provider should specifically state which versions of &FED; they
+	support.
       </para>
       <tip>
         <title>Old Versions of <command>yum</command> and Current Repositories</title>
         <para>
           The data format for repository indexes changed with version
-          2.11 of <command>yum</command>. This was the version supplied
-          with &FED; 3. Repository providers should specify the versions
-          of &FED; that they support. To confirm that an unlabeled
-          repository is compatible with current versions of
-          <command>yum</command>, check that it has a sub-directory
-          called <filename>repo-data/</filename>.
+	  2.1 of <command>yum</command>. This was the version supplied
+	  with &FED; 3. Repository providers should specify the versions
+	  of &FED; that they support. To confirm that an unlabeled
+	  repository is compatible with current versions of
+	  <command>yum</command>, check that it has a sub-directory
+	  called <filename>repodata/</filename>.
         </para>
       </tip>
     </section>
@@ -1145,53 +1159,65 @@
     <para>
       The <command>yum</command> system does not require any routine
       maintenance. To ensure that <command>yum</command> operations are
-      carried out at the best possible speed, disable or remove
-      repository definitions are no longer required. You may also clear
-      the files from the <command>yum</command> caches in order to
-      recover disk space.
+      carried out at optimal speed, disable or remove repository
+      definitions which you no longer require. You may also clear the
+      files from the <command>yum</command> caches in order to recover
+      disk space.
     </para>
 
     <section id="sn-removing-sources">
       <title>Disabling or Removing Package Sources</title>
       <indexterm>
-        <primary>repositories, disabling in yum</primary>
-      </indexterm>
-      <indexterm>
-        <primary>repositories, removing from yum</primary>
+        <primary>repositories</primary>
+	<secondary>disabling in yum</secondary>
       </indexterm>
       <indexterm>
-        <primary>repository definition files, removing</primary>
+        <primary>repositories</primary>
+	<secondary>removing from yum</secondary>
       </indexterm>
       <para>
         Set <command>enable=0</command> in a definition file to prevent
-        <command>yum</command> using that repository. Any definition
-        file with this setting is ignored.
+	<command>yum</command> from using that repository. The
+	<command>yum</command> utility ignores any definition file with
+	this setting.
       </para>
 
       <para>
         To completely remove access to a repository:
       </para>
-      <orderedlist>
-        <listitem>
+      <procedure>
+        <step>
           <para>
             Delete the relevant file from
-            <filename>/etc/yum.repos.d/</filename>.
+	    <filename>/etc/yum.repos.d/</filename>.
           </para>
-        </listitem>
-        <listitem>
+        </step>
+        <step>
           <para>
             Delete the cache directory from
-            <filename>/var/cache/yum/</filename>.
+	    <filename>/var/cache/yum/</filename>.
           </para>
-        </listitem>
-      </orderedlist>
+        </step>
+      </procedure>
+
+<!-- What with the "web of trust," removing GPG keys is not really -->
+<!-- something we should encourage. Having an extra GPG key in the RPM -->
+<!-- database is not a vulnerability, nor does it hamper the system in -->
+<!-- any way.  These are probably a couple of reasons Seth didn't build -->
+<!-- this function into yum as part of "clean all," for example.  Since -->
+<!-- we just had several admonitions against people running the rpm -->
+<!-- command on its own anyway, I would just omit this part -->
+<!-- completely. [PWF] -->
+
+<!--
+
       <important>
         <title>Remove Unneeded Public Keys</title>
 
         <para>
           If you will not be using any further packages from a provider,
-          remove their public key from the <command>rpm</command>
-          keyring using the procedure described in
+	  remove their public key from the <command>rpm</command>
+	  keyring using the procedure described in
           <xref linkend="sn-removing-publickeys" />.
         </para>
       </important>
@@ -1218,19 +1244,17 @@
 
       <example id="publickey-header-format">
         <title>Format of <command>rpm</command> Public Key Headers</title>
-<programlisting>
-      <![CDATA[
-Name        : gpg-pubkey                   Relocations: (not relocatable)
+<screen>
+<computeroutput>Name        : gpg-pubkey                   Relocations: (not relocatable)
 Version     : 4f2a6fd2                          Vendor: (none)
 Release     : 3f9d9d3b                      Build Date: Wed 15 Jun 2005 09:55:33 PM BST
 Install Date: Wed 15 Jun 2005 09:55:33 PM BST      Build Host: localhost
 Group       : Public Keys                   Source RPM: (none)
 Size        : 0                                License: pubkey
 Signature   : (none)
-Summary     : gpg(Fedora Project <fedora at redhat.com>)
-Description :
-      ]]>
-    </programlisting>
+Summary     : gpg(Fedora Project &lt;fedora at redhat.com&gt;)
+Description :</computeroutput>
+</screen>
       </example>
 
       <para>
@@ -1256,18 +1280,22 @@
         <systemitem class="username">root</systemitem> account when
         prompted.
       </para>
+
+-->
+
     </section>
 
     <section id="sn-yum-clearance">
       <title>Clearing the <command>yum</command> Caches</title>
       <indexterm>
-        <primary>yum, cleaning caches</primary>
+        <primary>yum</primary>
+	<secondary>cleaning caches</secondary>
       </indexterm>
       <para>
         By design, <command>yum</command> does not automatically delete
-        any of the packages or package data files that it downloads, so
-        that they may be reused in future operations. To purge the
-        header files, use the command:
+	any of the packages or package data files it downloads, so they
+	may be reused in future operations. To purge the header files,
+	use this command:
       </para>
 <screen>
 <userinput>su -c 'yum clean headers'</userinput>
@@ -1280,9 +1308,8 @@
 <userinput>su -c 'yum clean packages'</userinput>
 </screen>
       <para>
-        When using these commands, enter the password for the
-        <systemitem class="username">root</systemitem> account when
-        prompted.
+        When using these commands, at the prompt, enter the password for
+	the <systemitem class="username">root</systemitem> account.
       </para>
 
       <note>
@@ -1290,8 +1317,8 @@
 
         <para>
           Package management operations download header files and
-          packages as required, automatically replacing any deleted
-          files needed for the operation.
+	  packages as required, and automatically replace any deleted
+	  files needed for the operation.
         </para>
       </note>
     </section>
@@ -1302,10 +1329,13 @@
   <section id="sn-yum-installing-frompackage">
     <title>Manually Installing Software</title>
     <indexterm>
-      <primary>installing software with yum (from a package)</primary>
+      <primary>installing software</primary>
+      <secondary>from a package</secondary>
+      <see>software, installing from a package</see>
     </indexterm>
     <indexterm>
-      <primary>software, installing from a package</primary>
+      <primary>software</primary>
+      <secondary>installing from a package</secondary>
     </indexterm>
     <para>
       Use repositories and the standard <command>yum</command> commands
@@ -1322,28 +1352,28 @@
       <para>
         You must ensure that the public key for the package source has
         been imported before installing a package without a repository.
-        Refer to <xref linkend="sn-authorizing-package-sources"/>
+        Refer to <xref linkend="sn-authorizing-package-sources"/>.
       </para>
     </important>
 
     <para>
-      As an example, enter this command to install the package
+      Enter this command to install the package
       <filename>tsclient-0.132-4.i386.rpm</filename>:
     </para>
 <screen>
 <userinput>su -c 'yum localinstall <replaceable>tsclient-0.132-4.i386.rpm</replaceable>'</userinput>
 </screen>
     <para>
-      Enter the <systemitem class="username">root</systemitem> password
-      when prompted.
+      At the prompt, enter the <systemitem
+	class="username">root</systemitem> password.
     </para>
 
     <important>
-      <title>Dependencies Must Be Met</title>
+      <title>Meeting Dependencies</title>
 
       <para>
         You must ensure that all of the dependencies are already
-        installed on your system, as <command>yum</command> cannot
+        installed on your system,because <command>yum</command> cannot
         download additional packages to complete the installation when
         performing a <option>localinstall</option> operation.
       </para>
@@ -1353,103 +1383,101 @@
   <section id="sn-yum-proxy-server">
     <title>Using <command>yum</command> with a Proxy Server</title>
     <indexterm>
-      <primary>proxy server, with yum</primary>
+      <primary>proxy server</primary>
     </indexterm>
     <indexterm>
-      <primary>yum, using a proxy server</primary>
+      <primary>yum</primary>
+      <secondary>using with a proxy server</secondary>
     </indexterm>
     <para>
-      Repositories may be accessed through standard Web proxy servers.
-      If your system is connected to the Internet through a Web proxy
-      server, specify the details of the server in
-      <filename>/etc/yum.conf</filename>. The <command>proxy</command>
+      You may access Repositories through standard web proxy servers. If
+      your system is connected to the Internet through a web proxy
+      server, specify the proxy server details in
+      <filename>/etc/yum.conf</filename>. The <option>proxy</option>
       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
-      <command>proxy_username</command> and
-      <command>proxy_password</command> settings.
+      <option>proxy_username</option> and
+      <option>proxy_password</option> settings.
     </para>
 
     <para>
-      For example, the settings below enable <command>yum</command> to
-      use the proxy server <command>mycache.mydomain.com</command>,
-      connecting to port <command>3128</command>, with the username
-      <command>yum-user</command> and the password
-      <command>qwerty</command>.
+      The settings below enable <command>yum</command> to use the proxy
+      server <systemitem
+	class="systemname">mycache.mydomain.com</systemitem>, connecting
+      to port 3128, with the username <systemitem
+	class="username">yum-user</systemitem> and the password
+      <systemitem>qwerty</systemitem>.
     </para>
 
     <example id="config-file-httpproxy">
       <title>Configuration File Settings for Using A Proxy Server</title>
-<programlisting>
-       <![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
-       ]]>
-      </programlisting>
+<screen>
+<computeroutput># 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</computeroutput>
+</screen>
     </example>
 
     <note>
       <title>Global Settings</title>
 
       <para>
-        Defining a proxy server in <filename>/etc/yum.conf</filename>
-        means that <emphasis>all</emphasis> users connect to the proxy
-        server with those details when using <command>yum</command>.
+        If you define a proxy server in
+	<filename>/etc/yum.conf</filename>, <emphasis>all</emphasis>
+	users connect to the proxy server with those details when using
+	<command>yum</command>.
       </para>
     </note>
 
     <para>
       To enable proxy access for a specific user, add the lines in the
-      example box below to their shell profile. For the default
+      example box below to the user's shell profile. For the default
       <command>bash</command> shell, the profile is the file
-      <filename>.bash_profile</filename>. The settings below enable
-      <command>yum</command> to use the proxy server
-      <command>mycache.mydomain.com</command>, connecting to port
-      <command>3128</command>.
+      <filename>~/.bash_profile</filename>. The settings below enable
+      <command>yum</command> to use the proxy server <systemitem
+	class="systemname">mycache.mydomain.com</systemitem>, connecting
+      to port 3128.
     </para>
 
     <example id="profile-script-httpproxy">
       <title>Profile Settings for Using a Proxy Server</title>
-<programlisting>
-       <![CDATA[
-         # The Web proxy server used by this account
-         http_proxy="http://mycache.mydomain.com:3128"
-         export http_proxy
-       ]]>
-      </programlisting>
+<screen>
+<computeroutput># The Web proxy server used by this account
+http_proxy="http://mycache.mydomain.com:3128"
+export http_proxy</computeroutput>
+</screen>
     </example>
 
     <para>
-      If the proxy server requires a username and password then add
-      these to the URL. For example, to include the username
-      <command>yum-user</command> and the password
-      <command>qwerty</command>:
+      If the proxy server requires a username and password, add these to
+      the URL. To include the username
+      <systemitem class="username">yum-user</systemitem> and the password
+      <systemitem>qwerty</systemitem>, add these settings:
     </para>
 
     <example id="profile-script-httpproxy-withpassword">
       <title>Profile Settings for a Secured Proxy Server</title>
-<programlisting>
-       <![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
-       ]]>
-      </programlisting>
+<screen>
+<computeroutput># 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</computeroutput>
+</screen>
     </example>
 
     <note>
-      <title><command>http_proxy</command> Variable with Other Utilities</title>
+      <title>The <option>http_proxy</option> Environment
+	Variable</title>
 
       <para>
-        The <command>http_proxy</command> variable is also used by
-        <command>curl</command> and other utilities. Although
-        <command>yum</command> itself may use
-        <command>http_proxy</command> in either upper-case or
-        lower-case, <command>curl</command> requires the name of the
-        variable to be in lower-case.
+        The <command>http_proxy</command> environment variable is also
+	used by <command>curl</command> and other utilities. Although
+	<command>yum</command> itself may use
+	<command>http_proxy</command> in either upper-case or
+	lower-case, <command>curl</command> requires the name of the
+	variable to be in lower-case.
       </para>
     </note>
   </section>




More information about the docs-commits mailing list