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)
@@ -34,10 +34,55 @@
     		<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">
+                <item name="Getting Started" collapse="true" href="guides/index.html#Getting_Started">
+                    <item name="Getting started guide" href="guides/index.html" />
+                    <item name="Getting started with Jetspeed-2 source guide" href="guides/index.html" />
+                    <item name="Getting started with Jetspeed-2 binaries guide" href="guides/index.html" />
+                    <item name="Getting started with Jetspeed-2 installer" href="guides/index.html" />
+                </item>
+                <item name="Guides to Portal Concepts" collapse="true" href="guides/index.html#Guides_to_Portal_Concepts">
+                    <item name="Guide to Jetspeed-2 pipeline" href="guides/index.html" />
+                    <item name="Guide to decorators" href="guides/index.html" />
+                    <item name="Guide to layouts" href="guides/index.html" />
+                </item>
+                <item name="Configuration Guides" collapse="true" href="guides/index.html#Configuration_Guides">
+                    <item name="Guide to configuration properties" href="guides/index.html" />
+                    <item name="Guide to database configuration" href="guides/index.html" />
+                    <item name="Guide to application servers configuration" href="guides/index.html" />
+                    <item name="Guide to configuring Jetspeed-2 security" href="guides/index.html" />
+                    <item name="Guide to using Jetspeed-2 single sign-on" href="guides/index.html" />
+                    <item name="Guide to defining user attributes (PLT.17 user information configuration)" href="guides/index.html" />
+                    <item name="Guide to using profilers" href="guides/index.html" />
+                </item>
+                <item name="Portal Development Guides" collapse="true" href="guides/index.html#Portal_Development_Guides">
+                    <item name="Guide to portal design" href="guides/index.html" />
+                    <item name="Guide to PSML" href="guides/index.html" />
+                    <item name="Guide to declarative security through PSML" href="guides/index.html" />
+                    <item name="Guide to declarative menus in PSML" href="guides/index.html" />
+                    <item name="Guide to working with a Jetspeed-2 site" href="guides/index.html" />
+                    <item name="Guide to localization with Jetspeed-2" href="guides/index.html" />
+                    <item name="Guide to Jetspeed-2 AJAX API" href="guides/index.html" />
+                    <item name="Guide to a very simple portlet with Jetspeed-2" href="guides/index.html" />
+                    <item name="Guide to portlet bridges" href="guides/index.html" />
+                </item>
+                <item name="Jetspeed-2 Development Guide" collapse="true" href="guides/index.html#Jetspeed-2_Development_Guide">
+                    <item name="Guide to Jetspeed-2 development" href="guides/index.html" />
+                    <item name="Guide to helping with Jetpseed-2" href="guides/index.html" />
+                </item>
+                <item name="Guides to Jetspeed-2 Tools" collapse="true" href="guides/index.html#Guides_to_Jetspeed-2_Tools">
+                    <item name="Guide to Jetspeed-2 Power Tools" href="guides/index.html" />
+                    <item name="Guide to Jetspeed-2 Portlet Application Deployment" href="guides/index.html" />
+                    <item name="Guide to Jetspeed-2 Maven Plugin" href="guides/index.html" />
+                </item>
+                <item name="Components Guides" collapse="true" href="guides/index.html#Components_Guides">
+                    <item name="Guide to Jetspeed-2 component architecture" href="guides/index.html" />
+                    <item name="Guide to Jetspeed-2 directory structure" href="guides/index.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" />
@@ -54,4 +99,4 @@
             <item name="Quality Testing" href="quality-testing.html" />
         </menu>
     </body>
-</project>
\ No newline at end of file
+</project>
