Merge branch '2.0' into 2.1

Author: weaverryan

book/doctrine.rst

@@ -113,10 +113,10 @@ for you:
         [mysqld]
         collation-server = utf8_general_ci
         character-set-server = utf8
-        
+
 Using SQLite
 ~~~~~~~~~~~~
-    
+
 If you want to use SQLite as your database, you need to set the path
 where your database file should be stored:
 
@@ -356,8 +356,8 @@ doesn't replace your existing methods).
 
 .. caution::
 
-    Keep in mind that Doctrine's entity generator produces simple getters/setters. 
-    You should check generated entities and adjust getter/setter logic to your own 
+    Keep in mind that Doctrine's entity generator produces simple getters/setters.
+    You should check generated entities and adjust getter/setter logic to your own
     needs.
 
 .. sidebar:: More about ``doctrine:generate:entities``
@@ -1445,6 +1445,16 @@ Some notable or interesting tasks include:
    read the ":doc:`/bundles/DoctrineFixturesBundle/index`" entry of the
    documentation.
 
+.. tip::
+
+    This page shows working with Doctrine within a controller. You may also
+    want to work with Doctrine elsewhere in your application. The
+    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getDoctrine`
+    method of the controller returns the ``doctrine`` service, you can work with
+    this in the same way elsewhere by injecting this into your own
+    services. See :doc:`/book/service_container` for more on creating
+    your own services.
+
 Summary
 -------
 

reference/configuration/framework.rst

@@ -339,7 +339,7 @@ assets_version_format
 
 **type**: ``string`` **default**: ``%%s?%%s``
 
-This specifies a `sprintf()`_ pattern that will be used with the `assets_version`_
+This specifies a :phpfunction:`sprintf` pattern that will be used with the `assets_version`_
 option to construct an asset's path. By default, the pattern adds the asset's
 version as a query string. For example, if ``assets_version_format`` is set to
 ``%%s?version=%%s`` and ``assets_version`` is set to ``5``, the asset's path
@@ -501,4 +501,3 @@ Full Default Configuration
     it will start on demand now.
 
 .. _`protocol-relative`: http://tools.ietf.org/html/rfc3986#section-4.2
-.. _`sprintf()`: http://php.net/manual/en/function.sprintf.php