Merge pull request symfony#3294 from bicpi/fix_code_blocks

weaverryan · weaverryan · commit 08e3f630a71e · 2013-12-18T16:17:26.000-08:00
Fix some bash and text code blocks
diff --git a/book/installation.rst b/book/installation.rst
@@ -44,7 +44,7 @@ have curl installed, it's as easy as:
 
 .. code-block:: bash
 
-    curl -s https://getcomposer.org/installer | php
+    $ curl -s https://getcomposer.org/installer | php
 
 .. note::
 
@@ -146,7 +146,7 @@ Step 1: Get `Composer`_ (The great new PHP packaging system)
 
 .. code-block:: bash
 
-    curl -s http://getcomposer.org/installer | php
+    $ curl -s http://getcomposer.org/installer | php
 
 Make sure you download ``composer.phar`` in the same folder where
 the ``composer.json`` file is located (this is your Symfony project
@@ -169,8 +169,8 @@ Symfony itself - into the ``vendor/`` directory.
 
     .. code-block:: bash
 
-        php installer
-        php composer.phar install
+        $ php installer
+        $ php composer.phar install
 
 .. tip::
 
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -867,15 +867,15 @@ You can dump the default configuration for a bundle in YAML to the console using
 the ``config:dump-reference`` command.  Here is an example of dumping the default
 FrameworkBundle configuration:
 
-.. code-block:: text
+.. code-block:: bash
 
-    app/console config:dump-reference FrameworkBundle
+    $ app/console config:dump-reference FrameworkBundle
 
 The extension alias (configuration key) can also be used:
 
-.. code-block:: text
+.. code-block:: bash
 
-    app/console config:dump-reference framework
+    $ app/console config:dump-reference framework
 
 .. note::
 
diff --git a/book/performance.rst b/book/performance.rst
@@ -60,7 +60,7 @@ command line, and might become part of your deploy process:
 
 .. code-block:: bash
 
-    php composer.phar dump-autoload --optimize
+    $ php composer.phar dump-autoload --optimize
 
 Internally, this builds the big class map array in ``vendor/composer/autoload_classmap.php``.
 
diff --git a/book/templating.rst b/book/templating.rst
@@ -1364,7 +1364,7 @@ this classic example:
 
 Imagine the user enters the following code for their name:
 
-.. code-block:: text
+.. code-block:: html
 
     <script>alert('hello!')</script>
 
diff --git a/contributing/code/tests.rst b/contributing/code/tests.rst
@@ -30,7 +30,7 @@ Step 1: Get `Composer`_
 
 .. code-block:: bash
 
-    curl -s http://getcomposer.org/installer | php
+    $ curl -s http://getcomposer.org/installer | php
 
 Make sure you download ``composer.phar`` in the same folder where
 the ``composer.json`` file is located.
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -640,7 +640,7 @@ Don't forget also to update your database schema:
 
 .. code-block:: bash
 
-    php app/console doctrine:schema:update --force
+    $ php app/console doctrine:schema:update --force
 
 This will create the ``acme_role`` table and a ``user_role`` that stores
 the many-to-many relationship between ``acme_user`` and ``acme_role``. If
