Modified: shiro/site/publish/2012/03/13/whats-new-in-apache-shiro-12.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/2012/03/13/whats-new-in-apache-shiro-12.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/2012/03/13/whats-new-in-apache-shiro-12.html (original)
+++ shiro/site/publish/2012/03/13/whats-new-in-apache-shiro-12.html Tue Oct 25 
16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="../../../assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/confluence.css" media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" 
href="../../../assets/css/style.css">
+    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="../../../assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="../../../assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,50 +97,116 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="../../../index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="../../../index.html">
+                <img src="../../../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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="../../../get-started.html">Get Started</a></li>
                 <li><a href="../../../documentation.html">Docs</a></li>
                 <li><a href="../../../web-features.html">Web Apps</a></li>
-                <li><a href="../../../integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../spring.html">Spring</a></li>
+                        <li><a href="../../../guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="../../../features.html">Features</a></li>
-                <li><a href="../../../community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../forums.html">Community 
Forums</a></li>
+                        <li><a href="../../../mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="../../../articles.html">Articles</a></li>
+                        <li><a href="../../../news.html">News</a></li>
+                        <li><a href="../../../events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <p>Here's an article covering some of the main 
features and enhancements in Apache Shiro 1.2:</p>
+            <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="https://stormpath.com/blog/whats-new-apache-shiro-12"; 
rel="nofollow">https://stormpath.com/blog/whats-new-apache-shiro-12</a></p>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/2012/07/29/apache-shiro-121-released.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/2012/07/29/apache-shiro-121-released.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/2012/07/29/apache-shiro-121-released.html (original)
+++ shiro/site/publish/2012/07/29/apache-shiro-121-released.html Tue Oct 25 
16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="../../../assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/confluence.css" media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" 
href="../../../assets/css/style.css">
+    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="../../../assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="../../../assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="../../../index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="../../../index.html">
+                <img src="../../../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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="../../../get-started.html">Get Started</a></li>
                 <li><a href="../../../documentation.html">Docs</a></li>
                 <li><a href="../../../web-features.html">Web Apps</a></li>
-                <li><a href="../../../integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../spring.html">Spring</a></li>
+                        <li><a href="../../../guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="../../../features.html">Features</a></li>
-                <li><a href="../../../community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../forums.html">Community 
Forums</a></li>
+                        <li><a href="../../../mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="../../../articles.html">Articles</a></li>
+                        <li><a href="../../../news.html">News</a></li>
+                        <li><a href="../../../events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <p>Dear Apache Shiro Community,</p>
+            <p>Dear Apache Shiro Community,</p>
 
 <p>The Shiro team is pleased to announce the release of Apache Shiro version 
1.2.1.  This is the first bug fix point release after 1.2.0.</p>
 
@@ -114,27 +200,23 @@
 <p>Enjoy!</p>
 
 <p>The Apache Shiro Team</p>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/2013/05/30/apache-shiro-122-released.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/2013/05/30/apache-shiro-122-released.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/2013/05/30/apache-shiro-122-released.html (original)
+++ shiro/site/publish/2013/05/30/apache-shiro-122-released.html Tue Oct 25 
16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="../../../assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" 
href="../../../assets/css/confluence.css" media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" 
href="../../../assets/css/style.css">
+    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="../../../assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="../../../assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="../../../assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" 
src="../../../assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="../../../assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,54 +97,120 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="../../../index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="../../../index.html">
+                <img src="../../../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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="../../../get-started.html">Get Started</a></li>
                 <li><a href="../../../documentation.html">Docs</a></li>
                 <li><a href="../../../web-features.html">Web Apps</a></li>
-                <li><a href="../../../integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../spring.html">Spring</a></li>
+                        <li><a href="../../../guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="../../../features.html">Features</a></li>
-                <li><a href="../../../community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="../../../forums.html">Community 
Forums</a></li>
+                        <li><a href="../../../mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="../../../articles.html">Articles</a></li>
+                        <li><a href="../../../news.html">News</a></li>
+                        <li><a href="../../../events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="../../../community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <p>Dear Apache Shiro Community,</p>
+            <p>Dear Apache Shiro Community,</p>
 <p>The Shiro team is pleased to announce the release of Apache Shiro version 
