Index: head/share/xml/header.ent
===================================================================
--- head/share/xml/header.ent	(revision 54577)
+++ head/share/xml/header.ent	(revision 54578)
@@ -1,216 +1,216 @@
 <!-- $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;2020 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-form" action="https://duckduckgo.com/"
-      onsubmit="document.getElementById(&#39;words&#39;).value+=&#39; site: www.FreeBSD.org site: docs.FreeBSD.org site: lists.FreeBSD.org site: wiki.FreeBSD.org site: forums.FreeBSD.org&#39;">
+      onsubmit="document.getElementById(&#39;words&#39;).value+=&#39; (site:www.FreeBSD.org OR site:docs.FreeBSD.org OR site:lists.FreeBSD.org OR site:wiki.FreeBSD.org OR site:forums.FreeBSD.org)&#39;">
       <h2 class="blockhide"><label for="words">&header2.word.search;</label></h2>
       <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="https://papers.FreeBSD.org">Presentations and Papers</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>'>