From owner-svn-doc-projects@FreeBSD.ORG  Sun Aug 12 20:35:42 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B3A7106564A;
	Sun, 12 Aug 2012 20:35:42 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D1EC8FC17;
	Sun, 12 Aug 2012 20:35:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7CKZfD5036895;
	Sun, 12 Aug 2012 20:35:41 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7CKZfZH036863;
	Sun, 12 Aug 2012 20:35:41 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201208122035.q7CKZfZH036863@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 Aug 2012 20:35:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39366 - in projects/sgml2xml: de_DE.ISO8859-1/htdocs
	el_GR.ISO8859-7/share/sgml en_US.ISO8859-1/htdocs
	en_US.ISO8859-1/htdocs/events en_US.ISO8859-1/htdocs/gnome
	en_US.ISO8859-1/htdocs...
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Aug 2012 20:35:42 -0000

Author: gabor
Date: Sun Aug 12 20:35:40 2012
New Revision: 39366
URL: http://svn.freebsd.org/changeset/doc/39366

Log:
  - Add namespace to XHTML fragments generated by XSLT stylesheets
  - Properly define titles, navigation bars and RSS links for generated pages
  - Minor cleanup
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/community.xsl
  projects/sgml2xml/de_DE.ISO8859-1/htdocs/index.xsl
  projects/sgml2xml/el_GR.ISO8859-7/share/sgml/header.l10n.ent
  projects/sgml2xml/en_US.ISO8859-1/htdocs/community.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/events/rss.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss2.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/index.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/java/java-rss.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/search/index-site.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/security/errata-rss.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/security/mkindex.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rdf.xsl
  projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rss.xsl
  projects/sgml2xml/es_ES.ISO8859-1/htdocs/index.xsl
  projects/sgml2xml/es_ES.ISO8859-1/htdocs/search/index-site.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/auditors.sgml
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/index.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/index.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/news/status/report.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/search/index-site.xsl
  projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/community.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/events/rss.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/index.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/search/index-site.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/errata-rss.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/mkindex.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/security-rdf.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/htdocs/security/security-rss.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/libcommon.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.events.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.news-rdf.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.news-rss.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.newsflash.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.press-rss.xsl
  projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.press.xsl
  projects/sgml2xml/it_IT.ISO8859-15/htdocs/index.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/community.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/events/rss.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/index.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/java/java-rss.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/java/newsflash.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/search/index-site.xsl
  projects/sgml2xml/ja_JP.eucJP/htdocs/security/mkindex.xsl
  projects/sgml2xml/ja_JP.eucJP/share/sgml/libcommon.xsl
  projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.events.xsl
  projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl
  projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldpress.xsl
  projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.usergroups.xsl
  projects/sgml2xml/nl_NL.ISO8859-1/htdocs/community.xsl
  projects/sgml2xml/nl_NL.ISO8859-1/htdocs/index.xsl
  projects/sgml2xml/nl_NL.ISO8859-1/share/sgml/libcommon.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/community.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/community/social.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/events/rss.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/index.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/gnome/newsflash.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/index.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/search/index-site.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/errata-rss.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/security-rdf.xsl
  projects/sgml2xml/ru_RU.KOI8-R/htdocs/security/security-rss.xsl
  projects/sgml2xml/ru_RU.KOI8-R/share/sgml/libcommon.xsl
  projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.events.xsl
  projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.usergroups.xsl
  projects/sgml2xml/share/sgml/header.ent
  projects/sgml2xml/share/sgml/libcommon.xsl
  projects/sgml2xml/share/sgml/templates.entries.xsl
  projects/sgml2xml/share/sgml/templates.events.xsl
  projects/sgml2xml/share/sgml/templates.news-rdf.xsl
  projects/sgml2xml/share/sgml/templates.news-rss.xsl
  projects/sgml2xml/share/sgml/templates.newsflash.xsl
  projects/sgml2xml/share/sgml/templates.oldnewsflash.xsl
  projects/sgml2xml/share/sgml/templates.oldpress.xsl
  projects/sgml2xml/share/sgml/templates.pastevents.xsl
  projects/sgml2xml/share/sgml/templates.press-rss.xsl
  projects/sgml2xml/share/sgml/templates.press.xsl
  projects/sgml2xml/share/sgml/templates.usergroups.xsl
  projects/sgml2xml/share/sgml/xhtml.xsl
  projects/sgml2xml/zh_CN.GB2312/htdocs/index.xsl
  projects/sgml2xml/zh_CN.GB2312/htdocs/security/mkindex.xsl
  projects/sgml2xml/zh_CN.GB2312/share/sgml/libcommon.xsl
  projects/sgml2xml/zh_TW.Big5/htdocs/index.xsl
  projects/sgml2xml/zh_TW.Big5/share/sgml/libcommon.xsl

