Merge remote-tracking branch 'origin/pr-31'
Fixes: #31
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/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/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>
