Skip to content

Commit 64d8026

Browse files
weaverryanweaverryan
committed
Merge pull request symfony#3224 from peterkokot/patch-1
Typos
2 parents 11ed10e + 84d43ac commit 64d8026

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+93
-97
lines changed

‎README.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Contributing
88

99
>**Note**
1010
>Unless you're documenting a feature that's new to a specific version of Symfony
11-
>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
11+
>(e.g. Symfony 2.3), all pull requests must be based off of the **2.2** branch,
1212
>**not** the master or 2.3 branch.
1313
1414
We love contributors! For more information on how you can contribute to the
15-
Symfony documentation, please read
16-
[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)
15+
Symfony documentation, please read
16+
[Contributing to the Documentation](http://symfony.com/doc/current/contributing/documentation/overview.html)

‎book/forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ form with many ``Product`` sub-forms). This is done by using the ``collection``
11661166
field type.
11671167
11681168
For more information see the ":doc:`/cookbook/form/form_collections`" cookbook
1169-
entry and the :doc:`collection </reference/forms/types/collection>` field type reference.
1169+
entry and the :doc:`collection </reference/forms/types/collection>` field type reference.
11701170
11711171
.. index::
11721172
single: Forms; Theming

‎book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Updating Vendors
140140

141141
At this point, you've downloaded a fully-functional Symfony project in which
142142
you'll start to develop your own application. A Symfony project depends on
143-
a number of external libraries. These are downloaded into the `vendor/` directory
143+
a number of external libraries. These are downloaded into the ``vendor/`` directory
144144
of your project via a library called `Composer`_.
145145

146146
Depending on how you downloaded Symfony, you may or may not need to update

‎book/page_creation.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ also load specific bundles based on the selected environment. For example,
4242
Symfony2 comes with the WebProfilerBundle (described below), enabled only
4343
in the ``dev`` and ``test`` environments.
4444

45-
Symfony2 comes with two web-accessible front controllers: ``app_dev.php``
45+
Symfony2 comes with two web-accessible front controllers: ``app_dev.php``
4646
provides the ``dev`` environment, and ``app.php`` provides the ``prod`` environment.
4747
All web accesses to Symfony2 normally go through one of these front controllers.
48-
(The ``test`` environment is normally only used when running unit tests, and so
48+
(The ``test`` environment is normally only used when running unit tests, and so
4949
doesn't have a dedicated front controller. The console tool also provides a
5050
front controller that can be used with any environment.)
5151

@@ -555,7 +555,7 @@ You'll learn more about each of these directories in later chapters.
555555

556556
When Symfony is loading, a special file - ``vendor/autoload.php`` - is
557557
included. This file is created by Composer and will autoload all
558-
application files living in the `src/` folder as well as all
558+
application files living in the ``src/`` folder as well as all
559559
third-party libraries mentioned in the ``composer.json`` file.
560560

561561
Because of the autoloader, you never need to worry about using ``include``
@@ -868,7 +868,7 @@ Default Configuration Dump
868868
The ``config:dump-reference`` command was added in Symfony 2.1
869869

870870
You can dump the default configuration for a bundle in YAML to the console using
871-
the ``config:dump-reference`` command. Here is an example of dumping the default
871+
the ``config:dump-reference`` command. Here is an example of dumping the default
872872
FrameworkBundle configuration:
873873

874874
.. code-block:: text

‎book/propel.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Creating the Database Tables/Schema
134134
Now you have a usable ``Product`` class and all you need to persist it. Of
135135
course, you don't yet have the corresponding ``product`` table in your
136136
database. Fortunately, Propel can automatically create all the database tables
137-
needed for every known model in your application. To do this, run:
137+
needed for every known model in your application. To do this, run:
138138

139139
.. code-block:: bash
140140
@@ -153,7 +153,7 @@ Persisting Objects to the Database
153153
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
154154

155155
Now that you have a ``Product`` object and corresponding ``product`` table,
156-
you're ready to persist data to the database. From inside a controller, this
156+
you're ready to persist data to the database. From inside a controller, this
157157
is pretty easy. Add the following method to the ``DefaultController`` of the
158158
bundle::
159159

@@ -406,7 +406,7 @@ Fetching Related Objects
406406
~~~~~~~~~~~~~~~~~~~~~~~~
407407

408408
When you need to fetch associated objects, your workflow looks just like it did
409-
before. First, fetch a ``$product`` object and then access its related
409+
before. First, fetch a ``$product`` object and then access its related
410410
``Category``::
411411

412412
// ...
@@ -435,7 +435,7 @@ Lifecycle Callbacks
435435
-------------------
436436

437437
Sometimes, you need to perform an action right before or after an object is
438-
inserted, updated, or deleted. These types of actions are known as "lifecycle"
438+
inserted, updated, or deleted. These types of actions are known as "lifecycle"
439439
callbacks or "hooks", as they're callback methods that you need to execute
440440
during different stages of the lifecycle of an object (e.g. the object is
441441
inserted, updated, deleted, etc).

‎book/templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ Global Template Variables
10911091
-------------------------
10921092

10931093
During each request, Symfony2 will set a global template variable ``app``
1094-
in both Twig and PHP template engines by default. The ``app`` variable
1094+
in both Twig and PHP template engines by default. The ``app`` variable
10951095
is a :class:`Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables`
10961096
instance which will give you access to some application specific variables
10971097
automatically:

‎book/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ Redirecting
464464

465465
When a request returns a redirect response, the client does not follow
466466
it automatically. You can examine the response and force a redirection
467-
afterwards with the ``followRedirect()`` method::
467+
afterwards with the ``followRedirect()`` method::
468468

469469
$crawler = $client->followRedirect();
470470

‎book/validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ You could also pass the collection of errors into a template.
169169
return $this->render('AcmeBlogBundle:Author:validate.html.twig', array(
170170
'errors' => $errors,
171171
));
172-
}
172+
}
173173
174174
Inside the template, you can output the list of errors exactly as needed:
175175

‎components/class_loader/cache_class_loader.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ for a class.
2020

2121
.. note::
2222

23-
Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
24-
to cache Composer's `autoloader`_.
23+
Both the ``ApcClassLoader`` and the ``XcacheClassLoader`` can be used
24+
to cache Composer's `autoloader`_.
2525

2626
ApcClassLoader
2727
--------------

‎components/class_loader/class_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ or one of its children, the autoloader will first look for the class under the
8181
of the prefix registrations is significant in this case.
8282

8383
.. _PEAR: http://pear.php.net/manual/en/standards.naming.php
84-
.. _PSR-0: http://symfony.com/PSR0
84+
.. _PSR-0: http://www.php-fig.org/psr/psr-0/

0 commit comments

Comments
 (0)