Merge remote-tracking branch 'origin/pr-34'
Fixes #34
diff --git a/10-minute-tutorial.md.vtl b/10-minute-tutorial.md.vtl
index 202ef71..9fec419 100644
--- a/10-minute-tutorial.md.vtl
+++ b/10-minute-tutorial.md.vtl
@@ -17,7 +17,7 @@
Introduction
------------
-Welcome to Apache Shiro's 10 Minute Tutoral!
+Welcome to Apache Shiro's 10 Minute Tutorial!
By going through this quick and simple tutorial you should fully understand how a developer uses Shiro in their application. And you should be able to do it in under 10 minutes.
diff --git a/authentication-features.md b/authentication-features.md
index f98442e..5469ccb 100644
--- a/authentication-features.md
+++ b/authentication-features.md
@@ -14,7 +14,7 @@
* **Rich Exception Hierarchy** - Shiro offers a rich exception hierarchy to offered detailed explanations for why a login failed. The hierarchy can help you more easily diagnose code bugs or customer services issues related to authentication. In addition, the richness can help you create more complex authentication functionality if needed.
-* **'Remember Me' built in** - Standard in the Shiro API is the ability to remember your users if they return to your application. You can offer a better user experience to your them with minimal development effort.
+* **'Remember Me' built in** - Standard in the Shiro API is the ability to remember your users if they return to your application. You can offer a better user experience to them with minimal development effort.
* **Pluggable data sources** - Shiro uses pluggable data access objects (DAOs), called Realms, to connect to security data sources like LDAP and Active Directory. To help you avoid building and maintaining integrations yourself, Shiro provides out-of-the-box realms for popular data sources like LDAP, Active Directory, and JDBC. If needed, you can also create your own realms to support specific functionality not included in the basic realms.
diff --git a/authentication.md.vtl b/authentication.md.vtl
index 289bf36..8a6025a 100644
--- a/authentication.md.vtl
+++ b/authentication.md.vtl
@@ -95,7 +95,7 @@
But what happens if the login attempt failed? For example, what if the end-user supplied an incorrect password, or accessed the system too many times and maybe their account is locked?
-Shiro has a rich runtime [`AuthenticationException`](static/current/apidocs/org/apache/shiro/authz/AuthorizationException.html) hierarchy that can indicate exactly why the attempt failed. You can wrap `login` in a `try/catch` block and catch any exception you wish and react to them accordingly. For example:
+Shiro has a rich runtime [`AuthenticationException`](static/current/apidocs/org/apache/shiro/authc/AuthenticationException.html) hierarchy that can indicate exactly why the attempt failed. You can wrap `login` in a `try/catch` block and catch any exception you wish and react to them accordingly. For example:
``` java
try {
diff --git a/cachemanager.md b/cachemanager.md
index a762386..cf29371 100644
--- a/cachemanager.md
+++ b/cachemanager.md
@@ -36,7 +36,7 @@
<a name="CacheManager-Lendahandwithdocumentation"></a>
###Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
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>.
diff --git a/core.md b/core.md
index 1d9419b..427a36b 100644
--- a/core.md
+++ b/core.md
@@ -18,7 +18,7 @@
<a name="Core-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html).
diff --git a/cryptography.md b/cryptography.md
index 31c4031..d6464d7 100644
--- a/cryptography.md
+++ b/cryptography.md
@@ -3,7 +3,7 @@
<a name="Cryptography-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
<input type="hidden" id="ghEditPage" value="cryptography.md"></input>
diff --git a/documentation-help-block.md b/documentation-help-block.md
index 397d007..ebff287 100644
--- a/documentation-help-block.md
+++ b/documentation-help-block.md
@@ -1,7 +1,7 @@
<a name="DocumentationHelpBlock-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
<input type="hidden" id="ghEditPage" value="documentation-help-block.md"></input>
diff --git a/java-annotations.md b/java-annotations.md
index 21dc149..27ef248 100644
--- a/java-annotations.md
+++ b/java-annotations.md
@@ -15,7 +15,7 @@
<a name="JavaAnnotations-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
<input type="hidden" id="ghEditPage" value="java-annotations.md"></input>
diff --git a/java-authentication-guide.md.vtl b/java-authentication-guide.md.vtl
index 8dabaa2..ed29ba4 100644
--- a/java-authentication-guide.md.vtl
+++ b/java-authentication-guide.md.vtl
@@ -10,7 +10,7 @@
Terminology you'll need
-----------------------
-* **Subject** - Security specific user 'view' 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.
+* **Subject** - Security specific user 'view' of an application user. It can be a human being, a third-party process, a server connecting to you application, or even a cron job. Basically, it is anything or anyone communicating with your application.
* **Principals** - A subjects identifying attributes. First name, last name, social security number, username
diff --git a/java-authorization-guide.md.vtl b/java-authorization-guide.md.vtl
index 77e6dc6..a6a12df 100644
--- a/java-authorization-guide.md.vtl
+++ b/java-authorization-guide.md.vtl
@@ -42,7 +42,7 @@
<a name="JavaAuthorizationGuide-ImplicitRoles"></a>
#[[####Implicit Roles]]#
-Most people view roles as what we define as an implicit role where your application _implies_ a set of permissions because a user has a particular role as opposed to the role explicitly being assigned permissions or your application checking for those permissions. Role checks in code are generally a reflection of an implicit role. You can view patient data because you have the _administrator_ role. You can create an account because you have the _bank teller_ role. The fact that these names exist does not have a correlation to what the software can actually do. Most people use roles in this manner. It is easiest but it can create a lot of maintenance and management problems for all the but the simplest application.
+Most people view roles as what we define as an implicit role where your application _implies_ a set of permissions because a user has a particular role as opposed to the role explicitly being assigned permissions or your application checking for those permissions. Role checks in code are generally a reflection of an implicit role. You can view patient data because you have the _administrator_ role. You can create an account because you have the _bank teller_ role. The fact that these names exist does not have a correlation to what the software can actually do. Most people use roles in this manner. It is easiest but it can create a lot of maintenance and management problems for all but the simplest application.
<a name="JavaAuthorizationGuide-ExplicitRoles"></a>
#[[####Explicit Roles]]#
diff --git a/reference.md b/reference.md
index 99a362f..411eeab 100644
--- a/reference.md
+++ b/reference.md
@@ -50,7 +50,7 @@
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html).
diff --git a/spring-xml.md b/spring-xml.md
index b914945..9158d40 100644
--- a/spring-xml.md
+++ b/spring-xml.md
@@ -199,7 +199,7 @@
<a name="SpringXml-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
<input type="hidden" id="ghEditPage" value="spring-xml.md"></input>
diff --git a/spring.md b/spring.md
index 7f673ff..c6d3dec 100644
--- a/spring.md
+++ b/spring.md
@@ -197,7 +197,7 @@
<a name="Spring-Lendahandwithdocumentation"></a>
##Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
<input type="hidden" id="ghEditPage" value="spring.md"></input>
diff --git a/templates/default.vtl b/templates/default.vtl
index 45cd501..0829a1a 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -106,6 +106,9 @@
<img src="$root/assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;">
</a>
<span class="tagline">Simple. Java. Security.</span>
+ <a class="pull-right" href="https://www.apache.org/events/current-event.html">
+ <img style="padding-top: 8px" src="https://www.apache.org/events/current-event-125x125.png"/>
+ </a>
</p>
</div>
diff --git a/templates/macros/lend-a-hand.vtl b/templates/macros/lend-a-hand.vtl
index 4bcd662..68b8c49 100644
--- a/templates/macros/lend-a-hand.vtl
+++ b/templates/macros/lend-a-hand.vtl
@@ -1,7 +1,7 @@
#macro(lendAHandDoc)
<h2><a name="Lendahandwithdocumentation"></a>Lend a hand with documentation </h2>
-<p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, 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 submit a pull-request by clicking on the <code>Edit</code> link below, 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>
#end
diff --git a/terminology.md b/terminology.md
index 724c125..79c60a3 100644
--- a/terminology.md
+++ b/terminology.md
@@ -58,7 +58,7 @@
<a name="Terminology-role"></a>
* **Role**
-The definition of a Role can vary based on who you talk to. In many applications it is nebulous concept at best that people use to implicitly define security policies. Shiro prefers to interpret a Role as simply a named collection of Permissions. That's it - an application unique name aggregating one or more Permission declarations.
+The definition of a Role can vary based on who you talk to. In many applications it is a nebulous concept at best that people use to implicitly define security policies. Shiro prefers to interpret a Role as simply a named collection of Permissions. That's it - an application unique name aggregating one or more Permission declarations.
This is a more concrete definition than the implicit one used by many applications. If you choose to have your data model reflect Shiro's assumption, you'll find you will have much more power in controlling security policies.
@@ -76,7 +76,7 @@
<a name="Terminology-Lendahandwithdocumentation"></a>
###Lend a hand with documentation
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
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>.
diff --git a/what-is-shiro.md b/what-is-shiro.md
index 226c7d0..2fc027d 100644
--- a/what-is-shiro.md
+++ b/what-is-shiro.md
@@ -11,7 +11,7 @@
- Java security should be <em>really easy</em> to understand and use in your own applications.
- Existing Java security mechanisms (like JAAS) are too confusing and fall way short in the area of application-level security.
- Authentication and Authorization functionality should be as pluggable and flexible as possible.
-- Authentication and Authorization are only half of a robust security framework. Enterprise Session Management and easy Cryptography services are the the other half.
+- Authentication and Authorization are only half of a robust security framework. Enterprise Session Management and easy Cryptography services are the other half.
- <b>Session Management should not be tied to web or EJB applications</b>. We believe Sessions are a business-tier concern that should be accessible in any client or server environment.
- Heterogeneous client mediums (HTTP requests, Applets, Java Web Start, C# applications, etc) should be able to participate in the same Session, regardless of the client technology.
- Security code should be eliminated as much as possible in favor of a cleaner declarative security model utilizing JDK 1.5 Annotations or XML, whichever you prefer.
