Various tweaks to indexes - see #395

weaverryan · weaverryan · commit d9d25feaa71b · 2012-07-29T10:58:53.000-05:00
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -483,25 +483,28 @@ libraries that can be used inside *any* PHP project. These libraries, called
 the *Symfony2 Components*, contain something useful for almost any situation,
 regardless of how your project is developed. To name a few:
 
-* `HttpFoundation`_ - Contains the ``Request`` and ``Response`` classes, as
-  well as other classes for handling sessions and file uploads;
+* :doc:`HttpFoundation</components/http_foundation/introduction>` - Contains
+  the ``Request`` and ``Response`` classes, as well as other classes for handling
+  sessions and file uploads;
 
-* `Routing`_ - Powerful and fast routing system that allows you to map a
-  specific URI (e.g. ``/contact``) to some information about how that request
-  should be handled (e.g. execute the ``contactAction()`` method);
+* :doc:`Routing</components/routing>` - Powerful and fast routing system that
+  allows you to map a specific URI (e.g. ``/contact``) to some information
+  about how that request should be handled (e.g. execute the ``contactAction()``
+  method);
 
 * `Form`_ - A full-featured and flexible framework for creating forms and
   handling form submissions;
 
 * `Validator`_ A system for creating rules about data and then validating
   whether or not user-submitted data follows those rules;
 
-* `ClassLoader`_ An autoloading library that allows PHP classes to be used
-  without needing to manually ``require`` the files containing those classes;
+* :doc:`ClassLoader</components/class_loader>` An autoloading library that allows
+  PHP classes to be used without needing to manually ``require`` the files
+  containing those classes;
 
-* `Templating`_ A toolkit for rendering templates, handling template inheritance
-  (i.e. a template is decorated with a layout) and performing other common
-  template tasks;
+* :doc:`Templating</components/templating>` A toolkit for rendering templates,
+  handling template inheritance (i.e. a template is decorated with a layout)
+  and performing other common template tasks;
 
 * `Security`_ - A powerful library for handling all types of security inside
   an application;
@@ -541,11 +544,7 @@ sensible defaults. For more advanced users, the sky is the limit.
 .. _`List of HTTP status codes`: http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
 .. _`List of HTTP header fields`: http://en.wikipedia.org/wiki/List_of_HTTP_header_fields
 .. _`List of common media types`: http://en.wikipedia.org/wiki/Internet_media_type#List_of_common_media_types
-.. _`HttpFoundation`: https://github.com/symfony/HttpFoundation
-.. _`Routing`: https://github.com/symfony/Routing
 .. _`Form`: https://github.com/symfony/Form
 .. _`Validator`: https://github.com/symfony/Validator
-.. _`ClassLoader`: https://github.com/symfony/ClassLoader
-.. _`Templating`: https://github.com/symfony/Templating
 .. _`Security`: https://github.com/symfony/Security
 .. _`Translation`: https://github.com/symfony/Translation
diff --git a/components/class_loader.rst b/components/class_loader.rst
@@ -1,5 +1,6 @@
 .. index::
    pair: Autoloader; Configuration
+   single: Components; ClassLoader
 
 The ClassLoader Component
 =========================
diff --git a/components/config/introduction.rst b/components/config/introduction.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Config
+   single: Components; Config
 
 The Config Component
 ====================
diff --git a/components/console.rst b/components/console.rst
@@ -1,5 +1,6 @@
 .. index::
     single: Console; CLI
+    single: Components; Console
 
 The Console Component
 =====================
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -1,5 +1,6 @@
 .. index::
    single: CSS Selector
+   single: Components; CssSelector
 
 The CssSelector Component
 =========================
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -1,5 +1,6 @@
 ﻿.. index::
     single: Dependency Injection
+    single: Components; DependencyInjection
 
 The Dependency Injection Component
 ==================================
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -1,5 +1,6 @@
 .. index::
    single: DomCrawler
+   single: Components; DomCrawler
 
 The DomCrawler Component
 ========================
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Event Dispatcher
+   single: Components; EventDispatcher
 
 The Event Dispatcher Component
 ==============================
diff --git a/components/finder.rst b/components/finder.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Finder
+   single: Components; Finder
 
 The Finder Component
 ====================
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -1,6 +1,7 @@
 .. index::
    single: HTTP
    single: HttpFoundation
+   single: Components; HttpFoundation
 
 The HttpFoundation Component
 ============================
diff --git a/components/locale.rst b/components/locale.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Locale
+   single: Components; Locale
 
 The Locale Component
 ====================
diff --git a/components/process.rst b/components/process.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Process
+   single: Components; Process
 
 The Process Component
 =====================
diff --git a/components/templating.rst b/components/templating.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Templating
+   single: Components; Templating
 
 The Templating Component
 ========================
diff --git a/components/yaml.rst b/components/yaml.rst
@@ -1,5 +1,6 @@
 .. index::
    single: Yaml
+   single: Components; Yaml
 
 The YAML Component
 ==================
diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Bundles; Best practices
+   single: Bundle; 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: Bundle; Naming conventions
 
 .. _bundles-naming-conventions:
 
diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst
@@ -89,7 +89,7 @@ The second method has several specific advantages:
     be maintained.
 
 .. index::
-   single: Bundles; Extension
+   single: Bundle; Extension
    single: Dependency Injection; Extension
 
 Creating an Extension Class
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -1,5 +1,5 @@
 .. index::
-   single: Security, Voters
+   single: Security; Voters
 
 How to implement your own Voter to blacklist IP Addresses
 =========================================================
diff --git a/glossary.rst b/glossary.rst
@@ -109,7 +109,7 @@ Glossary
         application or for just a part of it. See the
         :doc:`/book/security` chapters.
 
-   YAML 
+   Yaml
         *YAML* is a recursive acronym for "YAML Ain't a Markup Language". It's a
         lightweight, humane data serialization language used extensively in
         Symfony2's configuration files.  See the :doc:`/components/yaml` 
