Modified: shiro/site/publish/get-started.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/get-started.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/get-started.html (original)
+++ shiro/site/publish/get-started.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <h1><a href="#get-started-with-apache-shiro" 
name="get-started-with-apache-shiro">Get Started with Apache Shiro</a></h1>
+                            <h1><a href="#get-started-with-apache-shiro" 
name="get-started-with-apache-shiro">Get Started with Apache Shiro</a></h1>
 <p>Apache Shiro focuses on ease-of-use, so you can rely on secure, stable 
authentication, authorization, cryptography, and session management. With 
Shiro’s easy-to-understand API, you can quickly and easily secure any 
application. Get started!</p>
 <p>Here are some links related help you get started with Shiro:</p>
 <ul>
@@ -102,7 +102,7 @@
   <li>
   <p><strong><a href="what-is-shiro.html">Apache Shiro Project 
Background</a></strong><br/>Apache Shiro, like most useful tools, was created 
out of necessity. Learn more about the project history and mission 
statement.<br/><input type="hidden" id="ghEditPage" 
value="get-started.md"></input></p></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/getting-started-block.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/getting-started-block.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/getting-started-block.html (original)
+++ shiro/site/publish/getting-started-block.html Mon Oct 24 22:11:17 2016
@@ -83,10 +83,10 @@
 
         <div id="content">
 
-            <a name="GettingStartedBlock-GetStartedin10MinuteswithShiro"></a>
+                            <a 
name="GettingStartedBlock-GetStartedin10MinuteswithShiro"></a>
 <h2><a href="#get-started-in-10-minutes-with-shiro" 
name="get-started-in-10-minutes-with-shiro">Get Started in 10 Minutes with 
Shiro</a></h2>
 <p>Try out Shiro for yourself with our <a href="10-minute-tutorial.html" 
title="10 Minute Tutorial">10 Minute Tutorial</a>. And if you have any 
questions about Shiro, please check out our <a href="forums.html" 
title="Forums">community forum</a> or <a href="mailing-lists.html" 
title="Mailing Lists">user mailing list</a> for answers from the 
community.<br/><input type="hidden" id="ghEditPage" 
value="getting-started-block.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/graduation-resolution.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/graduation-resolution.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/graduation-resolution.html (original)
+++ shiro/site/publish/graduation-resolution.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="GraduationResolution-ApacheShiroGraduationResolution"></a>
+                            <a 
name="GraduationResolution-ApacheShiroGraduationResolution"></a>
 <h1><a href="#apache-shiro-graduation-resolution" 
name="apache-shiro-graduation-resolution">Apache Shiro Graduation 
Resolution</a></h1>
 <pre><code class="nohighlight">Establish Apache Shiro Project
 
@@ -137,7 +137,7 @@ Incubator Shiro podling encumbered upon
 PMC are hereafter discharged.
 </code></pre>
 <input type="hidden" id="ghEditPage" value="graduation-resolution.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/guice.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/guice.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/guice.html (original)
+++ shiro/site/publish/guice.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a 
name="Guice-IntegratingApacheShirointoGuicebasedApplication"></a>
+                            <a 
name="Guice-IntegratingApacheShirointoGuicebasedApplication"></a>
 <h1><a href="#integrating-apache-shiro-into-guice-based-application" 
name="integrating-apache-shiro-into-guice-based-application">Integrating Apache 
Shiro into Guice based Application</a></h1>
 <p>Shiro <a href="https://github.com/google/guice";>Guice</a> integration was 
added in Shiro 1.2. This page covers the ways to integrate Shiro into 
Guice-based applications using standard Guice conventions and mechanisms. Prior 
to reading this integration document, you should be a least somewhat familiar 
with Guice.</p>
 <a name="Guice-Overview"></a>
