shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [4/4] shiro-site git commit: Fixed a whole bunch of dead links and corrected redirects
Date Fri, 21 Oct 2016 20:07:01 GMT
Fixed a whole bunch of dead links and corrected redirects


Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/7cfde39b
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/7cfde39b
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/7cfde39b

Branch: refs/heads/master
Commit: 7cfde39bc952e6592007990d8d5084d72261219a
Parents: 46e9cc4
Author: Brian Demers <bdemers@apache.org>
Authored: Fri Oct 21 16:06:23 2016 -0400
Committer: Brian Demers <bdemers@apache.org>
Committed: Fri Oct 21 16:06:23 2016 -0400

----------------------------------------------------------------------
 2011/01/13/apache-shiro-support-for-mule.html   |   4 +-
 ...iro-integration-for-grails-113-released.html |   2 +-
 2011/03/14/infoq-article-on-apache-shiro.html   |   2 +-
 2012/03/13/whats-new-in-apache-shiro-12.html    |   2 +-
 2012/07/29/apache-shiro-121-released.html       |   2 +-
 2013/05/30/apache-shiro-122-released.md         |   2 +-
 architecture.html.vtl                           |   2 +-
 articles.html.vtl                               |  21 +-
 authentication.html.vtl                         |  20 +-
 authorization.html.vtl                          |  18 +-
 caching.html                                    |   2 +-
 cas.html                                        |   6 +-
 commercial-support.html                         |   6 +-
 configuration.html.vtl                          |   8 +-
 developer-resources.html.vtl                    |   2 +-
 documentation.html.vtl                          |   2 +-
 download.html.vtl                               |  22 +--
 events.html                                     |   7 +-
 guice.html.vtl                                  |   6 +-
 how-to-contribute.html                          |   4 +-
 index.html                                      |   2 +-
 integration.md                                  |   6 +-
 java-authentication-guide.html.vtl              |   8 +-
 java-authorization-guide.html.vtl               |   4 +-
 mailing-lists.html                              |  38 +++-
 news.html                                       | 194 ++++---------------
 overview.html                                   |   2 +-
 powered-by-shiro.html                           |   9 +-
 realm.html.vtl                                  |  14 +-
 session-management.html                         |  14 +-
 spring.html                                     |   4 +-
 subject.html.vtl                                |   2 +-
 testing.html.vtl                                |   6 +-
 tutorial.html.vtl                               |   4 +-
 web.html.vtl                                    |  28 +--
 what-is-shiro.html                              |   2 +-
 36 files changed, 198 insertions(+), 279 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2011/01/13/apache-shiro-support-for-mule.html
----------------------------------------------------------------------
diff --git a/2011/01/13/apache-shiro-support-for-mule.html b/2011/01/13/apache-shiro-support-for-mule.html
index 0e31490..6915540 100644
--- a/2011/01/13/apache-shiro-support-for-mule.html
+++ b/2011/01/13/apache-shiro-support-for-mule.html
@@ -1,3 +1,3 @@
-<p>Mule now has integration with Apache Shiro.  Thanks to Dan Diephouse at <a class="external-link" href="http://www.mulesoft.org" rel="nofollow">MuleSoft</a> for the great blog post.  </p>
+<p>Mule now has integration with Apache Shiro.  Thanks to Dan Diephouse at <a class="external-link" href="https://developer.mulesoft.com" rel="nofollow">MuleSoft</a> for the great blog post.  </p>
 
-<p><a class="external-link" href="http://blogs.mulesoft.org/apache-shiro-support-for-mule/" rel="nofollow">http://blogs.mulesoft.org/apache-shiro-support-for-mule/</a></p>
\ No newline at end of file
+<p><a class="external-link" href="http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/" rel="nofollow">http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/</a></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2011/02/10/apache-shiro-integration-for-grails-113-released.html
----------------------------------------------------------------------
diff --git a/2011/02/10/apache-shiro-integration-for-grails-113-released.html b/2011/02/10/apache-shiro-integration-for-grails-113-released.html
index 9757434..ba7fa31 100644
--- a/2011/02/10/apache-shiro-integration-for-grails-113-released.html
+++ b/2011/02/10/apache-shiro-integration-for-grails-113-released.html
@@ -1,3 +1,3 @@
 <p>Secure your Grails application quickly and easily using the Apache Shiro security framework. Although easy to get started with, this framework gives you a great deal of flexibility and will support your application as it grows.</p>
 
-<p><a class="external-link" href="http://grails.org/plugin/shiro" rel="nofollow">http://grails.org/plugin/shiro</a></p>
\ No newline at end of file
+<p><a class="external-link" href="https://grails.org/plugin/shiro" rel="nofollow">https://grails.org/plugin/shiro</a></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2011/03/14/infoq-article-on-apache-shiro.html
----------------------------------------------------------------------
diff --git a/2011/03/14/infoq-article-on-apache-shiro.html b/2011/03/14/infoq-article-on-apache-shiro.html
index 7dd56e3..7aaccc7 100644
--- a/2011/03/14/infoq-article-on-apache-shiro.html
+++ b/2011/03/14/infoq-article-on-apache-shiro.html
@@ -1 +1 @@
-<p><a class="external-link" href="http://www.infoq.com/articles/apache-shiro" rel="nofollow">http://www.infoq.com/articles/apache-shiro</a></p>
\ No newline at end of file
+<p><a class="external-link" href="https://www.infoq.com/articles/apache-shiro" rel="nofollow">https://www.infoq.com/articles/apache-shiro</a></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2012/03/13/whats-new-in-apache-shiro-12.html
----------------------------------------------------------------------
diff --git a/2012/03/13/whats-new-in-apache-shiro-12.html b/2012/03/13/whats-new-in-apache-shiro-12.html
index f8a7a1f..d7e2bc8 100644
--- a/2012/03/13/whats-new-in-apache-shiro-12.html
+++ b/2012/03/13/whats-new-in-apache-shiro-12.html
@@ -1,3 +1,3 @@
 <p>Here's an article covering some of the main features and enhancements in Apache Shiro 1.2:</p>
 
-<p><a class="external-link" href="http://www.stormpath.com/blog/2012/03/12/whats-new-in-apache-shiro-12.html" rel="nofollow">http://www.stormpath.com/blog/2012/03/12/whats-new-in-apache-shiro-12.html</a></p>
\ No newline at end of file
+<p><a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">https://stormpath.com/blog/whats-new-apache-shiro-12</a></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2012/07/29/apache-shiro-121-released.html
----------------------------------------------------------------------
diff --git a/2012/07/29/apache-shiro-121-released.html b/2012/07/29/apache-shiro-121-released.html
index 33e1a4f..a64719d 100644
--- a/2012/07/29/apache-shiro-121-released.html
+++ b/2012/07/29/apache-shiro-121-released.html
@@ -6,7 +6,7 @@
 
 <p>All binaries (.jars) are available in Maven Central already.  Please note that the Apache mirrors are still updating to reflect the source distribution, but some mirrors may not be updated yet.  If a mirror download link does not work, please try another or wait another 12 to 24 hours.</p>
 
-<p>For more information on Shiro 1.2, please read the "<a class="external-link" href="http://www.stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
+<p>For more information on Shiro 1.2, please read the "<a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.</p>
 
 <p>Enjoy!</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/2013/05/30/apache-shiro-122-released.md
----------------------------------------------------------------------
diff --git a/2013/05/30/apache-shiro-122-released.md b/2013/05/30/apache-shiro-122-released.md
index 6370c53..9a0cb5f 100644
--- a/2013/05/30/apache-shiro-122-released.md
+++ b/2013/05/30/apache-shiro-122-released.md
@@ -8,7 +8,7 @@ This release includes <a class="external-link" href="https://issues.apache.org/j
 
 All binaries (.jars) are available in Maven Central already.  Please note that the Apache mirrors are still updating to reflect the source distribution, but some mirrors may not be updated yet.  If a mirror download link does not work, please try another or wait another 12 to 24 hours.
 
