Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 463f9db

Browse filesBrowse files
xabbuhxabbuh
committed
Merge branch '3.1'
* 3.1: Several typo fixes Several typo fixes Several typo fixes Update console.rst [#6917] some tweaks after review [Finder] document array use for locations
2 parents 09975d7 + d0a0a04 commit 463f9db
Copy full SHA for 463f9db

File tree

Expand file treeCollapse file tree

17 files changed

+25
-21
lines changed
Filter options
Expand file treeCollapse file tree

17 files changed

+25
-21
lines changed

‎components/console/helpers/table.rst

Copy file name to clipboardExpand all lines: components/console/helpers/table.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ This results in:
222222
.. tip::
223223

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

227227
$table->setHeaders(array(
228228
array(new TableCell('Main table title', array('colspan' => 3))),

‎components/finder.rst

Copy file name to clipboardExpand all lines: components/finder.rst
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ directory to use for the search::
8282
Search in several locations by chaining calls to
8383
:method:`Symfony\\Component\\Finder\\Finder::in`::
8484

85-
$finder->files()->in(__DIR__)->in('/elsewhere');
85+
// search inside *both* directories
86+
$finder->files()->in(array(__DIR__, '/elsewhere'));
87+
88+
// same as above
89+
$finder->in(__DIR__)->in('/elsewhere');
8690

8791
Use wildcard characters to search in the directories matching a pattern::
8892

‎console.rst

Copy file name to clipboardExpand all lines: console.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ instead::
177177
}
178178

179179
Now, once you created the required services and logic, the command will execute
180-
the ``generate()`` method of the ``app.user_manager`` service and the user will
180+
the ``create()`` method of the ``app.user_manager`` service and the user will
181181
be created.
182182

183183
Command Lifecycle

‎controller/argument_value_resolver.rst

Copy file name to clipboardExpand all lines: controller/argument_value_resolver.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ and adding a priority.
172172
// app/config/services.php
173173
use Symfony\Component\DependencyInjection\Definition;
174174
175-
$defintion = new Definition(
175+
$definition = new Definition(
176176
'AppBundle\ArgumentResolver\UserValueResolver',
177177
array(new Reference('security.token_storage'))
178178
);

‎deployment/fortrabbit.rst

Copy file name to clipboardExpand all lines: deployment/fortrabbit.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Configuring the Environment in the Dashboard
175175
PHP Settings
176176
~~~~~~~~~~~~
177177

178-
The PHP version and enabled extensions are configuable under the PHP settings
178+
The PHP version and enabled extensions are configurable under the PHP settings
179179
of your App within the fortrabbit Dashboard.
180180

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

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

‎doctrine.rst

Copy file name to clipboardExpand all lines: doctrine.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ Doctrine allows you to use any PHP object to hold your data and relies on
887887
mapping metadata information to map an object's data to a particular database
888888
table.
889889

890-
Doctrine has a lot more complex features to learn, like relationshps, complex queries,
890+
Doctrine has a lot more complex features to learn, like relationships, complex queries,
891891
and event listeners.
892892

893893
Learn more

‎doctrine/associations.rst

Copy file name to clipboardExpand all lines: doctrine/associations.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ to hold those associated objects.
162162
163163
While the many-to-one mapping shown earlier was mandatory, this one-to-many
164164
mapping is optional. It is included here to help demonstrate Doctrine's range
165-
of relationship management capabailties. Plus, in the context of this application,
165+
of relationship management capabilities. Plus, in the context of this application,
166166
it will likely be convenient for each ``Category`` object to automatically
167167
own a collection of its related ``Product`` objects.
168168

‎form/data_transformers.rst

Copy file name to clipboardExpand all lines: form/data_transformers.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
4949
}
5050

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

5454
This is a *perfect* time to attach a custom data transformer to the ``tags``
5555
field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`

‎form/direct_submit.rst

Copy file name to clipboardExpand all lines: form/direct_submit.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ method, pass the submitted data directly to
8282
When submitting a form via a "PATCH" request, you may want to update only a few
8383
submitted fields. To achieve this, you may pass an optional second boolean
8484
parameter to ``submit()``. Passing ``false`` will remove any missing fields
85-
within the form object. Otherwise, the mising fields will be set to ``null``.
85+
within the form object. Otherwise, the missing fields will be set to ``null``.

‎reference/configuration/framework.rst

Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ trusted_hosts
311311

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

‎reference/forms/types/entity.rst

Copy file name to clipboardExpand all lines: reference/forms/types/entity.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
263263
.. note::
264264

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

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

‎security/ldap.rst

Copy file name to clipboardExpand all lines: security/ldap.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ search_password
196196

197197
**type**: ``string`` **default**: ``null``
198198

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

202202
default_roles

‎serializer/custom_encoders.rst

Copy file name to clipboardExpand all lines: serializer/custom_encoders.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to Create your Custom Encoder
66

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

1111
The Component provides several built-in encoders that are described
1212
:doc:`in their own section </serializer/encoders>` but you may want

‎service_container/definitions.rst

Copy file name to clipboardExpand all lines: service_container/definitions.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fetched from the container::
9696
.. caution::
9797

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

102102
Method Calls

‎service_container/service_decoration.rst

Copy file name to clipboardExpand all lines: service_container/service_decoration.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ convention, the old ``app.mailer`` service is renamed to
154154
155155
use Symfony\Component\DependencyInjection\Reference;
156156
157-
$container->register('app.decorating_mailer', 'AppBundle\DeocratingMailer')
157+
$container->register('app.decorating_mailer', 'AppBundle\DecoratingMailer')
158158
->setDecoratedService('foo', 'app.decorating_mailer.wooz')
159159
->addArgument(new Reference('app.decorating_mailer.wooz'))
160160
// ...

‎setup/web_server_configuration.rst

Copy file name to clipboardExpand all lines: setup/web_server_configuration.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The **minimum configuration** to get your application running under Apache is:
5050
</Directory>
5151
5252
# uncomment the following lines if you install assets as symlinks
53-
# or run into problems when compiling LESS/Sass/CoffeScript assets
53+
# or run into problems when compiling LESS/Sass/CoffeeScript assets
5454
# <Directory /var/www/project>
5555
# Options FollowSymlinks
5656
# </Directory>
@@ -88,7 +88,7 @@ and increase web server performance:
8888
</Directory>
8989
9090
# uncomment the following lines if you install assets as symlinks
91-
# or run into problems when compiling LESS/Sass/CoffeScript assets
91+
# or run into problems when compiling LESS/Sass/CoffeeScript assets
9292
# <Directory /var/www/project>
9393
# Options FollowSymlinks
9494
# </Directory>
@@ -200,7 +200,7 @@ directive to pass requests for PHP files to PHP FPM:
200200
</Directory>
201201
202202
# uncomment the following lines if you install assets as symlinks
203-
# or run into problems when compiling LESS/Sass/CoffeScript assets
203+
# or run into problems when compiling LESS/Sass/CoffeeScript assets
204204
# <Directory /var/www/project>
205205
# Options FollowSymlinks
206206
# </Directory>
@@ -236,7 +236,7 @@ should look something like this:
236236
</Directory>
237237
238238
# uncomment the following lines if you install assets as symlinks
239-
# or run into problems when compiling LESS/Sass/CoffeScript assets
239+
# or run into problems when compiling LESS/Sass/CoffeeScript assets
240240
# <Directory /var/www/project>
241241
# Options FollowSymlinks
242242
# </Directory>

‎templating.rst

Copy file name to clipboardExpand all lines: templating.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ Suppose ``description`` equals ``I <3 this product``:
923923

924924
.. code-block:: twig
925925
926-
<!-- outupt escaping is on automatically -->
926+
<!-- output escaping is on automatically -->
927927
{{ description }} <!-- I &lt3 this product -->
928928
929929
<!-- disable output escaping with the raw filter -->

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.