Merge pull request #1703 from alanpoulain/chore/merge-2.7

Author: alanpoulain

core/controllers.md

@@ -148,7 +148,7 @@ App\Entity\Book:
 
 [/codeSelector]
 
-It is mandatory to set the `method`, `path` and `controller` attributes. They allow API Platform to configure the routing path and
+It is mandatory to set the `method`, `uriTemplate` and `controller` attributes. They allow API Platform to configure the routing path and
 the associated controller respectively.
 
 ## Using the PlaceholderAction

core/operations.md

@@ -76,10 +76,12 @@ use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
 
-#[ApiResource(operations: [
-    new Get(),
-    new GetCollection()
-])]
+#[ApiResource(
+    operations: [
+        new Get(),
+        new GetCollection()
+    ]
+)]
 class Book
 {
     // ...

distribution/index.md

@@ -73,13 +73,13 @@ Similarly, on Windows, only [Docker for Windows](https://docs.docker.com/docker-
 Open a terminal, and navigate to the directory containing your project skeleton. Run the following command to start all
 services using [Docker Compose](https://docs.docker.com/compose/):
 
-Download and build the latest versions of the images:
+Download the latest versions of the images:
 
 ```console
-docker compose build --pull --no-cache
+docker compose pull --include-deps
 ```
 
-Start Docker Compose in detached mode:
+Then build images and Start Docker Compose in detached mode:
 
 ```console
 docker compose up -d 

extra/releases.md

@@ -13,15 +13,18 @@ For example:
 
 ## Maintenance
 
-Only 3 versions are maintained at the same time:
+3 versions are maintained at the same time:
 
-* **stable** (currently the **2.7** branch): regular bugfixes are integrated in this version
-* **old-stable** (currently **2.6** branch): security fixes are integrated in this version, regular bugfixes are **not** backported in it
+* **stable** (currently the **3.0** branch): regular bugfixes are integrated in this version
+* **old-stable** (currently **2.7** branch): [security fixes](security.md) are integrated in this version, regular bugfixes are **not** backported in it
 * **development** (**main** branch): new features target this branch
 
-Older versions (1.x, 2.0...) **are not maintained**. If you still use them, you must upgrade as soon as possible.
+Older versions (1.x, 2.6...) **are not maintained**. If you still use them, you must upgrade as soon as possible.
 
 The **old-stable** branch is merged in the **stable** branch on a regular basis to propagate [security fixes](security.md).
 The **stable** branch is merged in the **development** branch on a regular basis to propagate [security](security.md) and regular bugfixes.
 
-New versions of API Platform are released **when they are ready**, on the behalf of the API Platform Core Team.
+New major versions of API Platform are released every 2 years.
+New minor versions of API Platform are released every 6 months.
+
+The latest minor version of a major branch contains all the new features introduced in the first version of the next major, but also contains deprecated features which are removed in the next major branch.