symfony · monofone · Feb 14, 2011 · Feb 14, 2011 · Mar 17, 2010 · Feb 12, 2011
diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst
@@ -29,7 +29,7 @@ When an object has a "main" many relation with related "things"
 The usage of these methods are only allowed when it is clear that there
 is a main relation:
 
-* a ``CookieJar`` has many ``Cookie``s;
+* a ``CookieJar`` has many ``Cookie`` objects;
 
 * a Service ``Container`` has many services and many parameters (as services
   is the main relation, we use the naming convention for this relation);

diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst
@@ -124,7 +124,7 @@ Check that all tests still pass and push your branch remotely:
 You can now discuss your patch on the `dev mailing-list`_ or make a pull
 request (they must be done on the ``fabpot/symfony`` repository).
 
-If you are going to send and email to the mailing-list, don't forget to
+If you are going to send an email to the mailing-list, don't forget to
 reference you branch URL (``http://github.com/USERNAME/symfony.git
 BRANCH_NAME``).
 

diff --git a/glossary.rst b/glossary.rst
@@ -23,4 +23,20 @@ Glossary
         A *Front Controller* is a short PHP that lives in the web directory
         of your project. Typically, *all* requests are handled by executing
         the same front controller, whose job is to bootstrap the Symfony
-        application.
+        application.
+
+    Service
+        A *Service* is a generic term for any PHP object that performs a
+        specific task. In Symfony2, services are often configured and retrieved
+        from the service container. An application that has many decoupled
+        services is said to follow a `service-oriented architecture`_
+
+    Service Container
+        A *Service Container*, also known as a *Dependency Injection Container*,
+        is a special object that manages the instantiation of services inside
+        an application. Instead of creating services directly, the developer
+        *trains* the service container (via configuration) on how to create
+        the services. The service container takes care of lazily instantiating
+        and injecting dependent services.
+
+.. _`service-oriented architecture`: http://wikipedia.org/wiki/Service-oriented_architecture
diff --git a/guides/forms/fields.rst b/guides/forms/fields.rst
@@ -37,7 +37,7 @@ this initial value, you can set it in the ``data`` option.
 
     When you set the ``data`` option, the field will also not write the the
     domain object, because the ``property_path`` option will implicitely be
-    ``null``. Read ```property_path```_ for more information.
+    ``null``. Read :ref:`form-field-property_path` for more information.
 
 ``required``
 ~~~~~~~~~~~~
@@ -92,6 +92,8 @@ set the ``trim`` option to ``false``.
 
     assert('   Data   ' === $field->getData());
 
+.. _form-field-property_path:
+
 ``property_path``
 ~~~~~~~~~~~~~~~~~
 
@@ -212,26 +214,5 @@ Symfony2 ships with the following fields:
 
     fields/index
 