-For more information on Shiro 1.2, please read the "<a class="external-link" href="http://www.stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="../../../2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.
+For more information on Shiro 1.2, please read the "<a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2?</a>" article or the previous <a class="external-link" href="../../../2012/01/24/apache-shiro-120-released.html">1.2 release announcement</a>.
 
 Enjoy!
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/architecture.html.vtl
----------------------------------------------------------------------
diff --git a/architecture.html.vtl b/architecture.html.vtl
index c4b9258..fc01ff4 100644
--- a/architecture.html.vtl
+++ b/architecture.html.vtl
@@ -31,7 +31,7 @@ We will talk about the <tt>SecurityManager</tt> in detail later on, but it is im
 <br clear="none" class="atl-forced-newline"></li><li><b>Realms</b>:  Realms act as the &#8216;bridge&#8217; or &#8216;connector&#8217; between Shiro and your application&#8217;s security data. When it comes time to actually interact with security-related data like user accounts to perform authentication (login) and authorization (access control), Shiro looks up many of these things from one or more Realms configured for an application.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
-In this sense a Realm is essentially a security-specific <a class="external-link" href="http://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">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. The <tt>SecurityManager</tt> may be configured with multiple Realms, but at least one is required.
+In this sense a Realm is essentially a security-specific <a class="external-link" href="https://en.wikipedia.org/wiki/Data_access_object" rel="nofollow">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. The <tt>SecurityManager</tt> may be configured with multiple Realms, but at least one is required.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
 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.

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/articles.html.vtl
----------------------------------------------------------------------
diff --git a/articles.html.vtl b/articles.html.vtl
index e4c799a..f8185ae 100644
--- a/articles.html.vtl
+++ b/articles.html.vtl
@@ -5,11 +5,11 @@
 <h2><a name="Articles-IntroductoryArticles"></a>Introductory Articles</h2>
 <p>New to Shiro? Here are some great introductory articles:</p>
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://www.infoq.com/articles/apache-shiro" rel="nofollow">Application Security with Apache Shiro</a></b> InfoQ article by Les Hazlewood, Apache Shiro PMC Chair.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://www.infoq.com/articles/apache-shiro" rel="nofollow">Application Security with Apache Shiro</a></b> InfoQ article by Les Hazlewood, Apache Shiro PMC Chair.</li></ul>
 
 <ul class="alternate" type="square"><li><b><a href="webapp-tutorial.html" title="Apache Shiro Beginner's Webapp Tutorial">Apache Shiro Beginner's Webapp Tutorial</a>: a step-by-step tutorial to enable Shiro in a web application</b> on 19 November 2013 by Les Hazlewood</li></ul>
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://www.stormpath.com/blog/2012/03/12/whats-new-in-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2</a></b> on 13 March 2012 by Les Hazlewood.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://stormpath.com/blog/whats-new-apache-shiro-12" rel="nofollow">What's new in Apache Shiro 1.2</a></b> on 13 March 2012 by Les Hazlewood.</li></ul>
 
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://www.ibm.com/developerworks/web/library/wa-apacheshiro/" rel="nofollow">Introducing Apache Shiro</a></b> by Nathan Good on IBM DeveloperWorks, 14 September 2010.</li></ul>
 
@@ -23,17 +23,17 @@
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://czetsuya-tech.blogspot.com/2012/10/how-to-integrate-apache-shiro-with.html?spref=tw" rel="nofollow">How to Integrate Apache Shiro with JavaEE6</a></b> by czetsuya on 11 October 2012.</li></ul>
 
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://blog.pinateknoloji.com/shiro-jdbc-realm" rel="nofollow">Custom Apache Shiro JDBC Realm</a></b> by Mehmet Celiksoy</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://mehmetceliksoy.wordpress.com/2015/06/28/shiro-jdbc-realm/" rel="nofollow">Custom Apache Shiro JDBC Realm</a></b> by Mehmet Celiksoy</li></ul>
 
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://bubba-h57.github.com/H57_Shiro/" rel="nofollow">Spring MVC + Shiro + myBatis + JSR-303 Validation</a></b> by Rob Hines et. al. on 2 April 2012.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://bubba-h57.github.io/H57_Shiro/" rel="nofollow">Spring MVC + Shiro + myBatis + JSR-303 Validation</a></b> by Rob Hines et. al. on 2 April 2012.</li></ul>
 
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://books.zkoss.org/wiki/Small_Talks/2012/March/Securing_ZK_Applications_With_Apache_Shiro" rel="nofollow">Securing ZK Applications with Apache Shiro</a></b> by Ashish Dasnurkar on 6 March 2012.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://www.zkoss.org/wiki/Small_Talks/2012/March/Securing_ZK_Applications_With_Apache_Shiro" rel="nofollow">Securing ZK Applications with Apache Shiro</a></b> by Ashish Dasnurkar on 6 March 2012.</li></ul>
 
 
 <ul class="alternate" type="square"><li><b>Facebook Login with Apache Shiro</b> by Mike Warren on 28 November 2011
-	<ul class="alternate" type="square"><li><a class="external-link" href="http://mrdwnotes.wordpress.com/2011/11/28/using-apache-shiro-security-to-allow-login-via-facebook-part-1" rel="nofollow">Part 1</a></li><li><a class="external-link" href="http://mrdwnotes.wordpress.com/2011/11/28/using-apache-shiro-security-to-allow-login-via-facebook-part-2" rel="nofollow">Part 2</a></li></ul>
+	<ul class="alternate" type="square"><li><a class="external-link" href="https://mrdwnotes.wordpress.com/2011/11/28/using-apache-shiro-security-to-allow-login-via-facebook-part-1/" rel="nofollow">Part 1</a></li><li><a class="external-link" href="https://mrdwnotes.wordpress.com/2011/11/28/using-apache-shiro-security-to-allow-login-via-facebook-part-2/" rel="nofollow">Part 2</a></li></ul>
 	</li></ul>
 
 
@@ -42,10 +42,7 @@
 	</li></ul>
 
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://www.katasoft.com/blog/2011/05/09/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a></b> by Les Hazlewood on 9 May 2011</li></ul>
-
-
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://eneuwirt.de/2011/04/22/using-apache-shiro-to-secure-vaading-application/" rel="nofollow">Securing Vaadin Applications with Apache Shiro</a></b> by Eduard Neuwirt on 22 April 2011.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="https://stormpath.com/blog/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a></b> by Les Hazlewood on 9 May 2011</li></ul>
 
 
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://blog.xebia.com/author/yamsellem/" rel="nofollow">HTTP Authentication and Security with Apache Shiro</a></b> blog article by yamsellem on 18 April 2011.</li></ul>
@@ -54,7 +51,7 @@
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://spring-java-ee.blogspot.com/2011/04/using-shiro-for-authorization-via-cdi.html" rel="nofollow">Using Shiro for Authorization via CDI Interceptors then Easily Test with Arquillian</a></b> blog article by Hendy Irawan on 16 April 2011.</li></ul>
 
 
-<ul class="alternate" type="square"><li><b><a class="external-link" href="http://blogs.mulesoft.org/apache-shiro-support-for-mule/" rel="nofollow">Apache Shiro Support for Mule</a></b> by Dan Diephouse on 10 January 2011.</li></ul>
+<ul class="alternate" type="square"><li><b><a class="external-link" href="http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/" rel="nofollow">Apache Shiro Support for Mule</a></b> by Dan Diephouse on 10 January 2011.</li></ul>
 
 
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://www.gdevelop.com/blog/2010/12/apache-shiro-on-appengine" rel="nofollow">Apache Shiro on Google AppEngine</a></b> by Trung on 13 December 2010.</li></ul>
@@ -63,4 +60,4 @@
 <ul class="alternate" type="square"><li><b><a class="external-link" href="http://techbeats.deluan.com/apache-shiro-tags-for-jsffacelets" rel="nofollow">Apache Shiro tags for JSF - Securing Your JSF Pages</a></b> by Deluan Quint&#227;o on 1 November 2010.</li></ul>
 
 
-<ul class="alternate" type="square"><li><b>Shiro DevNexus 2009 Presentation</b> by <a class="external-link" href="http://cwiki.apache.org/confluence/display/~jhaile">Jeremy Haile</a>: (<a href="assets/images/articles/Ki-DevNexus-2009.pdf?version=1&amp;modificationDate=1246602947000">PDF</a>) (<a href="assets/images/articles/Ki-DevNexus-2009.key.zip?version=1&amp;modificationDate=1246602947000">Keynote</a>) (<a href="assets/images/articles/Ki-DevNexus-2009.ppt.zip?version=1&amp;modificationDate=1246602947000">Powerpoint</a>)</li></ul>
+<ul class="alternate" type="square"><li><b>Shiro DevNexus 2009 Presentation</b> by Jeremy Haile: (<a href="assets/images/articles/Ki-DevNexus-2009.pdf?version=1&amp;modificationDate=1246602947000">PDF</a>) (<a href="assets/images/articles/Ki-DevNexus-2009.key.zip?version=1&amp;modificationDate=1246602947000">Keynote</a>) (<a href="assets/images/articles/Ki-DevNexus-2009.ppt.zip?version=1&amp;modificationDate=1246602947000">Powerpoint</a>)</li></ul>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/authentication.html.vtl
----------------------------------------------------------------------
diff --git a/authentication.html.vtl b/authentication.html.vtl
index db1b9c8..70ddc85 100644
--- a/authentication.html.vtl
+++ b/authentication.html.vtl
@@ -47,7 +47,7 @@
 
 <p>You may construct and represent <tt>AuthenticationToken</tt> instances however you like - it is protocol agnostic.</p>
 
-<p>This example also shows that we have indicated that we wish Shiro to perform 'Remember Me' services for the authentication attempt.  This ensures that Shiro remembers the user identity if they return to the application at a later date.  We will cover <a class="createlink" href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=SHIRO&amp;title=Remember+Me&amp;linkCreation=true&amp;fromPageId=25203054">Remember Me</a> services in a later chapter.</p>
+<p>This example also shows that we have indicated that we wish Shiro to perform 'Remember Me' services for the authentication attempt.  This ensures that Shiro remembers the user identity if they return to the application at a later date.  We will cover Remember Me services in a later chapter.</p>
 
 <h3><a name="Authentication-Step2%3ASubmittheprincipalsandcredentials"></a>Step 2: Submit the principals and credentials</h3>
 
@@ -61,13 +61,13 @@ currentUser.login(token);
 </pre>
 </div></div>
 
-<p>After acquiring the currently-executing <tt>Subject</tt>, we make a single <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#login(org.apache.shiro.authc.AuthenticationToken)">login</a></tt> call, passing in the <tt>AuthenticationToken</tt> instance we created earlier.</p>
+<p>After acquiring the currently-executing <tt>Subject</tt>, we make a single <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#login(org.apache.shiro.authc.AuthenticationToken)">login</a></tt> call, passing in the <tt>AuthenticationToken</tt> instance we created earlier.</p>
 
 <p>An invocation to the <tt>login</tt> method effectively represents an authentication attempt.</p>
 
 <h3><a name="Authentication-Step3%3AHandlingSuccessorFailure"></a>Step 3: Handling Success or Failure</h3>
 
-<p>If the <tt>login</tt> method returns quietly, that's it - we're done!  The <tt>Subject</tt> has been authenticated.  The application thread can continue uninterrupted and all further calls to <tt>SecurityUtils.getSubject()</tt> will return the authenticated <tt>Subject</tt> instance, and any calls to <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isAuthenticated()">isAuthenticated()</a></tt> will return <tt>true</tt>.</p>
+<p>If the <tt>login</tt> method returns quietly, that's it - we're done!  The <tt>Subject</tt> has been authenticated.  The application thread can continue uninterrupted and all further calls to <tt>SecurityUtils.getSubject()</tt> will return the authenticated <tt>Subject</tt> instance, and any calls to <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isAuthenticated()">isAuthenticated()</a></tt> will return <tt>true</tt>.</p>
 
 <p>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?</p>
 
@@ -98,9 +98,9 @@ currentUser.login(token);
 
 <p>As shown in the example above, Shiro supports the notion of "remember me" in addition to the normal login process.  It is worth pointing out at this time that Shiro makes a very precise distinction between a <em>remembered</em> Subject and an actual <em>authenticated</em> Subject:  </p>
 
-<ul><li><b>Remembered</b>: A remembered <tt>Subject</tt> is not anonymous and has a known identity (i.e. <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#getPrincipals()">getPrincipals()</a></tt> is non-empty).  But this identity is remembered from a previous authentication during a <b>previous</b> session.  A subject is considered remembered if <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isRemembered()">isRemembered()</a></tt> returns <tt>true</tt>.
+<ul><li><b>Remembered</b>: A remembered <tt>Subject</tt> is not anonymous and has a known identity (i.e. <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#getPrincipals()">getPrincipals()</a></tt> is non-empty).  But this identity is remembered from a previous authentication during a <b>previous</b> session.  A subject is considered remembered if <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isRemembered()">isRemembered()</a></tt> returns <tt>true</tt>.
 <br clear="none" class="atl-forced-newline">
-<br clear="none" class="atl-forced-newline"></li><li><b>Authenticated</b>: An authenticated <tt>Subject</tt> is one that has been successfully authenticated (i.e. the <tt>login</tt> method was invoked without throwing an exception) <em>during the Subject's current session</em>.  A subject is considered authenticated if <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isAuthenticated()">isAuthenticated()</a></tt> returns <tt>true</tt>.</li></ul>
+<br clear="none" class="atl-forced-newline"></li><li><b>Authenticated</b>: An authenticated <tt>Subject</tt> is one that has been successfully authenticated (i.e. the <tt>login</tt> method was invoked without throwing an exception) <em>during the Subject's current session</em>.  A subject is considered authenticated if <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isAuthenticated()">isAuthenticated()</a></tt> returns <tt>true</tt>.</li></ul>
 
 
 #warning('Mutually Exclusive', 'Remembered and authenticated states are mutually exclusive - a <tt>true</tt> value for one indicates a <tt>false</tt> value for the other and vice versa.')
@@ -119,7 +119,7 @@ currentUser.login(token);
 
 <p>The following is a fairly common scenario that helps illustrate why the the distinction between remembered and authenticated is important.</p>
 
-<p>Let's say you're using <a class="external-link" href="http://www.amazon.com" rel="nofollow">Amazon.com</a>. You've logged-in successfully and have added a few books to your shopping cart.  But you have to run off to a meeting, but forget to log out.  By the time the meeting is over, it's time to go home and you leave the office.</p>
+<p>Let's say you're using <a class="external-link" href="https://www.amazon.com" rel="nofollow">Amazon.com</a>. You've logged-in successfully and have added a few books to your shopping cart.  But you have to run off to a meeting, but forget to log out.  By the time the meeting is over, it's time to go home and you leave the office.</p>
 
 <p>The next day when you come in to work, you realize you didn't complete your purchase, so you go back to amazon.com.  This time, Amazon 'remembers' who you are, greets you by name, and still gives you some personalized book recommendations.  To Amazon, <tt>subject.isRemembered()</tt> would return <tt>true</tt>.</p>
 
@@ -131,7 +131,7 @@ currentUser.login(token);
 
 <h2><a name="Authentication-LoggingOut"></a>Logging Out</h2>
 
-<p>The opposite of authenticating is releasing all known identifying state.  When the <tt>Subject</tt> is done interacting with the application, you can call <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#logout()">logout()</a></tt> to relinquish all identifying information:</p>
+<p>The opposite of authenticating is releasing all known identifying state.  When the <tt>Subject</tt> is done interacting with the application, you can call <tt>subject.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#logout()">logout()</a></tt> to relinquish all identifying information:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -163,12 +163,12 @@ currentUser.logout(); <span class="code-comment">//removes all identifying infor
 <b>Step 2</b>: The <tt>Subject</tt> instance, typically a <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/support/DelegatingSubject.html">DelegatingSubject</a></tt> (or a subclass) delegates to the application's <tt>SecurityManager</tt> by calling <tt>securityManager.login(token)</tt>, where the actual authentication work begins.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
-<b>Step 3</b>: The <tt>SecurityManager</tt>, being a basic 'umbrella' component, receives the token and simply delegates to its internal <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/Authenticator.html">Authenticator</a></tt> instance by calling <tt>authenticator.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/Authenticator.html\#authenticate(org.apache.shiro.authc.AuthenticationToken)">authenticate(token)</a></tt>.  This is almost always a <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/pam/ModularRealmAuthenticator.html">ModularRealmAuthenticator</a></tt> instance, which supports coordinating one or more <tt>Realm</tt> instances during authentication.  The <tt>ModularRealmAuthenticator</tt> essentially provides a <a class="external-link" href="http://en.wikipedia.org/wiki/Pluggable_Authentication_Modules" rel="nofollow">PAM</a>-style paradigm for Apache Shiro (where each <tt>R
 ealm</tt> is a 'module' in PAM terminology).
+<b>Step 3</b>: The <tt>SecurityManager</tt>, being a basic 'umbrella' component, receives the token and simply delegates to its internal <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/Authenticator.html">Authenticator</a></tt> instance by calling <tt>authenticator.</tt><tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/Authenticator.html#[[#]]#authenticate(org.apache.shiro.authc.AuthenticationToken)">authenticate(token)</a></tt>.  This is almost always a <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/pam/ModularRealmAuthenticator.html">ModularRealmAuthenticator</a></tt> instance, which supports coordinating one or more <tt>Realm</tt> instances during authentication.  The <tt>ModularRealmAuthenticator</tt> essentially provides a <a class="external-link" href="https://en.wikipedia.org/wiki/Pluggable_Authentication_Modules" rel="nofollow">PAM</a>-style paradigm for Apache Shiro (where each
  <tt>Realm</tt> is a 'module' in PAM terminology).
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline">
 <b>Step 4</b>: If more than one <tt>Realm</tt> is configured for the application, the <tt>ModularRealmAuthenticator</tt> instance will initiate a multi-<tt>Realm</tt> authentication attempt utilizing its configured <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authc/pam/AuthenticationStrategy.html">AuthenticationStrategy</a></tt>.  Before, during and after the <tt>Realms</tt> are invoked for authentication, the <tt>AuthenticationStrategy</tt> will be called to allow it to react to each Realm's results.  We will cover <tt>AuthenticationStrategies</tt> soon.</p>
 #warning('Single-Realm Application', 'If only a single Realm is configured, it is called directly - there is no need for an <tt>AuthenticationStrategy</tt> in a single-Realm application.')
-<p><b>Step 5</b>: Each configured <tt>Realm</tt> is consulted to see if it <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html\#supports(org.apache.shiro.authc.AuthenticationToken)">supports</a></tt> the submitted <tt>AuthenticationToken</tt>.  If so, the supporting Realm's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html\#getAuthenticationInfo(org.apache.shiro.authc.AuthenticationToken)">getAuthenticationInfo</a></tt> method will be invoked with the submitted <tt>token</tt>.  The <tt>getAuthenticationInfo</tt> method effectively represents a single authentication attempt for that particular <tt>Realm</tt>.  We will cover the <tt>Realm</tt> authentication behavior shortly.</p>
+<p><b>Step 5</b>: Each configured <tt>Realm</tt> is consulted to see if it <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html#[[#]]#supports(org.apache.shiro.authc.AuthenticationToken)">supports</a></tt> the submitted <tt>AuthenticationToken</tt>.  If so, the supporting Realm's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html#[[#]]#getAuthenticationInfo(org.apache.shiro.authc.AuthenticationToken)">getAuthenticationInfo</a></tt> method will be invoked with the submitted <tt>token</tt>.  The <tt>getAuthenticationInfo</tt> method effectively represents a single authentication attempt for that particular <tt>Realm</tt>.  We will cover the <tt>Realm</tt> authentication behavior shortly.</p>
 
 <h3><a name="Authentication-%7B%7BAuthenticator%7D%7D"></a><tt>Authenticator</tt></h3>
 
@@ -283,7 +283,7 @@ securityManager.realms = $fooRealm, $barRealm, $blahRealm
 
 <h2><a name="Authentication-RealmAuthentication"></a>Realm Authentication</h2>
 
-<p>This chapter covers Shiro's master workflow explaining how an authentication attempt occurs.  The internal workflow of what happens in a single realm as it is consulted during authentication (i.e. 'Step 5' above) is covered in the <a href="realm.html" title="Realm">Realm</a> chapter's <a href="realm.html\#Realm-authentication">Realm Authentication</a> section.</p>
+<p>This chapter covers Shiro's master workflow explaining how an authentication attempt occurs.  The internal workflow of what happens in a single realm as it is consulted during authentication (i.e. 'Step 5' above) is covered in the <a href="realm.html" title="Realm">Realm</a> chapter's <a href="realm.html#[[#]]#Realm-authentication">Realm Authentication</a> section.</p>
 
 <h2><a name="Authentication-Lendahandwithdocumentation"></a>Lend a hand with documentation </h2>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/authorization.html.vtl
----------------------------------------------------------------------
diff --git a/authorization.html.vtl b/authorization.html.vtl
index 66ee4b5..370bb71 100644
--- a/authorization.html.vtl
+++ b/authorization.html.vtl
@@ -59,7 +59,7 @@
 
 <p>The Shiro team advocates using permissions and explicit roles instead of the older implicit approach.  You will have much greater control over your application's security experience.</p>
 
-#tip('Resource-Based Access Control', 'Be sure to read Les Hazlewood''s article, <a class="external-link" href="http://www.katasoft.com/blog/2011/05/09/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a>, which covers in-depth the benefits of using permissions and explicit roles (and their positive impact on source code) instead of the older implicit role approach.')
+#tip('Resource-Based Access Control', 'Be sure to read Les Hazlewood''s article, <a class="external-link" href="https://stormpath.com/blog/new-rbac-resource-based-access-control" rel="nofollow">The New RBAC: Resource-Based Access Control</a>, which covers in-depth the benefits of using permissions and explicit roles (and their positive impact on source code) instead of the older implicit role approach.')
 
 <h3><a name="Authorization-Users"></a>Users</h3>
 
@@ -92,7 +92,7 @@
 
 <p>If you want to simply check to see if the current <tt>Subject</tt> has a role or not, you can call the variant <tt>hasRole*</tt> methods on the <tt>Subject</tt> instance.</p>
 
-<p>For example, to see if a <tt>Subject</tt> has a particular (single) role, you can call the <tt>subject.</tt> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#hasRole(java.lang.String)">hasRole(roleName)</a></tt> method, and react accordingly:</p>
+<p>For example, to see if a <tt>Subject</tt> has a particular (single) role, you can call the <tt>subject.</tt> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#hasRole(java.lang.String)">hasRole(roleName)</a></tt> method, and react accordingly:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">
@@ -111,7 +111,7 @@ Subject currentUser = SecurityUtils.getSubject();
 <p>
 </p><div class="table-wrap">
 
