symfony · kevintweber · Mar 14, 2013 · Mar 14, 2013 · Mar 15, 2013 · Mar 17, 2013
diff --git a/book/routing.rst b/book/routing.rst
@@ -476,7 +476,7 @@ Take a quick look at the routes that have been created so far:
         return $collection;
 
 Can you spot the problem? Notice that both routes have patterns that match
-URL's that look like ``/blog/*``. The Symfony router will always choose the
+URLs that look like ``/blog/*``. The Symfony router will always choose the
 **first** matching route it finds. In other words, the ``blog_show`` route
 will *never* be matched. Instead, a URL like ``/blog/my-blog-post`` will match
 the first route (``blog``) and return a nonsense value of ``my-blog-post``
@@ -763,6 +763,7 @@ a slash. URLs matching this route might look like:
 
 * ``/articles/en/2010/my-post``
 * ``/articles/fr/2010/my-post.rss``
+* ``/articles/en/2013/my-latest-post.html``
 
 .. _book-routing-format-param:
 
@@ -1035,7 +1036,7 @@ the command by running the following from the root of your project.
 
     $ php app/console router:debug
 
-The command will print a helpful list of *all* the configured routes in
+This command will print a helpful list of *all* the configured routes in
 your application:
 
 .. code-block:: text
@@ -1054,6 +1055,19 @@ the route name after the command:
 
     $ php app/console router:debug article_show
 
+Likewise, if you want to test whether a URL matches a given route, you can
+use the ``router:match`` console command:
+
+.. code-block:: bash
+
+    $ php app/console router:match /blog/my-latest-post
+
+This command will print which route the URL matches.
+
+.. code-block:: text
+
+    Route "blog_show" matches
+
 .. index::
    single: Routing; Generating URLs
 

diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -325,6 +325,11 @@ The separator used in keys is typically ``_`` in Yaml and ``-`` in XML. For
 example, ``auto_connect`` in Yaml and ``auto-connect``. The normalization would
 make both of these ``auto_connect``.
 
+.. caution::
+
+    The target key will not be altered if it's mixed like 
+    ``foo-bar_moo`` or if it already exists.
+
 Another difference between Yaml and XML is in the way arrays of values may
 be represented. In Yaml you may have:
 

diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -153,7 +153,6 @@ You could then get your ``newsletter_manager`` service from the container
 like this::
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\DependencyInjection\Reference;
 
     $container = new ContainerBuilder();
 

diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -190,7 +190,7 @@ and :phpclass:`DOMNode` objects:
         $html = '';
 
         foreach ($crawler as $domElement) {
-            $html.= $domElement->ownerDocument->saveHTML();
+            $html .= $domElement->ownerDocument->saveHTML($domElement);
         }
 
 Form and Link support

diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
@@ -238,7 +238,7 @@ not to the property:
         # src/Acme/BlogBundle/Resources/config/validation.yml
         Acme\DemoBundle\Entity\AcmeEntity:
             constraints:
-                - ContainsAlphanumeric
+                ContainsAlphanumeric: ~
 
     .. code-block:: php-annotations
 

diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -162,16 +162,16 @@ assets_base_urls
 
 **default**: ``{ http: [], ssl: [] }``
 
-This option allows you to define base URL's to be used for assets referenced
+This option allows you to define base URLs to be used for assets referenced
 from ``http`` and ``ssl`` (``https``) pages. A string value may be provided in
-lieu of a single-element array. If multiple base URL's are provided, Symfony2
+lieu of a single-element array. If multiple base URLs are provided, Symfony2
 will select one from the collection each time it generates an asset's path.
 
 For your convenience, ``assets_base_urls`` can be set directly with a string or
 array of strings, which will be automatically organized into collections of base
-URL's for ``http`` and ``https`` requests. If a URL starts with ``https://`` or
+URLs for ``http`` and ``https`` requests. If a URL starts with ``https://`` or
 is `protocol-relative`_ (i.e. starts with `//`) it will be added to both
-collections. URL's starting with ``http://`` will only be added to the
+collections. URLs starting with ``http://`` will only be added to the
 ``http`` collection.
 
 .. _ref-framework-assets-version: