desktop-up2date desktop-up2date-en.xml,1.5,1.6

[Stuart Ellis (elliss)]

Author: elliss

Update of /cvs/docs/desktop-up2date
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12886

Modified Files:
	desktop-up2date-en.xml 
Log Message:

- Updated for FC4 yum integration.



Index: desktop-up2date-en.xml
===================================================================
RCS file: /cvs/docs/desktop-up2date/desktop-up2date-en.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- desktop-up2date-en.xml	12 Jul 2005 00:11:33 -0000	1.5
+++ desktop-up2date-en.xml	12 Jul 2005 20:30:11 -0000	1.6
@@ -142,12 +142,26 @@
       </para>
 
       <para>
-        These repositories are also used by software management systems
-        like <command>yum</command> to install and update software. If
-        you configure <command>yum</command> to use additional
-        repositories then you should add these to
-        <command>up2date</command> as well.
+        Repositories are also used by other software management
+        utilities to install and update software. On &FC; &FCLOCALVER;
+        systems <command>up2date</command> uses the repositories that
+        are specified in the <command>yum</command> configuration files,
+        in addition to any other channels. The &FP; repositories are
+        automatically specified in the <command>yum</command>
+        configuration.
       </para>
+
+      <note>
+        <title>Previous Versions of &FC;</title>
+
+        <para>
+          The version of <application>up2date</application> on &FC; 3
+          and earlier systems is configured to use the &FP; repositories
+          with settings in the <application>up2date</application>
+          configuration file. These versions do not use the
+          <command>yum</command> configuration on the system.
+        </para>
+      </note>
     </section>
   </section>
 
@@ -456,6 +470,17 @@
       <indexterm>
         <primary>channels, removing</primary>
       </indexterm>
+      <important>
+        <title>Channels and <command>yum</command></title>
+
+        <para>
+          Repositories configured within <command>yum</command> are
+          automatically used by <application>up2date</application> on
+          &FC; &FCLOCALVER;. Manually add <command>yum</command>
+          repositories as channels on older versions of &FC;.
+        </para>
+      </important>
+
       <para>
         To add a new channel, add a new line to
         <filename>/etc/sysconfig/rhn/sources</filename>.