Skip to content

Commit e5117d0

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: Fix minor issue [EventDispatcher] Consolidation event dispatcher docs Fix some references Format syntaxes reference Replace warning with caution for consistency
2 parents 95f53ba + 51aac77 commit e5117d0

19 files changed

+1163
-1147
lines changed

_build/redirection_map

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,13 @@
156156
/cookbook/email/index /email
157157
/cookbook/email/spool /email/spool
158158
/cookbook/email/testing /email/testing
159-
/cookbook/event_dispatcher/before_after_filters /event_dispatcher/before_after_filters
159+
/cookbook/event_dispatcher/before_after_filters /event_dispatcher#event-dispatcher-before-after-filters
160+
/event_dispatcher/before_after_filters /event_dispatcher#event-dispatcher-before-after-filters
160161
/cookbook/event_dispatcher/class_extension /event_dispatcher/class_extension
161162
/cookbook/event_dispatcher/event_listener /event_dispatcher
162163
/cookbook/event_dispatcher/index /event_dispatcher
163164
/cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
165+
/event_dispatcher/method_behavior /event_dispatcher#event-dispatcher-method-behavior
164166
/cookbook/expressions /security/expressions
165167
/expressions /security/expressions
166168
/cookbook/form/create_custom_field_type /form/create_custom_field_type
@@ -542,8 +544,10 @@
542544
/components/security/secure_tools /security/passwords
543545
/components/security /security
544546
/components/var_dumper/advanced /components/var_dumper#advanced-usage
545-
/components/yaml/yaml_format /components/yaml#yaml-format
546-
/components/expression_language/syntax /components/expression_language#expression-language-syntax
547+
/components/yaml/yaml_format /reference/formats/yaml
548+
/components/expression_language/syntax /reference/formats/expression_language
549+
/components/expression_language/ast /components/expression_language#expression-language-ast
550+
/components/expression_language/caching /components/expression_language#expression-language-caching
547551
/components/expression_language/extending /components/expression_language#expression-language-extending
548552
/notifier/chatters /notifier#sending-chat-messages
549553
/notifier/texters /notifier#sending-sms

components/event_dispatcher.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,8 +513,7 @@ Learn More
513513
:maxdepth: 1
514514
:glob:
515515

516-
/components/event_dispatcher/*
517-
/event_dispatcher/*
516+
event_dispatcher
518517

519518
* :ref:`The kernel.event_listener tag <dic-tags-kernel-event-listener>`
520519
* :ref:`The kernel.event_subscriber tag <dic-tags-kernel-event-subscriber>`

0 commit comments

Comments
 (0)