You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2014/01/30 22:13:53 UTC

svn commit: r1562965 [4/6] - in /shiro/site: publish/ publish/2010/03/18/ publish/2010/06/01/ publish/2010/09/14/ publish/2010/09/20/ publish/2010/09/24/ publish/2010/11/03/ publish/2011/01/06/ publish/2011/01/13/ publish/2011/02/10/ publish/2011/02/28...

Modified: shiro/site/publish/mailing-lists.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/mailing-lists.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/mailing-lists.html (original)
+++ shiro/site/publish/mailing-lists.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -100,7 +84,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -108,4 +92,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/navigation.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/navigation.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/navigation.html (original)
+++ shiro/site/publish/navigation.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -112,7 +96,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -120,4 +104,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/news.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/news.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/news.html (original)
+++ shiro/site/publish/news.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -613,7 +597,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -621,4 +605,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/overview.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/overview.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/overview.html (original)
+++ shiro/site/publish/overview.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -196,7 +180,7 @@ Subject currentUser = SecurityUtils.getS
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -204,4 +188,4 @@ Subject currentUser = SecurityUtils.getS
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/performing-a-release.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/performing-a-release.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/performing-a-release.html (original)
+++ shiro/site/publish/performing-a-release.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -189,7 +173,7 @@ $ ln -s 1.2.1 current 
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -197,4 +181,4 @@ $ ln -s 1.2.1 current 
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/permissions.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/permissions.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/permissions.html (original)
+++ shiro/site/publish/permissions.html Thu Jan 30 21:13:51 2014
@@ -51,36 +51,44 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
             <h1><a name="Permissions-UnderstandingPermissionsinApacheShiro"></a>Understanding Permissions in Apache Shiro</h1>
 
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+  
+</div>
+</td>
+</tr>
+</table>
+
 <p>Shiro defines a Permission as a statement that defines an explicit behavior or action.  It is a statement of raw functionality in an application and nothing more.  Permissions are the lowest-level constructs in security polices, and they explicitly define only "what" the application can do.</p>
 
 <p>They do <em>not</em> at all describe "who" is able to perform the action(s).</p>
@@ -382,6 +390,7 @@ printer:print
 
 <p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
 
+
         </div>
 
     </div><!--END WRAPPER-->
@@ -392,7 +401,7 @@ printer:print
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -400,4 +409,4 @@ printer:print
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/powered-by-shiro.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/powered-by-shiro.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/powered-by-shiro.html (original)
+++ shiro/site/publish/powered-by-shiro.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -117,7 +101,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -125,4 +109,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/privacy-policy.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/privacy-policy.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/privacy-policy.html (original)
+++ shiro/site/publish/privacy-policy.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -101,7 +85,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -109,4 +93,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/quickstart.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/quickstart.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/quickstart.html (original)
+++ shiro/site/publish/quickstart.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -93,7 +77,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -101,4 +85,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/realm.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/realm.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/realm.html (original)
+++ shiro/site/publish/realm.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -308,7 +292,7 @@ myRealm.credentialsMatcher = $credential
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -316,4 +300,4 @@ myRealm.credentialsMatcher = $credential
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/reference.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/reference.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/reference.html (original)
+++ shiro/site/publish/reference.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -142,7 +126,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -150,4 +134,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/securitymanager.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/securitymanager.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/securitymanager.html (original)
+++ shiro/site/publish/securitymanager.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -89,9 +73,16 @@
 
 <p>As stated previously, the application's <tt>SecurityManager</tt> performs security operations and manages state for <em>all</em> application users.  In Shiro's default <tt>SecurityManager</tt> implementations, this includes:</p>
 
-<ul><li>Authentication</li><li>Authorization</li><li>Session Management</li><li>Cache Management</li><li><a href="realm.html" title="Realm">Realm</a> coordination</li><li>Event propagation</li><li>"Remember Me" Services</li><li>Subject creation</li><li>Logout<br clear="none">
-and more.</li></ul>
-
+<ul>
+	<li>Authentication</li>
+	<li>Authorization</li>
+	<li>Session Management</li>
+	<li>Cache Management</li>
+	<li><a href="realm.html" title="Realm">Realm</a> coordination</li>
+	<li>Event propagation</li>
+	<li>"Remember Me" Services</li>
+	<li>Subject creation</li>
+	<li>Logout<br clear="none">and more.</li></ul>
 
 <p>But this is a lot of functionality to try to manage in a single component.  And, making these things flexible and customizable would be very difficult if everything were lumped into a single implementation class.  </p>
 
@@ -103,7 +94,13 @@ and more.</li></ul>
 
 <p>The nested components that the <tt>SecurityManager</tt> coordinates and delegates to are:</p>
 
-<ul><li><a href="authenticator.html" title="Authenticator">Authenticator</a> (<tt>org.apache.shiro.authc.Authenticator</tt>)</li><li><a href="authorizer.html" title="Authorizer">Authorizer</a> (<tt>org.apache.shiro.authz.Authorizer</tt>)</li><li><a href="sessionmanager.html" title="SessionManager">SessionManager</a> (<tt>org.apache.shiro.session.mgt.SessionManager</tt>)</li><li><a href="cachemanager.html" title="CacheManager">CacheManager</a> (<tt>org.apache.shiro.cache.CacheManager</tt>)</li><li><a class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=SHIRO&amp;title=RememberMeManager&amp;linkCreation=true&amp;fromPageId=9373660">RememberMeManager</a> (<tt>org.apache.shiro.mgt.RememberMeManager</tt>)</li><li><a class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=SHIRO&amp;title=SubjectFactory&amp;linkCreation=true&amp;fromPageId=9373660">SubjectFactory</a> (<tt>org.apache.shiro.mgt.SubjectFactory</tt>
 )</li></ul>
+<ul>
+	<li>Authenticator (<tt>org.apache.shiro.authc.Authenticator</tt>)</li>
+	<li>Authorizer (<tt>org.apache.shiro.authz.Authorizer</tt>)</li>
+	<li>SessionManager (<tt>org.apache.shiro.session.mgt.SessionManager</tt>)</li>
+	<li><a href="cachemanager.html" title="CacheManager">CacheManager</a> (<tt>org.apache.shiro.cache.CacheManager</tt>)</li>
+	<li>RememberMeManager  (<tt>org.apache.shiro.mgt.RememberMeManager</tt>)</li>
+	<li>SubjectFactory(<tt>org.apache.shiro.mgt.SubjectFactory</tt>)</li></ul>
 
 
 <p>The <tt>SecurityManager</tt> implementations and are also JavaBeans compatible, which allows you (or a configuration mechanism) to easily customize the pluggable components via standard JavaBeans accessor/mutator methods (get*/set*).  This means the Shiro's architectural modularity can translate into very easy configuration for custom behavior.</p>
@@ -155,7 +152,7 @@ Realm realm = <span class="code-comment"
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -163,4 +160,4 @@ Realm realm = <span class="code-comment"
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/session-management-features.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/session-management-features.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/session-management-features.html (original)
+++ shiro/site/publish/session-management-features.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -138,7 +122,7 @@ Sessions are buckets of data that your u
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -146,4 +130,4 @@ Sessions are buckets of data that your u
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/session-management.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/session-management.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/session-management.html (original)
+++ shiro/site/publish/session-management.html Thu Jan 30 21:13:51 2014
@@ -51,35 +51,47 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
             <h1><a name="SessionManagement-SessionManagement"></a>Session Management</h1>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+  <h2>Related Content</h2>
+	
+  <h3><a href="get-started.html">Getting Started</a></h3>
+  <p>Resources, guides and tutorials for new Shiro users. </br><span style="font-size:11"><a href="get-started.html">Read More &gt;&gt;</a></span></p>	
+	
+	<h3><a href="10-minute-tutorial.html">10-Minute Shiro Tutorial</a></h3>
+  <p>Try Apache Shiro for yourself in under 10 minutes. </br><span style="font-size:11"><a href="10-minute-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="java-authentication-guide.html">Java Authentication Guide</a></h3>
+  <p>Learn how Authentication in Java is performed in Shiro. </br><span style="font-size:11"><a href="java-authentication-guide.html">Read More &gt;&gt;</a></span></p>	
+	
+  <h3><a href="java-authorization-guide.html">Java Authorization Guide</a></h3>
+  <p>Learn how Shiro handles access control in Java. </br><span style="font-size:11"><a href="java-authorization-guide.html">Read More &gt;&gt;</a></span></p>	
+
+</div>
+</td>
+</tr>
+</table>
+
 <div class="toc">
 <ul><li><a href="#SessionManagement-UsingSessions">Using Sessions</a></li><li><a href="#SessionManagement-TheSessionManager">The SessionManager</a></li><ul><li><a href="#SessionManagement-SessionTimeout">Session Timeout</a></li><ul><li><a href="#SessionManagement-PerSessionTimeout">Per-Session Timeout</a></li></ul><li><a href="#SessionManagement-SessionListeners">Session Listeners</a></li><li><a href="#SessionManagement-SessionStorage">Session Storage</a></li><ul><li><a href="#SessionManagement-EHCacheSessionDAO">EHCache SessionDAO</a></li><ul><li><a href="#SessionManagement-EHCacheSessionCacheConfiguration">EHCache Session Cache Configuration</a></li><li><a href="#SessionManagement-EHCacheSessionCacheName">EHCache Session Cache Name</a></li></ul><li><a href="#SessionManagement-CustomSessionIDs">Custom Session IDs</a></li></ul><li><a href="#SessionManagement-SessionValidation%26Scheduling">Session Validation &amp; Scheduling</a></li><ul><li><a href="#SessionManagement-DefaultSession
 ValidationScheduler">Default SessionValidationScheduler</a></li><li><a href="#SessionManagement-CustomSessionValidationScheduler">Custom SessionValidationScheduler</a></li><li><a href="#SessionManagement-DisablingSessionValidation">Disabling Session Validation</a></li><li><a href="#SessionManagement-InvalidSessionDeletion">Invalid Session Deletion</a></li></ul></ul><li><a href="#SessionManagement-SessionClustering">Session Clustering</a></li><ul><li><a href="#SessionManagement-%7B%7BEnterpriseCacheSessionDAO%7D%7D"> <tt>EnterpriseCacheSessionDAO</tt></a></li><li><a href="#SessionManagement-EhcacheTerracotta">Ehcache + Terracotta</a></li><li><a href="#SessionManagement-Zookeeper">Zookeeper</a></li></ul><li><a href="#SessionManagement-SessionsandSubjectState">Sessions and Subject State</a></li><ul><li><a href="#SessionManagement-StatefulApplications%28Sessionsallowed%29">Stateful Applications (Sessions allowed)</a></li><li><a href="#SessionManagement-StatelessApplications%28Sessionles
 s%29">Stateless Applications (Sessionless)</a></li><ul><li><a href="#SessionManagement-DisablingSubjectStateSessionStorage">Disabling Subject State Session Storage</a></li></ul><li><a href="#SessionManagement-AHybridApproach">A Hybrid Approach</a></li><ul><li><a href="#SessionManagement-SessionStorageEvaluator">SessionStorageEvaluator</a></li><ul><li><a href="#SessionManagement-SubjectInspection">Subject Inspection</a></li></ul><li><a href="#SessionManagement-Configuration">Configuration</a></li></ul><li><a href="#SessionManagement-WebApplications">Web Applications</a></li></ul></ul></div>
 
@@ -718,7 +730,7 @@ securityManager.subjectDAO.sessionStorag
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -726,4 +738,4 @@ securityManager.subjectDAO.sessionStorag
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/sessionmanager.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/sessionmanager.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/sessionmanager.html (original)
+++ shiro/site/publish/sessionmanager.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -97,7 +81,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -105,4 +89,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/sharing-block-small.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/sharing-block-small.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/sharing-block-small.html (original)
+++ shiro/site/publish/sharing-block-small.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -96,7 +80,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -104,4 +88,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/sharing-block.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/sharing-block.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/sharing-block.html (original)
+++ shiro/site/publish/sharing-block.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -101,7 +85,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -109,4 +93,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/site.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/site.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/site.html (original)
+++ shiro/site/publish/site.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -91,7 +75,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -99,4 +83,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/siteheader.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/siteheader.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/siteheader.html (original)
+++ shiro/site/publish/siteheader.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -109,7 +93,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -117,4 +101,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/spring.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/spring.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/spring.html (original)
+++ shiro/site/publish/spring.html Thu Jan 30 21:13:51 2014
@@ -51,35 +51,36 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
-            <h1><a name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>Integrating Apache Shiro into Spring based Applications</h1>
+            <h1><a name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>Integrating Apache Shiro into Spring-based Applications</h1>
+
+<table align="right" width="275" style="margin-left: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; border-color: navy" cellpadding="10px">
+
+<tr>
+<td>
+<div id="border">
+	
+  <h3><a href="web.html">Web Apps with Shiro</a></h3>
+  <p>Detailed support for integrating Shiro into web applications. </br><span style="font-size:11"><a href="web.html">Read More &gt;&gt;</a></span></p>
+	
+  <h3><a href="webapp-tutorial.html">Web App Tutorial</a></h3>
+  <p>Step-by-step tutorial for securing a web application with Shiro. </br><span style="font-size:11"><a href="webapp-tutorial.html">Read More &gt;&gt;</a></span></p>
+
+</div>
+</td>
+</tr>
+</table>
 
 <p>This page covers the ways to integrate Shiro into <a class="external-link" href="http://www.springframework.org" rel="nofollow">Spring</a>-based applications.</p>
 
@@ -288,6 +289,7 @@ all of its configuration properties in w
 
 <p>The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
 
+
         </div>
 
     </div><!--END WRAPPER-->
