@@ -486,8 +486,10 @@ developer generate beautiful and readable PHP code:

 * ``outdent()``: Outdents the generated code (see ``Twig_Node_Block`` for a

   usage example).

-Creating a Twig Extension

+.. _creating_extensions:

+

+Creating an Extension

+---------------------

 The main motivation for writing an extension is to move often used code into a

 reusable class like adding support for internationalization. An extension can

@@ -330,7 +330,7 @@ escaping strategy), except those using the ``raw`` filter:

     {{ article.to_html|raw }}

 You can also change the escaping mode locally by using the ``autoescape`` tag

-(see the :doc:`autoescape<../tags/autoescape>` doc for the syntax used before

+(see the :doc:`autoescape<tags/autoescape>` doc for the syntax used before

 Twig 1.8):

 .. code-block:: jinja

@@ -8,8 +8,7 @@ Twig

     templates

     api

     advanced

-    extensions

-    hacking

+    internals

     recipes

     coding_standards

     tags/index

@@ -324,7 +324,7 @@ Using the Template name to set the default Escaping Strategy

 The ``autoescape`` option determines the default escaping strategy to use when

 no escaping is applied on a variable. When Twig is used to mostly generate

 HTML files, you can set it to ``html`` and explicitly change it to ``js`` when

-you have some dynamic JavaScript files thanks to the ``autoescape`` tag::

+you have some dynamic JavaScript files thanks to the ``autoescape`` tag:

 .. code-block:: jinja

@@ -710,7 +710,8 @@ Twig can be easily extended.

 If you are looking for new tags, filters, or functions, have a look at the Twig official

 `extension repository`_.

-If you want to create your own, read :doc:`extensions`.

+If you want to create your own, read the :ref:`Creating an

+Extension<creating_extensions>` chapter.

 .. _`Twig bundle`:              https://github.com/Anomareh/PHP-Twig.tmbundle

 .. _`Jinja syntax plugin`:      http://jinja.pocoo.org/2/documentation/integration