Removed duplicated text

Author: wouterj

bundles/routing.rst

@@ -314,6 +314,24 @@ as we set a content on the route. The content could be used to define an intro
 section that is the same for each project or other shared data. If you don't
 need content, you can just not set it in the document.
 
+.. _component-route-generator-and-locales:
+
+.. sidebar:: ContentAwareGenerator and locales
+
+    You can use the ``_locale`` default value in a Route to create one Route
+    per locale, all referencing the same multilingual content instance. The
+    ``ContentAwareGenerator`` respects the ``_locale`` when generating routes
+    from content instances. When resolving the route, the ``_locale`` gets
+    into the request and is picked up by the Symfony2 locale system.
+
+.. note::
+
+    Under PHPCR-ODM, Routes should never be translatable documents, as one
+    Route document represents one single url, and serving several translations
+    under the same url is not recommended.
+
+    If you need translated URLs, make the locale part of the route name.
+
 Sonata Admin Configuration
 --------------------------
 

components/routing.rst

@@ -7,8 +7,7 @@ Routing
 
 The Symfony CMF Routing component extends the Symfony2 core routing
 component. Even though it has Symfony in its name, it does not need the full
-Symfony2 Framework and can be used in standalone projects. For integration
-with the Symfony2 Framework, we provide :doc:`../bundles/routing`.
+Symfony2 Framework and can be used in standalone projects.
 
 At the core of the Symfony CMF Routing component is the `ChainRouter`_. The
 ChainRouter tries to match a request with each of its registered routers,
@@ -297,7 +296,8 @@ Routing Component and is called
 You can create your own final matcher by implementing
 ``Symfony\Cmf\Component\Routing\NestedMatcher\FinalMatcherInterface``.
 
-The final matcher is set using the second argument of the constructor::
+The final matcher is set using the second argument of the constructor of the
+``NestedMatcher``::
 
     use Symfony\Cmf\Component\Routing\NestedMatcher\UrlMatcher
     // ...
@@ -330,13 +330,13 @@ optional second argument to provide the priority.
 Linking a Route with a Content
 ..............................
 
-Depending on your application's logic, a requested url may have associated
-content from the database. Those Routes should implement the
-``RouteObjectInterface`` and can optionally return a model instance. If you
-configure the ``RouteContentEnhancer``, it will included that content in the
-match array, using the ``_content`` key. Notice that a Route can implement the
-above mentioned interface but still not to return any model instance, in which
-case no associated object will be returned.
+Depending on your application's logic, a requested url may have an associated
+content object. A route for such URL may implement the ``RouteObjectInterface``
+to return a content object if present. If you configure the
+``RouteContentEnhancer``, it will included that content in the match array,
+using the ``_content`` key. Notice that a Route can implement the above
+mentioned interface but still not to return any model instance, in which case
+no associated object will be returned.
 
 Furthermore, routes that implement this interface can also provide a custom
 Route name. The key returned by ``getRouteKey`` will be used as route name
@@ -354,7 +354,7 @@ Redirections
 
 You can build redirections by implementing the ``RedirectRouteInterface``.
 It can redirect to an absolute URI, a named Route that can be generated by any
-Router in the chain and to another Route object provided by the Route.
+Router in the chain or to another Route object provided by the Route.
 
 Notice that the actual redirection logic is not handled by the bundle. You
 should implement your own logic to handle the redirection. For an example of
@@ -371,19 +371,18 @@ able to generate a matching URL.
 
 Beside ``RequestMatcherInterface`` and ``UrlMatcherInterface`` to match a
 Request/URL to its corresponding parameters, the ``DynamicRouter`` also uses
-an ``UrlGeneratorInterface`` instance, which allows it to generate an URL from
+a ``UrlGeneratorInterface`` instance, which allows it to generate an URL from
 a Route.
 
 The included ``ProviderBasedGenerator`` extends Symfony2's default
-:class:`Symfony\\Component\\routing\\Generator\\UrlGenerator`
-(which, in turn, implements ``UrlGeneratorInterface``) and - if the name is
-not already a ``Route`` object - loads the Route from the
-Route provider. It then lets the core logic generate the URL from
-that Route.
+:class:`Symfony\\Component\\routing\\Generator\\UrlGenerator` (which, in turn,
+implements ``UrlGeneratorInterface``) and - if the name is not already a
+``Route`` object - loads the Route from the Route provider. It then lets the
+core logic generate the URL from that Route.
 
 The component also includes the ``ContentAwareGenerator``, which extends the
 ``ProviderBasedGenerator`` to check if the name is an object implementing
-``RouteAwareInterface`` and, if so, gets the Route from the content.
+``RouteReferrersReadInterface`` and, if so, gets the Route from the content.
 Using the ``ContentAwareGenerator``, you can generate urls for your content in
 three ways:
 
@@ -392,34 +391,13 @@ three ways:
 * Or provide an implementation of ``ContentRepositoryInterface`` and pass the id
   of the content object as parameter ``content_id`` and ``null`` as $name.
 
-.. _component-route-generator-and-locales:
-
-.. sidebar:: ContentAwareGenerator and locales
-
-    You can use the ``_locale`` default value in a Route to create one Route
-    per locale, all referencing the same multilingual content instance. The
-    ``ContentAwareGenerator`` respects the ``_locale`` when generating routes
-    from content instances. When resolving the route, the ``_locale`` gets
-    into the request and is picked up by the Symfony2 locale system.
-
-.. note::
-
-    Under PHPCR-ODM, Routes should never be translatable documents, as one
-    Route document represents one single url, and serving several translations
-    under the same url is not recommended.
-
-    If you need translated URLs, make the locale part of the route name.
-
 Symfony2 integration
 --------------------
 
-Like mentioned before, this bundle was designed to only require certain parts
-of Symfony2. However, if you wish to use it as part of your Symfony CMF project,
-an integration bundle is also available. We strongly recommend that you take
-a look at ":doc:`../bundles/routing`" in the bundles documentation.
-
-We strongly recommend reading Symfony2's `Routing`_ component documentation
-page, as it's the base of this bundle's implementation.
+As mentioned before, this component was designed to use independently of the
+Symfony2 framework.  However, if you wish to use it as part of your Symfony
+CMF project, an integration bundle is also available. Read more about the
+RoutingBundle in ":doc:`../bundles/routing`" in the bundles documentation.
 
 .. _`Install it via Composer`: http://symfony.com/doc/current/components/using_components.html
 .. _`Packagist`: https://packagist.org/packages/symfony-cmf/routing