Merge branch '1.3'

* 1.3: changed Symfony2 to Symfony
fabpot · Aug 4, 2015 · 9de3d8b · 9de3d8b
2 parents 73a6e76 + fe0e8fb
commit 9de3d8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 Silex, a simple Web Framework
 =============================
 
-Silex is a PHP micro-framework to develop websites based on `Symfony2
+Silex is a PHP micro-framework to develop websites based on `Symfony
 components`_:
 
 .. code-block:: php
@@ -57,8 +57,8 @@ License
 
 Silex is licensed under the MIT license.
 
-.. _Symfony2 components: http://symfony.com
-.. _Composer:            http://getcomposer.org
-.. _PHPUnit:             https://phpunit.de
-.. _silex.zip:           http://silex.sensiolabs.org/download
-.. _documentation:       http://silex.sensiolabs.org/documentation
+.. _Symfony components: http://symfony.com
+.. _Composer:           http://getcomposer.org
+.. _PHPUnit:            https://phpunit.de
+.. _silex.zip:          http://silex.sensiolabs.org/download
+.. _documentation:      http://silex.sensiolabs.org/documentation
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "minimum-stability": "dev",
     "name": "silex/silex",
-    "description": "The PHP micro-framework based on the Symfony2 Components",
+    "description": "The PHP micro-framework based on the Symfony Components",
     "keywords": ["microframework"],
     "homepage": "http://silex.sensiolabs.org",
     "license": "MIT",