[shiro-site] branch master updated: Update Shiro spring docs to point to Spring boot by default

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 670525e  Update Shiro spring docs to point to Spring boot by default
670525e is described below

commit 670525e74a1338bf44de1fd7678549a8b3b79693
Author: Brian Demers <bd...@apache.org>
AuthorDate: Wed Nov 4 14:29:55 2020 -0500

    Update Shiro spring docs to point to Spring boot by default
    
    We don't have a direct link to the spring-boot page from the menu, The current menu item links to an older XML based approach.
    The Spring Boot Page has links to non-boot options (annotations and xml) in the first paragraph, so it make for a better default
---
 sitemap.xml           | 3 +++
 templates/default.vtl | 2 +-
 web.md.vtl            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sitemap.xml b/sitemap.xml
index 9c8ac1b..3b8643e 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -208,6 +208,9 @@
     <loc>https://shiro.apache.org/spring.html</loc>
   </url>
   <url>
+    <loc>https://shiro.apache.org/spring-boot.html</loc>
+  </url>
+  <url>
     <loc>https://shiro.apache.org/subject.html</loc>
   </url>
   <url>
diff --git a/templates/default.vtl b/templates/default.vtl
index e349169..c155784 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -152,7 +152,7 @@
                     </a>
 
                     <ul class="dropdown-menu">
-                        <li><a href="$root/spring.html">Spring</a></li>
+                        <li><a href="$root/spring-boot.html">Spring</a></li>
                         <li><a href="$root/guice.html">Guice</a></li>
                         <li class="divider"></li>
                         <li><a href="$root/integration.html">Third-Party Integrations</a></li>
diff --git a/web.md.vtl b/web.md.vtl
index ca14731..f513afb 100644
--- a/web.md.vtl
+++ b/web.md.vtl
@@ -85,7 +85,7 @@ Configuration
 
 The simplest way to integrate Shiro into any web application is to configure a Servlet ContextListener and Filter in web.xml that understands how to read Shiro's INI configuration. The bulk of the INI config format itself is defined in the Configuration pages's [INI Sections](configuration.html#[[#]]#Configuration-INISections) section, but we'll cover some additional web-specific sections here.
 
-#info('Using Spring?', 'Spring Framework users will not perform this setup.  If you use Spring, you will want to read about <a href="spring.html#[[#]]#Spring-WebApplications">Spring-specific web configuration</a> instead.')
+#info('Using Spring?', 'Spring Framework users will not perform this setup.  If you use Spring, you will want to read about <a href="spring-boot.html#[[#]]#Spring-WebApplications">Spring-specific web configuration</a> instead.')
 
 <a name="Web-%7B%7Bweb.xml%7D%7D"></a>
 #[[###`web.xml`]]#