Skip to content

Commit

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

Conflicts:
	book/installation.rst
  • Loading branch information
weaverryan committed Aug 5, 2014
2 parents 3f3cd2a + 780a519 commit 6606698
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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.4.*
$ php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony '2.4.*'
.. 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
2 changes: 1 addition & 1 deletion quick_tour/the_big_picture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ directory:

.. code-block:: bash
$ composer create-project symfony/framework-standard-edition myproject/ ~2.4
$ composer create-project symfony/framework-standard-edition myproject/ '~2.4'
.. note::

Expand Down

0 comments on commit 6606698

Please sign in to comment.