yum-software-management yum-software-management-en.xml,1.14,1.15

[Stuart Ellis (elliss)]

Author: elliss

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

Modified Files:
	yum-software-management-en.xml 
Log Message:

- Added example public key header.
- Change example transaction to an <example>
- Removed superfluous paragraph from the Tools overview.



Index: yum-software-management-en.xml
===================================================================
RCS file: /cvs/docs/yum-software-management/yum-software-management-en.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- yum-software-management-en.xml	19 Jul 2005 02:36:04 -0000	1.14
+++ yum-software-management-en.xml	19 Jul 2005 19:42:22 -0000	1.15
@@ -1,4 +1,4 @@
- <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
 <!ENTITY % FEDORA-ENTITIES-EN SYSTEM "../docs-common/common/fedora-entities-en.ent">
@@ -110,8 +110,8 @@
         <para>
           You do not need to log in with the
           <systemitem class="username">root</systemitem> account in
-          order to manage your &FED; system. All of the commands shown in
-          this tutorial that require
+          order to manage your &FED; system. All of the commands shown
+          in this tutorial that require
           <systemitem class="username">root</systemitem> access will
           prompt you for the
           <systemitem class="username">root</systemitem> password. The
@@ -432,14 +432,6 @@
     </para>
 
     <para>
-      Both <application>up2date</application> and <command>yum</command>
-      are configured to use official &FED; repositories. If you add
-      other repositories to <command>yum</command> then for consistency
-      you should also configure <application>up2date</application> to
-      use them.
-    </para>
-
-    <para>
       Also included in &FC; is
       <application>system-config-packages</application>. From the main
       menu, this is <menuchoice><guimenu>System
@@ -543,8 +535,11 @@
       As an example, this is the transaction for installing
       <filename>tsclient</filename>:
     </para>
-<screen>
-<computeroutput>
+
+    <example id="yum-transaction-format">
+      <title>Format of <command>yum</command> Transaction Reports</title>
+<programlisting>
+      <![CDATA[
 =============================================================================
  Package                 Arch       Version          Repository        Size
 =============================================================================
@@ -560,8 +555,10 @@
 Remove       0 Package(s)
 Total download size: 355 k
 Is this ok [y/N]:
-</computeroutput>
-</screen>
+      ]]>
+    </programlisting>
+    </example>
+
     <para>
       Review the list of changes before pressing
       <userinput>y</userinput> to accept and begin the process. No
@@ -630,8 +627,8 @@
           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 run
-          <command>chkconfig</command> in a terminal window.
+          <guimenuitem>Services</guimenuitem></menuchoice>, or use the
+          <command>chkconfig</command> command-line utility.
         </para>
       </important>
     </section>
@@ -1162,11 +1159,34 @@
 <userinput>rpm -qi gpg-pubkey-*</userinput>
 </screen>
       <para>
-        The identification name for a key is
-        <option>gpg-pubkey-Version_number-Release_number</option>. For
-        example, the &FP; public key is currently version 4f2a6fd2,
-        release 3f9d9d3b. The <command>rpm</command> identification for
-        this key is <option>gpg-pubkey-4f2a6fd2-3f9d9d3b</option>.
+        Locate the heading for the relevant public key. The public key
+        headings follow this format:
+      </para>
+
+      <example id="publickey-header-format">
+        <title>Format of <command>rpm</command> Public Key Headers</title>
+<programlisting>
+      <![CDATA[
+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>
+      </example>
+
+      <para>
+        Add the <option>Version</option> and <option>Release</option>
+        attributes to <option>gpg-pubkey-</option> to make the complete
+        name of the key, in the form
+        <option>gpg-pubkey-Version_number-Release_number</option>. The
+        <command>rpm</command> identification for the &FP; public key
+        shown above is: <option>gpg-pubkey-4f2a6fd2-3f9d9d3b</option>.
       </para>
 
       <para>