You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2018/05/04 19:33:51 UTC

[1/3] shiro-site git commit: Update terminology.md

Repository: shiro-site
Updated Branches:
  refs/heads/master 683ee884c -> 0643e9a6e


Update terminology.md

a typo

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

Branch: refs/heads/master
Commit: 64f18f11a81c2691a2cff7ea20a38a5a00d5087b
Parents: d656e5a
Author: youkaichao <yo...@gmail.com>
Authored: Sat Aug 12 16:16:35 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Sat Aug 12 16:16:35 2017 +0800

----------------------------------------------------------------------
 terminology.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro-site/blob/64f18f11/terminology.md
----------------------------------------------------------------------
diff --git a/terminology.md b/terminology.md
index 724c125..9433e64 100644
--- a/terminology.md
+++ b/terminology.md
@@ -58,7 +58,7 @@ A Realm is a component that can access application-specific security data such a
 
 <a name="Terminology-role"></a>
 * **Role**
-The definition of a Role can vary based on who you talk to.  In many applications it is nebulous concept at best that people use to implicitly define security policies.  Shiro prefers to interpret a Role as simply a named collection of Permissions.  That's it - an application unique name aggregating one or more Permission declarations.  
+The definition of a Role can vary based on who you talk to.  In many applications it is a nebulous concept at best that people use to implicitly define security policies.  Shiro prefers to interpret a Role as simply a named collection of Permissions.  That's it - an application unique name aggregating one or more Permission declarations.  
 
     This is a more concrete definition than the implicit one used by many applications.  If you choose to have your data model reflect Shiro's assumption, you'll find you will have much more power in controlling security policies.
 


[3/3] shiro-site git commit: Merge remote-tracking branch 'origin/pr-28'

Posted by bd...@apache.org.
Merge remote-tracking branch 'origin/pr-28'

Fixes: #28


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

Branch: refs/heads/master
Commit: 0643e9a6e7cf1f36ee3b5a21bdbcb6dc6943d9eb
Parents: 683ee88 a085314
Author: Brian Demers <bd...@apache.org>
Authored: Fri May 4 15:29:47 2018 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Fri May 4 15:29:47 2018 -0400

----------------------------------------------------------------------
 cachemanager.md                  | 2 +-
 core.md                          | 2 +-
 cryptography.md                  | 2 +-
 documentation-help-block.md      | 2 +-
 java-annotations.md              | 2 +-
 reference.md                     | 2 +-
 spring-xml.md                    | 2 +-
 spring.md                        | 2 +-
 templates/macros/lend-a-hand.vtl | 2 +-
 terminology.md                   | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



[2/3] shiro-site git commit: incorrect words

Posted by bd...@apache.org.
incorrect words


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

Branch: refs/heads/master
Commit: a085314f0ff3d7f40cafd69e1abf35e6f0e986ff
Parents: 64f18f1
Author: You Kaichao <yo...@126.com>
Authored: Sat Aug 12 16:37:37 2017 +0800
Committer: You Kaichao <yo...@126.com>
Committed: Sat Aug 12 16:37:37 2017 +0800

----------------------------------------------------------------------
 cachemanager.md                  | 2 +-
 core.md                          | 2 +-
 cryptography.md                  | 2 +-
 documentation-help-block.md      | 2 +-
 java-annotations.md              | 2 +-
 reference.md                     | 2 +-
 spring-xml.md                    | 2 +-
 spring.md                        | 2 +-
 templates/macros/lend-a-hand.vtl | 2 +-
 terminology.md                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/cachemanager.md
