Index: head/share/xml/navibar.ent
===================================================================
--- head/share/xml/navibar.ent	(revision 50697)
+++ head/share/xml/navibar.ent	(revision 50698)
@@ -1,230 +1,228 @@
 <!-- $FreeBSD$ -->
 
 <!ENTITY nav.about '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/about.html">About</a></li>
     <li><a href="&base;/features.html">Features</a></li>
     <li><a href="&base;/applications.html">Applications</a></li>
     <li><a href="&base;/advocacy/">Advocacy</a></li>
     <li><a href="&base;/marketing/">Marketing</a></li>
     <li><a href="&base;/administration.html">Administration</a></li>
     <li><a href="&base;/news/newsflash.html">News</a></li>
     <li><a href="&base;/events/events.html">Events</a></li>
     <li><a href="&base;/news/press.html">Press</a></li>
     <li><a href="&base;/multimedia/multimedia.html">Multimedia</a></li>
     <li><a href="&base;/art.html">Artwork</a></li>
     <li><a href="&base;/logo.html">Logo</a></li>
     <li><a href="&base;/donations/">Donations</a></li>
     <li><a href="&base;/copyright/">Legal Notices</a></li>
     <li><a href="&base;/privacy.html">Privacy Policy</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.community '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/community.html">Community</a></li>
     <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;/community/irc.html">IRC</a></li>
     <li><a href="&base;/community/newsgroups.html">Newsgroups</a></li>
     <li><a href="&base;/usergroups.html">User Groups</a></li>
     <li><a href="https://planet.FreeBSD.org/">Blogs</a></li>
     <li><a href="&base;/events/events.html">Events</a></li>
     <li><a href="&base;/community/webresources.html">Web Resources</a></li>
     <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (external)</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.developers '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/projects/index.html">Developers</a></li>
     <li><a href="&base;/doc/en_US.ISO8859-1/books/developers-handbook">Developer&#39;s 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;/developers/cvs.html">Source code repositories</a></li>
     <li><a href="&base;/releng/index.html">Release Engineering</a></li>
     <li><a href="&base;/platforms/">Platforms</a></li>
     <li><a href="https://wiki.FreeBSD.org/IdeasPage">Project Ideas</a></li>
     <li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.docs '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/docs.html">Documentation</a></li>
     <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="&cgibase;/man.cgi">Manual Pages</a></li>
     <li><a href="&base;/docs/books.html">Books and Articles Online</a></li>
     <li><a href="&base;/publish.html">Publications</a></li>
     <li><a href="&base;/docs/webresources.html">Web Resources</a></li>
     <li><a href="&base;/projects/newbies.html">For Newbies</a></li>
     <li><a href="&base;/docproj/">Documentation Project</a></li>
     <li><a href="https://docs.freebsd.org/doc/">Archive</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <![ %beta.upcoming; [
 <!ENTITY beta.listitem '
   <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&u.betarel.schedule;">&betarel.current;</a></li>
 '>
 ]]>
 <!ENTITY beta.listitem ''>
 
 <![ %beta2.upcoming; [
 <!ENTITY beta2.listitem '
   <li xmlns="http://www.w3.org/1999/xhtml">Upcoming Release:<br /><a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
 '>
 ]]>
 <!ENTITY beta2.listitem ''>
 
 <!ENTITY nav.download '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/where.html">Get FreeBSD</a></li>
     <li><a href="&base;/releases/">Release Information</a>
       <ul>
 	<li>Production Release: <br />
 	  <a href="&u.rel.announce;">&rel.current;</a></li>
 	<li>Production Release: <br />
 	  <a href="&u.rel0.announce;">&rel0.current;</a></li>
 	<li>Production Release: <br />
 	  <a href="&u.rel1.announce;">&rel1.current;</a></li>
