8000 Merge branch 'standardising_index_case' of https://github.com/richard… · lazymanc/symfony-docs@26875e7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 26875e7

Browse files
weaverryanweaverryan
committed
Merge branch 'standardising_index_case' of https://github.com/richardmiller/symfony-docs into richardmiller-standardising_index_case
Conflicts: cookbook/bundles/best_practices.rst
2 parents d81b616 + 17b1e14 commit 26875e7

File tree

13 files changed

+37
-37
lines changed

13 files changed

+37
-37
lines changed

‎book/http_cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ which is actually a collection of various cache information.
290290
:ref:`http-expiration-validation` section.
291291

292292
.. index::
293-
single: Cache; Cache-Control Header
293+
single: Cache; Cache-Control header
294294
single: HTTP headers; Cache-Control
295295

296296
The Cache-Control Header
@@ -624,7 +624,7 @@ code.
624624
whether or not the resource has been updated since it was cached.
625625

626626
.. index::
627-
single: Cache; Conditional Get
627+
single: Cache; Conditional get
628628
single: HTTP; 304
629629

630630
.. _optimizing-cache-validation:

‎cookbook/assetic/apply_to_option.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Assetic; Apply Filters
2+
single: Assetic; Apply filters
33

44
How to Apply an Assetic Filter to a Specific File Extension
55
===========================================================

‎cookbook/assetic/jpeg_optimize.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Assetic; Image Optimization
2+
single: Assetic; Image optimization
33

44
How to Use Assetic For Image Optimization with Twig Functions
55
=============================================================

‎cookbook/bundles/best_practices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Bundle; Best Practices
2+
single: Bundles; Best practices
33

44
Bundle Structure and Best Practices
55
===================================
@@ -9,7 +9,7 @@ from classes to controllers and web resources. Even if bundles are very
99
flexible, you should follow some best practices if you want to distribute them.
1010

1111
.. index::
12-
pair: Bundles; Naming Conventions
12+
pair: Bundles; Naming conventions
1313

1414
.. _bundles-naming-conventions:
1515

‎cookbook/bundles/extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. index::
22
single: Configuration; Semantic
3-
single: Bundle; Extension Configuration
3+
single: Bundle; Extension configuration
44

55
How to expose a Semantic Configuration for a Bundle
66
===================================================

‎reference/configuration/assetic.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
pair: Assetic; Configuration Reference
2+
pair: Assetic; Configuration reference
33

44
AsseticBundle Configuration Reference
55
=====================================

‎reference/configuration/doctrine.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. index::
2-
single: Doctrine; ORM Configuration Reference
3-
single: Configuration Reference; Doctrine ORM
2+
single: Doctrine; ORM configuration reference
3+
single: Configuration reference; Doctrine ORM
44

55
Configuration Reference
66
=======================

‎reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Configuration Reference; Framework
2+
single: Configuration reference; Framework
33

44
FrameworkBundle Configuration ("framework")
55
===========================================

‎reference/configuration/monolog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
pair: Monolog; Configuration Reference
2+
pair: Monolog; Configuration reference
33

44
Configuration Reference
55
=======================

‎reference/configuration/security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. index::
2-
single: Security; Configuration Reference
2+
single: Security; Configuration reference
33

44
Security Configuration Reference
55
================================

0 commit comments

Comments
 (0)
0