Merge pull request symfony#1516 from richardmiller/fixing_index_inconsistencies

weaverryan · weaverryan · commit 41b4bb997ac1 · 2012-07-08T14:00:45.000-07:00
Fixing index inconsistencies
diff --git a/book/controller.rst b/book/controller.rst
@@ -384,7 +384,7 @@ itself.
     </cookbook/controller/service>`.
 
 .. index::
-   single: Controller; Common Tasks
+   single: Controller; Common tasks
 
 Common Controller Tasks
 -----------------------
@@ -623,7 +623,7 @@ These attributes will remain on the user for the remainder of that user's
 session.
 
 .. index::
-   single Session; Flash messages
+   single: Session; Flash messages
 
 Flash Messages
 ~~~~~~~~~~~~~~
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -1305,7 +1305,7 @@ and ``nullable``. Take a few examples:
     Doctrine's `Property Mapping documentation`_
 
 .. index::
-   single: Doctrine; ORM Console Commands
+   single: Doctrine; ORM console commands
    single: CLI; Doctrine ORM
 
 Console Commands
diff --git a/book/forms.rst b/book/forms.rst
@@ -369,7 +369,7 @@ Validation is a very powerful feature of Symfony2 and has its own
 :doc:`dedicated chapter</book/validation>`.
 
 .. index::
-   single: Forms; Validation Groups
+   single: Forms; Validation groups
 
 .. _book-forms-validation-groups:
 
@@ -404,7 +404,7 @@ In both of these cases, *only* the ``registration`` validation group will
 be used to validate the underlying object.
 
 .. index::
-   single: Forms; Built-in Field Types
+   single: Forms; Built-in field types
 
 .. _book-forms-type-reference:
 
@@ -543,7 +543,7 @@ passing the option in the options field array::
     ->add('task', null, array('max_length' => 4))
 
 .. index::
-   single: Forms; Rendering in a Template
+   single: Forms; Rendering in a template
 
 .. _form-rendering-template:
 
@@ -1172,7 +1172,7 @@ customize (e.g. ``widget``), you can construct the fragment name that needs
 to be overridden (e.g. ``textarea_widget``).
 
 .. index::
-   single: Forms; Template Fragment Inheritance
+   single: Forms; Template fragment inheritance
 
 Template Fragment Inheritance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1335,7 +1335,7 @@ Any fragments inside the ``Acme/TaskBundle/Resources/views/Form`` directory
 are now used globally to define form output.
 
 .. index::
-   single: Forms; CSRF Protection
+   single: Forms; CSRF protection
 
 .. _forms-csrf:
 
diff --git a/book/http_cache.rst b/book/http_cache.rst
@@ -63,7 +63,7 @@ Nottingham's `Cache Tutorial`_.
 
 .. index::
    single: Cache; Proxy
-   single: Cache; Reverse Proxy
+   single: Cache; Reverse proxy
    single: Cache; Gateway
 
 .. _gateway-caches:
@@ -126,7 +126,7 @@ the first two cache types. These caches are outside of your control but follow
 the HTTP cache directions set in the response.
 
 .. index::
-   single: Cache; Symfony2 Reverse Proxy
+   single: Cache; Symfony2 reverse proxy
 
 .. _`symfony-gateway-cache`:
 
@@ -428,7 +428,7 @@ on a cache to store and return "fresh" responses.
     are much more beautiful than its cover.
 
 .. index::
-   single: Cache; HTTP Expiration
+   single: Cache; HTTP expiration
 
 Expiration
 ~~~~~~~~~~
diff --git a/book/internals.rst b/book/internals.rst
@@ -88,7 +88,7 @@ Every Symfony2 Kernel implements
     function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
 
 .. index::
-   single: Internals; Controller Resolver
+   single: Internals; Controller resolver
 
 Controllers
 ~~~~~~~~~~~
@@ -139,7 +139,7 @@ the Request attributes.
         }
 
 .. index::
-  single: Internals; Request Handling
+  single: Internals; Request handling
 
 Handling Requests
 ~~~~~~~~~~~~~~~~~
@@ -181,7 +181,7 @@ instance), disable the ``kernel.exception`` event by passing ``false`` as the
 third argument to the ``handle()`` method.
 
 .. index::
-  single: Internals; Internal Requests
+  single: Internals; Internal requests
 
 Internal Requests
 ~~~~~~~~~~~~~~~~~
diff --git a/book/service_container.rst b/book/service_container.rst
@@ -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 a Service Container?
+   single: Service Container; What is a service container?
 
 What is a Service Container?
 ----------------------------
diff --git a/book/templating.rst b/book/templating.rst
@@ -355,8 +355,8 @@ When working with template inheritance, here are some tips to keep in mind:
         {% endblock %}
 
 .. index::
-   single: Templating; Naming Conventions
-   single: Templating; File Locations
+   single: Templating; Naming conventions
+   single: Templating; File locations
 
 .. _template-naming-locations:
 
@@ -444,7 +444,7 @@ section.
    See :ref:`Templating Configuration<template-configuration>` for more details.
 
 .. index::
-   single: Templating; Tags and Helpers
+   single: Templating; Tags and helpers
    single: Templating; Helpers
 
 Tags and Helpers
@@ -790,7 +790,7 @@ configuration option.
 .. index::
    single: Templating; Including stylesheets and Javascripts
    single: Stylesheets; Including stylesheets
-   single: Javascripts; Including Javascripts
+   single: Javascript; Including Javascripts
 
 Including Stylesheets and Javascripts in Twig
 ---------------------------------------------
@@ -969,7 +969,7 @@ Several configuration options are available and are covered in the
    third-party bundles).
 
 .. index::
-    single; Template; Overriding templates
+    single: Template; Overriding templates
 
 .. _overriding-bundle-templates:
 
@@ -1032,7 +1032,7 @@ subdirectory.
 .. _templating-overriding-core-templates:
 
 .. index::
-    single; Template; Overriding exception templates
+    single: Template; Overriding exception templates
 
 Overriding Core Templates
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/book/testing.rst b/book/testing.rst
@@ -38,7 +38,7 @@ file.
     Code coverage can be generated with the ``--coverage-html`` option.
 
 .. index::
-   single: Tests; Unit Tests
+   single: Tests; Unit tests
 
 Unit Tests
 ----------
@@ -105,7 +105,7 @@ Running tests for a given file or directory is also very easy:
     $ phpunit -c app src/Acme/DemoBundle/
 
 .. index::
-   single: Tests; Functional Tests
+   single: Tests; Functional tests
 
 Functional Tests
 ----------------
diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst
@@ -1,5 +1,5 @@
 ﻿.. index::
-   single: Dependency Injection; Service Definitions
+   single: Dependency Injection; Service definitions
 
 
 Working with Container Parameters and Definitions
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Parent Services
+   single: Dependency Injection; Parent services
 
 Managing Common Dependencies with Parent Services
 =================================================
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -86,7 +86,7 @@ Here are some examples of good event names:
 * ``form.pre_set_data``
 
 .. index::
-   single: Event Dispatcher; Event Subclasses
+   single: Event Dispatcher; Event subclasses
 
 Event Names and Event Objects
 .............................
@@ -213,7 +213,7 @@ instance of ``Symfony\Component\HttpKernel\Event\FilterResponseEvent``:
 .. _event_dispatcher-closures-as-listeners:
 
 .. index::
-   single: Event Dispatcher; Creating and Dispatching an Event
+   single: Event Dispatcher; Creating and dispatching an event
 
 Creating and Dispatching an Event
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/cookbook/configuration/external_parameters.rst b/cookbook/configuration/external_parameters.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Environments; External Parameters
+   single: Environments; External parameters
 
 How to Set External Parameters in the Service Container
 =======================================================
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Console; Create Commands
+   single: Console; Create commands
 
 How to create a Console Command
 ===============================
diff --git a/cookbook/profiler/data_collector.rst b/cookbook/profiler/data_collector.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Profiling; Data Collector
+   single: Profiling; Data collector
 
 How to create a custom Data Collector
 =====================================
diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Security; Custom Authentication Provider
+   single: Security; Custom authentication provider
 
 How to create a custom Authentication Provider
 ==============================================
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -1,6 +1,6 @@
 .. index::
-   single: Security; User Provider
-   single: Security; Entity Provider
+   single: Security; User provider
+   single: Security; Entity provider
 
 How to load Security Users from the Database (the Entity Provider)
 ==================================================================
diff --git a/cookbook/service_container/event_listener.rst b/cookbook/service_container/event_listener.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Events; Create Listener
+   single: Events; Create listener
 
 How to create an Event Listener
 ===============================
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
@@ -191,7 +191,7 @@ The ``render()`` method evaluates and returns the content of another template
 (this is the exact same method as the one used in the controller).
 
 .. index::
-   single: Templating; Embedding Pages
+   single: Templating; Embedding pages
 
 Embedding other Controllers
 ---------------------------
diff --git a/cookbook/testing/http_authentication.rst b/cookbook/testing/http_authentication.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Tests; HTTP Authentication
+   single: Tests; HTTP authentication
 
 How to simulate HTTP Authentication in a Functional Test
 ========================================================