-	<li>Upcoming Release: <br />
-	  <a href="&u.betarel2.schedule;">&betarel2.current;</a></li>
       </ul>
     </li>
     <li><a href="&base;/snapshots/">Snapshot Releases</a>
       <ul>
 	&beta.listitem;
 	&beta2.listitem;
       </ul>
     </li>
     <li><a href="&base;/ports/">Ported Applications</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.gnome '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/gnome/index.html">GNOME</a>
       <ul>
         <li><a href="&base;/gnome/docs/faq2.html#q1">Installation Instructions</a></li>
         <li><a href="&base;/gnome/docs/faq232.html#q2">Upgrade Instructions</a></li>
         <li><a href="&base;/gnome/../ports/gnome.html">Available Applications</a></li>
         <li><a href="&base;/gnome/docs/volunteer.html">How to Help</a></li>
         <li><a href="&base;/gnome/docs/bugging.html">Reporting a Bug</a></li>
         <li><a href="&base;/gnome/screenshots.html">Screenshots</a></li>
         <li><a href="&base;/gnome/contact.html">Contact Us</a></li>
       </ul></li>
     <li><a href="&base;/gnome/index.html">Documentation</a>
       <ul>
         <li><a href="&base;/gnome/docs/faq2.html">FAQ</a></li>
 	<li><a href="&base;/gnome/docs/halfaq.html">HAL FAQ</a></li>
         <li><a href="&base;/gnome/docs/faq232.html">2.30 to 2.32 Upgrade FAQ</a></li>
         <li><a href="&base;/gnome/docs/develfaq.html">Development Branch FAQ</a></li>
         <li><a href="&base;/gnome/docs/porting.html">Creating Ports</a></li>
         <li><a href="&base;/gnome/docs/faq232.html#q4">Known Issues</a></li>
       </ul></li>
     </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.ports '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
   <ul>
     <li><a href="&base;/ports/index.html">About ports</a></li>
     <li><a href="&base;/ports/installing.html">Installing</a></li>
     <li><a href="&base;/ports/updating.html">Updating</a></li>
     <li><a href="&base;/ports/searching.html">Searching</a></li>
     <li>&nbsp;&nbsp;&nbsp;Categories
       <ul>
         <li><a href="&base;/ports/categories-alpha.html">listed alphabetically</a></li>
         <li><a href="&base;/ports/categories-grouped.html">listed by logical group</a></li>
       </ul></li>
     <li><a href="&base;/ports/master-index.html">List of All Ports</a></li>
     <li><a href="&base;/ports/references.html">For More Information</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!ENTITY nav.support '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/support.html">Support</a></li>
     <li><a href="&base;/commercial/">Vendors</a>
     <ul>
       <li><a href="&base;/commercial/software_bycat.html">Software</a></li>
       <li><a href="&base;/commercial/hardware.html">Hardware</a></li>
       <li><a href="&base;/commercial/consult_bycat.html">Consulting</a></li>
       <li><a href="&base;/commercial/isp.html">Internet Service Providers</a></li>
       <li><a href="&base;/commercial/misc.html">Miscellaneous</a></li>
     </ul></li>
     <li><a href="&base;/security/index.html">Security Information</a>
     <ul>
       <li><a href="&base;/security/advisories.html">Advisories</a></li>
       <li><a href="&base;/security/notices.html">Errata Notices</a></li>
       <li><a href="&base;/security/index.html#sup">Supported Releases</a></li>
       <li><a href="&base;/security/unsupported.html">Unsupported Releases</a></li>
       <li><a href="&base;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
 	How to read FreeBSD Security Advisories</a></li>
       <li><a href="&base;/security/charter.html">Charter for the Security Officer and Team</a></li>
     </ul></li>
     <li><a href="&base;/support/bugreports.html">Bug Reports</a>
       <ul>
 	<li><a href="https://bugs.FreeBSD.org/submit/">Submit a Problem Report</a></li>
       </ul></li>
     <li><a href="&base;/support/webresources.html">Web Resources</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 
 <!--
 <!ENTITY % navinclude.about "IGNORE">
 <![%navinclude.about;[
 <!ENTITY nav '&nav.about;'>
 ]]>
 <!ENTITY % navinclude.community "IGNORE">
 <![%navinclude.community;[
 <!ENTITY nav '&nav.community;'>
 ]]>
 <!ENTITY % navinclude.developers "IGNORE">
 <![%navinclude.developers;[
 <!ENTITY nav '&nav.developers;'>
 ]]>
 <!ENTITY % navinclude.docs "IGNORE">
 <![%navinclude.docs;[
 <!ENTITY nav '&nav.docs;'>
 ]]>
 <!ENTITY % navinclude.download "IGNORE">
 <![%navinclude.download;[
 <!ENTITY nav '&nav.download;'>
 ]>
 <!ENTITY % navinclude.gnome "IGNORE">
 <![%navinclude.gnome;[
 <!ENTITY nav '&nav.gnome;'>
 ]]>
 <!ENTITY % navinclude.ports "IGNORE">
 <![%navinclude.ports;[
 <!ENTITY nav '&nav.ports;'>
 ]]>
 <!ENTITY % navinclude.support "IGNORE">
 <![%navinclude.support;[
 <!ENTITY nav '&nav.support;'>
 ]]>
 -->
 <!ENTITY nav ''>