Index: xdocs/guides/guide-security-declarative-psml.xml
===================================================================
--- xdocs/guides/guide-security-declarative-psml.xml	(revision 359004)
+++ xdocs/guides/guide-security-declarative-psml.xml	(working copy)
@@ -51,7 +51,7 @@
 Grants are associated with permissions, authorizing, or granting, a principal list 
 access to a page or folder.    
 A granting security constraint is the association of a list of one 
-or more security principals combined with one or permissions. Grant constraints grant access to a page or folder
+or more security principals combined with one or more permissions. Grant constraints grant access to a page or folder
 for the associated list of permissions. 
 </p>
 </subsection>
@@ -77,7 +77,7 @@
 </section>
 <section name='The Security Constraint'>
 <p>
-A security constraint is an XML element found in a PSML file, a folder metadata file, or inthe global security declarations.
+A security constraint is an XML element found in a PSML file, a folder metadata file, or in the global security declarations.
 A security constraint has one attribute: the name. A security constraint has the following elements:
 </p>
 <ul>
Index: xdocs/navigation.xml
===================================================================
--- xdocs/navigation.xml	(revision 359004)
+++ xdocs/navigation.xml	(working copy)
@@ -23,35 +23,80 @@
             <item name="PDF Documentation" href="/jetspeed2.pdf" img="images/pdf.gif" />
         </links>
         <menu name="Essentials">
-            <item name="Features" href="features.html" />
-        	<item name="Getting Started" href="getting-started.html" />            
+            <item name="Features" href="/features.html" />
+        	<item name="Getting Started" href="/getting-started.html" />            
         </menu>
     	<menu name="Building">
-    	    <item name="From Source" href="getting-started-source.html" />
-    	    <item name="From Maven Plugin" href="getting-started-binary.html" />
+    	    <item name="From Source" href="/getting-started-source.html" />
+    	    <item name="From Maven Plugin" href="/getting-started-binary.html" />
     	</menu>
     	<menu name="Download">
-    		<item name="Installer" href="download.html" />
-    		<item name="Source" href="source-code.html" />
+    		<item name="Installer" href="/download.html" />
+    		<item name="Source" href="/source-code.html" />
     	</menu>
-    	<menu name="Documentation">
-    		<item name="Documentation Guides" href="guides/index.html" />
-    		<item name="Jetspeed-2 API" href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html" />
-    		<item name="Jetspeed-2 Plugin" href="j2-maven-plugin.html" />
+        <menu name="Documentation">
+            <item name="Documentation Guides" href="/guides/index.html" collapse="true">
+                <item name="Getting Started" href="/guides/index.html#Getting_Started" collapse="true">
+                    <item name="Getting started guide" href="/getting-started.html" />
+                    <item name="Getting started with Jetspeed-2 source guide" href="/getting-started-source.html" />
+                    <item name="Getting started with Jetspeed-2 binaries guide" href="/getting-started-binary.html" />
+                    <item name="Getting started with Jetspeed-2 installer" href="/getting-started-installer.html" />
+                </item>
+                <item name="Guides to Portal Concepts" href="/guides/index.html#Guides_to_Portal_Concepts" collapse="true">
+                    <item name="Guide to Jetspeed-2 pipeline" href="/guides/guide-pipeline.html" />
+                    <item name="Guide to decorators" href="/guides/guide-decorators.html" />
+                    <item name="Guide to layouts" href="/guides/guide-layouts.html" />
+                </item>
+                <item name="Configuration Guides" href="/guides/index.html#Configuration_Guides" collapse="true">
+                    <item name="Guide to configuration properties" href="/guides/guide-properties.html" />
+                    <item name="Guide to database configuration" href="/guides/guide-database.html" />
+                    <item name="Guide to application servers configuration" href="/guides/guide-app-servers.html" />
+                    <item name="Guide to configuring Jetspeed-2 security" href="/guides/guide-security.html" />
+                    <item name="Guide to using Jetspeed-2 single sign-on" href="/guides/guide-sso.html" />
+                    <item name="Guide to defining user attributes (PLT.17 user information configuration)" href="/guides/guide-user-attributes.html" />
+                    <item name="Guide to using profilers" href="/guides/guide-profiler.html" />
+                </item>
+                <item name="Portal Development Guides" href="/guides/index.html#Portal_Development_Guides" collapse="true">
+                    <item name="Guide to portal design" href="/guides/guide-portal-design.html" />
+                    <item name="Guide to PSML" href="/guides/guide-psml.html" />
+                    <item name="Guide to declarative security through PSML" href="/guides/guide-security-declarative-psml.html" />
+                    <item name="Guide to declarative menus in PSML" href="/guides/guide-menus-declarative-psml.html" />
+                    <item name="Guide to working with a Jetspeed-2 site" href="/guides/guide-site.html" />
+                    <item name="Guide to localization with Jetspeed-2" href="/guides/guide-l10n.html" />
+                    <item name="Guide to Jetspeed-2 AJAX API" href="/guides/guide-ajax-api.html" />
+                    <item name="Guide to a very simple portlet with Jetspeed-2" href="/guides/guide-simple-portlet.html" />
+                    <item name="Guide to portlet bridges" href="/guides/guide-portlet-bridges.html" />
+                </item>
+                <item name="Jetspeed-2 Development Guide" href="/guides/index.html#Jetspeed-2_Development_Guide" collapse="true">
+                    <item name="Guide to Jetspeed-2 development" href="/guides/guide-j2-development.html" />
+                    <item name="Guide to helping with Jetpseed-2" href="/how-to-help.html" />
+                </item>
+                <item name="Guides to Jetspeed-2 Tools"  href="/guides/index.html#Guides_to_Jetspeed-2_Tools" collapse="true">
+                    <item name="Guide to Jetspeed-2 Power Tools" href="/guides/guide-jpt.html" />
+                    <item name="Guide to Jetspeed-2 Portlet Application Deployment" href="/multiproject/jetspeed-deploy-tools/index.html" />
+                    <item name="Guide to Jetspeed-2 Maven Plugin" href="/j2-maven-plugin.html" />
+                </item>
+                <item name="Components Guides" href="/guides/index.html#Components_Guides" collapse="true">
+                    <item name="Guide to Jetspeed-2 component architecture" href="/guides/guide-components.html" />
+                    <item name="Guide to Jetspeed-2 directory structure" href="/guides/guide-dir-structure.html" />
+                </item>
+            </item>
+            <item name="Jetspeed-2 API" href="http://portals.apache.org/jetspeed-2/multiproject/jetspeed-api/apidocs/index.html" />
+            <item name="Jetspeed-2 Plugin" href="/j2-maven-plugin.html" />
     	</menu>
     	<menu name="About Jetspeed-2">
-    		<item name="FAQs" href="faq.html" />
-    		<item name="For Jetspeed-1 Users" href="j1-users.html" />
-    		<item name="Supporting Projects" href="supporting-projects.html" />
-    		<item name="Who Uses J2?" href="who-uses-j2.html" />
-    		<item name="Portlets Community" href="portlets-community.html" />
-    		<item name="How to Help?" href="how-to-help.html" />
+    		<item name="FAQs" href="/faq.html" />
+    		<item name="For Jetspeed-1 Users" href="/j1-users.html" />
+    		<item name="Supporting Projects" href="/supporting-projects.html" />
+    		<item name="Who Uses J2?" href="/who-uses-j2.html" />
+    		<item name="Portlets Community" href="/portlets-community.html" />
+    		<item name="How to Help?" href="/how-to-help.html" />
     	</menu>
         <menu name="Support"> 	
-            <item name="Mailing List" href="mail-lists.html" />
-            <item name="Bug Database" href="issue-tracking.html" />
+            <item name="Mailing List" href="/mail-lists.html" />
+            <item name="Bug Database" href="/issue-tracking.html" />
             <item name="Wiki" href="http://wiki.apache.org/portals/Jetspeed2" />
-            <item name="Quality Testing" href="quality-testing.html" />
+            <item name="Quality Testing" href="/quality-testing.html" />
         </menu>
     </body>
-</project>
\ No newline at end of file
+</project>
