Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit e9e57ce6ed30 · 2014-08-05T15:17:37.000-04:00
* 2.4: Wrapping create-project in strings on different versions See #4091 Conflicts: book/installation.rst quick_tour/the_big_picture.rst
diff --git a/book/installation.rst b/book/installation.rst
@@ -57,7 +57,7 @@ Distribution:
 
 .. code-block:: bash
 
-    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.5.*
+    $ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony '2.5.*'
 
 .. tip::
 
diff --git a/cookbook/workflow/new_project_git.rst b/cookbook/workflow/new_project_git.rst
@@ -24,7 +24,7 @@ git repository:
 
    .. code-block:: bash
 
-        $ php composer.phar create-project symfony/framework-standard-edition path/ ~2.3
+        $ php composer.phar create-project symfony/framework-standard-edition path/ '~2.3'
 
    Composer will now download the Standard Distribution along with all of the
    required vendor libraries. For more information about downloading Symfony using