-* :doc:`BirthdayField <fields/BirthdayField>`
-* :doc:`CheckboxField <fields/CheckboxField>`
-* :doc:`ChoiceField <fields/ChoiceField>`
-* :doc:`CollectionField <fields/CollectionField>`
-* :doc:`CountryField <fields/CountryField>`
-* :doc:`DateField <fields/DateField>`
-* :doc:`DateTimeField <fields/DateTimeField>`
-* :doc:`EntityChoiceField <fields/EntityChoiceField>`
-* :doc:`FileField <fields/FileField>`
-* :doc:`HiddenField <fields/HiddenField>`
-* :doc:`IntegerField <fields/IntegerField>`
-* :doc:`LanguageField <fields/LanguageField>`
-* :doc:`LocaleField <fields/LocaleField>`
-* :doc:`MoneyField <fields/MoneyField>`
-* :doc:`NumberField <fields/NumberField>`
-* :doc:`PasswordField <fields/PasswordField>`
-* :doc:`PercentField <fields/PercentField>`
-* :doc:`RepeatedField <fields/RepeatedField>`
-* :doc:`TextareaField <fields/TextareaField>`
-* :doc:`TextField <fields/TextField>`
-* :doc:`TimeField <fields/TimeField>`
-* :doc:`TimezoneField <fields/TimezoneField>`
-* :doc:`UrlField <fields/UrlField>`
+.. include:: fields/map.rst.inc
+
diff --git a/guides/forms/fields/BirthdayField.rst b/guides/forms/fields/BirthdayField.rst
@@ -0,0 +1,5 @@
+BirthdayField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\BirthdayField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/CheckboxField.rst b/guides/forms/fields/CheckboxField.rst
@@ -0,0 +1,5 @@
+CheckboxField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\CheckboxField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/ChoiceField.rst b/guides/forms/fields/ChoiceField.rst
@@ -0,0 +1,5 @@
+ChoiceField
+===========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\ChoiceField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/CountryField.rst b/guides/forms/fields/CountryField.rst
@@ -0,0 +1,5 @@
+CountryField
+============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\CountryField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/DateField.rst b/guides/forms/fields/DateField.rst
@@ -0,0 +1,5 @@
+DateField
+=========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\DateField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/DateTimeField.rst b/guides/forms/fields/DateTimeField.rst
@@ -0,0 +1,5 @@
+DateTimeField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\DateTimeField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/EntityChoiceField.rst b/guides/forms/fields/EntityChoiceField.rst
@@ -0,0 +1,5 @@
+EntityChoiceField
+=================
+
+Documentation for the  :class:`Symfony\\Component\\Form\\EntityChoiceField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/FileField.rst b/guides/forms/fields/FileField.rst
@@ -0,0 +1,5 @@
+FileField
+=========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\FileField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/HiddenField.rst b/guides/forms/fields/HiddenField.rst
@@ -0,0 +1,5 @@
+HiddenField
+===========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\HiddenField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/IntegerField.rst b/guides/forms/fields/IntegerField.rst
@@ -0,0 +1,5 @@
+IntegerField
+============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\IntegerField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/LanguageField.rst b/guides/forms/fields/LanguageField.rst
@@ -0,0 +1,5 @@
+LanguageField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\LanguageField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/LocaleField.rst b/guides/forms/fields/LocaleField.rst
@@ -0,0 +1,5 @@
+LocaleField
+===========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\LocaleField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/MoneyField.rst b/guides/forms/fields/MoneyField.rst
@@ -0,0 +1,5 @@
+MoneyField
+==========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\MoneyField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/NumberField.rst b/guides/forms/fields/NumberField.rst
@@ -0,0 +1,5 @@
+NumberField
+===========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\NumberField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/PasswordField.rst b/guides/forms/fields/PasswordField.rst
@@ -0,0 +1,5 @@
+PasswordField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\PasswordField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/PercentField.rst b/guides/forms/fields/PercentField.rst
@@ -0,0 +1,5 @@
+PercentField
+============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\PercentField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/TextField.rst b/guides/forms/fields/TextField.rst
@@ -0,0 +1,5 @@
+TextField
+=========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\TextField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/TextareaField.rst b/guides/forms/fields/TextareaField.rst
@@ -0,0 +1,5 @@
+TextareaField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\TextareaField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/TimeField.rst b/guides/forms/fields/TimeField.rst
@@ -0,0 +1,5 @@
+TimeField
+=========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\TimeField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/TimezoneField.rst b/guides/forms/fields/TimezoneField.rst
@@ -0,0 +1,5 @@
+TimezoneField
+=============
+
+Documentation for the  :class:`Symfony\\Component\\Form\\TimezoneField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/UrlField.rst b/guides/forms/fields/UrlField.rst
@@ -0,0 +1,5 @@
+UrlField
+========
+
+Documentation for the  :class:`Symfony\\Component\\Form\\UrlField`
+class is currently only available via the generated API.
diff --git a/guides/forms/fields/index.rst b/guides/forms/fields/index.rst
@@ -0,0 +1,34 @@
+Built-in Fields
+===============
+
+Symfony2 ships with the following fields:
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   BirthdayField
+   CheckboxField
+   ChoiceField
+   CollectionField
+   CountryField
+   DateField
+   DateTimeField
+   EntityChoiceField
+   FileField
+   HiddenField
+   IntegerField
+   LanguageField
+   LocaleField
+   MoneyField
+   NumberField
+   PasswordField
+   PercentField
+   RepeatedField
+   TextareaField
+   TextField
+   TimeField
+   TimezoneField
+   UrlField
+
+.. include:: map.rst.inc
diff --git a/guides/forms/fields/map.rst.inc b/guides/forms/fields/map.rst.inc
@@ -0,0 +1,23 @@
+* :doc:`BirthdayField </guides/forms/fields/BirthdayField>`
+* :doc:`CheckboxField </guides/forms/fields/CheckboxField>`
+* :doc:`ChoiceField </guides/forms/fields/ChoiceField>`
+* :doc:`CollectionField </guides/forms/fields/CollectionField>`
+* :doc:`CountryField </guides/forms/fields/CountryField>`
+* :doc:`DateField </guides/forms/fields/DateField>`
+* :doc:`DateTimeField </guides/forms/fields/DateTimeField>`
+* :doc:`EntityChoiceField </guides/forms/fields/EntityChoiceField>`
+* :doc:`FileField </guides/forms/fields/FileField>`
+* :doc:`HiddenField </guides/forms/fields/HiddenField>`
+* :doc:`IntegerField </guides/forms/fields/IntegerField>`
+* :doc:`LanguageField </guides/forms/fields/LanguageField>`
+* :doc:`LocaleField </guides/forms/fields/LocaleField>`
+* :doc:`MoneyField </guides/forms/fields/MoneyField>`
+* :doc:`NumberField </guides/forms/fields/NumberField>`
+* :doc:`PasswordField </guides/forms/fields/PasswordField>`
+* :doc:`PercentField </guides/forms/fields/PercentField>`
+* :doc:`RepeatedField </guides/forms/fields/RepeatedField>`
+* :doc:`TextareaField </guides/forms/fields/TextareaField>`
+* :doc:`TextField </guides/forms/fields/TextField>`
+* :doc:`TimeField </guides/forms/fields/TimeField>`
+* :doc:`TimezoneField </guides/forms/fields/TimezoneField>`
+* :doc:`UrlField </guides/forms/fields/UrlField>`
diff --git a/guides/index.rst b/guides/index.rst
@@ -18,6 +18,7 @@ Dive into Symfony2 with the topical guides:
     event/index
     tools/index
     bundles/index
