Merge pull request #2332 from WouterJ/doc_override_dir_21

[#1519] Added charset configuration and composer to "override dir structure"

Author: weaverryan

cookbook/configuration/override_dir_structure.rst

@@ -91,6 +91,19 @@ may need to modify the paths inside these files::
     require_once __DIR__.'/../Symfony/app/bootstrap.php.cache';
     require_once __DIR__.'/../Symfony/app/AppKernel.php';
 
+Since Symfony 2.1 (in which Composer is introduced), you also need to change
+the ``extra.symfony-web-dir`` option in the ``composer.json`` file:
+
+.. code-block:: json
+
+    {
+        ...
+        "extra": {
+            ...
+            "symfony-web-dir": "my_new_web_dir"
+        }
+    }
+
 .. tip::
 
     Some shared hosts have a ``public_html`` web directory root. Renaming

reference/configuration/kernel.rst

@@ -11,11 +11,36 @@ the parent :class:`Symfony\\Component\\HttpKernel\\Kernel` class.
 Configuration
 -------------
 
+* `Charset`_
 * `Kernel Name`_
 * `Root Directory`_
 * `Cache Directory`_
 * `Log Directory`_
 
+.. versionadded:: 2.1
+    The :method:`Symfony\\Component\\HttpKernel\\Kernel::getCharset` method is new
+    in Symfony 2.1
+
+Charset
+~~~~~~~
+
+**type**: ``string`` **default**: ``UTF-8``
+
+This returns the charset that is used in the application. To change it, override the
+:method:`Symfony\\Component\\HttpKernel\\Kernel::getCharset` method and return another
+charset, for instance::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function getCharset()
+        {
+            return 'ISO-8859-1';
+        }
+    }
+
 Kernel Name
 ~~~~~~~~~~~