readme/devel/en_US README.xml,1.1,1.2 rpm-info.xml,1.1,1.2

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/readme/devel/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23003/en_US

Modified Files:
	README.xml rpm-info.xml 
Log Message:
Update content of XML for README module, making appropriate changes for F7 hopefully


Index: README.xml
===================================================================
RCS file: /cvs/docs/readme/devel/en_US/README.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.xml	27 Jan 2007 22:03:45 -0000	1.1
+++ README.xml	5 Apr 2007 13:31:01 -0000	1.2
@@ -13,8 +13,8 @@
 <!ENTITY FORMAL-RHI "&RH;, Inc."> <!-- Formal version -->
 <!ENTITY NAME "Fedora"> <!-- The project's (and software's) basic name -->
 <!ENTITY PROJ "&NAME; Project"> <!-- The project's name -->
-<!ENTITY DISTRO "&NAME; Core"> <!-- The software's name -->
-<!ENTITY DISTROVER "6"> <!-- The software's version -->
+<!ENTITY DISTRO "&NAME;"> <!-- The software's name -->
+<!ENTITY DISTROVER "7"> <!-- The software's version -->
 
 ]>
 
@@ -27,7 +27,7 @@
     </copyright>
     <legalnotice id="legalnotice">
       <para>
-        The contents of this CD-ROM are Copyright © 2006
+        The contents of this CD-ROM are Copyright © 2007
         &FORMAL-RHI; and others. Refer to the End User License Agreement
         and individual copyright notices in each source package for
         distribution terms.
@@ -97,18 +97,17 @@
       <!-- <remark os="test">(x86)</remark> -->
 <computeroutput>
 /mnt/cdrom
-  |----> Fedora
-  |        |----> RPMS         -- binary packages
-  |        `----> base         -- information on this release of Fedora
-  |                               Core used by the installation process
+  |----> Fedora                -- binary packages
+  |        `----> base         -- information on this release of &DISTRO;
+  |                               used by the installation process
   |----> images                -- boot and driver disk images
   |----> isolinux              -- files necessary to boot from CD-ROM
   |----> repodata              -- repository information used by the 
   |                               installation process
   |----> README                -- this file
   |----> RELEASE-NOTES         -- the latest information about this release
-  |                               of Fedora Core
-  `----> RPM-GPG-KEY           -- GPG signature for packages from Red Hat
+  |                               of &DISTRO;
+  `----> RPM-GPG-KEY           -- GPG signature for packages from &RH;
 </computeroutput>
     </screen>
 <!-- repetitive for the moment
@@ -116,16 +115,15 @@
       <remark os="test">(x86_64)</remark>
 <computeroutput>
 /mnt/cdrom
-  |- - - -> Fedora
-  |        |- - - -> RPMS         - - binary packages
-  |        `- - - -> base         - - information on this release of Fedora
-  |                               Core used by the installation process
+  |- - - -> Fedora                - - binary packages
+  |        `- - - -> base         - - information on this release of &DISTRO;
+  |                               used by the installation process
   |- - - -> images                - - boot disk ISO image
   |- - - -> isolinux              - - files necessary to boot from CD-ROM
   |- - - -> README                - - this file
   |- - - -> RELEASE-NOTES         - - the latest information about this release
-  |                               of Fedora Core
-  `- - - -> RPM-GPG-KEY           - - GPG signature for packages from Red Hat
+  |                               of &DISTRO;
+  `- - - -> RPM-GPG-KEY           - - GPG signature for packages from &RH;
 </computeroutput>
   </screen>
     -->
@@ -238,19 +236,18 @@
     <para>
       For those that have web access, see
       <ulink
-        url="http://fedora.redhat.com">http://fedora.redhat.com</ulink>.
+        url="http://fedoraproject.org/"/>.
       In particular, access to &PROJ; mailing lists can be found at:
     </para>
 
     <para>
-      <ulink
-    url="https://listman.redhat.com/mailman/listinfo/">https://listman.redhat.com/mailman/listinfo/</ulink>
+      <ulink url="https://listman.redhat.com/mailman/listinfo/"/>
     </para>
 
     <para>
       The complete &NAME; Installation Guide is available at
       <ulink
-	url="http://fedora.redhat.com/docs/" />.
+	url="http://docs.fedoraproject.org/" />.
     </para>
   </section>
 
@@ -294,17 +291,19 @@
     <itemizedlist>
       <listitem>
         <para>
-          <guilabel>Product:</guilabel> &DISTRO;
+          <guilabel>Product:</guilabel>
+          <wordasword>&DISTRO;</wordasword>
         </para>
       </listitem>
       <listitem>
         <para>
-          <guilabel>Version:</guilabel> "devel"
+          <guilabel>Version:</guilabel> <wordasword>devel</wordasword>
         </para>
       </listitem>
       <listitem>
         <para>
-          <guilabel>Component:</guilabel> fedora-release
+          <guilabel>Component:</guilabel>
+          <wordasword>fedora-release-notes</wordasword>
         </para>
       </listitem>
       <listitem>


Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/readme/devel/en_US/rpm-info.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-info.xml	27 Jan 2007 22:03:45 -0000	1.1
+++ rpm-info.xml	5 Apr 2007 13:31:01 -0000	1.2
@@ -12,12 +12,16 @@
     <version>1.0</version>
   </license>
   <copyright>
-    <year>2006</year>
+    <year>2007</year>
     <holder>Red Hat, Inc. and others</holder>
   </copyright>
-  <title>Fedora Core README</title>
+  <title>Fedora README</title>
   <desc>General information for CD and DVD media</desc>
   <changelog order="newest-first">
+    <revision date="2007-04-04" number="6.93">
+      <author worker="PaulWFrields"/>
+      <details>Update for Fedora 7, in time for test4 release</details>
+    </revision>
     <revision date="2007-01-27" number="6.91">
       <author worker="PaulWFrields"/>
       <details>Break into independent module</details>