Skip to content

Fix all lowercase "url" notations to uppercase "URL" #3167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/routing/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions components/templating/helpers/assetshelper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contributing/documentation/format.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cookbook/cache/varnish.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions cookbook/form/create_form_type_extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cookbook/profiler/matchers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion cookbook/security/custom_authentication_provider.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions reference/twig_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ Functions
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
| ``logout_path(key)`` | This will generate the relative logout URL for the given firewall |
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute url |
| ``logout_url(key)`` | Equal to ``logout_path(...)`` but this will generate an absolute URL |
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
| ``path(name, parameters = {})`` | Get a relative url for the given route, more information in |
| ``path(name, parameters = {})`` | Get a relative URL for the given route, more information in |
| | ":ref:`book-templating-pages`". |
+----------------------------------------------------+--------------------------------------------------------------------------------------------+
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute url |
| ``url(name, parameters = {})`` | Equal to ``path(...)`` but it generates an absolute URL |
+----------------------------------------------------+--------------------------------------------------------------------------------------------+

Filters
Expand Down