Index: openacs.org-dev/www/templates/community-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/community-index.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/community-index.adp	12 Jul 2002 11:47:44 -0000	1.1
+++ openacs.org-dev/www/templates/community-index.adp	17 Jul 2002 20:41:06 -0000	1.2
@@ -13,7 +13,7 @@
 src="images/spacer.gif" alt="" height="1" width="8"></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><span 
-class="nav"><a href="/community/forums/" class="top">OpenACS Community Forums</a></span></td>
+class="nav"><a href="/forums" class="top">OpenACS Community Forums</a></span></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><img 
 src="images/spacer.gif" alt="" height="1" width="8"></td>
@@ -137,7 +137,7 @@
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><span 
-class="nav"><a href="oacs_sites" class="top">OpenACS Sites</a>
+class="nav"><a href="sites" class="top">OpenACS Sites</a>
 </span></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><img 
Index: openacs.org-dev/www/templates/new-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/new-master.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/new-master.adp	12 Jul 2002 11:47:44 -0000	1.1
+++ openacs.org-dev/www/templates/new-master.adp	17 Jul 2002 20:41:06 -0000	1.2
@@ -63,23 +63,23 @@
 </else>
 
 
-<if @top_dir@ eq "sw">
+<if @top_dir@ eq "software">
 <td align="center" valign="middle" bgcolor="#cccccc" width="18%"><span class="navon">
-<if @urlc@ gt 1><a href="/sw" class="on">software</a></if><else>software</else></span></td>
+<if @urlc@ gt 1><a href="/software" class="on">software</a></if><else>software</else></span></td>
 </if>
 <else>
 <td align="center" valign="middle" bgcolor="#66ccff" width="18%"><span class="nav">
-<a href="/sw" class="top">software</a></span></td>
+<a href="/software" class="top">software</a></span></td>
 </else>
 
 
-<if @top_dir@ eq "oacs-doc">
+<if @top_dir@ eq "doc">
 <td align="center" valign="middle" bgcolor="#cccccc" width="18%"><span class="navon">
-<if @urlc@ gt 1><a href="/oacs-doc" class="on">documentation</a></if><else>documentation</else></span></td>
+<if @urlc@ gt 1><a href="/doc" class="on">documentation</a></if><else>documentation</else></span></td>
 </if>
 <else>
 <td align="center" valign="middle" bgcolor="#66ccff" width="18%"><span class="nav">
-<a href="/oacs-doc/" class="top">documentation</a></span></td>
+<a href="/doc" class="top">documentation</a></span></td>
 </else>