Merge branch '2.3'

weaverryan · weaverryan · commit ebdcaba00962 · 2013-06-12T07:11:55.000-05:00
diff --git 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.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
-    (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::
 
@@ -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/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.*"
                 }
             }
 
diff --git 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.
diff --git 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.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
-    (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
+    (e.g. 2.3.1). For details, see the `Symfony Installation Page`_
 
 .. tip::
 

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ Using the Finder Component`
`24`	`24`
`25`	`25`	`{`
`26`	`26`	`"require": {`
`27`		`- "symfony/finder": "2.2.*"`
	`27`	`+ "symfony/finder": "2.3.*"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	If you already have a ``composer.json`` file, just add this line to it. You
`32`		-may also need to adjust the version (e.g. ``2.1.1`` or ``2.2.*``).
	`32`	+may also need to adjust the version (e.g. ``2.2.2`` or ``2.3.*``).
`33`	`33`
`34`	`34`	You can research the component names and versions at `packagist.org`_.
`35`	`35`
`@@ -69,9 +69,9 @@ immediately::`
`69`	`69`
`70`	`70`	`{`
`71`	`71`	`"require": {`
`72`		`- "symfony/finder": "2.2.*",`
`73`		`- "symfony/dom-crawler": "2.2.*",`
`74`		`- "symfony/css-selector": "2.2.*"`
	`72`	`+ "symfony/finder": "2.3.*",`
	`73`	`+ "symfony/dom-crawler": "2.3.*",`
	`74`	`+ "symfony/css-selector": "2.3.*"`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`@@ -81,7 +81,7 @@ immediately::`
`81`	`81`
`82`	`82`	`{`
`83`	`83`	`"require": {`
`84`		`- "symfony/symfony": "2.2.*"`
	`84`	`+ "symfony/symfony": "2.3.*"`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`