From f7a4bcf8feb2939c5fc3024b8e613621613853d3 Mon Sep 17 00:00:00 2001 From: Romain GAUTIER Date: Mon, 3 Jun 2013 18:39:59 +0200 Subject: [PATCH 1/5] Updated to 2.3.0 --- book/installation.rst | 8 ++++---- quick_tour/the_big_picture.rst | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/book/installation.rst b/book/installation.rst index b4167818ece..0f61f588501 100644 --- a/book/installation.rst +++ b/book/installation.rst @@ -57,11 +57,11 @@ Distribution: .. code-block:: bash - php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.2.0 + php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.0 .. tip:: - For an exact version, replace `2.2.0` with the latest Symfony version + For an exact version, replace `2.3.0` with the latest Symfony version (e.g. 2.2.1). For details, see the `Symfony Installation Page`_ .. tip:: @@ -109,10 +109,10 @@ one of the following commands (replacing ``###`` with your actual filename): .. code-block:: bash # for .tgz file - $ tar zxvf Symfony_Standard_Vendors_2.2.###.tgz + $ tar zxvf Symfony_Standard_Vendors_2.3.###.tgz # for a .zip file - $ unzip Symfony_Standard_Vendors_2.2.###.zip + $ unzip Symfony_Standard_Vendors_2.3.###.zip If you've downloaded "without vendors", you'll definitely need to read the next section. diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst index 9c8a77a6b80..c9de273ce86 100644 --- a/quick_tour/the_big_picture.rst +++ b/quick_tour/the_big_picture.rst @@ -76,12 +76,12 @@ have a ``Symfony/`` directory that looks like this: .. code-block:: bash - $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.2.0 + $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.3.0 # remove the Git history $ rm -rf .git - For an exact version, replace `2.2.0` with the latest Symfony version + For an exact version, replace `2.3.0` with the latest Symfony version (e.g. 2.1.1). For details, see the `Symfony Installation Page`_ .. tip:: From 8ef2bdbf4423fa866bd72e9898e68268ac25a0f0 Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 3 Jun 2013 20:30:47 +0200 Subject: [PATCH 2/5] fixed typo --- book/installation.rst | 6 +++--- quick_tour/the_big_picture.rst | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/book/installation.rst b/book/installation.rst index 0f61f588501..3b33ceb8959 100644 --- a/book/installation.rst +++ b/book/installation.rst @@ -57,12 +57,12 @@ Distribution: .. code-block:: bash - php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.0 + php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.* .. tip:: - For an exact version, replace `2.3.0` with the latest Symfony version - (e.g. 2.2.1). For details, see the `Symfony Installation Page`_ + For an exact version, replace "2.3.0" with the latest Symfony version. + For details, see the `Symfony Installation Page`_ .. tip:: diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst index c9de273ce86..e002763041c 100644 --- a/quick_tour/the_big_picture.rst +++ b/quick_tour/the_big_picture.rst @@ -76,13 +76,13 @@ have a ``Symfony/`` directory that looks like this: .. code-block:: bash - $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.3.0 + $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.3.* # remove the Git history $ rm -rf .git - - For an exact version, replace `2.3.0` with the latest Symfony version - (e.g. 2.1.1). For details, see the `Symfony Installation Page`_ + + For an exact version, replace "2.3.0" with the latest Symfony version. + For details, see the `Symfony Installation Page`_ .. tip:: From f2af36f4a81cb9ed2accf601f167b43350396dc4 Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 3 Jun 2013 20:34:37 +0200 Subject: [PATCH 3/5] updated components to 2.3 --- components/using_components.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/using_components.rst b/components/using_components.rst index 174b041facc..b59c57013f4 100644 --- a/components/using_components.rst +++ b/components/using_components.rst @@ -24,12 +24,12 @@ Using the Finder Component { "require": { - "symfony/finder": "2.2.*" + "symfony/finder": "2.3.*" } } If you already have a ``composer.json`` file, just add this line to it. You -may also need to adjust the version (e.g. ``2.1.1`` or ``2.2.*``). +may also need to adjust the version (e.g. ``2.2.2`` or ``2.3.*``). You can research the component names and versions at `packagist.org`_. @@ -69,9 +69,9 @@ immediately:: { "require": { - "symfony/finder": "2.2.*", - "symfony/dom-crawler": "2.2.*", - "symfony/css-selector": "2.2.*" + "symfony/finder": "2.3.*", + "symfony/dom-crawler": "2.3.*", + "symfony/css-selector": "2.3.*" } } @@ -81,7 +81,7 @@ immediately:: { "require": { - "symfony/symfony": "2.2.*" + "symfony/symfony": "2.3.*" } } From 6290c535e8722dff729efe64c1f2b10d9d239d3e Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 3 Jun 2013 20:50:22 +0200 Subject: [PATCH 4/5] removed branch versions --- contributing/documentation/overview.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index e48a1d73ca6..d213835df20 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -26,9 +26,8 @@ then clone your fork: $ git clone git://github.com/YOURUSERNAME/symfony-docs.git Consistent with Symfony's source code, the documentation repository is split into -multiple branches: ``2.0``, ``2.1``, ``2.2`` corresponding to the different -versions of Symfony itself. The ``master`` branch holds the documentation -for the development branch of the code. +multiple branches, corresponding to the different versions of Symfony itself. +The ``master`` branch holds the documentation for the development branch of the code. Unless you're documenting a feature that was introduced *after* Symfony 2.1 (e.g. in Symfony 2.2), your changes should always be based on the 2.1 branch. From 0a3f81c3976f1c651ad1290cd70d4d9a61c5b087 Mon Sep 17 00:00:00 2001 From: Romain Gautier Date: Mon, 10 Jun 2013 01:12:44 +0300 Subject: [PATCH 5/5] Update installation.rst --- book/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/installation.rst b/book/installation.rst index 3b33ceb8959..bccb13b8287 100644 --- 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.3.* + php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.3.0 .. tip::