Modified: shiro/site/publish/concurrency.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/concurrency.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/concurrency.html (original)
+++ shiro/site/publish/concurrency.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,48 +97,114 @@
 </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>
-            </ul>
-        </div>
 
-        <div id="content">
+                <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>
 
-                            <p>TBD<br/><input type="hidden" id="ghEditPage" 
value="concurrency.md"></input></p>
-            
+            <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><!--END WRAPPER-->
 
-    <div id="footer">
+            <p>TBD<br/><input type="hidden" id="ghEditPage" 
value="concurrency.md"></input></p>
+    
+</div>
+
+    <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/conferences.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/conferences.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/conferences.html (original)
+++ shiro/site/publish/conferences.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,48 +97,114 @@
 </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>
-            </ul>
-        </div>
 
-        <div id="content">
+                <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>
 
-                            <p>If Shiro is presented at any conferences, 
we&rsquo;ll update this page with details.<br/><input type="hidden" 
id="ghEditPage" value="conferences.md"></input></p>
-            
+            <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><!--END WRAPPER-->
 
-    <div id="footer">
+            <p>If Shiro is presented at any conferences, we&rsquo;ll update 
this page with details.<br/><input type="hidden" id="ghEditPage" 
value="conferences.md"></input></p>
+    
+</div>
+
+    <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/configuration.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/configuration.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/configuration.html (original)
+++ shiro/site/publish/configuration.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="Configuration-ApacheShiroConfiguration"></a>
+            <a name="Configuration-ApacheShiroConfiguration"></a>
 <h1><a href="#apache-shiro-configuration" 
name="apache-shiro-configuration">Apache Shiro Configuration</a></h1>
 <ul>
   <li>
@@ -171,24 +257,10 @@
   <p><a href="#Configuration-Lendahandwithdocumentation">Lend a hand with 
documentation</a></p></li>
 </ul>
 <p>Shiro is designed to work in any environment, from simple command-line 
applications to the largest enterprise clustered applications. Because of this 
diversity of environments, there are a number of configuration mechanisms that 
are suitable for configuration. This section covers the configuration 
mechanisms that are supported by Shiro core only.</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>Many Configuration Options</b>
-                <br clear="none">
-                Shiro's <code>SecurityManager</code> implementations and all 
supporting components are all JavaBeans compatible.  This allows Shiro to be 
configured with practically any configuration format such as regular Java, XML 
(Spring, JBoss, Guice, etc), <a class="external-link" 
href="http://www.yaml.org/"; rel="nofollow">YAML</a>, JSON, Groovy Builder 
markup, and more.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-success">
+    <span class="glyphicon glyphicon-ok"></span> <strong>Many Configuration 
Options</strong>
+    <hr class="message-inner-separator">
+    <p>Shiro's <code>SecurityManager</code> implementations and all supporting 
components are all JavaBeans compatible.  This allows Shiro to be configured 
with practically any configuration format such as regular Java, XML (Spring, 
JBoss, Guice, etc), <a class="external-link" href="http://www.yaml.org/"; 
rel="nofollow">YAML</a>, JSON, Groovy Builder markup, and more.</p>
 </div>
 <a name="Configuration-ProgrammaticConfiguration"></a>
 <h2><a href="#programmatic-configuration" 
name="programmatic-configuration">Programmatic Configuration</a></h2>
@@ -361,24 +433,10 @@ securityManager.sessionManager.globalSes
 <pre><code 
class="java">securityManager.getSessionManager().setGlobalSessionTimeout(1800000);
 </code></pre>
 <p>The graph traversal can be as deep as necessary: 
<code>object.property1.property2....propertyN.value = blah</code></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>BeanUtils Property Support</b>
-                <br clear="none">
-                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.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-success">
+    <span class="glyphicon glyphicon-ok"></span> <strong>BeanUtils Property 
Support</strong>
+    <hr class="message-inner-separator">
+    <p>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.</p>
 </div>
 <a name="Configuration-ByteArrayValues"></a>
 <h6><a href="#byte-array-values" name="byte-array-values">Byte Array 
Values</a></h6>
@@ -419,27 +477,11 @@ anObject.mapProperty = key1:$object1, ke
 <a name="Configuration-OrderMatters"></a>
 <h6><a href="#order-matters" name="order-matters">Order Matters</a></h6>
 <p>The INI format and conventions above are very convenient and easy to 
