Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit 0ff13d600445 · 2021-12-29T17:41:03.000+01:00
* 6.0:
  Update esi.rst
  make following jquery example works
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -43,7 +43,8 @@ of your project. It already holds the basic config you need:
 
         .addEntry('app', './assets/app.js')
 
-        // ...
+        // uncomment this if you want use jQuery in the following example
+        .autoProvidejQuery()
     ;
 
     // ...
diff --git a/http_cache/esi.rst b/http_cache/esi.rst
@@ -65,7 +65,7 @@ First, to use ESI, be sure to enable it in your application configuration:
         # config/packages/framework.yaml
         framework:
             # ...
-            esi: { enabled: true }
+            esi: true
 
     .. code-block:: xml
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ of your project. It already holds the basic config you need:`
`43`	`43`
`44`	`44`	`.addEntry('app', './assets/app.js')`
`45`	`45`
`46`		`- // ...`
	`46`	`+ // uncomment this if you want use jQuery in the following example`
	`47`	`+ .autoProvidejQuery()`
`47`	`48`	`;`
`48`	`49`
`49`	`50`	`// ...`