Skip to content
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.

Sign up for GitHub

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

move assets options from templating to assets section and add base_path documentation #6172

Merged
merged 7 commits into from
Feb 21, 2016
+211 −231
Merged

move assets options from templating to assets section and add base_path documentation #6172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd0efed
[WIP] moving assets version and version_format options under assets s…
Jan 20, 2016
46156f4
put anchor back
Feb 15, 2016
5969b80
move packages and base_urls to assets section
Feb 16, 2016
61403e7
remove unused reference
Feb 16, 2016
cc12d7f
change order of assets configuration options
Feb 20, 2016
5d06eb5
document base_path option
Feb 20, 2016
2a905d8
small fixes for xml configuration examples
Feb 20, 2016
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
4 changes: 2 additions & 2 deletions book/templating.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,7 @@ being used and generating the correct paths accordingly.
Additionally, if you use the ``asset`` function, Symfony can automatically
append a query string to your asset, in order to guarantee that updated static
assets won't be cached when deployed. For example, ``/images/logo.png`` might
look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-framework-assets-version`
look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
configuration option.

.. _`book-templating-version-by-asset`:
Expand All @@ -1088,7 +1088,7 @@ if you are using Twig (or the fourth argument if you are using PHP) to the desir
) ?>" alt="Symfony!" />

If you don't give a version or pass ``null``, the default package version
(from :ref:`ref-framework-assets-version`) will be used. If you pass ``false``,
(from :ref:`reference-framework-assets-version`) will be used. If you pass ``false``,
versioned URL will be deactivated for this asset.

If you need absolute URLs for assets, you can set the ``absolute`` argument
Expand Down
2 changes: 1 addition & 1 deletion cookbook/assetic/asset_management.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ done from the template and is relative to the public document root:
Symfony also contains a method for cache *busting*, where the final URL
generated by Assetic contains a query parameter that can be incremented
via configuration on each deployment. For more information, see the
:ref:`ref-framework-assets-version` configuration option.
:ref:`reference-framework-assets-version` configuration option.

.. _cookbook-assetic-dumping:

Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/assetic.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Full Default Configuration
some_filter: []
workers:
# see https://github.com/symfony/AsseticBundle/pull/119
# Cache can also be busted via the framework.templating.assets_version
# Cache can also be busted via the framework.assets.version
# setting - see the "framework" configuration section
cache_busting:
enabled: false
Expand Down
Loading