Skip to content

Several typo fixes #6998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/console/helpers/table.rst
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ This results in:
.. tip::

You can create a multiple-line page title using a header cell that spans
the enire table width::
the entire table width::

$table->setHeaders(array(
array(new TableCell('Main table title', array('colspan' => 3))),
Expand Down
2 changes: 1 addition & 1 deletion controller/argument_value_resolver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ and adding a priority.
// app/config/services.php
use Symfony\Component\DependencyInjection\Definition;
$defintion = new Definition(
$definition = new Definition(
'AppBundle\ArgumentResolver\UserValueResolver',
array(new Reference('security.token_storage'))
);
Expand Down
4 changes: 2 additions & 2 deletions deployment/fortrabbit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Configuring the Environment in the Dashboard
PHP Settings
~~~~~~~~~~~~

The PHP version and enabled extensions are configuable under the PHP settings
The PHP version and enabled extensions are configurable under the PHP settings
of your App within the fortrabbit Dashboard.

Environment Variables
Expand All @@ -187,7 +187,7 @@ config files get loaded. ENV vars are configuable in fortrabbit Dashboard as wel
Document Root
~~~~~~~~~~~~~

The document root is configuable for every custom domain you setup for your App.
The document root is configurable for every custom domain you setup for your App.
The default is ``/htdocs``, but for Symfony you probably want to change it to
``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.

Expand Down
2 changes: 1 addition & 1 deletion doctrine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ Doctrine allows you to use any PHP object to hold your data and relies on
mapping metadata information to map an object's data to a particular database
table.

Doctrine has a lot more complex features to learn, like relationshps, complex queries,
Doctrine has a lot more complex features to learn, like relationships, complex queries,
and event listeners.

Learn more
Expand Down
2 changes: 1 addition & 1 deletion doctrine/associations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ to hold those associated objects.

While the many-to-one mapping shown earlier was mandatory, this one-to-many
mapping is optional. It is included here to help demonstrate Doctrine's range
of relationship management capabailties. Plus, in the context of this application,
of relationship management capabilities. Plus, in the context of this application,
it will likely be convenient for each ``Category`` object to automatically
own a collection of its related ``Product`` objects.

Expand Down
2 changes: 1 addition & 1 deletion form/data_transformers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
}

Internally the ``tags`` are stored as an array, but displayed to the user as a
simple comma seperated string to make them easier to edit.
simple comma separated string to make them easier to edit.

This is a *perfect* time to attach a custom data transformer to the ``tags``
field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`
Expand Down
2 changes: 1 addition & 1 deletion form/direct_submit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ method, pass the submitted data directly to
When submitting a form via a "PATCH" request, you may want to update only a few
submitted fields. To achieve this, you may pass an optional second boolean
parameter to ``submit()``. Passing ``false`` will remove any missing fields
within the form object. Otherwise, the mising fields will be set to ``null``.
within the form object. Otherwise, the missing fields will be set to ``null``.
2 changes: 1 addition & 1 deletion reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ trusted_hosts

A lot of different attacks have been discovered relying on inconsistencies
in handling the ``Host`` header by various software (web servers, reverse
proxies, web frameworks, etc.). Basically, everytime the framework is
proxies, web frameworks, etc.). Basically, every time the framework is
generating an absolute URL (when sending an email to reset a password for
instance), the host might have been manipulated by an attacker.

Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
.. note::

This option expects an array of entity objects (that's actually the same as with
the ``ChoiceType`` field, whichs requires an array of the preferred "values").
the ``ChoiceType`` field, which requires an array of the preferred "values").

.. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion security/ldap.rst
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ search_password

**type**: ``string`` **default**: ``null``

This is your read-only user's password, wich will be used to authenticate
This is your read-only user's password, which will be used to authenticate
against the LDAP server in order to fetch the user's information.

default_roles
Expand Down
2 changes: 1 addition & 1 deletion serializer/custom_encoders.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ How to Create your Custom Encoder

The :doc:`Serializer Component </components/serializer>` uses Normalizers
to transform any data to an array. Then, by leveraging *Encoders*, that data can
be convereted into any data-structure (e.g. JSON).
be converted into any data-structure (e.g. JSON).

The Component provides several built-in encoders that are described
:doc:`in their own section </serializer/encoders>` but you may want
Expand Down
2 changes: 1 addition & 1 deletion service_container/definitions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fetched from the container::
.. caution::

Don't use ``get()`` to get a service that you want to inject as constructor
argument, the service is not yet availabe. Instead, use a
argument, the service is not yet available. Instead, use a
``Reference`` instance as shown above.

Method Calls
Expand Down
2 changes: 1 addition & 1 deletion service_container/service_decoration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ convention, the old ``app.mailer`` service is renamed to

use Symfony\Component\DependencyInjection\Reference;

$container->register('app.decorating_mailer', 'AppBundle\DeocratingMailer')
$container->register('app.decorating_mailer', 'AppBundle\DecoratingMailer')
->setDecoratedService('foo', 'app.decorating_mailer.wooz')
->addArgument(new Reference('app.decorating_mailer.wooz'))
// ...
Expand Down
8 changes: 4 additions & 4 deletions setup/web_server_configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The **minimum configuration** to get your application running under Apache is:
</Directory>

# uncomment the following lines if you install assets as symlinks
# or run into problems when compiling LESS/Sass/CoffeScript assets
# or run into problems when compiling LESS/Sass/CoffeeScript assets
# <Directory /var/www/project>
# Options FollowSymlinks
# </Directory>
Expand Down Expand Up @@ -88,7 +88,7 @@ and increase web server performance:
</Directory>

# uncomment the following lines if you install assets as symlinks
# or run into problems when compiling LESS/Sass/CoffeScript assets
# or run into problems when compiling LESS/Sass/CoffeeScript assets
# <Directory /var/www/project>
# Options FollowSymlinks
# </Directory>
Expand Down Expand Up @@ -200,7 +200,7 @@ directive to pass requests for PHP files to PHP FPM:
</Directory>

# uncomment the following lines if you install assets as symlinks
# or run into problems when compiling LESS/Sass/CoffeScript assets
# or run into problems when compiling LESS/Sass/CoffeeScript assets
# <Directory /var/www/project>
# Options FollowSymlinks
# </Directory>
Expand Down Expand Up @@ -236,7 +236,7 @@ should look something like this:
</Directory>

# uncomment the following lines if you install assets as symlinks
# or run into problems when compiling LESS/Sass/CoffeScript assets
# or run into problems when compiling LESS/Sass/CoffeeScript assets
# <Directory /var/www/project>
# Options FollowSymlinks
# </Directory>
Expand Down
2 changes: 1 addition & 1 deletion templating.rst
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ Suppose ``description`` equals ``I <3 this product``:

.. code-block:: twig

<!-- outupt escaping is on automatically -->
<!-- output escaping is on automatically -->
{{ description }} <!-- I &lt3 this product -->

<!-- disable output escaping with the raw filter -->
Expand Down