diff --git a/ChangeLog b/ChangeLog
index a0a3c6609..449242447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07  Adam Fedor  <fedor@gnu.org>
+
+	* Documentation/HtmlNav/docs-web.html: Update to work with current
+	web structure.
+
 2004-09-07 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSSet.m: Fix possible stack overflows.
diff --git a/Documentation/HtmlNav/docs-web.html b/Documentation/HtmlNav/docs-web.html
index 584ba174f..d774250e8 100644
--- a/Documentation/HtmlNav/docs-web.html
+++ b/Documentation/HtmlNav/docs-web.html
@@ -1,18 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>GNUstep.org</title>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>GNUstep.org</title>
 	
 	<link rel="stylesheet" href="../gnustep-main.css" type="text/css">
 	<style type="text/css" media="screen">
 		@import "../gnustep-main-2.css";
 	</style>
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8"></head>
+	<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
+</head>
 
 
 <body>
 
 
 <div class="header">
-	<a href="http://gnustep.org/"><img src="../gnustep-header14.jpg" alt="GNUstep.org" width="560" height="74"></a>
-</div>
+	<a href="http://gnustep.org/"><img src="../gnustep-header14.jpg" alt="GNUstep.org" width="560" height="74"></a> </div>
 
 
 <div class="container">
@@ -25,7 +28,7 @@
           application framework and tool set for use on a wide variety of
           computer platforms.  It is based on the original OpenStep
           specification created by NeXT, Inc. (now Apple). (<a
-          href="http://gnustep.org/">Web site</a>)
+          href="http://gnustep.org/">Top</a>)
         </p>
         <div style="clear: both;"></div>
       </div>
@@ -38,30 +41,29 @@
          <td width="50%">
           <table width="80%">
             <tr>
-              <td><a href="User/GNUstep/userfaq_toc.html">User FAQ</a></td>
-              <td><a href="User/GNUstep/userfaq.pdf">(PDF)</a></td>
+              <td><a href="documentation/User/GNUstep/userfaq_toc.html">User FAQ</a></td>
+              <td><a href="documentation/User/GNUstep/userfaq.pdf">(PDF)</a></td>
             </tr>
             <tr>
-              <td><a href="User/GNUstep/faq_toc.html">Developer FAQ</a></td>
-              <td><a href="User/GNUstep/faq.pdf">(PDF)</a></td>
+              <td><a href="documentation/User/GNUstep/faq_toc.html">Developer FAQ</a></td>
+              <td><a href="documentation/User/GNUstep/faq.pdf">(PDF)</a></td>
             </tr>
             <tr>
-              <td><a href="User/GNUstep/gnustep-howto_toc.html">How-To</a></td>
-              <td><a href="User/GNUstep/gnustep-howto.pdf">(PDF)</a></td>
+              <td><a href="documentation/User/GNUstep/gnustep-howto_toc.html">How-To</a></td>
+              <td><a href="documentation/User/GNUstep/gnustep-howto.pdf">(PDF)</a></td>
             </tr>
             <tr>
-              <td><a href="User/GNUstep/filesystem_toc.html">Filesystem Layout</a></td>
-              <td><a href="User/GNUstep/filesystem.pdf">(PDF)</a></td>
+              <td><a href="documentation/User/GNUstep/filesystem_toc.html">Filesystem Layout</a></td>
+              <td><a href="documentation/User/GNUstep/filesystem.pdf">(PDF)</a></td>
               </tr>
           </table>
         </td>
          <td width="50%">
-          The following links will work only if you have installed the GUI
-          portion of GNUstep.
+          The GUI portion of GNUstep.
           <ul>
-            <li>User Defaults (<a href="User/Gui/DefaultsSummary.html">GUI</a>) (<a href="Developer/Back/General/DefaultsSummary.html">Back</a>)</li>
-            <li><a href="User/Gui/KeyboardSetup.html">User Keyboard Setup</a></li>
-            <li><a href="User/Gui/LanguageSetup.html">Setup for East Asian Languages</a></li>
+            <li>User Defaults (<a href="documentation/User/Gui/DefaultsSummary.html">GUI</a>) (<a href="Developer/Back/General/DefaultsSummary.html">Back</a>)</li>
+            <li><a href="documentation/User/Gui/KeyboardSetup.html">User Keyboard Setup</a></li>
+            <li><a href="documentation/User/Gui/LanguageSetup.html">Setup for East Asian Languages</a></li>
           </ul>
          </td>
         </tr></table>
@@ -80,50 +82,49 @@
          <td width="50%">
            <table>
              <tr>
