8000 Rebased #3982 - Some minor fixes by wouterj · Pull Request #3986 · symfony/symfony-docs · GitHub
[go: up one dir, main page]
Skip to content

Rebased #3982 - Some minor fixes #3986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 2, 2014
Merged

Rebased #3982 - Some minor fixes #3986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cbf4d9
Fixed invalid nesting
wouterj Jun 30, 2014
0cd3d89
Reoutlined the standards
wouterj Jun 30, 2014
f43fa0d
comply to dir structure standards
wouterj Jun 30, 2014
be09679
tried fixing code block rendering
wouterj Jun 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
8000
Diff view
Diff view
38 changes: 19 additions & 19 deletions contributing/documentation/standards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~

Expand Down Expand Up @@ -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
------------------

Expand Down
27 changes: 14 additions & 13 deletions cookbook/configuration/override_dir_structure.rst
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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

{
...
Expand Down
0