1.2.2. This is the second bug fix point release after 1.2.0.</p>
 <p>This release includes <a class="external-link" 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12323469";>18
 bug fixes</a> since the 1.2.1 release and is available for <a 
href="../../../download.html" title="Download">Download</a> now.</p>
 <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 &ldquo;<a 
class="external-link" 
href="https://stormpath.com/blog/whats-new-apache-shiro-12"; 
rel="nofollow">What&rsquo;s new in Apache Shiro 1.2?</a>&rdquo; 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>
 <p>The Apache Shiro Team</p>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/README.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/README.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/README.html (original)
+++ shiro/site/publish/README.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <h1><a href="#apache-shiro-website-overview" 
name="apache-shiro-website-overview">Apache Shiro Website Overview</a></h1>
+            <h1><a href="#apache-shiro-website-overview" 
name="apache-shiro-website-overview">Apache Shiro Website Overview</a></h1>
 <p>The Apache Shiro website is a static content website accessible at <a 
href="http://shiro.apache.org";>http://shiro.apache.org</a></p>
 <p>Site content is authored as Markdown and HTML files. These files are 
scanned by a tool that applies a page template to each file&rsquo;s contents as 
necessary, and the rendered static .html files are output to a 
<code>publish</code> directory.</p>
 <p>Publishing site changes is as simple as committing any changes in the 
<code>publish</code> directory to version control. ASF infrastructure will see 
the commit and automatically push the changes to the ASF&rsquo;s production 
webservers.</p>
@@ -117,27 +203,23 @@ scms trunk publish
 svn add .
 svn commit -m &quot;my change description&quot;
 </code></pre>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/about.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/about.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/about.html (original)
+++ shiro/site/publish/about.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a name="About-AboutApacheShiro"></a>
+            <a name="About-AboutApacheShiro"></a>
 <h1><a href="#about-apache-shiro" name="about-apache-shiro">About Apache 
Shiro</a></h1>
 <p>Apache Shiro is is a top level open source project under the <a 
href="http://www.apache.org";>Apache Software Foundation</a>. As a project, 
Shiro is an application security framework that provides application developers 
very clean and simple ways of supporting four cornerstones of security in their 
applications: authentication, authorization, enterprise session management and 
cryptography.</p>
 <p>If you&rsquo;d like to learn more about Shiro please visit the links 
below</p>
@@ -118,27 +204,23 @@
   <p><a href="license.html">License</a> - Review the license under which Shiro 
is released - Apache Software License, Version 2.0</p></li>
 </ul>
 <input type="hidden" id="ghEditPage" value="about.md"></input>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/adoption.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/adoption.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/adoption.html (original)
+++ shiro/site/publish/adoption.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,51 +97,117 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a name="Adoption-ApacheShiroAdoption"></a>
+            <a name="Adoption-ApacheShiroAdoption"></a>
 <h1><a href="#apache-shiro-adoption" name="apache-shiro-adoption">Apache Shiro 
Adoption</a></h1>
 <p>Are you using Shiro to build an application? List your name and company 
here and let the world know!</p>
 <p>The more people that adopt Shiro, the better it becomes, and the more you 
benefit from it. Help adoption by letting others know how you use 
it.<br/><input type="hidden" id="ghEditPage" value="adoption.md"></input></p>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/architecture.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/architecture.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/architecture.html (original)
+++ shiro/site/publish/architecture.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a name="Architecture-ApacheShiroArchitecture"></a>
+            <a name="Architecture-ApacheShiroArchitecture"></a>
 <h1><a href="#apache-shiro-architecture" 
name="apache-shiro-architecture">Apache Shiro Architecture</a></h1>
 <p>Apache Shiro&rsquo;s design goals are to simplify application security by 
being intuitive and easy to use. Shiro&rsquo;s core design models how most 
people think about application security - in the context of someone (or 
something) interacting with an application.</p>
 <p>Software applications are usually designed based on user stories. That is, 
you&rsquo;ll often design user interfaces or service APIs based on how a user 
would (or should) interact with the software. For example, you might say, 
&ldquo;If the user interacting with my application is logged in, I will show 
them a button they can click to view their account information. If they are not 
logged in, I will show a sign-up button.&rdquo;</p>
@@ -180,24 +266,10 @@
 <p>To simplify configuration and enable flexible configuration/pluggability, 
