Merge branch '2.0'

weaverryan · weaverryan · commit 53bbd5dd79a6 · 2012-03-18T20:42:57.000-05:00
diff --git a/components/class_loader.rst b/components/class_loader.rst
@@ -122,5 +122,5 @@ or one of its children, the autoloader will first look for the class under the
 ``Doctrine`` directory (the last one configured) if not found, before giving up.
 The order of the registrations is significant in this case.
 
-.. _standards: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+.. _standards: http://symfony.com/PSR0
 .. _PEAR:      http://pear.php.net/manual/en/standards.php
diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst
@@ -283,4 +283,4 @@ Learn more from the Cookbook
 
 * :doc:`/cookbook/bundles/extension`
 
-.. _standards: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+.. _standards: http://symfony.com/PSR0
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
@@ -367,5 +367,5 @@ need to learn a lot to become a Symfony2 master. Ready to dig into these
 topics now? Look no further - go to the official :doc:`/book/index` and pick
 any topic you want.
 
-.. _standards:               https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
-.. _convention:              http://pear.php.net/
+.. _standards:  http://symfony.com/PSR0
+.. _convention: http://pear.php.net/
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
@@ -13,7 +13,7 @@ Full Default Configuration
 
         web_profiler:
             
-            # display secondary information to make the toolbar shorter
+            # display secondary information, disable to make the toolbar shorter
             verbose:             true
 
             # display the web debug toolbar at the bottom of pages with a summary of profiler info

Original file line number	Diff line number	Diff line change
`@@ -283,4 +283,4 @@ Learn more from the Cookbook`
`283`	`283`
`284`	`284`	* :doc:`/cookbook/bundles/extension`
`285`	`285`
`286`		`-.. _standards: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md`
	`286`	`+.. _standards: http://symfony.com/PSR0`