Merge branch '2.0'

weaverryan · weaverryan · commit b55b984a7605 · 2012-06-19T07:52:55.000-05:00
Conflicts:
	reference/configuration/web_profiler.rst
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -290,7 +290,7 @@ which is actually a collection of various cache information.
     :ref:`http-expiration-validation` section.
 
 .. index::
-   single: Cache; Cache-Control Header
+   single: Cache; Cache-Control header
    single: HTTP headers; Cache-Control
 
 The Cache-Control Header
@@ -624,7 +624,7 @@ code.
     whether or not the resource has been updated since it was cached.
 
 .. index::
-   single: Cache; Conditional Get
+   single: Cache; Conditional get
    single: HTTP; 304
 
 .. _optimizing-cache-validation:
diff --git a/book/service_container.rst b/book/service_container.rst
@@ -1,6 +1,6 @@
 .. index::
    single: Service Container
-   single: Dependency Injection Container
+   single: Dependency Injection; Container
 
 Service Container
 =================
@@ -62,7 +62,7 @@ classes is a well-known and trusted object-oriented best-practice. These skills
 are key to being a good developer in almost any language.
 
 .. index::
-   single: Service Container; What is?
+   single: Service Container; What is a Service Container?
 
 What is a Service Container?
 ----------------------------
@@ -330,7 +330,7 @@ second method, which is the flexible and preferred method for importing service
 configuration from third-party bundles.
 
 .. index::
-   single: Service Container; imports
+   single: Service Container; Imports
 
 .. _service-container-imports-directive:
 
diff --git a/book/stable_api.rst b/book/stable_api.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Stable API
+
 The Symfony2 Stable API
 =======================
 
diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst
@@ -1,4 +1,7 @@
-﻿Compiling the Container
+﻿.. index::
+   single: Dependency Injection; Compilation
+
+Compiling the Container
 =======================
 
 The service container can be compiled for various reasons. These reasons
@@ -121,14 +124,8 @@ worlds though by using configuration files and then dumping and caching the resu
 configuration. The ``PhpDumper`` makes dumping the compiled container easy::
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\Config\FileLocator;
-    use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
     use Symfony\Component\DependencyInjection\Dumper\PhpDumper
 
