Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 33d18c5f17b5 · 2013-10-10T07:47:51.000-04:00
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -52,7 +52,7 @@ front controller that can be used with any environment.)
 When the front controller initializes the kernel, it provides two parameters:
 the environment, and also whether the kernel should run in debug mode.
 To make your application respond faster, Symfony2 maintains a cache under the
-``app/cache/`` directory. When in debug mode is enabled (such as ``app_dev.php``
+``app/cache/`` directory. When debug mode is enabled (such as ``app_dev.php``
 does by default), this cache is flushed automatically whenever you make changes
 to any code or configuration. When running in debug mode, Symfony2 runs
 slower, but your changes are reflected without having to manually clear the
diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst
@@ -66,7 +66,7 @@ To get an array of the constructor arguments for a definition you can use::
 or to get a single argument by its position::
 
     $definition->getArgument($index);
-    //e.g. $definition->getArgument(0) for the first argument
+    // e.g. $definition->getArgument(0) for the first argument
 
 You can add a new argument to the end of the arguments array using::
 
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -174,9 +174,9 @@ Rename
 :method:`Symfony\\Component\\Filesystem\\Filesystem::rename` is used to rename
 files and directories::
 
-    //rename a file
+    // rename a file
     $fs->rename('/tmp/processed_video.ogg', '/path/to/store/video_647.ogg');
-    //rename a directory
+    // rename a directory
     $fs->rename('/tmp/files', '/path/to/store/files');
 
 symlink
diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst
@@ -249,12 +249,17 @@ using the `Native*SessionHandler` classes, while
 :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\SessionHandlerProxy`
 will be used to wrap any custom save handlers, that implement :phpclass:`SessionHandlerInterface`.
 
-Under PHP 5.4 and above, all session handlers implement :phpclass:`SessionHandlerInterface`
+From PHP 5.4 and above, all session handlers implement :phpclass:`SessionHandlerInterface`
 including `Native*SessionHandler` classes which inherit from :phpclass:`SessionHandler`.
 
 The proxy mechanism allows you to get more deeply involved in session save handler
 classes. A proxy for example could be used to encrypt any session transaction
 without knowledge of the specific save handler.
 
+.. note::
+
+    Before PHP 5.4, you can only proxy user-land save handlers but not 
+    native PHP save handlers.
+
 .. _`php.net/session.customhandler`: http://php.net/session.customhandler
 .. _`php.net/session.configuration`: http://php.net/session.configuration
diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst
@@ -129,11 +129,11 @@ to ``ApacheRequest`` in ``web/app.php``::
 
     require_once __DIR__.'/../app/bootstrap.php.cache';
     require_once __DIR__.'/../app/AppKernel.php';
-    //require_once __DIR__.'/../app/AppCache.php';
+    // require_once __DIR__.'/../app/AppCache.php';
 
     use Symfony\Component\HttpFoundation\ApacheRequest;
 
     $kernel = new AppKernel('prod', false);
     $kernel->loadClassCache();
-    //$kernel = new AppCache($kernel);
+    // $kernel = new AppCache($kernel);
     $kernel->handle(ApacheRequest::createFromGlobals())->send();
diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst
@@ -9,7 +9,7 @@ cannot only be based on the person (``Token``) who is requesting access, but
 also involve a domain object that access is being requested for. This is where
 the ACL system comes in.
 
-.. sidebar:: Alternatives to ACLS
+.. sidebar:: Alternatives to ACLs
 
     Using ACL's isn't trivial, and for simpler use cases, it may be overkill.
     If your permission logic could be described by just writing some code (e.g.
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -649,7 +649,7 @@ this:
 
 .. code-block:: text
 
-    $ mysql> select * from acme_users;
+    $ mysql> select * from acme_role;
     +----+-------+------------+
     | id | name  | role       |
     +----+-------+------------+
