Merge pull request #2283 from symfony/2.2-update-urls

weaverryan · weaverryan · commit eb9959cb0c65 · 2013-03-14T18:57:44.000-07:00
[2.2] Updating some URLs from 2.1/master to 2.2
diff --git a/book/forms.rst b/book/forms.rst
@@ -1603,7 +1603,7 @@ Learn more from the Cookbook
 
 .. _`Symfony2 Form Component`: https://github.com/symfony/Form
 .. _`DateTime`: http://php.net/manual/en/class.datetime.php
-.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/Twig
-.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/2.2/src/Symfony/Bridge/Twig
+.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
 .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
-.. _`view on GitHub`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form
+.. _`view on GitHub`: https://github.com/symfony/symfony/tree/2.2/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -433,7 +433,7 @@ content:
 
     {
         "require": {
-            "symfony/symfony": "2.1.*"
+            "symfony/symfony": "2.2.*"
         },
         "autoload": {
             "files": ["model.php","controllers.php"]
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 dev-master
+    php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.2.0
 
 .. tip::
 
-    For an exact version, replace `dev-master` with the latest Symfony version
-    (e.g. 2.1.1). For details, see the `Symfony Installation Page`_
+    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`_
 
 .. tip::
 
@@ -110,10 +110,10 @@ one of the following commands (replacing ``###`` with your actual filename):
 .. code-block:: bash
 
     # for .tgz file
-    $ tar zxvf Symfony_Standard_Vendors_2.1.###.tgz
+    $ tar zxvf Symfony_Standard_Vendors_2.2.###.tgz
 
     # for a .zip file
-    $ unzip Symfony_Standard_Vendors_2.1.###.zip
+    $ unzip Symfony_Standard_Vendors_2.2.###.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,7 +24,7 @@ Using the Finder Component
 
     {
         "require": {
-            "symfony/finder": "2.1.*"
+            "symfony/finder": "2.2.*"
         }
     }
 
@@ -69,9 +69,9 @@ immediately::
 
             {
                 "require": {
-                    "symfony/finder": "2.1.*",
-                    "symfony/dom-crawler": "2.1.*",
-                    "symfony/css-selector": "2.1.*"
+                    "symfony/finder": "2.2.*",
+                    "symfony/dom-crawler": "2.2.*",
+                    "symfony/css-selector": "2.2.*"
                 }
             }
 
@@ -81,7 +81,7 @@ immediately::
 
             {
                 "require": {
-                    "symfony/symfony": "2.1.*"
+                    "symfony/symfony": "2.2.*"
                 }
             }
 
diff --git a/cookbook/form/form_customization.rst b/cookbook/form/form_customization.rst
@@ -969,4 +969,4 @@ customizations directly. Look at the following example:
 The array passed as the second argument contains form "variables". For
 more details about this concept in Twig, see :ref:`twig-reference-form-variables`.
 
-.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.1/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
diff --git 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 dev-master
+        $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.2.0
 
         # remove the Git history
         $ rm -rf .git
     
-    For an exact version, replace `dev-master` with the latest Symfony version
+    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`_
 
 .. tip::
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -808,6 +808,6 @@ For an example, see the ``EntityInitializer`` class inside the Doctrine Bridge.
 
 .. _`Twig's documentation`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
 .. _`Twig official extension repository`: https://github.com/fabpot/Twig-extensions
-.. _`KernelEvents`: https://github.com/symfony/symfony/blob/2.1/src/Symfony/Component/HttpKernel/KernelEvents.php
+.. _`KernelEvents`: https://github.com/symfony/symfony/blob/2.2/src/Symfony/Component/HttpKernel/KernelEvents.php
 .. _`SwiftMailer's Plugin Documentation`: http://swiftmailer.org/docs/plugins.html
 .. _`Twig Loader`: http://twig.sensiolabs.org/doc/api.html#loaders

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ content:`
`433`	`433`
`434`	`434`	`{`
`435`	`435`	`"require": {`
`436`		`- "symfony/symfony": "2.1.*"`
	`436`	`+ "symfony/symfony": "2.2.*"`
`437`	`437`	`},`
`438`	`438`	`"autoload": {`
`439`	`439`	`"files": ["model.php","controllers.php"]`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ Using the Finder Component`
`24`	`24`
`25`	`25`	`{`
`26`	`26`	`"require": {`
`27`		`- "symfony/finder": "2.1.*"`
	`27`	`+ "symfony/finder": "2.2.*"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -69,9 +69,9 @@ immediately::`
`69`	`69`
`70`	`70`	`{`
`71`	`71`	`"require": {`
`72`		`- "symfony/finder": "2.1.*",`
`73`		`- "symfony/dom-crawler": "2.1.*",`
`74`		`- "symfony/css-selector": "2.1.*"`
	`72`	`+ "symfony/finder": "2.2.*",`
	`73`	`+ "symfony/dom-crawler": "2.2.*",`
	`74`	`+ "symfony/css-selector": "2.2.*"`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`@@ -81,7 +81,7 @@ immediately::`
`81`	`81`
`82`	`82`	`{`
`83`	`83`	`"require": {`
`84`		`- "symfony/symfony": "2.1.*"`
	`84`	`+ "symfony/symfony": "2.2.*"`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`