Skip to content

Removed references to the web/ directory #8789

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

Merged
merged 1 commit into from
Nov 30, 2017
Merged

Removed references to the web/ directory #8789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions reference/configuration/framework.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,11 +1267,11 @@ package:
framework:
assets:
# this manifest is applied to every asset (including packages)
json_manifest_path: "%kernel.project_dir%/web/assets/manifest.json"
json_manifest_path: "%kernel.project_dir%/public/build/manifest.json"
packages:
foo_package:
# this package uses its own manifest (the default file is ignored)
json_manifest_path: "%kernel.project_dir%/web/assets/a_different_manifest.json"
json_manifest_path: "%kernel.project_dir%/public/build/a_different_manifest.json"
bar_package:
# this package uses the global manifest (the default file is used)
base_path: '/images'
Expand All @@ -1288,11 +1288,11 @@ package:

<framework:config>
<!-- this manifest is applied to every asset (including packages) -->
<framework:assets json-manifest-path="%kernel.project_dir%/web/assets/manifest.json">
<framework:assets json-manifest-path="%kernel.project_dir%/public/build/manifest.json">
<!-- this package uses its own manifest (the default file is ignored) -->
<framework:package
name="foo_package"
json-manifest-path="%kernel.project_dir%/web/assets/a_different_manifest.json" />
json-manifest-path="%kernel.project_dir%/public/build/a_different_manifest.json" />
<!-- this package uses the global manifest (the default file is used) -->
<framework:package
name="bar_package"
Expand All @@ -1307,11 +1307,11 @@ package:
$container->loadFromExtension('framework', array(
'assets' => array(
// this manifest is applied to every asset (including packages)
'json_manifest_path' => '%kernel.project_dir%/web/assets/manifest.json',
'json_manifest_path' => '%kernel.project_dir%/public/build/manifest.json',
'packages' => array(
'foo_package' => array(
// this package uses its own manifest (the default file is ignored)
'json_manifest_path' => '%kernel.project_dir%/web/assets/a_different_manifest.json',
'json_manifest_path' => '%kernel.project_dir%/public/build/a_different_manifest.json',
),
'bar_package' => array(
// this package uses the global manifest (the default file is used)
Expand Down
2 changes: 1 addition & 1 deletion templating.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ block of the base template.
You can also include assets located in your bundles' ``Resources/public/`` folder.
You will need to run the ``php bin/console assets:install target [--symlink]``
command, which copies (or symlinks) files into the correct location. (target
is by default the "web/" directory of your application).
is by default the "public/" directory of your application).

.. code-block:: html+twig

Expand Down