From owner-freebsd-doc@FreeBSD.ORG  Wed Dec 29 19:24:52 2004
Return-Path: <owner-freebsd-doc@FreeBSD.ORG>
Delivered-To: freebsd-doc@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2989816A4CE; Wed, 29 Dec 2004 19:24:52 +0000 (GMT)
Received: from smtp.eos.ocn.ne.jp (eos.ocn.ne.jp [222.146.51.150])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DDE8843D31; Wed, 29 Dec 2004 19:24:50 +0000 (GMT)
	(envelope-from hrs@FreeBSD.org)
Received: from localhost (p4157-adsau12honb4-acca.tokyo.ocn.ne.jp
	[220.97.141.157])	by smtp.eos.ocn.ne.jp (Postfix) with ESMTP
	id 3E5D82E7B; Thu, 30 Dec 2004 04:24:49 +0900 (JST)
Date: Thu, 30 Dec 2004 04:20:43 +0900 (JST)
Message-Id: <20041230.042043.39204756.hrs@eos.ocn.ne.jp>
To: doc@FreeBSD.org
From: Hiroki Sato <hrs@FreeBSD.org>
In-Reply-To: <20041125.122506.74752880.hrs@eos.ocn.ne.jp>
References: <20041123.043553.131911200.hrs@eos.ocn.ne.jp>
	<20041125005714.GA12863@sumuk.de>
	<20041125.122506.74752880.hrs@eos.ocn.ne.jp>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 4.1.53 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart0(Thu_Dec_30_04_20_43_2004_785)--"
Content-Transfer-Encoding: 7bit
cc: hrs@FreeBSD.org
Subject: Re: orig/trans automatic selection patch for
 news/{newsflash,press}.html
X-BeenThere: freebsd-doc@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-doc>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Help: <mailto:freebsd-doc-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-doc>,
	<mailto:freebsd-doc-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Dec 2004 19:24:52 -0000

----Security_Multipart0(Thu_Dec_30_04_20_43_2004_785)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Thu_Dec_30_04_20_43_2004_772)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Thu_Dec_30_04_20_43_2004_772)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi all,

 The revised version of the news item selection patch for www/{de,en,fr,ja,ru}
 is attached.  With this patch, index.html, news/newsflash.html, and
 news/press.html include the latest news items in English when the
 translation of them are not available.  Note that this replacement
 will be performed in per day basis; when there are multiple items in a day
 and the translated entry has only one of them, for example, the translated
 one will appear as the news item of the day and the rest which are not
 translated will be silently ignored.

 Please test the attached patch and let me know if you notice any problems.
 If there is no objection I will commit it in a few days.  Thanks.

-- 
| Hiroki SATO

----Next_Part(Thu_Dec_30_04_20_43_2004_772)--
Content-Type: Text/Plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline; filename="www-news-selection.diff"

Index: de/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/de/Makefile,v
retrieving revision 1.18
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.18 Makefile
--- de/Makefile	18 Dec 2004 13:10:22 -0000	1.18
+++ de/Makefile	29 Dec 2004 18:32:15 -0000
@@ -57,7 +57,9 @@
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 =

 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -66,7 +68,9 @@
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
Index: de/index.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/de/index.xsl,v
retrieving revision 1.18
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.18 index.xsl
--- de/index.xsl	18 Dec 2004 13:10:22 -0000	1.18
+++ de/index.xsl	29 Dec 2004 18:39:48 -0000
@@ -19,7 +19,9 @@
   <xsl:param name=3D"advisories.xml" select=3D"'none'"/>
   <xsl:param name=3D"notices.xml" select=3D"'none'"/>
   <xsl:param name=3D"mirrors.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.press.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.project.xml" select=3D"'none'"/>
 =

   <xsl:output type=3D"html" encoding=3D"iso-8859-1"
@@ -288,10 +290,11 @@
 			    <font size=3D"-1">
 			      aktualisiert am:
 			      <xsl:call-template name=3D"html-index-news-project-items-last=
modified">
-			        <xsl:with-param name=3D"news.project.xml" select=3D"$news.p=
roject.xml" />
+			        <xsl:with-param name=3D"news.project.xml-master" select=3D"=
$news.project.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 			      <xsl:call-template name=3D"html-index-news-project-items">
+			        <xsl:with-param name=3D"news.project.xml-master" select=3D"=
$news.project.xml-master" />
 			        <xsl:with-param name=3D"news.project.xml" select=3D"$news.p=
roject.xml" />
 			      </xsl:call-template>
 			      <a href=3D"news/newsflash.html">mehr ...</a>
@@ -302,10 +305,11 @@
 			    <font size=3D"-1">
 			      aktualisiert im:
 			      <xsl:call-template name=3D"html-index-news-press-items-lastmo=
dified">
-			        <xsl:with-param name=3D"news.press.xml" select=3D"$news.pre=
ss.xml" />
+			        <xsl:with-param name=3D"news.press.xml-master" select=3D"$n=
ews.press.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 			      <xsl:call-template name=3D"html-index-news-press-items">
+			        <xsl:with-param name=3D"news.press.xml-master" select=3D"$n=
ews.press.xml-master" />
 			        <xsl:with-param name=3D"news.press.xml" select=3D"$news.pre=
ss.xml" />
 			      </xsl:call-template>
 			      <a href=3D"news/press.html">mehr ...</a>
Index: de/news/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/de/news/Makefile,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 Makefile
--- de/news/Makefile	15 May 2004 12:39:08 -0000	1.3
+++ de/news/Makefile	22 Nov 2004 18:19:14 -0000
@@ -18,28 +18,32 @@
 DATA=3D		newsflash.html news.rdf press.html
 CLEANFILES+=3D	newsflash.html news.rdf press.html
 =

+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 =

 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 =

 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: de/news/newsflash.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/de/news/newsflash.xsl,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 newsflash.xsl
--- de/news/newsflash.xsl	15 May 2004 12:39:08 -0000	1.4
+++ de/news/newsflash.xsl	22 Nov 2004 18:17:16 -0000
@@ -19,6 +19,9 @@
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
 =

+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.project.xml" select=3D"'none'" />
+
   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

   <xsl:template match=3D"news">
@@ -69,16 +72,12 @@
 	<p>Die FreeBSD Sicherheitshinweise finden Sie auf der Seite
 	  <a href=3D"{$enbase}/security/#adv">Security Information</a>.</p>
 =

-	<xsl:apply-templates select=3D"descendant::month"/>
+	<xsl:call-template name=3D"html-news-list-newsflash">
+          <xsl:with-param name=3D"news.project.xml-master" select=3D"$=
news.project.xml-master" />
+          <xsl:with-param name=3D"news.project.xml" select=3D"$news.pr=
oject.xml" />
+	</xsl:call-template>
 =

-	<p>&#196;ltere Ank&#252;ndigungen:
-	  <a href=3D"2002/index.html">2002</a>,
-	  <a href=3D"{$enbase}/news/2001/index.html">2001</a>,
-	  <a href=3D"{$enbase}/news/2000/index.html">2000</a>,
-	  <a href=3D"{$enbase}/news/1999/index.html">1999</a>,
-	  <a href=3D"{$enbase}/news/1998/index.html">1998</a>,
-	  <a href=3D"{$enbase}/news/1997/index.html">1997</a>,
-	  <a href=3D"{$enbase}/news/1996/index.html">1996</a></p>
+        <xsl:call-template name=3D"html-news-make-olditems-list" />
 =

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
@@ -86,53 +85,26 @@
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-
-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::day"/>
-    </ul>
-  </xsl:template>
+  <!-- for l10n -->
+  <xsl:template name=3D"html-news-datelabel">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+    <xsl:param name=3D"day" />
 =

-  <xsl:template match=3D"day">
-    <xsl:apply-templates select=3D"event"/>
+    <xsl:value-of select=3D"concat($day, '. ', $month, ' ', $year, ':'=
)" />
   </xsl:template>
 =

-  <xsl:template match=3D"event">
-    <li><p><a>
-	  <xsl:attribute name=3D"name">
-	    <xsl:call-template name=3D"generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select=3D"ancestor::day/name"/>.
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name=3D"transtable-lookup">
-	    <xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	    <xsl:with-param name=3D"word">
-	      <xsl:value-of select=3D"ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text> </xsl:text>
-	  <xsl:value-of select=3D"ancestor::year/name"/>:</b><xsl:text> </xsl=
:text>
-	<xsl:apply-templates select=3D"p"/>
-	</p>
-
-    </li>
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>&#196;ltere Ank&#252;ndigungen:
+      <a href=3D"2002/index.html">2002</a>,
+      <a href=3D"{$enbase}/news/2001/index.html">2001</a>,
+      <a href=3D"{$enbase}/news/2000/index.html">2000</a>,
+      <a href=3D"{$enbase}/news/1999/index.html">1999</a>,
+      <a href=3D"{$enbase}/news/1998/index.html">1998</a>,
+      <a href=3D"{$enbase}/news/1997/index.html">1997</a>,
+      <a href=3D"{$enbase}/news/1996/index.html">1996</a></p>
   </xsl:template>
 =

