diff --git a/assets/image/demo-html-editor.png b/assets/image/demo-html-editor.png
new file mode 100644
index 0000000..dd69451
Binary files /dev/null and b/assets/image/demo-html-editor.png differ
diff --git a/assets/image/edit-in-place-demo.gif b/assets/image/edit-in-place-demo.gif
new file mode 100644
index 0000000..9915f70
Binary files /dev/null and b/assets/image/edit-in-place-demo.gif differ
diff --git a/best-practice/index.rst b/best-practice/index.rst
index 73fff04..5f41785 100644
--- a/best-practice/index.rst
+++ b/best-practice/index.rst
@@ -36,8 +36,9 @@ they are used. The following table is a good rule of thumb.
    "**error.** foo", "For error messages."
    "**help.** foo", "For help text used with forms."
    "foo **.heading**", "For a heading."
-   "foo **.pragraph0**", "For the first paragraph after a heading."
-   "foo **.pragraph1**", "For the second paragraph after a heading."
+   "foo **.paragraph0**", "For the first paragraph after a heading."
+   "foo **.paragraph1**", "For the second paragraph after a heading."
+   "foo.paragraph2 **.html**", "A third paragraph where HTML is allowed inside the translation."
    "_foo", "Starting with underscore means the the translated string should start with a lowercase letter."
    "**foo**", "For any common strings like “Show all”, “Next”, “Yes” etc."
    "**vendor.bundle.controller.action.** foo", "For any non-reusable translation."
diff --git a/symfony/edit-in-place.rst b/symfony/edit-in-place.rst
index f0e6cba..f9ea3b6 100644
--- a/symfony/edit-in-place.rst
+++ b/symfony/edit-in-place.rst
@@ -1,4 +1,141 @@
-Edit in Place
-=============
+Symfony Edit In Place
+=====================
+
+The Symfony Edit In Place feature allow to edit translations directly in the context of the page, without altering the display styles and presentation.
+
+Users are able to change any translated text directly on a web page, and save them to your configured translation configurations.
+
+.. figure:: /assets/image/edit-in-place-demo.gif
+    :width: 900px
+    :align: center
+    :alt: Demonstration of the Edit In Place feature
+
+*Some translated string can't be translated via this feature, like HTML Input placeholder or title tag for example. The JavaScript part is using ContentTools by Anthony Blackshaw, which use the HTML contenteditable attribute.*
+
+Configuration
+-------------
+
+.. code-block:: yaml
+
+    # config/config.yml
+    translation:
+      # ..
+      edit_in_place:
+        enabled: true
+        # config_name: default
+        # activator: php_translation.edit_in_place.activator
+      # ..
+
+- ``config_name`` is the configuration to use;
+- ``activator`` is the activator service name, see below.
+
+.. code-block:: yaml
+
+    # config/routing.yml
+    _translation_edit_in_place:
+      resource: '@TranslationBundle/Resources/config/routing_edit_in_place.yml'
+      prefix:  /admin
+
+- this routing file expose the controller saving the modifications, it **must**:
+
+  - be in a protected area of your application;
+  - be in the production routing file.
+
+Usage
+-----
+
+To see the editor options on a page, the ``php_translation.edit_in_place.activator`` service needs to allow the Request. By default we provide a simple Activator based on a flag stored in the Symfony Session.
+
+You can activate the editor by calling:
+
+.. code-block:: php
+
+    $container->get('php_translation.edit_in_place.activator')->activate();
+
+Then browse your website and you should see the blue Edit button on the top left corner. If you change a translation and hit the Save button, the modifications are saved for the current locale. So if you want to edit a German translation you have to go on the German version of your website.
+
+You can deactivate the editor by calling:
+
+.. code-block:: php
+
+    $container->get('php_translation.edit_in_place.activator')->deactivate();
+
+Those calls have to be implemented by yourself.
+
+Building your own Activator
+---------------------------
+
+You can change the way the editor is activated by building your own Activator service, all you have to do in implement the ``Translation\Bundle\EditInPlace\ActivatorInterface`` interface.
+
+For example if you wish to display the editor based on a specific authorization role you could implement it that way:
+
+.. code-block:: php
+
+    <?php
+
+    namespace AppBundle;
+
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+    use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
+    use Translation\Bundle\EditInPlace\ActivatorInterface;
+
+    class RoleActivator implements ActivatorInterface
+    {
+        /**
+         * @var AuthorizationCheckerInterface
+         */
+        private $authorizationChecker;
+
+        public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+        {
+            $this->authorizationChecker = $authorizationChecker;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function checkRequest(Request $request = null)
+        {
+            try {
+                return $this->authorizationChecker->isGranted(['ROLE_ADMIN']);
+            } catch (AuthenticationCredentialsNotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+
+.. code-block:: yaml
+
+    # services.yml
+    services:
+      my_activator:
+        class: AppBundle\RoleActivator
+        arguments: ["@security.authorization_checker"]
+
+And then use this new activator in the bundle configuration:
+
+.. code-block:: yaml
+
+    # config/config.yml
+    translation:
+      # ..
+      edit_in_place:
+        activator: my_activator
+      # ..
+
+The Editor toolbox for HTML
+---------------------------
+
+What is allowed inside the edited text is handled by our JavaScript. So if you follow the :doc:`../best-practice/index` and finish your translation keys with ``.html`` when you want to allow HTML, the editor comes with full power:
+
+.. figure:: /assets/image/demo-html-editor.png
+    :width: 992px
+    :align: center
+    :alt: HTML Editor options
+
+Please refer to ContentTools_ documentation for more information.
+
+.. _ContentTools: http://getcontenttools.com/
 
-TODO https://github.com/php-translation/symfony-bundle/pull/23