Shiro&rsquo;s implementations are all highly modular in design - so modular in 
fact, that the SecurityManager implementation (and its class-hierarchy) does 
not do much at all. Instead, the <code>SecurityManager</code> implementations 
mostly act as a lightweight &lsquo;container&rsquo; component, delegating 
almost all behavior to nested/wrapped components. This &lsquo;wrapper&rsquo; 
design is reflected in the detailed architecture diagram above.</p>
 <p>While the components actually execute the logic, the 
<code>SecurityManager</code> implementation knows how and when to coordinate 
the components for the correct behavior.</p>
 <p>The <code>SecurityManager</code> implementations and are also JavaBeans 
compatible, which allows you (or a configuration mechanism) to easily customize 
the pluggable components via standard JavaBeans accessor/mutator methods 
(get*/set*). This means the Shiro&rsquo;s architectural modularity can 
translate into very easy configuration for custom behavior.</p>
-<div class="panelMacro">
-    <table class="tipMacro">
-        <colgroup span="1">
-            <col span="1" width="24">
-            <col span="1">
-        </colgroup>
-        <tbody><tr>
-            <td colspan="1" rowspan="1" valign="top">
-                <i class="fa fa-check-square-o"></i>
-            </td>
-            <td colspan="1" rowspan="1">
-                <b>Easy Configuration</b>
-                <br clear="none">
-                Because of JavaBeans compatibility, it is very easy to 
configure the `SecurityManager` with custom components via any mechanism that 
supports JavaBeans-style configuration, such as <a href="spring.html" 
title="Spring">Spring</a>, Guice, JBoss, etc.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-success">
+    <span class="glyphicon glyphicon-ok"></span> <strong>Easy 
Configuration</strong>
+    <hr class="message-inner-separator">
+    <p>Because of JavaBeans compatibility, it is very easy to configure the 
`SecurityManager` with custom components via any mechanism that supports 
JavaBeans-style configuration, such as <a href="spring.html" 
title="Spring">Spring</a>, Guice, JBoss, etc.</p>
 </div>
 <p>We will cover <a href="configuration.html">Configuration</a> next.</p>
 <a name="Architecture-Lendahandwithdocumentation"></a>
@@ -205,27 +277,23 @@
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html">User Mailing List</a>.</p>
 <input type="hidden" id="ghEditPage" value="architecture.md.vtl"></input>
-            
-        </div>
-
-    </div><!--END WRAPPER-->
+    
+</div>
 
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>

Modified: shiro/site/publish/articles.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/articles.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/articles.html (original)
+++ shiro/site/publish/articles.html Tue Oct 25 16:48:27 2016
@@ -35,6 +35,7 @@
 
 
 <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="Apache Shiro is a powerful and 
easy-to-use Java security framework that performs authentication, 
authorization, cryptography, and session management.">
     <meta name="google-site-verification" 
content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw">
@@ -50,29 +51,44 @@
     <link rel="icon" type="image/vnd.microsoft.icon" 
href="./assets/images/favicon.ico">
     <link rel="stylesheet" type="text/css" 
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";>
 
-    <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css">
-    <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" 
media="screen">
+    <!-- site styles and  -->
     <link rel="stylesheet" type="text/css" href="./assets/css/style.css">
+    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
 
+    <!-- github ribbon -->
     <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" />
     <!--[if lt IE 9]>
       <link rel="stylesheet" 
href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" />
     <![endif]-->
 
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js"; 
integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" 
crossorigin="anonymous"></script>
+
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" 
href="./assets/bootstrap/css/bootstrap-theme.min.css">
+    <script src="./assets/bootstrap/js/bootstrap.min.js"></script>
+
+
+    <!-- Google Analytics -->
+    <script>
+    
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new 
Date();a=s.createElement(o),
+            
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-XXXXX-Y', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
+
+
+
     <!-- syntax highlighting -->
     <link rel="stylesheet" 
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css";
 integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" 
crossorigin="anonymous" />
     <script type="text/javascript" 
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js";
 integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" 
crossorigin="anonymous"></script>
-
-    <script type="text/javascript" src="./assets/js/shiro-site.js"></script>
-    <script type="text/javascript" 
src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script>
-    <script type="text/javascript" 
src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
+
     <script type="text/javascript">
-        // initialize plugins
-        jQuery(function() {
-            //Google Analytics
-            jQuery.trackPage('UA-11551827-1');
-        });
 
         $( document ).ready(function() {
             addPageEditLink();
@@ -81,27 +97,97 @@
 </head>
 
 <body>
-    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
 
     <div id="top-bar"></div>
 
-    <div class="wrapper">
+    <div class="container" style="max-width: 1200px;">
+
+    <a class="github-fork-ribbon right-top" 
href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on 
GitHub</a>
+
+
 
-        <div id="header">
-            <a href="./index.html"><div id="logo"></div></a>
-            <ul class="navigation">
+    <div class="masthead">
+        <p class="lead">
+            <a href="./index.html">
+                <img src="./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>
+        </p>
+    </div>
+
+
+
+    <nav class="navbar navbar-default" role="navigation">
+        <!-- Brand and toggle get grouped for better mobile display -->
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+        </div>
+
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="collapse navbar-collapse" id="navbar-collapse-1">
+            <ul class="nav navbar-nav">
                 <li><a href="./get-started.html">Get Started</a></li>
                 <li><a href="./documentation.html">Docs</a></li>
                 <li><a href="./web-features.html">Web Apps</a></li>
-                <li><a href="./integration.html">Integrations</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Integrations <b class="caret"></b>
+                    </a>
+
+                    <ul class="dropdown-menu">
+                        <li><a href="./spring.html">Spring</a></li>
+                        <li><a href="./guice.html">Guice</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./integration.html">Third-Party 
Integrations</a></li>
+                    </ul>
+                </li>
+
                 <li><a href="./features.html">Features</a></li>
-                <li><a href="./community.html">Community</a></li>
+
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Community <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li><a href="./forums.html">Community Forums</a></li>
+                        <li><a href="./mailing-lists.html">Mailing 
Lists</a></li>
+                        <li><a href="./articles.html">Articles</a></li>
+                        <li><a href="./news.html">News</a></li>
+                        <li><a href="./events.html">Events</a></li>
+                        <li class="divider"></li>
+                        <li><a href="./community.html">More</a></li>
+                    </ul>
+                </li>
+
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+                <li class="dropdown">
+                    <a href="http://www.apache.org/"; class="dropdown-toggle" 
data-toggle="dropdown">
+                        Apache Software Foundation <b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org/";>Apache 
Homepage</a></li>
+                        <li><a 
href="http://www.apache.org/licenses/";>License</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+                        <li><a 
href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li>
+                        <li><a 
href="http://www.apache.org/security/";>Security</a></li>
+                    </ul>
+                </li>
             </ul>
         </div>
+        <!-- /.navbar-collapse -->
+    </nav>
 
-        <div id="content">
 
-                            <a name="Articles-ApacheShiroArticles"></a>
+            <a name="Articles-ApacheShiroArticles"></a>
 <h1><a href="#apache-shiro-articles" name="apache-shiro-articles">Apache Shiro 
Articles</a></h1>
 <p>Here are some articles written by and for members of the Apache Shiro 
community. Please post any errata to the user or dev <a 
href="mailing-lists.html" title="Mailing Lists">mailing lists</a>.</p>
 <a name="Articles-IntroductoryArticles"></a>
@@ -169,27 +255,23 @@
   <li>
   <p><strong>Shiro DevNexus 2009 Presentation</strong> by Jeremy Haile: (<a 
href="assets/images/articles/Ki-DevNexus-2009.pdf?version=1&modificationDate=1246602947000">PDF</a>)
 (<a 
href="assets/images/articles/Ki-DevNexus-2009.key.zip?version=1&modificationDate=1246602947000">Keynote</a>)
 (<a 
href="assets/images/articles/Ki-DevNexus-2009.ppt.zip?version=1&modificationDate=1246602947000">Powerpoint</a>)<br/><input
 type="hidden" id="ghEditPage" value="articles.md"></input></p></li>
 </ul>
-            
-        </div>
+    
+</div>
 
-    </div><!--END WRAPPER-->
-
-    <div id="footer">
+    <div class="footer-padding"></div>
+    <footer class="custom-footer">
 
         <div class="wrapper">
 
             <a 
href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> 
|
             <a 
href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a>
             <p>Copyright &copy; 2008-2016 The Apache Software Foundation</p>
-
-            <div class="editThisPage">
-            </div>
-
+            <div class="editThisPage"></div>
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->
 
-    </div> <!--END FOOTER-->
+    </footer> <!--END FOOTER-->
 
 </body>
 </html>


Reply via email to