From owner-svn-src-user@FreeBSD.ORG  Fri Oct 17 23:26:45 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AFE81106568A;
	Fri, 17 Oct 2008 23:26:45 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9B9C68FC16;
	Fri, 17 Oct 2008 23:26:45 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HNQjtR001046;
	Fri, 17 Oct 2008 23:26:45 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HNQjEe001031;
	Fri, 17 Oct 2008 23:26:45 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200810172326.m9HNQjEe001031@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Fri, 17 Oct 2008 23:26:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184005 - in user/edwin/releasenotes: .
	head/release/doc/en_US.ISO8859-1/relnotes
	head/release/doc/share/sgml releng-6.0/release/doc/share/sgml
	releng-6.1/release/doc/share/sgml releng-...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2008 23:26:45 -0000

Author: edwin
Date: Fri Oct 17 23:26:44 2008
New Revision: 184005
URL: http://svn.freebsd.org/changeset/base/184005

Log:
  This is an experiment.
  
  Contributed software, like the timezone database, is always imported,
  often a merge-from-vendor is done and most of the times it is MFCd
  into the latest branch and the branch before that.
  
  Updating the release note documentation is a thing which is sometimes
  done, sometimes done by a third person and sometimes not done at
  all.
  
  By creating a datafile to store the information about the software,
  its versions, its import dates, its MFV dates and its MFC dates, I
  hope that it will be easier for commiters (lazy bums as they are!)
  and re@ to make sure that the information about these updates is
  tracked and easy to be used to generate release notes.
  
  First steps:
  Create a copy of the release directories for the 6.x and higher
  releases and branches, adjust the article.sgml files 7.x and higher
  releases and branches.
  Create the right catalog for the contributed software entity.
  Create the configuration file and the beginning of a script to
  convert the configuration into a piece of information which can be
  used by the releasenote processing software.

Added:
  user/edwin/releasenotes/contrib-xmltoent.pl
  user/edwin/releasenotes/contrib.xml
Modified:
  user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile
  user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/edwin/releasenotes/head/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-6.0/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-6.1/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-6.2/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-6.3/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-6.4/release/doc/share/sgml/catalog
  user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/edwin/releasenotes/releng-7.0/release/doc/share/sgml/catalog
  user/edwin/releasenotes/stable-6/release/doc/share/sgml/catalog
  user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/edwin/releasenotes/stable-7/release/doc/share/sgml/catalog

