From c95678ad39be8ecbc0989116ac1c24a7ad1f43b3 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 14 Feb 2017 13:15:18 +0100 Subject: [PATCH 1/3] Fixed code syntax issues --- components/http_foundation.rst | 4 ++-- doctrine/custom_dql_functions.rst | 2 +- doctrine/resolve_target_entity.rst | 4 ++-- form/without_class.rst | 2 +- reference/forms/types/options/choice_value.rst.inc | 2 +- templating/twig_extension.rst | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/http_foundation.rst b/components/http_foundation.rst index 5895d7ab182..9b80132c0e6 100644 --- a/components/http_foundation.rst +++ b/components/http_foundation.rst @@ -241,8 +241,8 @@ the method tells you if the request contains a session which was started in one of the previous requests. -Accessing `Accept-*` Headers Data -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Accessing ``Accept-*`` Headers Data +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can easily access basic data extracted from ``Accept-*`` headers by using the following methods: diff --git a/doctrine/custom_dql_functions.rst b/doctrine/custom_dql_functions.rst index c078f8b1f83..a70ae3282c8 100644 --- a/doctrine/custom_dql_functions.rst +++ b/doctrine/custom_dql_functions.rst @@ -78,7 +78,7 @@ In Symfony, you can register your custom DQL functions as follows: In case the ``entity_managers`` were named explicitly, configuring the functions with the orm directly will trigger the exception `Unrecognized option "dql" under "doctrine.orm"`. - The `dql` configuration block must be defined under the named entity manager. + The ``dql`` configuration block must be defined under the named entity manager. .. configuration-block:: diff --git a/doctrine/resolve_target_entity.rst b/doctrine/resolve_target_entity.rst index b192d2bc4ff..2480eb7cde8 100644 --- a/doctrine/resolve_target_entity.rst +++ b/doctrine/resolve_target_entity.rst @@ -21,8 +21,8 @@ without making them hard dependencies. Background ---------- -Suppose you have an `InvoiceBundle` which provides invoicing functionality -and a `CustomerBundle` that contains customer management tools. You want +Suppose you have an ``InvoiceBundle`` which provides invoicing functionality +and a ``CustomerBundle`` that contains customer management tools. You want to keep these separated, because they can be used in other systems without each other, but for your application you want to use them together. diff --git a/form/without_class.rst b/form/without_class.rst index 88155bfe3ba..30380b7a28d 100644 --- a/form/without_class.rst +++ b/form/without_class.rst @@ -6,7 +6,7 @@ How to Use a Form without a Data Class In most cases, a form is tied to an object, and the fields of the form get and store their data on the properties of that object. This is exactly what -you've seen so far in this chapter with the `Task` class. +you've seen so far in this chapter with the ``Task`` class. But sometimes, you may just want to use a form without a class, and get back an array of the submitted data. This is actually really easy:: diff --git a/reference/forms/types/options/choice_value.rst.inc b/reference/forms/types/options/choice_value.rst.inc index fda5a4e7542..60b552a9ed8 100644 --- a/reference/forms/types/options/choice_value.rst.inc +++ b/reference/forms/types/options/choice_value.rst.inc @@ -17,7 +17,7 @@ If ``null`` is used, an incrementing integer is used as the name. .. caution:: In Symfony 2.7, there was a small backwards-compatibility break with how the - `value` attribute of options is generated. This is not a problem unless you + ``value`` attribute of options is generated. This is not a problem unless you rely on the option values in JavaScript. See `issue #14825`_ for details. .. _`issue #14825`: https://github.com/symfony/symfony/pull/14825 diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst index 2f4fe969493..a42c51c43b6 100644 --- a/templating/twig_extension.rst +++ b/templating/twig_extension.rst @@ -58,8 +58,8 @@ As an example you'll create a price filter to format a given number into price:: .. tip:: - Along with custom filters, you can also add custom `functions` and register - `global variables`. + Along with custom filters, you can also add custom ``functions`` and register + global variables. Register an Extension as a Service ---------------------------------- From fa5808402ed9d403e4c289eae3f7afddb5334467 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 14 Feb 2017 13:16:22 +0100 Subject: [PATCH 2/3] Removed an unnecessary code --- templating/twig_extension.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst index a42c51c43b6..5949032c347 100644 --- a/templating/twig_extension.rst +++ b/templating/twig_extension.rst @@ -58,7 +58,7 @@ As an example you'll create a price filter to format a given number into price:: .. tip:: - Along with custom filters, you can also add custom ``functions`` and register + Along with custom filters, you can also add custom functions and register global variables. Register an Extension as a Service From 5ce515c77ed527f8f8c7f682edf442dcc7471c46 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sun, 19 Feb 2017 14:05:11 +0100 Subject: [PATCH 3/3] Minor fixes --- doctrine/resolve_target_entity.rst | 4 ++-- templating/twig_extension.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doctrine/resolve_target_entity.rst b/doctrine/resolve_target_entity.rst index 2480eb7cde8..92b2f1297e9 100644 --- a/doctrine/resolve_target_entity.rst +++ b/doctrine/resolve_target_entity.rst @@ -21,8 +21,8 @@ without making them hard dependencies. Background ---------- -Suppose you have an ``InvoiceBundle`` which provides invoicing functionality -and a ``CustomerBundle`` that contains customer management tools. You want +Suppose you have an InvoiceBundle which provides invoicing functionality +and a CustomerBundle that contains customer management tools. You want to keep these separated, because they can be used in other systems without each other, but for your application you want to use them together. diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst index 5949032c347..82a025b431a 100644 --- a/templating/twig_extension.rst +++ b/templating/twig_extension.rst @@ -58,8 +58,8 @@ As an example you'll create a price filter to format a given number into price:: .. tip:: - Along with custom filters, you can also add custom functions and register - global variables. + Along with custom filters, you can also add custom `functions`_ and register + `global variables`_. Register an Extension as a Service ----------------------------------