-  <xsl:template match=3D"date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the cu=
rrent
        value of the $base variable. -->
 =

Index: de/news/press.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/de/news/press.xsl,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.5 press.xsl
--- de/news/press.xsl	17 May 2004 22:41:54 -0000	1.5
+++ de/news/press.xsl	22 Nov 2004 18:20:37 -0000
@@ -19,8 +19,20 @@
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
 =

+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.press.xml" select=3D"'none'" />
+
   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

+  <!-- for l10n -->
+  <xsl:template name=3D"html-news-datelabel">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+    <xsl:param name=3D"day" />
+
+    <xsl:value-of select=3D"concat($day, '. ', $month, ' ', $year, ':'=
)" />
+  </xsl:template>
+
   <xsl:template match=3D"press">
     <html>
 =

@@ -35,51 +47,14 @@
 	  <a href=3D"mailto:www@FreeBSD.org">www@FreeBSD.org</a> und
 	  wir nehmen den Artikel auf.</p>
 =

-	<xsl:apply-templates select=3D"//month"/>
+	<xsl:call-template name=3D"html-news-list-press">
+	  <xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pres=
s.xml-master" />
+	  <xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml" =
/>
+	</xsl:call-template>
 =

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-
-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>      =

-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"story">
-    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:var=
iable>
-    <xsl:variable name=3D"site-url"><xsl:value-of
-    select=3D"site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name=3D"name">
-	  <xsl:call-template name=3D"generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href=3D"{$url}"><b><xsl:value-of
-        select=3D"name"/></b></a><br/>
-
-	<a href=3D"{$site-url}"><xsl:value-of
-	select=3D"site-name"/></a>, <xsl:value-of select=3D"author"/><br/>
-	<xsl:copy-of select=3D"p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
Index: en/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/Makefile,v
retrieving revision 1.116
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.116 Makefile
--- en/Makefile	18 Dec 2004 12:35:25 -0000	1.116
+++ en/Makefile	29 Dec 2004 17:35:26 -0000
@@ -89,7 +89,9 @@
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 =

 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -98,7 +100,9 @@
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
Index: en/index.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/index.xsl,v
retrieving revision 1.120
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.120 index.xsl
--- en/index.xsl	23 Dec 2004 22:29:28 -0000	1.120
+++ en/index.xsl	29 Dec 2004 18:41:11 -0000
@@ -14,7 +14,9 @@
   <xsl:param name=3D"advisories.xml" select=3D"'none'"/>
   <xsl:param name=3D"notices.xml" select=3D"'none'"/>
   <xsl:param name=3D"mirrors.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.press.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.project.xml" select=3D"'none'"/>
 =

   <xsl:output type=3D"html" encoding=3D"iso-8859-1"
@@ -253,12 +255,13 @@
 			    <font color=3D"#990000">(<a href=3D"news/news.rdf">RSS</a>)</fo=
nt><br/>
 			    <font size=3D"-1">Latest update:
 			      <xsl:call-template name=3D"html-index-news-project-items-last=
modified">
-				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-project-items">
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
 			      </xsl:call-template>
 =

@@ -269,12 +272,13 @@
 			    <font size=3D"-1">
 			      Latest update:
 			      <xsl:call-template name=3D"html-index-news-press-items-lastmo=
dified">
-				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-press-items">
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
 			      </xsl:call-template>
 =

Index: en/news/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/news/Makefile,v
retrieving revision 1.39
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.39 Makefile
--- en/news/Makefile	12 Jan 2004 21:26:59 -0000	1.39
+++ en/news/Makefile	22 Nov 2004 17:43:50 -0000
@@ -37,9 +37,13 @@
 DATA=3D		newsflash.html news.rdf press.html
 CLEANFILES+=3D	newsflash.html news.rdf press.html
 =

+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
@@ -47,18 +51,18 @@
 .endif
 =

 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 =

 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: en/news/news.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/news/news.xml,v
retrieving revision 1.256
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.256 news.xml
--- en/news/news.xml	28 Dec 2004 07:10:30 -0000	1.256
+++ en/news/news.xml	29 Dec 2004 17:31:50 -0000
@@ -147,6 +147,12 @@
 	      href=3D"mailto:carvay@FreeBSD.org">Vicente Carrasco</a>
 	      (doc)</p>
 	  </event>
+
+	  <event>
+	    <p>HOE committer: <a
+	      href=3D"mailto:carvay@FreeBSD.org">Vicente Carrasco</a>
+	      (doc)</p>
+	  </event>
 	</day>
 =

 	<day>
Index: en/news/newsflash.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/news/newsflash.xsl,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 newsflash.xsl
--- en/news/newsflash.xsl	8 Apr 2004 19:11:49 -0000	1.11
+++ en/news/newsflash.xsl	22 Nov 2004 17:56:40 -0000
@@ -14,6 +14,9 @@
   <xsl:variable name=3D"date">
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.project.xml" select=3D"'none'" />
   =

   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

@@ -63,70 +66,19 @@
 	<p>For FreeBSD Security Advisories, please refer to the =

 	  <a href=3D"{$base}/security/#adv">Security Information</a> page.</p=
>
 	=

-	<xsl:apply-templates select=3D"descendant::month"/>
-	=

-	<p>Older announcements:
-	  <a href=3D"2002/index.html">2002</a>,
-	  <a href=3D"2001/index.html">2001</a>,
-	  <a href=3D"2000/index.html">2000</a>,
-	  <a href=3D"1999/index.html">1999</a>,
-	  <a href=3D"1998/index.html">1998</a>,
-	  <a href=3D"1997/index.html">1997</a>,
-	  <a href=3D"1996/index.html">1996</a></p>
-	=

+	<xsl:call-template name=3D"html-news-list-newsflash">
+          <xsl:with-param name=3D"news.project.xml-master" select=3D"$=
news.project.xml-master" />
+	  <xsl:with-param name=3D"news.project.xml" select=3D"$news.project.x=
ml" />
+	</xsl:call-template>
+
+        <xsl:call-template name=3D"html-news-make-olditems-list" />
+
 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"day">
-    <xsl:apply-templates select=3D"event"/>
-  </xsl:template>
-
-  <xsl:template match=3D"event">
-    <li><p><a>
-	  <xsl:attribute name=3D"name">
-	    <xsl:call-template name=3D"generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select=3D"ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name=3D"transtable-lookup">
-	    <xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	    <xsl:with-param name=3D"word">
-	      <xsl:value-of select=3D"ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select=3D"ancestor::year/name"/>:</b><xsl:text> </xsl=
:text>
-	<xsl:apply-templates select=3D"p"/>
-	</p>
-
-    </li>
-  </xsl:template>
-
-  <xsl:template match=3D"date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the cu=
rrent
        value of the $base variable. -->
 =

Index: en/news/press.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/en/news/press.xsl,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.9 press.xsl
--- en/news/press.xsl	13 May 2004 20:52:49 -0000	1.9
+++ en/news/press.xsl	22 Nov 2004 17:47:04 -0000
@@ -14,6 +14,9 @@
   <xsl:variable name=3D"date">
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.press.xml" select=3D"'none'" />
   =

   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

@@ -31,58 +34,14 @@
 	  <a href=3D"mailto:www@FreeBSD.org">www@FreeBSD.org</a> so that we c=
an
 	  include them.</p>
 =

-	<xsl:apply-templates select=3D"//month"/>
+	<xsl:call-template name=3D"html-news-list-press">
+          <xsl:with-param name=3D"news.press.xml-master" select=3D"$ne=
ws.press.xml-master" />
+          <xsl:with-param name=3D"news.press.xml" select=3D"$news.pres=
s.xml" />
+	</xsl:call-template>
 =

-	<p>Older press publications:
-	  <a href=3D"2002/press.html">2002</a>,
-	  <a href=3D"2001/press.html">2001</a>,
-	  <a href=3D"2000/press.html">2000</a>,
-	  <a href=3D"1999/press.html">1999</a>,
-	  <a href=3D"1998/press.html">1998-1996</a></p>
-	=

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"story">
-    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:var=
iable>
-    <xsl:variable name=3D"site-url"><xsl:value-of
-    select=3D"site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name=3D"name">
-	  <xsl:call-template name=3D"generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href=3D"{$url}"><b><xsl:value-of
-      select=3D"name"/></b></a><br/>
-	  =

-	<a href=3D"{$site-url}"><xsl:value-of
-	select=3D"site-name"/></a>, <xsl:value-of select=3D"author"/><br/>
-	<xsl:copy-of select=3D"p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
Index: fr/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/fr/Makefile,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 Makefile
--- fr/Makefile	6 Oct 2004 12:55:04 -0000	1.7
+++ fr/Makefile	29 Dec 2004 19:20:24 -0000
@@ -92,15 +92,22 @@
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 =

 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
-		${XML_MIRRORS} ${XML_TRANSTABLE} ${XML_ADVISORIES} ${XML_NAVIGATION}=

+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
+		${XML_MIRRORS} ${XML_TRANSTABLE} \
+		${XML_ADVISORIES} ${XML_NOTICES} \
+		${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param notices.xml "'${XML_NOTICES}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
 		${.CURDIR}/index.xsl ${XML_NEWS_NEWS}
 .if !defined(NO_TIDY)
Index: fr/index.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/fr/index.xsl,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.11 index.xsl
--- fr/index.xsl	24 Nov 2004 21:29:06 -0000	1.11
+++ fr/index.xsl	29 Dec 2004 18:48:26 -0000
@@ -21,7 +21,9 @@
   <xsl:param name=3D"advisories.xml" select=3D"'none'"/>
   <xsl:param name=3D"notices.xml" select=3D"'none'"/>
   <xsl:param name=3D"mirrors.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.press.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.project.xml" select=3D"'none'"/>
 =

   <xsl:output type=3D"html" encoding=3D"iso-8859-1"
@@ -281,12 +283,13 @@
              <font color=3D"#990000">(<a href=3D"news/news.rdf">RSS</a=
>)</font><br/>
 			    <font size=3D"-1">Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name=3D"html-index-news-project-items-last=
modified">
-				     <xsl:with-param name=3D"news.project.xml" select=3D"$news.pro=
ject.xml" />
+				     <xsl:with-param name=3D"news.project.xml-master" select=3D"$n=
ews.project.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
-			      =

+
 			      <xsl:call-template name=3D"html-index-news-project-items">
+				     <xsl:with-param name=3D"news.project.xml-master" select=3D"$n=
ews.project.xml-master" />
 				     <xsl:with-param name=3D"news.project.xml" select=3D"$news.pro=
ject.xml" />
 			      </xsl:call-template>
 =

@@ -298,12 +301,13 @@
 			    <font size=3D"-1">
 			      Derni&#232;re mise &#224; jour :
 			      <xsl:call-template name=3D"html-index-news-press-items-lastmo=
dified">
-				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-press-items">
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
 			      </xsl:call-template>
 			      =

Index: fr/news/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/fr/news/Makefile,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 Makefile
--- fr/news/Makefile	29 Feb 2004 13:20:40 -0000	1.7
+++ fr/news/Makefile	22 Nov 2004 18:46:49 -0000
@@ -40,28 +40,32 @@
 DATA=3D		newsflash.html news.rdf press.html
 CLEANFILES+=3D	newsflash.html news.rdf press.html
 =

+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 =

 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 =

 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: fr/news/newsflash.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/fr/news/newsflash.xsl,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 newsflash.xsl
--- fr/news/newsflash.xsl	7 Aug 2004 15:33:38 -0000	1.6
+++ fr/news/newsflash.xsl	22 Nov 2004 18:48:30 -0000
@@ -24,6 +24,9 @@
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
 =

+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.project.xml" select=3D"'none'" />
+
   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

   <xsl:template match=3D"news">
@@ -72,70 +75,28 @@
 	<p>Pour les avis de s&#233;curit&#233; concernant FreeBSD, veuillez c=
onsulter la page
 	  <a href=3D"{$base}/security/#adv">d'information sur la s&#233;curit=
&#233;</a>.</p>
 =

-	<xsl:apply-templates select=3D"descendant::month"/>
+	<xsl:call-template name=3D"html-news-list-newsflash">
+          <xsl:with-param name=3D"news.project.xml-master" select=3D"$=
news.project.xml-master" />
+          <xsl:with-param name=3D"news.project.xml" select=3D"$news.pr=
oject.xml" />
+	</xsl:call-template>
 =

-	<p>Anciennes annonces :
-          <a href=3D"2002/index.html">2002</a>,
-          <a href=3D"2001/index.html">2001</a>,
-	  <a href=3D"2000/index.html">2000</a>,
-	  <a href=3D"1999/index.html">1999</a>,
-	  <a href=3D"1998/index.html">1998</a>,
-	  <a href=3D"1997/index.html">1997</a>,
-	  <a href=3D"1996/index.html">1996</a></p>
-	=

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"day">
-    <xsl:apply-templates select=3D"event"/>
-  </xsl:template>
-
-  <xsl:template match=3D"event">
-    <li><p><a>
-	  <xsl:attribute name=3D"name">
-	    <xsl:call-template name=3D"generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select=3D"ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name=3D"transtable-lookup">
-	    <xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	    <xsl:with-param name=3D"word">
-	      <xsl:value-of select=3D"ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select=3D"ancestor::year/name"/>:</b><xsl:text> </xsl=
:text>
-	<xsl:apply-templates select=3D"p"/>
-	</p>
-
-    </li>
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>Anciennes annonces :
+      <a href=3D"2002/index.html">2002</a>,
+      <a href=3D"2001/index.html">2001</a>,
+      <a href=3D"2000/index.html">2000</a>,
+      <a href=3D"1999/index.html">1999</a>,
+      <a href=3D"1998/index.html">1998</a>,
+      <a href=3D"1997/index.html">1997</a>,
+      <a href=3D"1996/index.html">1996</a></p>
   </xsl:template>
 =

-  <xsl:template match=3D"date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the cu=
rrent
        value of the $base variable. -->
 =

Index: fr/news/press.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/fr/news/press.xsl,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 press.xsl
--- fr/news/press.xsl	8 Jan 2004 00:26:44 -0000	1.2
+++ fr/news/press.xsl	22 Nov 2004 18:49:29 -0000
@@ -23,6 +23,9 @@
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
 =

+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.press.xml" select=3D"'none'" />
+
   <xsl:output type=3D"html" encoding=3D"iso-8859-1"/>
 =

   <xsl:template match=3D"press">
@@ -41,46 +44,15 @@
 =

 	<p>Vous pouvez &#233;galement consulter la page <a href=3D"{$base}/ja=
va/press.html">FreeBSD/Java
 	    dans la Presse</a> pour des nouvelles sur le projet Java pour Fre=
eBSD</p>
-	=

-	<xsl:apply-templates select=3D"//month"/>
-	=

+
+	<xsl:call-template name=3D"html-news-list-press">
+	  <xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pres=
s.xml-master" />
+	  <xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml" =
/>
+	</xsl:call-template>
+
 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1><xsl:value-of select=3D"name"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"story">
-    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:var=
iable>
-    <xsl:variable name=3D"site-url"><xsl:value-of
-    select=3D"site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name=3D"name">
-	  <xsl:call-template name=3D"generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href=3D"{$url}"><b><xsl:value-of
-      select=3D"name"/></b></a><br/>
-	  =

-	<a href=3D"{$site-url}"><xsl:value-of
-	select=3D"site-name"/></a>, <xsl:value-of select=3D"author"/><br/>
-	<xsl:copy-of select=3D"p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
Index: ja/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/Makefile,v
retrieving revision 1.67
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.67 Makefile
--- ja/Makefile	9 Dec 2004 19:48:57 -0000	1.67
+++ ja/Makefile	29 Dec 2004 17:37:09 -0000
@@ -87,15 +87,20 @@
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 =

 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
-		${XML_MIRRORS} ${XML_ADVISORIES} \
-		${XML_NOTICES} ${XML_NAVIGATION}
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
+		${XML_MIRRORS} ${XML_TRANSTABLE} \
+		${XML_ADVISORIES} ${XML_NOTICES} \
+		${XML_NAVIGATION}
 	${XSLTPROC} ${XSLTPROCOPTS} \
 		-o $@ \
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
Index: ja/includes.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/includes.xsl,v
retrieving revision 1.22
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.22 includes.xsl
--- ja/includes.xsl	9 Dec 2004 20:11:38 -0000	1.22
+++ ja/includes.xsl	29 Dec 2004 18:22:53 -0000
@@ -102,32 +102,32 @@
   <!-- template: "html-index-news-project-items-lastmodified" -->
 =

   <xsl:template name=3D"html-index-news-project-items-lastmodified">
-    <xsl:param name=3D"news.project.xml" select=3D"''" />
+    <xsl:param name=3D"news.project.xml-master" select=3D"''" />
 =

-    <xsl:value-of select=3D"document($news.project.xml)/descendant::ye=
ar[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.project.xml-master)/descend=
ant::year[position() =3D 1]/name"/>
     <xsl:text> =C7=AF </xsl:text>
     <xsl:call-template name=3D"transtable-lookup">
       <xsl:with-param name=3D"word-group" select=3D"'number-month'" />=

       <xsl:with-param name=3D"word">
-	<xsl:value-of select=3D"document($news.project.xml)/descendant::month=
[position() =3D 1]/name"/>
+	<xsl:value-of select=3D"document($news.project.xml-master)/descendant=
::month[position() =3D 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select=3D"document($news.project.xml)/descendant::da=
y[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.project.xml-master)/descend=
ant::day[position() =3D 1]/name"/>
     <xsl:text> =C6=FC </xsl:text>
   </xsl:template>
 =

   <!-- template: "html-index-news-press-items-lastmodified" -->
 =

   <xsl:template name=3D"html-index-news-press-items-lastmodified">
-    <xsl:param name=3D"news.press.xml" select=3D"''" />
+    <xsl:param name=3D"news.press.xml-master" select=3D"''" />
 =

-    <xsl:value-of select=3D"document($news.press.xml)/descendant::year=
[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.press.xml-master)/descendan=
t::year[position() =3D 1]/name"/>
     <xsl:text> =C7=AF </xsl:text>
     <xsl:call-template name=3D"transtable-lookup">
       <xsl:with-param name=3D"word-group" select=3D"'number-month'" />=

       <xsl:with-param name=3D"word">
-	<xsl:value-of select=3D"document($news.press.xml)/descendant::month[p=
osition() =3D 1]/name"/>
+	<xsl:value-of select=3D"document($news.press.xml-master)/descendant::=
month[position() =3D 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
Index: ja/index.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/index.xsl,v
retrieving revision 1.38
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.38 index.xsl
--- ja/index.xsl	9 Dec 2004 19:48:57 -0000	1.38
+++ ja/index.xsl	29 Dec 2004 18:53:36 -0000
@@ -18,7 +18,9 @@
   <xsl:param name=3D"advisories.xml" select=3D"'none'"/>
   <xsl:param name=3D"notices.xml" select=3D"'none'"/>
   <xsl:param name=3D"mirrors.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.press.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.project.xml" select=3D"'none'"/>
 =

   <xsl:output type=3D"html" encoding=3D"EUC-JP"
@@ -32,7 +34,7 @@
 	<meta name=3D"description" content=3D"The FreeBSD Project"/>
 =

 	<meta name=3D"keywords" content=3D"FreeBSD, BSD, UNIX, Support, Galle=
ry,
-	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,=
 =

+	      Release, Application, Software, Handbook, FAQ, Tutorials, Bugs,=

 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
 	<link rel=3D"shortcut icon" href=3D"/favicon.ico" type=3D"image/x-ico=
n"/>
 	<link rel=3D"icon" href=3D"/favicon.ico" type=3D"image/x-icon"/>
@@ -53,7 +55,7 @@
 		     alt=3D"FreeBSD: =A4=B3=A4=CE=A5=D1=A5=EF=A1=BC=A4=F2=A4=A2=A4=CA=
=A4=BF=A4=CE=A4=BF=A4=E1=A4=CB" border=3D"0"/></a></td>
 =

 	    <td align=3D"right" valign=3D"bottom">
-	      <form action=3D"http://www.FreeBSD.org/cgi/mirror.cgi" =

+	      <form action=3D"http://www.FreeBSD.org/cgi/mirror.cgi"
 		    method=3D"get">
 =

 		<br/>
@@ -63,7 +65,7 @@
 		<br/>
 =

 		<select name=3D"goto">
-		  <!--  Only list TRUE mirrors here! Native language pages =

+		  <!--  Only list TRUE mirrors here! Native language pages
 		        which are not mirrored should be listed in
 		        support.sgml.  -->
 =

@@ -269,14 +271,15 @@
 			    <xsl:text> </xsl:text>
 			    <font color=3D"#990000">(<a href=3D"{$enbase}/news/news.rdf">RS=
S</a>)</font><br/>
 			    <font size=3D"-1">
-			      =BA=C7=BD=AA=B9=B9=BF=B7: =

+			      =BA=C7=BD=AA=B9=B9=BF=B7:
 			      <xsl:call-template name=3D"html-index-news-project-items-last=
modified">
-				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-project-items">
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
 			      </xsl:call-template>
 =

@@ -286,14 +289,15 @@
 			  <p><font size=3D"+1" color=3D"#990000"><b>FreeBSD Press</b></font=
><br/>
 =

 			    <font size=3D"-1">
-			      =BA=C7=BD=AA=B9=B9=BF=B7: =

+			      =BA=C7=BD=AA=B9=B9=BF=B7:
 			      <xsl:call-template name=3D"html-index-news-press-items-lastmo=
dified">
-				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-press-items">
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
 			      </xsl:call-template>
 =

@@ -306,7 +310,7 @@
 			    <font color=3D"#990000">(<a href=3D"{$enbase}/security/advisori=
es.rdf">RSS</a>)</font><br/>
 =

 			    <font size=3D"-1">
-			      =BA=C7=BD=AA=B9=B9=BF=B7: =

+			      =BA=C7=BD=AA=B9=B9=BF=B7:
 			      <xsl:call-template name=3D"html-index-advisories-items-lastmo=
dified">
 				<xsl:with-param name=3D"advisories.xml" select=3D"$advisories.xml"=
 />
 				<xsl:with-param name=3D"type" select=3D"'advisory'" />
@@ -403,7 +407,7 @@
 		valign=3D"top"><small><a href=3D"{$base}/mailto.html">=A4=AA=CC=E4=A4=
=A4=B9=E7=A4=EF=A4=BB=C0=E8</a> : <a href=3D"jabout.html">=C6=FC=CB=DC=B8=
=EC=B2=BD=A4=CB=A4=C4=A4=A4=A4=C6</a><br/>
 		<xsl:value-of select=3D"$date"/></small></td>
 =

-	    <td align=3D"right" =

+	    <td align=3D"right"
 		valign=3D"top"><small><a href=3D"copyright/index.html">=C3=CE=C5=AA=BA=
=E2=BB=BA=B8=A2=A4=CB=A4=C4=A4=A4=A4=C6</a><br/> &#169; 1995-2004
 		The FreeBSD Project.<br/>
 		All rights reserved.</small></td>
Index: ja/news/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/news/Makefile,v
retrieving revision 1.35
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.35 Makefile
--- ja/news/Makefile	21 Sep 2003 17:18:14 -0000	1.35
+++ ja/news/Makefile	22 Nov 2004 17:49:52 -0000
@@ -37,22 +37,33 @@
 #SUBDIR+=3D	status
 =

 DATA=3D		newsflash.html press.html
-#+=3D news.rdf
 CLEANFILES+=3D	newsflash.html press.html
 =

-newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
+newsflash.html: newsflash.xsl news.xml\
+			includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 =

-news.rdf: news-rdf.xsl news.xml includes.xsl ../includes.xsl
+news.rdf: news-rdf.xsl news.xml\
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 =

-press.html: press.xsl press.xml includes.xsl ../includes.xsl
+press.html: press.xsl press.xml\
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
@@ -60,5 +71,3 @@
 =

 ### Revision checking
 REVCHECK=3D	YES
-
-.include "${WEB_PREFIX}/share/mk/web.site.mk"
Index: ja/news/newsflash.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/news/newsflash.xsl,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.9 newsflash.xsl
--- ja/news/newsflash.xsl	3 Nov 2003 11:41:05 -0000	1.9
+++ ja/news/newsflash.xsl	22 Nov 2004 18:11:17 -0000
@@ -16,6 +16,9 @@
   <xsl:variable name=3D"date">
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
+
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.project.xml" select=3D"'none'" />
   =

   <xsl:output type=3D"html" encoding=3D"EUC-JP"/>
 =

@@ -64,54 +67,45 @@
 	<p>FreeBSD =A5=BB=A5=AD=A5=E5=A5=EA=A5=C6=A5=A3=B4=AB=B9=F0=A4=CB=A4=C4=
=A4=A4=A4=C6=A4=CF=A1=A2<a href=3D"{$base}/security/#adv">
 	  =A5=BB=A5=AD=A5=E5=A5=EA=A5=C6=A5=A3=BE=F0=CA=F3</a> =A4=CE=A5=DA=A1=
=BC=A5=B8=A4=F2=A4=B4=CD=F7=A4=AF=A4=C0=A4=B5=A4=A4=A1=A3</p>
 	=

-	<xsl:apply-templates select=3D"descendant::month"/>
-	=

-	<p>Older announcements:
-	  <a href=3D"{$enbase}/news/2002/index.html">2002</a>,
-	  <a href=3D"{$enbase}/news/2001/index.html">2001</a>,
-	  <a href=3D"2000/index.html">2000</a>,
-	  <a href=3D"1999/index.html">1999</a>,
-	  <a href=3D"1998/index.html">1998</a>,
-	  <a href=3D"1997/index.html">1997</a>,
-	  <a href=3D"1996/index.html">1996</a></p>
-	=

+	<xsl:call-template name=3D"html-news-list-newsflash">
+          <xsl:with-param name=3D"news.project.xml-master" select=3D"$=
news.project.xml-master" />
+          <xsl:with-param name=3D"news.project.xml" select=3D"$news.pr=
oject.xml" />
+	</xsl:call-template>
+
+        <xsl:call-template name=3D"html-news-make-olditems-list" />
+
 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1><xsl:value-of select=3D"ancestor::year/name"/>
-      <xsl:text>=C7=AF </xsl:text>
-      <xsl:value-of select=3D"name"/> =B7=EE</h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"day">
-    <xsl:apply-templates select=3D"event"/>
+  <!-- for l10n -->
+  <xsl:template name=3D"html-news-datelabel">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+    <xsl:param name=3D"day" />
+    <xsl:value-of select=3D"concat($month, ' ', $day, ' =C6=FC:')" />
   </xsl:template>
 =

-  <xsl:template match=3D"event">
-    <li><p><a>
-	  <xsl:attribute name=3D"name">
-	    <xsl:call-template name=3D"generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select=3D"format-number(number(ancestor::year/name),=
'0000')"/>/<xsl:value-of select=3D"format-number(number(ancestor::month=
/name),'00')"/>/<xsl:value-of select=3D"format-number(number(ancestor::=
day/name),'00')"/>:</b><xsl:text> </xsl:text>
-	<xsl:apply-templates select=3D"p"/>
-	</p>
+  <!-- for l10n -->
+  <xsl:template name=3D"html-news-month-headings">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
 =

-    </li>
+    <xsl:value-of select=3D"concat($year, ' =C7=AF ', $month)" />
   </xsl:template>
 =

-  <xsl:template match=3D"date"/>    <!-- Deliberately left blank -->
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>=B2=E1=B5=EE=A4=CE=A5=CB=A5=E5=A1=BC=A5=B9:
+      <a href=3D"2002/index.html">2002</a>,
+      <a href=3D"2001/index.html">2001</a>,
+      <a href=3D"2000/index.html">2000</a>,
+      <a href=3D"1999/index.html">1999</a>,
+      <a href=3D"1998/index.html">1998</a>,
+      <a href=3D"1997/index.html">1997</a>,
+      <a href=3D"1996/index.html">1996</a></p>
+  </xsl:template>
 =

   <!-- When the href attribute contains a '$base', expand it to the cu=
rrent
        value of the $base variable. -->
Index: ja/news/press.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ja/news/press.xsl,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 press.xsl
--- ja/news/press.xsl	3 Nov 2003 11:41:05 -0000	1.4
+++ ja/news/press.xsl	22 Nov 2004 18:12:14 -0000
@@ -14,9 +14,20 @@
   <xsl:variable name=3D"base" select=3D"'..'"/>
   <xsl:variable name=3D"title" select=3D"'FreeBSD In The Press'"/>
   <xsl:variable name=3D"date" select=3D"'$FreeBSD: www/ja/news/press.x=
sl,v 1.4 2003/11/03 11:41:05 rushani Exp $'"/>
+
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.press.xml" select=3D"'none'" />
   =

   <xsl:output type=3D"html" encoding=3D"EUC-JP"/>
 =

+  <!-- for l10n -->
+  <xsl:template name=3D"html-news-month-headings">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+
+    <xsl:value-of select=3D"concat($year, ' =C7=AF ', $month)" />
+  </xsl:template>
+
   <xsl:template match=3D"press">
     <html>
       =

@@ -35,43 +46,14 @@
 	  <a href=3D"{$base}/java/press.html">FreeBSD/Java Press</a>
 	  =A4=F2=A4=B4=CD=F7=B2=BC=A4=B5=A4=A4=A1=A3</p>
 	=

-	<xsl:apply-templates select=3D"//month"/>
-	=

+	<xsl:call-template name=3D"html-news-list-press">
+	  <xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pres=
s.xml-master" />
+	  <xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml" =
/>
+	</xsl:call-template>
+
 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
       </body>
     </html>
   </xsl:template>
-
-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1><xsl:value-of select=3D"ancestor::year/name"/> =C7=AF <xsl:val=
ue-of select=3D"name"/> =B7=EE</h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"story">
-    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:var=
iable>
-    <xsl:variable name=3D"site-url"><xsl:value-of
-    select=3D"site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name=3D"name">
-	  <xsl:call-template name=3D"generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href=3D"{$url}"><b><xsl:value-of
-      select=3D"name"/></b></a><br/>
-	  =

-	<a href=3D"{$site-url}"><xsl:value-of
-	select=3D"site-name"/></a>, <xsl:value-of select=3D"author"/><br/>
-	<xsl:copy-of select=3D"p/child::node()"/>
-      </p>
-    </li>
-  </xsl:template>
 </xsl:stylesheet>
Index: ru/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ru/Makefile,v
retrieving revision 1.41
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.41 Makefile
--- ru/Makefile	2 Nov 2004 08:53:08 -0000	1.41
+++ ru/Makefile	29 Dec 2004 18:54:56 -0000
@@ -82,7 +82,9 @@
 XML_NEWS_PRESS=3D		${XML_NEWS_PRESS_MASTER}
 =

 index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} ${XML_NEWS_NEWS} ${XML_NEWS_PRESS}\
+		${XML_NEWS_INCLUDES} \
+		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
+		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
 		${XML_MIRRORS} ${XML_TRANSTABLE} \
 		${XML_ADVISORIES} ${XML_NOTICES} \
 		${XML_NAVIGATION}
@@ -91,7 +93,9 @@
 		--param mirrors.xml "'${XML_MIRRORS}'" \
 		--param advisories.xml "'${XML_ADVISORIES}'" \
 		--param notices.xml "'${XML_NOTICES}'" \
+		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
 		--param news.press.xml "'${XML_NEWS_PRESS}'" \
+		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
 		--param news.project.xml "'${XML_NEWS_NEWS}'" \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		--param navigation.xml "'${XML_NAVIGATION}'" \
Index: ru/index.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ru/index.xsl,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 index.xsl
--- ru/index.xsl	9 Nov 2004 14:41:00 -0000	1.23
+++ ru/index.xsl	29 Dec 2004 18:56:52 -0000
@@ -24,6 +24,8 @@
   <xsl:param name=3D"notices.xml" select=3D"'none'"/>
   <xsl:param name=3D"mirrors.xml" select=3D"'none'"/>
   <xsl:param name=3D"news.press.xml" select=3D"'none'"/>
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'"/>
+  <xsl:param name=3D"news.project.xml-master" select=3D"'none'"/>
   <xsl:param name=3D"news.project.xml" select=3D"'none'"/>
 =

   <xsl:output type=3D"html" encoding=3D"koi8-r"
@@ -290,11 +292,12 @@
 			    <font size=3D"-1">
 			      =F0=CF=D3=CC=C5=C4=CE=C9=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1: =

 			      <xsl:call-template name=3D"html-index-news-project-items-last=
modified">
-				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 			      </xsl:call-template>
 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-project-items">
+				<xsl:with-param name=3D"news.project.xml-master" select=3D"$news.p=
roject.xml-master" />
 				<xsl:with-param name=3D"news.project.xml" select=3D"$news.project.=
xml" />
 			      </xsl:call-template>
 =

@@ -306,12 +309,13 @@
 			    <font size=3D"-1">
 			      =F0=CF=D3=CC=C5=C4=CE=C9=C5 =C9=DA=CD=C5=CE=C5=CE=C9=D1: =

 			      <xsl:call-template name=3D"html-index-news-press-items-lastmo=
dified">
-				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 			      </xsl:call-template>
 =

 			      <br/>
 =

 			      <xsl:call-template name=3D"html-index-news-press-items">
+				<xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pre=
ss.xml-master" />
 				<xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml"=
 />
 			      </xsl:call-template>
 =

Index: ru/news/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ru/news/Makefile,v
retrieving revision 1.10
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.10 Makefile
--- ru/news/Makefile	9 Apr 2004 12:08:13 -0000	1.10
+++ ru/news/Makefile	22 Nov 2004 18:56:09 -0000
@@ -37,25 +37,31 @@
 DATA=3D		newsflash.html news.rdf press.html
 CLEANFILES+=3D	newsflash.html news.rdf press.html
 =

+.include "${WEB_PREFIX}/share/mk/web.site.mk"
+
 newsflash.html: newsflash.xsl news.xml\
-			includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.project.xml-master" "'${XML_NEWS_NEWS_MASTER}'" \
+		--param "news.project.xml" "'${XML_NEWS_NEWS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/newsflash.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 =

 news.rdf: news-rdf.xsl news.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
 		--param transtable.xml "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/news-rdf.xsl ${.CURDIR}/news.xml
 =

 press.html: press.xsl press.xml\
-		includes.xsl ../includes.xsl ${XML_TRANSTABLE}
+		includes.xsl ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
+		--param "news.press.xml-master" "'${XML_NEWS_PRESS_MASTER}'" \
+		--param "news.press.xml" "'${XML_NEWS_PRESS}'" \
+		--param "transtable.xml" "'${XML_TRANSTABLE}'" \
 		${.CURDIR}/press.xsl ${.CURDIR}/press.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
Index: ru/news/newsflash.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ru/news/newsflash.xsl,v
retrieving revision 1.7
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.7 newsflash.xsl
--- ru/news/newsflash.xsl	9 Apr 2004 11:57:33 -0000	1.7
+++ ru/news/newsflash.xsl	22 Nov 2004 18:57:21 -0000
@@ -74,16 +74,12 @@
 	<p>=E2=C0=CC=CC=C5=D4=C5=CE=C9 =D0=CF =C2=C5=DA=CF=D0=C1=D3=CE=CF=D3=D4=
=C9 FreeBSD =CE=C1=C8=CF=C4=D1=D4=D3=D1 =CE=C1 =D3=D4=D2=C1=CE=C9=C3=C5=
 <a
 	  href=3D"{$base}/security/#adv">=E9=CE=C6=CF=D2=CD=C1=C3=C9=C9 =CF =E2=
=C5=DA=CF=D0=C1=D3=CE=CF=D3=D4=C9</a>.</p>
 =

-	<xsl:apply-templates select=3D"descendant::month"/>
+	<xsl:call-template name=3D"html-news-list-newsflash">
+          <xsl:with-param name=3D"news.project.xml-master" select=3D"$=
news.project.xml-master" />
+          <xsl:with-param name=3D"news.project.xml" select=3D"$news.pr=
oject.xml" />
+	</xsl:call-template>
 =

-	<p>=E1=CE=CF=CE=D3=D9 =D0=D2=CF=DB=CC=D9=C8 =CC=C5=D4:
-          <a href=3D"2002/index.html">2002</a>,
-          <a href=3D"2001/index.html">2001</a>,
-	  <a href=3D"2000/index.html">2000</a>,
-	  <a href=3D"1999/index.html">1999</a>,
-	  <a href=3D"1998/index.html">1998</a>,
-	  <a href=3D"1997/index.html">1997</a>,
-	  <a href=3D"1996/index.html">1996</a></p>
+	<xsl:call-template name=3D"html-news-make-olditems-list" />
 =

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
@@ -91,53 +87,17 @@
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::day"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"day">
-    <xsl:apply-templates select=3D"event"/>
-  </xsl:template>
-
-  <xsl:template match=3D"event">
-    <li><p><a>
-	  <xsl:attribute name=3D"name">
-	    <xsl:call-template name=3D"generate-event-anchor"/>
-	  </xsl:attribute>
-	</a>
-
-	<b><xsl:value-of select=3D"ancestor::day/name"/>
-	  <xsl:text> </xsl:text>
-	  <xsl:call-template name=3D"transtable-lookup">
-	    <xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	    <xsl:with-param name=3D"word">
-	      <xsl:value-of select=3D"ancestor::month/name"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text>, </xsl:text>
-	  <xsl:value-of select=3D"ancestor::year/name"/>:</b><xsl:text> </xsl=
:text>
-	<xsl:apply-templates select=3D"p"/>
-	</p>
-
-    </li>
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>=E1=CE=CF=CE=D3=D9 =D0=D2=CF=DB=CC=D9=C8 =CC=C5=D4:
+      <a href=3D"2002/index.html">2002</a>,
+      <a href=3D"2001/index.html">2001</a>,
+      <a href=3D"2000/index.html">2000</a>,
+      <a href=3D"1999/index.html">1999</a>,
+      <a href=3D"1998/index.html">1998</a>,
+      <a href=3D"1997/index.html">1997</a>,
+      <a href=3D"1996/index.html">1996</a></p>
   </xsl:template>
 =

-  <xsl:template match=3D"date"/>    <!-- Deliberately left blank -->
-
   <!-- When the href attribute contains a '$base', expand it to the cu=
rrent
        value of the $base variable. -->
 =

Index: ru/news/press.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/ru/news/press.xsl,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.6 press.xsl
--- ru/news/press.xsl	9 Apr 2004 11:56:13 -0000	1.6
+++ ru/news/press.xsl	22 Nov 2004 18:59:22 -0000
@@ -20,7 +20,10 @@
   <xsl:variable name=3D"date">
     <xsl:value-of select=3D"//cvs:keyword[@name=3D'freebsd']"/>
   </xsl:variable>
-  =

+
+  <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+  <xsl:param name=3D"news.press.xml" select=3D"'none'" />
+
   <xsl:output type=3D"html" encoding=3D"koi8-r"/>
 =

   <xsl:template match=3D"press">
@@ -40,14 +43,12 @@
           =D0=CF=D3=C5=D4=C9=D7 =D3=D4=D2=C1=CE=C9=DE=CB=D5 <a
           href=3D"{$base}/java/press.html">FreeBSD/Java =D7 =F0=D2=C5=D3=
=D3=C5</a>.</p>
 =

-	<xsl:apply-templates select=3D"//month"/>
+	<xsl:call-template name=3D"html-news-list-press">
+	  <xsl:with-param name=3D"news.press.xml-master" select=3D"$news.pres=
s.xml-master" />
+	  <xsl:with-param name=3D"news.press.xml" select=3D"$news.press.xml" =
/>
+	</xsl:call-template>
 =

-	<p>=F0=D5=C2=CC=C9=CB=C1=C3=C9=C9 =D0=D2=CF=DB=CC=D9=C8 =CC=C5=D4:
-	  <a href=3D"2002/press.html">2002</a>,
-	  <a href=3D"2001/press.html">2001</a>,
-	  <a href=3D"2000/press.html">2000</a>,
-	  <a href=3D"1999/press.html">1999</a>,
-	  <a href=3D"1998/press.html">1998-1996</a></p>
+	<xsl:call-template name=3D"html-news-make-olditems-list" />
 =

 	<xsl:copy-of select=3D"$newshome"/>
 	<xsl:copy-of select=3D"$footer"/>
@@ -55,43 +56,12 @@
     </html>
   </xsl:template>
 =

-  <!-- Everything that follows are templates for the rest of the conte=
nt -->
-  =

-  <xsl:template match=3D"month">
-    <h1>
-      <xsl:call-template name=3D"transtable-lookup">
-	<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
-	<xsl:with-param name=3D"word">
-	  <xsl:value-of select=3D"name"/>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select=3D"ancestor::year/name"/></h1>
-
-    <ul>
-      <xsl:apply-templates select=3D"descendant::story"/>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match=3D"story">
-    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:var=
iable>
-    <xsl:variable name=3D"site-url"><xsl:value-of
-    select=3D"site-url"/></xsl:variable>
-
-    <li>
-      <a>
-	<xsl:attribute name=3D"name">
-	  <xsl:call-template name=3D"generate-story-anchor"/>
-	</xsl:attribute>
-      </a>
-
-      <p><a href=3D"{$url}"><b><xsl:value-of
-      select=3D"name"/></b></a><br/>
-	  =

-	<a href=3D"{$site-url}"><xsl:value-of
-	select=3D"site-name"/></a>, <xsl:value-of select=3D"author"/><br/>
-	<xsl:copy-of select=3D"p/child::node()"/>
-      </p>
-    </li>
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>=F0=D5=C2=CC=C9=CB=C1=C3=C9=C9 =D0=D2=CF=DB=CC=D9=C8 =CC=C5=D4:=

+      <a href=3D"2002/press.html">2002</a>,
+      <a href=3D"2001/press.html">2001</a>,
+      <a href=3D"2000/press.html">2000</a>,
+      <a href=3D"1999/press.html">1999</a>,
+      <a href=3D"1998/press.html">1998-1996</a></p>
   </xsl:template>
 </xsl:stylesheet>
Index: share/sgml/includes.misc.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/www/share/sgml/includes.misc.xsl,v
retrieving revision 1.13
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Dragon=
Fly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.13 includes.misc.xsl
--- share/sgml/includes.misc.xsl	27 Jun 2004 19:18:00 -0000	1.13
+++ share/sgml/includes.misc.xsl	29 Dec 2004 18:18:35 -0000
@@ -25,6 +25,13 @@
   <!--
      template name                               used in
 =

+     html-news-list-newsflash                    news/newsflash.xsl
+     html-news-list-press                        news/press.xsl
+     html-news-list-datelabel                    news/newsflash.xsl (f=
or l10n)
+     html-news-generate-anchor                   news/newsflash.xsl
+     html-news-make-olditems-list                news/newsflash.xsl (f=
or l10n)
+     html-news-month-headings                    news/newsflash.xsl (f=
or l10n)
+
      html-list-advisories                        security/mkindex.xsl
      html-list-advisories-putitems               security/mkindex.xsl
      html-list-advisories-release-label          security/mkindex.xsl =
(for l10n)
@@ -41,6 +48,248 @@
      html-index-mirrors-options-list             index.xsl
   -->
 =

+  <!-- template: "html-news-make-olditems-list" -->
+  <xsl:template name=3D"html-news-make-olditems-list">
+    <p>Old announcement:
+      <a href=3D"2002/index.html">2002</a>,
+      <a href=3D"2001/index.html">2001</a>,
+      <a href=3D"2000/index.html">2000</a>,
+      <a href=3D"1999/index.html">1999</a>,
+      <a href=3D"1998/index.html">1998</a>,
+      <a href=3D"1997/index.html">1997</a>,
+      <a href=3D"1996/index.html">1996</a></p>
+  </xsl:template>
+
+  <!-- template: "html-news-list-newsflash" -->
+  <xsl:template name=3D"html-news-list-newsflash">
+    <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+    <xsl:param name=3D"news.project.xml" select=3D"'none'" />
+
+    <xsl:for-each select=3D"document($news.project.xml-master)//descen=
dant::year">
+      <xsl:param name=3D"year" select=3D"name" />
+
+      <xsl:for-each select=3D"month">
+	<xsl:param name=3D"month" select=3D"name" />
+
+	<h1>
+	  <!-- generate month headings -->
+	  <xsl:call-template name=3D"html-news-month-headings">
+	    <xsl:with-param name=3D"year" select=3D"$year" />
+	    <xsl:with-param name=3D"month">
+	      <xsl:call-template name=3D"transtable-lookup">
+		<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
+		<xsl:with-param name=3D"word" select=3D"$month" />
+	      </xsl:call-template>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</h1>
+
+	<ul>
+	  <xsl:for-each select=3D"day">
+	    <xsl:param name=3D"day" select=3D"name" />
+	    <xsl:param name=3D"index" select=3D"position()" />
+
+	    <!-- search localized items per day basis -->
+	    <xsl:param name=3D"localizeditems"
+	      select=3D"document($news.project.xml)
+	              //descendant::year[name =3D $year]
+	              /month[name =3D $month]
+	              /day[name =3D $day and position() =3D $index]" />
+
+	    <xsl:choose>
+	      <xsl:when test=3D"$localizeditems">
+		<!-- when localized item exists -->
+		<xsl:for-each select=3D"$localizeditems/event">
+		  <xsl:param name=3D"anchor-position" select=3D"position()" />
+
+		  <li><p class=3D"localized">
+		      <a><xsl:attribute name=3D"name">
+			  <xsl:call-template name=3D"html-news-generate-anchor">
+			    <xsl:with-param name=3D"label" select=3D"local-name()" />
+			    <xsl:with-param name=3D"year" select=3D"$year" />
+			    <xsl:with-param name=3D"month" select=3D"$month" />
+			    <xsl:with-param name=3D"day" select=3D"$day" />
+			    <xsl:with-param name=3D"pos" select=3D"$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <b><xsl:call-template name=3D"html-news-datelabel">
+			  <xsl:with-param name=3D"year" select=3D"$year" />
+			  <xsl:with-param name=3D"month">
+			    <xsl:call-template name=3D"transtable-lookup">
+			      <xsl:with-param name=3D"word-group" select=3D"'number-month'"=
 />
+			      <xsl:with-param name=3D"word" select=3D"$month" />
+			    </xsl:call-template>
+			  </xsl:with-param>
+			  <xsl:with-param name=3D"day" select=3D"$day" />
+			</xsl:call-template></b>
+		      <!-- put localized text -->
+		      <xsl:text> </xsl:text>
+		      <xsl:apply-templates select=3D"p" />
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:when>
+
+	      <xsl:otherwise>
+		<!-- when localized item does not exist -->
+		<xsl:for-each select=3D"event">
+		  <xsl:param name=3D"anchor-position" select=3D"position()" />
+
+		  <li><p class=3D"original">
+		      <a><xsl:attribute name=3D"name">
+			  <xsl:call-template name=3D"html-news-generate-anchor">
+			    <xsl:with-param name=3D"label" select=3D"local-name()" />
+			    <xsl:with-param name=3D"year" select=3D"$year" />
+			    <xsl:with-param name=3D"month" select=3D"$month" />
+			    <xsl:with-param name=3D"day" select=3D"$day" />
+			    <xsl:with-param name=3D"pos" select=3D"$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <b><xsl:call-template name=3D"html-news-datelabel">
+			  <xsl:with-param name=3D"year" select=3D"$year" />
+			  <xsl:with-param name=3D"month">
+			    <xsl:call-template name=3D"transtable-lookup">
+			      <xsl:with-param name=3D"word-group" select=3D"'number-month'"=
 />
+			      <xsl:with-param name=3D"word" select=3D"$month" />
+			    </xsl:call-template>
+			  </xsl:with-param>
+			  <xsl:with-param name=3D"day" select=3D"$day" />
+			</xsl:call-template></b>
+		      <!-- put English text -->
+		      <xsl:text> </xsl:text>
+		      <xsl:apply-templates select=3D"p" />
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:for-each>
+	</ul>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- template: "html-news-list-press" -->
+  <xsl:template name=3D"html-news-list-press">
+    <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
+    <xsl:param name=3D"news.press.xml" select=3D"'none'" />
+
+    <xsl:for-each select=3D"document($news.press.xml-master)//descenda=
nt::year">
+      <xsl:param name=3D"year" select=3D"name" />
+
+      <xsl:for-each select=3D"month">
+	<xsl:param name=3D"month" select=3D"name" />
+
+	<h1>
+	  <!-- generate month headings -->
+	  <xsl:call-template name=3D"html-news-month-headings">
+	    <xsl:with-param name=3D"year" select=3D"$year" />
+	    <xsl:with-param name=3D"month">
+	      <xsl:call-template name=3D"transtable-lookup">
+		<xsl:with-param name=3D"word-group" select=3D"'number-month'" />
+		<xsl:with-param name=3D"word" select=3D"$month" />
+	      </xsl:call-template>
+	    </xsl:with-param>
+	  </xsl:call-template>
+	</h1>
+
+	<ul>
+	  <xsl:for-each select=3D"story">
+	    <xsl:variable name=3D"url"><xsl:value-of select=3D"url"/></xsl:va=
riable>
+	    <xsl:variable name=3D"site-url"><xsl:value-of select=3D"site-url"=
/></xsl:variable>
+
+	    <!-- search localized items per story(URL) basis -->
+	    <xsl:param name=3D"localizeditems"
+	      select=3D"document($news.press.xml)
+	              //descendant::year[name =3D $year]
+	              /month[name =3D $month]
+	              /story[url =3D $url]" />
+
+	    <xsl:param name=3D"anchor-position" select=3D"position()" />
+
+	    <xsl:choose>
+	      <xsl:when test=3D"$localizeditems">
+		<xsl:for-each select=3D"$localizeditems">
+		  <li><p>
+		      <a><xsl:attribute name=3D"name">
+			  <xsl:call-template name=3D"html-news-generate-anchor">
+			    <xsl:with-param name=3D"label" select=3D"local-name()" />
+			    <xsl:with-param name=3D"year" select=3D"$year" />
+			    <xsl:with-param name=3D"month" select=3D"$month" />
+			    <xsl:with-param name=3D"pos" select=3D"$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+		      <a href=3D"{$url}"><b><xsl:value-of select=3D"name"/></b></a><=
br/>
+		      <a href=3D"{$site-url}"><xsl:value-of select=3D"site-name"/></=
a>,
+		      <xsl:value-of select=3D"author"/><br/>
+		      <xsl:copy-of select=3D"p/child::node()"/>
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:when>
+
+	      <xsl:otherwise>
+		<xsl:for-each select=3D".">
+		  <li><p>
+		      <a><xsl:attribute name=3D"name">
+			  <xsl:call-template name=3D"html-news-generate-anchor">
+			    <xsl:with-param name=3D"label" select=3D"local-name()" />
+			    <xsl:with-param name=3D"year" select=3D"$year" />
+			    <xsl:with-param name=3D"month" select=3D"$month" />
+			    <xsl:with-param name=3D"pos" select=3D"$anchor-position" />
+			  </xsl:call-template>
+			</xsl:attribute></a>
+
+		      <a href=3D"{$url}"><b><xsl:value-of select=3D"name"/></b></a><=
br/>
+		      <a href=3D"{$site-url}"><xsl:value-of select=3D"site-name"/></=
a>,
+		      <xsl:value-of select=3D"author"/><br/>
+		      <xsl:copy-of select=3D"p/child::node()"/>
+		    </p>
+		  </li>
+		</xsl:for-each>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:for-each>
+	</ul>
+      </xsl:for-each>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- template: "html-news-datelabel" (for l10n) -->
+  <xsl:template name=3D"html-news-datelabel">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+    <xsl:param name=3D"day" />
+
+    <xsl:value-of select=3D"concat($day, ' ', $month, ', ', $year, ':'=
)" />
+  </xsl:template>
+
+  <!-- template: "html-news-generate-anchor" (for l10n) -->
+  <xsl:template name=3D"html-news-generate-anchor">
+    <xsl:param name=3D"label" />
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+    <xsl:param name=3D"day" />
+    <xsl:param name=3D"pos" />
+
+    <xsl:value-of select=3D"concat(
+      $label,
+      format-number($year, '0000'),
+      format-number($month, '00'))" />
+    <xsl:if test=3D"$label =3D 'event'" >
+      <xsl:value-of select=3D"format-number($day, '00')" />
+    </xsl:if>
+    <xsl:value-of select=3D"format-number($pos, ':00')" />
+  </xsl:template>
+
+  <!-- template: "html-news-month-headings" (for l10n) -->
+  <xsl:template name=3D"html-news-month-headings">
+    <xsl:param name=3D"year" />
+    <xsl:param name=3D"month" />
+
+    <xsl:value-of select=3D"concat($month, ' ', $year)" />
+  </xsl:template>
+
   <!-- template: "html-list-advisories"
        generate a list of all security advisories -->
 =

