Merge pull request #543 from symfony-cmf/proofread

Proof reading fixes for RA docs

Author: dantleech

bundles/routing_auto/conflict_resolvers.rst

@@ -5,8 +5,7 @@ Conflict Resolvers
 ==================
 
 Conflict resolvers are invoked when the system detects that a newly generated
-route would conflict with an route already existing in the route repository.
-The task of a conflict resolver is to decide what happends in such cases.
+route would conflict with a route already existing in the route repository.
 
 This section details the conflict resolvers which are provided by default.
 
@@ -65,7 +64,7 @@ To create a custom conflict resolver, you have to implement
 ``resolveConflict`` which has access to the ``UriContext``. It returns the new
 route.
 
-The following example will append an unique string to the URI to resolve a
+The following example will append a unique string to the URI to resolve a
 conflict::
 
     namespace Symfony\Cmf\Component\RoutingAuto\ConflictResolver;

bundles/routing_auto/defunct_route_handlers.rst

@@ -38,9 +38,10 @@ action.
 leave_redirect
 --------------
 
-The leave redirect will automatically update old routes to redirect the browser
-to the route which has replaced it. This effectively means you can rename your
-objects without worrying about users recieving HTTP 404 responses.
+The ``LeaveRedirectDefunctRouteHandler`` will automatically update old routes
+to redirect the browser to the route which has replaced it. This effectively
+means you can rename your objects without worrying about users receiving HTTP
+404 responses.
 
 The handler will replace the old route with a ``RedirectRoute`` at the same
 path.
@@ -108,7 +109,7 @@ Creating a Custom Defunct Route Handler
 To create a custom default route handler, you have to implement
 ``DefunctRouteHandlerInterface``. This requires a method ``handleDefunctRoutes()``.
 
-They are not all-together trivial - the following handler removes old routes and is
+They are not alltogether trivial - the following handler removes old routes and is
 the default handler::
 
     namespace Symfony\Cmf\Component\RoutingAuto\DefunctRouteHandler;

bundles/routing_auto/token_providers.rst

@@ -6,7 +6,7 @@ Token Providers
 
 Token providers provide values for the tokens specified in the URI schemas.
 Such values can be derived form the object for which the route is being
-generated or from the environment (e.g. the you could use the current locale in
+generated or from the environment (e.g. you could use the current locale in
 the route).
 
 
@@ -18,14 +18,6 @@ The ``content_method`` provider allows the content object (e.g. a forum
 method as it allows the content document to do whatever it can to produce the
 route.
 
-Options
-~~~~~~~
-
-``method``
-    **required** Method used to return the route name/path/path elements.
-``slugify``
-    If the return value should be slugified, default is ``true``.
-
 .. configuration-block::
 
     .. code-block:: yaml
@@ -101,7 +93,7 @@ content_locale
 --------------
 
 The ``content_locale`` provider will provide the locale (e.g. ``fr``, ``de``,
-etc) from the subject object. It ultimately it determines the locale from the 
+etc) from the subject object. It ultimately determines the locale from the
 storage specific adapter - so it is dependent upon the adapter supporting this
 feature.