@@ -233,7 +233,7 @@ bindConstant().annotatedWith(Names.named
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="guice.md.vtl"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/guides.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/guides.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/guides.html (original)
+++ shiro/site/publish/guides.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Guides-ApacheShiroGuides"></a>
+                            <a name="Guides-ApacheShiroGuides"></a>
 <h1><a href="#apache-shiro-guides" name="apache-shiro-guides">Apache Shiro 
Guides</a></h1>
 <p>Here are some basic guides on how to use Shiro.</p>
 <p>Please post any errata to the user or dev mailing lists.</p>
@@ -95,7 +95,7 @@
   <li>
   <p><strong><a href="java-authorization-guide.html" title="Java Authorization 
Guide">Authorization Guide</a></strong><br/><input type="hidden" 
id="ghEditPage" value="guides.md"></input></p></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/how-to-contribute.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/how-to-contribute.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/how-to-contribute.html (original)
+++ shiro/site/publish/how-to-contribute.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="HowtoContribute-ContributingtoApacheShiro"></a>
+                            <a 
name="HowtoContribute-ContributingtoApacheShiro"></a>
 <h1><a href="#contributing-to-apache-shiro" 
name="contributing-to-apache-shiro">Contributing to Apache Shiro</a></h1>
 <ul>
   <li><a href="#HowtoContribute-introduction">Introduction</a></li>
@@ -206,7 +206,7 @@ master
   <li>Keep all project-related discussion on the mailing list. It is much 
better to utilise the wider audience, rather than to break off into private 
discussion groups. You never know who else will have the answer to your issues, 
and anyway other people are interested in the outcome.</li>
   <li>Become familiar with the mailing lists. As you browse and search, you 
will see the way other people do things. Follow the leading 
examples.<br/><input type="hidden" id="ghEditPage" 
value="how-to-contribute.md"></input></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/inclusionslibrary.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/inclusionslibrary.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/inclusionslibrary.html (original)
+++ shiro/site/publish/inclusionslibrary.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <p>The children of this page contain information which is 
<strong>included in other pages</strong>. This is a library of re-usable 
information chunks.</p>
+                            <p>The children of this page contain information 
which is <strong>included in other pages</strong>. This is a library of 
re-usable information chunks.</p>
 <p>If you want to change any of these pages, be aware that:</p>
 <ul>
   <li>Changing page names is problematic — you will need to change all the 
{include} and {excerpt-include} macros manually.</li>
@@ -97,7 +97,7 @@
 <pre><code>{include:page name|nopanel=true} 
 </code></pre>
 <input type="hidden" id="ghEditPage" value="inclusionslibrary.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/index.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/index.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/index.html (original)
+++ shiro/site/publish/index.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <div id="main-content">
+                            <div id="main-content">
 
     <h1>Welcome to Apache Shiro</h1>
 
@@ -194,7 +194,7 @@
 
 <div class="clearfix"></div>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/integration.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/integration.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/integration.html (original)
+++ shiro/site/publish/integration.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <h1><a href="#apache-shiro-integrations" 
name="apache-shiro-integrations">Apache Shiro Integrations</a></h1>
+                            <h1><a href="#apache-shiro-integrations" 
name="apache-shiro-integrations">Apache Shiro Integrations</a></h1>
 <p>Shiro has been downloaded over one million times and is in production at 
thousands of companies. One reason: it integrates well with other technologies 
and frameworks. </p>
 <h2><a href="#officially-supported-integrations" 
name="officially-supported-integrations">Officially Supported 
Integrations</a></h2>
 <p>These integrations are supported by the Apache Shiro Development team. Want 
to help make them great? <a href="how-to-contribute.html">Contribute</a> back 
to the project!</p>
@@ -137,7 +137,7 @@
 </ul>
 <h2><a href="#got-an-integration-" name="got-an-integration-">Got An 
Integration?</a></h2>
 <p>Have an integration you want listed? Send us a pull request of <a 
href="https://github.com/apache/shiro-site/blob/master/integration.md";>this 
page</a>, and participate in Shiro development! <a 
href="how-to-contribute.html">Learn more about contributing to Apache 
Shiro</a>.<br/><input type="hidden" id="ghEditPage" 
value="integration.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/introduction.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/introduction.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/introduction.html (original)
+++ shiro/site/publish/introduction.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Introduction-IntroductiontoApacheShiro"></a>
+                            <a 
name="Introduction-IntroductiontoApacheShiro"></a>
 <h1><a href="#introduction-to-apache-shiro" 
name="introduction-to-apache-shiro">Introduction to Apache Shiro</a></h1>
 <a name="Introduction-WhatisApacheShiro%3F"></a>
 <h2><a href="#what-is-apache-shiro-" name="what-is-apache-shiro-">What is 
Apache Shiro?</a></h2>
@@ -129,7 +129,7 @@
   <li>&ldquo;Run As&rdquo;: A feature that allows users to assume the identity 
of another user (if they are allowed), sometimes useful in administrative 
scenarios.</li>
   <li>&ldquo;Remember Me&rdquo;: Remember users&rsquo; identities across 
sessions so they only need to log in when mandatory.<br/><input type="hidden" 
id="ghEditPage" value="introduction.md"></input></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/issues.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/issues.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/issues.html (original)
+++ shiro/site/publish/issues.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Issues-ApacheShiroBug%26IssueTracking"></a>
+                            <a 
name="Issues-ApacheShiroBug%26IssueTracking"></a>
 <h2>Apache Shiro Bug &amp; Issue Tracking</h2>
 <p>Apache Shiro uses Atlassian Jira for tracking tasks, feature requests, 
bugs, and other issues related to the project development.</p>
 <a name="Issues-UsageGuidelines"></a>
@@ -100,7 +100,7 @@
 <a 
name="Issues-ClickheretovisittheApacheShiroJiraissuetrackerhttps%3A%2F%2Fissues.apache.org%2Fjira%2Fbrowse%2FSHIRO"></a>
 <h2><a href="https://issues.apache.org/jira/browse/SHIRO";>Click here to visit 
the Apache Shiro Jira issue tracker</a></h2>
 <input type="hidden" id="ghEditPage" value="issues.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/java-annotations-list.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-annotations-list.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/java-annotations-list.html (original)
+++ shiro/site/publish/java-annotations-list.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="JavaAnnotationsList-JavaAnnotationsList"></a>
+                            <a 
name="JavaAnnotationsList-JavaAnnotationsList"></a>
 <h1><a href="#java-annotations-list" name="java-annotations-list">Java 
Annotations List</a></h1>
 <p>Below are a list of the different Shiro annotations you can use in your 
application.</p>
 <ul>
@@ -99,7 +99,7 @@
   <p><strong><a 
href="static/current/apidocs/org/apache/shiro/authz/annotation/RequiresUser.html">RequiresUser</a></strong>
 - Requires the current Subject to be an application user for the annotated 
class/instance/method to be accessed or invoked.</p></li>
 </ul>
 <input type="hidden" id="ghEditPage" value="java-annotations-list.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/java-annotations.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-annotations.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/java-annotations.html (original)
+++ shiro/site/publish/java-annotations.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="JavaAnnotations-JavaAnnotationSupport"></a>
+                            <a 
name="JavaAnnotations-JavaAnnotationSupport"></a>
 <h1><a href="#java-annotation-support" name="java-annotation-support">Java 
Annotation Support</a></h1>
 <p>Before you can use Java annotations, you&rsquo;ll need to enable AOP 
support in your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 <p>For AspectJ, you can review our <a 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
@@ -95,7 +95,7 @@
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-annotations.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/java-authentication-guide.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-authentication-guide.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/java-authentication-guide.html (original)
+++ shiro/site/publish/java-authentication-guide.html Mon Oct 24 22:11:17 2016
@@ -83,30 +83,29 @@
 
         <div id="content">
 
-            <a 
name="JavaAuthenticationGuide-JavaAuthenticationGuidewithApacheShiro"></a>
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 200px; float: left"></div>
+
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <h2>Related Content</h2>
+                    <h3><a href="authentication-features.html">Authentication 
Features</a></h3>
+            <p>Quick overview of easy, subject-based authentication in 
Shiro.</br><span style="font-size:11"><a 
href="authentication-features.html">Read More &gt;&gt;</a></span></p>
+                    <h3><a href="authentication.html">Authentication 
Docs</a></h3>
+            <p>Full documentation on Shiro's Authentication 
functionality.</br><span style="font-size:11"><a 
href="authentication.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>
+          </div>
+  <a name="JavaAuthenticationGuide-JavaAuthenticationGuidewithApacheShiro"></a>
 <h1><a href="#java-authentication-guide-with-apache-shiro" 
name="java-authentication-guide-with-apache-shiro">Java Authentication Guide 
with Apache Shiro</a></h1>
 <p>Authentication is the process of identity verification&ndash; you are 
trying to prove a user is who they say they are. To do so, a user needs to 
provide some sort of proof of identity that your system understands and 
trust.</p>
 <p>The goal of this guide is to walk you through how Authentication in Java is 
performed in Shiro. If you haven&rsquo;t already please take moment and go 
through Shiro&rsquo;s <a href="10-minute-tutorial.html" title="10 Minute 
Tutorial">10 Minute Tutorial</a> so that you get a basic understanding of how 
to work with Shiro.</p>
 <a name="JavaAuthenticationGuide-Terminologyyou%27llneed"></a>
 <h2>Terminology you&rsquo;ll need</h2>
-<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="authentication-features.html">Authentication Features</a></h3>
-  <p>Quick overview of easy, subject-based authentication in Shiro. </br><span 
style="font-size:11"><a href="authentication-features.html">Read More 
&gt;&gt;</a></span></p>
-
-  <h3><a href="authentication.html">Authentication Docs</a></h3>
-  <p>Full documentation on Apache Shiro's Authentication functionality. 
</br><span style="font-size:11"><a href="authentication.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>
-
-</div>
-</td></tr></table>
 <ul>
   <li>
   <p><strong>Subject</strong> - Security specific user &lsquo;view&rsquo; of 
an application user. It can be a human being, a third-party process, a server 
connecting to you application application, or even a cron job. Basically, it is 
anything or anyone communicating with your application.</p></li>
@@ -237,8 +236,7 @@ currentUser.login(token);
 <a name="JavaAuthenticationGuide-Lendahandwithdocumentation"></a>
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
-<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-authentication-guide.md.vtl"></input></p>
-
+<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-authentication-guide.md.vtl"></input></p>            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/java-authorization-guide.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-authorization-guide.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/java-authorization-guide.html (original)
+++ shiro/site/publish/java-authorization-guide.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,26 @@
 
         <div id="content">
 
-            <a 
name="JavaAuthorizationGuide-JavaAuthorizationGuidewithApacheShiro"></a>
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 200px; float: left"></div>
+
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <h2>Related Content</h2>
+                    <h3><a href="authorization-features.html">Authorization 
Features</a></h3>
+            <p>Quick overview of permissions, roles, and users in 
Shiro.</br><span style="font-size:11"><a 
href="authorization-features.html">Read More &gt;&gt;</a></span></p>
+                    <h3><a href="authorization.html">Authorization 
Docs</a></h3>
+            <p>Full documentation on Apache Shiro's Authorization 
functionality.</br><span style="font-size:11"><a href="authorization.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>
+                    <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>
+  <a name="JavaAuthorizationGuide-JavaAuthorizationGuidewithApacheShiro"></a>
 <h1><a href="#java-authorization-guide-with-apache-shiro" 
name="java-authorization-guide-with-apache-shiro">Java Authorization Guide with 
Apache Shiro</a></h1>
 <p>Authorization, or access control, is the function of specifying access 
rights to resources. In other words, <em>who</em> has access to 
<em>what</em>.</p>
 <p>Examples of authorization checks are: Is the user allowed to look at this 
webpage, edit this data, view this button, or print to this printer? Those are 
all decisions determining what a user has access to.</p>
@@ -92,27 +111,6 @@
 <p>Authorization has three core elements that we reference quite a bit in 
Shiro&ndash; permissions, roles, and users.</p>
 <a name="JavaAuthorizationGuide-PermissionsDefined"></a>
 <h3><a href="#permissions-defined" name="permissions-defined">Permissions 
Defined</a></h3>
-<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="authorization-features.html">Authorization Features</a></h3>
-  <p>Quick overview of permissions, roles, and users in Shiro. </br><span 
style="font-size:11"><a href="authorization-features.html">Read More 
&gt;&gt;</a></span></p>
-       
-  <h3><a href="authorization.html">Authorization Docs</a></h3>
-  <p>Full documentation on Apache Shiro's Authorization functionality. 
</br><span style="font-size:11"><a href="authorization.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>
-       
-  <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>Permissions are the most atomic level of a security policy and they are 
statements of functionality. Permissions represent what can be done in your 
application. A well formed permission describes a resource types and what 
actions are possible when you interact with those resources. Can you 
<em>open</em> a <em>door</em>? Can you <em>read</em> a <em>file</em>? Can you 
<em>delete</em> a <em>customer record</em>? Can you <em>push</em> a 
<em>button</em>?</p>
 <p>Common actions for data-related resources are create, read, update, and 
delete, commonly referred to as CRUD.</p>
 <p>It is important to understand that permissions do not have knowledge of 
<em>who</em> can perform the actions&ndash; they are just statements of 
<em>what</em> actions can be performed.</p>
@@ -278,8 +276,7 @@ public void openAccount( Account acct )
 <a name="JavaAuthorizationGuide-Lendahandwithdocumentation"></a>
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
-<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-authorization-guide.md.vtl"></input></p>
-
+<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-authorization-guide.md.vtl"></input></p>            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/java-cryptography-guide.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-cryptography-guide.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/java-cryptography-guide.html (original)
+++ shiro/site/publish/java-cryptography-guide.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a 
name="JavaCryptographyGuide-JavaCryptographyGuidewithApacheShiro"></a>
+                            <a 
name="JavaCryptographyGuide-JavaCryptographyGuidewithApacheShiro"></a>
 <h1><a href="#java-cryptography-guide-with-apache-shiro" 
name="java-cryptography-guide-with-apache-shiro">Java Cryptography Guide with 
Apache Shiro</a></h1>
 <div class="addthis_toolbox addthis_default_style">
 <a class="addthis_button_compact" 
href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd";>Share</a>
@@ -195,7 +195,7 @@ new Sha256(aPassword, salt, 1024).toBase
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="java-cryptography-guide.md.vtl"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/jsp-tag-library.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/jsp-tag-library.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/jsp-tag-library.html (original)
+++ shiro/site/publish/jsp-tag-library.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="JSPTagLibrary-JSP%2FGSPTagLibraryforApacheShiro"></a>
+                            <a 
name="JSPTagLibrary-JSP%2FGSPTagLibraryforApacheShiro"></a>
 <h1><a href="#jsp-gsp-tag-library-for-apache-shiro" 
name="jsp-gsp-tag-library-for-apache-shiro">JSP/GSP Tag Library for Apache 
Shiro</a></h1>
 <ul>
   <li>
@@ -107,7 +107,7 @@
   <li>
   <p><strong>&lt;shiro:notAuthenticated/&gt;</strong> - Displays body content 
only if the current user has NOT succesfully authenticated <em>during their 
current session</em>. It is logically opposite to the 
&lsquo;authenticated&rsquo; tag.<br/><input type="hidden" id="ghEditPage" 
value="jsp-tag-library.md"></input></p></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/license.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/license.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/license.html (original)
+++ shiro/site/publish/license.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="License-TheApacheSoftwareLicense%2CVersion2.0"></a>
+                            <a 
name="License-TheApacheSoftwareLicense%2CVersion2.0"></a>
 <h1>The Apache Software License, Version 2.0</h1>
 <pre><code class="nohighlight">                                Apache License
                            Version 2.0, January 2004
@@ -288,7 +288,7 @@
    limitations under the License.
 </code></pre>
 <input type="hidden" id="ghEditPage" value="license.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/mailing-lists.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/mailing-lists.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/mailing-lists.html (original)
+++ shiro/site/publish/mailing-lists.html Mon Oct 24 22:11:17 2016
@@ -83,58 +83,63 @@
 
         <div id="content">
 
-            <a name="MailingLists-ApacheShiroMailingLists"></a>
+                            <style>
+
+    table, th, td {
+        border: 1px solid black;
+        border-collapse: collapse;
+        border-color: #ccc;
+    }
+    th {
+        background-color: #f0f0f0
+    }
+    th, td {
+        padding: 8px;
+    }
+</style>
+<a name="MailingLists-ApacheShiroMailingLists"></a>
 <h1><a href="#apache-shiro-mailing-lists" 
name="apache-shiro-mailing-lists">Apache Shiro Mailing Lists</a></h1>
-<!-- Markdown tables need some style before switchig
-| List Name            | List Address                      | Subscribe         
                                     | Unsubscribe                              
                  | ASF Archive                                                 
           | Nabble (Online Forums)                                             
      |
-|----------------------|-----------------------------------|--------------------------------------------------------|------------------------------------------------------------|------------------------------------------------------------------------|--------------------------------------------------------------------------|
-| Shiro User List      | [mailto:[email protected]]    | 
[Subscribe](mailto:[email protected])    | 
[Unsubscribe](mailto:[email protected])    | [ASF 
Archive](http://mail-archives.apache.org/mod_mbox/shiro-user/)    | [Nabble 
Forum and Archive](http://shiro-user.582556.n2.nabble.com/)      |
-| Shiro Developer List | [mailto:[email protected]]     | 
[Subscribe](mailto:[email protected])     | 
[Unsubscribe](mailto:[email protected])     | [ASF 
Archive](http://mail-archives.apache.org/mod_mbox/shiro-dev)      | [Nabble 
Forum and Archive](http://shiro-developer.582600.n2.nabble.com/) |
-| Shiro SCM List       | [mailto:[email protected]] | 
[Subscribe](mailto:[email protected]) | 
[Unsubscribe](mailto:[email protected]) | [ASF 
Archive](http://mail-archives.apache.org/mod_mbox/shiro-commits/) |             
                                                             |
--->
-<div class="table-wrap">
-    <table class="confluenceTable">
-        <tbody>
-        <tr>
-            <th colspan="1" rowspan="1" class="confluenceTh"> List Name</th>
-            <th colspan="1" rowspan="1" class="confluenceTh"> List Address</th>
-            <th colspan="1" rowspan="1" class="confluenceTh"> Subscribe</th>
-            <th colspan="1" rowspan="1" class="confluenceTh"> Unsubscribe</th>
-            <th colspan="1" rowspan="1" class="confluenceTh"> ASF Archive</th>
-            <th colspan="1" rowspan="1" class="confluenceTh"> Nabble (Online 
Forums)</th>
-        </tr>
-        <tr>
-            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro User 
List</td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">[email protected]</a>
-            </td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Subscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Unsubscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" 
href="http://mail-archives.apache.org/mod_mbox/shiro-user/";>ASF Archive</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="http://shiro-user.582556.n2.nabble.com/"; 
rel="nofollow">Nabble Forum and Archive</a></td>
-        </tr>
-        <tr>
-            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro Developer 
List</td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">[email protected]</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Subscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Unsubscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" 
href="http://mail-archives.apache.org/mod_mbox/shiro-dev/";>ASF Archive</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="http://shiro-developer.582600.n2.nabble.com/"; 
rel="nofollow">Nabble Forum and Archive</a></td>
-        </tr>
-        <tr>
-            <td colspan="1" rowspan="1" class="confluenceTd"> Shiro SCM 
List</td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">[email protected]</a> </td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Subscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" href="mailto:[email protected]"; 
rel="nofollow">Unsubscribe</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"><a 
class="external-link" 
href="http://mail-archives.apache.org/mod_mbox/shiro-commits/";>ASF 
Archive</a></td>
-            <td colspan="1" rowspan="1" class="confluenceTd"></td>
-        </tr>
-        </tbody>
-    </table>
-</div>
+<table>
+  <thead>
+    <tr>
+      <th>List Name </th>
+      <th>List Address </th>
+      <th>Subscribe </th>
+      <th>Unsubscribe </th>
+      <th>ASF Archive </th>
+      <th>Nabble (Online Forums) </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Shiro User List </td>
+      <td><a href="mailto:[email protected]";>[email protected]</a> 
</td>
+      <td><a href="mailto:[email protected]";>Subscribe</a> </td>
+      <td><a href="mailto:[email protected]";>Unsubscribe</a> 
</td>
+      <td><a href="http://mail-archives.apache.org/mod_mbox/shiro-user/";>ASF 
Archive</a> </td>
+      <td><a href="http://shiro-user.582556.n2.nabble.com/";>Nabble Forum and 
Archive</a> </td>
+    </tr>
+    <tr>
+      <td>Shiro Developer List </td>
+      <td><a href="mailto:[email protected]";>[email protected]</a> 
</td>
+      <td><a href="mailto:[email protected]";>Subscribe</a> </td>
+      <td><a href="mailto:[email protected]";>Unsubscribe</a> 
</td>
+      <td><a href="http://mail-archives.apache.org/mod_mbox/shiro-dev/";>ASF 
Archive</a> </td>
+      <td><a href="http://shiro-developer.582600.n2.nabble.com/";>Nabble Forum 
and Archive</a> </td>
+    </tr>
+    <tr>
+      <td>Shiro SCM List </td>
+      <td><a 
href="mailto:[email protected]";>[email protected]</a> </td>
+      <td><a href="mailto:[email protected]";>Subscribe</a> 
</td>
+      <td><a 
href="mailto:[email protected]";>Unsubscribe</a> </td>
+      <td><a 
href="http://mail-archives.apache.org/mod_mbox/shiro-commits/";>ASF Archive</a> 
</td>
+      <td> </td>
+    </tr>
+  </tbody>
+</table>
 <a name="MailingLists-DiscussionForums"></a>
-<h3><a href="#discussion-forums" name="discussion-forums">Discussion 
Forums</a></h3>
 <p>If you prefer you could use our discussion <a href="forums.html" 
title="Forums">Forums</a> which are sync&rsquo;d with the above mailing 
lists.<br/><input type="hidden" id="ghEditPage" 
value="mailing-lists.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/navigation.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/navigation.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/navigation.html (original)
+++ shiro/site/publish/navigation.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <ul>
+                            <ul>
   <li><a href="index.html">Home</a></li>
   <li><a href="download.html">Download</a></li>
   <li>
@@ -126,7 +126,7 @@
   <p><a href="commercial-support.html">Commercial Support</a></p></li>
 </ul>
 <input type="hidden" id="ghEditPage" value="navigation.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/news.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/news.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/news.html (original)
+++ shiro/site/publish/news.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <script type="text/javascript">
+                            <script type="text/javascript">
     //Swap the blog title with the author information (not sure why Confluence 
orders it this way):
     jQuery(function() {
         jQuery("a.blogHeading").each(function() {
@@ -617,7 +617,7 @@ The Apache Shiro Team
 
 <input type="hidden" id="ghEditPage" value="news.html"></input>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/overview.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/overview.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/overview.html (original)
+++ shiro/site/publish/overview.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Overview-OverviewofApacheShiro"></a>
+                            <a name="Overview-OverviewofApacheShiro"></a>
 <h1><a href="#overview-of-apache-shiro" 
name="overview-of-apache-shiro">Overview of Apache Shiro</a></h1>
 <a name="Overview-Introduction"></a>
 <h2><a href="#introduction" name="introduction">Introduction</a></h2>
@@ -165,7 +165,7 @@ Subject currentUser = SecurityUtils.getS
 <p>In this sense a Realm is essentially a security-specific <a 
href="https://en.wikipedia.org/wiki/Data_access_object";>DAO</a>: it 
encapsulates connection details for data sources and makes the associated data 
available to Shiro as needed. When configuring Shiro, you must specify at least 
one Realm to use for authentication and/or authorization. More than one Realm 
may be configured, but at least one is required.</p>
 <p>Shiro provides out-of-the-box Realms to connect to a number of security 
data sources (aka directories) such as LDAP, relational databases (JDBC), text 
configuration sources like INI and properties files, and more. You can plug-in 
your own Realm implementations to represent custom data sources if the default 
Realms do not meet your needs.</p>
 <p>Like other internal components, the Shiro <code>SecurityManager</code> 
manages how Realms are used to acquire security data and then represented as 
<code>Subject</code> instances.<br/><input type="hidden" id="ghEditPage" 
value="overview.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/performing-a-release.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/performing-a-release.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/performing-a-release.html (original)
+++ shiro/site/publish/performing-a-release.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <p>This page has been moved.  You are being redirected.</p>
+                            <p>This page has been moved.  You are being 
redirected.</p>
 
 <div class="panelMacro">
     <table class="noteMacro">
@@ -114,7 +114,7 @@
 </script>
 <input type="hidden" id="ghEditPage" 
value="performing-a-release.html.vtl"></input>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/permissions.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/permissions.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/permissions.html (original)
+++ shiro/site/publish/permissions.html Mon Oct 24 22:11:17 2016
@@ -83,27 +83,24 @@
 
         <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"><tbody><tr><td>
+                            
 
-<div id="border">
-    <h2>Related Content</h2>
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 60px; float: left"></div>
 
-    <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></tbody></table>
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <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>
+  <h1><a 
name="Permissions-UnderstandingPermissionsinApacheShiro"></a>Understanding 
Permissions in Apache Shiro</h1>
 <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 &ldquo;what&rdquo; the application can do.</p>
 <p>They do <em>not</em> at all describe &ldquo;who&rdquo; is able to perform 
the action(s).</p>
 <p>Some examples of permissions:</p>
@@ -259,8 +256,7 @@ printer:print:epsoncolor
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
-<input type="hidden" id="ghEditPage" value="permissions.md"></input>
-
+<input type="hidden" id="ghEditPage" value="permissions.md"></input>           
 
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/powered-by-shiro.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/powered-by-shiro.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/powered-by-shiro.html (original)
+++ shiro/site/publish/powered-by-shiro.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="PoweredbyShiro-OrganizationsusingApacheShiro"></a>
+                            <a 
name="PoweredbyShiro-OrganizationsusingApacheShiro"></a>
 <h1><a href="#organizations-using-apache-shiro" 
name="organizations-using-apache-shiro">Organizations using Apache 
Shiro</a></h1>
 <p>Please consider adding yourself to the Apache Shiro PoweredBy page. By 
letting others know that you are using Shiro, you help expand the community and 
in turn improve Shiro. Win/Win!</p>
 <a name="PoweredbyShiro-Stormpath"></a>
@@ -111,7 +111,7 @@
 <p><a class="external-link" href="http://www.apache.org";>Your Company Name</a> 
- Your company description</p>
 <ul><li>Any details you can share</li><li>...</li></ul>
 <input type="hidden" id="ghEditPage" value="powered-by-shiro.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/privacy-policy.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/privacy-policy.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/privacy-policy.html (original)
+++ shiro/site/publish/privacy-policy.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="PrivacyPolicy-ApacheShiroPrivacyPolicy"></a>
+                            <a 
name="PrivacyPolicy-ApacheShiroPrivacyPolicy"></a>
 <h1><a href="#apache-shiro-privacy-policy" 
name="apache-shiro-privacy-policy">Apache Shiro Privacy Policy</a></h1>
 <p>Information about your use of this website is collected using server access 
logs and a tracking cookie. The collected information consists of the 
following:</p>
 <ul>
@@ -96,7 +96,7 @@
 <p>Part of this information is gathered using a tracking cookie set by the 
Google Analytics service and handled by Google as described in their privacy 
policy. See your browser documentation for instructions on how to disable the 
cookie if you prefer not to share this data with Google.</p>
 <p>We use the gathered information to help us make our site more useful to 
visitors and to better understand how and when our site is used. We do not 
track or collect personally identifiable information or associate gathered data 
with any personally identifying information from other sources.</p>
 <p>By using this website, you consent to the collection of this data in the 
manner and for the purpose described above.<br/><input type="hidden" 
id="ghEditPage" value="privacy-policy.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/quickstart.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/quickstart.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/quickstart.html (original)
+++ shiro/site/publish/quickstart.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <p>This page has been moved.  You are being redirected.</p>
+                            <p>This page has been moved.  You are being 
redirected.</p>
 
 <div class="panelMacro">
     <table class="noteMacro">
@@ -114,7 +114,7 @@
 </script>
 <input type="hidden" id="ghEditPage" value="quickstart.html.vtl"></input>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/realm.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/realm.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/realm.html (original)
+++ shiro/site/publish/realm.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <h1><a name="Realm-ApacheShiroRealms"></a>Apache Shiro Realms</h1>
+                            <h1><a name="Realm-ApacheShiroRealms"></a>Apache 
Shiro Realms</h1>
 <ul>
   <li>
     <p><a href="#Realm-RealmConfiguration">Realm Configuration</a></p>
@@ -347,7 +347,7 @@ myRealm.credentialsMatcher = $credential
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
 <input type="hidden" id="ghEditPage" value="realm.md.vtl"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/reference.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/reference.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/reference.html (original)
+++ shiro/site/publish/reference.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Reference-ApacheShiroReferenceDocumentation"></a>
+                            <a 
name="Reference-ApacheShiroReferenceDocumentation"></a>
 <h1><a href="#apache-shiro-reference-documentation" 
name="apache-shiro-reference-documentation">Apache Shiro Reference 
Documentation</a></h1>
 <ol>
   <li>
@@ -160,7 +160,7 @@
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html">User Mailing List</a>.</p>
 <input type="hidden" id="ghEditPage" value="reference.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/securitymanager.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/securitymanager.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/securitymanager.html (original)
+++ shiro/site/publish/securitymanager.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a 
name="SecurityManager-UnderstandingtheSecurityManagerinApacheShiro"></a>
+                            <a 
name="SecurityManager-UnderstandingtheSecurityManagerinApacheShiro"></a>
 <h1><a href="#understanding-the-securitymanager-in-apache-shiro" 
name="understanding-the-securitymanager-in-apache-shiro">Understanding the 
SecurityManager in Apache Shiro</a></h1>
 <p>The <a 
href="static/current/apidocs/org/apache/shiro/mgt/SecurityManager.html">SecurityManager</a>
 lies at the heart of Shiro&rsquo;s architecture. While the <a 
href="subject.html" title="Subject">Subject</a> represents security 
functionality and state for a <em>single</em> application user, the 
<code>SecurityManager</code> performs security operations and manages state for 
<em>all</em> application users.</p>
 <p>Because Shiro&rsquo;s API encourages a <code>Subject</code>-centric 
programming approach, most application developers will rarely, if ever, 
interact with the <code>SecurityManager</code> directly (framework developers 
however might sometimes find it useful). Even so, it is still important to know 
how the <code>SecurityManager</code> functions, especially when configuring one 
for an application.</p>
@@ -159,7 +159,7 @@ SecurityUtils.setSecurityManager(securit
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="securitymanager.md.vtl"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/session-management-features.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/session-management-features.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/session-management-features.html (original)
+++ shiro/site/publish/session-management-features.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a 
name="SessionManagementFeatures-ApacheShiroSessionManagementFeatures"></a>
+                            <a 
name="SessionManagementFeatures-ApacheShiroSessionManagementFeatures"></a>
 <h1><a href="#apache-shiro-session-management-features" 
name="apache-shiro-session-management-features">Apache Shiro Session Management 
Features</a></h1>
 <div class="addthis_toolbox addthis_default_style">
 <a class="addthis_button_compact" 
href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd";>Share</a>
@@ -121,7 +121,7 @@
 <a name="SessionManagementFeatures-GetStartedin10MinuteswithShiro"></a>
 <h2><a href="#get-started-in-10-minutes-with-shiro" 
name="get-started-in-10-minutes-with-shiro">Get Started in 10 Minutes with 
Shiro</a></h2>
 <p>Try out Shiro for yourself with our <a href="10-minute-tutorial.html">10 
Minute Tutorial</a>. And if you have any questions about Shiro, please check 
out our <a href="forums.html">community forum</a> or <a 
href="mailing-lists.html">user mailing list</a> for answers from the 
community.<br/><input type="hidden" id="ghEditPage" 
value="session-management-features.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/session-management.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/session-management.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/session-management.html (original)
+++ shiro/site/publish/session-management.html Mon Oct 24 22:11:17 2016
@@ -83,34 +83,27 @@
 
         <div id="content">
 
-            <a name="SessionManagement-SessionManagement"></a>
-<h1><a href="#session-management" name="session-management">Session 
Management</a></h1>
-<table align="right" width="275" style="margin-left: 20px; margin-bottom: 
20px; border-style: solid; border-width: 2px; border-color: navy" 
cellpadding="10px">
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 60px; float: left"></div>
 
-<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>
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <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>
+  <a name="SessionManagement-SessionManagement"></a>
+<h1><a href="#session-management" name="session-management">Session 
Management</a></h1>
 <ul>
   <li><a href="#SessionManagement-UsingSessions">Using Sessions</a></li>
   <li><a href="#SessionManagement-TheSessionManager">The SessionManager</a>
@@ -859,8 +852,7 @@ securityManager.subjectDAO.sessionStorag
 <ul>
   <li><code>httpServletRequest.getSession(false)</code></li>
   <li><code>subject.getSession(false)</code><br/><input type="hidden" 
id="ghEditPage" value="session-management.md.vtl"></input></li>
-</ul>
-
+</ul>            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/sessionmanager.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/sessionmanager.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/sessionmanager.html (original)
+++ shiro/site/publish/sessionmanager.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <p>This page has been moved.  You are being redirected.</p>
+                            <p>This page has been moved.  You are being 
redirected.</p>
 
 <div class="panelMacro">
     <table class="noteMacro">
@@ -114,7 +114,7 @@
 </script>
 <input type="hidden" id="ghEditPage" value="sessionmanager.html.vtl"></input>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/spring.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/spring.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/spring.html (original)
+++ shiro/site/publish/spring.html Mon Oct 24 22:11:17 2016
@@ -83,19 +83,21 @@
 
         <div id="content">
 
-            <a 
name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>
-<h1>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"><tbody><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>
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 200px; float: left"></div>
 
-</div>
-</td></tr></tbody></table>
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <h2>Related Content</h2>
+                    <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>
+  <a name="Spring-IntegratingApacheShirointoSpringbasedApplications"></a>
+<h1>Integrating Apache Shiro into Spring-based Applications</h1>
 <p>This page covers the ways to integrate Shiro into <a 
href="http://spring.io";>Spring</a>-based applications.</p>
 <p>Shiro&rsquo;s JavaBeans compatibility makes it perfectly suited to be 
configured via Spring XML or other Spring-based configuration mechanisms. Shiro 
applications need an application singleton <code>SecurityManager</code> 
instance. Note that this does not have to be a <em>static</em> singleton, but 
there should only be a single instance used by the application, whether its a 
static singleton or not.</p>
 <h2><a name="Spring-StandaloneApplications"></a>Standalone Applications</h2>
@@ -247,8 +249,7 @@
 <a name="Spring-Lendahandwithdocumentation"></a>
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
-<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="spring.md"></input></p>
-
+<p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="spring.md"></input></p>            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/subject.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/subject.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/subject.html (original)
+++ shiro/site/publish/subject.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Subject-UnderstandingSubjectsinApacheShiro"></a>
+                            <a 
name="Subject-UnderstandingSubjectsinApacheShiro"></a>
 <h1><a href="#understanding-subjects-in-apache-shiro" 
name="understanding-subjects-in-apache-shiro">Understanding Subjects in Apache 
Shiro</a></h1>
 <p>Without question, the most important concept in Apache Shiro is the 
<code>Subject</code>. &lsquo;Subject&rsquo; is just a security term that means 
a security-specific &lsquo;view&rsquo; of an application user. A Shiro 
<code>Subject</code> instance represents both security state and operations for 
a <em>single</em> application user.</p>
 <p>These operations include:</p>
@@ -409,7 +409,7 @@ Executor executor = new java.util.concur
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="subject.md.vtl"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/support.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/support.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/support.html (original)
+++ shiro/site/publish/support.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <h1>Apache Shiro Community Support&quot;</h1>
+                            <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>
@@ -91,7 +91,7 @@
   <li><a href="forums.html" title="Forums">Forums</a></li>
   <li><a href="issues.html">Issues and Bug Tracking</a><br/><input 
type="hidden" id="ghEditPage" value="support.md"></input></li>
 </ul>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/tags.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/tags.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/tags.html (original)
+++ shiro/site/publish/tags.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <script type="text/javascript">
+                            <script type="text/javascript">
 <!--
 window.location = 
"https://github.com/apache/shiro/blob/master/web/src/main/resources/META-INF/shiro.tld";
 //-->
@@ -91,7 +91,7 @@ window.location = "https://github.com/ap
 
 <input type="hidden" id="ghEditPage" value="tags.html"></input>
 
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/team.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/team.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/team.html (original)
+++ shiro/site/publish/team.html Mon Oct 24 22:11:17 2016
@@ -83,10 +83,10 @@
 
         <div id="content">
 
-            <h1><a href="#apache-shiro-team" name="apache-shiro-team">Apache 
Shiro Team</a></h1>
+                            <h1><a href="#apache-shiro-team" 
name="apache-shiro-team">Apache Shiro Team</a></h1>
 <p>TODO: list dev team members here</p>
 <input type="hidden" id="ghEditPage" value="team.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/terminology.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/terminology.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/terminology.html (original)
+++ shiro/site/publish/terminology.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Terminology-ApacheShiroTerminology"></a>
+                            <a name="Terminology-ApacheShiroTerminology"></a>
 <h1><a href="#apache-shiro-terminology" name="apache-shiro-terminology">Apache 
Shiro Terminology</a></h1>
 <p>Please just take 2 minutes to read and understand this - it is 
<em>really</em> important. Really. The terms and concepts here are referred to 
everywhere in the documentation and it will <em>greatly</em> simplify your 
understanding of Shiro and security in general.</p>
 <p>Security can be really confusing because of the terminology used. 
We&rsquo;ll make life easier by clarifying some core concepts and you&rsquo;ll 
see how nicely the Shiro API reflects them:</p>
@@ -160,7 +160,7 @@
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <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>
 <input type="hidden" id="ghEditPage" value="terminology.md"></input>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/testing.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/testing.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/testing.html (original)
+++ shiro/site/publish/testing.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <a name="Testing-TestingwithApacheShiro"></a>
+                            <a name="Testing-TestingwithApacheShiro"></a>
 <h1><a href="#testing-with-apache-shiro" 
name="testing-with-apache-shiro">Testing with Apache Shiro</a></h1>
 <p>This part of the documentation explains how to enable Shiro in unit 
tests.</p>
 <a name="Testing-Whattoknowfortests"></a>
@@ -310,7 +310,7 @@ public class ExampleShiroIntegrationTest
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="testing.md.vtl"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/tools.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/tools.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/tools.html (original)
+++ shiro/site/publish/tools.html Mon Oct 24 22:11:17 2016
@@ -83,8 +83,8 @@
 
         <div id="content">
 
-            <p><a href="command-line-hasher.html">Command Line 
Hasher</a><br/><input type="hidden" id="ghEditPage" 
value="tools.md"></input></p>
-
+                            <p><a href="command-line-hasher.html">Command Line 
Hasher</a><br/><input type="hidden" id="ghEditPage" 
value="tools.md"></input></p>
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/tutorial.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/tutorial.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/tutorial.html (original)
+++ shiro/site/publish/tutorial.html Mon Oct 24 22:11:17 2016
@@ -83,23 +83,23 @@
 
         <div id="content">
 
-            <a name="Tutorial-ApacheShiroTutorial"></a>
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 60px; float: left"></div>
+
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <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>
+          </div>
+  <a name="Tutorial-ApacheShiroTutorial"></a>
 <h1><a href="#apache-shiro-tutorial" name="apache-shiro-tutorial">Apache Shiro 
Tutorial</a></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>
-       
-</div>
-</td></tr></table>
 <a name="Tutorial-YourFirstApacheShiroApplication"></a>
 <h2><a href="#your-first-apache-shiro-application" 
name="your-first-apache-shiro-application">Your First Apache Shiro 
Application</a></h2>
 <p>If you&rsquo;re new to Apache Shiro, this short tutorial will show you how 
to set up an initial and very simple application secured by Apache Shiro. 
We&rsquo;ll discuss Shiro&rsquo;s core concepts along the way to help 
familiarize you with Shiro&rsquo;s design and API.</p>
@@ -535,8 +535,7 @@ public class Tutorial {
 <p>Hopefully this introduction tutorial helped you understand how to set-up 
Shiro in a basic application as well Shiro&rsquo;s primary design concepts, the 
<code>Subject</code> and <code>SecurityManager</code>.</p>
 <p>But this was a fairly simple application. You might have asked yourself, 
&ldquo;What if I don&rsquo;t want to use INI user accounts and instead want to 
connect to a more complex user data source?&rdquo;</p>
 <p>To answer that question requires a little deeper understanding of 
Shiro&rsquo;s architecture and supporting configuration mechanisms. We&rsquo;ll 
cover Shiro&rsquo;s <a href="architecture.html" 
title="Architecture">Architecture</a> next.</p>
-<input type="hidden" id="ghEditPage" value="tutorial.md.vtl"></input>
-
+<input type="hidden" id="ghEditPage" value="tutorial.md.vtl"></input>          
  
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/version-2-brainstorming.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/version-2-brainstorming.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/version-2-brainstorming.html (original)
+++ shiro/site/publish/version-2-brainstorming.html Mon Oct 24 22:11:17 2016
@@ -83,7 +83,7 @@
 
         <div id="content">
 
-            <ul>
+                            <ul>
   <li><a 
href="#Version2Brainstorming-RenameAuthenticationInfotoAccount">Rename 
AuthenticationInfo to Account</a></li>
   <li><a href="#Version2Brainstorming-Realmrefactoring">Realm 
refactoring</a></li>
   <li><a href="#Version2Brainstorming-Splitshirocoreintomodules">Split 
shiro-core into modules</a></li>
@@ -231,7 +231,7 @@ if (response.hasException()) {
 <a name="Version2Brainstorming-Webmodulerepackaging."></a>
 <h3>Web module repackaging.</h3>
 <p>The Web module is largely Servlet-specific at the moment. As such, its 
packaging should reflect this, in the same way that all other support modules 
are named, e.g.<br/>module name: <code>shiro-servlet</code><br/>package base: 
<code>org.apache.shiro.servlet.*</code><br/><input type="hidden" 
id="ghEditPage" value="version-2-brainstorming.md"></input></p>
-
+            
         </div>
 
     </div><!--END WRAPPER-->

Modified: shiro/site/publish/web-features.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/web-features.html?rev=1766454&r1=1766453&r2=1766454&view=diff
==============================================================================
--- shiro/site/publish/web-features.html (original)
+++ shiro/site/publish/web-features.html Mon Oct 24 22:11:17 2016
@@ -83,26 +83,22 @@
 
         <div id="content">
 
-            <h1><a href="#apache-shiro-for-web-applications" 
name="apache-shiro-for-web-applications">Apache Shiro for Web 
Applications</a></h1>
+                            
+
+<!-- spacer allows enough room to display the header -->
+<div id="spacer" style="width: 0; height: 200px; float: left"></div>
+
+<!-- related content (if any) -->
+    <div style="border-style: solid; border-width: 2px; border-color: navy; 
padding: 5px; margin-left: 20px; margin-bottom: 20px; width:275px; float: 
right; clear: both; ">
+      <h2>Related Content</h2>
+                    <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="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>
+          </div>
+  <h1><a href="#apache-shiro-for-web-applications" 
name="apache-shiro-for-web-applications">Apache Shiro for Web 
Applications</a></h1>
 <p>Although Apache Shiro is designed to be used to secure <em>any</em> 
JVM-based application, it is most commonly used to secure a web application. It 
greatly simplifies how you secure web applications base on simple URL pattern 
matching and filter chain definitions. In addition to Shiro&rsquo;s API, 
Shiro&rsquo;s web support includes a rich JSP tag library to control page 
output.</p>
 <h2><a href="#features" name="features">Features</a></h2>
-<table align="right" width="275" style="margin-left: 15px; 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="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="web.html">Web Support Docs</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>
-       
-</div>
-</td>
-</tr>
-</table>
 <ul>
   <li>
   <p><strong>Simple ShiroFilter web.xml definition</strong><br/>You can enable 
Shiro for a web application with one simple filter definition in 
web.xml.</p></li>
@@ -114,8 +110,7 @@
   <p><strong>JSP Tag support</strong><br/>The JSP tags allow you to easily 
control page output based on the current user&rsquo;s state and access 
rights.</p></li>
   <li>
   <p><strong>Transparent HttpSession support</strong><br/>If you are using 
Shiro&rsquo;s native sessions, we have implemented HTTP Session API and the 
Servlet 2.5 API so you don&rsquo;t have to change any of your existing web code 
to use Shiro.<br/><input type="hidden" id="ghEditPage" 
value="web-features.md"></input></p></li>
-</ul>
-
+</ul>            
         </div>
 
     </div><!--END WRAPPER-->



Reply via email to