Merge pull request symfony#3167 from bicpi/fix_url_notations

weaverryan · weaverryan · commit 8c33ddceb933 · 2013-11-07T05:32:04.000-08:00
Fix all lowercase "url" notations to uppercase "URL"
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
@@ -127,7 +127,7 @@ does *not* match, because "foo" fails the month wildcard.
 
 .. tip::
 
-    If you want to match all urls which start with a certain path and end in an
+    If you want to match all URLs which start with a certain path and end in an
     arbitrary suffix you can use the following route definition::
 
         $route = new Route(
diff --git a/components/templating/helpers/assetshelper.rst b/components/templating/helpers/assetshelper.rst
@@ -40,12 +40,12 @@ Now, if you use the helper, everything will be prefixed with ``/foo/bar``:
 Absolute Urls
 -------------
 
-You can also specify a url to use in the second parameter of the constructor::
+You can also specify a URL to use in the second parameter of the constructor::
 
     // ...
     $templateEngine->set(new AssetsHelper(null, 'http://cdn.example.com/'));
 
-Now urls are rendered like ``http://cdn.example.com/images/logo.png``.
+Now URLs are rendered like ``http://cdn.example.com/images/logo.png``.
 
 Versioning
 ----------
@@ -57,7 +57,7 @@ can be specified in the third argument::
     // ...
     $templateEngine->set(new AssetsHelper(null, null, '328rad75'));
 
-Now, every url is suffixed with ``?328rad75``. If you want to have a different
+Now, every URL is suffixed with ``?328rad75``. If you want to have a different
 format, you can specify the new format in fourth argument. It's a string that
 is used in :phpfunction:`sprintf`. The first argument is the path and the
 second is the version. For instance, ``%s?v=%s`` will be rendered as
diff --git a/contributing/documentation/format.rst b/contributing/documentation/format.rst
@@ -208,7 +208,7 @@ Installing the Sphinx extensions
     # use PHP as the primary domain
     primary_domain = 'php'
 
-    # set url for API links
+    # set URL for API links
     api_url = 'http://api.symfony.com/master/%s'
 
 .. _reStructuredText:        http://docutils.sourceforge.net/rst.html
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst
@@ -178,7 +178,7 @@ that will invalidate the cache for a given resource:
 Routing and X-FORWARDED Headers
 -------------------------------
 
-To ensure that the Symfony Router generates urls correctly with Varnish,
+To ensure that the Symfony Router generates URLs correctly with Varnish,
 proper ```X-Forwarded``` headers must be added so that Symfony is aware of
 the original port number of the request. Exactly how this is done depends
 on your setup. As a simple example, Varnish and your web server are on the
diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst
@@ -163,13 +163,13 @@ database)::
         // ...
 
         /**
-         * Get the image url
+         * Get the image URL
          *
          * @return null|string
          */
         public function getWebPath()
         {
-            // ... $webPath being the full image url, to be used in templates
+            // ... $webPath being the full image URL, to be used in templates
 
             return $webPath;
         }
@@ -181,11 +181,11 @@ the ``file`` form type:
 #. Override the ``setDefaultOptions`` method in order to add an image_path
    option;
 #. Override the ``buildForm`` and ``buildView`` methods in order to pass the image
-   url to the view.
+   URL to the view.
 
 The logic is the following: when adding a form field of type ``file``,
 you will be able to specify a new option: ``image_path``. This option will
-tell the file field how to get the actual image url in order to display
+tell the file field how to get the actual image URL in order to display
 it in the view::
 
     // src/Acme/DemoBundle/Form/Extension/ImageTypeExtension.php
@@ -220,7 +220,7 @@ it in the view::
         }
 
         /**
-         * Pass the image url to the view
+         * Pass the image URL to the view
          *
          * @param FormView $view
          * @param FormInterface $form
diff --git a/cookbook/profiler/matchers.rst b/cookbook/profiler/matchers.rst
@@ -50,7 +50,7 @@ use this configuration:
 
 You can also set a ``path`` option to define the path on which the profiler
 should be enabled. For instance, setting it to ``^/admin/`` will enable the
-profiler only for the ``/admin/`` urls.
+profiler only for the ``/admin/`` URLs.
 
 Creating a Custom Matcher
 -------------------------
diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst
@@ -178,7 +178,7 @@ a 403 Response is returned.
     :class:`Symfony\\Component\\Security\\Http\\Firewall\\AbstractAuthenticationListener`
     class, is a very useful base class which provides commonly needed functionality
     for security extensions. This includes maintaining the token in the session,
-    providing success / failure handlers, login form urls, and more. As WSSE
+    providing success / failure handlers, login form URLs, and more. As WSSE
     does not require maintaining authentication sessions or login forms, it
     won't be used for this example.
 
