Skip to content

Commit

Permalink
minor #5575 Move some articles from wrong sections (sylvaincombes, Wo…
Browse files Browse the repository at this point in the history
…uterJ)

This PR was merged into the 2.3 branch.

Discussion
----------

Move some articles from wrong sections

Finishes #5301

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets | #4416

Commits
-------

0b3da6f Moved mongodb article and cleanup
e755522 Fixing remaining reference of old emplacement of pdo_session_storage page due to the rebase
fb7be61 Move some articles from wrong sections, updated indexs
9e0f1b4 Move some articles from wrong sections
  • Loading branch information
xabbuh committed Aug 1, 2015
2 parents a4ec9e9 + 0b3da6f commit bde40f9
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 19 deletions.
2 changes: 0 additions & 2 deletions cookbook/configuration/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Configuration
using_parameters_in_dic
front_controllers_and_kernel
external_parameters
pdo_session_storage
apache_router
web_server_configuration
configuration_organization
mongodb_session_storage
2 changes: 1 addition & 1 deletion cookbook/controller/error_pages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ before, but also requires a thorough understanding of Symfony internals. Suppose
that your code throws specialized exceptions with a particular meaning to your
application domain.

:doc:`Writing your own event listener </cookbook/service_container/event_listener>`
:doc:`Writing your own event listener </cookbook/event_dispatcher/event_listener>`
for the ``kernel.exception`` event allows you to have a closer look at the exception
and take different actions depending on it. Those actions might include logging
the exception, redirecting the user to another page or rendering specialized
Expand Down
2 changes: 2 additions & 0 deletions cookbook/doctrine/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ Doctrine
resolve_target_entity
mapping_model_classes
registration_form
pdo_session_storage
mongodb_session_storage
console
File renamed without changes.
2 changes: 1 addition & 1 deletion cookbook/event_dispatcher/before_after_filters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Creating an Event Listener

Next, you'll need to create an event listener, which will hold the logic
that you want executed before your controllers. If you're not familiar with
event listeners, you can learn more about them at :doc:`/cookbook/service_container/event_listener`::
event listeners, you can learn more about them at :doc:`/cookbook/event_dispatcher/event_listener`::

// src/AppBundle/EventListener/TokenListener.php
namespace AppBundle\EventListener;
Expand Down
1 change: 1 addition & 0 deletions cookbook/event_dispatcher/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Event Dispatcher
.. toctree::
:maxdepth: 2

event_listener
before_after_filters
class_extension
method_behavior
19 changes: 10 additions & 9 deletions cookbook/map.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
* :doc:`/cookbook/configuration/using_parameters_in_dic`
* :doc:`/cookbook/configuration/front_controllers_and_kernel`
* :doc:`/cookbook/configuration/external_parameters`
* :doc:`/cookbook/configuration/pdo_session_storage`
* :doc:`/cookbook/configuration/apache_router`
* :doc:`/cookbook/configuration/web_server_configuration`
* :doc:`/cookbook/configuration/configuration_organization`
* :doc:`/cookbook/configuration/mongodb_session_storage`
* (Doctrine) :doc:`/cookbook/doctrine/pdo_session_storage`
* (Doctrine) :doc:`/cookbook/doctrine/mongodb_session_storage`

* :doc:`/cookbook/console/index`

Expand Down Expand Up @@ -77,8 +77,9 @@
* :doc:`/cookbook/doctrine/resolve_target_entity`
* :doc:`/cookbook/doctrine/mapping_model_classes`
* :doc:`/cookbook/doctrine/registration_form`
* :doc:`/cookbook/doctrine/pdo_session_storage`
* :doc:`/cookbook/doctrine/mongodb_session_storage`
* :doc:`/cookbook/doctrine/console`
* (configuration) :doc:`/cookbook/configuration/pdo_session_storage`

* :doc:`/cookbook/email/index`

Expand All @@ -94,7 +95,7 @@
* :doc:`/cookbook/event_dispatcher/before_after_filters`
* :doc:`/cookbook/event_dispatcher/class_extension`
* :doc:`/cookbook/event_dispatcher/method_behavior`
* (service container) :doc:`/cookbook/service_container/event_listener`
* :doc:`/cookbook/event_dispatcher/event_listener`

* :doc:`/cookbook/form/index`