----------------------------------------------------------------------
diff --git a/cachemanager.md b/cachemanager.md
index a762386..cf29371 100644
--- a/cachemanager.md
+++ b/cachemanager.md
@@ -36,7 +36,7 @@ Finally note that [`AuthorizingRealm`](static/current/apidocs/org/apache/shiro/r
 <a name="CacheManager-Lendahandwithdocumentation"></a>
 ###Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/core.md
----------------------------------------------------------------------
diff --git a/core.md b/core.md
index 1d9419b..427a36b 100644
--- a/core.md
+++ b/core.md
@@ -18,7 +18,7 @@ First we'll present Shiro's architecture and a summary of each core concept.  Th
 <a name="Core-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html).
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/cryptography.md
----------------------------------------------------------------------
diff --git a/cryptography.md b/cryptography.md
index 31c4031..d6464d7 100644
--- a/cryptography.md
+++ b/cryptography.md
@@ -3,7 +3,7 @@ TODO. In the mean time, you can read more about [Shiro's Crypography Features](c
 <a name="Cryptography-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
 <input type="hidden" id="ghEditPage" value="cryptography.md"></input>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/documentation-help-block.md
----------------------------------------------------------------------
diff --git a/documentation-help-block.md b/documentation-help-block.md
index 397d007..ebff287 100644
--- a/documentation-help-block.md
+++ b/documentation-help-block.md
@@ -1,7 +1,7 @@
 <a name="DocumentationHelpBlock-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
 <input type="hidden" id="ghEditPage" value="documentation-help-block.md"></input>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/java-annotations.md
----------------------------------------------------------------------
diff --git a/java-annotations.md b/java-annotations.md
index 21dc149..27ef248 100644
--- a/java-annotations.md
+++ b/java-annotations.md
@@ -15,7 +15,7 @@ Once you have AOP enabled in our application, you can use Shiro's set of annotat
 <a name="JavaAnnotations-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
 <input type="hidden" id="ghEditPage" value="java-annotations.md"></input>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/reference.md
----------------------------------------------------------------------
diff --git a/reference.md b/reference.md
index 99a362f..411eeab 100644
--- a/reference.md
+++ b/reference.md
@@ -50,7 +50,7 @@
 
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html).
 

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/spring-xml.md
----------------------------------------------------------------------
diff --git a/spring-xml.md b/spring-xml.md
index b914945..9158d40 100644
--- a/spring-xml.md
+++ b/spring-xml.md
@@ -199,7 +199,7 @@ For example, if you were using HTTP-based remoting (notice the property referenc
 <a name="SpringXml-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
 <input type="hidden" id="ghEditPage" value="spring-xml.md"></input>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/spring.md
----------------------------------------------------------------------
diff --git a/spring.md b/spring.md
index 7f673ff..c6d3dec 100644
--- a/spring.md
+++ b/spring.md
@@ -197,7 +197,7 @@ For example, if you were using HTTP-based remoting (notice the property referenc
 <a name="Spring-Lendahandwithdocumentation"></a>
 ##Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the [User Forum](http://shiro-user.582556.n2.nabble.com/) or the [User Mailing List](mailing-lists.html "Mailing Lists").
 <input type="hidden" id="ghEditPage" value="spring.md"></input>

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/templates/macros/lend-a-hand.vtl
----------------------------------------------------------------------
diff --git a/templates/macros/lend-a-hand.vtl b/templates/macros/lend-a-hand.vtl
index 4bcd662..68b8c49 100644
--- a/templates/macros/lend-a-hand.vtl
+++ b/templates/macros/lend-a-hand.vtl
@@ -1,7 +1,7 @@
 #macro(lendAHandDoc)
 <h2><a name="Lendahandwithdocumentation"></a>Lend a hand with documentation </h2>
 
-<p>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'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>While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider correcting, 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 submit a pull-request by clicking on the <code>Edit</code> link below, send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p>
 #end

http://git-wip-us.apache.org/repos/asf/shiro-site/blob/a085314f/terminology.md
----------------------------------------------------------------------
diff --git a/terminology.md b/terminology.md
index 9433e64..79c60a3 100644
--- a/terminology.md
+++ b/terminology.md
@@ -76,7 +76,7 @@ A <em>Subject</em> is just fancy security term that basically means a security-s
 <a name="Terminology-Lendahandwithdocumentation"></a>
 ###Lend a hand with documentation
 
-While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'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.
+While we hope this documentation helps you with the work you're doing with Apache Shiro, the community is improving and expanding the documentation all the time.  If you'd like to help the Shiro project, please consider correcting, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.
 
 The easiest way to contribute your documentation is to send it to the <a class="external-link" href="http://shiro-user.582556.n2.nabble.com/" rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.