diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 7c5721870c3..0ccf57050b7 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -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' @@ -1288,11 +1288,11 @@ package: - + + json-manifest-path="%kernel.project_dir%/public/build/a_different_manifest.json" /> 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) diff --git a/templating.rst b/templating.rst index 00cd2c27602..1a19eeeeeed 100644 --- a/templating.rst +++ b/templating.rst @@ -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