diff --git a/share/sgml/templates.news-rdf.xsl b/share/sgml/templates.news-rdf.xsl
index a0adc85ca0..78cc41b0a8 100644
--- a/share/sgml/templates.news-rdf.xsl
+++ b/share/sgml/templates.news-rdf.xsl
@@ -1,75 +1,75 @@
 <?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 "FreeBSD News Flash RDF">
 <!ENTITY email "freebsd-www">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.news-rdf.xsl,v 1.1 2006/08/19 21:20:54 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.news-rdf.xsl,v 1.2 2006/08/21 18:27:43 hrs Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
 
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   
-  <xsl:output method="xml" indent="yes"/>
+  <xsl:output method="xml" indent="yes" encoding="$xml.encoding;"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
   <!-- Generate the main body of the RDF file -->
   <xsl:template match="news">
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	     xmlns="http://my.netscape.com/rdf/simple/0.9/">
 
       <channel>
 	<title>FreeBSD Project News</title>
 	<link>http://www.FreeBSD.org/news/</link>
 	<description>News from the FreeBSD Project</description>
       </channel>
 
       <!-- Only include the last 10 events -->
       <xsl:apply-templates select="descendant::event[position() &lt;= 10]"/>
 
       </rdf:RDF>
   </xsl:template>
 
   <!-- Generate the <item> elements and their content -->
   <xsl:template match="event" xmlns="http://my.netscape.com/rdf/simple/0.9/">
     <xsl:param name="year" select="../../../name" />
     <xsl:param name="month" select="../../name" />
     <xsl:param name="day" select="../name" />
     <xsl:param name="this" select="." />
     <xsl:param name="pos">
       <xsl:for-each select="../event">
 	<xsl:if test=". = $this">
 	  <xsl:value-of select="position()" />
 	</xsl:if>
       </xsl:for-each>
     </xsl:param>
 
     <item>
       <xsl:choose>
 	<xsl:when test="count(child::title)">
 	  <title><xsl:value-of select="normalize-space(title)"/></title>
 	</xsl:when>
 	<xsl:otherwise>
 	  <title><xsl:value-of select="normalize-space(p)"/></title>
 	</xsl:otherwise>
       </xsl:choose>
       <link>
 	<xsl:text>http://www.FreeBSD.org/news/newsflash.html#</xsl:text>
 	<xsl:call-template name="html-news-generate-anchor">
 	  <xsl:with-param name="label" select="'event'" />
 	  <xsl:with-param name="year" select="$year" />
 	  <xsl:with-param name="month" select="$month" />
 	  <xsl:with-param name="day" select="$day" />
 	  <xsl:with-param name="pos" select="$pos" />
 	</xsl:call-template>
       </link>
     </item>
   </xsl:template>
   
   <xsl:template match="name | date"/>
 </xsl:stylesheet>
diff --git a/share/sgml/templates.news-rss.xsl b/share/sgml/templates.news-rss.xsl
index e825b5c207..f549540045 100644
--- a/share/sgml/templates.news-rss.xsl
+++ b/share/sgml/templates.news-rss.xsl
@@ -1,101 +1,101 @@
 <?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 "FreeBSD News Flash">
 <!ENTITY link "http://www.FreeBSD.org/news/">
 <!ENTITY email "freebsd-www">
 <!ENTITY realname "Webmaster Team">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.news-rss.xsl,v 1.1 2008/01/07 07:50:27 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.news-rss.xsl,v 1.2 2008/01/08 06:07:52 murray Exp $ -->
 
 <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:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   
