Skip to content

Commit ddb7572

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: added a space before "=" in code fix the markup Changing to absolute url, as requested Updated link to Event Listeners page Revert "Fix typo on which YAML values must not be quoted" Fix typo (shard -> shared) Fix typo on which YAML values must not be quoted
2 parents cd36eb0 + 01ec58c commit ddb7572

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

components/lock.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ then the lock is considered as acquired; otherwise as not acquired::
262262

263263
$stores = [];
264264
foreach (array('server1', 'server2', 'server3') as $server) {
265-
$redis= new \Redis();
265+
$redis = new \Redis();
266266
$redis->connect($server);
267267

268268
$stores[] = new RedisStore($redis);

doctrine/event_listeners_subscribers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@ to the tag like so:
239239
definitions which are described :doc:`in their own article </service_container/lazy_services>`
240240

241241
.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
242-
.. _`the Doctrine Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#entity-listeners
242+
.. _`the Doctrine Documentation`: https://symfony.com/doc/current/bundles/DoctrineBundle/entity-listeners.html

frontend/encore/shared-entry.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ in your layout, *before* ``app.js``:
3939
4040
Before making this change, if both ``app.js`` and ``store.js`` require ``jquery``,
4141
then ``jquery`` would be packaged into *both* files, which is wasteful. By making
42-
``app.js`` your "shard" entry, *any* code required by ``app.js`` (like jQuery) will
42+
``app.js`` your "shared" entry, *any* code required by ``app.js`` (like jQuery) will
4343
*no longer* be packaged into any other files. The same is true for any CSS.
4444

4545
Because ``app.js`` contains all the common code that other entry files depend on,

0 commit comments

Comments
 (0)