Modified: projects/sgml2xml/de_DE.ISO8859-1/htdocs/community.xsl
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/htdocs/community.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/de_DE.ISO8859-1/htdocs/community.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -2,7 +2,6 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "Die FreeBSD-Gemeinde">
-<!ENTITY email "freebsd-www">
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
 
@@ -10,28 +9,23 @@
 <!-- $FreeBSDde: de-www/community.xsl,v 1.7 2011/08/01 09:27:32 jkois Exp $ -->
 <!-- basiert auf: 1.9 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:key name="last-year-event-by-country" match="event[number(enddate/year) = (number($curdate.year) - 1)]"
     use="location/country" />
 
   <xsl:key name="event-by-year" match="event" use="enddate/year" />
 
-  <xsl:template name="process.content">
-              <div id="SIDEWRAP">
-                &nav;
-              </div> <!-- SIDEWRAP -->
-
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.community;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	      <p>&os; wird von einer aktiven Gemeinschaft
 		unterst&uuml;tzt.</p>
 
@@ -136,6 +130,5 @@
   </script>
 
 	      </div> <!-- Latest Videos -->
-	      </div> <!-- CONTENTWRAP -->
   </xsl:template>
 </xsl:stylesheet>

Modified: projects/sgml2xml/de_DE.ISO8859-1/htdocs/index.xsl
==============================================================================
--- projects/sgml2xml/de_DE.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/de_DE.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -9,7 +9,10 @@
      basiert auf: 1.178
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
     <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
@@ -26,6 +29,8 @@
   <xsl:param name="events.xml" select="'none'"/>
   <xsl:param name="html.header.script.google" select="'IGNORE'"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template name="process.content">
         <div id="FRONTCONTAINER">
           <div id="FRONTMAIN">

Modified: projects/sgml2xml/el_GR.ISO8859-7/share/sgml/header.l10n.ent
==============================================================================
--- projects/sgml2xml/el_GR.ISO8859-7/share/sgml/header.l10n.ent	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/el_GR.ISO8859-7/share/sgml/header.l10n.ent	Sun Aug 12 20:35:40 2012	(r39366)
@@ -97,8 +97,6 @@
 </div> <!-- HEADERCONTAINER -->
 '>
 
-<!ENTITY header3 '<h1>&title;</h1>'>
-
 <!-- macro for webbuild paper -->
 <!ENTITY webbuild '
 <p>Áõôü ôï êåßìåíï ðåñéãñÜöåé ôç ÷åéñïêßíçôç äéáäéêáóßá ðñïåôïéìáóßáò

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/community.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/community.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/community.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -2,37 +2,29 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "FreeBSD Community">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+  <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:output method="xml" encoding="&xml.encoding;"
-    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"/>
+  <xsl:variable name="title">&title;</xsl:variable>
 
   <xsl:key name="last-year-event-by-country" match="event[number(enddate/year) = (number($curdate.year) - 1)]"
     use="location/country" />
 
   <xsl:key name="event-by-year" match="event" use="enddate/year" />
 
-  <xsl:template name="process.content">
-              <div id="SIDEWRAP">
-                &nav;
-              </div> <!-- SIDEWRAP -->
-
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.community;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	      <p>&os; is well supported by its active
 		community.</p>
 
@@ -136,7 +128,5 @@
     GSearch.setOnLoadCallback(LoadVideoBar);
   </script>
               </div> <!-- Latest Videos -->
-	      </div> <!-- CONTENTWRAP -->
-	      <br class="clearboth" />
   </xsl:template>
 </xsl:stylesheet>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/events/rss.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/events/rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/events/rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "FreeBSD Events">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 
@@ -43,10 +39,6 @@
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:output method="xml" indent="yes"/>
 
   <xsl:key name="event-by-month" match="event"

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -3,7 +3,6 @@
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY base "..">
 <!ENTITY title "The FreeBSD GNOME Project">