-  <xsl:output method="xml" indent="yes"/>
+  <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
   <!-- Generate the main body of the RDF file -->
   <xsl:template match="news">
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 
       <channel>
 	<title>&title;</title>
 	<link>&link;</link>
 	<description>News from the FreeBSD Project</description>
 	<language>en-us</language>
 	<webMaster>&email;@FreeBSD.org (&realname;)</webMaster>
 	<managingEditor>&email;@FreeBSD.org (&realname;)</managingEditor>
 	<docs>http://blogs.law.harvard.edu/tech/rss</docs>
 	<ttl>120</ttl>
 	<image>
 	  <url>http://www.FreeBSD.org/logo/logo-full.png</url>
 	  <title>&title;</title>
 	  <link>&link;</link>
 	</image>
 	<atom:link href="&link;rss.xml" rel="self" type="application/rss+xml" />
       <!-- Only include the last 10 events -->
       <xsl:apply-templates select="descendant::event[position() &lt;= 10]"/>
 
       </channel>
       </rss>
   </xsl:template>
 
   <!-- Generate the <item> elements and their content -->
   <xsl:template match="event">
     <xsl:param name="year" select="../../../name" />
     <xsl:param name="month" select="../../name" />
     <xsl:param name="day" select="../name" />
     <xsl:param name="this" select="." />
     <xsl:param name="pos">
       <xsl:for-each select="../event">
 	<xsl:if test=". = $this">
 	  <xsl:value-of select="position()" />
 	</xsl:if>
       </xsl:for-each>
     </xsl:param>
 
     <xsl:variable name="link">
 	<xsl:text>http://www.FreeBSD.org/news/newsflash.html#</xsl:text>
 	<xsl:call-template name="html-news-generate-anchor">
 	  <xsl:with-param name="label" select="'event'" />
 	  <xsl:with-param name="year" select="$year" />
 	  <xsl:with-param name="month" select="$month" />
 	  <xsl:with-param name="day" select="$day" />
 	  <xsl:with-param name="pos" select="$pos" />
 	</xsl:call-template>
     </xsl:variable>
 
     <item>
       <xsl:choose>
 	<xsl:when test="count(child::title)">
 	  <title><xsl:value-of select="normalize-space(title)"/></title>
 	  <description><xsl:value-of select="normalize-space(p)"/></description>
 	</xsl:when>
 	<xsl:otherwise>
 	  <title><xsl:value-of select="normalize-space(p)"/></title>
 	</xsl:otherwise>
       </xsl:choose>
       <link><xsl:value-of select="normalize-space($link)"/></link>
       <guid><xsl:value-of select="normalize-space($link)"/></guid>
 
       <pubDate>
 	<xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="day" select="$day" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
 	</xsl:call-template>
       </pubDate>
     </item>
   </xsl:template>
   
   <xsl:template match="name | date"/>
 
 </xsl:stylesheet>
diff --git a/share/sgml/templates.press-rss.xsl b/share/sgml/templates.press-rss.xsl
index eb764bd0cc..28a6a40ff8 100644
--- a/share/sgml/templates.press-rss.xsl
+++ b/share/sgml/templates.press-rss.xsl
@@ -1,127 +1,127 @@
 <?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 "FreeBSD in the Press">
 <!ENTITY link "http://www.FreeBSD.org/news/press.html">
 <!ENTITY email "freebsd-www">
 <!ENTITY realname "Webmaster Team">
 ]>
 
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/share/sgml/templates.press-rss.xsl,v 1.1 2008/01/16 08:21:47 murray Exp $ -->
 
 <!-- Copyright (c) 2008 Murray Stokely <murray@FreeBSD.org>
 
      All rights reserved.
 
      Redistribution and use in source and binary forms, with or without
      modification, are permitted provided that the following conditions
      are met:
      1. Redistributions of source code must retain the above copyright
 	notice, this list of conditions and the following disclaimer.
      2. Redistributions in binary form must reproduce the above copyright
 	notice, this list of conditions and the following disclaimer in the
 	documentation and/or other materials provided with the distribution.
 
      THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
      ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
      ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
      FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
      DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
      OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
      OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
      SUCH DAMAGE.
 -->
 
 <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:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
   
-  <xsl:output method="xml" indent="yes"/>
+  <xsl:output method="xml" indent="yes" encoding="&xml.encoding;"/>
 
   <xsl:variable name="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
   <!-- Generate the main body of the RSS file -->
   <xsl:template match="press">
     <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 
       <channel>
 	<title>&title;</title>
 	<link>&link;</link>
 	<description>Press Stories about FreeBSD</description>
 	<language>en-us</language>
 	<webMaster>&email;@FreeBSD.org (&realname;)</webMaster>
 	<managingEditor>&email;@FreeBSD.org (&realname;)</managingEditor>
 	<docs>http://blogs.law.harvard.edu/tech/rss</docs>
 	<ttl>120</ttl>
 	<image>
 	  <url>http://www.FreeBSD.org/logo/logo-full.png</url>
 	  <title>&title;</title>
 	  <link>&link;</link>
 	</image>
 	<atom:link href="http://www.FreeBSD.org/news/press-rss.xml" rel="self" type="application/rss+xml" />
 
         <!-- Only include the last 10 stories -->
         <xsl:apply-templates select="descendant::story[position() &lt;= 10]"/>
 
       </channel>
       </rss>
   </xsl:template>
 
   <!-- Generate the <item> elements and their content -->
   <xsl:template match="story">
     <xsl:param name="year" select="../../name" />
     <xsl:param name="month" select="../name" />
     <xsl:param name="this" select="." />
     <xsl:param name="pos">
       <xsl:for-each select="../story">
 	<xsl:if test=". = $this">
 	  <xsl:value-of select="position()" />
 	</xsl:if>
       </xsl:for-each>
     </xsl:param>
 
     <xsl:variable name="link">
 	<xsl:text>http://www.FreeBSD.org/news/press.html#</xsl:text>
 	<xsl:call-template name="html-news-generate-anchor">
 	  <xsl:with-param name="label" select="'story'" />
 	  <xsl:with-param name="year" select="$year" />
 	  <xsl:with-param name="month" select="$month" />
 	  <xsl:with-param name="pos" select="$pos" />
 	</xsl:call-template>
     </xsl:variable>
 
     <item>
       <title>
         <xsl:value-of select="name" />
         <xsl:if test="site-name"><xsl:text>, </xsl:text></xsl:if>
         <xsl:value-of select="site-name" />
         <xsl:if test="author"><xsl:text>, </xsl:text></xsl:if>
         <xsl:value-of select="author" />
       </title>
 
       <description><xsl:value-of select="normalize-space(p)"/></description>
 
       <link><xsl:value-of select="normalize-space($link)"/></link>
       <guid><xsl:value-of select="normalize-space($link)"/></guid>
 
       <pubDate>
 	<xsl:call-template name="misc-format-date-string">
 	    <xsl:with-param name="year" select="$year" />
 	    <xsl:with-param name="month" select="$month" />
 	    <xsl:with-param name="day" select="number(substring(date,0,3))" />
 	    <xsl:with-param name="date-format" select="$param-l10n-date-format-rfc822" />
 	</xsl:call-template>
       </pubDate>
     </item>
   </xsl:template>
   
   <xsl:template match="name | date"/>
 
 </xsl:stylesheet>
