Skip to content

Commit

Permalink
Merge branch '2.3' into 2.5
Browse files Browse the repository at this point in the history
* 2.3:
  Replaced a "note" by a "seealso"
  Imrpoved the wording of the note about using using legacy PHP 5.3 version
  Reworded the reasons why you should use Composer-based installation
  Wrapped a line to follow doc standards
  Display the same version number on Linux and Windows to avoid confusions
  Add an explicit command to better explain that we recommend to move symfony.phar to projects directory
  Reworded a confusing phrase
  Added a note about verifying Symfony digital signatures
  Re-added a wrongly deleted link reference
  Rewritten from scratch the chapter about installing Symfony

Conflicts:
	book/installation.rst
  • Loading branch information
weaverryan committed Dec 21, 2014
2 parents eda75fe + 92a186d commit f2fd74e
Show file tree
Hide file tree
Showing 2 changed files with 240 additions and 219 deletions.
Loading

0 comments on commit f2fd74e

Please sign in to comment.