@@ -282,71 +531,135 @@
        pulls in the 5 most recent project items -->
 =

   <xsl:template name=3D"html-index-news-project-items">
-    <xsl:param name=3D"news.project.xml" select=3D"''" />
+    <xsl:param name=3D"news.project.xml-master" select=3D"'none'" />
+    <xsl:param name=3D"news.project.xml" select=3D"'none'" />
 =

-    <xsl:for-each select=3D"document($news.project.xml)/descendant::ev=
ent[position() &lt;=3D 5]">
-      <xsl:value-of select=3D"$leadingmark" /><a>
-	<xsl:attribute name=3D"href">
-	  news/newsflash.html#<xsl:call-template name=3D"generate-event-ancho=
r"/>
-	</xsl:attribute>
-	<xsl:choose>
-	  <xsl:when test=3D"count(child::title)">
-	    <xsl:value-of select=3D"title"/><br/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select=3D"p"/><br/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </a>
+    <xsl:for-each select=3D"document($news.project.xml-master)/descend=
ant::day[position() &lt;=3D 5]">
+      <xsl:param name=3D"year" select=3D"ancestor::year/name" />
+      <xsl:param name=3D"month" select=3D"ancestor::month/name" />
+      <xsl:param name=3D"day" select=3D"name" />
+
+      <!-- search localized items per day basis -->
+      <xsl:param name=3D"localizeditems"
+	select=3D"document($news.project.xml)
+	//descendant::year[name =3D $year]
+	/month[name =3D $month]
+	/day[name =3D $day]" />
+
+      <xsl:choose>
+	<xsl:when test=3D"$localizeditems/event">
+	  <xsl:for-each select=3D"$localizeditems/event">
+	    <xsl:value-of select=3D"$leadingmark" /><a>
+	      <xsl:attribute name=3D"href">
+		news/newsflash.html#<xsl:call-template name=3D"generate-event-anchor=
"/>
+	      </xsl:attribute>
+
+	      <xsl:choose>
+		<xsl:when test=3D"count(child::title)">
+		  <xsl:value-of select=3D"title"/><br/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select=3D"p"/><br/>
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </a>
+	  </xsl:for-each>
+	</xsl:when>
+
+	<xsl:otherwise>
+	  <xsl:for-each select=3D"event">
+	    <xsl:value-of select=3D"$leadingmark" /><a>
+	      <xsl:attribute name=3D"href">
+		news/newsflash.html#<xsl:call-template name=3D"generate-event-anchor=
"/>
+	      </xsl:attribute>
+
+	      <xsl:choose>
+		<xsl:when test=3D"count(child::title)">
+		  <xsl:value-of select=3D"title"/><br/>
+		</xsl:when>
+		<xsl:otherwise>
+		  <xsl:value-of select=3D"p"/><br/>
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </a>
+	  </xsl:for-each>
+	</xsl:otherwise>
+      </xsl:choose>
     </xsl:for-each>
   </xsl:template>
 =

   <!-- template: "html-index-news-project-items-lastmodified" -->
 =

   <xsl:template name=3D"html-index-news-project-items-lastmodified">
