Skip to content

Commit f6992a8

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: (31 commits) Minor tweaks! Tweaks! Fixed some misconfigured redirections Tweaks thanks to comments minor tweaks Completely updating the configuration main chapter to talk about parameters and a few other details more tweaks Moving configuration/configuration.rst -> configuration.rst Tweaks thanks to Javier Updating and massively shortening page creation Moving http_fundamentals into introduction Moving web server configuration out of configuration - it has nothing to do with Symfony configuration Fixing references Moving logging/monolog.rst to /logging.rst, removing some sections from it, rewriting others Another batch of build error fixes language tweak Renaming installation.rst -> setup.rst && set_up.rst to setup.rst minor tweaks Re-adding simple final thoughts to templating putting final thoughts back ...
2 parents 504214b + b4866bd commit f6992a8

File tree

85 files changed

+4146
-4299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+4146
-4299
lines changed

_includes/_rewrite_rule_tip.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. tip::
22

33
By using rewrite rules in your
4-
:doc:`web server configuration </configuration/web_server_configuration>`,
4+
:doc:`web server configuration </setup/web_server_configuration>`,
55
the ``index.php`` won't be needed and you will have beautiful, clean URLs
66
(e.g. ``/show``).

best_practices/creating-the-project.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Installer**, which has to be installed before creating your first project.
1212

1313
Use the Symfony Installer to create new Symfony-based projects.
1414

15-
Read the :doc:`installation chapter </installation>` of the Symfony Book to
15+
Read the :doc:`installation & setup chapter </setup>` of the Symfony Book to
1616
learn how to install and use the Symfony Installer.
1717

1818
.. _linux-and-mac-os-x-systems:

bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Templates
1212

1313
For information on overriding templates, see
1414

15-
* :ref:`overriding-bundle-templates`.
15+
* :doc:`/templating/overriding`.
1616
* :doc:`/bundles/inheritance`
1717

1818
Routing

cache/form_csrf_caching.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CSRF tokens are meant to be different for every user. This is why you
88
need to be cautious if you try to cache pages with forms including them.
99

1010
For more information about how CSRF protection works in Symfony, please
11-
check :ref:`CSRF Protection <forms-csrf>`.
11+
check :doc:`CSRF Protection </form/csrf_protection>`.
1212

1313
Why Caching Pages with a CSRF token is Problematic
1414
--------------------------------------------------

cache/varnish.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If you know for sure that the backend never uses sessions or basic
7777
authentication, have Varnish remove the corresponding header from requests to
7878
prevent clients from bypassing the cache. In practice, you will need sessions
7979
at least for some parts of the site, e.g. when using forms with
80-
:ref:`CSRF Protection <forms-csrf>`. In this situation, make sure to
80+
:doc:`CSRF Protection </form/csrf_protection>`. In this situation, make sure to
8181
:doc:`only start a session when actually needed </session/avoid_session_start>`
8282
and clear the session when it is no longer needed. Alternatively, you can look
8383
into :doc:`/cache/form_csrf_caching`.

components/form.rst

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ That's it! By printing ``form_widget(form)``, each field in the form is
522522
rendered, along with a label and error message (if there is one). As easy
523523
as this is, it's not very flexible (yet). Usually, you'll want to render each
524524
form field individually so you can control how the form looks. You'll learn how
525-
to do that in the ":ref:`form-rendering-template`" section.
525+
to do that in the ":doc:`/form/rendering`" section.
526526

527527
Changing a Form's Method and Action
528528
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -743,15 +743,6 @@ method to access the list of errors. It returns a
743743
This is useful, for example, if you want to use PHP's ``array_`` function
744744
on the form errors.
745745

746-
Learn More
747-
----------
748-
749-
.. toctree::
750-
:maxdepth: 1
751-
:glob:
752-
753-
form/*
754-
755746
.. _Packagist: https://packagist.org/packages/symfony/form
756747
.. _Twig: http://twig.sensiolabs.org
757748
.. _`Twig Configuration`: http://twig.sensiolabs.org/doc/intro.html

0 commit comments

Comments
 (0)