diff --git a/share/sgml/templates.usergroups.xsl b/share/sgml/templates.usergroups.xsl
index 6eb86451fe..31122bb998 100644
--- a/share/sgml/templates.usergroups.xsl
+++ b/share/sgml/templates.usergroups.xsl
@@ -1,95 +1,95 @@
 <?xml version="1.0"?>
 <!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 "User Groups">
 <!ENTITY email "freebsd-www">
 <!ENTITY % navinclude.community "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.10 2008/04/20 22:22:34 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.usergroups.xsl,v 1.11 2008/04/20 22:49:25 murray Exp $ -->
 
 <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:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:output method="xml"
+  <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="date">
     <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
   </xsl:variable>
 
   <xsl:key name="usergroup-by-country" match="entry"
     use="../@code" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />
 
   <xsl:template match="/">
     <html>
       &header1;
 
       <body>
 	<div id="CONTAINERWRAP">
 	  <div id="CONTAINER">
 	    &header2;
 
 	    <div id="CONTENT">
 	      <div id="SIDEWRAP">
 		&nav;
 	      </div> <!-- SIDEWRAP -->
 
 	      <div id="CONTENTWRAP">
 		&header3;
 
   <xsl:variable name="chart-countries">
     <xsl:for-each select="//entry[
 	generate-id() =
 	generate-id(key('usergroup-by-country', ../@code)[1])]">
 <!--      <xsl:sort select="format-number(count(key('event-by-country', location/country)), '000')" order="descending"/>
 -->
         <xsl:value-of select="../@code" />
     </xsl:for-each>
   </xsl:variable>
 
   <xsl:variable name="chart-country-counts">
     <xsl:for-each select="//entry[
 	generate-id() =
 	generate-id(key('usergroup-by-country', ../@code)[1])]">
         <xsl:value-of select="count(key('usergroup-by-country', ../@code))" />.0<xsl:if test="position()!=last()">,</xsl:if></xsl:for-each>
   </xsl:variable>
 
   <xsl:variable name="imageurl"><xsl:value-of select="$charturl"/>&amp;chd=t:<xsl:value-of select="$chart-country-counts"/>&amp;chld=<xsl:value-of select="$chart-countries"/></xsl:variable>
 
 	<xsl:call-template name="html-usergroups-list-header" />
 
 	<xsl:call-template name="html-usergroups-list-regions">
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
 
 	<xsl:call-template name="html-usergroups-map">
 	  <xsl:with-param name="mapurl" select="$imageurl" />
 	</xsl:call-template>
 
 	<xsl:call-template name="html-usergroups-list-entries">
           <xsl:with-param name="usergroups.xml" select="$usergroups.xml" />
           <xsl:with-param name="usergroups-local.xml" select="$usergroups-local.xml" />
 	</xsl:call-template>
 
 	      </div> <!-- CONTENTWRAP -->
 
 	      <br class="clearboth" />
 	    </div> <!-- CONTENT -->
 
 	    <div id="FOOTER">
 	      &copyright;<br />
 	      &date;
 	    </div> <!-- FOOTER -->
 	  </div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
       </body>
     </html>
   </xsl:template>
 </xsl:stylesheet>