understand, but it is not as powerful as other text/XML-based configuration 
mechanisms. The most important thing to understand when using the above 
mechanism is that <strong>Order Matters!</strong></p>
-<div class="panelMacro">
-    <table class="noteMacro">
-        <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-warning"></i>
-            </td>
-
-            <td colspan="1" rowspan="1">
-                <b>Be Careful</b>
-                <br clear="none">
-                Each object instantiation and each value assignment is 
executed <em>in the order they occur in the [main] section</em>.  These lines 
ultimately translate to a JavaBeans getter/setter method invocation, and so 
those methods are invoked in the same order!
-<p>Keep this in mind when writing your configuration.</p>
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-warning">
+    <span class="glyphicon glyphicon-warning-sign"></span> <strong>Be 
Careful</strong>
+    <hr class="message-inner-separator">
+    <p>Each object instantiation and each value assignment is executed <em>in 
the order they occur in the [main] section</em>.  These lines ultimately 
translate to a JavaBeans getter/setter method invocation, and so those methods 
are invoked in the same order!
+<p>Keep this in mind when writing your configuration.</p></p>
 </div>
 <a name="Configuration-OverridingInstances"></a>
 <h6><a href="#overriding-instances" name="overriding-instances">Overriding 
Instances</a></h6>
@@ -474,28 +516,10 @@ admin = secret
 lonestarr = vespa, goodguy, schwartz
 darkhelmet = ludicrousspeed, badguy, schwartz
 </code></pre>
-<div class="panelMacro">
-    <table class="infoMacro">
-        <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-info-circle"></i>
-            </td>
-
-            <td colspan="1" rowspan="1">
-                <b>Automatic IniRealm</b>
-                <br clear="none">
-                Just defining non-empty [users] or [roles] sections will 
automatically trigger the creation of an <a class="external-link" 
href="static/current/apidocs/org/apache/shiro/realm/text/IniRealm.html"><code>org.apache.shiro.realm.text.IniRealm</code></a>
 instance and make it available in the [main] section under the name 
<b><code>iniRealm</code></b>.  You can configure it like any other object as 
described above.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-info">
+    <span class="glyphicon glyphicon-info-sign"></span> <strong>Automatic 
IniRealm</strong>
+    <hr class="message-inner-separator">
+    <p>Just defining non-empty [users] or [roles] sections will automatically 
trigger the creation of an <a class="external-link" 
href="static/current/apidocs/org/apache/shiro/realm/text/IniRealm.html"><code>org.apache.shiro.realm.text.IniRealm</code></a>
 instance and make it available in the [main] section under the name 
<b><code>iniRealm</code></b>.  You can configure it like any other object as 
described above.</p>
 </div>
 <a name="Configuration-LineFormat"></a>
 <h5><a href="#line-format" name="line-format">Line Format</a></h5>
@@ -509,24 +533,10 @@ darkhelmet = ludicrousspeed, badguy, sch
 <a name="Configuration-EncryptingPasswords"></a>
 <h5><a href="#encrypting-passwords" name="encrypting-passwords">Encrypting 
Passwords</a></h5>
 <p>If you don&rsquo;t want the [users] section passwords to be in plain-text, 
you can encrypt them using your favorite hash algorithm (MD5, Sha1, Sha256, 
etc) however you like and use the resulting string as the password value. By 
default, the password string is expected to be Hex encoded, but can be 
configured to be Base64 encoded instead (see below).</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 Secure Passwords</b>
-                <br clear="none">
-                To save time and use best-practices, you might want to use 
Shiro's <a href="command-line-hasher.html" title="Command Line Hasher">Command 
Line Hasher</a>, which will hash passwords as well as any other type of 
resource.  It is especially convenient for encrypting INI <code>[users]</code> 
passwords.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-success">
+    <span class="glyphicon glyphicon-ok"></span> <strong>Easy Secure 
Passwords</strong>
+    <hr class="message-inner-separator">
+    <p>To save time and use best-practices, you might want to use Shiro's <a 
href="command-line-hasher.html" title="Command Line Hasher">Command Line 
Hasher</a>, which will hash passwords as well as any other type of resource.  
It is especially convenient for encrypting INI <code>[users]</code> 
passwords.</p>
 </div>
 <p>Once you&rsquo;ve specified the hashed text password values, you have to 
