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:36:24 UTC
[4/4] shiro-site git commit: Merge remote-tracking branch
'origin/pr-35'
Merge remote-tracking branch 'origin/pr-35'
Fixes #35
Project: http://git-wip-us.apache.org/repos/asf/shiro-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro-site/commit/6817cb0b
Tree: http://git-wip-us.apache.org/repos/asf/shiro-site/tree/6817cb0b
Diff: http://git-wip-us.apache.org/repos/asf/shiro-site/diff/6817cb0b
Branch: refs/heads/master
Commit: 6817cb0b86fcdbbd2c53c4ce28e74c7dce225ca7
Parents: 59c35e3 67d0844
Author: Brian Demers <bd...@apache.org>
Authored: Fri May 4 15:35:14 2018 -0400
Committer: Brian Demers <bd...@apache.org>
Committed: Fri May 4 15:35:14 2018 -0400
----------------------------------------------------------------------
cryptography-features.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro-site/blob/6817cb0b/cryptography-features.md
----------------------------------------------------------------------
diff --cc cryptography-features.md
index 2ea4ddb,97dc2fa..1ebb72e
--- a/cryptography-features.md
+++ b/cryptography-features.md
@@@ -13,9 -13,9 +13,9 @@@
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4d66ef016022c3bd"></script>
-Cryptography is the practice of protecting information from undesired access by hiding it or converting it into nonsense so know one else can read it. Shiro focuses on two core elements of Cryptography: ciphers that encrypt data like email using a public or private key, and hashes (aka message digests) that irreversibly encrypt data like passwords.
+Cryptography is the practice of protecting information from undesired access by hiding it or converting it into nonsense so no one else can read it. Shiro focuses on two core elements of Cryptography: ciphers that encrypt data like email using a public or private key, and hashes (aka message digests) that irreversibly encrypt data like passwords.
- Shiro Cryptography's primary goal is take what has traditionally be an extremely complex field and make it easy for the rest of us while providing a robust set of cryptography features.
+ Shiro Cryptography's primary goal is take what has traditionally been an extremely complex field and make it easy for the rest of us while providing a robust set of cryptography features.
<a name="CryptographyFeatures-SimplicityFeatures"></a>
##Simplicity Features