diff --git a/share/sgml/navibar.ent b/share/sgml/navibar.ent
index 726fb1605c..6dc4cfb8b9 100644
--- a/share/sgml/navibar.ent
+++ b/share/sgml/navibar.ent
@@ -1,185 +1,185 @@
-<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.5 2006/10/14 20:21:27 marcus Exp $ -->
+<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.6 2007/03/01 08:04:23 joel Exp $ -->
 
 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
 <!ENTITY nav '
 <div 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;/internet.html">Internetworking</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;/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>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.community "IGNORE">
 <![ %navinclude.community; [
 <!ENTITY nav '
 <div 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="&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="&base;/community/webresources.html">Web Resources</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.developers "IGNORE">
 <![ %navinclude.developers; [
 <!ENTITY nav '
 <div 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">CVS Repository</a></li>
     <li><a href="&base;/releng/index.html">Release Engineering</a></li>
     <li><a href="&base;/platforms/">Platforms</a></li>
     <li><a href="&base;/projects/ideas/">Project Ideas</a></li>
     <li><a href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.docs "IGNORE">
 <![ %navinclude.docs; [
 <!ENTITY nav '
 <div 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="&base;/docs/man.html">Manual Pages</a>
       <ul>
         <li><a href="&cgibase;/man.cgi">Man Online</a></li>
       </ul></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>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.download "IGNORE">
 <![ %navinclude.download; [
 <!ENTITY nav '
 <div 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><a href="&u.rel.announce;">Production Release: &rel.current;</a></li>
         <li><a href="&u.rel2.announce;">Production (Legacy) Release: &rel2.current;</a></li>
         <li><a href="&base;/snapshots/">Snapshot Releases</a></li>
 <![ %beta.testing; [ 
         <li><a href="&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
 ]]>
 <![ %beta2.testing; [ 
         <li><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
 ]]>
       </ul></li>
     <li><a href="&base;/ports/">Ported Applications</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.gnome "IGNORE">
 <![ %navinclude.gnome; [
 <!ENTITY nav '
 <div id="SIDENAV">
   <h2 class="blockhide">Section Navigation</h2>
 
   <ul>
     <li><a href="&base;/gnome/index.html">FreeBSD/GNOME</a>
       <ul>
         <li><a href="&base;/gnome/docs/faq2.html#q1">Installation Instructions</a></li>
-        <li><a href="&base;/gnome/docs/faq216.html#q2">Upgrade Instructions</a></li>
+        <li><a href="&base;/gnome/docs/faq218.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/faq216.html">2.14 to 2.16 Upgrade FAQ</a></li>
+        <li><a href="&base;/gnome/docs/faq218.html">2.14 to 2.16 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/faq216.html#q5">Known Issues</a></li>
+        <li><a href="&base;/gnome/docs/faq218.html#q5">Known Issues</a></li>
       </ul></li>
     </ul>
 </div> <!-- SIDENAV -->'>
 ]]>
 
 <!ENTITY % navinclude.ports "IGNORE">
 <![ %navinclude.ports; [
 <!ENTITY nav '
 <div 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 % navinclude.support "IGNORE">
 <![ %navinclude.support; [
 <!ENTITY nav '
 <div 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/">Security Information</a></li>
     <li><a href="&base;/support/bugreports.html">Bug Reports</a>
       <ul>
         <li><a href="&base;/send-pr.html">Submit a Problem Report</a></li>
       </ul></li>
     <li><a href="&base;/support/webresources.html">Web Resources</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>
 ]]>