Merge remote-tracking branch 'upstream/master'

rfc1483 · rfc1483 · commit 30aad67454f6 · 2011-05-29T19:56:09.000+02:00
diff --git a/book/translation.rst b/book/translation.rst
@@ -261,6 +261,16 @@ It's the responsibility of the developer (or translator) of an internationalized
 application to create these translations. Translations are stored on the
 filesystem and discovered by Symfony, thanks to some conventions.
 
+.. tip::
+
+    Each time you create a *new* translation resource (or install a bundle
+    that includes a translation resource), be sure to clear your cache so
+    that Symfony can discover the new translation resource:
+    
+    .. code-block:: bash
+    
+        $ php app/console cache:clear
+
 .. index::
    single: Translations; Translation resource locations
 
diff --git a/cookbook/index.rst b/cookbook/index.rst
@@ -4,35 +4,38 @@ Cookbook
 .. toctree::
     :hidden:
 
-    email
-    gmail
-    configuration/environments
-    configuration/pdo_session_storage
-    configuration/external_parameters
-    templating/PHP
     controller/error_pages
     controller/service
-    validation/custom_constraint
+    
+    routing/scheme
+    
+    assetic/yuicompressor
+    templating/PHP
+
+    doctrine/reverse_engineering
+    doctrine/doctrine_fixtures
+    doctrine/mongodb
+    doctrine/migrations
+
     form/twig_form_customization
     form/create_custom_field_type
     form/file_uploads
-    tools/autoloader
-    tools/finder
-    logging/monolog
-    cache/varnish
+    validation/custom_constraint
+
+    configuration/environments
+    configuration/external_parameters
+    service_container/factories
+    service_container/parentservices
+    configuration/pdo_session_storage
+    bundles/extension
+
+    email
+    gmail
+
     testing/http_authentication
     testing/insulating_clients
     testing/profiling
-    event_dispatcher/class_extension
-    event_dispatcher/method_behavior
-    profiler/data_collector
-    bundles/extension
-    request/mime_type
-    doctrine/reverse_engineering
-    doctrine/doctrine_fixtures
-    doctrine/mongodb
-    doctrine/migrations
-    routing/scheme
+
     security/voters
     security/acl
     security/acl_advanced
@@ -41,11 +44,20 @@ Cookbook
     security/securing_services
     security/entity_provider
     security/custom_provider
-    debugging
-    assetic/yuicompressor
+
+    cache/varnish
+
+    tools/autoloader
+    tools/finder
     console
-    service_container/factories
-    service_container/parentservices
+    debugging
+    logging/monolog
+    
+    event_dispatcher/class_extension
+    event_dispatcher/method_behavior
+    request/mime_type
+    profiler/data_collector
+
     symfony1
 
 .. include:: map.rst.inc
