diff --git a/Resources/doc/cache-resolver/aws_s3.rst b/Resources/doc/cache-resolver/aws_s3.rst
index bddbe4b39..1f886b06b 100644
--- a/Resources/doc/cache-resolver/aws_s3.rst
+++ b/Resources/doc/cache-resolver/aws_s3.rst
@@ -85,7 +85,7 @@ names and create additional services!
 Additional options
 ------------------
 
-You can use `Cache <cache>`_ and `Proxy <proxy>`_ resolvers in chain with
+You can use :doc:`Cache <cache>` and :doc:`Proxy <proxy>` resolvers in chain with
 current. You just need to configure them with defined options.
 
 .. code-block:: yaml
@@ -98,8 +98,8 @@ current. You just need to configure them with defined options.
                   proxies: ['http://one.domain.com', 'http://two.domain.com']
                   cache: true
 
-If enabled both first one will be `Cache <cache>`_, then `Proxy <proxy>`_ and
-after all process delegates to AwsS3 resolver.
+If enabled both first one will be :doc:`Cache <cache>`, then :doc:`Proxy <proxy>`
+and after all process delegates to AwsS3 resolver.
 
 Object GET Options
 ------------------
diff --git a/Resources/doc/cache-resolvers.rst b/Resources/doc/cache-resolvers.rst
index b4c3c3b55..f83d64691 100644
--- a/Resources/doc/cache-resolvers.rst
+++ b/Resources/doc/cache-resolvers.rst
@@ -1,11 +1,11 @@
 Built-In CacheResolver
 ======================
 
-* `Web path <cache-resolver/web_path>`_
-* `AmazonS3 <cache-resolver/amazons3>`_
-* `AwsS3 <cache-resolver/aws_s3>`_ - for SDK version
-* `CacheResolver <cache-resolver/cache>`_
-* `ProxyResolver <cache-resolver/proxy>`_
+* :doc:`Web path <cache-resolver/web_path>`
+* :doc:`AmazonS3 <cache-resolver/amazons3>`
+* :doc:`AwsS3 <cache-resolver/aws_s3>` - for SDK version
+* :doc:`CacheResolver <cache-resolver/cache>`
+* :doc:`ProxyResolver <cache-resolver/proxy>`
 
 Changing the default cache resolver
 -----------------------------------
diff --git a/Resources/doc/configuration.rst b/Resources/doc/configuration.rst
index 322498b47..a4ecf411a 100644
--- a/Resources/doc/configuration.rst
+++ b/Resources/doc/configuration.rst
@@ -66,7 +66,7 @@ Each filter set that you specify has the following options:
 * ``filters`` - determine the type of filter to be used (refer to *Filters* section
   for more information) and options that should be passed to the specific filter type.
 * ``post_processors`` - sets post-processors to be applied on filtered image
-  (see Post-Processors section in the `filters chapter <filters>`_ for details).
+  (see Post-Processors section in the :doc:`filters chapter <filters>` for details).
 * ``quality`` - override the default quality of 100 for the generated images.
 * ``cache`` - override the default cache setting.
 * ``data_loader`` - override the default data loader.
diff --git a/Resources/doc/data-loaders.rst b/Resources/doc/data-loaders.rst
index 73735189a..dda8042d8 100644
--- a/Resources/doc/data-loaders.rst
+++ b/Resources/doc/data-loaders.rst
@@ -1,9 +1,9 @@
 Built-In DataLoader
 ===================
 
-* :doc:`FileSystem <data-loader/filesystem>`_
-* :doc:`MongoDB GridFS <data-loader/gridfs>`_
-* :doc:`Stream <data-loader/stream>`_
+* :doc:`FileSystem <data-loader/filesystem>`
+* :doc:`MongoDB GridFS <data-loader/gridfs>`
+* :doc:`Stream <data-loader/stream>`
 
 Other data loaders
 ------------------
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
index c581aeba0..0d62c003c 100644
--- a/Resources/doc/index.rst
+++ b/Resources/doc/index.rst
@@ -1,10 +1,10 @@
 LiipImagineBundle
 =================
 
-* :doc:`Installation <installation>`_
-* :doc:`Introduction <introduction>`_
-* :doc:`Configuration <configuration>`_
-* :doc:`Filters <filters>`_
-* :doc:`DataLoaders <data-loaders>`_
-* :doc:`CacheResolvers <cache-resolvers>`_
-* :doc:`CacheManager <cache-manager>`_
+* :doc:`Installation <installation>`
+* :doc:`Introduction <introduction>`
+* :doc:`Configuration <configuration>`
+* :doc:`Filters <filters>`
+* :doc:`DataLoaders <data-loaders>`
+* :doc:`CacheResolvers <cache-resolvers>`
+* :doc:`CacheManager <cache-manager>`
diff --git a/Resources/doc/introduction.rst b/Resources/doc/introduction.rst
index 3c83837fa..d4e9c4d9a 100644
--- a/Resources/doc/introduction.rst
+++ b/Resources/doc/introduction.rst
@@ -29,7 +29,7 @@ The most important parts about those ``DataLoader``:
 1. They ``find`` a single image based on a given identifier.
 2. They return a ready-to-use ``Imagine\Image\ImageInterface``.
 
-Check out the `chapter about data loaders <data-loaders>`_ to learn more about them.
+Check out the :doc:`chapter about data loaders <data-loaders>` to learn more about them.
 
 Apply filters on the original image
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -49,7 +49,7 @@ The filter has one objective: Apply itself on the provided image (loaded by the
 ``DataLoader``). It receives options to configure the actual result of it, to
 customize the outcome.
 
-Check out the `chapter about filters <filters>`_ to learn more about them.
+Check out the :doc:`chapter about filters <filters>` to learn more about them.
 
 Cache the filtered image
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -81,4 +81,4 @@ The responsibilities of the ``CacheResolver`` are:
 3. generate an URI to address the cached image directly,
 4. remove a cached image.
 
-Check out the `chapter about cache resolvers <cache-resolvers>`_ to learn more about them.
+Check out the :doc:`chapter about cache resolvers <cache-resolvers>` to learn more about them.