Merge branch 'standardising_index_case' of https://github.com/richardmiller/symfony-docs into richardmiller-standardising_index_case

weaverryan · weaverryan · commit 26875e7b6793 · 2012-06-19T07:49:51.000-05:00
Conflicts:
	cookbook/bundles/best_practices.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/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: Bundle; 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
 ===================================================
diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst
@@ -1,5 +1,5 @@
 .. index::
-   pair: Assetic; Configuration Reference
+   pair: Assetic; Configuration reference
 
 AsseticBundle Configuration Reference
 =====================================
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -1,6 +1,6 @@
 .. index::
-   single: Doctrine; ORM Configuration Reference
-   single: Configuration Reference; Doctrine ORM
+   single: Doctrine; ORM configuration reference
+   single: Configuration reference; Doctrine ORM
 
 Configuration Reference
 =======================
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Configuration Reference; Framework
+   single: Configuration reference; Framework
 
 FrameworkBundle Configuration ("framework")
 ===========================================
diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst
@@ -1,5 +1,5 @@
 .. index::
-   pair: Monolog; Configuration Reference
+   pair: Monolog; Configuration reference
 
 Configuration Reference
 =======================
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Security; Configuration Reference
+   single: Security; Configuration reference
 
 Security Configuration Reference
 ================================
diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Configuration Reference; Swiftmailer
+   single: Configuration reference; Swiftmailer
 
 SwiftmailerBundle Configuration ("swiftmailer")
 ===============================================
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -1,5 +1,5 @@
 .. index::
-   pair: Twig; Configuration Reference
+   pair: Twig; Configuration reference
 
 TwigBundle Configuration Reference
 ==================================
diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst
@@ -1,23 +1,23 @@
-.. index::
-   single: Configuration Reference; WebProfiler
-
-WebProfilerBundle Configuration
-===============================
-
-Full Default Configuration
---------------------------
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        web_profiler:
-            
-            # display secondary information, disable to make the toolbar shorter
-            verbose:             true
-
-            # display the web debug toolbar at the bottom of pages with a summary of profiler info
-            toolbar:             false
-
-            # gives you the opportunity to look at the collected data before following the redirect
+.. index::
+   single: Configuration reference; WebProfiler
+
+WebProfilerBundle Configuration
+===============================
+
+Full Default Configuration
+--------------------------
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        web_profiler:
+            
+            # display secondary information, disable to make the toolbar shorter
+            verbose:             true
+
+            # display the web debug toolbar at the bottom of pages with a summary of profiler info
+            toolbar:             false
+
+            # gives you the opportunity to look at the collected data before following the redirect
             intercept_redirects: false
