From f3396d37f5dd476763c2c6e3865ba26fa509efba Mon Sep 17 00:00:00 2001 From: richardudovich Date: Thu, 11 Jun 2015 21:32:16 +1000 Subject: [PATCH 1/3] Reword a paragraph about service configurations --- book/service_container.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/book/service_container.rst b/book/service_container.rst index ac19681e7bf..99495e6dc40 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -276,10 +276,13 @@ The service container is built using a single configuration resource be imported from inside this file in one way or another. This gives you absolute flexibility over the services in your application. -External service configuration can be imported in two different ways. The -first - and most common method - is via the ``imports`` directive. Later, you'll -learn about the second method, which is the flexible and preferred method -for importing service configuration from third-party bundles. +External service configuration can be imported in two different ways. The first +method, commonly used to import container configuration from the bundles you've +created - is via the ``imports`` directive. The second method, although slightly more +complex offers more flexibility and is commonly used to import third-party bundle +configuration. Read on to learn about both methods. + + .. index:: single: Service Container; Imports From 5ac0b1fed2551621254d429d76bc3d5a450faedb Mon Sep 17 00:00:00 2001 From: richardudovich Date: Mon, 22 Jun 2015 21:46:26 +1000 Subject: [PATCH 2/3] remove the two lines --- book/service_container.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/book/service_container.rst b/book/service_container.rst index 99495e6dc40..519d89d9953 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -282,8 +282,6 @@ created - is via the ``imports`` directive. The second method, although slightly complex offers more flexibility and is commonly used to import third-party bundle configuration. Read on to learn about both methods. - - .. index:: single: Service Container; Imports From 99af6008135af376a9cb1a72be1a402e86a9fd7c Mon Sep 17 00:00:00 2001 From: richardudovich Date: Tue, 23 Jun 2015 00:33:32 +1000 Subject: [PATCH 3/3] Improved wording --- book/service_container.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/service_container.rst b/book/service_container.rst index 519d89d9953..cd6850bbd65 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -280,7 +280,7 @@ External service configuration can be imported in two different ways. The first method, commonly used to import container configuration from the bundles you've created - is via the ``imports`` directive. The second method, although slightly more complex offers more flexibility and is commonly used to import third-party bundle -configuration. Read on to learn about both methods. +configuration. Read on to learn more about both methods. .. index:: single: Service Container; Imports