Merge branch '2.3' into 2.4

symfony · Jun 11, 2014 · d45a60f · d45a60f
2 parents 04f4318 + 06e3d97
commit d45a60f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/book/translation.rst b/book/translation.rst
@@ -647,7 +647,7 @@ Translating Database Content
 
 The translation of database content should be handled by Doctrine through
 the `Translatable Extension`_ or the `Translatable Behavior`_ (PHP 5.4+).
-For more information, see the documentation for thes libraries.
+For more information, see the documentation for these libraries.
 
 Summary
 -------

diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -92,6 +92,8 @@ Files and Directories
 * When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
   top level directory. E.g.
 
+  .. code-block:: text
+
       your-project/
       ├─ app/
       ├─ src/