Skip to content

Commit 5d9534b

Browse files
committed
Merge branch '7.3' into 7.4
* 7.3: Fix build [AssetMapper]: "server" -> "machine"
2 parents 639d58c + 31d975f commit 5d9534b

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

frontend/asset_mapper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ Symfony will add a ``Link`` header in the response to preload the CSS files.
740740
Pre-Compressing Assets
741741
----------------------
742742

743-
Although most servers (Caddy, Nginx, Apache, FrankenPHP) and services like Cloudflare
743+
Although most web servers (Caddy, Nginx, Apache, FrankenPHP) and services like Cloudflare
744744
provide asset compression features, AssetMapper also allows you to compress all
745745
your assets before serving them.
746746

@@ -750,7 +750,7 @@ server, which then returns them to the client without wasting CPU resources on
750750
compression.
751751

752752
AssetMapper supports `Brotli`_, `Zstandard`_ and `gzip`_ compression formats.
753-
Before using any of them, the server that pre-compresses assets must have
753+
Before using any of them, the machine that pre-compresses assets must have
754754
installed the following PHP extensions or CLI commands:
755755

756756
* Brotli: ``brotli`` CLI command; `brotli PHP extension`_;

service_container/import.rst

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -155,23 +155,23 @@ from auto-registering classes that are defined manually elsewhere:
155155

156156
.. configuration-block::
157157

158-
.. code-block:: yaml
158+
.. code-block:: yaml
159159
160-
# config/services.yaml
161-
imports:
162-
- { resource: services/mailer.yaml }
163-
# ... other imports
160+
# config/services.yaml
161+
imports:
162+
- { resource: services/mailer.yaml }
163+
# ... other imports
164164
165-
services:
166-
_defaults:
167-
autowire: true
168-
autoconfigure: true
165+
services:
166+
_defaults:
167+
autowire: true
168+
autoconfigure: true
169169
170-
App\:
171-
resource: '../src/*'
172-
exclude:
173-
- '../src/Mailer/'
174-
- '../src/SpecificClass.php'
170+
App\:
171+
resource: '../src/*'
172+
exclude:
173+
- '../src/Mailer/'
174+
- '../src/SpecificClass.php'
175175
176176
.. code-block:: xml
177177
@@ -232,19 +232,19 @@ same file. These later definitions will override the auto-registered ones:
232232

233233
.. configuration-block::
234234

235-
.. code-block:: yaml
235+
.. code-block:: yaml
236236
237-
# config/services.yaml
238-
services:
239-
_defaults:
240-
autowire: true
241-
autoconfigure: true
237+
# config/services.yaml
238+
services:
239+
_defaults:
240+
autowire: true
241+
autoconfigure: true
242242
243-
App\:
244-
resource: '../src/*'
243+
App\:
244+
resource: '../src/*'
245245
246-
App\Mailer\MyMailer:
247-
arguments: ['%env(MAILER_DSN)%']
246+
App\Mailer\MyMailer:
247+
arguments: ['%env(MAILER_DSN)%']
248248
249249
.. code-block:: xml
250250

0 commit comments

Comments
 (0)