-<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 <!-- $FreeBSD$ -->
 
@@ -15,9 +14,11 @@
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template name="process.content">
               <div id="SIDEWRAP">
-                &nav;
+                &nav.gnome;
               </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
@@ -86,7 +87,7 @@
                   </div> <!-- rightnav -->
                 </div> <!-- rightwrap -->
 
-		&header3;
+		<h1>&title;</h1>
 
 		<h2>What is GNOME?</h2>
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -4,23 +4,26 @@
 <!ENTITY base "..">
 <!ENTITY title "FreeBSD GNOME News Flash">
 <!ENTITY rsslink "&base;/gnome/rss.xml">
-<!ENTITY rsstitle "&title;">
-<!ENTITY email "freebsd-gnome">
-<!ENTITY % navinclude.gnome "INCLUDE">
-<!ENTITY % header.rss "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS" exclude-result-prefixes="cvs">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
+  <xsl:variable name="rsstitle">&title;</xsl:variable>
+
+  <xsl:variable name="rsslink">&rsslink;</xsl:variable>
+
   <xsl:template name="process.content">
               <div id="SIDEWRAP">
-                &nav;
+                &nav.gnome;
                 <div id="FEEDLINKS">
                   <ul>
                     <li>
@@ -39,7 +42,7 @@
               </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
-		&header3;
+		<h1>&title;</h1>
 
 		<img src="&base;/gifs/news.jpg" align="right" border="0" width="193"
 		  height="144" alt="FreeBSD GNOME News"/>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
-<!ENTITY title "FreeBSD GNOME Project News System">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss2.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss2.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/rss2.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
-<!ENTITY title "FreeBSD GNOME Project News System">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 
@@ -15,11 +12,6 @@
 
   <xsl:output method="xml" indent="yes"/>
 
-
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:template match="/">
     <xsl:variable name="title">FreeBSD GNOME Project News</xsl:variable>
     <xsl:variable name="link">http://www.FreeBSD.org/gnome/</xsl:variable>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -6,7 +6,10 @@
 
 <!-- $FreeBSD$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
@@ -23,6 +26,8 @@
   <xsl:param name="events.xml" select="'none'"/>
   <xsl:param name="html.header.script.google" select="'IGNORE'"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template name="process.content">
         <div id="FRONTCONTAINER">
           <div id="FRONTMAIN">

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/java/java-rss.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/java/java-rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/java/java-rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
@@ -14,10 +11,6 @@
 
   <xsl:output method="xml" indent="yes"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:template match="/">
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
       <channel>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -3,24 +3,28 @@
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY base "..">
 <!ENTITY rsslink "&base;/java/rss.xml">
-<!ENTITY title "FreeBSD &java; Project: Newsflash">
+<!ENTITY title "FreeBSD &java; Project News Flash">
 <!ENTITY rsstitle "FreeBSD Java Project News">
-<!ENTITY email "freebsd-java">
-<!ENTITY % navinclude.developers "INCLUDE">
-<!ENTITY % header.rss "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS" exclude-result-prefixes="cvs">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
+  <xsl:variable name="rsstitle">&title;</xsl:variable>
+
+  <xsl:variable name="rsslink">&rsslink;</xsl:variable>
+
   <xsl:template name="process.content">
               <div id="SIDEWRAP">
-                &nav;
+                &nav.developers;
                 <div id="FEEDLINKS">
                   <ul>
                     <li>
@@ -33,7 +37,7 @@
               </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
-		&header3;
+		<h1>&title;</h1>
 
 		<img src="&base;/gifs/news.jpg" align="right" border="0" width="193"
 		  height="144" alt="FreeBSD Java News"/>

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,34 +1,26 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "../..">
 <!ENTITY title "FreeBSD Quarterly Status Report">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
 
 <!-- Standard header material -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="ucletters"
-    select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-  <xsl:variable name="lcletters"
-    select="'abcdefghijklmnopqrstuvwxyz'"/>
-  
-  <xsl:template name="process.content">
-              <div id="SIDEWRAP">
-                &nav;
-              </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="contentwrap">
-                &header3;
+  <xsl:template name="process.sidewrap">
+    &nav.about;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	<!-- Process all the <sections>, in order -->
 	<xsl:apply-templates select="report/section"/>
 
