Skip to content

Commit d76516d

Browse files
committed
use "Symfony Framework" instead of "Symfony framework"
1 parent 6e2db0a commit d76516d

22 files changed

+36
-36
lines changed

Diff for: best_practices/introduction.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
The Symfony Framework Best Practices
55
====================================
66

7-
The Symfony framework is well-known for being *really* flexible and is used
7+
The Symfony Framework is well-known for being *really* flexible and is used
88
to build micro-sites, enterprise applications that handle billions of connections
99
and even as the basis for *other* frameworks. Since its release in July 2011,
1010
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?
1919
-------------------------
2020

2121
This guide aims to fix that by describing the **best practices for developing
22-
web apps with the Symfony full-stack framework**. These are best practices that
22+
web apps with the Symfony full-stack Framework**. These are best practices that
2323
fit the philosophy of the framework as envisioned by its original creator
2424
`Fabien Potencier`_.
2525

@@ -32,7 +32,7 @@ fit the philosophy of the framework as envisioned by its original creator
3232

3333
This guide is **specially suited** for:
3434

35-
* Websites and web applications developed with the full-stack Symfony framework.
35+
* Websites and web applications developed with the full-stack Symfony Framework.
3636

3737
For other situations, this guide might be a good **starting point** that you can
3838
then **extend and fit to your specific needs**:

Diff for: book/doctrine.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Databases and Doctrine
66

77
One of the most common and challenging tasks for any application
88
involves persisting and reading information to and from a database. Although
9-
the Symfony full-stack framework doesn't integrate any ORM by default,
9+
the Symfony full-stack Framework doesn't integrate any ORM by default,
1010
the Symfony Standard Edition, which is the most widely used distribution,
1111
comes integrated with `Doctrine`_, a library whose sole goal is to give
1212
you powerful tools to make this easy. In this chapter, you'll learn the

Diff for: book/forms.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ file, you can see every block needed to render a form and every default field
15191519
type.
15201520

15211521
In PHP, the fragments are individual template files. By default they are located in
1522-
the `Resources/views/Form` directory of the framework bundle (`view on GitHub`_).
1522+
the `Resources/views/Form` directory of the FrameworkBundle (`view on GitHub`_).
15231523

15241524
Each fragment name follows the same basic pattern and is broken up into two pieces,
15251525
separated by a single underscore character (``_``). A few examples are:

Diff for: book/http_fundamentals.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ the user is connecting via a secured connection (i.e. HTTPS).
266266

267267
The Request class also has a public ``attributes`` property, which holds
268268
special data related to how the application works internally. For the
269-
Symfony framework, the ``attributes`` holds the values returned by the
269+
Symfony Framework, the ``attributes`` holds the values returned by the
270270
matched route, like ``_controller``, ``id`` (if you have an ``{id}``
271271
wildcard), and even the name of the matched route (``_route``). The
272272
``attributes`` property exists entirely to be a place where you can
@@ -500,7 +500,7 @@ emails, validating user input and handling security.
500500
The good news is that none of these problems is unique. Symfony provides
501501
a framework full of tools that allow you to build your application, not your
502502
tools. With Symfony, nothing is imposed on you: you're free to use the full
503-
Symfony framework, or just one piece of Symfony all by itself.
503+
Symfony Framework, or just one piece of Symfony all by itself.
504504

505505
.. index::
506506
single: Symfony Components
@@ -542,9 +542,9 @@ regardless of how your project is developed. To name a few:
542542
:doc:`Translation </components/translation/introduction>`
543543
A framework for translating strings in your application.
544544

545-
Each one of these components is decoupled and can be used in *any*
546-
PHP project, regardless of whether or not you use the Symfony framework.
547-
Every part is made to be used if needed and replaced when necessary.
545+
Each one of these components is decoupled and can be used in *any* PHP project,
546+
regardless of whether or not you use the Symfony Framework. Every part is
547+
made to be used if needed and replaced when necessary.
548548

549549
.. _the-full-solution-the-symfony2-framework:
550550

Diff for: book/installation.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ you can create Symfony applications using the alternative installation method
112112
based on `Composer`_.
113113

114114
Composer is the dependency manager used by modern PHP applications and it can
115-
also be used to create new applications based on the Symfony framework. If you
115+
also be used to create new applications based on the Symfony Framework. If you
116116
don't have installed it globally, start by reading the next section.
117117

118118
Installing Composer Globally
@@ -319,7 +319,7 @@ applications:
319319
* The `Symfony CMF Standard Edition`_ is the best distribution to get started
320320
with the `Symfony CMF`_ project, which is a project that makes it easier for
321321
developers to add CMS functionality to applications built with the Symfony
322-
framework.
322+
Framework.
323323
* The `Symfony REST Edition`_ shows how to build an application that provides a
324324
RESTful API using the FOSRestBundle and several other related bundles.
325325

Diff for: book/internals.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ On top of HttpFoundation is the :namespace:`Symfony\\Component\\HttpKernel`
5555
component. HttpKernel handles the dynamic part of HTTP; it is a thin wrapper
5656
on top of the Request and Response classes to standardize the way requests are
5757
handled. It also provides extension points and tools that makes it the ideal
58-
starting point to create a Web framework without too much overhead.
58+
starting point to create a web framework without too much overhead.
5959

