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

Commit8ffdb1c

Browse files
committed
minor#5427 Cookbook grammar and style fixes (frne, javiereguiluz)
This PR was merged into the 2.3 branch.Discussion----------Cookbook grammar and style fixes| Q | A| ------------- | ---| Doc fix? | yes| New docs? | no| Applies to | 2.3+| Fixed tickets | -Commits-------1cff826 Fixed a minor typo797aab7 Fixed minor issuesa75cc15 Removed some information wrongly rebased2af84eb Style / grammar fixes for the deployment chapterc56f912 Style / grammar fixes for the controller chapter136230f Style / grammar fixes for the console chaptera0abc5d Removes wrong comma974e17f Rewritten 'whether' & removed serial comma21ebbd4 Style / grammar fixes for the configuration chapterba6f59f Style / grammar fixes for the cache chapter2ec4855 Style / grammar fixes for the bundles chapterbed8824 Style / grammar fixes for the assetic chapter
2 parents91d9ab1 +1cff826 commit8ffdb1c

18 files changed

+58
-59
lines changed

‎cookbook/assetic/asset_management.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ To include JavaScript files, use the ``javascripts`` tag in any template:
9191

9292
You can also include CSS stylesheets: see:ref:`cookbook-assetic-including-css`.
9393

94-
In this example, allof thefiles in the ``Resources/public/js/`` directory
95-
of theAppBundle will be loaded and served from a different location.
96-
The actualrendered tag might simply look like:
94+
In this example, all files in the ``Resources/public/js/`` directory of the
95+
AppBundle will be loaded and served from a different location. The actual
96+
rendered tag might simply look like:
9797

9898
..code-block::html
9999

@@ -357,7 +357,7 @@ Filters
357357
Once they're managed by Assetic, you can apply filters to your assets before
358358
they are served. This includes filters that compress the output of your assets
359359
for smaller file sizes (and better frontend optimization). Other filters
360-
can compileJavaScript file fromCoffeeScript files and process SASS into CSS.
360+
can compile CoffeeScript files to JavaScript and process SASS into CSS.
361361
In fact, Assetic has a long list of available filters.
362362

363363
Many of the filters do not do the work directly, but use existing third-party

‎cookbook/assetic/jpeg_optimize.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
How to Use Assetic for Image Optimization with Twig Functions
55
=============================================================
66

7-
Amongst its many filters, Assetic has four filters which can be used for on-the-fly
7+
Among its many filters, Assetic has four filters which can be used for on-the-fly
88
image optimization. This allows you to get the benefits of smaller file sizes
99
without having to use an image editor to process each image. The results
1010
are cached and can be dumped for production so there is no performance hit
@@ -70,7 +70,7 @@ It can now be used from a template:
7070
Removing all EXIF Data
7171
~~~~~~~~~~~~~~~~~~~~~~
7272

73-
By default, the ``jpegoptim`` filter removes someof themeta information stored
73+
By default, the ``jpegoptim`` filter removes some meta information stored
7474
in the image. To remove all EXIF data and comments, set the ``strip_all`` option
7575
to ``true``:
7676

‎cookbook/assetic/yuicompressor.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Download the YUI Compressor JAR
1818
-------------------------------
1919

2020
The YUI Compressor is written in Java and distributed as a JAR. `Download the JAR`_
21-
from the Yahoo!site and save it to ``app/Resources/java/yuicompressor.jar``.
21+
from the Yahoo!website and save it to ``app/Resources/java/yuicompressor.jar``.
2222

2323
Configure the YUI Filters
2424
-------------------------

‎cookbook/bundles/configuration.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ The ``Configuration`` class to handle the sample configuration looks like::
210210
supporting "prototype" nodes, advanced validation, XML-specific normalization
211211
and advanced merging. You can read more about this in
212212
:doc:`the Config component documentation</components/config/definition>`. You
213-
can also see it in action by checking out someof thecore Configuration
213+
can also see it in action by checking out some core Configuration
214214
classes, such as the one from the `FrameworkBundle Configuration`_ or the
215215
`TwigBundle Configuration`_.
216216

@@ -227,7 +227,7 @@ thrown)::
227227
}
228228

229229
The ``processConfiguration()`` method uses the configuration tree you've defined
230-
in the ``Configuration`` class to validate, normalize and merge allofthe
230+
in the ``Configuration`` class to validate, normalize and merge all the
231231
configuration arrays together.
232232

233233
..tip::
@@ -253,7 +253,7 @@ configuration arrays together.
253253
}
254254

255255
This class uses the ``getConfiguration()`` method to get the Configuration
256-
instance, you should override it if your Configuration class is not called
256+
instance. You should override it if your Configuration class is not called
257257
``Configuration`` or if it is not placed in the same namespace as the
258258
extension.
259259

‎cookbook/bundles/override.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ In this example you fetch the service definition of the original service, and se
9090
its class name to your own class.
9191

9292
See:doc:`/cookbook/service_container/compiler_passes` for information on how to use
93-
compiler passes. If you want to do something beyond just overriding the class -
94-
like adding a method call - you can only use the compiler pass method.
93+
compiler passes. If you want to do something beyond just overriding the class,
94+
like adding a method call, you can only use the compiler pass method.
9595

9696
Entities & Entity Mapping
9797
-------------------------