@@ -40,7 +32,7 @@
 	  <xsl:variable name="cat-short" select="name"/>
 	  <ul>
 	    <xsl:for-each select="//project[@cat=$cat-short and @summary]">
-  	      <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+  	      <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	      <li><a><xsl:attribute name="href">#<xsl:value-of
 	      select="translate(title, ' ',
 	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
@@ -48,7 +40,7 @@
 	    </xsl:for-each>
 
 	    <xsl:for-each select="//project[@cat=$cat-short and not(@summary)]">
-  	      <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+  	      <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	      <li><a><xsl:attribute name="href">#<xsl:value-of
 	      select="translate(title, ' ',
 	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
@@ -58,7 +50,7 @@
 	</xsl:for-each>
 	<ul>
 	  <xsl:for-each select="//project[not(@cat)]">
-  	    <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+  	    <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	    <li><a><xsl:attribute name="href">#<xsl:value-of
 	    select="translate(title, ' ',
 	    '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
@@ -70,14 +62,11 @@
 
 	<!-- Process each project, sorted -->
 	<xsl:apply-templates select="report/project">
-	  <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+	  <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	</xsl:apply-templates>
 
 	<!-- Standard footer -->
 	<a href="../news.html">News Home</a> | <a href="status.html">Status Home</a> 
-	      </div> <!-- contentwrap -->
-
-	      <br class="clearboth" />
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/search/index-site.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -6,12 +6,17 @@
 
 <!-- $FreeBSD$ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
   <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:template name="process.contentwrap">
     <h1>Site Map</h1>
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/security/errata-rss.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/security/errata-rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/security/errata-rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
@@ -14,10 +11,6 @@
 
   <xsl:output method="xml" indent="yes"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:template match="/">
     <xsl:call-template name="rss-errata-notices">
        <xsl:with-param name="notices.xml" select="$notices.xml" />

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/security/mkindex.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/security/mkindex.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/security/mkindex.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rdf.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rdf.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rdf.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rss.xsl
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/security/security-rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
@@ -14,10 +11,6 @@
 
   <xsl:output method="xml" indent="yes"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:template match="/">
     <xsl:call-template name="rss-security-advisories">
        <xsl:with-param name="advisories.xml" select="$advisories.xml" />

Modified: projects/sgml2xml/es_ES.ISO8859-1/htdocs/index.xsl
==============================================================================
--- projects/sgml2xml/es_ES.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/es_ES.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -7,12 +7,13 @@
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.163			-->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
-
   <!-- these params should be externally bound. The values
        here are not used actually -->
   <xsl:param name="advisories.xml" select="'none'"/>
@@ -25,6 +26,10 @@
   <xsl:param name="events.xml-master" select="'none'"/>
   <xsl:param name="events.xml" select="'none'"/>
 
+  <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/>
+
+  <xsl:variable name="title">&title;</xsl:variable>
+
 <xsl:template name="process.content">
         <div id="FRONTCONTAINER">
           <div id="FRONTMAIN">

Modified: projects/sgml2xml/es_ES.ISO8859-1/htdocs/search/index-site.xsl
==============================================================================
--- projects/sgml2xml/es_ES.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/es_ES.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "Mapa de sitio e índice de http://www.FreeBSD.org">
+<!ENTITY title "Mapa del sitio">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -9,18 +9,21 @@
 <!-- The FreeBSD Spanish Documentation Project
      Original Revision: r1.29                   -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
   <xsl:variable name="lowercase" select="'aábcdeéfghiíjklmnñoópqrstuúvwxyz'"/>
   <xsl:variable name="uppercase" select="'AÁBCDEÉFGHIÍJKLMNÑOÓPQRSTUÚVWXYZ'"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
   <xsl:template name="process.contentwrap">
-    <h1>Mapa del sitio</h1>
-
     <xsl:call-template name="html-sitemap"/>
 
     <h2>Metapáginas</h2>

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/auditors.sgml
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/auditors.sgml	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/auditors.sgml	Sun Aug 12 20:35:40 2012	(r39366)
@@ -26,8 +26,6 @@
 
    <h1>Informations Générales</h1>
 
-    <em>&date; </em>
-
     <h2>Introduction</h2>
 
     <p>A la lumière de notre récent (et toujours actuel) souci de la sécurité,

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/index.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
 <!ENTITY title "Projet GNOME pour FreeBSD">