-    <xsl:param name=3D"news.project.xml" select=3D"''" />
+    <xsl:param name=3D"news.project.xml-master" select=3D"''" />
 =

     <xsl:call-template name=3D"transtable-lookup">
       <xsl:with-param name=3D"word-group" select=3D"'number-month'" />=

       <xsl:with-param name=3D"word">
-	<xsl:value-of select=3D"document($news.project.xml)/descendant::month=
[position() =3D 1]/name"/>
+	<xsl:value-of select=3D"document($news.project.xml-master)/descendant=
::month[position() =3D 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select=3D"document($news.project.xml)/descendant::da=
y[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.project.xml-master)/descend=
ant::day[position() =3D 1]/name"/>
     <xsl:text>, </xsl:text>
-    <xsl:value-of select=3D"document($news.project.xml)/descendant::ye=
ar[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.project.xml-master)/descend=
ant::year[position() =3D 1]/name"/>
   </xsl:template>
 =

   <!-- template: "html-index-news-press-items"
        pulls in the 5 most recent press items -->
 =

   <xsl:template name=3D"html-index-news-press-items">
+    <xsl:param name=3D"news.press.xml-master" select=3D"'none'" />
     <xsl:param name=3D"news.press.xml" select=3D"''" />
 =

-    <xsl:for-each select=3D"document($news.press.xml)/descendant::stor=
y[position() &lt;=3D 5]">
-      <xsl:value-of select=3D"$leadingmark" /><a>
+    <xsl:for-each select=3D"document($news.press.xml-master)/descendan=
t::story[position() &lt;=3D 5]">
+      <xsl:param name=3D"year" select=3D"../../year/name" />
+      <xsl:param name=3D"month" select=3D"../month/name" />
+      <xsl:param name=3D"pos" select=3D"position()" />
+      <xsl:param name=3D"url" select=3D"url" />
+      <xsl:param name=3D"site-url" select=3D"site-url" />
+
+      <!-- search localized items per story(URL) basis -->
+      <xsl:param name=3D"localizeditems"
+	select=3D"document($news.press.xml)
+	//descendant::year[name =3D $year]
+	/month[name =3D $month]
+	/story[url =3D $url]" />
+
+      <xsl:value-of select=3D"$leadingmark" />
+      <a>
 	<xsl:attribute name=3D"href">
 	  news/press.html#<xsl:call-template name=3D"generate-story-anchor"/>=

 	</xsl:attribute>
-	<xsl:value-of select=3D"name"/>
-      </a><br/>
+
+	<xsl:choose>
+	  <xsl:when test=3D"$localizeditems">
+	    <xsl:value-of select=3D"$localizeditems/name"/>
+	  </xsl:when>
+
+	  <xsl:otherwise>
+	    <xsl:value-of select=3D"name"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </a>
+
+      <br/>
     </xsl:for-each>
   </xsl:template>
 =

   <!-- template: "html-index-news-press-items-lastmodified" -->
 =

   <xsl:template name=3D"html-index-news-press-items-lastmodified">
-    <xsl:param name=3D"news.press.xml" select=3D"''" />
+    <xsl:param name=3D"news.press.xml-master" select=3D"''" />
 =

     <xsl:call-template name=3D"transtable-lookup">
       <xsl:with-param name=3D"word-group" select=3D"'number-month'" />=

       <xsl:with-param name=3D"word">
-	<xsl:value-of select=3D"document($news.press.xml)/descendant::month[p=
osition() =3D 1]/name"/>
+	<xsl:value-of select=3D"document($news.press.xml-master)/descendant::=
month[position() =3D 1]/name"/>
       </xsl:with-param>
     </xsl:call-template>
     <xsl:text> </xsl:text>
-    <xsl:value-of select=3D"document($news.press.xml)/descendant::year=
[position() =3D 1]/name"/>
+    <xsl:value-of select=3D"document($news.press.xml-master)/descendan=
t::year[position() =3D 1]/name"/>
   </xsl:template>
 =

   <!-- template: "html-index-navigation-link-list"

----Next_Part(Thu_Dec_30_04_20_43_2004_772)----

----Security_Multipart0(Thu_Dec_30_04_20_43_2004_785)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQBB0wOLTyzT2CeTzy0RAoYRAJ9IaztEMT4XaBz7Z1orpDwUnafINACgpiJh
vX60bzvp0ClMc0M+F8KNh8Q=
=65PM
-----END PGP SIGNATURE-----

----Security_Multipart0(Thu_Dec_30_04_20_43_2004_785)----