merged branch robincawser/patch-1 (PR #583)

This PR was merged into the master branch.

Commits
-------

661d632e Update doc/providers/security.rst

Discussion
----------

Update doc/providers/security.rst

Fixed spelling mistake

---------------------------------------------------------------------------

by igorw at 2013-01-15T13:26:30Z

👍

doc/providers/security.rst

@@ -101,7 +101,7 @@ is known, you can get it with a call to ``getUser()``::
         $user = $token->getUser();
     }
 
-The user can be a string, and object with a ``__toString()`` method, or an
+The user can be a string, an object with a ``__toString()`` method, or an
 instance of `UserInterface
 <http://api.symfony.com/master/Symfony/Component/Security/Core/User/UserInterface.html>`_.