Expand All @@ -108,8 +109,8 @@
* :doc:`/cookbook/form/unit_testing`
* :doc:`/cookbook/form/use_empty_data`
* :doc:`/cookbook/form/direct_submit`
* (validation) :doc:`/cookbook/validation/custom_constraint`
* (doctrine) :doc:`/cookbook/doctrine/file_uploads`
* (Validation) :doc:`/cookbook/validation/custom_constraint`
* (Doctrine) :doc:`/cookbook/doctrine/file_uploads`

* :doc:`/cookbook/frontend/index`

Expand Down Expand Up @@ -179,19 +180,19 @@

* :doc:`/cookbook/service_container/index`

* :doc:`/cookbook/service_container/event_listener`
* :doc:`/cookbook/service_container/scopes`
* :doc:`/cookbook/service_container/compiler_passes`
* (Event Dispatcher) :doc:`/cookbook/event_dispatcher/event_listener`

* :doc:`/cookbook/session/index`

* :doc:`/cookbook/session/proxy_examples`
* :doc:`/cookbook/session/locale_sticky_session`
* :doc:`/cookbook/session/sessions_directory`
* :doc:`/cookbook/session/php_bridge`
* (configuration) :doc:`/cookbook/configuration/pdo_session_storage`
* (configuration) :doc:`/cookbook/configuration/mongodb_session_storage`
* :doc:`/cookbook/session/avoid_session_start`
* (Doctrine) :doc:`/cookbook/doctrine/pdo_session_storage`
* (Doctrine) :doc:`/cookbook/doctrine/mongodb_session_storage`

* **PSR-7**

Expand Down
1 change: 0 additions & 1 deletion cookbook/service_container/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ Service Container
.. toctree::
:maxdepth: 2

event_listener
scopes
compiler_passes
2 changes: 1 addition & 1 deletion cookbook/session/locale_sticky_session.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Creating a LocaleListener
-------------------------

To simulate that the locale is stored in a session, you need to create and
register a :doc:`new event listener </cookbook/service_container/event_listener>`.
register a :doc:`new event listener </cookbook/event_dispatcher/event_listener>`.
The listener will look something like this. Typically, ``_locale`` is used
as a routing parameter to signify the locale, though it doesn't really matter
how you determine the desired locale from the request::
Expand Down
4 changes: 2 additions & 2 deletions cookbook/session/sessions_directory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ that your current sessions aren't lost when you clear Symfony's cache.
method of session management available within Symfony. See
:doc:`/components/http_foundation/session_configuration` for a
discussion of session save handlers. There are also entries in the cookbook
about storing sessions in a :doc:`relational database </cookbook/configuration/pdo_session_storage>`
or a :doc:`NoSQL database </cookbook/configuration/mongodb_session_storage>`.
about storing sessions in a :doc:`relational database </cookbook/doctrine/pdo_session_storage>`
or a :doc:`NoSQL database </cookbook/doctrine/mongodb_session_storage>`.

To change the directory in which Symfony saves session data, you only need
change the framework configuration. In this example, you will change the
Expand Down
3 changes: 3 additions & 0 deletions redirection_map
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@
/components/templating /components/templating/introduction
/cookbook/upgrading /cookbook/upgrade/index
/cookbook/security/voters_data_permission /cookbook/security/voters
/cookbook/configuration/pdo_session_storage /cookbook/doctrine/pdo_session_storage
/cookbook/configuration/mongodb_session_storage /cookbook/doctrine/mongodb_session_storage
/cookbook/service_container/event_listener /cookbook/event_dispatcher/event_listener
2 changes: 1 addition & 1 deletion reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ installation.
.. seealso::

You can see an example of the usage of this in
:doc:`/cookbook/configuration/pdo_session_storage`.
:doc:`/cookbook/doctrine/pdo_session_storage`.

name
....
Expand Down
2 changes: 1 addition & 1 deletion reference/dic_tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ kernel.event_listener
This tag allows you to hook your own classes into Symfony's process at different
points.

For a full example of this listener, read the :doc:`/cookbook/service_container/event_listener`
For a full example of this listener, read the :doc:`/cookbook/event_dispatcher/event_listener`
cookbook entry.

For another practical example of a kernel listener, see the cookbook
Expand Down

0 comments on commit bde40f9

Please sign in to comment.