From 5c27ee7fbcb7760f459870202ac8a07051178442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 21:50:31 +0200 Subject: [PATCH 1/8] remove unwanted comma --- cookbook/security/acl_advanced.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/acl_advanced.rst b/cookbook/security/acl_advanced.rst index a0e65467d45..6744e185002 100644 --- a/cookbook/security/acl_advanced.rst +++ b/cookbook/security/acl_advanced.rst @@ -34,7 +34,7 @@ Object Identities The ACL system is completely decoupled from your domain objects. They don't even have to be stored in the same database, or on the same server. In order to achieve this decoupling, in the ACL system your objects are represented -through object identity objects. Everytime, you want to retrieve the ACL for a +through object identity objects. Everytime you want to retrieve the ACL for a domain object, the ACL system will first create an object identity from your domain object, and then pass this object identity to the ACL provider for further processing. From 7e4a506626afd79e3ed826b1b05a8f58398a1ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:10:41 +0200 Subject: [PATCH 2/8] This abbreviation felt sloppy; write like a sir --- cookbook/security/force_https.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/force_https.rst b/cookbook/security/force_https.rst index a57dcce6027..df14ecd87fe 100644 --- a/cookbook/security/force_https.rst +++ b/cookbook/security/force_https.rst @@ -7,7 +7,7 @@ How to force HTTPS or HTTP for Different URLs You can force areas of your site to use the ``HTTPS`` protocol in the security config. This is done through the ``access_control`` rules using the ``requires_channel`` option. For example, if you want to force all URLs starting with ``/secure`` -to use ``HTTPS`` then you could use the following config: +to use ``HTTPS`` then you could use the following configuration: .. configuration-block:: From 6f228290484d2e7074da7348d209805f06334291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:13:33 +0200 Subject: [PATCH 3/8] Add some punctuation here and there. --- cookbook/security/force_https.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/security/force_https.rst b/cookbook/security/force_https.rst index df14ecd87fe..1785e9c6607 100644 --- a/cookbook/security/force_https.rst +++ b/cookbook/security/force_https.rst @@ -5,7 +5,7 @@ How to force HTTPS or HTTP for Different URLs ============================================= You can force areas of your site to use the ``HTTPS`` protocol in the security -config. This is done through the ``access_control`` rules using the ``requires_channel`` +config. This is done through the ``access_control`` rules, using the ``requires_channel`` option. For example, if you want to force all URLs starting with ``/secure`` to use ``HTTPS`` then you could use the following configuration: @@ -33,7 +33,7 @@ to use ``HTTPS`` then you could use the following configuration: ), ), -The login form itself needs to allow anonymous access otherwise users will +The login form itself needs to allow anonymous access, otherwise users will be unable to authenticate. To force it to use ``HTTPS`` you can still use ``access_control`` rules by using the ``IS_AUTHENTICATED_ANONYMOUSLY`` role: From 128333eefce701807f99cf5c1a6fcc6db78d229b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:21:24 +0200 Subject: [PATCH 4/8] Try to produce something easier to understand. --- cookbook/security/form_login.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst index 3ea50f33672..6d68c80548f 100644 --- a/cookbook/security/form_login.rst +++ b/cookbook/security/form_login.rst @@ -105,10 +105,11 @@ Redirecting after Success You can change where the login form redirects after a successful login using the various config options. By default the form will redirect to the URL the user requested (i.e. the URL which triggered the login form being shown). -For example, if the user requested ``http://www.example.com/admin/post/18/edit`` -then after he/she will eventually be sent back to ``http://www.example.com/admin/post/18/edit`` -after successfully logging in. This is done by storing the requested URL -in the session. If no URL is present in the session (perhaps the user went +For example, if the user requested ``http://www.example.com/admin/post/18/edit``, +then after he/she successfully logs in, he/she will eventually be sent back to +``http://www.example.com/admin/post/18/edit``. +This is done by storing the requested URL in the session. +If no URL is present in the session (perhaps the user went directly to the login page), then the user is redirected to the default page, which is ``/`` (i.e. the homepage) by default. You can change this behavior in several ways. From c33c26ae791a6191e9fcb6b0acc3506a051451b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:24:32 +0200 Subject: [PATCH 5/8] avoid awkward awkward construction --- cookbook/security/form_login.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst index 6d68c80548f..4b19a8bbcbb 100644 --- a/cookbook/security/form_login.rst +++ b/cookbook/security/form_login.rst @@ -106,7 +106,7 @@ You can change where the login form redirects after a successful login using the various config options. By default the form will redirect to the URL the user requested (i.e. the URL which triggered the login form being shown). For example, if the user requested ``http://www.example.com/admin/post/18/edit``, -then after he/she successfully logs in, he/she will eventually be sent back to +then after they successfully logs in, they will eventually be sent back to ``http://www.example.com/admin/post/18/edit``. This is done by storing the requested URL in the session. If no URL is present in the session (perhaps the user went From bd26b41df13fc836d93510c73b800dc86ba66f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:32:11 +0200 Subject: [PATCH 6/8] Add some punctuation --- cookbook/security/form_login.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst index 4b19a8bbcbb..87664b0d34e 100644 --- a/cookbook/security/form_login.rst +++ b/cookbook/security/form_login.rst @@ -156,7 +156,7 @@ the following config: ), )); -Now, when no URL is set in the session users will be sent to ``/admin``. +Now, when no URL is set in the session, users will be sent to ``/admin``. Always Redirect to the Default Page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From d4f661f88090d3ffc05a29e095d2cc96964a0115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 22:32:25 +0200 Subject: [PATCH 7/8] It does not feel right without -ing --- cookbook/security/form_login.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst index 87664b0d34e..b5a188eddf4 100644 --- a/cookbook/security/form_login.rst +++ b/cookbook/security/form_login.rst @@ -330,7 +330,7 @@ option to another value. Redirecting on Login Failure ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In addition to redirect the user after a successful login, you can also set +In addition to redirecting the user after a successful login, you can also set the URL that the user should be redirected to after a failed login (e.g. an invalid username or password was submitted). By default, the user is redirected back to the login form itself. You can set this to a different URL with the From faaac70784d9454cb5da760b7482239a543b3986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 16 Oct 2012 23:17:12 +0200 Subject: [PATCH 8/8] Improve formatting --- cookbook/security/custom_authentication_provider.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst index 9559668490c..5b35743dd73 100644 --- a/cookbook/security/custom_authentication_provider.rst +++ b/cookbook/security/custom_authentication_provider.rst @@ -489,7 +489,7 @@ Configuration ~~~~~~~~~~~~~ You can add custom options under the ``wsse`` key in your security configuration. -For instance, the time allowed before expiring the Created header item, +For instance, the time allowed before expiring the ``Created`` header item, by default, is 5 minutes. Make this configurable, so different firewalls can have different timeout lengths.