Include some updates after clarification

bicpi · bicpi · commit 00af1ddc618a · 2013-11-17T06:19:40.000+01:00
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: DependencyInjection; Container
 
 Service Container
 =================
diff --git a/components/class_loader/cache_class_loader.rst b/components/class_loader/cache_class_loader.rst
@@ -1,8 +1,8 @@
 .. index::
     single: APC; ApcClassLoader
-    single: Class Loader; ApcClassLoader
-    single: Class Loader; Cache
-    single: Class Loader; XcacheClassLoader
+    single: ClassLoader; ApcClassLoader
+    single: ClassLoader; Cache
+    single: ClassLoader; XcacheClassLoader
     single: XCache; XcacheClassLoader
     
 Cache a Class Loader
diff --git a/components/class_loader/class_loader.rst b/components/class_loader/class_loader.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Class Loader; PSR-0 Class Loader
+   single: ClassLoader; PSR-0 Class Loader
 
 The PSR-0 Class Loader
 ======================
diff --git a/components/class_loader/debug_class_loader.rst b/components/class_loader/debug_class_loader.rst
@@ -1,5 +1,5 @@
 .. index::
-    single: Class Loader; DebugClassLoader
+    single: ClassLoader; DebugClassLoader
     
 Debugging a Class Loader
 ========================
diff --git a/components/class_loader/map_class_loader.rst b/components/class_loader/map_class_loader.rst
@@ -1,5 +1,5 @@
 .. index::
-    single: Class Loader; MapClassLoader
+    single: ClassLoader; MapClassLoader
     
 MapClassLoader
 ==============
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: CSS Selector
+   single: CssSelector
    single: Components; CssSelector
 
 The CssSelector Component
diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Advanced configuration
+   single: DependencyInjection; Advanced configuration
 
 Advanced Container Configuration
 ================================
diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst
@@ -1,5 +1,5 @@
 ﻿.. index::
-   single: Dependency Injection; Compilation
+   single: DependencyInjection; Compilation
 
 Compiling the Container
 =======================
diff --git a/components/dependency_injection/configurators.rst b/components/dependency_injection/configurators.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Service configurators
+   single: DependencyInjection; Service configurators
 
 Configuring Services with a Service Configurator
 ================================================
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: DependencyInjection; Service definitions
 
 Working with Container Service Definitions
 ==========================================
diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Factories
+   single: DependencyInjection; Factories
 
 Using a Factory to Create Services
 ==================================
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -1,5 +1,5 @@
 ﻿.. index::
-    single: Dependency Injection
+    single: DependencyInjection
     single: Components; DependencyInjection
 
 The DependencyInjection Component
diff --git a/components/dependency_injection/parameters.rst b/components/dependency_injection/parameters.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Parameters
+   single: DependencyInjection; Parameters
 
 Introduction to Parameters
 ==========================
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: DependencyInjection; Parent services
 
 Managing Common Dependencies with Parent Services
 =================================================
diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst
@@ -1,5 +1,5 @@
 ﻿.. index::
-   single: Dependency Injection; Tags
+   single: DependencyInjection; Tags
 
 Working with Tagged Services
 ============================
diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst
@@ -1,5 +1,5 @@
 ﻿.. index::
-   single: Dependency Injection; Injection types
+   single: DependencyInjection; Injection types
 
 Types of Injection
 ==================
diff --git a/components/dependency_injection/workflow.rst b/components/dependency_injection/workflow.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Workflow
+   single: DependencyInjection; Workflow
 
 Container Building Workflow
 ===========================
diff --git a/components/http_kernel/index.rst b/components/http_kernel/index.rst
@@ -1,4 +1,4 @@
-HTTPKernel
+HttpKernel
 ==========
 
 .. toctree::
diff --git a/components/map.rst.inc b/components/map.rst.inc
@@ -22,7 +22,7 @@
   * :doc:`/components/console/single_command_tool`
   * :doc:`/components/console/helpers/index`
 
-* **CSS Selector**
+* **CssSelector**
 
   * :doc:`/components/css_selector`
 
@@ -40,7 +40,7 @@
   * :doc:`/components/dependency_injection/advanced`
   * :doc:`/components/dependency_injection/workflow`
 
-* **DOM Crawler**
+* **DomCrawler**
 
   * :doc:`/components/dom_crawler`
 
@@ -79,7 +79,7 @@
 
   * :doc:`/components/locale`
 
-* **Options Resolver**
+* **OptionsResolver**
 
   * :doc:`/components/options_resolver`
 
diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst
@@ -91,7 +91,7 @@ The second method has several specific advantages:
 
 .. index::
    single: Bundle; Extension
-   single: Dependency Injection; Extension
+   single: DependencyInjection; Extension
 
 Creating an Extension Class
 ---------------------------
diff --git a/cookbook/service_container/compiler_passes.rst b/cookbook/service_container/compiler_passes.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Compiler passes
+   single: DependencyInjection; 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,5 +1,5 @@
 .. index::
-   single: Dependency Injection; Scopes
+   single: DependencyInjection; Scopes
 
 How to work with Scopes
 =======================

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-HTTPKernel`
	`1`	`+HttpKernel`
`2`	`2`	`==========`
`3`	`3`
`4`	`4`	`.. toctree::`