-<table class="confluenceTable" id="TBL1365578679389"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#hasRole(java.lang.String)">hasRole(String roleName)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is assigned the specified role, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#hasRoles(java.util.List)">hasRoles(List&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns a array of <tt>hasRole</tt> results corresponding to the indices in the method argument.  Useful as a performance enhancem
 ent if many role checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#hasAllRoles(java.util.Collection)">hasAllRoles(Collection&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is assigned <em>all</em> of the specified roles, <tt>false</tt> otherwise. </td></tr></tbody></table>
+<table class="confluenceTable" id="TBL1365578679389"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#hasRole(java.lang.String)">hasRole(String roleName)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is assigned the specified role, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#hasRoles(java.util.List)">hasRoles(List&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns a array of <tt>hasRole</tt> results corresponding to the indices in the method argument.  Useful as a performanc
 e enhancement if many role checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#hasAllRoles(java.util.Collection)">hasAllRoles(Collection&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is assigned <em>all</em> of the specified roles, <tt>false</tt> otherwise. </td></tr></tbody></table>
 </div>
 
 <script type="text/javascript"> <!-- 
@@ -157,7 +157,7 @@ openBankAccount();
 <p>
 </p><div class="table-wrap">
 
-<table class="confluenceTable" id="TBL1365578679390"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkRole(java.lang.String)">checkRole(String roleName)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is assigned the specified role or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkRoles(java.util.Collection)">checkRoles(Collection&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is assigned <em>all</em> of the specified role or 
 throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkRoles(java.lang.String...)">checkRoles(String... roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same effect as the <tt>checkRoles</tt> method above, but allows Java 5 var-args style arguments. </td></tr></tbody></table>
+<table class="confluenceTable" id="TBL1365578679390"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkRole(java.lang.String)">checkRole(String roleName)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is assigned the specified role or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkRoles(java.util.Collection)">checkRoles(Collection&lt;String&gt; roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is assigned <em>all</em> of the specifie
 d role or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkRoles(java.lang.String...)">checkRoles(String... roleNames)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same effect as the <tt>checkRoles</tt> method above, but allows Java 5 var-args style arguments. </td></tr></tbody></table>
 </div>
 
 <script type="text/javascript"> <!-- 
@@ -199,7 +199,7 @@ Subject currentUser = SecurityUtils.getSubject();
 
 <p>Object-based <tt>Permissions</tt> are useful if:</p>
 
-<ul><li>You want compile-time type-safety</li><li>You want to guarantee permissions are represented and used correctly</li><li>You want explicit control of how permission resolution logic (called permission implication logic, based on the Permission interface's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authz/Permission.html\#implies(org.apache.shiro.authz.Permission)">implies</a></tt> method) executes.</li><li>You want to guarantee Permissions reflect application resources accurately (for example, maybe Permission classes can be auto-generated during a project's build based on a project's domain model).</li></ul>
+<ul><li>You want compile-time type-safety</li><li>You want to guarantee permissions are represented and used correctly</li><li>You want explicit control of how permission resolution logic (called permission implication logic, based on the Permission interface's <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/authz/Permission.html#[[#]]#implies(org.apache.shiro.authz.Permission)">implies</a></tt> method) executes.</li><li>You want to guarantee Permissions reflect application resources accurately (for example, maybe Permission classes can be auto-generated during a project's build based on a project's domain model).</li></ul>
 
 
 <p>There are few Object permission-oriented <tt>Subject</tt> methods you can call, depending on your needs:</p>
@@ -207,7 +207,7 @@ Subject currentUser = SecurityUtils.getSubject();
 <p>
 </p><div class="table-wrap">
 
-<table class="confluenceTable" id="TBL1365578679391"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermitted(org.apache.shiro.authz.Permission)">isPermitted(Permission p)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>Permission</tt> instance, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermitted(java.util.List)">isPermitted(List&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns an array of <
 tt>isPermitted</tt> results corresponding to the indices in the method argument.  Useful as a performance enhancement if many permission checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermittedAll(java.util.Collection)">isPermittedAll(Collection&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted <em>all</em> of the specified permissions, <tt>false</tt> otherwise. </td></tr></tbody></table>
+<table class="confluenceTable" id="TBL1365578679391"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermitted(org.apache.shiro.authz.Permission)">isPermitted(Permission p)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>Permission</tt> instance, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermitted(java.util.List)">isPermitted(List&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns an 
 array of <tt>isPermitted</tt> results corresponding to the indices in the method argument.  Useful as a performance enhancement if many permission checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermittedAll(java.util.Collection)">isPermittedAll(Collection&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted <em>all</em> of the specified permissions, <tt>false</tt> otherwise. </td></tr></tbody></table>
 </div>
 
 <script type="text/javascript"> <!-- 
@@ -266,7 +266,7 @@ Permission p = <span class="code-keyword">new</span> WildcardPermission(<span cl
 <p>
 </p><div class="table-wrap">
 
-<table class="confluenceTable" id="TBL1365578679392"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermitted(java.lang.String)">isPermitted(String perm)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>String</tt> permission, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermitted(java.util.List)">isPermitted(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns an array of <tt>isPermitted</tt> results corre
 sponding to the indices in the method argument.  Useful as a performance enhancement if many <tt>String</tt> permission checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#isPermittedAll(java.lang.String...)">isPermittedAll(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted <em>all</em> of the specified <tt>String</tt> permissions, <tt>false</tt> otherwise. </td></tr></tbody></table>
+<table class="confluenceTable" id="TBL1365578679392"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermitted(java.lang.String)">isPermitted(String perm)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>String</tt> permission, <tt>false</tt> otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermitted(java.util.List)">isPermitted(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns an array of <tt>isPermitted</tt> res
 ults corresponding to the indices in the method argument.  Useful as a performance enhancement if many <tt>String</tt> permission checks need to be performed (e.g. when customizing a complex view) </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#isPermittedAll(java.lang.String...)">isPermittedAll(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns <tt>true</tt> if the <tt>Subject</tt> is permitted <em>all</em> of the specified <tt>String</tt> permissions, <tt>false</tt> otherwise. </td></tr></tbody></table>
 </div>
 
 <script type="text/javascript"> <!-- 
@@ -315,7 +315,7 @@ openBankAccount();
 <p>
 </p><div class="table-wrap">
 
-<table class="confluenceTable" id="TBL1365578679393"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkPermission(org.apache.shiro.authz.Permission)">checkPermission(Permission p)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>Permission</tt> instance, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkPermission(java.lang.String)">checkPermission(String perm)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd">
  Returns quietly if the <tt>Subject</tt> is is permitted to perform an action or access a resource summarized by the specified <tt>String</tt> permission, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkPermissions(java.util.Collection)">checkPermissions(Collection&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is permitted <em>all</em> the specified permissions, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html\#checkPermissions(java.lang.String...)">checkPermissions(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same effect as the <tt>chec
 kPermissions</tt> method above, but using <tt>String</tt>-based permissions. </td></tr></tbody></table>
+<table class="confluenceTable" id="TBL1365578679393"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Subject Method </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkPermission(org.apache.shiro.authz.Permission)">checkPermission(Permission p)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is permitted to perform an action or access a resource summarized by the specified <tt>Permission</tt> instance, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkPermission(java.lang.String)">checkPermission(String perm)</a></tt> </td><td colspan="1" rowspan="1" class="conf
 luenceTd"> Returns quietly if the <tt>Subject</tt> is is permitted to perform an action or access a resource summarized by the specified <tt>String</tt> permission, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkPermissions(java.util.Collection)">checkPermissions(Collection&lt;Permission&gt; perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Returns quietly if the <tt>Subject</tt> is permitted <em>all</em> the specified permissions, or throws an <tt>AuthorizationException</tt> if not. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/subject/Subject.html#[[#]]#checkPermissions(java.lang.String...)">checkPermissions(String... perms)</a></tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Same ef
 fect as the <tt>checkPermissions</tt> method above, but using <tt>String</tt>-based permissions. </td></tr></tbody></table>
 </div>
 
 <script type="text/javascript"> <!-- 
@@ -506,7 +506,7 @@ customizeMacroTable('TBL1365578679393', columnTypes, 1, 'lightgoldenrodyellow',
 
 <h3><a name="Authorization-JSPTagLibAuthorization"></a>JSP TagLib Authorization</h3>
 
-<p>Shiro offers a Tag Library for controlling JSP/GSP page output based on <tt>Subject</tt> state.  This is covered in the <a href="web.html" title="Web">Web</a> chapter's <a href="web.html\#Web-taglibrary">JSP/GSP Tag Library</a> section.</p>
+<p>Shiro offers a Tag Library for controlling JSP/GSP page output based on <tt>Subject</tt> state.  This is covered in the <a href="web.html" title="Web">Web</a> chapter's <a href="web.html#[[#]]#Web-taglibrary">JSP/GSP Tag Library</a> section.</p>
 
 <h2><a name="Authorization-AuthorizationSequence"></a>Authorization Sequence</h2>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/caching.html
----------------------------------------------------------------------
diff --git a/caching.html b/caching.html
index 2402200..46080a5 100644
--- a/caching.html
+++ b/caching.html
@@ -36,7 +36,7 @@ securityManager.cacheManager = $cacheManager
 
 <p>The <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/cache/MemoryConstrainedCacheManager.html">MemoryConstrainedCacheManager</a></tt> is a <tt>CacheManager</tt> implementation suitable for single-JVM production environments.  It is not clustered/distributed, so if your application spans across more than one JVM (e.g. web app running on multiple web servers), and you want cache entries to be accessible across JVMs, you will need to use a distributed cache implementation instead.</p>
 
-<p>The <tt>MemoryConstrainedCacheManager</tt> manages <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/cache/MapCache.html">MapCache</a></tt> instances, one <tt>MapCache</tt> instance per named cache.  Each <tt>MapCache</tt> instance is backed by a Shiro <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/util/SoftHashMap.html">SoftHashMap</a></tt> which can auto-resize itself based on an application's runtime memory constraints/needs (by leveraging JDK <tt><a class="external-link" href="http://docs.oracle.com/javase/1.4.2/docs/api/java/lang/ref/SoftReference.html" rel="nofollow">SoftReference</a></tt> instances).</p>
+<p>The <tt>MemoryConstrainedCacheManager</tt> manages <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/cache/MapCache.html">MapCache</a></tt> instances, one <tt>MapCache</tt> instance per named cache.  Each <tt>MapCache</tt> instance is backed by a Shiro <tt><a class="external-link" href="static/current/apidocs/org/apache/shiro/util/SoftHashMap.html">SoftHashMap</a></tt> which can auto-resize itself based on an application's runtime memory constraints/needs (by leveraging JDK <tt><a class="external-link" href="https://docs.oracle.com/javase/7/docs/api/java/lang/ref/SoftReference.html" rel="nofollow">SoftReference</a></tt> instances).</p>
 
 <p>Because the <tt>MemoryConstrainedCacheManager</tt> can auto-resize itself based on an application's memory profile, it is safe to use in a single-JVM production application as well as for testing needs.  However, it does not have more advanced features suche as cache entry Time-to-Live or Time-to-Expire settings.  For these more advanced cache management features, you'll likely want to use one of the more advanced <tt>CacheManager</tt> offerings below.</p>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/cas.html
----------------------------------------------------------------------
diff --git a/cas.html b/cas.html
index f06cda8..21cfe88 100644
--- a/cas.html
+++ b/cas.html
@@ -21,7 +21,7 @@
 </table>
 
 
-<p>The <em>shiro-cas</em> module is made to protect a web application with a <a class="external-link" href="http://www.jasig.org/cas" rel="nofollow">Jasig CAS</a> SSO server. It enables a Shiro-enabled application to be a CAS client.</p>
+<p>The <em>shiro-cas</em> module is made to protect a web application with a <a class="external-link" href="https://wiki.jasig.org/display/CAS/Home" rel="nofollow">Jasig CAS</a> SSO server. It enables a Shiro-enabled application to be a CAS client.</p>
 
 <h2><a name="CAS-BasicunderstandingoftheCASprotocol"></a>Basic understanding of the CAS protocol</h2>
 
@@ -102,7 +102,7 @@ casRealm.casServerUrlPrefix =&#160;https:<span class="code-comment">//server.cas
 <p>The <em>casServerUrlPrefix</em> is the url of the CAS server (for example&#160;: <a class="external-link" href="https://server.cas.com" rel="nofollow">https://server.cas.com</a>).<br clear="none">
 The <em>casService</em> is the application service url, the url on wich the application receives CAS service ticket (for example&#160;: <a class="external-link" href="http://application.examples.com/shiro-cas" rel="nofollow">http://application.examples.com/shiro-cas</a>).<br clear="none">
 The <em>validationProcol</em> can be SAML or CAS (default)&#160;: attributes and remember me information are only pushed throught the SAML validation procotol (except specific customizations). It depends on the version of the CAS server&#160;: SAML protocol can be used with CAS server version &gt;= 3.1.</p>
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">If you choose SAML validation, you need some more specific dependencies :</td></tr></table></div>
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.png" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">If you choose SAML validation, you need some more specific dependencies :</td></tr></table></div>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-xml">
 <span class="code-tag">&lt;dependency&gt;</span>
@@ -123,7 +123,7 @@ The <em>validationProcol</em> can be SAML or CAS (default)&#160;: attributes and
 <p>The <em>defaultRoles</em> is the default roles given to the authenticated user after CAS authentication success.<br clear="none">
 The <em>defaultPermissions</em> is the default permissions given to the authenticated user after CAS authentication success.<br clear="none">
 The <em>roleAttributeNames</em> defines the names of the attributes received from CAS response which define roles to give to the authenticated user (the roles are separated by comas).<br clear="none">
-The <em>permissionAttributeNames</em> defines the names of the attributes received from CAS response which define permissions to give to the authenticated user (the permissions are separated by comas).</p>
+The <em>permissionAttributeNames</em> defines the names of the attributes received from CAS response which define permissions to give to the autnewhenticated user (the permissions are separated by comas).</p>
 
 <h3><a name="CAS-CasSubjectFactory"></a>CasSubjectFactory</h3>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/commercial-support.html
----------------------------------------------------------------------
diff --git a/commercial-support.html b/commercial-support.html
index fc390c6..960b457 100644
--- a/commercial-support.html
+++ b/commercial-support.html
@@ -2,7 +2,7 @@
 
 <div>
 <h3>
-    <a class="external-link" href="http://www.stormpath.com" title="Stormpath User Management">Apache Shiro Plugin for Stormpath User Management</a>
+    <a class="external-link" href="https://www.stormpath.com" title="Stormpath User Management">Apache Shiro Plugin for Stormpath User Management</a>
 </h3>
 
 <p>The <a href="https://github.com/stormpath/stormpath-shiro/wiki">Apache Shiro plugin for Stormpath</a> allows an Apache Shiro-enabled application to use the <a href="https://www.stormpath.com">Stormpath User Management & Authentication service</a> for all authentication and access control needs.  </p>
@@ -10,12 +10,12 @@
 <p>Pairing Shiro with Stormpath give you a full application security system complete with immediate user account support, admin UI, authentication service, account registration and password reset workflows, password security, and more-- with little to no coding on your part.</p>
     <a class="external-link" href="https://github.com/stormpath/stormpath-shiro/wiki" title="Apache Shiro plugin for Stormpath">Learn More >>></a>
 <h3>
-    <a class="external-link" href="http://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Stormpath Commercial Support for Apache Shiro</a>
+    <a class="external-link" href="https://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Stormpath Commercial Support for Apache Shiro</a>
 </h3>
 
 <p>Shiro commercial support and consulting services are available from Stormpath, a company started by Shiro committer and Project Chair, Les Hazlewood:
 </p>
-    <a class="external-link" href="http://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Learn More >>></a>
+    <a class="external-link" href="https://www.stormpath.com/apache-shiro-support" title="Stormpath Support for Apache Shiro">Learn More >>></a>
 </div>
 <br>
 <p><strong>Providing Shiro services? Get listed on this page by posting to the <a href="mailing-lists.html" title="Shiro Mailing Lists">Dev Mailing list</a> </strong></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/configuration.html.vtl
----------------------------------------------------------------------
diff --git a/configuration.html.vtl b/configuration.html.vtl
index aedb2ff..fd76cfc 100644
--- a/configuration.html.vtl
+++ b/configuration.html.vtl
@@ -62,7 +62,7 @@ SessionDAO sessionDAO = <span class="code-keyword">new</span> CustomSessionDAO()
 
 <p>Most applications instead benefit from text-based configuration that could be modified independently of source code and even make things easier to understand for those not intimately familiar with Shiro's APIs.</p>
 
-<p>To ensure a common-denominator text-based configuration mechanism that can work in all environments with minimal 3rd party dependencies, Shiro supports the <a class="external-link" href="http://en.wikipedia.org/wiki/INI_file" rel="nofollow">INI format</a> to build the <tt>SecurityManager</tt> object graph and its supporting components.  INI is easy to read, easy to configure, and is simple to set-up and suits most applications well.</p>
+<p>To ensure a common-denominator text-based configuration mechanism that can work in all environments with minimal 3rd party dependencies, Shiro supports the <a class="external-link" href="https://en.wikipedia.org/wiki/INI_file" rel="nofollow">INI format</a> to build the <tt>SecurityManager</tt> object graph and its supporting components.  INI is easy to read, easy to configure, and is simple to set-up and suits most applications well.</p>
 
 <h3><a name="Configuration-CreatingaSecurityManagerfromINI"></a>Creating a SecurityManager from INI</h3>
 
@@ -217,9 +217,9 @@ myRealm.setUsername(<span class="code-quote">"jsmith"</span>);
 </pre>
 </div></div>
 
-<p>How is this possible?  It assumes that all objects are <a class="external-link" href="http://en.wikipedia.org/wiki/JavaBean" rel="nofollow">Java Beans</a>-compatible <a class="external-link" href="http://en.wikipedia.org/wiki/Plain_Old_Java_Object" rel="nofollow">POJO</a>s.</p>
+<p>How is this possible?  It assumes that all objects are <a class="external-link" href="https://en.wikipedia.org/wiki/JavaBean" rel="nofollow">Java Beans</a>-compatible <a class="external-link" href="https://en.wikipedia.org/wiki/Plain_Old_Java_Object" rel="nofollow">POJO</a>s.</p>
 
-<p>Under the covers, Shiro by default uses Apache Commons <a class="external-link" href="http://commons.apache.org/beanutils/">BeanUtils</a> to do all the heavy lifting when setting these properties.  So although INI values are text, BeanUtils knows how to convert the string values to the proper primitive types and then invoke the corresponding JavaBeans setter method.</p>
+<p>Under the covers, Shiro by default uses Apache Commons <a class="external-link" href="http://commons.apache.org/proper/commons-beanutils/">BeanUtils</a> to do all the heavy lifting when setting these properties.  So although INI values are text, BeanUtils knows how to convert the string values to the proper primitive types and then invoke the corresponding JavaBeans setter method.</p>
 
 <h6><a name="Configuration-ReferenceValues"></a>Reference Values</h6>
 
@@ -259,7 +259,7 @@ securityManager.getSessionManager().setGlobalSessionTimeout(1800000);
 
 <p>The graph traversal can be as deep as necessary: <tt>object.property1.property2....propertyN.value = blah</tt></p>
 
-#tip('BeanUtils Property Support', 'Any property assignment operation supported by the BeanUtils.<a class="external-link" href="http://commons.apache.org/beanutils/v1.8.2/apidocs/org/apache/commons/beanutils/BeanUtils.html#setProperty%28java.lang.Object,%20java.lang.String,%20java.lang.Object%29">setProperty</a> method will work in Shiro''s [main] section, including set/list/map element assignments.  See the <a class="external-link" href="http://commons.apache.org/beanutils/">Apache Commons BeanUtils Website</a> and documentation for more information.')
+#tip('BeanUtils Property Support', 'Any property assignment operation supported by the BeanUtils.<a class="external-link" href="https://commons.apache.org/proper/commons-beanutils/apidocs/org/apache/commons/beanutils/BeanUtils.html#setProperty-java.lang.Object-java.lang.String-java.lang.Object-">setProperty</a> method will work in Shiro''s [main] section, including set/list/map element assignments.  See the <a class="external-link" href="http://commons.apache.org/proper/commons-beanutils/">Apache Commons BeanUtils Website</a> and documentation for more information.')
 
 <h6><a name="Configuration-ByteArrayValues"></a>Byte Array Values</h6>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/developer-resources.html.vtl
----------------------------------------------------------------------
diff --git a/developer-resources.html.vtl b/developer-resources.html.vtl
index 72971dd..4faeafb 100644
--- a/developer-resources.html.vtl
+++ b/developer-resources.html.vtl
@@ -4,7 +4,7 @@
 
 <h2><a name="DeveloperResources-WritingDocumentation"></a>Writing Documentation</h2>
 
-<p>All non-JavaDoc documentation is written in our <a class="external-link" href="http://cwiki.apache.org/confluence/display/SHIRO/">Apache Shiro Confluence Wiki Space</a>.  This space is converted into the public website by the <a href="confluence-auto-export.html" title="Confluence Auto Export">Confluence Auto Export Process</a>.</p>
+<p>All non-JavaDoc documentation is managed in our <a class="external-link" href="https://github.com/apache/shiro-site">apache/shiro-site</a> repo.</p>
 
 <h2><a name="DeveloperResources-SourceCodeRepository"></a>Source Code Repository</h2>
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/documentation.html.vtl
----------------------------------------------------------------------
diff --git a/documentation.html.vtl b/documentation.html.vtl
index e04ab1c..3a6f092 100644
--- a/documentation.html.vtl
+++ b/documentation.html.vtl
@@ -5,7 +5,7 @@
 <h3><a name="Documentation-Introduction"></a>Introduction</h3>
 <p>Helpful if read in order:</p>
 <ul>
-    <li><a class="external-link" href="http://www.infoq.com/articles/apache-shiro" rel="nofollow">Application Security
+    <li><a class="external-link" href="https://www.infoq.com/articles/apache-shiro" rel="nofollow">Application Security
         with Apache Shiro</a> - full intro article on InfoQ.com
     </li>
     <li><a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a></li>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/download.html.vtl
----------------------------------------------------------------------
diff --git a/download.html.vtl b/download.html.vtl
index 94a9733..5209cb7 100644
--- a/download.html.vtl
+++ b/download.html.vtl
@@ -175,7 +175,7 @@
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables Jasig <a class="external-link"
-                                                                                   href="http://www.jasig.org/cas">CAS</a> support.
+                                                                                   href="https://wiki.jasig.org/display/CAS/Home">CAS</a> support.
                     <div class="warning">
                         <span>NOTE:</span>
                         Shiro-CAS support is deprecated, support has been moved to the Apache Shiro based <a href="https://github.com/bujiio/buji-pac4j">buji-pac4j</a> project.
@@ -197,7 +197,7 @@
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://ehcache.org">Ehcache</a>-based
+                                                                             href="http://www.ehcache.org">Ehcache</a>-based
                     famework caching.
                 </td>
             </tr>
@@ -217,7 +217,7 @@
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://hazelcast.org">Hazelcast</a>-based
+                                                                             href="https://hazelcast.org">Hazelcast</a>-based
                     famework caching.
                 </td>
             </tr>
@@ -255,7 +255,7 @@
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://code.google.com/p/google-guice/">Google Guice</a>
+                                                                             href="https://github.com/google/guice">Google Guice</a>
                     integration.
                 </td>
             </tr>
@@ -293,7 +293,7 @@
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://www.springsource.org/about">Spring Framework</a>
+                                                                             href="https://spring.io/">Spring Framework</a>
                     integration.
                 </td>
             </tr>
@@ -446,7 +446,7 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables Jasig <a class="external-link"
-                                                                                   href="http://www.jasig.org/cas">CAS</a> support.
+                                                                                   href="https://wiki.jasig.org/display/CAS/Home">CAS</a> support.
                 </td>
             </tr>
             <tr>
@@ -464,7 +464,7 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://ehcache.org">Ehcache</a>-based
+                                                                             href="http://www.ehcache.org">Ehcache</a>-based
                     famework caching.
                 </td>
             </tr>
@@ -502,7 +502,7 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://code.google.com/p/google-guice/">Google Guice</a>
+                                                                             href="https://github.com/google/guice">Google Guice</a>
                     integration.
                 </td>
             </tr>
@@ -540,7 +540,7 @@ git checkout shiro-root-${latestRelease} -b shiro-root-${latestRelease}
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://www.springsource.org/about">Spring Framework</a>
+                                                                             href="https://spring.io/">Spring Framework</a>
                     integration.
                 </td>
             </tr>
@@ -693,7 +693,7 @@ git checkout shiro-root-1.2.6 -b shiro-root-1.2.6
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://ehcache.org">Ehcache</a>-based
+                                                                             href="http://www.ehcache.org">Ehcache</a>-based
                     famework caching.
                 </td>
             </tr>
@@ -731,7 +731,7 @@ git checkout shiro-root-1.2.6 -b shiro-root-1.2.6
                     </div>
                 </td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Enables <a class="external-link"
-                                                                             href="http://www.springsource.org/about">Spring Framework</a>
+                                                                             href="https://spring.io/">Spring Framework</a>
                     integration.
                 </td>
             </tr>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/events.html
----------------------------------------------------------------------
diff --git a/events.html b/events.html
index f4f9fef..b053cd3 100644
--- a/events.html
+++ b/events.html
@@ -6,14 +6,13 @@
 
 <h3><a name="Events-DevNexus%3AApplicationSecuritywithApacheShiro"></a>DevNexus: Application Security with Apache Shiro</h3>
 <p>March 22, 2011, Atlanta, GA
-<br clear="none" class="atl-forced-newline"><a class="external-link" href="http://www.devnexus.com/s/presentations#1138" rel="nofollow">http://www.devnexus.com/s/presentations#1138</a></p>
+<br clear="none" class="atl-forced-newline"><a class="external-link" href="https://www.devnexus.com/s/presentations#1138" rel="nofollow">https://www.devnexus.com/s/presentations#1138</a></p>
 
 <h2><a name="Events-PastEvents"></a>Past Events</h2>
 
 <h3><a name="Events-SanFranciscoJavaUserGroup%3ASuperSimpleApplicationSecuritywithApacheShiro"></a>San Francisco Java User Group: Super Simple Application Security with Apache Shiro</h3>
 <p>October 12, 2010, San Francisco, CA
-<br clear="none" class="atl-forced-newline"><a class="external-link" href="http://www.sfjava.org/events/13539905/" rel="nofollow">http://www.sfjava.org/events/13539905/</a></p>
+<br clear="none" class="atl-forced-newline"><a class="external-link" href="http://www.meetup.com/sfjava/" rel="nofollow">http://www.meetup.com/sfjava/</a></p>
 
 <h3><a name="Events-SDForum%3ASecuringApplicationswithApacheShiro"></a>SDForum: Securing Applications with Apache Shiro</h3>
-<p>June 1, 2010, Palo Alto, CA
-<br clear="none" class="atl-forced-newline"><a class="external-link" href="http://www.sdforum.org/index.cfm?fuseaction=Calendar.eventDetail&amp;eventID=13671&amp;pageId=471" rel="nofollow">http://www.sdforum.org/index.cfm?fuseaction=Calendar.eventDetail&amp;eventID=13671&amp;pageId=471</a></p>
\ No newline at end of file
+<p>June 1, 2010, Palo Alto, CA</p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/7cfde39b/guice.html.vtl
----------------------------------------------------------------------
diff --git a/guice.html.vtl b/guice.html.vtl
index b8fae6b..e20f51b 100644
--- a/guice.html.vtl
+++ b/guice.html.vtl
@@ -1,6 +1,6 @@
 <h1><a name="Guice-IntegratingApacheShirointoGuicebasedApplication"></a>Integrating Apache Shiro into Guice based Application</h1>
 
-<p>Shiro <a class="external-link" href="http://code.google.com/p/google-guice/" rel="nofollow">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>
+<p>Shiro <a class="external-link" href="https://github.com/google/guice" rel="nofollow">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>
 
 <h2><a name="Guice-Overview"></a>Overview</h2>
 
@@ -12,12 +12,12 @@
 
 
 <ul><li>ShiroWebModule
-	<ul><li>Extension of <tt>ShiroModule</tt> that sets up the web environment and also allows for filter chain configuration.  This uses the <a class="external-link" href="http://code.google.com/p/google-guice/wiki/ServletModule" rel="nofollow">Guice Servlet Module</a> to configure the filters, and so requires that to be setup.</li><li>Like the <tt>ShiroModule</tt>, this module is used by extending it and adding your own custom configuration.</li></ul>
+	<ul><li>Extension of <tt>ShiroModule</tt> that sets up the web environment and also allows for filter chain configuration.  This uses the <a class="external-link" href="https://github.com/google/guice/wiki/ServletModule" rel="nofollow">Guice Servlet Module</a> to configure the filters, and so requires that to be setup.</li><li>Like the <tt>ShiroModule</tt>, this module is used by extending it and adding your own custom configuration.</li></ul>
 	</li></ul>
 
 
 <ul><li>ShiroAopModule
-	<ul><li>Uses <a class="external-link" href="http://code.google.com/p/google-guice/wiki/AOP" rel="nofollow">Guice AOP</a> to implement the Shiro AOP annotations.  This module is primarily concerned with adapting Shiro <tt>AnnotationMethodInterceptors</tt> to the Guice method interceptor model.</li><li>This module is typically used by simply installing it.  However, if you have your own <tt>AnnotationMethodInterceptors</tt> written for Shiro, they can be easily incorporated by extending it.</li></ul>
+	<ul><li>Uses <a class="external-link" href="https://github.com/google/guice/wiki/AOP" rel="nofollow">Guice AOP</a> to implement the Shiro AOP annotations.  This module is primarily concerned with adapting Shiro <tt>AnnotationMethodInterceptors</tt> to the Guice method interceptor model.</li><li>This module is typically used by simply installing it.  However, if you have your own <tt>AnnotationMethodInterceptors</tt> written for Shiro, they can be easily incorporated by extending it.</li></ul>
 	</li></ul>
 
 


Mime
View raw message