Merge remote-tracking branch 'origin/main' into detached

# Conflicts:
#	pages/cockpit/how-to/create-external-data-sources.mdx

Author: dalilacerbah

changelog/april2025/2025-04-01-messaging-and-queuing-added-undelivered-message-queue-f.mdx

@@ -0,0 +1,10 @@
+---
+title: Undelivered message queue feature is available
+status: added
+date: 2025-04-01
+category: serverless
+product: messaging-and-queuing
+---
+
+When creating a new queue with Scaleway Queues, you can now configure a dead-letter queue to receive its on-hold or undelivered messages. Read more in the [documentation](/messaging/concepts/#dead-letter-queue)
+

changelog/april2025/2025-04-03-vpc-added-network-acl-is-now-available-in-public-beta.mdx

@@ -0,0 +1,10 @@
+---
+title: Network ACL is now available in Public Beta
+status: added
+date: 2025-04-03
+category: network
+product: vpc
+---
+
+Network ACL allows you to define fine-grained access control policies for your network resources. With Network ACL, you can better manage and restrict access between Private Networks. Available for API and DevTools for now. [Learn more about Network ACL.](/vpc/reference-content/understanding-nacls/)
+

changelog/april2025/2025-04-07-apple-silicon-added-introduction-of-a-new-monthly-confi.mdx

@@ -0,0 +1,20 @@
+---
+title: Introduction of a new monthly configuration offering discounted prices
+status: added
+date: 2025-04-07
+category: bare-metal
+product: apple-silicon
+---
+
+We have introduced a monthly commitment plan for Apple silicon. This is a new billing plan, offering better rates than pay-as-you-go pricing.
+
+The initial commitment is for one month from the server order. At the end of your initial commitment period, the commitment is automatically renewed every month on the anniversary date unless you choose to delete the machine, in which case the deletion will take effect on the anniversary date of the commitment.
+
+Monthly pricing:
+- M1-M: €79/month 
+- M2-M: €115/month
+- M2-L: €159/month
+- M4-S: €149/month
+
+Read [our documentation](/apple-silicon/how-to/manage-commitment-plan/) on how to manage commitment plans.
+

changelog/april2025/2025-04-08-public-gateways-changed-new-public-gateway-api-v2.mdx

@@ -0,0 +1,14 @@
+---
+title: New Public Gateway API v2
+status: changed
+date: 2025-04-08
+category: network
+product: public-gateways
+---
+
+We have released a new [Public Gateways API v2](https://www.scaleway.com/en/developers/api/public-gateway/), which comes with a new security feature for SSH bastion: [Allowed IPs](https://www.scaleway.com/en/docs/public-gateways/concepts/#allowed-ips). This version also removes some old DHCP features that are now managed by the IPAM and the built-in DHCP of the Private Networks.
+
+The API v1 is now deprecated and will be definitively removed by October 1, 2025. Public Gateways users are encouraged to migrate to the API v2.
+[Learn more in our detailed documentation.](/public-gateways/reference-content/understanding-v2/)
+
+

changelog/may2024/2024-05-24-cockpit-added-cockpit-available-in-all-region.mdx

@@ -9,5 +9,5 @@ category: observability
 product: cockpit
 ---
 
-Cockpit is now available in all three Scaleway regions: Paris, Amsterdam, and Warsaw. From the Scaleway console, you can now decide in which region to enable the [alert manager](/cockpit/concepts/#alert-manager) and your [preconfigured alerts](/cockpit/concepts/#preconfigured-alerts). You can also choose the regions in which to create your [data types](/cockpit/concepts/#data-types), [data sources](/cockpit/concepts/#data-sources), and [tokens](/cockpit/concepts/#tokens).
+Cockpit is now available in all three Scaleway regions: Paris, Amsterdam, and Warsaw. From the Scaleway console, you can now decide in which region to enable the [alert manager](/cockpit/concepts/#alert-manager) and your [preconfigured alerts](/cockpit/concepts/#preconfigured-alerts). You can also choose the regions in which to create your [data types](/cockpit/concepts/#data-types), [data sources](/cockpit/concepts/#data-sources), and [tokens](/cockpit/concepts/#cockpit-tokens).
 

macros/cockpit/plan-deprecation.mdx

@@ -2,11 +2,18 @@
 macro: cockpit-plan-deprecation
 ---
 
-<Message type="important">
+<Message type="note">
 
- **Cockpit pricing plans were deprecated on January 1st 2025** <br /><br />
+ **Pricing update for Cockpit custom retention** <br /><br />
 
- The [retention](/cockpit/concepts/#retention) period previously set for your Scaleway and custom logs, metrics and traces remains the same. <br /><br />
- You can change the retention period for your metrics, logs, and traces for free during the retention period edition beta (starting January 1st 2025). <br /><br />
- Find out [how to change data retention period](/cockpit/how-to/change-data-retention/) in the dedicated documentation.
+ On January 1st, 2025, Cockpit pricing plans were deprecated and replaced by the custom [retention](/cockpit/concepts/#retention) feature, available for free during beta.
+ On May 1st, 2025, this feature reaches general availability and **becomes billable**. <br /><br />
+
+ **Logs and traces**: free retention for 7 days, then charged €0.002/GB/day
+
+ **Metrics**: free retention for 31 days, then charged €0.0002/10 million samples/day
+
+ Ingestion of custom data remains billable at [the current pricing](/cockpit/faq/#how-am-i-billed-for-using-cockpit-with-custom-data).
+
+ Refer to the [dedicated documentation](/cockpit/how-to/change-data-retention/) to adjust retention settings.
 </Message>

macros/console/create-account.mdx

@@ -8,30 +8,35 @@ macro: create-account
       <TabsTab label="Sign-up with SSO">
         1. Select the service you want to use (Google, Microsoft, or Github). Make sure the associated email address is the one you want to use for your Scaleway account.
         2. Check the box to agree to Scaleway's [Terms and Services](https://www.scaleway.com/en/contracts/), and Scaleway's [Data Protection Agreement](https://www.scaleway.com/en/contracts/).
-        3. Click **Confirm email address** to continue. 
+        3. Click **Confirm email address** to continue.
         4. Fill out the form with the requested information.
         5. Click **Create account** to continue.
       </TabsTab>
       <TabsTab label="Sign-up with your email address">
         1. Click **Sign up with email**.
         2. Enter the email address you want to use.
         3. Check the box to agree to Scaleway's [Terms and Services](https://www.scaleway.com/en/contracts/), and Scaleway's [Data Protection Agreement](https://www.scaleway.com/en/contracts/).
-        4. Click **Confirm email address** to continue. 
+        4. Click **Confirm email address** to continue.
         5. Click the validation link sent to your email address.
         6. Fill out the form with the requested information.
         7. Click **Create account** to continue.
       </TabsTab>
     </Tabs>
 
 ### Add your phone number
-1. Enter your phone number and click **Send code**. 
-2. Enter the 6-digit code you received on your phone number. 
-3. Click **Verify phone number**. 
+
+<Message type="note">
+  This step is not mandatory for users with the Personal project account type.
+</Message>
+
+1. Enter your phone number and click **Send code**.
+2. Enter the 6-digit code you received on your phone number.
+3. Click **Verify phone number**.
 
 ### Add your billing information
-Fill out the required fields, then click **Add billing address**. This address will be used in your invoices. 
+Fill out the required fields, then click **Add billing address**. This address will be used in your invoices.
     <Message type="note">
-      You can click **Add later** to [enter your billing information at a later time](/billing/how-to/add-payment-method/), and directly access your Organization dashboard in the [Scaleway console](https://console.scaleway.com/organization). However, you will need to add a valid credit card to order Scaleway resources. 
+      You can click **Add later** to [enter your billing information at a later time](/billing/how-to/add-payment-method/), and directly access your Organization dashboard in the [Scaleway console](https://console.scaleway.com/organization). However, you will need to add a valid credit card to order Scaleway resources.
     </Message>
 
 ### Add your payment method
@@ -40,8 +45,8 @@ Note that prepaid cards and some virtual cards are not accepted as a payment met
 
 ### Validate your payment method
 <Message type="note">
-  This step is necessary for security purposes, but does not prevent you from using Scaleway resources. **You have 10 days to validate your credit card** once it's added. 
+  This step is necessary for security purposes, but does not prevent you from using Scaleway resources. **You have 10 days to validate your credit card** once it's added.
 </Message>
 When checking your bank statement, look for a €1 transaction labeled "SCW", followed by a 4-digit code (e.g., SCW* C-1234).
 1. Enter the 4-digit code.
-2. Click **Verify payment method**. 
+2. Click **Verify payment method**.

macros/network/lb-create-backend-2-traffic-mgnt.mdx

@@ -14,7 +14,7 @@ Traffic management configuration lets you define how your Load Balancer's backen
 2. Add the **Server IP addresses** of the servers the Load Balancer will forward requests/connections to. These will be your backend servers. 
 
         <Message type="note">
-        If you want your Load Balancer to communicate with its backend servers over an attached [Private Network](/vpc/concepts/#private-networks), ensure that you enter the servers' private IP addresses on that network. This is necessary in the case of a [private Load Balancer](/load-balancer/reference-content/public-private-accessibility/#private-load-balancers), but may also be desired for public Load Balancers attached to Private Networks where backend servers are on the same Private Network.
+        If you want your Load Balancer to communicate with its backend servers over an attached [Private Network](/vpc/concepts/#private-networks), ensure that you enter the servers' private IP addresses. This is necessary in the case of a [private Load Balancer](/load-balancer/reference-content/public-private-accessibility/#private-load-balancers), but may also be desired for public Load Balancers attached to Private Networks where backend servers are in the same VPC. As Load Balancers are compatible with [VPC routing](/vpc/reference-content/understanding-routing/), they will be able to direct requests to any backend server within the same VPC, via its private IP address. The Load Balancer and backend server do not have to be on the same Private Network in that VPC.
         </Message>
 
 3. Choose whether to activate **sticky sessions** (default setting is deactivated). Sticky sessions enable the Load Balancer to bind a given user's sessions to a specific backend server. If you choose to activate sticky sessions, you are prompted to select either **IP-based** (clients' IPs are used to bind sessions) or **cookie-based** (an HTTP cookie is used to bind sessions, and you must choose a name for the cookie).

menu/navigation.json

@@ -165,7 +165,7 @@
                     "slug": "add-payment-method"
                   },
                   {
-                    "label": "Add billing contact",
+                    "label": "Set up billing notifications",
                     "slug": "add-billing-contact"
                   },
                   {
@@ -181,7 +181,7 @@
                     "slug": "use-the-cost-manager"
                   },
                   {
-                    "label": "Purchase a Savings Plan",
+                    "label": "Purchase a savings plan",
                     "slug": "purchase-savings-plan"
                   },
                   {
@@ -221,7 +221,7 @@
                     "slug": "reading-an-invoice"
                   },
                   {
-                    "label": "Understanding Savings Plans",
+                    "label": "Understanding savings plans",
                     "slug": "understanding-savings-plans"
                   }
                 ],
@@ -1131,6 +1131,10 @@
                     "label": "Reinstall a Mac mini",
                     "slug": "reinstall-mac-mini"
                   },
+                  {
+                    "label": "Manage your commitment plan",
+                    "slug": "manage-commitment-plan"
+                  },
                   {
                     "label": "Delete a Mac mini",
                     "slug": "delete-mac-mini"
@@ -3011,7 +3015,7 @@
                 "slug": "troubleshooting"
               }
             ],
-            "label": "Distributed Data Lab",
+            "label": " Data Lab for Apache Spark™",
             "slug": "data-lab"
           }
         ],
@@ -3247,6 +3251,16 @@
                 "label": "API/CLI",
                 "slug": "api-cli"
               },
+              {
+                "items": [
+                  {
+                    "label": "Understanding v2",
+                    "slug": "understanding-v2"
+                  }
+                ],
+                "label": "Additional Content",
+                "slug": "reference-content"
+              },
               {
                 "label": "Troubleshooting",
                 "slug": "troubleshooting"
@@ -5279,6 +5293,10 @@
               },
               {
                 "items": [
+                  {
+                    "label": "Understanding the Baseboard Management Controller (BMC)",
+                    "slug": "understanding-bmc"
+                  },
                   {
                     "label": "Use HP iLO",
                     "slug": "hp-ilo"

package.json

@@ -25,7 +25,7 @@
     "@commitlint/config-conventional": "^19.8.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.5.0",
-    "prettier": "^3.4.2"
+    "prettier": "^3.5.3"
   },
   "scripts": {
     "prepare": "husky install",