-    $container = new ContainerBuilder();
-    $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
-    $loader->load('services.xml');
-
     $file = __DIR__ .'/cache/container.php';
 
     if (file_exists($file)) {
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -279,81 +279,3 @@ The ``newsletter_manager`` and ``mailer`` services can be set up using config fi
         $container->register('newsletter_manager', 'NewsletterManager')
            ->addMethodCall('setMailer', new Reference('mailer');
 
-Dumping the Configuration for Performance
------------------------------------------
-
-Using configuration files to manage the service container can be much easier
-to understand than using PHP once there are a lot of services. This ease comes
-at a price though when it comes to performance as the config files need to be
-parsed and the PHP configuration built from them. You can have the best of both
-worlds though by using configuration files and then dumping and caching the resulting
-configuration. The ``PhpDumper`` makes dumping the compiled container easy::
-
-    use Symfony\Component\DependencyInjection\ContainerBuilder;
-    use Symfony\Component\Config\FileLocator;
-    use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-    use Symfony\Component\DependencyInjection\Dumper\PhpDumper
-
-    $container = new ContainerBuilder();
-    $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
-    $loader->load('services.xml');
-
-    $file = __DIR__ .'/cache/container.php';
-
-    if (file_exists($file)) {
-        require_once $file;
-        $container = new ProjectServiceContiner();
-    } else {
-        $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
-        $loader->load('services.xml');
-
-        $dumper = new PhpDumper($container);
-        file_put_contents($file, $dumper->dump());
-    }
-
-``ProjectServiceContiner`` is the default name given to the dumped container
-class, you can change this though this with the ``class`` option when you dump
-it::
-
-    // ...
-    $file = __DIR__ .'/cache/container.php';
-
-    if (file_exists($file)) {
-        require_once $file;
-        $container = new MyCachedContainer();
-    } else {
-        $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
-        $loader->load('services.xml');
-
-        $dumper = new PhpDumper($container);
-        file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
-    }
-
-You will now get the speed of the PHP configured container with the ease of using
-configuration files. In the above example you will need to delete the cached
-container file whenever you make any changes. Adding a check for a variable that
-determines if you are in debug mode allows you to keep the speed of the cached
-container in production but getting an up to date configuration whilst developing
-your application::
-
-    // ...
-
-    // set $isDebug based on something in your project
-
-    $file = __DIR__ .'/cache/container.php';
-
-    if (!$isDebug && file_exists($file)) {
-        require_once $file;
-        $container = new MyCachedContainer();
-    } else {
-        $container = new ContainerBuilder();
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
-        $loader->load('services.xml');
-
-        if(!$isDebug) {
-   	     $dumper = new PhpDumper($container);
-            file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
-        }
-    }
diff --git a/components/yaml.rst b/components/yaml.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Yaml
+
 The YAML Component
 ==================
 
diff --git a/contributing/documentation/translations.rst b/contributing/documentation/translations.rst
@@ -24,6 +24,7 @@ for. Here is the list of the official *master* repositories:
 * *Romanian*: https://github.com/sebio/symfony-docs-ro
 * *Russian*:  https://github.com/avalanche123/symfony-docs-ru
 * *Spanish*:  https://github.com/gitnacho/symfony-docs-es
+* *Turkish*:  https://github.com/symfony-tr/symfony-docs-tr
 
 .. note::
 
diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Assetic; Apply Filters
+   single: Assetic; Apply filters
 
 How to Apply an Assetic Filter to a Specific File Extension
 ===========================================================
diff --git a/cookbook/assetic/jpeg_optimize.rst b/cookbook/assetic/jpeg_optimize.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Assetic; Image Optimization
+   single: Assetic; Image optimization
 
 How to Use Assetic For Image Optimization with Twig Functions
 =============================================================
diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Bundles; Best Practices
+   single: Bundles; Best practices
 
 Bundle Structure and Best Practices
 ===================================
@@ -9,7 +9,7 @@ from classes to controllers and web resources. Even if bundles are very
 flexible, you should follow some best practices if you want to distribute them.
 
 .. index::
-   pair: Bundles; Naming Conventions
+   pair: Bundles; Naming conventions
 
 .. _bundles-naming-conventions:
 
diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst
@@ -1,6 +1,6 @@
 .. index::
    single: Configuration; Semantic
-   single: Bundle; Extension Configuration
+   single: Bundle; Extension configuration
 
 How to expose a Semantic Configuration for a Bundle
 ===================================================
@@ -90,7 +90,7 @@ The second method has several specific advantages:
 
 .. index::
    single: Bundles; Extension
-   single: Dependency Injection, Extension
+   single: Dependency Injection; Extension
 
 Creating an Extension Class
 ---------------------------
diff --git a/cookbook/configuration/environments.rst b/cookbook/configuration/environments.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Environments;
+   single: Environments
 
 How to Master and Create new Environments
 =========================================
diff --git a/cookbook/controller/error_pages.rst b/cookbook/controller/error_pages.rst
@@ -1,3 +1,7 @@
+.. index::
+   single: Controller; Customize error pages
+   single: Error pages
+
 How to customize Error Pages
 ============================
 
diff --git a/cookbook/doctrine/common_extensions.rst b/cookbook/doctrine/common_extensions.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Doctrine; Common extensions
+
 Doctrine Extensions: Timestampable, Sluggable, Translatable, etc.
 =================================================================
 
diff --git a/cookbook/doctrine/custom_dql_functions.rst b/cookbook/doctrine/custom_dql_functions.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Doctrine; Custom DQL functions
+
 Registering Custom DQL Functions
 ================================
 
@@ -77,4 +80,4 @@ In Symfony, you can register your custom DQL functions as follows:
             ),
         ));
 
