You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2014/05/08 12:12:43 UTC
svn commit: r1593225 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/
oak-doc/src/site/markdown/security/accesscontrol.md
oak-doc/src/site/markdown/security/accesscontrol/restriction.md
oak-doc/src/site/markdown/security/overview.md
Author: mduerig
Date: Thu May 8 10:12:43 2014
New Revision: 1593225
URL: http://svn.apache.org/r1593225
Log:
OAK-301 : oak docu
Merged r1593211
Added:
jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol/restriction.md
- copied unchanged from r1593211, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol/restriction.md
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md
jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1593211
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1593211
Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md?rev=1593225&r1=1593224&r2=1593225&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md (original)
+++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md Thu May 8 10:12:43 2014
@@ -22,4 +22,4 @@ _TODO_
### Differences wrt Jackrabbit 2.x
-see the corresponding [documentation](../differences_accesscontrol.html).
\ No newline at end of file
+see the corresponding [documentation](../differences_accesscontrol.html).
Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md?rev=1593225&r1=1593224&r2=1593225&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md (original)
+++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md Thu May 8 10:12:43 2014
@@ -28,11 +28,14 @@ The Oak Security Layer
* [Pre-Authentication](authentication/preauthentication.html)
* [Access Control](accesscontrol.html)
* [Differences wrt Jackrabbit 2.x](accesscontrol/differences.html)
-* [Permission Evaluation](permission.html)
+ * [Restriction Management](accesscontrol/restriction.html)
+* [Permissions](permission.html)
* [Differences wrt Jackrabbit 2.x](permission/differences.html)
+ * [Permission Evaluation in Detail](permission/evaluation.html)
* [Privilege Management](privilege.html)
* [Differences wrt Jackrabbit 2.x](privilege/differences.html)
* [Principal Management](principal.html)
* [Differences wrt Jackrabbit 2.x](principal/differences.html)
* [User Management](user.html)
* [Differences wrt Jackrabbit 2.x](user/differences.html)
+ * [Authorizable Actions](user/authorizableaction.html)