From c7f2ee64fbb01e625199b825b2616d42ca92fe4b Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 8 Mar 2014 11:01:57 +0100 Subject: [PATCH 1/4] fixing doc roles --- components/security/authentication.rst | 2 +- cookbook/email/cloud.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/security/authentication.rst b/components/security/authentication.rst index 8a3b93a32ce..b4baae6b635 100644 --- a/components/security/authentication.rst +++ b/components/security/authentication.rst @@ -204,7 +204,7 @@ own, it just needs to follow these rules: :method:`Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface::isPasswordValid` must first of all make sure the password is not too long, i.e. the password length is no longer than 4096 characters. This is for security reasons (see `CVE-2013-5750`_), and you can use the - :method:`Symfony\\Component\\Security\\Core\\Encoder\\BasePasswordEncoder::isPasswordTooLong`_ + :method:`Symfony\\Component\\Security\\Core\\Encoder\\BasePasswordEncoder::isPasswordTooLong` method for this check: use Symfony\Component\Security\Core\Exception\BadCredentialsException; diff --git a/cookbook/email/cloud.rst b/cookbook/email/cloud.rst index 3f62afc746b..c409826a918 100644 --- a/cookbook/email/cloud.rst +++ b/cookbook/email/cloud.rst @@ -7,7 +7,7 @@ How to use the Cloud to Send Emails Requirements for sending emails from a production system differ from your development setup as you don't want to be limited in the number of emails, the sending rate or the sender address. Thus, -:doc:`using Gmail `_ or similar services is not an +:doc:`using Gmail ` or similar services is not an option. If setting up and maintaining your own reliable mail server causes you a headache there's a simple solution: Leverage the cloud to send your emails. From 72659e2e1b3c999f81668d75560222d8db9f0d29 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 13 Mar 2014 22:09:25 +0100 Subject: [PATCH 2/4] fix PHP code block --- components/form/type_guesser.rst | 2 +- components/security/authentication.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/form/type_guesser.rst b/components/form/type_guesser.rst index 2cdc6c02dac..652f350b1ac 100644 --- a/components/form/type_guesser.rst +++ b/components/form/type_guesser.rst @@ -74,7 +74,7 @@ that the type guesser cannot guess the type. The ``TypeGuess`` constructor requires 3 options: -* The type name (one of the :doc:`form types `); * Additional options (for instance, when the type is ``entity``, you also want to set the ``class`` option). If no types are guessed, this should be set to an empty array; diff --git a/components/security/authentication.rst b/components/security/authentication.rst index b4baae6b635..81268b3312f 100644 --- a/components/security/authentication.rst +++ b/components/security/authentication.rst @@ -205,7 +205,7 @@ own, it just needs to follow these rules: must first of all make sure the password is not too long, i.e. the password length is no longer than 4096 characters. This is for security reasons (see `CVE-2013-5750`_), and you can use the :method:`Symfony\\Component\\Security\\Core\\Encoder\\BasePasswordEncoder::isPasswordTooLong` - method for this check: + method for this check:: use Symfony\Component\Security\Core\Exception\BadCredentialsException; From 62586a4e6294bce5ca8b7e051aab302a86e0dfbd Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 13 Mar 2014 22:23:55 +0100 Subject: [PATCH 3/4] fix table syntax --- reference/constraints/Valid.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst index 5bb51a7d12e..635f0bddfd2 100644 --- a/reference/constraints/Valid.rst +++ b/reference/constraints/Valid.rst @@ -9,7 +9,7 @@ object and all sub-objects associated with it. | Applies to | :ref:`property or method ` | +----------------+---------------------------------------------------------------------+ | Options | - `traverse`_ | -| | - `message`_ | +| | - `message`_ | +----------------+---------------------------------------------------------------------+ | Class | :class:`Symfony\\Component\\Validator\\Constraints\\Type` | +----------------+---------------------------------------------------------------------+ From 62d4a9702111bae5240c1b8c103f8049470f0947 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 13 Mar 2014 22:24:14 +0100 Subject: [PATCH 4/4] fix seealso directive name --- reference/dic_tags.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index cbb8ca4c6a9..37dcc731a52 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -344,7 +344,7 @@ process. By default, form guessing is done by "guessers" based on the validation metadata and Doctrine metadata (if you're using Doctrine) or Propel metadata (if you're using Propel). -.. seelalso:: +.. seealso:: For information on how to create your own type guesser, see :doc:`/components/form/type_guesser`. @@ -847,7 +847,7 @@ swiftmailer.default.plugin If you're using a custom SwiftMailer plugin (or want to create one), you can register it with SwiftMailer by creating a service for your plugin and tagging -it with ``swiftmailer.default.plugin`` (it has no options). +it with ``swiftmailer.default.plugin`` (it has no options). .. note::