Skip to content

Commit 67b4d21

Browse files
committed
Merge branch '2.3'
2 parents 957bca4 + 08ef9f8 commit 67b4d21

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

book/forms.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,9 @@ used the ``form_row`` helper:
806806
{{ form_widget(form.dueDate) }}
807807
</div>
808808

809-
<input type="submit" />
809+
<div>
810+
{{ form_widget(form.save) }}
811+
</div>
810812

811813
{{ form_end(form) }}
812814

@@ -828,7 +830,9 @@ used the ``form_row`` helper:
828830
<?php echo $view['form']->widget($form['dueDate']) ?>
829831
</div>
830832

831-
<input type="submit" />
833+
<div>
834+
<?php echo $view['form']->widget($form['save']) ?>
835+
</div>
832836

833837
<?php echo $view['form']->end($form) ?>
834838

cookbook/logging/monolog_email.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ to and from addresses and the subject.
107107
You can combine these handlers with other handlers so that the errors still
108108
get logged on the server as well as the emails being sent:
109109

110+
.. caution::
111+
112+
The default spool setting for swiftmailer is set to ``memory``, which
113+
means that emails are sent at the very end of the request. However, this
114+
does not work with buffered logs at the moment. In order to enable emailing
115+
logs per the example below, you must comment out the ``spool: { type: memory }``
116+
line in the ``config.yml`` file.
117+
110118
.. configuration-block::
111119

112120
.. code-block:: yaml

reference/constraints/NotEqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,4 @@ message
9898

9999
**type**: ``string`` **default**: ``This value should not be equal to {{ compared_value }}``
100100

101-
This is the message that will be shown if the value is not equal.
101+
This is the message that will be shown if the value is equal.

0 commit comments

Comments
 (0)