Index: head/share/xml/header.ent
===================================================================
--- head/share/xml/header.ent	(revision 45489)
+++ head/share/xml/header.ent	(revision 45490)
@@ -1,200 +1,201 @@
 <!-- $FreeBSD$ -->
 
 <!-- FreeBSD HTML Header Entities -->
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header Entities//EN" -->
 
 <!-- Images -->
 <!ENTITY i.daemon '<img xmlns="http://www.w3.org/1999/xhtml" src="&enbase;/gifs/daemon.gif" alt="" align="left"  width="80" height="76"/>'>
 <!ENTITY i.new '<img xmlns="http://www.w3.org/1999/xhtml" src="&enbase;/gifs/new.gif" alt="[New!]" width="28" height="11"/>'>
 
 <!-- Components making up the standard headers and footers. -->
 <!-- Override in the prolog <em>before</em> including this  -->
 <!-- file if necessary.                                      -->
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">Site Map</a> |
   <a href="&base;/copyright/">Legal Notices</a> | &copy; 1995&ndash;2014 The FreeBSD Project.
   All rights reserved.</span>'>
 <!ENTITY email 'freebsd-questions'>
 <!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY home '<a href="&base;/index.html"><img src"&enbase;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
 <!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20130112'>
 
 <!-- Standard headers and footers -->
 
 <![%html.header.script.google;[
 <!ENTITY header1.googlejs '<script xmlns="http://www.w3.org/1999/xhtml" type="text/javascript" src="&enbase;/layout/js/google.js"></script>'>
 ]]>
 <!ENTITY header1.googlejs ''>
 
 <!ENTITY header2.logo-red.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Header And Logo</h2>'>
 
 <!ENTITY header2.logo-red '
 <a xmlns="http://www.w3.org/1999/xhtml" href="&base;" title="FreeBSD"><img src="&enbase;/layout/images/logo-red.png"
 				      width="457" height="75" alt="FreeBSD" /></a>
 '>
 
 <!ENTITY header2.word.search 'Search'>
 <!ENTITY header2.word.donate 'Donate'>
 <!ENTITY header2.word.contact 'Contact'>
 
 <!ENTITY header2.donatebutton '
   <div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
     <div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
       <div class="frontdonatecontent">
 	<a
 	  href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
       </div>
     <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
   </div>
 '>
 
 <!ENTITY header2.searchinputs '
 	<div xmlns="http://www.w3.org/1999/xhtml">
             <input type="hidden" name="max" value="25" />
             <input type="hidden" name="source" value="www" />
             <input id="words" name="words" type="text" size="20"
                    maxlength="255"
                    onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;"
                    value="&header2.word.search;" /><![CDATA[ ]]>
 	    <span>&nbsp;</span>
             <input id="submit" name="submit" type="submit" value="&header2.word.search;" />
 	</div>
 '>
 
 <!ENTITY header2.topnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Site Navigation</h2>'>
 
 <!ENTITY header2.topnav '
   <div xmlns="http://www.w3.org/1999/xhtml" id="menu">
     <ul class="first">
       <li><a href="&base;/">Home</a></li>
     </ul>
     <ul>
       <li><a href="&base;/about.html">About</a>
 	<ul>
 	  <li><a href="&base;/projects/newbies.html">Introduction</a></li>
 	  <li><a href="&base;/features.html">Features</a></li>
 	  <li><a href="&base;/advocacy/">Advocacy</a></li>
 	  <li><a href="&base;/marketing/">Marketing</a></li>
 	  <li><a href="&base;/privacy.html">Privacy Policy</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="&base;/where.html">Get FreeBSD</a>
 	<ul>
 	  <li><a href="&base;/releases/">Release Information</a></li>
 	  <li><a href="&base;/releng/">Release Engineering</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="&base;/docs.html">Documentation</a>
 	<ul>
 	  <li><a href="&base;/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
 	  <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
 	  <li><a href="&base;/doc/en_US.ISO8859-1/books/porters-handbook">Porter&#39;s Handbook</a></li>
 	  <li><a href="&base;/doc/en_US.ISO8859-1/books/developers-handbook">Developer&#39;s Handbook</a></li>
 	  <li><a href="&cgibase;/man.cgi">Manual Pages</a></li>
 	  <li><a href="&base;/doc/en_US.ISO8859-1/books/fdp-primer">Documentation Project Primer</a></li>
 	  <li><a href="&base;/docs/books.html">All Books and Articles</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="&base;/community.html">Community</a>
 	<ul>
 	  <li><a href="&base;/community/mailinglists.html">Mailing Lists</a></li>
 	  <li><a href="https://forums.FreeBSD.org">Forums</a></li>
 	  <li><a href="&base;/usergroups.html">User Groups</a></li>
 	  <li><a href="&base;/events/events.html">Events</a></li>
 	  <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (external)</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="&base;/projects/index.html">Developers</a>
 	<ul>
 	  <li><a href="https://wiki.FreeBSD.org/IdeasPage">Project Ideas</a></li>
 	  <li><a href="https://svnweb.FreeBSD.org">SVN Repository</a></li>
 	  <li><a href="http://p4web.FreeBSD.org">Perforce Repository</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="&base;/support.html">Support</a>
 	<ul>
 	  <li><a href="&base;/commercial/commercial.html">Vendors</a></li>
 	  <li><a href="http://security.FreeBSD.org/">Security Information</a></li>
 	  <li><a href="https://bugs.FreeBSD.org/search/">Bug Reports</a></li>
 	  <li><a href="https://www.FreeBSD.org/support.html">Submit Bug-report</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="http://www.freebsdfoundation.org/">Foundation</a>
 	<ul>
 	  <li><a href="http://www.freebsdfoundation.org/donate/">Monetary Donations</a></li>
 	  <li><a href="&base;/donations/">Hardware Donations</a></li>
 	</ul>
       </li>
     </ul>
   </div> <!-- MENU -->
 '>
 
 <!ENTITY header2.searchnav.label '<h2 xmlns="http://www.w3.org/1999/xhtml" class="blockhide">Peripheral Links</h2>'>
 
 <!ENTITY header2.searchnav '
       <div xmlns="http://www.w3.org/1999/xhtml" id="searchnav">
         <ul id="searchnavlist">
 	  <!--<li><a href="&base;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>-->
 
 	  <!--<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>-->
         </ul>
       </div> <!-- SEARCHNAV -->
 '>
 
 <!ENTITY header2.skipnav '
 <span xmlns="http://www.w3.org/1999/xhtml" class="txtoffscreen">
   <a href="#content" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)
   <a href="#contentwrap" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)
 </span>'>
 
 <!ENTITY header2 '
 &header2.skipnav;
 
