Skip to content

Commit ed3b5f4

Browse files
weaverryanweaverryan
committed
Merge branch 'removed_trailing_space' of git://github.com/WouterJ/symfony-docs into WouterJ-removed_trailing_space
Conflicts: components/options_resolver.rst
2 parents 0015c9d + 5542d41 commit ed3b5f4

File tree

82 files changed

+226
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+226
-287
lines changed

‎book/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ information. By convention, this information is usually configured in an
9191
</doctrine:config>
9292
9393
.. code-block:: php
94-
94+
9595
// app/config/config.php
9696
$configuration->loadFromExtension('doctrine', array(
9797
'dbal' => array(

‎book/forms.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,6 @@ file:
14401440
- 'AcmeTaskBundle:Form'
14411441
# ...
14421442
1443-
14441443
.. code-block:: xml
14451444
14461445
<!-- app/config/config.xml -->
@@ -1613,7 +1612,7 @@ but here's a short example:
16131612
The ``constraints`` option, which accepts a single constraint or an array
16141613
of constraints (before 2.1, the option was called ``validation_constraint``,
16151614
and only accepted a single constraint) is new to Symfony 2.1.
1616-
1615+
16171616
.. code-block:: php
16181617
16191618
use Symfony\Component\Validator\Constraints\Length;
@@ -1633,15 +1632,14 @@ but here's a short example:
16331632
16341633
.. tip::
16351634

1636-
If you are using Validation Groups, you need to either reference the
1637-
``Default`` group when creating the form, or set the correct group on
1635+
If you are using Validation Groups, you need to either reference the
1636+
``Default`` group when creating the form, or set the correct group on
16381637
the constraint you are adding.
1639-
1638+
16401639
.. code-block:: php
16411640
16421641
new NotBlank(array('groups' => array('create', 'update'))
1643-
1644-
1642+
16451643
Final Thoughts
16461644
--------------
16471645

‎book/from_flat_php_to_symfony2.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ Add a Touch of Symfony2
422422

423423
Symfony2 to the rescue. Before actually using Symfony2, you need to download
424424
it. This can be done by using Composer, which takes care of downloading the
425-
correct version and all its dependencies and provides an autoloader. An
426-
autoloader is a tool that makes it possible to start using PHP classes
425+
correct version and all its dependencies and provides an autoloader. An
426+
autoloader is a tool that makes it possible to start using PHP classes
427427
without explicitly including the file containing the class.
428428

429429
In your root directory, create a ``composer.json`` file with the following
@@ -439,7 +439,7 @@ content:
439439
"files": ["model.php","controllers.php"]
440440
}
441441
}
442-
442+
443443
Next, `download Composer`_ and then run the following command, which will download Symfony
444444
into a vendor/ directory:
445445

@@ -448,7 +448,7 @@ into a vendor/ directory:
448448
$ php composer.phar install
449449
450450
Beside downloading your dependencies, Composer generates a ``vendor/autoload.php`` file,
451-
which takes care of autoloading for all the files in the Symfony Framework as well as
451+
which takes care of autoloading for all the files in the Symfony Framework as well as
452452
the files mentioned in the autoload section of your ``composer.json``.
453453

454454
Core to Symfony's philosophy is the idea that an application's main job is

‎book/http_fundamentals.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ the user is connecting via a secured connection (i.e. ``https``).
270270
``attributes`` property exists entirely to be a place where you can
271271
prepare and store context-specific information about the request.
272272

273-
274273
Symfony also provides a ``Response`` class: a simple PHP representation of
275274
an HTTP response message. This allows your application to use an object-oriented
276275
interface to construct the response that needs to be returned to the client::
@@ -358,7 +357,7 @@ Stay Organized
358357
~~~~~~~~~~~~~~
359358

360359
Inside your front controller, you have to figure out which code should be
361-
executed and what the content to return should be. To figure this out, you'll
360+
executed and what the content to return should be. To figure this out, you'll
362361
need to check the incoming URI and execute different parts of your code depending
363362
on that value. This can get ugly quickly::
364363

‎book/installation.rst

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,13 @@ Symfony itself - into the ``vendor/`` directory.
188188
When running ``php composer.phar install`` or ``php composer.phar update``,
189189
composer will execute post install/update commands to clear the cache
190190
and install assets. By default, the assets will be copied into your ``web``
191-
directory.
191+
directory.
192192

193193
Instead of copying your Symfony assets, you can create symlinks if
194194
your operating system supports it. To create symlinks, add an entry
195195
in the ``extra`` node of your composer.json file with the key
196196
``symfony-assets-install`` and the value ``symlink``:
197197

198-
199198
.. code-block:: json
200199
201200
"extra": {
@@ -239,7 +238,7 @@ If there are any issues, correct them now before moving on.
239238
On a UNIX system, this can be done with one of the following commands:
240239

241240
.. code-block:: bash
242-
241+
243242
$ ps aux | grep httpd
244243
245244
or
@@ -261,7 +260,7 @@ If there are any issues, correct them now before moving on.
261260
262261
$ sudo chmod +a "www-data allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
263262
$ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
264-
263+
265264
**2. Using Acl on a system that does not support chmod +a**
266265

267266
Some systems don't support ``chmod +a``, but do support another utility
@@ -304,12 +303,12 @@ Symfony2 should welcome and congratulate you for your hard work so far!
304303
.. image:: /images/quick_tour/welcome.png
305304

306305
.. tip::
307-
308-
To get nice and short urls you should point the document root of your
309-
webserver or virtual host to the ``Symfony/web/`` directory. Though
310-
this is not required for development it is recommended at the time your
306+
307+
To get nice and short urls you should point the document root of your
308+
webserver or virtual host to the ``Symfony/web/`` directory. Though
309+
this is not required for development it is recommended at the time your
311310
application goes into production as all system and configuration files
312-
become inaccessible to clients then. For information on configuring
311+
become inaccessible to clients then. For information on configuring
313312
your specific web server document root, read
314313
:doc:`/cookbook/configuration/web_server_configuration`
315314
or consult the official documentation of your webserver:

‎book/internals.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ the Request attributes.
146146
Handling Requests
147147
~~~~~~~~~~~~~~~~~
148148

149-
The :method:`Symfony\\Component\\HttpKernel\\HttpKernel::handle` method
150-
takes a ``Request`` and *always* returns a ``Response``. To convert the
151-
``Request``, ``handle()`` relies on the Resolver and an ordered chain of
152-
Event notifications (see the next section for more information about each
149+
The :method:`Symfony\\Component\\HttpKernel\\HttpKernel::handle` method
150+
takes a ``Request`` and *always* returns a ``Response``. To convert the
151+
``Request``, ``handle()`` relies on the Resolver and an ordered chain of
152+
Event notifications (see the next section for more information about each
153153
Event):
154154

155155
#. Before doing anything else, the ``kernel.request`` event is notified -- if
@@ -209,14 +209,14 @@ Each event thrown by the Kernel is a subclass of
209209
:class:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent`. This means that
210210
each event has access to the same basic information:
211211

212-
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequestType`
213-
- returns the *type* of the request (``HttpKernelInterface::MASTER_REQUEST``
212+
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequestType`
213+
- returns the *type* of the request (``HttpKernelInterface::MASTER_REQUEST``
214214
or ``HttpKernelInterface::SUB_REQUEST``);
215215

216-
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getKernel`
216+
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getKernel`
217217
- returns the Kernel handling the request;
218218

219-
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequest`
219+
* :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequest`
220220
- returns the current ``Request`` being handled.
221221

222222
``getRequestType()``
@@ -513,7 +513,7 @@ HTTP header of the Response::
513513
want to get the token for an Ajax request, use a tool like Firebug to get
514514
the value of the ``X-Debug-Token`` HTTP header.
515515

516-
Use the :method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::find`
516+
Use the :method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::find`
517517
method to access tokens based on some criteria::
518518

519519
// get the latest 10 tokens
@@ -526,8 +526,8 @@ method to access tokens based on some criteria::
526526
$tokens = $container->get('profiler')->find('127.0.0.1', '', 10);
527527

528528
If you want to manipulate profiling data on a different machine than the one
529-
where the information were generated, use the
530-
:method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::export` and
529+
where the information were generated, use the
530+
:method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::export` and
531531
:method:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler::import` methods::
532532

533533
// on the production machine

‎book/page_creation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,9 @@ You'll learn more about each of these directories in later chapters.
516516

517517
.. sidebar:: Autoloading
518518

519-
When Symfony is loading, a special file - ``vendor/autoload.php`` - is
520-
included. This file is created by Composer and will autoload all
521-
application files living in the `src/` folder as well as all
519+
When Symfony is loading, a special file - ``vendor/autoload.php`` - is
520+
included. This file is created by Composer and will autoload all
521+
application files living in the `src/` folder as well as all
522522
third-party libraries mentioned in the ``composer.json`` file.
523523

524524
Because of the autoloader, you never need to worry about using ``include``

‎book/propel.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ Propel provides the following hooks:
439439
* ``preDelete()`` code executed before deleting an object
440440
* ``postDelete()`` code executed after deleting an object
441441

442-
443442
Behaviors
444443
---------
445444

‎book/security.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,6 @@ In a controller this can be shortcut to:
13781378
$user = $this->getUser();
13791379
}
13801380
1381-
13821381
.. note::
13831382

13841383
Anonymous users are technically authenticated, meaning that the ``isAuthenticated()``
@@ -1400,7 +1399,6 @@ method:
14001399

14011400
<p>Username: <?php echo $app->getUser()->getUsername() ?></p>
14021401

1403-
14041402
Using Multiple User Providers
14051403
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14061404

‎book/service_container.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ looks up the value of each parameter and uses it in the service definition.
264264
265265
.. caution::
266266

267-
You may receive a
267+
You may receive a
268268
:class:`Symfony\\Component\\DependencyInjection\\Exception\\ScopeWideningInjectionException`
269269
when passing the ``request`` service as an argument. To understand this
270270
problem better and learn how to solve it, refer to the cookbook article

‎book/templating.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ code.
1919
How to render templates is covered in the :ref:`controller <controller-rendering-templates>`
2020
page of the book.
2121

22-
2322
.. index::
2423
single: Templating; What is a template?
2524

@@ -976,7 +975,6 @@ advantage of Symfony's template inheritance.
976975
more interesting things with those assets. For more information on
977976
using Assetic see :doc:`/cookbook/assetic/asset_management`.
978977

979-
980978
Start by adding two blocks to your base template that will hold your assets:
981979
one called ``stylesheets`` inside the ``head`` tag and another called ``javascripts``
982980
just above the closing ``body`` tag. These blocks will contain all of the
@@ -1346,7 +1344,7 @@ a variable that is trusted and contains markup that should not be escaped.
13461344
Suppose that administrative users are able to write articles that contain
13471345
HTML code. By default, Twig will escape the article body.
13481346

1349-
To render it normally, add the ``raw`` filter:
1347+
To render it normally, add the ``raw`` filter:
13501348

13511349
.. code-block:: jinja
13521350
@@ -1401,7 +1399,6 @@ Template parameters can then be dumped using the ``dump`` function:
14011399
</a>
14021400
{% endfor %}
14031401

1404-
14051402
The variables will only be dumped if Twig's ``debug`` setting (in ``config.yml``)
14061403
is ``true``. By default this means that the variables will be dumped in the
14071404
``dev`` environment but not the ``prod`` environment.

‎book/testing.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,6 @@ Learn more
799799
* :doc:`/cookbook/testing/profiling`
800800
* :doc:`/cookbook/testing/bootstrap`
801801

802-
803802
.. _`DemoControllerTest`: https://github.com/symfony/symfony-standard/blob/master/src/Acme/DemoBundle/Tests/Controller/DemoControllerTest.php
804803
.. _`$_SERVER`: http://php.net/manual/en/reserved.variables.server.php
805804
.. _`documentation`: http://www.phpunit.de/manual/3.5/en/

‎book/translation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ via the ``request`` object::
512512
.. index::
513513
single: Translations; Fallback and default locale
514514

515-
It is also possible to store the locale in the session instead of on a per
515+
It is also possible to store the locale in the session instead of on a per
516516
request basis. If you do this, each subsequent request will have this locale.
517517

518518
.. code-block:: php
@@ -556,7 +556,7 @@ by defining a ``default_locale`` for the framework:
556556
557557
.. versionadded:: 2.1
558558
The ``default_locale`` parameter was defined under the session key
559-
originally, however, as of 2.1 this has been moved. This is because the
559+
originally, however, as of 2.1 this has been moved. This is because the
560560
locale is now set on the request instead of the session.
561561

562562
.. _book-translation-locale-url:

‎components/config/definition.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ you can take advantage of the shortcut
293293
->defaultFalse()
294294
;
295295

296-
The ``canBeDisabled`` method looks about the same except that the section
296+
The ``canBeDisabled`` method looks about the same except that the section
297297
would be enabled by default.
298298

299299
Merging options
@@ -384,7 +384,7 @@ make both of these ``auto_connect``.
384384

385385
.. caution::
386386

387-
The target key will not be altered if it's mixed like
387+
The target key will not be altered if it's mixed like
388388
``foo-bar_moo`` or if it already exists.
389389

390390
Another difference between Yaml and XML is in the way arrays of values may
@@ -553,4 +553,3 @@ Otherwise the result is a clean array of configuration values::
553553
$configuration,
554554
$configs)
555555
;
556-

0 commit comments

Comments
 (0)