Skip to content

Commit c024209

Browse files
committed
bug #8789 Removed references to the web/ directory (javiereguiluz)
This PR was merged into the 4.0 branch. Discussion ---------- Removed references to the web/ directory The `/create_framework/*` articles still contain lots of references to `web/` ... but that's not wrong. Commits ------- 7e18b4e Removed references to the web/ directory
2 parents 533b633 + 7e18b4e commit c024209

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

reference/configuration/framework.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,11 +1267,11 @@ package:
12671267
framework:
12681268
assets:
12691269
# this manifest is applied to every asset (including packages)
1270-
json_manifest_path: "%kernel.project_dir%/web/assets/manifest.json"
1270+
json_manifest_path: "%kernel.project_dir%/public/build/manifest.json"
12711271
packages:
12721272
foo_package:
12731273
# this package uses its own manifest (the default file is ignored)
1274-
json_manifest_path: "%kernel.project_dir%/web/assets/a_different_manifest.json"
1274+
json_manifest_path: "%kernel.project_dir%/public/build/a_different_manifest.json"
12751275
bar_package:
12761276
# this package uses the global manifest (the default file is used)
12771277
base_path: '/images'
@@ -1288,11 +1288,11 @@ package:
12881288
12891289
<framework:config>
12901290
<!-- this manifest is applied to every asset (including packages) -->
1291-
<framework:assets json-manifest-path="%kernel.project_dir%/web/assets/manifest.json">
1291+
<framework:assets json-manifest-path="%kernel.project_dir%/public/build/manifest.json">
12921292
<!-- this package uses its own manifest (the default file is ignored) -->
12931293
<framework:package
12941294
name="foo_package"
1295-
json-manifest-path="%kernel.project_dir%/web/assets/a_different_manifest.json" />
1295+
json-manifest-path="%kernel.project_dir%/public/build/a_different_manifest.json" />
12961296
<!-- this package uses the global manifest (the default file is used) -->
12971297
<framework:package
12981298
name="bar_package"
@@ -1307,11 +1307,11 @@ package:
13071307
$container->loadFromExtension('framework', array(
13081308
'assets' => array(
13091309
// this manifest is applied to every asset (including packages)
1310-
'json_manifest_path' => '%kernel.project_dir%/web/assets/manifest.json',
1310+
'json_manifest_path' => '%kernel.project_dir%/public/build/manifest.json',
13111311
'packages' => array(
13121312
'foo_package' => array(
13131313
// this package uses its own manifest (the default file is ignored)
1314-
'json_manifest_path' => '%kernel.project_dir%/web/assets/a_different_manifest.json',
1314+
'json_manifest_path' => '%kernel.project_dir%/public/build/a_different_manifest.json',
13151315
),
13161316
'bar_package' => array(
13171317
// this package uses the global manifest (the default file is used)

templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ block of the base template.
881881
You can also include assets located in your bundles' ``Resources/public/`` folder.
882882
You will need to run the ``php bin/console assets:install target [--symlink]``
883883
command, which copies (or symlinks) files into the correct location. (target
884-
is by default the "web/" directory of your application).
884+
is by default the "public/" directory of your application).
885885

886886
.. code-block:: html+twig
887887

0 commit comments

Comments
 (0)