The Katamari is dead! Long live the Katamari!

I come not to praise the Katamari, but to bury it...

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

2 files changed, 16 insertions, 15 deletions

diff --git a/general/README.xml b/general/README.xml
index 3129720..d5bad5f 100644
--- a/general/README.xml
+++ b/general/README.xml
@@ -52,7 +52,7 @@ issues, fixes for driver bugs, and fixes that improve stability.
 <![ %minorrel [
 -->
 <para>
-X11R&relvers; is the &whichfullrel; release in the X11R&majorvers; series.
+X11R&relvers; was the &whichfullrel; release in the X11R&majorvers; series.
 </para>
 <!--
 ]]>
@@ -284,11 +284,11 @@ mirrors of this server.
 <title>X11R&relvers;</title>
 
 <para>
-This is the &whichfullrel; release of the new modular source code tree.  The
-source code has been split into nine logical modules: app, data, doc,
+X11R&relvers; was the &whichfullrel; release of the modular source code tree.
+The source code has been split into nine logical modules: app, data, doc,
 driver, font, lib. proto, util and xserver.  Each of these modules
 contain one or more packages that can be configured, built and installed
-separately.  Please see an X11R&relvers; release site for a complete
+separately.  Please see an X.Org release site for a complete
 list of the tarballs.
 </para>
 
diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index 4ec3290..f5e3db8 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -34,18 +34,16 @@
     <title>Introduction to the X11R&relvers; Release</title>
 
     <para>
-      This release is the &whichfullrel; modular release of the
+      X11R&relvers; was the &whichfullrel; modular release of the
       <productname>X Window System</productname>.
-      The next full release will be X11R&nextrelvers; and is expected in
-      &nextfullreldate;.
     </para>
 
     <para>
-      Unlike X11R1 through X11R6.9, X11R7.x releases are not built from one
+      Unlike X11R1 through X11R6.9, X11R7.x releases were not built from one
       monolithic source tree, but many individual modules.   These modules
       are distributed as individual source code releases, and each one is
       released when it is ready, instead of only when the overall window
-      system is ready for release.  The X11R7.x releases are made by
+      system is ready for release.  The X11R7.x releases were made by
       &ldquo;rolling up&rdquo; the individual module releases into a
       collection that is often affectionately called the
       &ldquo;<foreignphrase>katamari</foreignphrase>&rdquo; by the developers.
@@ -73,10 +71,13 @@
       announcements of individual module updates on the <ulink
 	url="https://lists.x.org/mailman/listinfo/xorg-announce"
 	>xorg-announce mailing list</ulink> and update to those as needed.
-      The X.Org Foundation currently releases the X Window System
-      katamari releases approximately once a year, but many modules,
-      especially the X servers and drivers, are updated more frequently
-      between those releases.
+    </para>
+
+    <para>
+      There are no plans for any further
+      &ldquo;<foreignphrase>katamari</foreignphrase>&rdquo; releases of the
+      X Window System at this time, only releases of the individual modules
+      are planned for now.
     </para>
 
     <para>
@@ -106,7 +107,7 @@ were based on X version 10.  The MIT X Consortium and its successors,
 the X Consortium, the Open Group X Project Team, and the X.Org Group
 released versions X11R3 through X11R6.6.  Since the founding of the
 X.Org Foundation in early 2004, many further releases have been
-issued, from X11R6.7 to the current &relvers;.
+issued, from X11R6.7 to the current module releases.
 </para>
 
 <para>
@@ -117,7 +118,7 @@ as well as what is new in the latest full release (&fullrelvers;).
 ]]>
 <![ %majorrel [
 -->
-The next section describes what is new in the latest full release
+The next section describes what was new in the last full release
 (&relvers;) compared with the previous full release
 (&prevrelvers;).
 <!--