Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 17b584a790fd · 2013-11-03T11:36:07.000-06:00
Conflicts:
	book/templating.rst
diff --git a/book/forms.rst b/book/forms.rst
@@ -1865,7 +1865,7 @@ There's still much more to learn about the powerful world of forms, such as
 how to handle
 :doc:`file uploads with Doctrine </cookbook/doctrine/file_uploads>` or how
 to create a form where a dynamic number of sub-forms can be added (e.g. a
-todo list where you can keep adding more fields via Javascript before submitting).
+todo list where you can keep adding more fields via JavaScript before submitting).
 See the cookbook for these topics. Also, be sure to lean on the
 :doc:`field type reference documentation </reference/forms/types>`, which
 includes examples of how to use each field type and its options.
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -479,7 +479,7 @@ specific PHP method ``contactAction`` inside a class called ``MainController``::
 
 In this very simple example, the controller simply creates a
 :class:`Symfony\\Component\\HttpFoundation\\Response` object with the HTML
-``<h1>Contact us! </h1>``. In the :doc:`controller chapter </book/controller>`,
+``<h1>Contact us!</h1>``. In the :doc:`controller chapter </book/controller>`,
 you'll learn how a controller can render templates, allowing your "presentation"
 code (i.e. anything that actually writes out HTML) to live in a separate
 template file. This frees up the controller to worry only about the hard
@@ -524,14 +524,14 @@ regardless of how your project is developed. To name a few:
 * `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
+* `Validator`_ - A system for creating rules about data and then validating
   whether or not user-submitted data follows those rules;
 
-* :doc:`ClassLoader </components/class_loader/introduction>` An autoloading library that allows
+* :doc:`ClassLoader </components/class_loader/introduction>` - An autoloading library that allows
   PHP classes to be used without needing to manually ``require`` the files
   containing those classes;
 
-* :doc:`Templating </components/templating/introduction>` A toolkit for rendering
+* :doc:`Templating </components/templating/introduction>` - A toolkit for rendering
   templates, handling template inheritance (i.e. a template is decorated with
   a layout) and performing other common template tasks;
 
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -95,7 +95,7 @@ inside a bundle.
 
 A bundle is nothing more than a directory that houses everything related
 to a specific feature, including PHP classes, configuration, and even stylesheets
-and Javascript files (see :ref:`page-creation-bundles`).
+and JavaScript files (see :ref:`page-creation-bundles`).
 
 To create a bundle called ``AcmeHelloBundle`` (a play bundle that you'll
 build in this chapter), run the following command and follow the on-screen
diff --git a/book/security.rst b/book/security.rst
@@ -415,9 +415,9 @@ submission (i.e.  ``/login_check``):
     to this URL.
 
 .. versionadded:: 2.1
-    As of Symfony 2.1, you *must* have routes configured for your ``login_path``,
-    ``check_path`` ``logout`` keys. These keys can be route names (as shown
-    in this example) or URLs that have routes configured for them.
+    As of Symfony 2.1, you *must* have routes configured for your ``login_path``
+    and ``check_path``. These keys can be route names (as shown in this example)
+    or URLs that have routes configured for them.
 
 Notice that the name of the ``login`` route matches the ``login_path`` config
 value, as that's where the security system will redirect users that need
diff --git a/book/templating.rst b/book/templating.rst
@@ -676,7 +676,10 @@ that as much code as possible lives in reusable :doc:`services </book/service_co
 Asynchronous Content with hinclude.js
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Controllers can be embedded asynchronously using the hinclude.js_ javascript library.
+.. versionadded:: 2.1
+    hinclude.js support was added in Symfony 2.1
+
+Controllers can be embedded asynchronously using the hinclude.js_ JavaScript library.
 As the embedded content comes from another page (or controller for that matter),
 Symfony2 uses a version of the standard ``render`` function to configure ``hinclude``
 tags:
@@ -741,7 +744,7 @@ tags:
                 'fragments' => array('path' => '/_fragment'),
             ));
 
-Default content (while loading or if javascript is disabled) can be set globally
+Default content (while loading or if JavaScript is disabled) can be set globally
 in your application configuration:
 
 .. configuration-block::
@@ -971,7 +974,7 @@ correctly:
 Linking to Assets
 ~~~~~~~~~~~~~~~~~
 
-Templates also commonly refer to images, Javascript, stylesheets and other
+Templates also commonly refer to images, JavaScript, stylesheets and other
 assets. Of course you could hard-code the path to these assets (e.g. ``/images/logo.png``),
 but Symfony2 provides a more dynamic option via the ``asset`` Twig function:
 
@@ -1004,29 +1007,29 @@ look like ``/images/logo.png?v2``. For more information, see the :ref:`ref-frame
 configuration option.
 
 .. index::
-   single: Templating; Including stylesheets and Javascripts
+   single: Templating; Including stylesheets and JavaScripts
    single: Stylesheets; Including stylesheets
-   single: Javascript; Including Javascripts
+   single: JavaScript; Including JavaScripts
 
-Including Stylesheets and Javascripts in Twig
+Including Stylesheets and JavaScripts in Twig
 ---------------------------------------------
 
-No site would be complete without including Javascript files and stylesheets.
+No site would be complete without including JavaScript files and stylesheets.
 In Symfony, the inclusion of these assets is handled elegantly by taking
 advantage of Symfony's template inheritance.
 
 .. tip::
 
     This section will teach you the philosophy behind including stylesheet
-    and Javascript assets in Symfony. Symfony also packages another library,
+    and JavaScript assets in Symfony. Symfony also packages another library,
     called Assetic, which follows this philosophy but allows you to do much
     more interesting things with those assets. For more information on
     using Assetic see :doc:`/cookbook/assetic/asset_management`.
 
 Start by adding two blocks to your base template that will hold your assets:
 one called ``stylesheets`` inside the ``head`` tag and another called ``javascripts``
 just above the closing ``body`` tag. These blocks will contain all of the
-stylesheets and Javascripts that you'll need throughout your site:
+stylesheets and JavaScripts that you'll need throughout your site:
 
 .. code-block:: html+jinja
 
@@ -1049,7 +1052,7 @@ stylesheets and Javascripts that you'll need throughout your site:
     </html>
 
 That's easy enough! But what if you need to include an extra stylesheet or
-Javascript from a child template? For example, suppose you have a contact
+JavaScript from a child template? For example, suppose you have a contact
 page and you need to include a ``contact.css`` stylesheet *just* on that
 page. From inside that contact page's template, do the following:
 
diff --git a/book/validation.rst b/book/validation.rst
@@ -971,6 +971,18 @@ entity and a new constraint group called ``Premium``:
 
 .. configuration-block::
 
+    .. code-block:: yaml
+
+        # src/Acme/DemoBundle/Resources/config/validation.yml
+        Acme\DemoBundle\Entity\User:
+            properties:
+                name:
+                    - NotBlank
+                creditCard:
+                    - CardScheme
+                        schemes: [VISA]
+                        groups: [Premium]
+
     .. code-block:: php-annotations
 
         // src/Acme/DemoBundle/Entity/User.php
@@ -996,18 +1008,6 @@ entity and a new constraint group called ``Premium``:
             private $creditCard;
         }
 
-    .. code-block:: yaml
-
-        # src/Acme/DemoBundle/Resources/config/validation.yml
-        Acme\DemoBundle\Entity\User:
-            properties:
-                name:
-                    - NotBlank
-                creditCard:
-                    - CardScheme
-                        schemes: [VISA]
-                        groups: [Premium]
-
     .. code-block:: xml
 
         <!-- src/Acme/DemoBundle/Resources/config/validation.xml -->
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -32,8 +32,8 @@ long and unwieldy expressions.
 
 Many developers -- particularly web developers -- are more comfortable
 using CSS selectors to find elements. As well as working in stylesheets,
-CSS selectors are used in Javascript with the ``querySelectorAll`` function
-and in popular Javascript libraries such as jQuery, Prototype and MooTools.
+CSS selectors are used in JavaScript with the ``querySelectorAll`` function
+and in popular JavaScript libraries such as jQuery, Prototype and MooTools.
 
 CSS selectors are less powerful than XPath, but far easier to write, read
 and understand. Since they are less powerful, almost all CSS selectors can
diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
@@ -7,7 +7,7 @@ How to Apply an Assetic Filter to a Specific File Extension
 Assetic filters can be applied to individual files, groups of files or even,
 as you'll see here, files that have a specific extension. To show you how
 to handle each option, let's suppose that you want to use Assetic's CoffeeScript
-filter, which compiles CoffeeScript files into Javascript.
+filter, which compiles CoffeeScript files into JavaScript.
 
 The main configuration is just the paths to coffee, node and node_modules.
 An example configuration might look like this:
diff --git a/cookbook/assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst
@@ -4,8 +4,8 @@
 How to Minify CSS/JS Files (using UglifyJs and UglifyCss)
 =========================================================
 
-`UglifyJs`_ is a javascript parser/compressor/beautifier toolkit. It can be used
-to combine and minify javascript assets so that they require less HTTP requests
+`UglifyJs`_ is a JavaScript parser/compressor/beautifier toolkit. It can be used
+to combine and minify JavaScript assets so that they require less HTTP requests
 and make your site load faster. `UglifyCss`_ is a css compressor/beautifier
 that is very similar to UglifyJs.
 
diff --git a/cookbook/assetic/yuicompressor.rst b/cookbook/assetic/yuicompressor.rst
@@ -103,7 +103,7 @@ the view layer, this work is done in your templates:
 
     The above example assumes that you have a bundle called ``AcmeFooBundle``
     and your JavaScript files are in the ``Resources/public/js`` directory under
-    your bundle. This isn't important however - you can include your Javascript
+    your bundle. This isn't important however - you can include your JavaScript
     files no matter where they are.
 
 With the addition of the ``yui_js`` filter to the asset tags above, you should
diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -48,7 +48,20 @@ following configuration snippet:
 
 .. code-block:: apache
 
-    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]   
+
+.. caution::
+
+    In Apache 2.4, ``Order allow,deny`` has been replaced by ``Require all granted``,
+    and hence you need to modify your Directory permission settings as follows:
+
+        .. code-block:: apache
+
+            <Directory /var/www/project/web>
+                # enable the .htaccess rewrites
+                AllowOverride All
+                Require all granted
+            </Directory>
 
 Nginx
 -----
diff --git a/cookbook/console/logging.rst b/cookbook/console/logging.rst
@@ -23,7 +23,7 @@ Manually logging from a console Command
 This one is really simple. When you create a console command within the full
 framework as described in ":doc:`/cookbook/console/console_command`", your command
 extends :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`.
