Skip to content

Commit

Permalink
Merge branch '2.4' into 2.5
Browse files Browse the repository at this point in the history
* 2.4:
  Wrapping create-project in strings on different versions
  See #4091

Conflicts:
	book/installation.rst
	quick_tour/the_big_picture.rst
  • Loading branch information
weaverryan committed Aug 5, 2014
2 parents b8687dd + 6606698 commit e9e57ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion book/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down
2 changes: 1 addition & 1 deletion cookbook/workflow/new_project_git.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e9e57ce

Please sign in to comment.