svn commit: r1460645 - in /incubator/marmotta/site/trunk/content/markdown: configuration.md platform/security-module.md

[wi...@apache.org]

Author: wikier
Date: Mon Mar 25 13:09:14 2013
New Revision: 1460645

URL: http://svn.apache.org/r1460645
Log:
simplifying security configuration

Modified:
    incubator/marmotta/site/trunk/content/markdown/configuration.md
    incubator/marmotta/site/trunk/content/markdown/platform/security-module.md

Modified: incubator/marmotta/site/trunk/content/markdown/configuration.md
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/markdown/configuration.md?rev=1460645&r1=1460644&r2=1460645&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/markdown/configuration.md (original)
+++ incubator/marmotta/site/trunk/content/markdown/configuration.md Mon Mar 25 13:09:14 2013
@@ -44,16 +44,10 @@ open to intrusions), there are some cons
 
 
     security.permission.admin_ui.pattern = /.*/admin/.*
-    security.permission.admin_ui.methods = GET
-    security.permission.admin_ui.methods = POST
-    security.permission.admin_ui.methods = PUT
-    security.permission.admin_ui.methods = OPTIONS
+    security.permission.admin_ui.methods = GET,POST,PUT,OPTIONS
     security.permission.admin_ui.roles = manager
     security.permission.admin_ui.priority = 5
     security.restriction.admin_ui.pattern = /.*/admin/.*
-    security.restriction.admin_ui.methods = GET
-    security.restriction.admin_ui.methods = POST
-    security.restriction.admin_ui.methods = PUT
-    security.restriction.admin_ui.methods = OPTIONS
+    security.restriction.admin_ui.methods = GET,POST,PUT,OPTIONS
     security.restriction.admin_ui.priority = 4
 

Modified: incubator/marmotta/site/trunk/content/markdown/platform/security-module.md
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/markdown/platform/security-module.md?rev=1460645&r1=1460644&r2=1460645&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/markdown/platform/security-module.md (original)
+++ incubator/marmotta/site/trunk/content/markdown/platform/security-module.md Mon Mar 25 13:09:14 2013
@@ -47,7 +47,7 @@ Where:
   * `{TYPE}` is the type of control, which can be `permission` for granting permission the requests matching this rule or `restriction` for restricting.
   * `{NAME}` is an arbitrary label for naming the rule, which should be unique in combination with the type.
   * `{PATTERN}` is the regular expression pattern which this rule matches.
-  * `{METHOD}` is the HTTP method this rule applies (`HEAD`, `OPTIONS`, `GET`, `POST`, `PUT` or `DELETE`). If the rules applies to more than one method, additional property lines should be added for each one.
+  * `{METHOD}` is the HTTP method this rule applies (`HEAD`, `OPTIONS`, `GET`, `POST`, `PUT` or `DELETE`). If the rules applies to more than one method, you can add all methods separated by commas or add additional property lines for each method, both options are valid.
   * `{PRIORITY}` is the the priority of this rule in the access control list.
 
 The system evaluates the rules ordered by priority, allowing or rejecting access