Added: user/edwin/releasenotes/contrib-xmltoent.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/releasenotes/contrib-xmltoent.pl	Fri Oct 17 23:26:44 2008	(r184005)
@@ -0,0 +1,176 @@
+#!/usr/bin/perl -w
+
+use XML::Parser;
+use Data::Dumper;
+use strict;
+
+my @tree = ();
+my @values = ();
+my $treeindex = -1;
+
+my %branches = ();
+my %softwares = ();
+my $software = "";
+my $mfcbranch = "";
+my $swversion = "";
+
+my %releaseent = ();
+
+sub xml_start {
+	my $expat = shift;
+	my $element = shift;
+
+	$tree[++$treeindex] = $element;
+	while (defined (my $attribute = shift)) {
+		$values[$treeindex]{$attribute} = shift;
+	}
+
+	if ($element eq "software") {
+		$software = $values[$treeindex]{name};
+	}
+	if ($element eq "version") {
+		$softwares{$software}{versions}{$values[$treeindex]{version}} = {};
+		$swversion = $values[$treeindex]{version};
+	}
+	if ($element eq "mfc") {
+		$mfcbranch = $values[$treeindex]{branch};
+	}
+
+}
+
+sub xml_end {
+	my $expat = shift;
+	my $element = shift;
+
+	$values[$treeindex] = ();
+	$treeindex--;
+}
+
+sub xml_char {
+	my $expat = shift;
+	my $value = shift;
+
+	if ($tree[0] eq "freebsd") {
+		return if ($treeindex == 0);
+
+		if ($tree[1] eq "branches") {
+			return if ($treeindex == 1);
+
+			if ($tree[2] eq "branch") {
+				$branches{$values[$treeindex]{name}} = $value;
+				return;
+			}
+
+			return;
+		}
+
+		if ($tree[1] eq "softwares") {
+			return if ($treeindex == 1);
+
+			if ($tree[2] eq "software") {
+				return if ($treeindex == 2);
+
+				if ($tree[3] eq "desc") {
+					$softwares{$software}{desc} = ""
+						if (!defined $softwares{$software}{desc});
+					$softwares{$software}{desc} .= $value;
+					return;
+				}
+
+				if ($tree[3] eq "versions") {
+					return if ($treeindex == 3);
+
+					if ($tree[4] eq "version") {
+						return if ($treeindex == 4);
+
+						if ($tree[5] eq "import") {
+							$softwares{$software}{versions}{$swversion}{import} = $value;
+							return;
+						}
+						if ($tree[5] eq "mfv") {
+							$softwares{$software}{versions}{$swversion}{mfv} = $value;
+							return;
+						}
+						if ($tree[5] eq "desc") {
+							$softwares{$software}{versions}{$swversion}{desc} = ""
+								if (!defined $softwares{$software}{versions}{$swversion}{desc});
+							$softwares{$software}{versions}{$swversion}{desc} .= $value;
+							return;
+						}
+						if ($tree[5] eq "mfc") {
+							$softwares{$software}{versions}{$swversion}{mfc}{$mfcbranch} = $value;
+							return;
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+}
+
+my $p = new XML::Parser(
+	Handlers => {
+		Start   => \&xml_start,
+		End     => \&xml_end,
+		Char    => \&xml_char,
+	});
+$p->parsefile("../../../../../contrib.xml");
+
+{
+	my %r = (
+		"release.current"	=> 1,
+		"release.next"		=> 1,
+		"release.prev"		=> 1,
+		"release.branch"	=> 1,
+	);
+	open(FIN, "../../share/sgml/release.ent");
+	my @lines = <FIN>;
+	close(FIN);
+	chomp(@lines);
+
+	foreach my $line (@lines) {
+		if ($line =~ /<!ENTITY ([^ ]+) "([^\-]+).*">/) {
+			next if (!defined $r{$1});
+			$releaseent{$1} = $2;
+		}
+	}
+}
+
+#print Dumper(%branches);
+#print Dumper(%releaseent);
+#print Dumper(%softwares);
+
+#
+# If we are in -current, then release.current doesn't exist yet.
+# In that case copy all MFVs into MFC{release.branch}. The date
+# of the new MFC is the date of the release.prev.
+#
+# release.current is then assigned with release.branch.
+#
+# the creation date of branches{release.current} will be
+# branches{release.prev}
+#
+if (!defined $branches{$releaseent{"release.current"}}) {
+	foreach my $sw (keys(%softwares)) {
+		foreach my $vs (keys(%{$softwares{$sw}{versions}})) {
+			next if (!defined $softwares{$sw}{versions}{$vs}{mfv});
+			$softwares{$sw}{versions}{$vs}{mfc}{$releaseent{"release.branch"}} = $softwares{$sw}{versions}{$vs}{mfv};
+		}
+	}
+
+	$releaseent{"release.current"} = $releaseent{"release.branch"};
+	$branches{$releaseent{"release.current"}} =
+		$branches{$releaseent{"release.prev"}}
+
+}
+
+#
+# Find all MFVs which are done in the time that 
+#
+
+
+print Dumper(%branches);
+print Dumper(%releaseent);
+#print Dumper(%softwares);

Added: user/edwin/releasenotes/contrib.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/releasenotes/contrib.xml	Fri Oct 17 23:26:44 2008	(r184005)
@@ -0,0 +1,278 @@
+<freebsd>
+  <branches>
+    <branch name="7">2007-10-11</branch>
+    <branch name="7.0">2007-12-22</branch>
+    <branch name="6">2005-07-11</branch>
+    <branch name="6.0">2005-10-09</branch>
+    <branch name="6.1">2006-04-30</branch>
+    <branch name="6.2">2006-11-14</branch>
+    <branch name="6.3">2007-10-24</branch>
+    <branch name="6.4">2008-10-02</branch>
+  </branches>
+
+  <softwares>
+    <software name="less">
+      <desc><![CDATA[
+	<para><application>less</application> has been updated from
+	      %v1% to %v2%.</para>
+      ]]></desc>
+
+      <versions>
+	<version version="v416">
+	  <import>2007-11-26</import>
+	  <mfv>2007-11-26</mfv>
+	  <mfc branch="7">2007-12-05</mfc>
+	  <mfc branch="6">2007-12-05</mfc>
+	</version>
+	<version version="v415">
+	  <import>2007-11-17</import>
+	  <mfv>2007-11-17</mfv>
+	</version>
+	<version version="v409">
+	  <import>2007-10-13</import>
+	  <mfv>2007-10-13</mfv>
+	  <mfc branch="7">2007-10-18</mfc>
+	  <mfc branch="6">2007-10-16</mfc>
+	</version>
+	<version version="v408">
+	  <import>2007-10-09</import>
+	  <mfv>2007-10-09</mfv>
+	  <mfc branch="6">2007-10-12</mfc>
+	</version>
+	<version version="v406">
+	  <import>2007-06-21</import>
+	  <mfv>2007-06-21</mfv>
+	  <mfc branch="6">2007-07-03</mfc>
+	</version>
+	<version version="v403">
+	  <import>2007-06-04</import>
+	  <mfv>2007-06-04</mfv>
+	</version>
+	<version version="v394">
+	  <import>2006-08-21</import>
+	  <mfv>2006-08-21</mfv>
+	  <mfc branch="6">2006-08-30</mfc>
+	</version>
+	<version version="v381">
+	  <import>2004-04-17</import>
+	  <mfv>2004-04-17</mfv>
+	</version>
+	<version version="v371">
+	  <import>2002-01-08</import>
+	  <mfv>2002-01-08</mfv>
+	</version>
+	<version version="v357">
+	  <import>2000-07-14</import>
+	  <mfv>2000-07-14</mfv>
+	</version>
+	<version version="v354">
+	  <import>2000-05-22</import>
+	</version>
+      </versions>
+    </software>
+
+    <software name="tzdata">
+      <desc><![CDATA[
+	  <para>The timezone database has been updated from
+	  the <application>%v1%</application> release to the
+	  <application>%v2%</application> release.</para>
+      ]]></desc>
+
+      <versions>
+	<version version="tzdata2008h">
+	  <import>2008-10-14</import>
+	  <mfv>2008-10-14</mfv>
+	  <mfc branch="7">2008-10-14</mfc>
+	  <mfc branch="6">2008-10-14</mfc>
+	  <mfc branch="6.4">2008-10-14</mfc>
+	</version>
+	<version version="tzdata2008g">
+	  <import>2008-10-14</import>
+	  <mfv>2008-10-14</mfv>
+	  <mfc branch="7">2008-10-14</mfc>
+	  <mfc branch="6">2008-10-14</mfc>
+	  <mfc branch="6.4">2008-10-14</mfc>
+	</version>
+	<version version="tzdata2008f">
+	  <import>2008-09-16</import>
+	  <mfv>2008-09-16</mfv>
+	  <mfc branch="7">2008-09-16</mfc>
+	  <mfc branch="6">2008-09-16</mfc>
+	</version>
+	<version version="tzdata2008e">
+	  <import>2008-08-08</import>
+	  <mfv>2008-08-08</mfv>
+	  <mfc branch="7">2008-08-08</mfc>
+	  <mfc branch="6">2008-08-15</mfc>
+	</version>
+	<version version="tzdata2008d">
+	  <import>2008-08-08</import>
+	  <mfv>2008-08-08</mfv>
+	  <mfc branch="7">2008-08-08</mfc>
+	  <mfc branch="6">2008-08-15</mfc>
+	</version>
+	<version version="tzdata2008c">
+	  <import>2008-08-08</import>
+	  <mfv>2008-08-08</mfv>
+	  <mfc branch="7">2008-08-08</mfc>
+	  <mfc branch="6">2008-08-15</mfc>
+	</version>
+	<version version="tzdata2008b">
+	  <import>2008-03-25</import>
+	  <mfv>2008-08-08</mfv>
+	  <mfc branch="7">2008-03-25</mfc>
+	  <mfc branch="6">2008-03-25</mfc>
+	</version>
+	<version version="tzdata2008a">
+	  <import>2008-03-09</import>
+	  <mfv>2008-03-09</mfv>
+	  <mfc branch="7">2008-03-09</mfc>
+	  <mfc branch="6">2008-03-09</mfc>
+	</version>
+	<version version="tzdata2007k">
+	  <import>2008-01-01</import>
+	  <mfv>2008-01-01</mfv>
+	  <mfc branch="7">2008-01-06</mfc>
+	  <mfc branch="6">2008-01-06</mfc>
+	  <mfc branch="6.3">2008-01-06</mfc>
+	</version>
+	<version version="tzdata2007j">
+	  <import>2007-12-04</import>
+	  <mfv>2007-12-04</mfv>
+	</version>
+	<version version="tzdata2007i">
+	  <import>2007-11-04</import>
+	  <mfv>2007-11-04</mfv>
+	</version>
+	<version version="tzdata2007h">
+	  <import>2007-10-09</import>
+	  <mfv>2007-10-09</mfv>
+	  <mfc branch="6">2007-10-18</mfc>
+	</version>
+	<version version="tzdata2007g">
+	  <import>2007-08-24</import>
+	  <mfv>2007-08-24</mfv>
+	  <mfc branch="6">2007-09-02</mfc>
+	</version>
+	<version version="tzdata2007f">
+	  <import>2007-05-21</import>
+	  <mfv>2007-05-21</mfv>
+	</version>
+	<version version="tzdata2006n">
+	  <import>2006-05-11</import>
+	  <mfv>2006-05-21</mfv>
+	  <mfc branch="6">2006-10-16</mfc>
+	</version>
+	<version version="tzdata2006g">
+	  <import>2006-05-11</import>
+	  <mfv></mfv>
+	  <mfc branch="6">2005-05-11</mfc>
+	</version>
+	<version version="tzdata2005r">
+	  <import>2005-12-27</import>
+	  <mfv>2005-12-27</mfv>
+	  <mfc branch="6">2005-12-27</mfc>
+	</version>
+	<version version="tzdata2005q">
+	  <import>2005-12-22</import>
+	  <mfv>2005-12-22</mfv>
+	  <mfc branch="6">2005-12-22</mfc>
+	</version>
+	<version version="tzdata2005m">
+	  <import>2005-08-26</import>
+	  <mfv>2005-08-29</mfv>
+	  <mfc branch="6">2005-12-22</mfc>
+	</version>
+	<version version="tzdata2005l">
+	  <import>2005-08-26</import>
+	  <mfv>2005-08-27</mfv>
+	  <mfc branch="6">2005-12-22</mfc>
+	</version>
+	<version version="tzdata2004g">
+	  <import>2004-12-03</import>
+	  <mfv>2004-12-03</mfv>
+	  <mfc branch="6">2004-12-02</mfc>
+	</version>
+	<version version="tzdata2004e">
+	  <import>2004-10-18</import>
+	  <mfv>2004-10-18</mfv>
+	</version>
+	<version version="tzdata2003d">
+	  <import>2003-10-14</import>
+	  <mfv>2003-10-15</mfv>
+	</version>
+	<version version="tzdata2003a">
+	  <import>2003-04-28</import>
+	  <mfv>2003-04-29</mfv>
+	</version>
+	<version version="tzdata2002d">
+	  <import>2002-10-16</import>
+	  <mfv>2002-10-16</mfv>
+	</version>
+	<version version="tzdata2002c">
+	  <import>2002-04-04</import>
+	  <mfv>2002-04-05</mfv>
+	</version>
+	<version version="tzdata2001d">
+	  <import>2001-11-10</import>
+	  <mfv>2001-11-10</mfv>
+	</version>
+	<version version="tzdata2001b">
+	  <import>2001-04-06</import>
+	  <mfv>2001-04-07</mfv>
+	</version>
+	<version version="tzdata2000g">
+	  <import>2000-10-25</import>
+	  <mfv>2000-10-26</mfv>
+	</version>
+	<version version="tzdata2000f">
+	  <import>2000-03-29</import>
+	  <mfv>2000-08-11</mfv>
+	</version>
+	<version version="tzdata2000d">
+	  <import>2000-03-29</import>
+	  <mfv>2000-03-30</mfv>
+	</version>
+	<version version="tzdata1999b">
+	  <import>1999-02-02</import>
+	  <mfv>1999-02-03</mfv>
+	</version>
+	<version version="tzdata1999a">
+	  <import>1999-01-21</import>
+	  <mfv>1999-01-22</mfv>
+	</version>
+	<version version="tzdata1997i">
+	  <import>1997-10-25</import>
+	  <mfv>1997-10-26</mfv>
+	</version>
+	<version version="tzdata1996n">
+	  <import>1996-12-02</import>
+	</version>
+	<version version="tzdata1996l">
+	  <import>1996-12-02</import>
+	  <mfv></mfv>
+	</version>
+	<version version="tzdata96i">
+	  <import>1996-11-19</import>
+	  <mfv></mfv>
+	</version>
+	<version version="tzdata96d">
+	  <import>1996-07-17</import>
+	  <mfv></mfv>
+	</version>
+	<version version="tzdata96c">
+	  <import>1996-03-02</import>
+	  <mfv>1996-03-03</mfv>
+	</version>
+	<version version="tzdata95e">
+	  <import>1995-08-04</import>
+	  <mfv></mfv>
+	</version>
+	<version version="tzdata94f">
+	  <import>1994-09-13</import>
+	  <mfv></mfv>
+	</version>
+      </versions>
+    </software>
+  </softwares>
+</freebsd>

Modified: user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile
==============================================================================
--- user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile	Fri Oct 17 23:26:44 2008	(r184005)
@@ -18,6 +18,12 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.sgml
 
+# Contributed software
+SRCS+= contrib.ent
+
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl
+
 URL_RELPREFIX?=	../../../..
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"

Modified: user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:26:44 2008	(r184005)
@@ -5,6 +5,9 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 
+<!ENTITY % contrib PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN">
+%contrib;
+
 <!-- Text constants which probably don't need to be changed.-->
 
 <!ENTITY % include.historic "IGNORE">
@@ -420,6 +423,12 @@
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para role="merged"><application>AMD</application> has been updated from 6.0.10
       to 6.1.5.</para>

Modified: user/edwin/releasenotes/head/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/head/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/head/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,10 +6,11 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
        "../../en_US.ISO8859-1/share/sgml/release.dsl"
-
-

Modified: user/edwin/releasenotes/releng-6.0/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-6.0/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-6.0/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/releng-6.1/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-6.1/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-6.1/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/releng-6.2/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-6.2/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-6.2/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/releng-6.3/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-6.3/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-6.3/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/releng-6.4/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-6.4/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-6.4/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:26:44 2008	(r184005)
@@ -5,6 +5,9 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 
+<!ENTITY % contrib PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN">
+%contrib;
+
 <!-- Text constants which probably don't need to be changed.-->
 
 <!-- The marker for MFCs. -->
@@ -1455,6 +1458,12 @@ mdconfig_md1="-t vnode -f /var/foo.img"<
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>Intel ACPI-CA</application>
       has been updated to 20070320.</para>

Modified: user/edwin/releasenotes/releng-7.0/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/releng-7.0/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/releng-7.0/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/stable-6/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/stable-6/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/stable-6/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"
 

Modified: user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Fri Oct 17 23:26:44 2008	(r184005)
@@ -5,6 +5,9 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 
+<!ENTITY % contrib PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN">
+%contrib;
+
 <!-- Text constants which probably don't need to be changed.-->
 
 <!ENTITY % include.historic "IGNORE">
@@ -261,6 +264,12 @@
 
   <sect2 id="contrib">
     <title>Contributed Software</title>
+    &contrib.softwares;
+
+  </sect2>
+
+  <sect2 id="excontrib">
+    <title>Expected Contributed Software</title>
 
     <para><application>AMD</application> has been updated from 6.0.10
       to 6.1.5.</para>

Modified: user/edwin/releasenotes/stable-7/release/doc/share/sgml/catalog
==============================================================================
--- user/edwin/releasenotes/stable-7/release/doc/share/sgml/catalog	Fri Oct 17 23:23:50 2008	(r184004)
+++ user/edwin/releasenotes/stable-7/release/doc/share/sgml/catalog	Fri Oct 17 23:26:44 2008	(r184005)
@@ -6,6 +6,9 @@
 PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
        "release.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES Release Contrib Set//EN"
+	"../../en_US.ISO8859-1/relnotes/contrib.ent"
+
 PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN"
        "release.dsl"