You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shiro.apache.org by GitBox <gi...@apache.org> on 2021/04/24 20:20:59 UTC
[GitHub] [shiro-site] fpapon commented on a change in pull request #80: [INFRA-21748] Rename Shiro master branch to main
fpapon commented on a change in pull request #80:
URL: https://github.com/apache/shiro-site/pull/80#discussion_r619705144
##########
File path: spring-boot.md.vtl
##########
@@ -9,7 +9,7 @@ Shiro's Spring-Boot integration is the easiest way to integrate Shiro into a Spr
Web Applications
---
-Shiro has first-class support for Spring web applications. In a web application, all Shiro-accessible web requests must go through a master Shiro Filter. This filter itself is extremely powerful, allowing for ad-hoc custom filter chains to be executed based on any URL path expression.
+Shiro has first-class support for Spring web applications. In a web application, all Shiro-accessible web requests must go through a main Shiro Filter. This filter itself is extremely powerful, allowing for ad-hoc custom filter chains to be executed based on any URL path expression.
Review comment:
Agree that it's not about renaming branch but it's in the same feeling of replacing some words.
##########
File path: spring-framework.md.vtl
##########
@@ -60,13 +60,13 @@ That is it, now you can get the current `Subject` using:
SecurityUtils.getSubject();
```
-You can see a full example in our [samples on Github](https://github.com/apache/shiro/tree/master/samples/spring).
+You can see a full example in our [samples on Github](https://github.com/apache/shiro/tree/main/samples/spring).
<a name="SpringFramework-WebApplications"></a>
Web Applications
---
-Shiro has first-class support for Spring web applications. In a web application, all Shiro-accessible web requests must go through a master Shiro Filter. This filter itself is extremely powerful, allowing for ad-hoc custom filter chains to be executed based on any URL path expression.
+Shiro has first-class support for Spring web applications. In a web application, all Shiro-accessible web requests must go through a main Shiro Filter. This filter itself is extremely powerful, allowing for ad-hoc custom filter chains to be executed based on any URL path expression.
Review comment:
Agree that it's not about renaming branch but it's in the same feeling of replacing some words.
##########
File path: webapp-tutorial.md
##########
@@ -198,7 +198,7 @@ We do all of this by adding a few things to the existing `src/main/webapp/WEB-IN
* The `<listener>` declaration defines a [`ServletContextListener`](http://docs.oracle.com/javaee/6/api/javax/servlet/ServletContextListener.html) that starts up the Shiro environment (including the Shiro `SecurityManager`) upon web application startup. By default, this listener automatically knows to look for our `WEB-INF/shiro.ini` file for Shiro configuration.
-* The `<filter>` declaration defines the master `ShiroFilter`. This filter is expected to filter _all_ requests into the web application so Shiro can peform necessary identity and access control operations before allowing a request to reach the application.
+* The `<filter>` declaration defines the main `ShiroFilter`. This filter is expected to filter _all_ requests into the web application so Shiro can peform necessary identity and access control operations before allowing a request to reach the application.
Review comment:
Agree that it's not about renaming branch but it's in the same feeling of replacing some words.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org