8000 Merge branch '2.0' · shakir33/symfony-docs@40b48dc · GitHub
[go: up one dir, main page]
Skip to content

Commit 40b48dc

Browse files
weaverryanweaverryan
committed
Merge branch '2.0'
2 parents 7a96f35 + 9ed2ebb commit 40b48dc

File tree

22 files changed

+69
-37
lines changed

22 files changed

+69
-37
lines changed

‎book/controller.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ itself.
384384
</cookbook/controller/service>`.
385385

386386
.. index::
387-
single: Controller; Common Tasks
387+
single: Controller; Common tasks
388388

389389
Common Controller Tasks
390390
-----------------------
@@ -623,7 +623,7 @@ These attributes will remain on the user for the remainder of that user's
623623
session.
624624

625625
.. index::
626-
single Session; Flash messages
626+
single: Session; Flash messages
627627

628628
Flash Messages
629629
~~~~~~~~~~~~~~

‎book/doctrine.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ and ``nullable``. Take a few examples:
13051305
Doctrine's `Property Mapping documentation`_
13061306

13071307
.. index::
1308-
single: Doctrine; ORM Console Commands
1308+
single: Doctrine; ORM console commands
13091309
single: CLI; Doctrine ORM
13101310

13111311
Console Commands

‎book/forms.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ Validation is a very powerful feature of Symfony2 and has its own
369369
:doc:`dedicated chapter</book/validation>`.
370370

371371
.. index::
372-
single: Forms; Validation Groups
372+
single: Forms; Validation groups
373373

374374
.. _book-forms-validation-groups:
375375

@@ -448,7 +448,7 @@ You can also define whole logic inline by using a Closure::
448448
}
449449

450450
.. index::
451-
single: Forms; Built-in Field Types
451+
single: Forms; Built-in field types
452452

453453
.. _book-forms-type-reference:
454454

@@ -587,7 +587,7 @@ passing the option in the options field array::
587587
->add('task', null, array('max_length' => 4))
588588

589589
.. index::
590-
single: Forms; Rendering in a Template
590+
single: Forms; Rendering in a template
591591

592592
.. _form-rendering-template:
593593

@@ -1236,7 +1236,7 @@ customize (e.g. ``widget``), you can construct the fragment name that needs
12361236
to be overridden (e.g. ``textarea_widget``).
12371237

12381238
.. index::
1239-
single: Forms; Template Fragment Inheritance
1239+
single: Forms; Template fragment inheritance
12401240

12411241
Template Fragment Inheritance
12421242
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1399,7 +1399,7 @@ Any fragments inside the ``Acme/TaskBundle/Resources/views/Form`` directory
13991399
are now used globally to define form output.
14001400

14011401
.. index::
1402-
single: Forms; CSRF Protection
1402+
single: Forms; CSRF protection
14031403

14041404
.. _forms-csrf:
14051405

‎book/http_cache.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Nottingham's `Cache Tutorial`_.
6363

6464
.. index::
6565
single: Cache; Proxy
66-
single: Cache; Reverse Proxy
66+
single: Cache; Reverse proxy
6767
single: Cache; Gateway
6868

6969
.. _gateway-caches:
@@ -126,7 +126,7 @@ the first two cache types. These caches are outside of your control but follow
126126
the HTTP cache directions set in the response.
127127

128128
.. index::
129-
single: Cache; Symfony2 Reverse Proxy
129+
single: Cache; Symfony2 reverse proxy
130130

131131
.. _`symfony-gateway-cache`:
132132

@@ -431,7 +431,7 @@ on a cache to store and return "fresh" responses.
431431
are much more beautiful than its cover.
432432

433433
.. index::
434-
single: Cache; HTTP Expiration
434+
single: Cache; HTTP expiration
435435

436436
Expiration
437437
~~~~~~~~~~

‎book/internals.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Every Symfony2 Kernel implements
8888
function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
8989

9090
.. index::
91-
single: Internals; Controller Resolver
91+
single: Internals; Controller resolver
9292

9393
Controllers
9494
~~~~~~~~~~~
@@ -139,7 +139,7 @@ the Request attributes.
139139
}
140140

141141
.. index::
142-
single: Internals; Request Handling
142+
single: Internals; Request handling
143143

144144
Handling Requests
145145
~~~~~~~~~~~~~~~~~
@@ -181,7 +181,7 @@ instance), disable the ``kernel.exception`` event by passing ``false`` as the
181181
third argument to the ``handle()`` method.
182182

183183
.. index::
184-
single: Internals; Internal Requests
184+
single: Internals; Internal requests
185185

186186
Internal Requests
187187
~~~~~~~~~~~~~~~~~

‎book/service_container.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ classes is a well-known and trusted object-oriented best-practice. These skills
6262
are key to being a good developer in almost any language.
6363

6464
.. index::
65-
single: Service Container; What is a Service Container?
65+
single: Service Container; What is a service container?
6666

6767
What is a Service Container?
6868
----------------------------
@@ -1069,8 +1069,13 @@ additional arguments (beyond just the ``name`` parameter).
10691069
Learn more
10701070
----------
10711071

1072+
* :doc:`/components/dependency_injection/compilation`
1073+
* :doc:`/components/dependency_injection/definitions`
10721074
* :doc:`/components/dependency_injection/factories`
10731075
* :doc:`/components/dependency_injection/parentservices`
1076+
* :doc:`/components/dependency_injection/tags`
10741077
* :doc:`/cookbook/controller/service`
1078+
* :doc:`/cookbook/service_container/scopes`
1079+
* :doc:`/cookbook/service_container/compiler_passes`
10751080

10761081
.. _`service-oriented architecture`: http://wikipedia.org/wiki/Service-oriented_architecture

‎book/templating.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ When working with template inheritance, here are some tips to keep in mind:
355355
{% endblock %}
356356

357357
.. index::
358-
single: Templating; Naming Conventions
359-
single: Templating; File Locations
358+
single: Templating; Naming conventions
359+
single: Templating; File locations
360360

361361
.. _template-naming-locations:
362362

@@ -444,7 +444,7 @@ section.
444444
See :ref:`Templating Configuration<template-configuration>` for more details.
445445

446446
.. index::
447-
single: Templating; Tags and Helpers
447+
single: Templating; Tags and helpers
448448
single: Templating; Helpers
449449

450450
Tags and Helpers
@@ -844,7 +844,7 @@ configuration option.
844844
.. index::
845845
single: Templating; Including stylesheets and Javascripts
846846
single: Stylesheets; Including stylesheets
847-
single: Javascripts; Including Javascripts
847+
single: Javascript; Including Javascripts
848848

849849
Including Stylesheets and Javascripts in Twig
850850
---------------------------------------------
@@ -1023,7 +1023,7 @@ Several configuration options are available and are covered in the
10231023
third-party bundles).
10241024

10251025
.. index::
1026-
single; Template; Overriding templates
1026+
single: Template; Overriding templates
10271027

10281028
.. _overriding-bundle-templates:
10291029

@@ -1086,7 +1086,7 @@ subdirectory.
10861086
.. _templating-overriding-core-templates:
10871087

10881088
.. index::
1089-
single; Template; Overriding exception templates
1089+
single: Template; Overriding exception templates
10901090

10911091
Overriding Core Templates
10921092
~~~~~~~~~~~~~~~~~~~~~~~~~

‎book/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ file.
3939
Code coverage can be generated with the ``--coverage-html`` option.
4040

4141
.. index::
42-
single: Tests; Unit Tests
42+
single: Tests; Unit tests
4343

4444
Unit Tests
4545
----------
@@ -106,7 +106,7 @@ Running tests for a given file or directory is also very easy:
106106
$ phpunit -c app src/Acme/DemoBundle/
107107
108108
.. index::
109-
single: Tests; Functional Tests
109+
single: Tests; Functional tests
110110

111111
Functional Tests
112112
----------------

‎components/dependency_injection/definitions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Dependency Injection; Service Definitions
2+
single: Dependency Injection; Service definitions
33

44

55
Working with Container Parameters and Definitions

‎components/dependency_injection/parentservices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Dependency Injection; Parent Services
2+
single: Dependency Injection; Parent services
33

44
Managing Common Dependencies with Parent Services
55
=================================================

0 commit comments

Comments
 (0)
0