web/ -> public/ after merge

weaverryan · weaverryan · commit 049742d74993 · 2018-11-05T13:56:39.000-05:00
diff --git a/frontend/encore/copy-files.rst b/frontend/encore/copy-files.rst
@@ -36,7 +36,7 @@ files into your final output directory.
 
     Encore
         // ...
-        .setOutputPath('web/build/')
+        .setOutputPath('public/build/')
 
     +     .copyFiles({
     +         from: './assets/images',
@@ -48,16 +48,16 @@ files into your final output directory.
     +         //pattern: /\.(png|jpg|jpeg)$/
     +     })
 
-This will copy all files from ``assets/images`` into ``web/build`` (the output
+This will copy all files from ``assets/images`` into ``public/build`` (the output
 path). If you have :doc:`versioning enabled <versioning>`, the copied files will
 include a hash based on their content.
 
 To render inside Twig, use the ``asset()`` function:
 
-    {# assets/images/logo.png was copied to web/build/logo.png #}
+    {# assets/images/logo.png was copied to public/build/logo.png #}
     <img src="{{ asset('build/logo.png') }}"
 
-    {# assets/images/subdir/logo.png was copied to web/build/subdir/logo.png #}
+    {# assets/images/subdir/logo.png was copied to public/build/subdir/logo.png #}
     <img src="{{ asset('build/subdir/logo.png') }}"
 
 Make sure you've enabled the :ref:`json_manifest_path <load-manifest-files>` option,
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -76,9 +76,9 @@ To build the assets, run:
 
 Congrats! You now have three new files:
 
-* ``web/build/app.js`` (holds all the JavaScript for your "app" entry)
-* ``web/build/app.css`` (holds all the CSS for your "app" entry)
-* ``web/build/runtime.js`` (a file that helps Webpack do its job)
+* ``public/build/app.js`` (holds all the JavaScript for your "app" entry)
+* ``public/build/app.css`` (holds all the CSS for your "app" entry)
+* ``public/build/runtime.js`` (a file that helps Webpack do its job)
 
 Next, include these in your base layout file. Two Twig helpers from WebpackEncoreBundle
 can do most of the work for you:
