Refactoring the organization of the cookbook

weaverryan · weaverryan · commit bbcb0f0e4529 · 2011-05-25T07:27:09.000-05:00
diff --git a/book/map.rst.inc b/book/map.rst.inc
@@ -11,7 +11,7 @@
 
   * :doc:`Introduction to the Model </book/doctrine/model>` |
   * :doc:`DBAL </book/doctrine/dbal>` |
-  * :doc:`ORM </book/doctrine/orm>` |
+  * :doc:`ORM </book/doctrine/orm>`
 
 * :doc:`Validation </book/validation>`
 * :doc:`Forms </book/forms>`
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -1,43 +1,81 @@
-* :doc:`/cookbook/email`
-* :doc:`/cookbook/gmail`
-* :doc:`/cookbook/configuration/environments`
-* :doc:`/cookbook/configuration/external_parameters`
-* :doc:`/cookbook/templating/PHP`
-* :doc:`/cookbook/controller/error_pages`
-* :doc:`/cookbook/controller/service`
-* :doc:`/cookbook/validation/custom_constraint`
-* :doc:`/cookbook/form/twig_form_customization`
-* :doc:`/cookbook/form/create_custom_field_type`
-* :doc:`/cookbook/form/file_uploads`
-* :doc:`/cookbook/tools/autoloader`
-* :doc:`/cookbook/tools/finder`
-* :doc:`/cookbook/logging/monolog`
-* :doc:`/cookbook/cache/varnish`
-* :doc:`/cookbook/testing/http_authentication`
-* :doc:`/cookbook/testing/insulating_clients`
-* :doc:`/cookbook/testing/profiling`
-* :doc:`/cookbook/event_dispatcher/class_extension`
-* :doc:`/cookbook/event_dispatcher/method_behavior`
-* :doc:`/cookbook/profiler/data_collector`
-* :doc:`/cookbook/bundles/extension`
-* :doc:`/cookbook/request/mime_type`
-* :doc:`/cookbook/doctrine/reverse_engineering`
-* :doc:`/cookbook/doctrine/doctrine_fixtures`
-* :doc:`/cookbook/doctrine/mongodb`
-* :doc:`/cookbook/doctrine/migrations`
-* :doc:`/cookbook/routing/scheme`
-* :doc:`/cookbook/debugging`
-* :doc:`/cookbook/assetic/yuicompressor`
-* :doc:`/cookbook/console`
-* :doc:`/cookbook/security/voters`
-* :doc:`/cookbook/security/acl`
-* :doc:`/cookbook/security/acl_advanced`
-* :doc:`/cookbook/security/force_https`
-* :doc:`/cookbook/security/form_login`
-* :doc:`/cookbook/security/securing_services`
-* :doc:`/cookbook/security/entity_provider`
-* :doc:`/cookbook/security/custom_provider`
-* :doc:`/cookbook/configuration/pdo_session_storage`
-* :doc:`/cookbook/service_container/factories`
-* :doc:`/cookbook/service_container/parentservices`
-* :doc:`/cookbook/symfony1`
+* **Controllers**
+
+  * :doc:`/cookbook/controller/error_pages` |
+  * :doc:`/cookbook/controller/service`
+
+* **Routing**
+
+  * :doc:`/cookbook/routing/scheme`
+
+* **Templating and Assets**
+
+  * :doc:`/cookbook/assetic/yuicompressor` |
+  * :doc:`/cookbook/templating/PHP`
+
+* **Database Interaction (Doctrine)**
+
+  * :doc:`/cookbook/doctrine/reverse_engineering` |
+  * :doc:`/cookbook/doctrine/doctrine_fixtures` |
+  * :doc:`/cookbook/doctrine/mongodb` |
+  * :doc:`/cookbook/doctrine/migrations`
+
+* **Forms and Validation**
+
+  * :doc:`/cookbook/form/twig_form_customization` |
+  * :doc:`/cookbook/form/create_custom_field_type` |
+  * :doc:`/cookbook/form/file_uploads` |
+  * :doc:`/cookbook/validation/custom_constraint`
+
+* **Configuration and the Service Container**
+
+  * :doc:`/cookbook/configuration/environments` |
+  * :doc:`/cookbook/configuration/external_parameters` |
+  * :doc:`/cookbook/service_container/factories` |
+  * :doc:`/cookbook/service_container/parentservices` |
+  * :doc:`/cookbook/configuration/pdo_session_storage` |
+  * :doc:`/cookbook/bundles/extension`
+
+* **Emailing**
+
+  * :doc:`/cookbook/email` |
+  * :doc:`/cookbook/gmail`
+
+* **Testing**
+
+  * :doc:`/cookbook/testing/http_authentication` |
+  * :doc:`/cookbook/testing/insulating_clients` |
+  * :doc:`/cookbook/testing/profiling`
+
+* **Security**
+
+  * :doc:`/cookbook/security/voters` |
+  * :doc:`/cookbook/security/acl` |
+  * :doc:`/cookbook/security/acl_advanced` |
+  * :doc:`/cookbook/security/force_https` |
+  * :doc:`/cookbook/security/form_login` |
+  * :doc:`/cookbook/security/securing_services` |
+  * :doc:`/cookbook/security/entity_provider` |
+  * :doc:`/cookbook/security/custom_provider`
+
+* **Caching**
+
+  * :doc:`/cookbook/cache/varnish`
+
+* **Tools, Logging and Internals**
+
+  * :doc:`/cookbook/tools/autoloader` |
+  * :doc:`/cookbook/tools/finder` |
+  * :doc:`/cookbook/console` |
+  * :doc:`/cookbook/debugging` |
+  * :doc:`/cookbook/logging/monolog`
+
+* **Extending Symfony**
+
+  * :doc:`/cookbook/event_dispatcher/class_extension` |
+  * :doc:`/cookbook/event_dispatcher/method_behavior` |
+  * :doc:`/cookbook/request/mime_type` |
+  * :doc:`/cookbook/profiler/data_collector`
+
+* **Symfony2 for symfony1 Users**
+
+  * :doc:`/cookbook/symfony1`
diff --git a/reference/index.rst b/reference/index.rst
@@ -6,6 +6,7 @@ Reference Documents
 
     dic_tags
     YAML
+    configuration/framework
     configuration/doctrine
     configuration/twig
     configuration/monolog
