Merge branch 'main' into redirection-push-fix

platformsh · Dec 3, 2024 · 41319d4 · 41319d4
2 parents 9a7b522 + 7980325
commit 41319d4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/sites/platform/.yaml b/sites/platform/.yaml
@@ -73,6 +73,7 @@ dotnet:
     supported:
       - '7.0'
       - '6.0'
+      - '8.0'
     legacy:
       - '3.1'
       - '2.2'
@@ -674,6 +675,7 @@ php:
       - '5.5'
       - '5.4'
     supported:
+      - '8.4'
       - '8.3'
       - '8.2'
       - '8.1'

diff --git a/sites/platform/src/administration/cli/_index.md b/sites/platform/src/administration/cli/_index.md
@@ -164,9 +164,7 @@ The code is only merged between environments remotely.
 
 ### Customize the CLI
 
-You can customize how the CLI operates and what it returns with a configuration file (`~/{{% vendor/configdir %}}/config.yaml`)
-or environment variables.
-For details, see the [customization instructions on GitHub](https://github.com/platformsh/legacy-cli#user-content-customization).
+You can customize how the CLI operates and what it returns with a configuration file (`~/.platformsh/config.yaml`) or environment variables. For details, see the [customization instructions on GitHub](https://github.com/platformsh/legacy-cli#user-content-customization).
 
 #### Automate repetitive tasks
 

diff --git a/sites/upsun/.yaml b/sites/upsun/.yaml
@@ -73,6 +73,7 @@ dotnet:
     supported:
       - '7.0'
       - '6.0'
+      - '8.0'
     legacy:
       - '3.1'
       - '2.2'
@@ -674,6 +675,7 @@ php:
       - '5.5'
       - '5.4'
     supported:
+      - '8.4'
       - '8.3'
       - '8.2'
       - '8.1'

diff --git a/sites/upsun/src/administration/cli/_index.md b/sites/upsun/src/administration/cli/_index.md
@@ -164,9 +164,7 @@ The code is only merged between environments remotely.
 
 ### Customize the CLI
 
-You can customize how the CLI operates and what it returns with a configuration file (`~/{{% vendor/configdir %}}/config.yaml`)
-or environment variables.
-For details, see the [customization instructions on GitHub](https://github.com/platformsh/legacy-cli#user-content-customization).
+You can customize how the CLI operates and what it returns with a configuration file (`~/.upsun-cli/config.yaml`) or environment variables. For details, see the [customization instructions on GitHub](https://github.com/platformsh/legacy-cli#user-content-customization).
 
 #### Automate repetitive tasks
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,6 +73,7 @@ dotnet: @@
         supported:
           - '7.0'
           - '6.0'
+          - '8.0'
         legacy:
           - '3.1'
           - '2.2'
@@ Expand Down Expand Up / @@ -674,6 +675,7 @@ php: @@
           - '5.5'
           - '5.4'
         supported:
+          - '8.4'
           - '8.3'
           - '8.2'
           - '8.1'
@@ Expand Down @@