‎cookbook/bundles/prepend_extension.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ often need to be repeated for various bundles.
1515
Using the below approach, it is possible to remove the disadvantage of the
1616
multiple bundle approach by enabling a single Extension to prepend the settings
1717
for any bundle. It can use the settings defined in the ``app/config/config.yml``
18-
to prepend settings just as if theywould have been written explicitly by
18+
to prepend settings just as if theyhad been written explicitly by
1919
the user in the application configuration.
2020

2121
For example, this could be used to configure the entity manager name to use in

‎cookbook/bundles/remove.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Remove the ``_acme_demo`` entry at the bottom of this file.
5656

5757
Some bundles contain configuration in one of the ``app/config/config*.yml``
5858
files. Be sure to remove the related configuration from these files. You can
59-
quickly spot bundle configuration by looking fora ``acme_demo`` (or whatever
59+
quickly spot bundle configuration by looking foran ``acme_demo`` (or whatever
6060
the name of the bundle is, e.g. ``fos_user`` for the FOSUserBundle) string in
6161
the configuration files.
6262

‎cookbook/cache/varnish.rst‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,16 @@ in the Symfony configuration so that Varnish is seen as a trusted proxy and the
2929
Routing and X-FORWARDED Headers
3030
-------------------------------
3131

32-
If the ``X-Forwarded-Port`` header is not set correctly, Symfony will append
33-
the port where the PHP application is running when generating absolute URLs,
34-
e.g. ``http://example.com:8080/my/path``. To ensure that the Symfony router
35-
generates URLs correctly with Varnish, add the correct port number in the
36-
``X-Forwarded-Port`` header. This port depends on your setup.
37-
38-
Suppose that external connections come in on the default HTTP port 80. For HTTPS
39-
connections, there is another proxy (as Varnish does not do HTTPS itself) on the
40-
default HTTPS port 443 that handles the SSL termination and forwards the requests
41-
as HTTP requests to Varnish with a ``X-Forwarded-Proto`` header. In this case,
42-
add the following to your Varnish configuration:
32+
To ensure that the Symfony Router generates URLs correctly with Varnish,
33+
an ``X-Forwarded-Port`` header must be present for Symfony to use the
34+
correct port number.
35+
36+
This port number corresponds to the port your setup is using to receive external
37+
connections (``80`` is the default value for HTTP connections). If the application
38+
also accepts HTTPS connections, there could be another proxy (as Varnish does
39+
not do HTTPS itself) on the default HTTPS port 443 that handles the SSL termination
40+
and forwards the requests as HTTP requests to Varnish with an ``X-Forwarded-Proto``
41+
header. In this case, you need to add the following configuration snippet:
4342

4443
..code-block::varnish4
4544
@@ -192,7 +191,7 @@ Symfony adds automatically:
192191
..tip::
193192

194193
If you followed the advice about ensuring a consistent caching
195-
behavior, thosevcl functions already exist. Just append the code
194+
behavior, thoseVCL functions already exist. Just append the code
196195
to the end of the function, they won't interfere with each other.
197196

198197
..index::

‎cookbook/configuration/apache_router.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ You're now all set to use Apache routes.
133133
Additional Tweaks
134134
-----------------
135135

136-
To savea little bit of processing time, change occurrences of ``Request``
136+
To savesome processing time, change occurrences of ``Request``
137137
to ``ApacheRequest`` in ``web/app.php``::
138138

139139
// web/app.php

‎cookbook/configuration/environments.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ How to Master and Create new Environments
55
=========================================
66

77
Every application is the combination of code and a set of configuration that
8-
dictates how that code should function. The configuration may define the
9-
databasebeing used,whether or notsomething should be cached, or how verbose
10-
logging should be. In Symfony, the idea of "environments" is the idea that
11-
thesame codebase can be run using multiple different configurations. For
12-
example, the ``dev`` environment should use configuration that makes development
13-
easy and friendly, while the ``prod`` environment should use a set of configuration
14-
optimized for speed.
8+
dictates how that code should function. The configuration may define the database
9+
being used,ifsomething should be cached or how verbose logging should be.
10+
11+
In Symfony,theidea of "environments" is the idea that the same codebase can be
12+
run using multiple different configurations. Forexample, the ``dev`` environment
13+
should use configuration that makes development easy and friendly, while the
14+
``prod`` environment should use a set of configurationoptimized for speed.
1515

1616
..index::
1717
single: Environments; Configuration files
@@ -170,10 +170,10 @@ this code and changing the environment string.
170170

171171
Important, but unrelated to the topic of *environments* is the ``false``
172172
argument as the second argument to the ``AppKernel`` constructor. This
173-
specifieswhether or not the application should run in "debug mode". Regardless
173+
specifiesif the application should run in "debug mode". Regardless
174174
of the environment, a Symfony application can be run with debug mode
175175
set to ``true`` or ``false``. This affects many things in the application,
176-
such aswhether or not errors should be displayed or if cache files are
176+
such asif errors should be displayed or if cache files are
177177
dynamically rebuilt on each request. Though not a requirement, debug mode
178178
is generally set to ``true`` for the ``dev`` and ``test`` environments
179179
and ``false`` for the ``prod`` environment.
@@ -322,7 +322,7 @@ The new environment is now accessible via::
322322
..note::
323323

324324
Some environments, like the ``dev`` environment, are never meant to be
325-
accessed on any deployed server by thegeneralpublic. This is because
325+
accessed on any deployed server by the public. This is because
326326
certain environments, for debugging purposes, may give too much information
327327
about the application or underlying infrastructure. To be sure these environments
328328
aren't accessible, the front controller is usually protected from external

0 commit comments

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