Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commit463f9db

Browse files
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 parents09975d7 +d0a0a04 commit463f9db

File tree

17 files changed

+25
-21
lines changed

17 files changed

+25
-21
lines changed

‎components/console/helpers/table.rst‎

Lines 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-
theenire table width::
225+
theentire table width::
226226

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

‎components/finder.rst‎

Lines 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‎

Lines 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‎

Lines 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‎

Lines 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 areconfiguable under the PHP settings
178+
The PHP version and enabled extensions areconfigurable 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 isconfiguable for every custom domain you setup for your App.
190+
The document root isconfigurable 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‎

Lines 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, likerelationshps, complex queries,
890+
Doctrine has a lot more complex features to learn, likerelationships, complex queries,
891891
and event listeners.
892892

893893
Learn more

‎doctrine/associations.rst‎

Lines 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 managementcapabailties. Plus, in the context of this application,
165+
of relationship managementcapabilities. 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‎

Lines 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 commaseperated string to make them easier to edit.
52+
simple commaseparated 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‎

Lines 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, themising fields will be set to ``null``.
85+
within the form object. Otherwise, themissing fields will be set to ``null``.

‎reference/configuration/framework.rst‎

Lines 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

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp