Merge current v2.4 into master

docs/content/middlewares/http/errorpages.md

@@ -58,18 +58,6 @@ labels:
   - "traefik.http.middlewares.test-errorpage.errors.query=/{status}.html"
 ```
 
-```toml tab="File (TOML)"
-# Custom Error Page for 5XX
-[http.middlewares]
-  [http.middlewares.test-errorpage.errors]
-    status = ["500-599"]
-    service = "serviceError"
-    query = "/{status}.html"
-
-[http.services]
-  # ... definition of error-handler-service and my-service
-```
-
 ```yaml tab="File (YAML)"
 # Custom Error Page for 5XX
 http:
@@ -81,6 +69,18 @@ http:
         service: serviceError
         query: "/{status}.html"
 
+  services:
+    # ... definition of error-handler-service and my-service
+```
+
+```toml tab="File (TOML)"
+# Custom Error Page for 5XX
+[http.middlewares]
+  [http.middlewares.test-errorpage.errors]
+    status = ["500-599"]
+    service = "serviceError"
+    query = "/{status}.html"
+
 [http.services]
   # ... definition of error-handler-service and my-service
 ```
@@ -99,7 +99,10 @@ The status code ranges are inclusive (`500-599` will trigger with every code bet
 
 !!! note ""
 
-    You can define either a status code as a number (`500`) or ranges by separating two codes with a dash (`500-599`).
+    You can define either a status code as a number (`500`),
+    as multiple comma-separated numbers (`500,502`),
+    as ranges by separating two codes with a dash (`500-599`),
+    or a combination of the two (`404,418,500-599`).
 
 ### `service`