From b08d97821216b4218a1c1ebb743d46301d49ed51 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 27 Oct 2015 17:18:14 +0100 Subject: [PATCH 1/2] Fixed the YAML syntax for service references --- cookbook/routing/custom_route_loader.rst | 4 ++-- reference/configuration/twig.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook/routing/custom_route_loader.rst b/cookbook/routing/custom_route_loader.rst index 046ea128409..2e644464416 100644 --- a/cookbook/routing/custom_route_loader.rst +++ b/cookbook/routing/custom_route_loader.rst @@ -16,7 +16,7 @@ A custom route loader does not enable your bundle to inject routes without the need to modify the routing configuration (e.g. ``app/config/routing.yml``) manually. If your bundle provides routes, whether via a configuration file, like -the `WebProfilerBundle` does, or via a custom route loader, like the +the `WebProfilerBundle` does, or via a custom route loader, like the `FOSRestBundle`_ does, an entry in the routing configuration is always necessary. @@ -46,7 +46,7 @@ Take these lines from the ``routing.yml`` in the Symfony Standard Edition: # app/config/routing.yml app: - resource: @AppBundle/Controller/ + resource: '@AppBundle/Controller/' type: annotation When the main loader parses this, it tries all registered delegate loaders and calls diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index 2776df191d0..f06ac5a751d 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -35,7 +35,7 @@ TwigBundle Configuration ("twig") # The following were added in Symfony 2.3. # See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy - autoescape_service: ~ # Example: @my_service + autoescape_service: ~ # Example: '@my_service' autoescape_service_method: ~ # use in combination with autoescape_service option base_template_class: ~ # Example: Twig_Template cache: "%kernel.cache_dir%/twig" From 0b8e913f50181926cf72f95eadcddf397201535b Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 27 Oct 2015 17:32:38 +0100 Subject: [PATCH 2/2] Replace single quotes by double quotes --- cookbook/routing/custom_route_loader.rst | 2 +- reference/configuration/twig.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/routing/custom_route_loader.rst b/cookbook/routing/custom_route_loader.rst index 2e644464416..98fd383da18 100644 --- a/cookbook/routing/custom_route_loader.rst +++ b/cookbook/routing/custom_route_loader.rst @@ -46,7 +46,7 @@ Take these lines from the ``routing.yml`` in the Symfony Standard Edition: # app/config/routing.yml app: - resource: '@AppBundle/Controller/' + resource: "@AppBundle/Controller/" type: annotation When the main loader parses this, it tries all registered delegate loaders and calls diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index f06ac5a751d..a666b9ef6b6 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -35,7 +35,7 @@ TwigBundle Configuration ("twig") # The following were added in Symfony 2.3. # See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy - autoescape_service: ~ # Example: '@my_service' + autoescape_service: ~ # Example: "@my_service" autoescape_service_method: ~ # use in combination with autoescape_service option base_template_class: ~ # Example: Twig_Template cache: "%kernel.cache_dir%/twig"