-This means that you  can simply access the standard logger service through the
+This means that you can simply access the standard logger service through the
 container and use it to do the logging::
 
     // src/Acme/DemoBundle/Command/GreetCommand.php
diff --git a/cookbook/controller/error_pages.rst b/cookbook/controller/error_pages.rst
@@ -68,7 +68,7 @@ end-user, create a new template located at
 
 In addition to the standard HTML error page, Symfony provides a default error
 page for many of the most common response formats, including JSON
-(``error.json.twig``), XML (``error.xml.twig``) and even Javascript
+(``error.json.twig``), XML (``error.xml.twig``) and even JavaScript
 (``error.js.twig``), to name a few. To override any of these templates, just
 create a new file with the same name in the
 ``app/Resources/TwigBundle/views/Exception`` directory. This is the standard
diff --git a/cookbook/event_dispatcher/class_extension.rst b/cookbook/event_dispatcher/class_extension.rst
@@ -77,7 +77,7 @@ use this pattern of class extension:
             $this->stopPropagation();
         }
 
-        public function getReturnValue($val)
+        public function getReturnValue()
         {
             return $this->returnValue;
         }
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -5,7 +5,7 @@ CardScheme
     The CardScheme validation is new in Symfony 2.2.
 
 This constraint ensures that a credit card number is valid for a given credit card
-company. It can be used to validate the number before trying to initiate a payment 
+company. It can be used to validate the number before trying to initiate a payment
 through a payment gateway.
 
 +----------------+--------------------------------------------------------------------------+
@@ -23,7 +23,7 @@ Basic Usage
 -----------
 
 To use the ``CardScheme`` validator, simply apply it to a property or method
-on an  object that will contain a credit card number.
+on an object that will contain a credit card number.
 
 .. configuration-block::
 
@@ -103,7 +103,7 @@ schemes
 
 **type**: ``mixed`` [:ref:`default option <validation-default-option>`]
 
-This option is required and represents the name of the number scheme used to 
+This option is required and represents the name of the number scheme used to
 validate the credit card number, it can either be a string or an array. Valid
 values are:
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ use this pattern of class extension:`
`77`	`77`	`$this->stopPropagation();`
`78`	`78`	`}`
`79`	`79`
`80`		`- public function getReturnValue($val)`
	`80`	`+ public function getReturnValue()`
`81`	`81`	`{`
`82`	`82`	`return $this->returnValue;`
`83`	`83`	`}`