+    service_container/index
     internals/index
     symfony1
     stable_api

diff --git a/guides/internals/overview.rst b/guides/internals/overview.rst
@@ -62,7 +62,7 @@ Dependency Injection component and a powerful plugin system (bundles).
 .. seealso::
 
     Read more about the :doc:`HttpKernel <kernel>` component. Read more about
-    :doc:`Dependency Injection </guides/dependency_injection/index>` and
+    :doc:`Dependency Injection </guides/service_container/index>` and
     :doc:`Bundles </guides/bundles/index>`.
 
 ``FrameworkBundle`` Bundle

diff --git a/guides/map.rst.inc b/guides/map.rst.inc
@@ -28,7 +28,8 @@
 * **Forms**:
 
   * :doc:`Overview </guides/forms/overview>` |
-  * :doc:`Templates </guides/forms/view>`
+  * :doc:`Templates </guides/forms/view>` |
+  * :doc:`Form Fields </guides/forms/fields>`
 
 * **Security**:
 
@@ -63,9 +64,10 @@
   * :doc:`Best Practices </guides/bundles/best_practices>` |
   * :doc:`Configuration </guides/bundles/configuration>`
 
-* **Dependency Injection**:
+* **Service Container**:
 
-  * :doc:`Extensions </guides/dependency_injection/extensions>`
+  * :doc:`Service Container </guides/service_container/index>`
+  * :doc:`Extensions </guides/service_container/extensions>`
 
 * **Internals**:
 

diff --git a/guides/security/authorization.rst b/guides/security/authorization.rst
@@ -81,12 +81,15 @@ Access control rules can match a request in many different ways:
                 - { path: /admin/.*, role: ROLE_ADMIN }
 
                 # match the controller class name
-                - { controller: .*\\.*Bundle\\Admin\\.*, role: ROLE_ADMIN }
+                - 
+                    attributes:
+                        _controller: '.*Bundle\\\.*\\\Admin.*'
+                    role: ROLE_ADMIN 
 
                 # match any request attribute
                 -
                     attributes:
-                        - { key: _controller, pattern: .*\\.*Bundle\\Admin\\.* }
+                        - { key: _controller, pattern: '.*Bundle\\\.*\\\Admin.*' }
                     role: ROLE_ADMIN
 
     .. code-block:: xml
@@ -98,11 +101,13 @@ Access control rules can match a request in many different ways:
                 <rule path="/admin/.*" role="ROLE_ADMIN" />
 
                 <!-- match the controller class name -->
-                <rule controller=".*\\.*Bundle\\Admin\\.*" role="ROLE_ADMIN" />
+                <rule role="ROLE_ADMIN">
+                  <attribute key="_controller" pattern=".*Bundle\\\.*\\\Admin.*" />
+                </rule>
 
                 <!-- match any request attribute -->
                 <rule role="ROLE_ADMIN">
-                    <attribute key="_controller" pattern=".*\\.*Bundle\\Admin\\.*" />
+                    <attribute key="_controller" pattern=".*Bundle\\\.*\\\Admin.*" />
                 </rule>
             </access-control>
         </config>
@@ -116,12 +121,15 @@ Access control rules can match a request in many different ways:
                 array('path' => '/admin/.*', 'role' => 'ROLE_ADMIN'),
 
                 // match the controller class name
-                array('controller' => '.*\\.*Bundle\\Admin\\.*', 'role' => 'ROLE_ADMIN'),
+                array(
+                      'attributes' => array('controller' => '.*Bundle\\\.*\\\Admin.*'),
+                      'role' => 'ROLE_ADMIN'
+                    ),
 
                 // match any request attribute
                 array(
                     'attributes' => array(
-                        array('key' => '_controller', 'pattern' => '.*\\.*Bundle\\Admin\\.*'),
+                        array('key' => '_controller', 'pattern' => '.*Bundle\\\.*\\\Admin.*'),
                     ),
                     'role' => 'ROLE_ADMIN',
                 ),