Skip to content

Commit e1037e9

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Update readme for contributing Update workflow.rst Added a "see also" note in the Redis cache adapter article Remove whitespace before self closing xml tag
2 parents 3e0543a + 3bb644b commit e1037e9

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

README.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ This documentation is rendered online at https://symfony.com/doc/current/
66
Contributing
77
------------
88

9+
We love contributors! For more information on how you can contribute to the
10+
Symfony documentation, please read
11+
[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
12+
913
> **Note**
1014
> Unless you're documenting a feature that was introduced *after* Symfony 3.4
1115
> (e.g. in Symfony 4.2), all pull requests must be based off of the **3.4** branch,
1216
> **not** the master or older branches.
1317
14-
We love contributors! For more information on how you can contribute to the
15-
Symfony documentation, please read
16-
[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
17-
1818
SymfonyCloud
1919
------------
2020

cache.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ You can read more about these at the :doc:`component documentation </components/
3434

3535
The cache contracts were introduced in Symfony 4.2.
3636

37+
.. _cache-configuration-with-frameworkbundle:
38+
3739
Configuring Cache with FrameworkBundle
3840
--------------------------------------
3941

components/cache/adapters/redis_adapter.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@
77
Redis Cache Adapter
88
===================
99

10+
.. seealso::
11+
12+
This article explains how to configure the Redis adapter when using the
13+
Cache as an independent component in any PHP application. Read the
14+
:ref:`Symfony Cache configuration <cache-configuration-with-frameworkbundle>`
15+
article if you are using it in a Symfony application.
16+
1017
This adapter stores the values in-memory using one (or more) `Redis server`_ instances.
18+
1119
Unlike the :ref:`APCu adapter <apcu-adapter>`, and similarly to the
1220
:ref:`Memcached adapter <memcached-adapter>`, it is not limited to the current server's
1321
shared memory; you can store contents independent of your PHP environment. The ability

security/remember_me.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ First, you need to register ``DoctrineTokenProvider`` as a service:
223223
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
224224
225225
<services>
226-
<service id="Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider" />
226+
<service id="Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider"/>
227227
</services>
228228
</container>
229229

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ transition. The value of this option is any valid expression created with the
447447
to: published
448448
reject:
449449
# or any valid expression language with "subject" referring to the post
450-
guard: "has_role("ROLE_ADMIN") and subject.isStatusReviewed()"
450+
guard: "has_role('ROLE_ADMIN') and subject.isStatusReviewed()"
451451
from: reviewed
452452
to: rejected
453453

0 commit comments

Comments
 (0)