Merge branch '3.4' into 4.3

OskarStark · OskarStark · commit 84a0f107c60a · 2019-08-28T13:41:05.000+02:00
* 3.4:
  Fix comment to actually be a comment in code block
  Fix rendering of error code block
diff --git a/frontend/encore/babel.rst b/frontend/encore/babel.rst
@@ -46,7 +46,7 @@ cache directory:
 
 .. code-block:: terminal
 
-    $ On Unix run this command. On Windows, clear this directory manually
+    # On Unix run this command. On Windows, clear this directory manually
     $ rm -rf node_modules/.cache/babel-loader/
 
 Creating a .babelrc File
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -302,8 +302,10 @@ Then, tell Encore to enable the Sass pre-processor:
 Because you just changed your ``webpack.config.js`` file, you'll need to restart
 Encore. When you do, you'll see an error!
 
->   Error: Install sass-loader & node-sass to use enableSassLoader()
->     yarn add sass-loader@^7.0.1 node-sass --dev
+.. code-block:: terminal
+
+    >   Error: Install sass-loader & node-sass to use enableSassLoader()
+    >     yarn add sass-loader@^7.0.1 node-sass --dev
 
 Encore supports many features. But, instead of forcing all of them on you, when
 you need a feature, Encore will tell you what you need to install. Run:
