diff --git a/share/sgml/navibar.ent b/share/sgml/navibar.ent
index 10d71fdf31..ab732b2ab1 100644
--- a/share/sgml/navibar.ent
+++ b/share/sgml/navibar.ent
@@ -1,184 +1,184 @@
-<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.2 2006/08/20 16:09:00 joel Exp $ -->
+<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.3 2006/08/20 16:19:22 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;/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/faq214.html#q2">Upgrade Instructions</a></li>
+        <li><a href="&base;/gnome/docs/faq216.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/faq214.html">2.12 to 2.14 Upgrade FAQ</a></li>
+        <li><a href="&base;/gnome/docs/faq214.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/faq214.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 -->'>
 ]]>
diff --git a/share/sgml/release.ent b/share/sgml/release.ent
index 043e21e0fa..82775fb7f4 100644
--- a/share/sgml/release.ent
+++ b/share/sgml/release.ent
@@ -1,83 +1,83 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.2 2006/09/20 16:48:37 bmah Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.3 2006/10/05 15:02:42 bmah Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time.  When you update this, you should also
      update (at least) the following:
 
 	- similar entity in the Handbook
 	- similar entity in the Relnotes
 	- releases/index.sgml has the date of the current release
 	- the FAQ has links to the release FTP url
 	- "versions supported" in security.sgml
 
      (If you're the release engineer, feel free to update this list with
      other doc-related things you had to do.  It'll save you time and
      trouble the next time around :-).)
 
      As of 5.0, we now have the concept of two different "currently"
      released versions (from two different development branches).  Use
      rel.* and u.rel.* for the "latest and greatest" version and
      rel2.* and u.rel2.* for the "conservative users" version.
 -->
 
 <!ENTITY rel.head.major '7'>
 <!ENTITY rel.head '&rel.head.major;.0'>
 
 <!-- If there is no release currently in the release cycle (i.e. we
       don't have something in BETAn or RCn), then change %beta.testing
       below to "IGNORE".  If we do, use "INCLUDE". -->
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '6.2'>
 <!ENTITY betarel.vers 'BETA2'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
       are having release candidates at the same time), do the same here.  -->
 <!ENTITY beta2.testing "IGNORE">
 <!ENTITY % beta2.testing "IGNORE">
 <!ENTITY betarel2.current '5.5'>
 <!ENTITY betarel2.vers 'RC1'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '6'>
 <!ENTITY rel.current '&rel.current.major;.1'>
 <!ENTITY rel.current.date 'May 2006'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
 <!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
 <!ENTITY u.rel.errata '&base;/releases/&rel.current;R/errata.html'>
 <!ENTITY u.rel.hardware '&base;/releases/&rel.current;R/hardware.html'>
 <!ENTITY u.rel.installation '&base;/releases/&rel.current;R/installation.html'>
 <!ENTITY u.rel.readme '&base;/releases/&rel.current;R/readme.html'>
 <!ENTITY u.rel.early '&base;/releases/&rel.current;R/migration-guide.html'> <!-- TEMP -->
 <!ENTITY u.rel.migration '&base;/releases/&rel.current;R/migration-guide.html'>
 
 <!-- Secondary "current release" entities -->
 <!ENTITY rel2.current '5.5'>
 <!ENTITY rel2.current.date 'May 2006'>
 <!ENTITY rel2.current.major '5'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
 <!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
 <!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
 <!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
 <!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
 <!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
 
-<!ENTITY gnomeoldver '2.12'>
-<!ENTITY gnomever '2.14'>
-<!ENTITY gnomedevelver '2.15'>
+<!ENTITY gnomeoldver '2.14'>
+<!ENTITY gnomever '2.16'>
+<!ENTITY gnomedevelver '2.17'>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->