-<!ENTITY % navinclude.gnome "INCLUDE">
 ]>
 <!-- $FreeBSD$ -->
 
@@ -22,12 +20,13 @@
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
-  <xsl:variable name="title" select="''"/>
+  <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/>
+
+  <xsl:variable name="title">&title;</xsl:variable>
 
   <xsl:template names="process.content">
               <div id="SIDEWRAP">
-                &nav;
+                &nav.gnome;
               </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
@@ -96,7 +95,7 @@
                   </div> <!-- rightnav -->
                 </div> <!-- rightwrap -->
 
-		&header3;
+		<h1>&title;</h1>
 
 		<h2>Qu'est-ce que GNOME ?</h2>
 

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/newsflash.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
 <!ENTITY title "Nouvelles sur le projet GNOME pour FreeBSD">
-<!ENTITY email "freebsd-gnome">
-<!ENTITY % navinclude.developers "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -16,24 +13,20 @@
      Version francaise : Stephane Legrand <stephane@freebsd-fr.org>
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS" exclude-result-prefixes="cvs">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:template names="process.content">
-              <div id="SIDEWRAP">
-                &nav;
-              </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.developers;
+  </xsl:template>
 
+  <xsl:template names="process.contentwrap">
 	<img src="&enbase;/gifs/news.jpg" align="right" border="0" width="193"
 	     height="144" alt="FreeBSD GNOME News"/>
 
@@ -42,8 +35,6 @@
 	<xsl:for-each select="/news">
 	<xsl:call-templates name="html-news-list-homelink" />
 	</xsl:for-each>
-
-	      </div> <!-- contentwrap -->
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->
@@ -78,6 +69,4 @@
 
     </li>
   </xsl:template>
-
-  <xsl:template match="date"/>    <!-- Deliberately left blank -->
 </xsl:stylesheet>

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/gnome/rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "..">
-<!ENTITY title "Système de nouvelles du Projet GNOME pour FreeBSD">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <!-- 
@@ -19,7 +16,7 @@
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/>
 
   <xsl:output type="xml" />
 

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/index.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/index.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -13,12 +13,13 @@
    Mise a jour:	Marc Fonvieille <blackend@FreeBSD.org>
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date" select="''"/>
-
   <!-- these params should be externally bound. The values
        here are not used actually -->
   <xsl:param name="advisories.xml" select="'none'"/>
@@ -32,6 +33,10 @@
   <xsl:param name="events.xml" select="'none'"/>
   <xsl:param name="curdate.xml" select="'none'"/>
 
+  <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/>
+
+  <xsl:variable name="title">&title;</xsl:variable>
+
 <xsl:template names="process.content">
         <div id="FRONTCONTAINER">
           <div id="FRONTMAIN">

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/news/status/report.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/news/status/report.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/news/status/report.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base "../..">
 <!ENTITY title "FreeBSD Rapport de Statut">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -17,28 +14,20 @@
 -->
 
 <!-- Standard header material -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
-  <xsl:variable name="ucletters"
-    select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
-  <xsl:variable name="lcletters"
-    select="'abcdefghijklmnopqrstuvwxyz'"/>
-  
-  <xsl:template names="process.content">
-              <div id="SIDEWRAP">
-                &nav;
-              </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="contentwrap">
-                &header3;
+  <xsl:template name="process.sidewrap">
+    &nav.about;
+  </xsl:template>
 
+  <xsl:template names="process.contentwrap">
 	<!-- Process all the <sections>, in order -->
 	<xsl:apply-templates select="/report/section"/>
 
@@ -50,7 +39,7 @@
 	  <xsl:variable name="cat-short" select="name"/>
 	  <ul>
 	    <xsl:for-each select="//project[@cat=$cat-short]">
-  	      <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+  	      <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	      <li><a><xsl:attribute name="href">#<xsl:value-of
 	      select="translate(title, ' ',
 	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
@@ -60,7 +49,7 @@
 	</xsl:for-each>
 	<ul>
 	  <xsl:for-each select="//project[not(@cat)]">
-  	    <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+  	    <xsl:sort select="translate(title, $lowercase, $ucppercase)"/>
 	    <li><a><xsl:attribute name="href">#<xsl:value-of
 	    select="translate(title, ' ',
 	    '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
@@ -72,12 +61,11 @@
 
 	<!-- Process each project, sorted -->
 	<xsl:apply-templates select="/report/project">
-	  <xsl:sort select="translate(title, $lcletters, $ucletters)"/>
+	  <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	</xsl:apply-templates>
 
 	<!-- Standard footer -->
 	<a href="../news.html">News Home</a> | <a href="status.html">Status Home</a> 
-	      </div> <!-- contentwrap -->
   </xsl:template>
 
   <!-- Everything that follows are templates for the rest of the content -->

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/search/index-site.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/search/index-site.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY title "Plan du site et index de http://www.FreeBSD.org">
+<!ENTITY title "Plan du site">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -15,18 +15,21 @@
   Version francaise (mise a jour) : Antoine Brodin <antoine.brodin@laposte.net>
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
   <xsl:variable name="lowercase" select="'aàbcçdeéèêfghiîjklmnoôpqrstuùûvwxyz'"/>
   <xsl:variable name="uppercase" select="'AÀBCÇDEÉÈÊFGHIÎJKLMNOÔPQRSTUÙÛVWXYZ'"/>
 
+  <xsl:variable name="title">&title;</xsl:variable>
+
   <xsl:key name="indexLetter" match="term" use="translate(substring(text, 1, 1), $lowercase, $uppercase)"/>
 
   <xsl:template name="process.contentwrap">
-    <h1>Plan du site</h1>
-
     <xsl:call-template name="html-sitemap"/>
 
     <h2>Meta pages d'accueil</h2>

Modified: projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl
==============================================================================
--- projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/fr_FR.ISO8859-1/htdocs/security/mkindex.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
-				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
-<!ENTITY base ".">
-<!ENTITY title "">
-]>
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
 
 <!-- $FreeBSD$ -->
 
@@ -17,7 +14,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="svnKeyword" select="'$FreeBSD$'"/>
 
   <xsl:output type="xml" encoding="iso-8859-1"
               omit-xml-declaration="yes" />

Modified: projects/sgml2xml/hu_HU.ISO8859-2/htdocs/community.xsl
==============================================================================
--- projects/sgml2xml/hu_HU.ISO8859-2/htdocs/community.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/hu_HU.ISO8859-2/htdocs/community.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -2,8 +2,6 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
                                 "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "A &os; k&ouml;z&ouml;ss&eacute;g">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.community "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->
@@ -14,28 +12,25 @@
      %SRCID%    1.9
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>
 
-  <xsl:variable name="date">
-    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
-  </xsl:variable>
-
   <xsl:key name="last-year-event-by-country" match="event[number(enddate/year) = (number($curdate.year) - 1)]"
     use="location/country" />
 
   <xsl:key name="event-by-year" match="event" use="enddate/year" />
 
-  <xsl:template name="process.content">
-	      <div id="SIDEWRAP">
-		&nav;
-	      </div> <!-- SIDEWRAP -->
+  <xsl:variable name="title">&title;</xsl:variable>
 
-	      <div id="CONTENTWRAP">
-		&header3;
+  <xsl:template name="process.sidewrap">
+    &nav.community;
+  </xsl:template>
 
+  <xsl:template name="process.contentwrap">
 	      <p>A &os; m&ouml;g&ouml;tt egy akt&iacute;v
 		fejleszt&#245;i k&ouml;z&ouml;ss&eacute;g
 		&aacute;ll.</p>
@@ -143,6 +138,5 @@
 		    GSearch.setOnLoadCallback(LoadVideoBar);
 		  </script>
 		</div> <!-- latest-videos -->
-	      </div> <!-- CONTENTWRAP -->
   </xsl:template>
 </xsl:stylesheet>

Modified: projects/sgml2xml/hu_HU.ISO8859-2/htdocs/events/rss.xsl
==============================================================================
--- projects/sgml2xml/hu_HU.ISO8859-2/htdocs/events/rss.xsl	Sun Aug 12 20:07:59 2012	(r39365)
+++ projects/sgml2xml/hu_HU.ISO8859-2/htdocs/events/rss.xsl	Sun Aug 12 20:35:40 2012	(r39366)
@@ -2,8 +2,6 @@
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
 <!ENTITY title "&os; k&ouml;zpont&uacute; rendezv&eacute;nyek">
-<!ENTITY email "freebsd-www">
-<!ENTITY % navinclude.about "INCLUDE">
 ]>
 
 <!-- $FreeBSD$ -->

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***