tell Shiro that these are encrypted. You do that by configuring the implicitly 
created <code>iniRealm</code> in the [main] section to use an appropriate 
<code>CredentialsMatcher</code> implementation corresponding to the hash 
algorithm you&rsquo;ve specified:</p>
 <pre><code class="ini">[main]
@@ -564,47 +574,15 @@ goodguy = winnebago:drive:eagle5
 <p>Each line in the [roles] section must must define a role-to-permission(s) 
key/value mapping with in the following format:</p>
 <p><code>rolename</code> = <em>permissionDefinition1</em>, 
<em>permissionDefinition2</em>, &hellip;, <em>permissionDefinitionN</em></p>
 <p>where <em>permissionDefinition</em> is an arbitrary String, but most people 
will want to use strings that conform<br/>to the <a 
href="static/current/apidocs/org/apache/shiro/authz/permission/WildcardPermission.html"><code>org.apache.shiro.authz.permission.WildcardPermission</code></a>
 format for ease of use and flexibility. See the <a href="permissions.html" 
title="Permissions">Permissions</a> documentation for more information on 
Permissions and how you can benefit from them.</p>
-<div class="panelMacro">
-    <table class="infoMacro">
-        <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-info-circle"></i>
-            </td>
-
-            <td colspan="1" rowspan="1">
-                <b>Internal commas</b>
-                <br clear="none">
-                Note that if an individual <em>permissionDefinition</em> needs 
to be internally comma-delimited (e.g. 
<code>printer:5thFloor:print,info</code>), you will need to surround that 
definition with double quotes (") to avoid parsing 
errors:<code>"printer:5thFloor:print,info"</code>
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-info">
+    <span class="glyphicon glyphicon-info-sign"></span> <strong>Internal 
commas</strong>
+    <hr class="message-inner-separator">
+    <p>Note that if an individual <em>permissionDefinition</em> needs to be 
internally comma-delimited (e.g. <code>printer:5thFloor:print,info</code>), you 
will need to surround that definition with double quotes (") to avoid parsing 
errors:<code>"printer:5thFloor:print,info"</code></p>
 </div>
-<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>Roles without Permissions</b>
-                <br clear="none">
-                If you have roles that don't require permission associations, 
you don't need to list them in the [roles] section if you don't want to.  Just 
defining the role names in the [users] section is enough to create the role if 
it does not exist yet.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-success">
+    <span class="glyphicon glyphicon-ok"></span> <strong>Roles without 
Permissions</strong>
+    <hr class="message-inner-separator">
+    <p>If you have roles that don't require permission associations, you don't 
need to list them in the [roles] section if you don't want to.  Just defining 
the role names in the [users] section is enough to create the role if it does 
not exist yet.</p>
 </div>
 <a name="Configuration-%5Curls%5C"></a>
 <h4>[urls]</h4>
@@ -613,27 +591,23 @@ goodguy = winnebago:drive:eagle5
 <h2><a href="#lend-a-hand-with-documentation" 
name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2>
 <p>While we hope this documentation helps you with the work you&rsquo;re doing 
with Apache Shiro, the community is improving and expanding the documentation 
all the time. If you&rsquo;d like to help the Shiro project, please consider 
corrected, expanding, or adding documentation where you see a need. Every 
little bit of help you provide expands the community and in turn improves 
Shiro.</p>
 <p>The easiest way to contribute your documentation is to send it to the <a 
href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a 
href="mailing-lists.html" title="Mailing Lists">User Mailing 
List</a>.<br/><input type="hidden" id="ghEditPage" 
value="configuration.md.vtl"></input></p>
-            
-        </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/confluence-auto-export.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/confluence-auto-export.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/confluence-auto-export.html (original)
+++ shiro/site/publish/confluence-auto-export.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,48 +97,102 @@
 </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>This page has been moved.  You are being 
redirected.</p>
+            <p>This page has been moved.  You are being redirected.</p>
 
-<div class="panelMacro">
-    <table class="noteMacro">
-        <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-warning"></i>
-            </td>
-
-            <td colspan="1" rowspan="1">
-                <b>Redirection Notice</b>
-                <br clear="none">
-                This page should redirect to <a href="index.html" 
title="index.html">index.html</a>.
-            </td>
-        </tr>
-        </tbody>
-    </table>
+<div class="alert alert-warning">
+    <span class="glyphicon glyphicon-warning-sign"></span> <strong>Redirection 
Notice</strong>
+    <hr class="message-inner-separator">
+    <p>This page should redirect to <a href="index.html" 
title="index.html">index.html</a>.</p>
 </div>
 
 <script type="text/javascript">
@@ -132,27 +202,23 @@
 </script>
 <input type="hidden" id="ghEditPage" 
value="confluence-auto-export.html.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/contribute.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/contribute.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/contribute.html (original)
+++ shiro/site/publish/contribute.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="Contribute-ContributingtoApacheShiro"></a>
+            <a name="Contribute-ContributingtoApacheShiro"></a>
 <h1><a href="#contributing-to-apache-shiro" 
name="contributing-to-apache-shiro">Contributing to Apache Shiro</a></h1>
 <p>Apache Shiro is a non-profit project and relies on your help and 
contributions in order to evolve and improve.</p>
 <p>At the Shiro project we make it easy for anyone to join our great community 
and lend a hand. We welcome any help you can offer inlcuding help with 
documentation, identifying bugs, providing answers on the user mailing list, 
and providing helpful code improvements.</p>
@@ -117,27 +203,23 @@
   <p><a href="developer-resources.html">Developer Resources</a> - Helpful 
information for anyone providing project help as a committer or 
contributor</p></li>
 </ul>
 <input type="hidden" id="ghEditPage" value="contribute.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/core.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/core.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/core.html (original)
+++ shiro/site/publish/core.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="Core-CoreConceptsinApacheShiro"></a>
+            <a name="Core-CoreConceptsinApacheShiro"></a>
 <h1><a href="#core-concepts-in-apache-shiro" 
name="core-concepts-in-apache-shiro">Core Concepts in Apache Shiro</a></h1>
 <p>This part of the documentation covers Shiro&rsquo;s core architectural 
concepts.</p>
 <p>First we&rsquo;ll present Shiro&rsquo;s architecture and a summary of each 
core concept. Then we&rsquo;ll cover the most important concept in Shiro - the 
<code>Subject</code>, a security-specific &lsquo;view&rsquo; of a 
<em>single</em> application user. Next we&rsquo;ll discuss the 
<tt>SecurityManager</tt>, an application singleton that manages all Subjects 
for the application, and as well as the SecurityManager&rsquo;s supporting 
components that do most of Shiro&rsquo;s heavy lifting. Then onto Realms, the 
security-specific DAOs, Shiro communicates with and then Permissions, the 
building block of any security policy.</p>
@@ -122,27 +208,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="core.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/cryptography-features.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/cryptography-features.html?rev=1766556&r1=1766555&r2=1766556&view=diff
==============================================================================
--- shiro/site/publish/cryptography-features.html (original)
+++ shiro/site/publish/cryptography-features.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="CryptographyFeatures-ApacheShiroCryptographyFeatures"></a>
+            <a name="CryptographyFeatures-ApacheShiroCryptographyFeatures"></a>
 <h1><a href="#apache-shiro-cryptography-features" 
name="apache-shiro-cryptography-features">Apache Shiro Cryptography 
Features</a></h1>
 <div class="addthis_toolbox addthis_default_style">
     <a class="addthis_button_compact" 
href="http://www.addthis.com/bookmark.php?v=250&amp;pubid=ra-4d66ef016022c3bd";>Share</a>
@@ -150,27 +236,23 @@
 <a name="CryptographyFeatures-GetStartedin10MinuteswithShiro"></a>
 <h2><a href="#get-started-in-10-minutes-with-shiro" 
name="get-started-in-10-minutes-with-shiro">Get Started in 10 Minutes with 
Shiro</a></h2>
 <p>Try out Shiro for yourself with our <a href="10-minute-tutorial.html" 
title="10 Minute Tutorial">10 Minute Tutorial</a>. And if you have any 
questions about Shiro, please check out our <a href="forums.html" 
title="Forums">community forum</a> or <a href="mailing-lists.html" 
title="Mailing Lists">user mailing list</a> for answers from the 
community.<br/><input type="hidden" id="ghEditPage" 
value="cryptography-features.md"></input></p>
-            
-        </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>


Reply via email to