diff --git a/components/serializer.rst b/components/serializer.rst index 37645d83f71..e86d828b315 100644 --- a/components/serializer.rst +++ b/components/serializer.rst @@ -224,7 +224,7 @@ and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`:: $nameConverter = new OrgPrefixNameConverter(); $normalizer = new PropertyNormalizer(null, $nameConverter); - $serializer = new Serializer(array(new JsonEncoder()), array($normalizer)); + $serializer = new Serializer(array($normalizer), array(new JsonEncoder())); $obj = new Company(); $obj->name = 'Acme Inc.'; diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst index c187890183f..17f8f72a637 100644 --- a/contributing/code/standards.rst +++ b/contributing/code/standards.rst @@ -165,10 +165,7 @@ Service Naming Conventions * Use lowercase letters for service and parameter names; -* A group name uses the underscore notation; - -* Each service has a corresponding parameter containing the class name, - following the ``SERVICE NAME.class`` convention. +* A group name uses the underscore notation. Documentation ------------- diff --git a/cookbook/logging/monolog_email.rst b/cookbook/logging/monolog_email.rst index af57caf09ad..1aafe4560af 100644 --- a/cookbook/logging/monolog_email.rst +++ b/cookbook/logging/monolog_email.rst @@ -7,7 +7,7 @@ How to Configure Monolog to Email Errors Monolog_ can be configured to send an email when an error occurs with an application. The configuration for this requires a few nested handlers in order to avoid receiving too many emails. This configuration looks -complicated at first but each handler is fairly straight forward when +complicated at first but each handler is fairly straightforward when it is broken down. .. configuration-block:: diff --git a/cookbook/security/form_login_setup.rst b/cookbook/security/form_login_setup.rst index 4d41cb5798e..1f9bb881730 100644 --- a/cookbook/security/form_login_setup.rst +++ b/cookbook/security/form_login_setup.rst @@ -215,7 +215,7 @@ Finally, create the template: {# ... you will probably extends your base template, like base.html.twig #} {% if error %} -