From 43d206fdd3d6cbc4949aecba286443480a659ceb Mon Sep 17 00:00:00 2001 From: Christian Morgan Date: Fri, 15 Mar 2013 14:05:10 +0000 Subject: [PATCH] Fixed plural version of URLs where it was referred to as "URL's" --- book/routing.rst | 2 +- reference/configuration/framework.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/book/routing.rst b/book/routing.rst index 5b857dc1340..83df5398ea9 100644 --- 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`` diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 52382977696..deb67595a36 100644 --- 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: