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

Commitf285d93

Browse files
committed
minor#3451 some language tweaks (AE, third-person perspective) (xabbuh)
This PR was merged into the 2.3 branch.Discussion----------some language tweaks (AE, third-person perspective)| Q | A| ------------- | ---| Doc fix? | yes| New docs? | no| Applies to | all| Fixed tickets |Commits-------0aad5d3 some language tweaks (AE, third-person perspective)
2 parents2b7e0f6 +0aad5d3 commitf285d93

File tree

32 files changed

+70
-73
lines changed

32 files changed

+70
-73
lines changed

‎book/forms.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Submitting Forms with Multiple Buttons
281281

282282
When your form contains more than one submit button, you will want to check
283283
which of the buttons was clicked to adapt the program flow in your controller.
284-
Let'sadd a second button with the caption "Save and add" toour form::
284+
To do this,add a second button with the caption "Save and add" toyour form::
285285

286286
$form = $this->createFormBuilder($task)
287287
->add('task', 'text')
@@ -552,8 +552,8 @@ Groups based on the Clicked Button
552552
When your form contains multiple submit buttons, you can change the validation
553553
group depending on which button is used to submit the form. For example,
554554
consider a form in a wizard that lets you advance to the next step or go back
555-
to the previous step.Let's assumealsothat when returning to the previous
556-
step,the data of the form should be saved, but not validated.
555+
to the previous step.Also assume that when returning to the previous step,
556+
the data of the form should be saved, but not validated.
557557

558558
First, we need to add the two buttons to the form::
559559

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ to maintain. There are several problems that need to be addressed:
7575
tied to MySQL. Though not covered here, Symfony2 fully integrates `Doctrine`_,
7676
a library dedicated to database abstraction and mapping.
7777

78-
Let's get to work on solving these problems and more.
79-
8078
Isolating the Presentation
8179
~~~~~~~~~~~~~~~~~~~~~~~~~~
8280

@@ -673,8 +671,8 @@ Where Symfony2 Delivers
673671
~~~~~~~~~~~~~~~~~~~~~~~
674672

675673
In the upcoming chapters, you'll learn more about how each piece of Symfony
676-
works and the recommended organization of a project. For now,let's see how
677-
migrating the blog from flat PHP to Symfony2 has improved life:
674+
works and the recommended organization of a project. For now,have a look
675+
at howmigrating the blog from flat PHP to Symfony2 has improved life:
678676

679677
* Your application now has **clear and consistently organized code** (though
680678
Symfony doesn't force you into this). This promotes **reusability** and

‎book/security.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ that looks like the following:
148148
* All URLs *not* matching ``/admin/*`` are accessible by all users (and the
149149
user is never prompted to log in).
150150

151-
Let's look briefly athow security works and how each part of the configuration
152-
comes into play.
151+
Read this short summary abouthow security works and how each part of the
152+
configurationcomes into play.
153153

154154
How Security Works: Authentication and Authorization
155155
----------------------------------------------------
@@ -541,7 +541,7 @@ And that's it! When you submit the form, the security system will automatically
541541
check the user's credentials and either authenticate the user or send the
542542
user back to the login form where the error can be displayed.
543543

544-
Let's review the whole process:
544+
To review the whole process:
545545

546546
#. The user tries to access a resource that is protected;
547547
#. The firewall initiates the authentication process by redirecting the

‎components/console/introduction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can install the component in 2 different ways:
2727
configured with an ANSI driver and your console commands invoke other scripts which
2828
emit ANSI color sequences, they will be shown as raw escape characters.
2929

30-
To enable ANSIcolour support for Windows, please install `ANSICON`_.
30+
To enable ANSIcolor support for Windows, please install `ANSICON`_.
3131

3232
Creating a basic Command
3333
------------------------

‎components/filesystem.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ the mode of a file. The fourth argument is a boolean recursive option::
162162
Remove
163163
~~~~~~
164164

165-
:method:`Symfony\\Component\\Filesystem\\Filesystem::remove`let's you remove
166-
files,symlink, directories easily::
165+
:method:`Symfony\\Component\\Filesystem\\Filesystem::remove`is used to remove
166+
files,symlinks, directories easily::
167167

168168
$fs->remove(array('symlink', '/path/to/directory', 'activity.log'));
169169

‎components/http_foundation/session_configuration.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Configuring Sessions and Save Handlers
77

88
This section deals with how to configure session management and fine tune it
99
to your specific needs. This documentation covers save handlers, which
10-
store and retrieve session data, and configuring sessionbehaviour.
10+
store and retrieve session data, and configuring sessionbehavior.
1111

1212
Save Handlers
1313
~~~~~~~~~~~~~
@@ -57,7 +57,7 @@ Example usage::
5757

5858
Native save handlers provide a quick solution to session storage, however, in complex systems
5959
where you need more control, custom save handlers may provide more freedom and flexibility.
60-
Symfony2 provides several implementations which you may furthercustomise as required.
60+
Symfony2 provides several implementations which you may furthercustomize as required.
6161

6262
Custom Save Handlers
6363
--------------------

‎components/routing/introduction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ In order to set up a basic routing system you need three parts:
2525
* A:class:`Symfony\\Component\\Routing\\RequestContext`, which has information about the request
2626
* A:class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher`, which performs the mapping of the request to a single route
2727

28-
Let's see a quick example. Notice that this assumes that you've already configured
28+
Here is a quick example. Notice that this assumes that you've already configured
2929
your autoloader to load the Routing component::
3030

3131
use Symfony\Component\Routing\Matcher\UrlMatcher;

‎components/serializer.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ method on the normalizer definition::
129129
Deserializing an Object
130130
-----------------------
131131

132-
Let's seenow how to do theexactly the opposite. This time, the information
132+
You'llnowlearnhow to do theexact opposite. This time, the information
133133
of the ``Person`` class would be encoded in XML format::
134134

135135
$data = <<<EOF

‎cookbook/assetic/apply_to_option.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to Apply an Assetic Filter to a Specific File Extension
66

77
Assetic filters can be applied to individual files, groups of files or even,
88
as you'll see here, files that have a specific extension. To show you how
9-
to handle each option,let'ssuppose that you want to use Assetic's CoffeeScript
9+
to handle each option, suppose that you want to use Assetic's CoffeeScript
1010
filter, which compiles CoffeeScript files into JavaScript.
1111

1212
The main configuration is just the paths to coffee, node and node_modules.

‎cookbook/cache/varnish.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ that will invalidate the cache for a given resource:
9090
9191
sub vcl_recv {
9292
/*
93-
Varnish defaultbehaviour doesn't support PURGE.
93+
Varnish defaultbehavior doesn't support PURGE.
9494
Match the PURGE request and immediately do a cache lookup,
9595
otherwise Varnish will directly pipe the request to the backend
9696
and bypass the cache

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp