Index: head/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl
===================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl	(revision 53665)
+++ head/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl	(revision 53666)
@@ -1,268 +1,268 @@
 # $FreeBSD$
 #
 # Perl routines to encapsulate various elements of HTML page style.
 
 # For future reference, when is now?
 ($se,$mn,$hr,$md,$mo,$yr,$wd,$yd,$dst) = localtime(time);
 $yr += 1900;
 $mo += 1;
 $timestamp = "$mo-$md-$yr";
 
 if (!defined($hsty_base)) { 
     # $hsty_base should be relative if possible, so that mirrors
     # serve their local copy instead of going to the main site.
     # However, if we aren't running as a cgi, or if we're
     # running on cgi, hub, docs or people, use the absolute home path.
     if (!defined($ENV{'HTTP_HOST'}) ||
 	$ENV{'HTTP_HOST'} =~ /(cgi|hub|docs|people|mailarchive.ysv).freebsd.org/i) {
 
 	$hsty_base = '//www.FreeBSD.org'
     } else {
 	$hsty_base = '..';
     }
 }
 if (!defined($hsty_email)) {
     $hsty_email = 'Contact';
 }
 if (!defined($hsty_author)) {
     $hsty_author = "<a href='$hsty_base/mailto.html'>$hsty_email</a>";
 }
 
 if (!defined($hsty_date)) {
     $hsty_date = '';
 }
 
 if (!defined($hsty_charset)) {
     $hsty_charset = 'iso-8859-1';
 }
 
 # This can be set to either a string containing an inline CSS stylesheet
 # or to a <link> element that references an external CSS stylesheet, to
 # make local modifications to the style of a CGI script's output.
 $t_style = "";	# Don't allow script to override completely, just
 		# let the script's setting cascade with the master.
 
 $i_topbar = qq`
     <div id="containerwrap">
       <div id="container">
         <span class="txtoffscreen"><a href="#content"
         title="Skip site navigation" accesskey="1">Skip site
         navigation</a> (1)</span><span class="txtoffscreen"><a
         href="#content" title="Skip section navigation"
         accesskey="2">Skip section navigation</a> (2)</span>
 
         <div id="headercontainer">
           <div id="header">
             <h2 class="blockhide">Header And Logo</h2>
 
             <div id="headerlogoleft">
               <a href="$hsty_base" title="FreeBSD"><img
               src="$hsty_base/layout/images/logo-red.png" width="457"
               height="75" alt="FreeBSD" /></a>
             </div>
 
             <div id="headerlogoright">
               <h2 class="blockhide">Peripheral Links</h2>
 
 	      <div class="frontdonateroundbox">
 		<div class="frontdonatetop">
 		  <div>
 		    <b style="display: none;">.</b>
 		  </div>
 		</div>
 		<div class="frontdonatecontent">
 		  <a href="https://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
 		</div>
 		<div class="frontdonatebot">
 		  <div>
 		    <b style="display: none;">.</b>
 		  </div>
 		</div>
 	      </div>
 
               <div id="search">
-		<form method="get" id="search" action="https://duckduckgo.com/">
+		<form method="get" id="search-form" action="https://duckduckgo.com/">
 		  <h2 class="blockhide"><label for="words">Search</label></h2>
 		  <input type="hidden" name="sites" value="www.FreeBSD.org,docs.FreeBSD.org,lists.FreeBSD.org,wiki.FreeBSD.org,forums.FreeBSD.org" />
 		  <input type="hidden" name="ka" value="v" />
 		  <input type="hidden" name="kt" value="v" />
 		  <input type="hidden" name="kh" value="1" />
 		  <input type="hidden" name="kj" value="r2" />
 		  <input id="words" name="q" type="text" size="20"
                     autocapitalize="none"
 		    maxlength="255"
 		    onfocus="if( this.value==this.defaultValue ) this.value='';"
 		    value="Search" />
 		  <span>&nbsp;</span>
 		  <input id="submit" name="submit" type="submit" value="Search" />
 		</form>
               </div>
             </div>
           </div>
 
           <h2 class="blockhide">Site Navigation</h2>
 
 	  <div id="menu">
 	    <ul class="first">
 	      <li><a href="$hsty_base/">Home</a></li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/about.html">About</a>
 		<ul>
 		  <li><a href="$hsty_base/projects/newbies.html">Introduction</a></li>
 		  <li><a href="$hsty_base/features.html">Features</a></li>
 		  <li><a href="$hsty_base/advocacy/">Advocacy</a></li>
 		  <li><a href="$hsty_base/marketing/">Marketing</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/where.html">Get FreeBSD</a>
 		<ul>
 		  <li><a href="$hsty_base/releases/">Release Information</a></li>
 		  <li><a href="$hsty_base/releng/">Release Engineering</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/docs.html">Documentation</a>
 		<ul>
 		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/faq/">FAQ</a></li>
 		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/handbook/">Handbook</a></li>
 		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/porters-handbook">Porter's Handbook</a></li>
 		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/developers-handbook">Developer's Handbook</a></li>
 		  <li><a href="$hsty_base/cgi/man.cgi">Manual Pages</a></li>
 		  <li><a href="$hsty_base/doc/en_US.ISO8859-1/books/fdp-primer">Documentation Project Primer</a></li>
 		  <li><a href="$hsty_base/docs/books.html">All Books and Articles</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/community.html">Community</a>
 		<ul>
 		  <li><a href="$hsty_base/community/mailinglists.html">Mailing Lists</a></li>
 		  <li><a href="https://forums.FreeBSD.org">Forums</a></li>
 		  <li><a href="$hsty_base/usergroups.html">User Groups</a></li>
 		  <li><a href="$hsty_base/events/events.html">Events</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/projects/index.html">Developers</a>
 		<ul>
 		  <li><a href="$hsty_base/projects/ideas/ideas.html">Project Ideas</a></li>
 		  <li><a href="//svnweb.FreeBSD.org">SVN Repository</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="$hsty_base/support.html">Support</a>
 		<ul>
 		  <li><a href="$hsty_base/commercial/commercial.html">Vendors</a></li>
 		  <li><a href="//security.FreeBSD.org/">Security Information</a></li>
 		  <li><a href="https://bugs.freebsd.org/search/">Bug Reports</a></li>
 		  <li><a href="$hsty_base/support.html">Submit Bug-report</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	    <ul>
 	      <li><a href="//www.freebsdfoundation.org/">Foundation</a>
 		<ul>
 		  <li><a href="//www.freebsdfoundation.org/donate/">Donate</a></li>
 		</ul>
 	      </li>
 	    </ul>
 	  </div> <!-- MENU -->
         </div>
 
 	<div id="content">
 `;
 
 #XXX does anyone use this? I don't know what it should be in the new style.
 if (!defined($hsty_home)) {
     $hsty_home = "<a href='$hsty_base/'><img src='$hsty_base/gifs/home.gif'
   alt='FreeBSD Home Page' border='0' align='right'></a>";
 }
 
 sub html_header {
     local ($title, $xhtml) = @_;
 
     return short_html_header($title, $xhtml) . "<h1>$title</h1>\n";
 }
 
 sub short_html_header {
     local ($title, $xhtml) = @_;
 
     $xhtml = 1 unless defined($xhtml);
     $doctype = $xhtml ?  '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' : '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">';
     $html = $xhtml ? '<html xmlns="http://www.w3.org/1999/xhtml">' : '<html>';
     $endslash = $xhtml ? '/' : '';
     $csshack = (1 || $xhtml) ? '' : q`<style type="text/css">
 tr, td {
   margin: 0;
   padding: 0;
   font-family: verdana, sans-serif;
   font-size: 69%;
   color: #000;
 }
 </style>
 `;
 
     return qq`Content-type: text/html
 
 $doctype
 $html
 
 <head><title>$title</title>
 <meta http-equiv='content-type' content='text/html; charset=$hsty_charset' $endslash>
 <meta name='robots' content='nofollow' $endslash>
     <link rel="stylesheet" media="screen"
     href="$hsty_base/layout/css/fixed.css" type="text/css"
     title="Normal Text" $endslash>
     <link rel="alternate stylesheet" media="screen"
     href="$hsty_base/layout/css/fixed_large.css" type="text/css"
     title="Large Text" $endslash>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="/favicon.ico" type="image/x-icon" />
 $csshack
 <script type="text/javascript" src="$hsty_base/layout/js/google.js">
 </script>
 $t_style
 </head>
 <body>
 $i_topbar
 `;
 }
 
 sub html_footer {
     return qq`
 	</div>
         <div id="footer">
           <a href="$hsty_base/copyright/">Legal Notices</a> | &copy; 1995-2019
           The FreeBSD Project. All rights reserved.<br />
 	  <address>$hsty_author<br />$hsty_date</address>
         </div>
       </div>
     </div>
   </body>
 </html>
 `;
 
 
 }
 
 sub get_the_source {
     return if $ENV{'PATH_INFO'} ne '/get_the_source';
 
     open(R, $0) || do { 
 	print "Oops! open $0: $!\n";  # should not reached
 	exit;
     };
 
     print "Content-type: text/plain\n\n";
     while(<R>) { print }
     close R;
     exit;
 }
 
 1;
Index: head/en_US.ISO8859-1/htdocs/layout/css/layout.css
===================================================================
--- head/en_US.ISO8859-1/htdocs/layout/css/layout.css	(revision 53665)
+++ head/en_US.ISO8859-1/htdocs/layout/css/layout.css	(revision 53666)
@@ -1,527 +1,521 @@
 /*
  * FreeBSD.org - Layout Styles
  *
  * $FreeBSD$
  */
 
 /* Container Definitions */
 
 /* Page Container */
 
 #containerwrap {
   text-align: center; /* Win IE5 */
 }
 
 #container {
   margin: 0em auto;
   width: 90%;
   padding: 0;
   padding-top: 0px;
   padding-bottom: 15px;
   text-align: left; /* Win IE5 */
 }
 
 /* Header */
 
 #headercontainer {
   padding-bottom: 2px;
 }
 
 #header {
   position: relative;
   height: 15%;
   margin: 0;
   padding: 0;
   clear: both;
 }
 
 #headerlogoleft {
   position: relative;
   border: 0px;
   padding: 0px;
   top: 0px;
   float: left;
 }
 
 #headerlogoleft img {
   border: 0px;
 }
 
 #headerlogoright {
   position: relative;
   border: 0px;
   padding-left: 0px;
   float: right;
 }
 
 #headerlogoright img {
   border: 0px;
 }
 
 /* Search */
 
 @media screen {
 #search {
-  position: relative;
   text-align: right;
   padding: 0;
-  margin: 0;
-  margin-top: 6px;
   color: #666;
 }
 
 #search form {
-  position: relative;
-  top: 5px;
-  right: 0;
   margin: 0; /* need for IE Mac */
   text-align: right; /* need for IE Mac */
   white-space: nowrap; /* for Opera */
 }
 
 #search form label {
   color: #666;
 }
 
 #search form #submit {
   background: transparent;
   color: #fff;
   border-right: 1px solid #DADADA;
   border-bottom: 1px solid #DADADA;
   border-top: 1px solid #DADADA;
   border-left: 1px solid #DADADA;
   padding: 1px 5px 1px 5px;
 }
 
 #search form #words {
   width: 50%;
   border: 1px solid #DADADA;
   background: #FFFFFF;
   color: #666;
   padding: 2px 2px 2px 5px;
 }
 }
 
 @media print {
 #search { display: none; }
 }
 
 /* Mirror Select */
 
 #mirror {
   text-align: right;
   padding: 0;
   margin: 0;
   margin-top: 6px;
   color: #666;
 }
 
 #mirror form {
   padding-top: 5px;
   right: 0;
   margin: 0; /* need for IE Mac */
   text-align: right; /* need for IE Mac */
   white-space: nowrap; /* for Opera */
 }
 
 #mirror form label {
   color: #666;
   font-size: 0.8em;
 }
 
 #mirror form select {
   font-size: 0.8em;
 }
 
 #mirror form #mirrorsel {
   font-size: 0.8em;
   width: 150px;
   border: 1px solid #DADADA;
   background: #FFFFFF;
   color: #666;
 }
 
 #mirror input {
   font-size: 0.8em;
   background: transparent;
   color: #666;
   border: 1px solid #DADADA;
 }
 
 /* Content */
 
 #content {
   clear: both;
   display: block;
 }
 
 #frontcontainer {
   width: 100%;
 }
 
 #frontfeaturecontainer {
   clear: both;
 }
 
 #frontfeatureleft{
   width: 30%;
   margin: 0;
   padding: 0;
   float: left;
 }
 
 #frontfeatureleft h2 {
   border: none;
   margin-top: 0;
 }
 
 #frontfeatureleft p {
   margin: 0 0 1em 0;
 }
 
 	#frontfeaturecontent {
 	  margin: 10px 10px 10px 13px;
 	}
 
 #frontfeaturemiddle {
   float: left;
   margin-top: 20px;
   background: url(../images/beastie.png) no-repeat top left;
   min-height: 196px;
   width: 30%;
 }
 
 #frontfeatureright {
   position: relative;
   border: 0px;
   padding: 0px;
   margin: 0px;
   width: 30%;
   float: right;
 }
 
 /* News/Events/Media/Security Box */
 
 #frontnemscontainer {
   width: 100%;
   background: #eee;
   display: inline;
   float: left;
   margin-top: 8px;
   margin-bottom: 8px;
 }
 
 #frontnews {
   width: 24%;
   margin: 0;
   padding: 0;
   float: left;
 }
 
 #frontnewscontent {
   margin: 17px 15px 24px 18px;
 }
 
 #frontevents {
   width: 24%;
   margin: 0;
   padding: 0;
   float: left;
 }
 
 #fronteventscontent {
   margin: 17px 15px 24px 14px;
 }
 
 #frontmedia {
   width: 24%;
   margin: 0;
   padding: 0;
   float: left;
 }
 
 #frontmediacontent {
   margin: 17px 15px 24px 14px;
 }
 
 #frontsecurity {
   width: 24%;
   margin: 0;
   padding: 0;
   float: left;
 }
 
 #frontsecuritycontent {
   margin: 17px 15px 24px 14px;
 }
 
 /* No way to get equal columns in pure CSS - setting height is a temporary hack */
 .frontseparator {
   width: 0.5%;
   height: 500px;
   margin: 0;
   padding: 0;
   background-color: #fff;
   float: left;
 }
 
 .newseventswrap {
   padding-left: 5px;
 }
 
 .newseventslist {
   list-style: none;
   margin: 0;
   padding: 0;
   display: inline;
 }
 
 .newseventslist img.rssimage {
   display: inline;
   border: 0;
   vertical-align: bottom;
 }
 
 .newseventslist li {
   padding: 0 0.3em 0 0.5em;
   display: inline;
   border-right: 1px solid #E1E1E1;
 }
 
 .newseventslist li a {
 }
 
 .newseventslist li.last-child {
   border-right: 0;
   padding-right: 0;
 }
 
 .newseventslist li.first-child {
   padding-left: 0;
 }
 
 .newseventslist li.only-child {
   border-right: 0;
   padding-left: 0;
 }
 
 /* Shortcuts */
 
 #frontshortcuts {
   margin: 0;
   padding: 0;
   color: #666;
 }
 
 #frontshortcutscontent {
   float: right;
   margin: 0;
   padding: 0;
   padding-left: 15px;
   padding-top: 20px;
 }
 
 #frontshortcutslist {
   margin: 0;
   padding: 0;
   margin-left: 5px;
   margin-top: 5px;
   list-style: none;
 }
 
 #frontshortcutslist li {
   margin: 0;
   padding-left: 12px;
   background-image: url(../images/blt_red_arrow.png);
   background-repeat: no-repeat;
   background-position: 0px 0.5em;
 }
 
 /* Latest Releases */
 
 #frontreleases {
   padding: 0;
   margin: 8px;
   margin-left: 190px;
   margin-top: 5px;
   padding-bottom: 20px;
   color: #666;
   width: 85%;
 }
 
 #frontreleasescontent {
   margin: 0;
   padding: 0;
 }
 
 #frontreleaseslist {
   margin: 0;
   padding: 0;
   margin-left: 5px;
   margin-top: 5px;
   list-style: none;
 }
 
 #frontreleaseslist li {
   margin: 0;
   padding-left: 12px;
   background-image: url(../images/blt_red_arrow.png);
   background-repeat: no-repeat;
   background-position: 0px 0.5em;
 }
 
 /* New User Box */
 
  /* height and width details */
 .frontnewtop div, .frontnewtop, .frontnewbot div, .frontnewbot {
   width: 100%;
   height: 12px;
 }
 
 .frontnewcontent {
   margin: 0;
   padding: 0;
   margin-top: -4px;
   margin-bottom: -4px;
   text-align: center;
   font-size: 1.1em;
   font-weight: bold;
 }
 
 .frontnewcontent a, .frontnewcontent a:link, .frontnewcontent a:visited, .frontnewcontent a:hover, .frontnewcontent a:active {
   color: #990000;
   text-decoration: none;
 }
 
 .frontnewroundbox {
   float: left;
   margin: 0;
   margin-top: 30px;
   padding: 0;
   width: 130px;
   background-color: #D8D8D8;
   border-radius: 10px;
 }
 
 /* Donate Button */
  /* height and width details */
 .frontdonatetop div, .frontdonatetop, .frontdonatebot div, .frontdonatebot {
   width: 20%;
   height: 10px;
   font-size: 1px;
   text-align: center;
 }
 
 .frontdonatecontent {
   margin: 0;
   padding: 0;
   margin-top: -4px;
   margin-bottom: -4px;
   text-align: center;
   font-size: 1.1em;
   font-weight: bold;
 }
 
 .frontdonatecontent a, .frontdonatecontent a:link, .frontdonatecontent a:visited, .frontdonatecontent a:hover, .frontdonatecontent a:active {
   color: #990000;
   text-decoration: none;
 }
 
 .frontdonateroundbox {
   margin-top: 0.5em;
   padding: 0;
   white-space: nowrap;
   background-color: white;
   border-radius: 10px;
 }
 
 /* Get FreeBSD Box */
 
  /* height and width details */
 .frontgettop div, .frontgettop, .frontgetbot div, .frontgetbot {
   width: 100%;
   height: 18px;
   font-size: 1px;
 }
 
 .frontgetcontent {
   margin: 0;
   padding: 0;
   margin-top: -8px;
   margin-bottom: -8px;
   text-align: center;
   font-size: 1.4em;
   font-weight: bold;
 }
 
 .frontgetcontent a, .frontgetcontent a:link, .frontgetcontent a:visited, .frontgetcontent a:hover, .frontgetcontent a:active {
   color: #990000;
   text-decoration: none;
 }
 
 .frontgetroundbox {
   margin-top: 50px;
   margin-left: 160px;
   padding: 0;
   width: 190px;
   background-color: #FACC2E;
   border-radius: 15px;
 }
 
 /* Secondary Pages */
 
 @media screen {
 #sidewrap {
   float: left;
   width: 166px;
   margin-top: 15px;
   margin-right: -170px;
 }
 
 #rightwrap {
   float: right;
   width: 166px;
   margin-left: 15px;
 }
 
 #contentwrap {
   margin-left: 170px;
   padding-top: 15px;
 }
 }
 
 @media print {
 #sidewrap, #rightwrap { display: none; }
 #contentwrap { margin-left: 16px; padding-top: 15px; }
 }
 
 /* Footer */
 
 #footer {
   font-size: 0.9em;
   text-align: center;
   color: #737373;
   line-height: 1.3em;
   padding-top: 5px;
   clear: both;
 }
 
 /* Misc Classes */
 
 .clearboth {
   clear: both;
   margin: 0;
   padding: 0;
 }
 
 .blockhide {
   display: none;
   height: 0;
   width: 0;
   overflow: hidden;
   position: absolute;  /* IE5 Mac */
 }
 
 img {
   border: 0;
 }
