Skip to content

Commit 6a5a17a

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: typo fix in speaker mentoring Added link to bcrypt (Wikipedia) Added a caution note about the checkMX option clarify the datetime format option
2 parents f4c9872 + 944aeae commit 6a5a17a

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

contributing/community/speaker-mentoring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public speaker. They can even do practice runs via video chat!
3333
Furthermore, they can also be an ally when it comes to the day of
3434
giving the talk at a conference!
3535

36-
A great resource with advice on everything related to`public speaking`_
36+
A great resource with advice on everything related to `public speaking`_
3737
is a collection of links maintained by VM (Vicky) Brasseur. It covers
3838
everything from finding a conference call for proposals, how to
3939
refine a proposal, to how to put together slide decks to practical

doctrine/registration_form.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ With some validation added, your class may look something like this::
8787
* @ORM\Column(type="string", length=64)
8888
*/
8989
private $password;
90-
90+
9191
/**
9292
* @ORM\Column(type="array")
9393
*/
@@ -146,7 +146,7 @@ With some validation added, your class may look something like this::
146146
// You *may* need a real salt if you choose a different encoder.
147147
return null;
148148
}
149-
149+
150150
public function getRoles()
151151
{
152152
return $this->roles;
@@ -318,7 +318,7 @@ encoder in the security configuration:
318318
),
319319
));
320320
321-
In this case the recommended ``bcrypt`` algorithm is used. If needed, check out
321+
In this case the recommended `bcrypt`_ algorithm is used. If needed, check out
322322
the :ref:`user password encoding <security-encoding-user-password>` article.
323323

324324
.. note::
@@ -455,3 +455,4 @@ us to add validation, even though there is no ``termsAccepted`` property on ``Us
455455

456456
.. _`CVE-2013-5750`: https://symfony.com/blog/cve-2013-5750-security-issue-in-fosuserbundle-login-form
457457
.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
458+
.. _`bcrypt`: https://en.wikipedia.org/wiki/Bcrypt

reference/constraints/Email.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ checkMX
117117
If true, then the :phpfunction:`checkdnsrr` PHP function will be used to
118118
check the validity of the MX record of the host of the given email.
119119

120+
.. caution::
121+
122+
This option is not reliable because it depends on the network conditions
123+
and some valid servers refuse to respond to those requests.
124+
120125
checkHost
121126
~~~~~~~~~
122127

reference/forms/types/datetime.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ format
107107

108108
If the ``widget`` option is set to ``single_text``, this option specifies
109109
the format of the input, i.e. how Symfony will interpret the given input
110-
as a datetime string. It defaults to the `RFC 3339`_ format which is used
111-
by the HTML5 ``datetime`` field. Keeping the default value will cause the
112-
field to be rendered as an ``input`` field with ``type="datetime"``. For
113-
more information on valid formats, see `Date/Time Format Syntax`_.
110+
as a datetime string. It defaults to the `datetime local`_ format which is
111+
used by the HTML5 ``datetime-local`` field. Keeping the default value will
112+
cause the field to be rendered as an ``input`` field with ``type="datetime-local"``.
113+
For more information on valid formats, see `Date/Time Format Syntax`_.
114114

115115
.. include:: /reference/forms/types/options/hours.rst.inc
116116

@@ -214,5 +214,5 @@ Field Variables
214214
| | | contains the input type to use (``datetime``, ``date`` or ``time``). |
215215
+----------+------------+----------------------------------------------------------------------+
216216

217-
.. _`RFC 3339`: https://tools.ietf.org/html/rfc3339
217+
.. _`datetime local`: http://w3c.github.io/html-reference/datatypes.html#form.data.datetime-local
218218
.. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax

0 commit comments

Comments
 (0)