@@ -523,7 +523,7 @@ the correct values of a number of field options.
 And though you'll need to manually add your server-side validation, these
 field type options can then be guessed from that information.
 
-* ``required``: The ``required`` option can be guessed based off of the validation
+* ``required``: The ``required`` option can be guessed based on the validation
 rules (i.e. is the field ``NotBlank`` or ``NotNull``) or the Doctrine metadata
 (i.e. is the field ``nullable``). This is very useful, as your client-side
 validation will automatically match your validation rules.

@@ -203,7 +203,7 @@ that controller.
 
 The controller - ``AcmeHelloBundle:Hello:index`` is the *logical* name of
 the controller, and it maps to the ``indexAction`` method of a PHP class
-called ``Acme\HelloBundle\Controller\Hello``. Start by creating this file
+called ``Acme\HelloBundle\Controller\HelloController``. Start by creating this file
 inside your ``AcmeHelloBundle``::
 
 // src/Acme/HelloBundle/Controller/HelloController.php
@@ -274,7 +274,7 @@ An optional, but common, third step in the process is to create a template.
 Optional Step 3: Create the Template
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Templates allows you to move all of the presentation (e.g. HTML code) into
+Templates allow you to move all of the presentation (e.g. HTML code) into
 a separate file and reuse different portions of the page layout. Instead
 of writing the HTML inside the controller, render a template instead:
 
@@ -993,4 +993,4 @@ to rapidly develop applications.
 .. _`third-party bundles`: http://symfony2bundles.org/
 .. _`Symfony Standard Edition`: http://symfony.com/download
 .. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/2.0/mod/mod_dir.html
-.. _`Nginx HttpCoreModule location documentation`: http://wiki.nginx.org/HttpCoreModule#location
+.. _`Nginx HttpCoreModule location documentation`: http://wiki.nginx.org/HttpCoreModule#location

@@ -221,7 +221,7 @@ workflow looks like the following from inside a controller::
 
 public function updateAction(Request $request)
 {
-$author = new Acme\BlogBundle\Entity\Author();
+$author = new Author();
 $form = $this->createForm(new AuthorType(), $author);
 
 if ($request->getMethod() == 'POST') {

@@ -199,6 +199,7 @@ added above:
 
 .. code-block:: php
 
-$acl->insertObjectAce(new UserSecurityIdentity('johannes'), $mask);
+$identity = new UserSecurityIdentity('johannes', 'Acme\UserBundle\Entity\User');
+$acl->insertObjectAce($identity, $mask);
 
 The user is now allowed to view, edit, delete, and un-delete objects.