6060
It also optionally adds configurability and extensibility, thanks to the
6161
DependencyInjection component and a powerful plugin system (bundles).

Diff for: book/page_creation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ in mind:
10811081
and ``vendor/`` (third-party code) (there's also a ``bin/`` directory that's
10821082
used to help updated vendor libraries);
10831083

1084-
* Each feature in Symfony (including the Symfony framework core) is organized
1084+
* Each feature in Symfony (including the Symfony Framework core) is organized
10851085
into a *bundle*, which is a structured set of files for that feature;
10861086

10871087
* The **configuration** for each bundle lives in the ``Resources/config``

Diff for: book/service_container.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ In other words, a service container extension configures the services for
462462
a bundle on your behalf. And as you'll see in a moment, the extension provides
463463
a sensible, high-level interface for configuring the bundle.
464464

465-
Take the FrameworkBundle - the core Symfony framework bundle - as an
465+
Take the FrameworkBundle - the core Symfony Framework bundle - as an
466466
example. The presence of the following code in your application configuration
467467
invokes the service container extension inside the FrameworkBundle:
468468

@@ -517,7 +517,7 @@ can handle the ``framework`` configuration directive. The extension in question,
517517
which lives in the FrameworkBundle, is invoked and the service configuration
518518
for the FrameworkBundle is loaded. If you remove the ``framework`` key
519519
from your application configuration file entirely, the core Symfony services
520-
won't be loaded. The point is that you're in control: the Symfony framework
520+
won't be loaded. The point is that you're in control: the Symfony Framework
521521
doesn't contain any magic or perform any actions that you don't have control
522522
over.
523523

Diff for: book/templating.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ subdirectory.
13121312
Overriding Core Templates
13131313
~~~~~~~~~~~~~~~~~~~~~~~~~
13141314

1315-
Since the Symfony framework itself is just a bundle, core templates can be
1315+
Since the Symfony Framework itself is just a bundle, core templates can be
13161316
overridden in the same way. For example, the core TwigBundle contains
13171317
a number of different "exception" and "error" templates that can be overridden
13181318
by copying each from the ``Resources/views/Exception`` directory of the

Diff for: book/translation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ into the language of the user::
2727
*country* code (e.g. ``fr_FR`` for French/France) is recommended.
2828

2929
In this chapter, you'll learn how to use the Translation component in the
30-
Symfony framework. You can read the
30+
Symfony Framework. You can read the
3131
:doc:`Translation component documentation </components/translation/usage>`
3232
to learn even more. Overall, the process has several steps:
3333

Diff for: components/dependency_injection/compilation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ The XML version of the config would then look like this:
207207
208208
.. note::
209209

210-
In the Symfony full-stack framework there is a base Extension class which
210+
In the Symfony full-stack Framework there is a base Extension class which
211211
implements these methods as well as a shortcut method for processing the
212212
configuration. See :doc:`/cookbook/bundles/extension` for more details.
213213

Diff for: components/dependency_injection/workflow.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In the preceding pages of this section, there has been little to say about
88
where the various files and classes should be located. This is because this
99
depends on the application, library or framework in which you want to use
1010
the container. Looking at how the container is configured and built in the
11-
Symfony full-stack framework will help you see how this all fits together,
11+
Symfony full-stack Framework will help you see how this all fits together,
1212
whether you are using the full-stack framework or looking to use the service
1313
container in another application.
1414

Diff for: components/form/introduction.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Configuration
2727

2828
.. tip::
2929

30-
If you are working with the full-stack Symfony framework, the Form component
30+
If you are working with the full-stack Symfony Framework, the Form component
3131
is already configured for you. In this case, skip to :ref:`component-form-intro-create-simple-form`.
3232

3333
In Symfony, forms are represented by objects and these objects are built
@@ -375,7 +375,7 @@ Creating a simple Form
375375

376376
.. tip::
377377

378-
If you're using the Symfony framework, then the form factory is available
378+
If you're using the Symfony Framework, then the form factory is available
379379
automatically as a service called ``form.factory``. Also, the default
380380
base controller class has a :method:`Symfony\\Bundle\\FrameworkBundle\\Controller::createFormBuilder`
381381
method, which is a shortcut to fetch the form factory and call ``createBuilder``

Diff for: components/form/type_guesser.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,6 @@ The last thing you need to do is registering your custom type guesser by using
186186

187187
.. note::
188188

189-
When you use the Symfony framework, you need to register your type guesser
189+
When you use the Symfony Framework, you need to register your type guesser
190190
and tag it with ``form.type_guesser``. For more information see
191191
:ref:`the tag reference <reference-dic-type_guesser>`.

Diff for: components/http_foundation/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ in the request, which is also an instance of
173173
:class:`Symfony\\Component\\HttpFoundation\\ParameterBag`. This is mostly used
174174
to attach information that belongs to the Request and that needs to be
175175
accessed from many different points in your application. For information
176-
on how this is used in the Symfony framework, see
176+
on how this is used in the Symfony Framework, see
177177
:ref:`the Symfony book <book-fundamentals-attributes>`.
178178

179179
Finally, the raw data sent with the request body can be accessed using

Diff for: components/http_foundation/session_php_bridge.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ However when there really are circumstances where this is not possible, you
1616
can use a special storage bridge
1717
:class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage`
1818
which is designed to allow Symfony to work with a session started outside of
19-
the Symfony Session framework. You are warned that things can interrupt this
19+
the Symfony session framework. You are warned that things can interrupt this
2020
use-case unless you are careful: for example the legacy application erases
2121
``$_SESSION``.
2222

Diff for: components/templating/introduction.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Global Variables
8484

8585
Sometimes, you need to set a variable which is available in all templates
8686
rendered by an engine (like the ``$app`` variable when using the Symfony
87-
framework). These variables can be set by using the
87+
Framework). These variables can be set by using the
8888
:method:`Symfony\\Component\\Templating\\PhpEngine::addGlobal` method and they
8989
can be accessed in the template as normal variables::
9090

@@ -135,7 +135,7 @@ escaper using the
135135
Helpers
136136
-------
137137

138-
The Templating component can be easily extended via helpers. Helpers are PHP objects that
138+
The Templating component can be easily extended via helpers. Helpers are PHP objects that
139139
provide features useful in a template context. The component has
140140
2 built-in helpers:
141141

Diff for: cookbook/console/console_command.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to Create a Console Command
66

77
The Console page of the Components section (:doc:`/components/console/introduction`) covers
88
how to create a console command. This cookbook article covers the differences
9-
when creating console commands within the Symfony framework.
9+
when creating console commands within the Symfony Framework.
1010

1111
Automatically Registering Commands
1212
----------------------------------
@@ -140,9 +140,9 @@ see :doc:`/cookbook/service_container/scopes`.
140140
Testing Commands
141141
----------------
142142

143-
When testing commands used as part of the full framework
144-
:class:`Symfony\\Bundle\\FrameworkBundle\\Console\\Application <Symfony\\Bundle\\FrameworkBundle\\Console\\Application>` should be used
145-
instead of
143+
When testing commands used as part of the full-stack framework,
144+
:class:`Symfony\\Bundle\\FrameworkBundle\\Console\\Application <Symfony\\Bundle\\FrameworkBundle\\Console\\Application>`
145+
should be used instead of
146146
:class:`Symfony\\Component\\Console\\Application <Symfony\\Component\\Console\\Application>`::
147147

148148
use Symfony\Component\Console\Tester\CommandTester;

Diff for: cookbook/console/logging.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ There are basically two logging cases you would need:
2121
Manually Logging from a Console Command
2222
---------------------------------------
2323

24-
This one is really simple. When you create a console command within the full
24+
This one is really simple. When you create a console command within the full-stack
2525
framework as described in ":doc:`/cookbook/console/console_command`", your command
2626
extends :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`.
2727
This means that you can simply access the standard logger service through the

Diff for: cookbook/symfony1.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
How Symfony2 Differs from Symfony1
55
==================================
66

7-
The Symfony2 framework embodies a significant evolution when compared with
7+
The Symfony2 Framework embodies a significant evolution when compared with
88
the first version of the framework. Fortunately, with the MVC architecture
99
at its core, the skills used to master a symfony1 project continue to be
1010
very relevant when developing in Symfony2. Sure, ``app.yml`` is gone, but
@@ -227,7 +227,7 @@ Bundles and Plugins
227227
In a symfony1 project, a plugin could contain configuration, modules, PHP
228228
libraries, assets and anything else related to your project. In Symfony2,
229229
the idea of a plugin is replaced by the "bundle". A bundle is even more powerful
230-
than a plugin because the core Symfony2 framework is brought in via a series
230+
than a plugin because the core Symfony2 Framework is brought in via a series
231231
of bundles. In Symfony2, bundles are first-class citizens that are so flexible
232232
that even core code itself is a bundle.
233233

Diff for: quick_tour/the_controller.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,6 @@ Final Thoughts
349349

350350
That's all there is to it, and I'm not even sure you'll have spent the full
351351
10 minutes. You were briefly introduced to bundles in the first part, and all the
352-
features you've learned about so far are part of the core framework bundle.
352+
features you've learned about so far are part of the core FrameworkBundle.
353353
But thanks to bundles, everything in Symfony can be extended or replaced.
354354
That's the topic of the :doc:`next part of this tutorial <the_architecture>`.

Diff for: reference/dic_tags.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ translation.extractor
10961096
The ability to add message extractors was introduced in Symfony 2.1.
10971097
10981098
When executing the ``translation:update`` command, it uses extractors to
1099-
extract translation messages from a file. By default, the Symfony framework
1099+
extract translation messages from a file. By default, the Symfony Framework
11001100
has a :class:`Symfony\\Bridge\\Twig\\Translation\\TwigExtractor` and a
11011101
:class:`Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor`, which
11021102
help to find and extract translation keys from Twig templates and PHP files.

0 commit comments

Comments
 (0)