-               <td><a href="Developer/Base/ProgrammingManual/manual_toc.html">Base Programming Manual</a></td>
-               <td><a href="Developer/Base/ProgrammingManual/manual.pdf">(PDF)</a></td>
+               <td><a href="documentation/Developer/Base/ProgrammingManual/manual_toc.html">Base Programming Manual</a></td>
+               <td><a href="documentation/Developer/Base/ProgrammingManual/manual.pdf">(PDF)</a></td>
              </tr>
              <tr>
-               <td><a href="Developer/Make/Manual/make_toc.html">Make Utility</a>&nbsp;&nbsp;(<a href="Developer/Make/ReleaseNotes/">Release notes</a>)</td>
-               <td><a href="Developer/Make/Manual/make.pdf">(PDF)</a></td>
+               <td><a href="documentation/Developer/Make/Manual/make_toc.html">Make Utility</a>&nbsp;&nbsp;(<a href="Developer/Make/ReleaseNotes/">Release notes</a>)</td>
+               <td><a href="documentation/Developer/Make/Manual/make.pdf">(PDF)</a></td>
              </tr>
              <tr>
-               <td><a href="Developer/Tools/Reference/index.html">Command-line Tools</a></td>
+               <td><a href="documentation/Developer/Tools/Reference/index.html">Command-line Tools</a></td>
              </tr>
              <tr><td>&nbsp;</td></tr>
              <tr>
-               <td><a href="Developer/Base/Reference/index.html">Base Library API</a>&nbsp;&nbsp;(<a href="Developer/Base/ReleaseNotes/ReleaseNotes.html">Release notes</a>)</td>
+               <td><a href="documentation/Developer/Base/Reference/index.html">Base Library API</a>&nbsp;&nbsp;(<a href="Developer/Base/ReleaseNotes/ReleaseNotes.html">Release notes</a>)</td>
              </tr>
              <tr>
-               <td><a href="Developer/BaseAdditions/Reference/index.html">Base Additions API</a></td>
+               <td><a href="documentation/Developer/BaseAdditions/Reference/index.html">Base Additions API</a></td>
              </tr>
              <tr><td>&nbsp;</td></tr>
              <tr>
-               <td><a href="Developer/Base/General/OpenStepCompliance.html">OpenStep and OS X Compliance</a></td>
+               <td><a href="documentation/Developer/Base/General/OpenStepCompliance.html">OpenStep and OS X Compliance</a></td>
              </tr>
              <tr>
-               <td><a href="Developer/CodingStandards/coding-standards_toc.html">GNUstep Coding Standards</a></td>
-               <td><a href="Developer/CodingStandards/coding-standards.pdf">(PDF)</a></td>
+               <td><a href="documentation/Developer/CodingStandards/coding-standards_toc.html">GNUstep Coding Standards</a></td>
+               <td><a href="documentation/Developer/CodingStandards/coding-standards.pdf">(PDF)</a></td>
              </tr>
              <tr>
-               <td><a href="Developer/Base/General/Debugging.html">Debugging Information</a></td>
+               <td><a href="documentation/Developer/Base/General/Debugging.html">Debugging Information</a></td>
              </tr>
            </table>
         </td>
          <td width="50%">
-          The following links will work only if you have installed the GUI
-          portion of GNUstep.
+          The GUI portion of GNUstep.
           <table>
             <tr>
-              <td><a href="Developer/Gui/ProgrammingManual/manual_toc.html">GUI Programming Manual</a></td>
-              <td><a href="Developer/Gui/ProgrammingManual/manual.pdf">(PDF)</a></td>
+              <td><a href="documentation/Developer/Gui/ProgrammingManual/manual_toc.html">GUI Programming Manual</a></td>
+              <td><a href="documentation/Developer/Gui/ProgrammingManual/manual.pdf">(PDF)</a></td>
             </tr>
              <tr><td>&nbsp;</td></tr>
             <tr>
-              <td><a href="Developer/Gui/Reference/index.html">GUI Library API</a>&nbsp;&nbsp;(<a href="Developer/Gui/ReleaseNotes/ReleaseNotes.html">Release notes</a>)</td>
+              <td><a href="documentation/Developer/Gui/Reference/index.html">GUI Library API</a>&nbsp;&nbsp;(<a href="Developer/Gui/ReleaseNotes/ReleaseNotes.html">Release notes</a>)</td>
             </tr>
             <tr>
-              <td><a href="Developer/Gui/Additions/index.html">GUI Additions API</a></td>
+              <td><a href="documentation/Developer/Gui/Additions/index.html">GUI Additions API</a></td>
             </tr>
           </table>
          </td>
