diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst index 821252113bf..57cd8933c4c 100644 --- a/contributing/documentation/standards.rst +++ b/contributing/documentation/standards.rst @@ -81,25 +81,6 @@ Configuration examples should show all supported formats using * **Validation**: YAML, Annotations, XML, PHP * **Doctrine Mapping**: Annotations, YAML, XML, PHP -Files and Directories -~~~~~~~~~~~~~~~~~~~~~ - -* When referencing directories, always add a trailing slash to avoid confusions - with regular files (e.g. *"execute the ``console`` script located at the ``app/`` - directory"*). -* When referencing file extensions explicitly, you should include a leading dot - for every extension (e.g. "*XML files use the ``.xml`` extension*"). -* 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/ - ├─ vendor/ - └─ ... - Example ~~~~~~~ @@ -133,6 +114,25 @@ Example In YAML you should put a space after ``{`` and before ``}`` (e.g. ``{ _controller: ... }``), but this should not be done in Twig (e.g. ``{'hello' : 'value'}``). +Files and Directories +--------------------- + +* When referencing directories, always add a trailing slash to avoid confusions + with regular files (e.g. "execute the ``console`` script located at the ``app/`` + directory"). +* When referencing file extensions explicitly, you should include a leading dot + for every extension (e.g. "XML files use the ``.xml`` extension"). +* 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/ + ├─ vendor/ + └─ ... + Language Standards ------------------ diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst index 73f2016c36c..2f0382e8984 100644 --- a/cookbook/configuration/override_dir_structure.rst +++ b/cookbook/configuration/override_dir_structure.rst @@ -10,18 +10,19 @@ directory structure is: .. code-block:: text - app/ - cache/ - config/ - logs/ - ... - src/ - ... - vendor/ - ... - web/ - app.php - ... + your-project/ + ├─ app/ + │ ├─ cache/ + │ ├─ config/ + │ ├─ logs/ + │ └─ ... + ├─ src/ + │ └─ ... + ├─ vendor/ + │ └─ ... + └─ web/ + ├─ app.php + └─ ... .. _override-cache-dir: @@ -94,7 +95,7 @@ may need to modify the paths inside these files:: Since Symfony 2.1 (in which Composer is introduced), you also need to change the ``extra.symfony-web-dir`` option in the ``composer.json`` file: -.. code-block:: json +.. code-block:: javascript { ...