Fixed the description of the new "base_urls" option

javiereguiluz · javiereguiluz · commit 49221c2c2cca · 2015-04-16T16:34:50.000+02:00
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -427,23 +427,36 @@ assets
 base_urls
 .........
 
-**default**: ``{ http: [], ssl: [] }``
+**default**: ``[]``
 
 .. versionadded:: 2.7
     The ``base_urls`` option was introduced in Symfony 2.7. Prior to Symfony
     2.7, the option was called ``assets_base_urls`` and it was defined under
     the ``templating`` key.
 
-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 URLs are provided, Symfony
-will select one from the collection each time it generates an asset's path.
+This option allows you to define the base URLs used to generate the asset's paths.
+A string value may be provided instead of a single-element array. If multiple base
+URLs are provided, Symfony selects one from the collection each time it generates
+an asset's path.
 
-For your convenience, ``base_urls`` can be set directly with a string or array of
-strings, which will be automatically organized into collections of base 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.
-URLs starting with ``http://`` will only be added to the ``http`` collection.
+The selection of the base URL is request context-sensitive. If the rendered page
+is secure, assets are only served via ``https://`` or protocol-relative (``//``)
+URLs. If the page is non-secure, all provided URLs will be considered (even secure
+``htpps://`` URLs).
+
+If your ``base_urls`` option is the following:
+
+.. code-block:: yaml
+
+    framework:
+        assets:
+            base_urls:
+                - 'http://static.example.com/'
+                - '//assets.example.com/'
+                - 'https://contents.example.com'
+
+Assets loaded in non-secure pages will use any of the three URLs. However, assets
+loaded in secure pages will only use the last two URLs defined.
 
 .. _ref-framework-assets-version:
 
