Merge remote-tracking branch 'origin/2.0' into 2.0

weaverryan · weaverryan · commit 8e69999d36a4 · 2012-04-29T11:39:46.000-05:00
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -1000,7 +1000,10 @@ Here is how you can configure the Symfony2 reverse proxy to support the
 ``PURGE`` HTTP method::
 
     // app/AppCache.php
-    class AppCache extends Cache
+
+    use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+    class AppCache extends HttpCache
     {
         protected function invalidate(Request $request)
         {
diff --git a/book/translation.rst b/book/translation.rst
@@ -322,7 +322,7 @@ Creating Translations
 
 The act of creating translation files is an important part of "localization"
 (often abbreviated `L10n`_). Translation files consist of a series of
-id-translation pairs for the given domain and locale. The id is the identifier
+id-translation pairs for the given domain and locale. The source is the identifier
 for the individual translation, and can be the message in the main locale (e.g.
 "Symfony is great") of your application or a unique identifier (e.g.
 "symfony2.great" - see the sidebar below):

Original file line number	Diff line number	Diff line change
`@@ -1000,7 +1000,10 @@ Here is how you can configure the Symfony2 reverse proxy to support the`
`1000`	`1000`	``PURGE`` HTTP method::
`1001`	`1001`
`1002`	`1002`	`// app/AppCache.php`
`1003`		`- class AppCache extends Cache`
	`1003`	`+`
	`1004`	`+ use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;`
	`1005`	`+`
	`1006`	`+ class AppCache extends HttpCache`
`1004`	`1007`	`{`
`1005`	`1008`	`protected function invalidate(Request $request)`
`1006`	`1009`	`{`