From a7e64b688f55d0689e2d749887bf3b42d9e97da3 Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Thu, 21 Mar 2013 22:11:52 +0100
Subject: [PATCH 1/2] Added composer changes

---
 cookbook/configuration/override_dir_structure.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst
index 20d5184446f..31aeb973847 100644
--- a/cookbook/configuration/override_dir_structure.rst
+++ b/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

From 2639ae0dc3527832c353da03d5bb043a0cf6f66a Mon Sep 17 00:00:00 2001
From: WouterJ <waldio.webdesign@gmail.com>
Date: Thu, 21 Mar 2013 22:12:43 +0100
Subject: [PATCH 2/2] Document override charset

---
 reference/configuration/kernel.rst | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/reference/configuration/kernel.rst b/reference/configuration/kernel.rst
index 026f475518b..24566753ebb 100644
--- a/reference/configuration/kernel.rst
+++ b/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
 ~~~~~~~~~~~