Merge branch '3.0' into 3.1

xabbuh · xabbuh · commit 8594d987783b · 2016-07-28T22:54:39.000+02:00
* 3.0:
  fix syntax errors
  fix code block indentation
diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst
@@ -294,6 +294,6 @@ Learn More
     :glob:
 
     /components/dependency_injection/*
-    /dependency_injection/*
+    /service_container/*
 
 .. _Packagist: https://packagist.org/packages/symfony/dependency-injection
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -746,7 +746,7 @@ Learn more
 ----------
 
 .. toctree::
-   :maxlength: 1
+   :maxdepth: 1
    :glob:
 
    /reference/events
diff --git a/components/translation.rst b/components/translation.rst
@@ -222,7 +222,7 @@ Learn More
     /components/translation/*
     /translation
     /translation/*
-    /validation/translation
+    /validation/translations
 
 .. _Packagist: https://packagist.org/packages/symfony/translation
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -183,7 +183,7 @@ about the request, the query parameters, security details and database queries:
 
 .. image:: /_images/quick_tour/profiler.png
    :align: center
-   : class: with-browser
+   :class: with-browser
 
 This tool provides so much internal information about your application that
 you may be worried about your visitors accessing sensible information. Symfony
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -125,11 +125,11 @@ convention, the old ``app.mailer`` service is renamed to
 
         .. code-block:: yaml
 
-        services:
-            app.mailer:
-                # ...
-                decoration_inner_name: app.decorating_mailer.wooz
-                arguments: ['@app.decorating_mailer.wooz']
+            services:
+                app.mailer:
+                    # ...
+                    decoration_inner_name: app.decorating_mailer.wooz
+                    arguments: ['@app.decorating_mailer.wooz']
 
         .. code-block:: xml
 
diff --git a/setup/composer.rst b/setup/composer.rst
@@ -12,4 +12,5 @@ Since this article was first published, Composer installation has improved a lot
 Therefore, the original contents of this article have been removed and you are
 encourage to `install Composer`_ as explained in the official Composer documentation.
 
+.. _`Composer`: https://getcomposer.org/
 .. _`install Composer`: https://getcomposer.org/download/