@@ -142,47 +143,47 @@
         </p>
         <br/><br/>
 
-      </div>
+     </div>
 
 </div>
 
 <div class="sidebar">
 	
-
-        <b>General</b><br>
-          <a href="http://gnustep.org/">Home page</a><br>
-          <a href="http://gnustep.org/information/aboutGNUstep.html">Introduction</a><br>
-          <a href="http://gnustep.org/information/mission.html">Mission</a><br>
-          <a href="http://gnustep.org/information/machines_toc.html">Platforms</a><br>
-          <a href="http://gnustep.org/resources/sources.html">Download</a><br>
-          <a href="http://gnustep.org/experience/apps.html">Applications</a><br>
-          <a href="http://gnustep.org/information/userfaq_toc.html">User FAQ</a><br>
-        <br>
-        <b>Developers</b><br>
-          <a href="http://gnustep.org/experience/documentation.html">Getting Started</a><br>
-          <a href="http://gnustep.org/developers/suite.html">Documentation</a><br>
-          <a href="http://wiki.gnustep.org/">Wiki Docs</a><br>
-          <a href="http://gnustep.org/information/faq_toc.html">Developer FAQ</a><br>
-          <a href="http://gnustep.org/developers/map.html">Libraries</a><br>
-          <a href="http://gnustep.org/developers/whoiswho.html">Who's Who</a>?<br>
-         <br>
-        <b>External</b><br>
-          <a href="http://savannah.gnu.org/projects/gnustep/">Project Page</a><br>
-          <a href="http://gnustep.org/resources/resources.html">Related Links</a><br>
-          <a href="http://gnustep.org/information/gethelp.html">Mailing Lists</a><br>
-
-        <br>
-
-    	<b><a href="http://gnustep.org/resources/sites.html">Related Sites...</a></b><br>
+	<b>General</b><br />
+	  <a href="../">Home page</a><br />
+	  <a href="../information/aboutGNUstep.html">Introduction</a><br />
+	  <a href="../information/mission.html">Mission</a><br />
+	  <a href="../information/machines_toc.html">Platforms</a><br />
+	  <a href="../resources/sources.html">Download</a><br />
+	  <a href="../experience/apps.html">Applications</a><br />
+	  <a href="../information/userfaq_toc.html">User FAQ</a><br />
+	<br />
+	<b>Developers</b><br />
+	  <a href="../experience/documentation.html">Getting Started</a><br />
+	  <a href="../resources/docs-web.html">Documentation</a><br />
+	  <a href="http://wiki.gnustep.org/">Wiki Docs</a><br />
+	  <a href="../information/faq_toc.html">Developer FAQ</a><br />
+	  <a href="../developers/map.html">Libraries</a><br />
+	  <a href="../developers/whoiswho.html">Who's Who</a>?<br />
+	 <br />
+	<b>External</b><br />
+	  <a href="http://savannah.gnu.org/projects/gnustep/">Project Page</a><br />
+	  <a href="../resources/resources.html">Related Links</a><br />
+	  <a href="../information/gethelp.html">Mailing Lists</a><br />
 	
-	<br>
+	<br />
 
-	<b><a href="http://gnustep.org/resources/mirrors.html">Mirrors...</a></b><br>
-	<br>
+        <b><a href="../resources/sites.html">Related Sites...</a></b><br />
+	
+	<br />
+
+	<b><a href="../resources/mirrors.html">Mirrors...</a></b><br />
+	<br />
 	Site by <a href="mailto:webmasters@gnustep.org">webmasters@gnustep.org</a>
   
 </div>
 
 
 
-</body></html>
+</body>
+</html>

User FAQ	(PDF)	User FAQ	(PDF)
Developer FAQ	(PDF)	Developer FAQ	(PDF)
How-To	(PDF)	How-To	(PDF)
Filesystem Layout	(PDF)	Filesystem Layout	(PDF)
Base Programming Manual	(PDF)	Base Programming Manual	(PDF)
Make Utility (Release notes)	(PDF)	Make Utility (Release notes)	(PDF)
Command-line Tools	Command-line Tools

Base Library API (Release notes)	Base Library API (Release notes)
Base Additions API	Base Additions API

OpenStep and OS X Compliance	OpenStep and OS X Compliance
GNUstep Coding Standards	(PDF)	GNUstep Coding Standards	(PDF)
Debugging Information	Debugging Information
GUI Programming Manual	(PDF)	GUI Programming Manual	(PDF)

GUI Library API (Release notes)	GUI Library API (Release notes)
GUI Additions API	GUI Additions API