Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 2d66d800331c · 2019-04-13T15:52:36.000+02:00
* 3.4:
  small improvements
diff --git a/frontend/encore/vuejs.rst b/frontend/encore/vuejs.rst
@@ -144,7 +144,7 @@ you can import them with ``require()`` function:
         render() {
             return (
                 <div>
-                    <img src={require("./image.png")} />
+                    <img src={require("./image.png")}/>
                 </div>
             )
         }
diff --git a/setup/symfony_server.rst b/setup/symfony_server.rst
@@ -55,7 +55,7 @@ run the Symfony server in the background:
 Enabling TLS
 ------------
 
-Browsing the secure version of your apps locally is important to detect
+Browsing the secure version of your applications locally is important to detect
 problems with mixed content early, and to run libraries that only run in HTTPS.
 Traditionally this has been painful and complicated to set up, but the Symfony
 server automates everything. First, run this command:

Original file line number	Diff line number	Diff line change
@@ -144,7 +144,7 @@ you can import them with ``require()`` function:
`144`	`144`	`render() {`
`145`	`145`	`return (`
`146`	`146`	`<div>`
`147`		`- <img src={require("./image.png")} />`
	`147`	`+ <img src={require("./image.png")}/>`
`148`	`148`	`</div>`
`149`	`149`	`)`
`150`	`150`	`}`