diff --git a/best_practices/introduction.rst b/best_practices/introduction.rst index d1d0e760d32..0808422ed5f 100644 --- a/best_practices/introduction.rst +++ b/best_practices/introduction.rst @@ -4,7 +4,7 @@ The Symfony Framework Best Practices ==================================== -The Symfony framework is well-known for being *really* flexible and is used +The Symfony Framework is well-known for being *really* flexible and is used to build micro-sites, enterprise applications that handle billions of connections and even as the basis for *other* frameworks. Since its release in July 2011, the community has learned a lot about what's possible and how to do things *best*. @@ -19,7 +19,7 @@ What is this Guide About? ------------------------- This guide aims to fix that by describing the **best practices for developing -web apps with the Symfony full-stack framework**. These are best practices that +web apps with the Symfony full-stack Framework**. These are best practices that fit the philosophy of the framework as envisioned by its original creator `Fabien Potencier`_. @@ -32,7 +32,7 @@ fit the philosophy of the framework as envisioned by its original creator This guide is **specially suited** for: -* Websites and web applications developed with the full-stack Symfony framework. +* Websites and web applications developed with the full-stack Symfony Framework. For other situations, this guide might be a good **starting point** that you can then **extend and fit to your specific needs**: diff --git a/book/doctrine.rst b/book/doctrine.rst index 82e22ba1386..d38b4b35891 100644 --- a/book/doctrine.rst +++ b/book/doctrine.rst @@ -6,7 +6,7 @@ Databases and Doctrine One of the most common and challenging tasks for any application involves persisting and reading information to and from a database. Although -the Symfony full-stack framework doesn't integrate any ORM by default, +the Symfony full-stack Framework doesn't integrate any ORM by default, the Symfony Standard Edition, which is the most widely used distribution, comes integrated with `Doctrine`_, a library whose sole goal is to give you powerful tools to make this easy. In this chapter, you'll learn the diff --git a/book/forms.rst b/book/forms.rst index c99daab928d..810d23c0174 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -1490,7 +1490,7 @@ file, you can see every block needed to render a form and every default field type. In PHP, the fragments are individual template files. By default they are located in -the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_). +the `Resources/views/Form` directory of the FrameworkBundle (`view on GitHub`_). Each fragment name follows the same basic pattern and is broken up into two pieces, separated by a single underscore character (``_``). A few examples are: diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst index b49729183f7..32d58705a95 100644 --- a/book/http_fundamentals.rst +++ b/book/http_fundamentals.rst @@ -266,7 +266,7 @@ the user is connecting via a secured connection (i.e. HTTPS). The Request class also has a public ``attributes`` property, which holds special data related to how the application works internally. For the - Symfony framework, the ``attributes`` holds the values returned by the + Symfony Framework, the ``attributes`` holds the values returned by the matched route, like ``_controller``, ``id`` (if you have an ``{id}`` wildcard), and even the name of the matched route (``_route``). The ``attributes`` property exists entirely to be a place where you can @@ -500,7 +500,7 @@ emails, validating user input and handling security. The good news is that none of these problems is unique. Symfony provides a framework full of tools that allow you to build your application, not your tools. With Symfony, nothing is imposed on you: you're free to use the full -Symfony framework, or just one piece of Symfony all by itself. +Symfony Framework, or just one piece of Symfony all by itself. .. index:: single: Symfony Components @@ -543,7 +543,7 @@ regardless of how your project is developed. To name a few: A framework for translating strings in your application. Each and every one of these components is decoupled and can be used in *any* -PHP project, regardless of whether or not you use the Symfony framework. +PHP project, regardless of whether or not you use the Symfony Framework. Every part is made to be used if needed and replaced when necessary. .. _the-full-solution-the-symfony2-framework: diff --git a/book/installation.rst b/book/installation.rst index f065473ec3f..d2fc3641b01 100644 --- a/book/installation.rst +++ b/book/installation.rst @@ -111,7 +111,7 @@ you can create Symfony applications using the alternative installation method based con `Composer`_. Composer is the dependency manager used by modern PHP applications and it can -also be used to create new applications based on the Symfony framework. If you +also be used to create new applications based on the Symfony Framework. If you don't have installed it globally, start by reading the next section. Installing Composer Globally @@ -315,7 +315,7 @@ applications: * The `Symfony CMF Standard Edition`_ is the best distribution to get started with the `Symfony CMF`_ project, which is a project that makes it easier for developers to add CMS functionality to applications built with the Symfony - framework. + Framework. * The `Symfony REST Edition`_ shows how to build an application that provides a RESTful API using the FOSRestBundle and several other related bundles. diff --git a/book/internals.rst b/book/internals.rst index 96150ad7782..1b451370888 100644 --- a/book/internals.rst +++ b/book/internals.rst @@ -55,7 +55,7 @@ On top of HttpFoundation is the :namespace:`Symfony\\Component\\HttpKernel` component. HttpKernel handles the dynamic part of HTTP; it is a thin wrapper on top of the Request and Response classes to standardize the way requests are handled. It also provides extension points and tools that makes it the ideal -starting point to create a Web framework without too much overhead. +starting point to create a web framework without too much overhead. It also optionally adds configurability and extensibility, thanks to the DependencyInjection component and a powerful plugin system (bundles). diff --git a/book/page_creation.rst b/book/page_creation.rst index cf8ca140e58..4496276e0dc 100644 --- a/book/page_creation.rst +++ b/book/page_creation.rst @@ -1073,7 +1073,7 @@ in mind: and ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's used to help updated vendor libraries); -* Each feature in Symfony (including the Symfony framework core) is organized +* Each feature in Symfony (including the Symfony Framework core) is organized into a *bundle*, which is a structured set of files for that feature; * The **configuration** for each bundle lives in the ``Resources/config`` diff --git a/book/service_container.rst b/book/service_container.rst index ea1996179b2..cef6a4eaf9e 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -458,7 +458,7 @@ In other words, a service container extension configures the services for a bundle on your behalf. And as you'll see in a moment, the extension provides a sensible, high-level interface for configuring the bundle. -Take the FrameworkBundle - the core Symfony framework bundle - as an +Take the FrameworkBundle - the core Symfony Framework bundle - as an example. The presence of the following code in your application configuration invokes the service container extension inside the FrameworkBundle: @@ -511,7 +511,7 @@ can handle the ``framework`` configuration directive. The extension in question, which lives in the FrameworkBundle, is invoked and the service configuration for the FrameworkBundle is loaded. If you remove the ``framework`` key from your application configuration file entirely, the core Symfony services -won't be loaded. The point is that you're in control: the Symfony framework +won't be loaded. The point is that you're in control: the Symfony Framework doesn't contain any magic or perform any actions that you don't have control over. diff --git a/book/templating.rst b/book/templating.rst index dd2cb88300b..00c0c29e2ee 100644 --- a/book/templating.rst +++ b/book/templating.rst @@ -1312,7 +1312,7 @@ subdirectory. Overriding Core Templates ~~~~~~~~~~~~~~~~~~~~~~~~~ -Since the Symfony framework itself is just a bundle, core templates can be +Since the Symfony Framework itself is just a bundle, core templates can be overridden in the same way. For example, the core TwigBundle contains a number of different "exception" and "error" templates that can be overridden by copying each from the ``Resources/views/Exception`` directory of the diff --git a/book/translation.rst b/book/translation.rst index fcafd3c5ee7..a2e8f089560 100644 --- a/book/translation.rst +++ b/book/translation.rst @@ -27,7 +27,7 @@ into the language of the user:: *country* code (e.g. ``fr_FR`` for French/France) is recommended. In this chapter, you'll learn how to use the Translation component in the -Symfony framework. You can read the +Symfony Framework. You can read the :doc:`Translation component documentation ` to learn even more. Overall, the process has several steps: diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst index a902a1bcfc7..e9b9939bff8 100644 --- a/components/dependency_injection/compilation.rst +++ b/components/dependency_injection/compilation.rst @@ -207,7 +207,7 @@ The XML version of the config would then look like this: .. note:: - In the Symfony full-stack framework there is a base Extension class which + In the Symfony full-stack Framework there is a base Extension class which implements these methods as well as a shortcut method for processing the configuration. See :doc:`/cookbook/bundles/extension` for more details. diff --git a/components/dependency_injection/workflow.rst b/components/dependency_injection/workflow.rst index 94dc1b3b39a..d528c10fa6b 100644 --- a/components/dependency_injection/workflow.rst +++ b/components/dependency_injection/workflow.rst @@ -8,7 +8,7 @@ In the preceding pages of this section, there has been little to say about where the various files and classes should be located. This is because this depends on the application, library or framework in which you want to use the container. Looking at how the container is configured and built in the -Symfony full-stack framework will help you see how this all fits together, +Symfony full-stack Framework will help you see how this all fits together, whether you are using the full-stack framework or looking to use the service container in another application. diff --git a/components/form/introduction.rst b/components/form/introduction.rst index 05d4a0d1584..7d1bcde2b73 100644 --- a/components/form/introduction.rst +++ b/components/form/introduction.rst @@ -27,7 +27,7 @@ Configuration .. tip:: - If you are working with the full-stack Symfony framework, the Form component + If you are working with the full-stack Symfony Framework, the Form component is already configured for you. In this case, skip to :ref:`component-form-intro-create-simple-form`. In Symfony, forms are represented by objects and these objects are built @@ -375,7 +375,7 @@ Creating a simple Form .. tip:: - If you're using the Symfony framework, then the form factory is available + If you're using the Symfony Framework, then the form factory is available automatically as a service called ``form.factory``. Also, the default base controller class has a :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::createFormBuilder` method, which is a shortcut to fetch the form factory and call ``createBuilder`` diff --git a/components/form/type_guesser.rst b/components/form/type_guesser.rst index 819e835ca8e..7126999470b 100644 --- a/components/form/type_guesser.rst +++ b/components/form/type_guesser.rst @@ -186,6 +186,6 @@ The last thing you need to do is registering your custom type guesser by using .. note:: - When you use the Symfony framework, you need to register your type guesser + When you use the Symfony Framework, you need to register your type guesser and tag it with ``form.type_guesser``. For more information see :ref:`the tag reference `. diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index 6475fab2c0a..588ac1aed17 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -173,7 +173,7 @@ in the request, which is also an instance of :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`. This is mostly used to attach information that belongs to the Request and that needs to be accessed from many different points in your application. For information -on how this is used in the Symfony framework, see +on how this is used in the Symfony Framework, see :ref:`the Symfony book `. Finally, the raw data sent with the request body can be accessed using diff --git a/components/http_foundation/session_php_bridge.rst b/components/http_foundation/session_php_bridge.rst index 5b55417d983..fecb5cd358a 100644 --- a/components/http_foundation/session_php_bridge.rst +++ b/components/http_foundation/session_php_bridge.rst @@ -16,7 +16,7 @@ However when there really are circumstances where this is not possible, you can use a special storage bridge :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage` which is designed to allow Symfony to work with a session started outside of -the Symfony Session framework. You are warned that things can interrupt this +the Symfony session framework. You are warned that things can interrupt this use-case unless you are careful: for example the legacy application erases ``$_SESSION``. diff --git a/components/templating/introduction.rst b/components/templating/introduction.rst index 946da963104..154925f842a 100644 --- a/components/templating/introduction.rst +++ b/components/templating/introduction.rst @@ -84,7 +84,7 @@ Global Variables Sometimes, you need to set a variable which is available in all templates rendered by an engine (like the ``$app`` variable when using the Symfony -framework). These variables can be set by using the +Framework). These variables can be set by using the :method:`Symfony\\Component\\Templating\\PhpEngine::addGlobal` method and they can be accessed in the template as normal variables:: @@ -135,7 +135,7 @@ escaper using the Helpers ------- -The Templating component can be easily extended via helpers. Helpers are PHP objects that +The Templating component can be easily extended via helpers. Helpers are PHP objects that provide features useful in a template context. The component has 2 built-in helpers: diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst index 4a2ea5cafb2..7cfaa7e46fb 100644 --- a/cookbook/console/console_command.rst +++ b/cookbook/console/console_command.rst @@ -6,7 +6,7 @@ How to Create a Console Command The Console page of the Components section (:doc:`/components/console/introduction`) covers how to create a console command. This cookbook article covers the differences -when creating console commands within the Symfony framework. +when creating console commands within the Symfony Framework. Automatically Registering Commands ---------------------------------- @@ -140,9 +140,9 @@ see :doc:`/cookbook/service_container/scopes`. Testing Commands ---------------- -When testing commands used as part of the full framework -:class:`Symfony\\Bundle\\FrameworkBundle\\Console\\Application ` should be used -instead of +When testing commands used as part of the full-stack framework, +:class:`Symfony\\Bundle\\FrameworkBundle\\Console\\Application ` +should be used instead of :class:`Symfony\\Component\\Console\\Application `:: use Symfony\Component\Console\Tester\CommandTester; diff --git a/cookbook/console/logging.rst b/cookbook/console/logging.rst index f9d5dab1aec..4119925f180 100644 --- a/cookbook/console/logging.rst +++ b/cookbook/console/logging.rst @@ -21,7 +21,7 @@ There are basically two logging cases you would need: Manually Logging from a Console Command --------------------------------------- -This one is really simple. When you create a console command within the full +This one is really simple. When you create a console command within the full-stack framework as described in ":doc:`/cookbook/console/console_command`", your command extends :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`. This means that you can simply access the standard logger service through the diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst index 4ed7f8d9c3c..62d9a3d2783 100644 --- a/cookbook/symfony1.rst +++ b/cookbook/symfony1.rst @@ -4,7 +4,7 @@ How Symfony2 Differs from Symfony1 ================================== -The Symfony2 framework embodies a significant evolution when compared with +The Symfony2 Framework embodies a significant evolution when compared with the first version of the framework. Fortunately, with the MVC architecture at its core, the skills used to master a symfony1 project continue to be very relevant when developing in Symfony2. Sure, ``app.yml`` is gone, but @@ -227,7 +227,7 @@ Bundles and Plugins In a symfony1 project, a plugin could contain configuration, modules, PHP libraries, assets and anything else related to your project. In Symfony2, the idea of a plugin is replaced by the "bundle". A bundle is even more powerful -than a plugin because the core Symfony2 framework is brought in via a series +than a plugin because the core Symfony2 Framework is brought in via a series of bundles. In Symfony2, bundles are first-class citizens that are so flexible that even core code itself is a bundle. diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst index 114b2e587b3..918b6b7bd73 100644 --- a/quick_tour/the_controller.rst +++ b/quick_tour/the_controller.rst @@ -349,6 +349,6 @@ Final Thoughts That's all there is to it, and I'm not even sure you'll have spent the full 10 minutes. You were briefly introduced to bundles in the first part, and all the -features you've learned about so far are part of the core framework bundle. +features you've learned about so far are part of the core FrameworkBundle. But thanks to bundles, everything in Symfony can be extended or replaced. That's the topic of the :doc:`next part of this tutorial `. diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 833b4cc33d1..3c0b11c9cff 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -1096,7 +1096,7 @@ translation.extractor The ability to add message extractors was introduced in Symfony 2.1. When executing the ``translation:update`` command, it uses extractors to -extract translation messages from a file. By default, the Symfony framework +extract translation messages from a file. By default, the Symfony Framework has a :class:`Symfony\\Bridge\\Twig\\Translation\\TwigExtractor` and a :class:`Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor`, which help to find and extract translation keys from Twig templates and PHP files.