@@ -298,7 +300,7 @@ all of its configuration properties in w
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -306,4 +308,4 @@ all of its configuration properties in w
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/subject.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/subject.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/subject.html (original)
+++ shiro/site/publish/subject.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -446,7 +430,7 @@ Executor executor = <span class="code-ke
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -454,4 +438,4 @@ Executor executor = <span class="code-ke
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/support.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/support.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/support.html (original)
+++ shiro/site/publish/support.html Thu Jan 30 21:13:51 2014
@@ -51,41 +51,24 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
 
-            <h1>a name=&ldquo;Support-ApacheShiroCommunitySupport&rdquo;&gt;Apache Shiro Community Support</h1><p>The Shiro project offers support through its community of users, contributors, and project committers.</p><p>We encourage everyone to participate and use the available community support tools below.</p>
+            <h1>Apache Shiro Community Support&quot;</h1><p>The Shiro project offers support through its community of users, contributors, and project committers.</p><p>We encourage everyone to participate and use the available community support tools below.</p>
 <ul>
   <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
   <li><a href="forums.html" title="Forums">Forums</a></li>
-</ul><p><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li><li><a href="forums.html" title="Forums">Forums</a></li><li><a href="issues.html" title="Issues">Issue &amp; Bug Tracking</a></li></ul></p>
-<h2><a name="Support-CommericalSupport"></a>Commerical Support</h2>
-<p><b><a href="commercial-support.html" title="Commercial Support">Commercial support and consulting</a></b> for Apache Shiro is offered by outside organizations who are actively involved with the project.</p>
+  <li><a href="issues.html">Issues and Bug Tracking</a></li>
+</ul>
 
         </div>
 
@@ -97,7 +80,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -105,4 +88,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/tags.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/tags.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/tags.html (original)
+++ shiro/site/publish/tags.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -96,7 +80,7 @@ window.location = "http://svn.apache.org
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -104,4 +88,4 @@ window.location = "http://svn.apache.org
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/team.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/team.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/team.html (original)
+++ shiro/site/publish/team.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -93,7 +77,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -101,4 +85,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/terminology.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/terminology.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/terminology.html (original)
+++ shiro/site/publish/terminology.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -175,7 +159,7 @@ A <em>Subject</em> is just fancy securit
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -183,4 +167,4 @@ A <em>Subject</em> is just fancy securit
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/testing.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/testing.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/testing.html (original)
+++ shiro/site/publish/testing.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -332,7 +316,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -340,4 +324,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: shiro/site/publish/tools.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/tools.html?rev=1562965&r1=1562964&r2=1562965&view=diff
==============================================================================
--- shiro/site/publish/tools.html (original)
+++ shiro/site/publish/tools.html Thu Jan 30 21:13:51 2014
@@ -51,30 +51,14 @@
 
         <div id="header">
             <a href="./index.html"><div id="logo"></div></a>
-            <div id="navigation">
-                <a href="./download.html">
-                    <div class="navigation-button">Get Started</div>
-                </a>
-                <a href="./documentation.html">
-                    <div class="navigation-button">Get Smart</div>
-                </a>
-                <a href="./support.html">
-                    <div class="navigation-button">Get Help</div>
-                </a>
-                <a href="./commercial-support.html">
-                    <div class="navigation-button">Get Support</div>
-                </a>
-            </div> <!--END NAVIGATION-->
-            <div id="secondary-navigation">
-                <ul>
-                    <li><a href="./documentation.html">Documentation</a></li>
-                    <li><a href="./news.html">News</a></li>
-                    <li><a href="./events.html">Events</a></li>
-                    <li><a href="http://twitter.com/ApacheShiro/">Twitter</a></li>
-                    <li><a href="./mailing-lists.html">Mailing lists</a></li>
-                    <li><a href="./contribute.html">Contribute</a></li>
-                </ul>
-            </div> <!--END SECONDARY NAVIGATION-->
+            <ul class="navigation">
+                <li><a href="./get-started.html">Get Started</a></li>
+                <li><a href="./documentation.html">Docs</a></li>
+                <li><a href="./web-features.html">Web Apps</a></li>
+                <li><a href="./integration.html">Integrations</a></li>
+                <li><a href="./features.html">Features</a></li>
+                <li><a href="./community.html">Community</a></li>
+            </ul>
         </div>
 
         <div id="content">
@@ -91,7 +75,7 @@
 
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
-            <p>Copyright &copy; 2008-2013 The Apache Software Foundation</p>
+            <p>Copyright &copy; 2008-2014 The Apache Software Foundation</p>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
@@ -99,4 +83,4 @@
     </div> <!--END FOOTER-->
 
 </body>
-</html>
\ No newline at end of file
+</html>