Index: head/share/xml/header.ent
===================================================================
--- head/share/xml/header.ent	(revision 53665)
+++ head/share/xml/header.ent	(revision 53666)
@@ -1,215 +1,215 @@
 <!-- $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;2019 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="https://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
       </div>
     <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
   </div>
 '>
 
 <!-- Legacy until translations catch up -->
 <!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.searchbox '
   <div id="search" xmlns="http://www.w3.org/1999/xhtml">
-    <form method="get" id="search" action="https://duckduckgo.com/">
+    <form method="get" id="search-form" action="https://duckduckgo.com/">
       <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
       <input type="hidden" name="sites" value="www.FreeBSD.org,docs.FreeBSD.org,lists.FreeBSD.org,wiki.FreeBSD.org,forums.FreeBSD.org" />
       <input type="hidden" name="ka" value="v" />
       <input type="hidden" name="kt" value="v" />
       <input type="hidden" name="kh" value="1" />
       <input type="hidden" name="kj" value="r2" />
       <input id="words" name="q" type="text" size="20"
         maxlength="255"
         onfocus="if( this.value==this.defaultValue ) this.value=&#39;&#39;;"
         value="&header2.word.search;" />
       <span>&nbsp;</span>
       <input id="submit" name="submit" type="submit" value="&header2.word.search;" />
     </form>
   </div> <!-- SEARCH -->
 '>
 
 <!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://freebsdjournal.com">FreeBSD Journal</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">Subversion Repository</a></li>
 	  <li><a href="https://github.com/freebsd">Git Mirror</a></li>
 	  <li><a href="https://reviews.FreeBSD.org">Code Review (Phabricator)</a></li>
 	  <li><a href="https://wiki.FreeBSD.org">Wiki</a></li>
 	  <li><a href="https://ci.FreeBSD.org">Continuous Integration Service</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="&base;/security/">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">Submitting Bug Reports</a></li>
 	</ul>
       </li>
     </ul>
     <ul>
       <li><a href="https://www.freebsdfoundation.org/">Foundation</a>
 	<ul>
 	  <li><a href="https://www.freebsdfoundation.org/donate/">Monetary Donations</a></li>
 	  <li><a href="&base;/donations/index.html#systems">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 xmlns="http://www.w3.org/1999/xhtml" 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;
       &header2.searchbox;
     </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>'>