-<div id="headercontainer">
+<div xmlns="http://www.w3.org/1999/xhtml" id="headercontainer">
   <div id="header">
-    <h2 class="blockhide">Header And Logo</h2>
+    &header2.logo-red.label;`
 
     <div id="headerlogoleft">
       &header2.logo-red;
     </div> <!-- HEADERLOGOLEFT -->
 
     <div id="headerlogoright">
       &header2.donatebutton;
       &header2.searchnav.label;
 
       &header2.searchnav;
 
       <div id="search">
         <form action="&cgibase;/search.cgi" method="get">
           <div>
             <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
 
             &header2.searchinputs;
           </div>
         </form>
       </div> <!-- SEARCH -->
     </div> <!-- HEADERLOGORIGHT -->
   </div> <!-- HEADER -->
 
+  &header2.topnav.label;
   &header2.topnav;
 </div> <!-- HEADERCONTAINER -->
 '>
 
 <!ENTITY lastmod 'Last modified: '>
 
 <!-- macro for webbuild paper -->
 <!ENTITY webbuild '
 <p xmlns="http://www.w3.org/1999/xhtml">This document describes how to build and update
 the FreeBSD Web pages from the Subversion repository by hand.</p>'>
Index: head/share/xml/xhtml.xsl
===================================================================
--- head/share/xml/xhtml.xsl	(revision 45489)
+++ head/share/xml/xhtml.xsl	(revision 45490)
@@ -1,200 +1,166 @@
 <?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/share/xml/xslt10-freebsd.dtd">
 <!-- $FreeBSD$ -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
   xmlns:xhtml="http://www.w3.org/1999/xhtml"
   xmlns:db="http://docbook.org/ns/docbook"
   xmlns:str="http://exslt.org/strings"
   xmlns="http://www.w3.org/1999/xhtml"
   exclude-result-prefixes="cvs xhtml"
   extension-element-prefixes="str">
 
   <xsl:variable name="rsslink" select="''"/>
 
   <xsl:variable name="rsstitle" select="''"/>
 
   <xsl:variable name="svnKeyword">
     <xsl:value-of select="normalize-space(//cvs:keyword[1])"/>
   </xsl:variable>
 
   <xsl:variable name="date">
     <xsl:value-of select="str:split($svnKeyword, ' ')[4]"/>
   </xsl:variable>
 
   <xsl:variable name="title">
     <xsl:value-of select="/xhtml:html/xhtml:head/xhtml:title"/>
   </xsl:variable>
 
   <xsl:output type="xml" encoding="&xml.encoding;"
     indent="yes"
     doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
     doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" />
 
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml">
       <head>
 	<title><xsl:value-of select="$title" /></title>
 	<xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:base" />
 	<meta http-equiv="Content-Type" content="text/html; charset=&xml.encoding;" />
 	<xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:meta"/>
 	<link rel="shortcut icon" href="&enbase;/favicon.ico" type="image/x-icon" />
 	<link rel="stylesheet" media="screen" href="&stylesheet;" type="text/css"/>
 	<xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:link"/>
 	<xsl:call-template name="process.rss.link"/>
 	&header1.googlejs;
       </head>
 
       <body>
 	<div id="containerwrap">
 	  <div id="container">
-	    &header2.skipnav;
-
-	    <div id="headercontainer">
-	      <div id="header">
-
-		&header2.logo-red.label;
-
-		<div id="headerlogoleft">
-		  &header2.logo-red;
-		</div> <!-- HEADERLOGOLEFT -->
-
-		<div id="headerlogoright">
-		  &header2.donatebutton;
-
-		  &header2.searchnav.label;
-
-		  &header2.searchnav;
-
-		<div id="search">
-		  <form action="&cgibase;/search.cgi" method="get">
-		    <div>
-		      <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
-
-		      &header2.searchinputs;
-		    </div>
-		  </form>
-		</div> <!-- SEARCH -->
-	      </div> <!-- HEADERLOGORIGHT -->
-	    </div> <!-- HEADER -->
-
-	    &header2.topnav.label;
-
-	    &header2.topnav;
-
-	  </div> <!-- HEADERCONTAINER -->
+	    &header2;
 
 	  <div id="content">
 	      <xsl:call-template name="process.content"/>
 	    </div> <!-- CONTENT -->
 
 	    <div id="footer">
 	      <xsl:call-template name="process.footer"/>
 	    </div> <!-- FOOTER -->
 	  </div> <!-- CONTAINER -->
 	</div> <!-- CONTAINERWRAP -->
       </body>
     </html>
   </xsl:template>
 
   <xsl:template name="process.rss.link">
     <xsl:if test="$rsslink != ''">
       <link rel="alternate" type="application/rss+xml"
 	title="{$rsstitle}" href="{$rsslink}" />
     </xsl:if>
   </xsl:template>
 
   <xsl:template name="process.sidewrap">
               <xsl:choose xmlns:xhtml="http://www.w3.org/1999/xhtml">
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.about'">
                   &nav.about;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.community'">
                   &nav.community;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.developers'">
                   &nav.developers;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.docs'">
                   &nav.docs;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.download'">
                   &nav.download;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.gnome'">
                   &nav.gnome;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.ports'">
                   &nav.ports;
                 </xsl:when>
 
                 <xsl:when test="xhtml:html/xhtml:body/@class = 'navinclude.support'">
                   &nav.support;
                 </xsl:when>
               </xsl:choose>
   </xsl:template>
 
   <xsl:template name="process.content">
 	    <div id="sidewrap">
       <xsl:call-template name="process.sidewrap"/>
 	    </div> <!-- SIDEWRAP -->
 
 	    <div id="contentwrap">
       <xsl:call-template name="process.contentwrap"/>
 	    </div> <!-- CONTENTWRAP -->
 
 	    <br class="clearboth" />
   </xsl:template>
 
   <xsl:template name="process.contentwrap">
     <h1><xsl:value-of select="$title" /></h1>
 
     <xsl:for-each select="xhtml:html/xhtml:body">
       <xsl:apply-templates />
     </xsl:for-each>
   </xsl:template>
 
   <xsl:template match="db:email">
     <xsl:text>&lt;</xsl:text>
     <xsl:choose>
       <xsl:when test="@role='nolink'">
 	<xsl:apply-templates />
       </xsl:when>
       <xsl:otherwise>
 	<a>
 	  <xsl:attribute name="href">
 	    <xsl:text>mailto:</xsl:text>
 	    <xsl:value-of select="." />
 	  </xsl:attribute>
 	  <xsl:apply-templates />
 	</a>
       </xsl:otherwise>
     </xsl:choose>
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 
   <xsl:template match="xhtml:*">
     <xsl:copy xmlns:xhtml="http://www.w3.org/1999/xhtml">
       <xsl:for-each select="@*">
         <xsl:copy />
       </xsl:for-each>
       <xsl:apply-templates />
     </xsl:copy>
   </xsl:template>
 
   <xsl:template name="process.footer">
     &copyright;<br/>
     <xsl:if test="$date != ''">
       &lastmod; <xsl:value-of select="$date"/>
     </xsl:if>
   </xsl:template>
 </xsl:stylesheet>