-.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html
+.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html
diff --git a/cookbook/doctrine/event_listeners_subscribers.rst b/cookbook/doctrine/event_listeners_subscribers.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Doctrine; Event listeners and subscribers
+
 .. _doctrine-event-config:
 
 Registering Event Listeners and Subscribers
@@ -111,4 +114,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost``
 entity), you should check for the class name of the entity in your method
 (as shown above).
 
-.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
+.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -1,3 +1,7 @@
+.. index::
+   single: Doctrine; File uploads
+
+
 How to handle File Uploads with Doctrine
 ========================================
 
diff --git a/cookbook/doctrine/multiple_entity_managers.rst b/cookbook/doctrine/multiple_entity_managers.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Doctrine; Multiple entity managers
+
 How to work with Multiple Entity Managers
 =========================================
 
diff --git a/cookbook/email/dev_environment.rst b/cookbook/email/dev_environment.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Emails; In development
+
 How to Work with Emails During Development
 ==========================================
 
diff --git a/cookbook/email/spool.rst b/cookbook/email/spool.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Emails; Spooling
+
 How to Spool Email
 ==================
 
diff --git a/cookbook/form/data_transformers.rst b/cookbook/form/data_transformers.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Form; Data transformers
+
 Using Data Transformers
 =======================
 
diff --git a/cookbook/form/use_virtuals_forms.rst b/cookbook/form/use_virtuals_forms.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Form; Use virtual forms
+   single: Form; Virtual forms
 
 How to use the Virtual Form Field Option
 ========================================
diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Logging; Emailling errors
+
 How to Configure Monolog to Email Errors
 ========================================
 
diff --git a/cookbook/security/force_https.rst b/cookbook/security/force_https.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Security; Force HTTPS
+
 How to force HTTPS or HTTP for Different URLs
 =============================================
 
diff --git a/cookbook/security/form_login.rst b/cookbook/security/form_login.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Security; Customizing form login
+
 How to customize your Form Login
 ================================
 
diff --git a/cookbook/security/remember_me.rst b/cookbook/security/remember_me.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Security; "Remember me"
+
 How to add "Remember Me" Login Functionality
 ============================================
 
diff --git a/cookbook/security/securing_services.rst b/cookbook/security/securing_services.rst
@@ -1,3 +1,7 @@
+.. index::
+   single: Security; Securing any service
+   single: Security; Securing any method
+
 How to secure any Service or Method in your Application
 =======================================================
 
diff --git a/cookbook/service_container/compiler_passes.rst b/cookbook/service_container/compiler_passes.rst
@@ -1,3 +1,7 @@
+.. index::
+   single: Dependency Injection; Compiler passes
+   single: Service Container; Compiler passes
+
 How to work with Compiler Passes in Bundles
 ===========================================
 
diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Dependency Injection; Scopes
+
 How to work with Scopes
 =======================
 
diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: symfony1
+
 How Symfony2 differs from symfony1
 ==================================
 
diff --git a/cookbook/testing/insulating_clients.rst b/cookbook/testing/insulating_clients.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Tests
+   single: Tests; Insulating clients
 
 How to test the Interaction of several Clients
 ==============================================
diff --git a/cookbook/workflow/new_project_git.rst b/cookbook/workflow/new_project_git.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Workflow; Git
+
 How to Create and store a Symfony2 Project in git
 =================================================
 
diff --git a/cookbook/workflow/new_project_svn.rst b/cookbook/workflow/new_project_svn.rst
@@ -1,3 +1,6 @@
+.. index::
+   single: Workflow; Subversion
+
 How to Create and store a Symfony2 Project in Subversion
 ========================================================
 
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
diff --git a/reference/forms/types/options/by_reference.rst.inc b/reference/forms/types/options/by_reference.rst.inc
