From 1e4294ee6b8f533ca874dbbd8a10dc361a906ca2 Mon Sep 17 00:00:00 2001 From: SamyOubouaziz Date: Tue, 30 Jul 2024 16:00:24 +0200 Subject: [PATCH] docs(DLB): update --- .../api-cli/elastic-metal-with-api.mdx | 6 +----- .../creating-managing-instances-with-cliv2.mdx | 6 +----- compute/instances/how-to/create-a-snapshot.mdx | 6 +----- compute/instances/how-to/migrate-routed-ips.mdx | 7 +------ .../understanding-instance-pricing.mdx | 7 +------ .../troubleshooting/reboot-from-faulty-kernel.mdx | 8 +------- console/billing/how-to/add-payment-method.mdx | 5 ----- .../api-cli/changing-control-plane-offer.mdx | 7 +------ .../deploy-image-from-container-registry.mdx | 6 +----- .../domains/how-to/file-contact-info.mdx | 6 +----- .../domains/how-to/purchase-domain.mdx | 6 +----- .../domains/how-to/transfer-domain.mdx | 6 +----- .../ip-failover/how-to/assign-failover-ip.mdx | 7 +------ .../ip-failover/how-to/configure-centos.mdx | 7 +------ .../how-to/configure-debian-ubuntu.mdx | 7 +------ .../ip-failover/how-to/configure-freebsd.mdx | 7 +------ .../how-to/configure-multiip-virtualmac.mdx | 7 +------ .../how-to/configure-network-virtual-machine.mdx | 7 +------ .../ipv6/how-to/configure-ipv6-linux.mdx | 8 +------- .../ipv6/how-to/configure-ipv6-windows.mdx | 8 +------- dedibox-network/ipv6/how-to/create-subnet.mdx | 8 +------- .../network/how-to/configure-network-netplan.mdx | 7 +------ .../network/how-to/subscribe-to-jmrp.mdx | 8 +------- .../how-to/change-root-password.mdx | 7 +------ .../how-to/change-win-server-language.mdx | 7 +------ .../how-to/connect-to-server.mdx | 8 +------- .../how-to/get-started-with-server.mdx | 7 +------ .../dedicated-servers/how-to/install-a-server.mdx | 7 +------ .../dedicated-servers/how-to/manage-packages.mdx | 7 +------ .../dedicated-servers/how-to/migrate-server.mdx | 7 +------ .../dedicated-servers/how-to/monitor-server.mdx | 7 +------ .../dedicated-servers/how-to/order-a-server.mdx | 7 +------ .../dedicated-servers/how-to/rescue-your-data.mdx | 7 +------ .../dedicated-servers/how-to/restart-server.mdx | 7 +------ .../how-to/use-dedibackup-ftp-backup.mdx | 7 +------ .../how-to/use-ipmi-on-server.mdx | 7 +------ .../dedicated-servers/how-to/use-rescue-mode.mdx | 7 +------ .../how-to/use-serial-console.mdx | 7 +------ dedibox/dedicated-servers/quickstart.mdx | 15 ++------------- .../how-to/disable-boot-errors-idrac.mdx | 7 +------ dedibox/kvm-over-ip/how-to/quantaplex.mdx | 7 +------ dedibox/kvm-over-ip/quickstart.mdx | 7 +------ dedibox/vps/how-to/create-vps.mdx | 7 +------ dedibox/vps/quickstart.mdx | 7 +------ .../api-cli/getting-started-with-ipfs-cli.mdx | 6 +----- labs/ipfs-pinning/api-cli/ipfs-cli.mdx | 6 +----- labs/ipfs-pinning/api-cli/pin-operations.mdx | 13 ++----------- .../api-cli/migrating-endpoints.mdx | 6 +----- .../how-to/remove-public-endpoint.mdx | 7 +------ .../iot-hub/api-cli/cli-db-tips-tricks.mdx | 5 ----- .../iot-hub/api-cli/iot-hub-routes.mdx | 6 +----- .../cockpit/how-to/activate-managed-alerts.mdx | 7 +------ .../messaging/reference-content/nats-overview.mdx | 12 ++---------- .../object/how-to/access-objects-via-https.mdx | 7 +------ tutorials/load-testing-vegeta/index.mdx | 6 +----- tutorials/terraform-quickstart/index.mdx | 6 +----- .../index.mdx | 6 ------ tutorials/use-managed-redis-with-mysql/index.mdx | 6 ------ 58 files changed, 57 insertions(+), 355 deletions(-) diff --git a/bare-metal/elastic-metal/api-cli/elastic-metal-with-api.mdx b/bare-metal/elastic-metal/api-cli/elastic-metal-with-api.mdx index 09750c658d..6c4ba6ed43 100644 --- a/bare-metal/elastic-metal/api-cli/elastic-metal-with-api.mdx +++ b/bare-metal/elastic-metal/api-cli/elastic-metal-with-api.mdx @@ -27,11 +27,7 @@ The new deployment in one command feature allows you to speed up the delivery of ## Deploying Elastic Metal servers using the API -<<<<<<< HEAD -Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server/), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli/) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/). -======= -Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +Besides creating your Elastic Metal servers from the graphical [Scaleway console](/bare-metal/elastic-metal/how-to/create-server/), you can also create and manage them directly from the command line using the [CLI-tool](https://github.com/scaleway/scaleway-cli) or the [API](https://www.scaleway.com/en/developers/api/elastic-metal/). You need to [generate API keys](/identity-and-access-management/iam/how-to/create-api-keys/) to access the Scaleway API. diff --git a/compute/instances/api-cli/creating-managing-instances-with-cliv2.mdx b/compute/instances/api-cli/creating-managing-instances-with-cliv2.mdx index 302aaf37f0..7d36382d32 100644 --- a/compute/instances/api-cli/creating-managing-instances-with-cliv2.mdx +++ b/compute/instances/api-cli/creating-managing-instances-with-cliv2.mdx @@ -13,11 +13,7 @@ categories: - compute --- -<<<<<<< HEAD -Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance/) and manage your Instances from the [console](https://console.scaleway.com/login/), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli/). -======= -Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance) and manage your Instances from the [console](https://console.scaleway.com/login), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +Scaleway Instances provide you with resources to develop, test code and deploy your applications in no time. Instances are designed for modern workflows. They are with you from prototyping to large-scale deployment. You can [create](/compute/instances/how-to/create-an-instance/) and manage your Instances from the [console](https://console.scaleway.com/login), via the [API](https://www.scaleway.com/en/developers/api/instance/) or the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli). ## Scaleway Command Line Interface Overview diff --git a/compute/instances/how-to/create-a-snapshot.mdx b/compute/instances/how-to/create-a-snapshot.mdx index cbf652064d..dfe5a11114 100644 --- a/compute/instances/how-to/create-a-snapshot.mdx +++ b/compute/instances/how-to/create-a-snapshot.mdx @@ -58,11 +58,7 @@ You can create a [volume](/compute/instances/concepts/#volume) from a snapshot a The available volume types may change according to the type of snapshot you select. -<<<<<<< HEAD - The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes/). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume/) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances. -======= - The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances. ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + The volume is created, and can be viewed in the [Volumes tab](https://console.scaleway.com/instance/volumes). Check out our documentation on [attaching volumes](/storage/block/how-to/attach-a-volume/) and [mounting volumes](/storage/block/api-cli/managing-a-volume/#mounting-the-block-volume) to learn how to use the volume with your Instances. ## How to create an Instance from a snapshot diff --git a/compute/instances/how-to/migrate-routed-ips.mdx b/compute/instances/how-to/migrate-routed-ips.mdx index 39066f33df..01a9b85bea 100644 --- a/compute/instances/how-to/migrate-routed-ips.mdx +++ b/compute/instances/how-to/migrate-routed-ips.mdx @@ -28,13 +28,8 @@ Using a routed flexible IP is recommended for all compatible Instance types, as -<<<<<<< HEAD -- A Scaleway account logged into the [console](https://console.scaleway.com/) -- An [Instance](/compute/instances/how-to/create-an-instance/) that has not been moved to routed IPs -======= - A Scaleway account logged into the [console](https://console.scaleway.com) -- An [Instance](/compute/instances/how-to/create-an-instance) that has not been moved to routed IPs ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- An [Instance](/compute/instances/how-to/create-an-instance/) that has not been moved to routed IPs ## Updating the required packages diff --git a/compute/instances/reference-content/understanding-instance-pricing.mdx b/compute/instances/reference-content/understanding-instance-pricing.mdx index 951dc42522..90da8b362a 100644 --- a/compute/instances/reference-content/understanding-instance-pricing.mdx +++ b/compute/instances/reference-content/understanding-instance-pricing.mdx @@ -25,13 +25,8 @@ Our [console](https://console.scaleway.com/) tries to make it as easy as possibl ## Hourly pricing Instances are priced by the hour, with different [Instance types](/compute/instances/reference-content/choosing-instance-type/) having different hourly rates. You can check out the current prices for Instances in one of two ways: -<<<<<<< HEAD -- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create/) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account/) to access this page. -- See the dedicated [pricing page](https://www.scaleway.com/en/pricing/?tags=available/) of our website. -======= -- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account) to access this page. +- Go to the Instance [creation page](https://console.scaleway.com/instance/servers/create) of the Scaleway console. Note that you must have [an account](/console/account/how-to/create-an-account/) to access this page. - See the dedicated [pricing page](https://www.scaleway.com/en/pricing/?tags=available) of our website. ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) ## Instance billing diff --git a/compute/instances/troubleshooting/reboot-from-faulty-kernel.mdx b/compute/instances/troubleshooting/reboot-from-faulty-kernel.mdx index f5323baa08..c902de05aa 100644 --- a/compute/instances/troubleshooting/reboot-from-faulty-kernel.mdx +++ b/compute/instances/troubleshooting/reboot-from-faulty-kernel.mdx @@ -17,15 +17,9 @@ categories: -<<<<<<< HEAD -- A Scaleway account logged into the [console](https://console.scaleway.com/) -- An [Instance](/compute/instances/how-to/create-an-instance/) -- Installed and configured the Scaleway [CLI](/compute/instances/api-cli/creating-managing-instances-with-cliv2/) on your local computer -======= - A Scaleway account logged into the [console](https://console.scaleway.com) -- An [Instance](/compute/instances/how-to/create-an-instance) +- An [Instance](/compute/instances/how-to/create-an-instance/) - Installed and configured the Scaleway [CLI](/compute/instances/api-cli/creating-managing-instances-with-cliv2) on your local computer ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) 1. Switch the Instance's `boot-type` to `rescue` and reboot your Instance into rescue mode using the CLI-Tools: diff --git a/console/billing/how-to/add-payment-method.mdx b/console/billing/how-to/add-payment-method.mdx index 5307ac283d..24c7e76cec 100644 --- a/console/billing/how-to/add-payment-method.mdx +++ b/console/billing/how-to/add-payment-method.mdx @@ -53,13 +53,8 @@ Before you can order Scaleway resources, you must add a payment method to your a ## How to add a SEPA mandate -<<<<<<< HEAD * This method requires a successful [KYC verification](/console/account/how-to/verify-identity/). - * To add a SEPA mandate, both your postal and bank addresses must be part of the [SEPA zone](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html/). -======= - * This method requires a successful [KYC verification](/console/account/how-to/verify-identity). * To add a SEPA mandate, both your postal and bank addresses must be part of the [SEPA zone](https://www.ecb.europa.eu/paym/integration/retail/sepa/html/index.en.html). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) 1. Access the [Scaleway console](https://console.scaleway.com/organization). diff --git a/containers/kubernetes/api-cli/changing-control-plane-offer.mdx b/containers/kubernetes/api-cli/changing-control-plane-offer.mdx index 9d8c816725..16a4b03f34 100644 --- a/containers/kubernetes/api-cli/changing-control-plane-offer.mdx +++ b/containers/kubernetes/api-cli/changing-control-plane-offer.mdx @@ -24,13 +24,8 @@ In this tutorial, we show you how to change your cluster type using the Scaleway - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization - A valid [API key](/identity-and-access-management/iam/how-to/create-api-keys/) -<<<<<<< HEAD -- Downloaded and installed the most recent version of the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2/) -- [Created a cluster](/containers/kubernetes/how-to/create-cluster/) -======= - Downloaded and installed the most recent version of the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2) -- [Created a cluster](/containers/kubernetes/how-to/create-cluster) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created a cluster](/containers/kubernetes/how-to/create-cluster/) 1. Run the following command to list the viable cluster types. ``` diff --git a/containers/kubernetes/how-to/deploy-image-from-container-registry.mdx b/containers/kubernetes/how-to/deploy-image-from-container-registry.mdx index 1665e5a84d..b58c24e28a 100644 --- a/containers/kubernetes/how-to/deploy-image-from-container-registry.mdx +++ b/containers/kubernetes/how-to/deploy-image-from-container-registry.mdx @@ -65,11 +65,7 @@ The generated Docker images are stored in a private Docker registry using the Sc REPOSITORY TAG IMAGE ID CREATED SIZE mycontainer latest c427b132b5fc 22 minutes ago 1.24GB ``` -<<<<<<< HEAD -5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli/). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces/) and depends on your configuration: -======= -5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces) and depends on your configuration: ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +5. [Log into your Container Registry](/containers/container-registry/how-to/connect-docker-cli/). The endpoint (for example: `rg.fr-par.scw.cloud/myregistry`) of your Container Registry is available from the [Scaleway console](https://console.scaleway.com/registry/namespaces) and depends on your configuration: ```bash docker login rg.fr-par.scw.cloud/myregistry -u nologin -p $SCW_SECRET_KEY ``` diff --git a/dedibox-network/domains/how-to/file-contact-info.mdx b/dedibox-network/domains/how-to/file-contact-info.mdx index 0c14a6125e..55eabf8e8b 100644 --- a/dedibox-network/domains/how-to/file-contact-info.mdx +++ b/dedibox-network/domains/how-to/file-contact-info.mdx @@ -16,11 +16,7 @@ categories: You must always ensure that the contact information for the domain owner is accurate and correct. You are prompted to provide and/or check contact details when you are ordering or renewing your domain. It is your responsibility to keep this information up-to-date after that. This document shows you how to check and modify this information. -<<<<<<< HEAD - If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/). -======= - If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade). diff --git a/dedibox-network/domains/how-to/purchase-domain.mdx b/dedibox-network/domains/how-to/purchase-domain.mdx index c03e02fcda..bb93831396 100644 --- a/dedibox-network/domains/how-to/purchase-domain.mdx +++ b/dedibox-network/domains/how-to/purchase-domain.mdx @@ -40,11 +40,7 @@ A domain name is the equivalent of your postal address on the web, and allows yo -<<<<<<< HEAD - You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/). -======= - You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + You must always keep the contact details relating to the owner of your domain name accurate and up-to-date. Once created, if you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade). 9. Scroll down to the bottom of the page and click **Confirm**. diff --git a/dedibox-network/domains/how-to/transfer-domain.mdx b/dedibox-network/domains/how-to/transfer-domain.mdx index 755aee8865..d9f3e05f08 100644 --- a/dedibox-network/domains/how-to/transfer-domain.mdx +++ b/dedibox-network/domains/how-to/transfer-domain.mdx @@ -44,11 +44,7 @@ You can transfer any domain bought or renewed at another registrar to Scaleway a 8. If you did not select hosting backup, a pop-up may display asking you to confirm your choice. Click **Continue without backup** or **Add backup**. The **Contact information** page displays. 9. Complete the contact information for the domain name. -<<<<<<< HEAD - You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade/). -======= - You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership) process via the [console](https://console.online.net/fr/domain/trade). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + You must always keep the domain owner’s contact details accurate and up-to-date. If you wish to change details about the owner’s identity, such as full name(s) or corporate name, you must complete the [change of owner/applicant](/dedibox-network/domains/how-to/change-ownership/) process via the [console](https://console.online.net/fr/domain/trade). 10. Scroll down to the bottom of the page and click **Confirm**. The **Summary** page displays. 11. Check the summary of your order and select a payment mode from the drop-down menu. You must also agree to the terms of service as well as the web hosting specific terms, and choose whether to activate automatic renewal of your domain. diff --git a/dedibox-network/ip-failover/how-to/assign-failover-ip.mdx b/dedibox-network/ip-failover/how-to/assign-failover-ip.mdx index 2353cf3a34..cfcae73674 100644 --- a/dedibox-network/ip-failover/how-to/assign-failover-ip.mdx +++ b/dedibox-network/ip-failover/how-to/assign-failover-ip.mdx @@ -21,13 +21,8 @@ For each server, you can add failover IP addresses according to the offer and yo -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server diff --git a/dedibox-network/ip-failover/how-to/configure-centos.mdx b/dedibox-network/ip-failover/how-to/configure-centos.mdx index 26a2d8a8a3..4a6d509214 100644 --- a/dedibox-network/ip-failover/how-to/configure-centos.mdx +++ b/dedibox-network/ip-failover/how-to/configure-centos.mdx @@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server ## Failover IP configuration using the Network Manager diff --git a/dedibox-network/ip-failover/how-to/configure-debian-ubuntu.mdx b/dedibox-network/ip-failover/how-to/configure-debian-ubuntu.mdx index a80ad0f5ad..7ae65867f2 100644 --- a/dedibox-network/ip-failover/how-to/configure-debian-ubuntu.mdx +++ b/dedibox-network/ip-failover/how-to/configure-debian-ubuntu.mdx @@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server ## Failover IP configuration on Debian diff --git a/dedibox-network/ip-failover/how-to/configure-freebsd.mdx b/dedibox-network/ip-failover/how-to/configure-freebsd.mdx index 2521412751..0839c2faac 100644 --- a/dedibox-network/ip-failover/how-to/configure-freebsd.mdx +++ b/dedibox-network/ip-failover/how-to/configure-freebsd.mdx @@ -17,13 +17,8 @@ This page shows you how to configure a [failover IP](/dedibox-network/ip-failove -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server ## Failover IP configuration on FreeBSD diff --git a/dedibox-network/ip-failover/how-to/configure-multiip-virtualmac.mdx b/dedibox-network/ip-failover/how-to/configure-multiip-virtualmac.mdx index 9c483f4580..ef9ace23e3 100644 --- a/dedibox-network/ip-failover/how-to/configure-multiip-virtualmac.mdx +++ b/dedibox-network/ip-failover/how-to/configure-multiip-virtualmac.mdx @@ -21,13 +21,8 @@ As long as they share the same virtual MAC, your failover IPs must be moved in a -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server - At least 2 [failover IPs](/dedibox-network/ip-failover/concepts/#failover-ips) - Generated a [virtual MAC address](/dedibox-network/ip-failover/concepts/#virtual-mac-address) diff --git a/dedibox-network/ip-failover/how-to/configure-network-virtual-machine.mdx b/dedibox-network/ip-failover/how-to/configure-network-virtual-machine.mdx index 196a31664d..82237d90b1 100644 --- a/dedibox-network/ip-failover/how-to/configure-network-virtual-machine.mdx +++ b/dedibox-network/ip-failover/how-to/configure-network-virtual-machine.mdx @@ -25,13 +25,8 @@ To communicate on the internet, each of your virtual machines needs an IP addres -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server and installed a hypervisor on it -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) a Dedibox dedicated server and installed a hypervisor on it ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) a Dedibox dedicated server and installed a hypervisor on it - Ordered a [failover IP](/dedibox-network/ip-failover/concepts/#failover-ips) - Generated a [virtual MAC address](/dedibox-network/ip-failover/concepts/#virtual-mac-address) diff --git a/dedibox-network/ipv6/how-to/configure-ipv6-linux.mdx b/dedibox-network/ipv6/how-to/configure-ipv6-linux.mdx index 4b63c0887d..2500805050 100644 --- a/dedibox-network/ipv6/how-to/configure-ipv6-linux.mdx +++ b/dedibox-network/ipv6/how-to/configure-ipv6-linux.mdx @@ -15,15 +15,9 @@ categories: -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox/) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix -======= - A Dedibox account logged into the [console](https://console.online.net) - A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix) a /48 IPv6 prefix ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix Follow the IPv6 on Ubuntu configuration if you are on Ubuntu and use Netplan as your default network manager. diff --git a/dedibox-network/ipv6/how-to/configure-ipv6-windows.mdx b/dedibox-network/ipv6/how-to/configure-ipv6-windows.mdx index 27c4eb747c..d2759a06eb 100644 --- a/dedibox-network/ipv6/how-to/configure-ipv6-windows.mdx +++ b/dedibox-network/ipv6/how-to/configure-ipv6-windows.mdx @@ -15,15 +15,9 @@ categories: -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox/) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix -======= - A Dedibox account logged into the [console](https://console.online.net) - A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix) a /48 IPv6 prefix ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix * On servers supporting [IPv6 SLAAC](/dedibox-network/ipv6/how-to/enable-ipv6-slaac/), SLAAC has to be enabled in order to ensure that DHCPv6 works correctly. diff --git a/dedibox-network/ipv6/how-to/create-subnet.mdx b/dedibox-network/ipv6/how-to/create-subnet.mdx index 2ef5236f93..5c73a4824c 100644 --- a/dedibox-network/ipv6/how-to/create-subnet.mdx +++ b/dedibox-network/ipv6/how-to/create-subnet.mdx @@ -22,15 +22,9 @@ You can split your IPv6 prefix into several subnets and use them on your Dedibox -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox/) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix -======= - A Dedibox account logged into the [console](https://console.online.net) - A [Dedibox dedicated server](https://www.scaleway.com/en/dedibox) -- [Requested](/dedibox-network/ipv6/how-to/request-prefix) a /48 IPv6 prefix ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Requested](/dedibox-network/ipv6/how-to/request-prefix/) a /48 IPv6 prefix 1. Click **Server** > **Network configuration** in the Dedibox console. The network configuration pages displays. Scroll down to the IPv6 network configuration section. 2. Click the settings icon (cogwheel) next to your `/48` prefix. Then click **Create subnet**. diff --git a/dedibox-network/network/how-to/configure-network-netplan.mdx b/dedibox-network/network/how-to/configure-network-netplan.mdx index 6fd76ec153..2b3d26c39f 100644 --- a/dedibox-network/network/how-to/configure-network-netplan.mdx +++ b/dedibox-network/network/how-to/configure-network-netplan.mdx @@ -17,13 +17,8 @@ Since the release of its version 18.04, Bionic Beaver, [Ubuntu](http://www.ubunt -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## Configuration files diff --git a/dedibox-network/network/how-to/subscribe-to-jmrp.mdx b/dedibox-network/network/how-to/subscribe-to-jmrp.mdx index 6f0edb5cba..cb20ac2eda 100644 --- a/dedibox-network/network/how-to/subscribe-to-jmrp.mdx +++ b/dedibox-network/network/how-to/subscribe-to-jmrp.mdx @@ -23,15 +23,9 @@ By following these steps, you can effectively manage your IP reputation and main -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) +- A Dedibox account logged into the [console](https://console.online.net) - [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server - [Configured the reverse DNS of your IP](/dedibox-network/ip-failover/how-to/configure-reverse-dns/) -======= -- A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server -- [Configured the reverse DNS of your IP](/dedibox-network/ip-failover/how-to/configure-reverse-dns) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) - A Microsoft account 1. Open the [JMRP website](https://sendersupport.olc.protection.outlook.com/snds/JMRP.aspx) in your web browser. diff --git a/dedibox/dedicated-servers/how-to/change-root-password.mdx b/dedibox/dedicated-servers/how-to/change-root-password.mdx index 3f0ec2372b..2e7154e2e1 100644 --- a/dedibox/dedicated-servers/how-to/change-root-password.mdx +++ b/dedibox/dedicated-servers/how-to/change-root-password.mdx @@ -17,13 +17,8 @@ This document shows you how to change your password using the [rescue system](/d -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server 1. From the console, [launch rescue mode](/dedibox/dedicated-servers/how-to/use-rescue-mode/). 2. Mount your partitions: diff --git a/dedibox/dedicated-servers/how-to/change-win-server-language.mdx b/dedibox/dedicated-servers/how-to/change-win-server-language.mdx index 0aaace5f24..c08f060d0b 100644 --- a/dedibox/dedicated-servers/how-to/change-win-server-language.mdx +++ b/dedibox/dedicated-servers/how-to/change-win-server-language.mdx @@ -17,13 +17,8 @@ This page shows you how to change the language of a Windows Server 2019 installe -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) with Windows Server 2019 [installed](/dedibox/dedicated-servers/how-to/install-a-server/) on it -======= - A Dedibox account logged into the [console](https://console.online.net) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server) with Windows Server 2019 [installed](/dedibox/dedicated-servers/how-to/install-a-server) on it ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) with Windows Server 2019 [installed](/dedibox/dedicated-servers/how-to/install-a-server/) on it 1. Log onto your Windows Server's graphical interface (via Remote Desktop or similar). 2. Click the Start menu, then the settings icon to open the Settings Interface. diff --git a/dedibox/dedicated-servers/how-to/connect-to-server.mdx b/dedibox/dedicated-servers/how-to/connect-to-server.mdx index 9a860fa6c6..fc4dca830e 100644 --- a/dedibox/dedicated-servers/how-to/connect-to-server.mdx +++ b/dedibox/dedicated-servers/how-to/connect-to-server.mdx @@ -21,15 +21,9 @@ You can also use FTP, SFTP, or SCP to transfer data to and from your server. -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) +- A Dedibox account logged into the [console](https://console.online.net) - [Created and uploaded your SSH key](/dedibox-console/account/how-to/upload-an-ssh-key/) - [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server and transferred your SSH key to the server during installation -======= -- A Dedibox account logged into the [console](https://console.online.net) -- [Created and uploaded your SSH key](/dedibox-console/account/how-to/upload-an-ssh-key) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server and transferred your SSH key to the server during installation ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) ## How to connect via SSH diff --git a/dedibox/dedicated-servers/how-to/get-started-with-server.mdx b/dedibox/dedicated-servers/how-to/get-started-with-server.mdx index 27bcfaccab..c2eefe11b9 100644 --- a/dedibox/dedicated-servers/how-to/get-started-with-server.mdx +++ b/dedibox/dedicated-servers/how-to/get-started-with-server.mdx @@ -17,13 +17,8 @@ Once you have a Dedibox server, installed an OS and connected to it via SSH, you -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to use the shell diff --git a/dedibox/dedicated-servers/how-to/install-a-server.mdx b/dedibox/dedicated-servers/how-to/install-a-server.mdx index 36029a9aa5..2507e8ce89 100644 --- a/dedibox/dedicated-servers/how-to/install-a-server.mdx +++ b/dedibox/dedicated-servers/how-to/install-a-server.mdx @@ -17,13 +17,8 @@ After the delivery of your server, you can begin installing it. -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) -======= - A Dedibox account logged into the [console](https://console.online.net) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) 1. From the console, click **Server** > **Server list** on the top menu. A list of your servers displays. 2. Click **Manage** next to the server you want to install. The server installation wizard displays. diff --git a/dedibox/dedicated-servers/how-to/manage-packages.mdx b/dedibox/dedicated-servers/how-to/manage-packages.mdx index 8ae19c41ef..3e0f8745d5 100644 --- a/dedibox/dedicated-servers/how-to/manage-packages.mdx +++ b/dedibox/dedicated-servers/how-to/manage-packages.mdx @@ -19,13 +19,8 @@ On Debian and Ubuntu, you should use the **APT** (**A**dvanced **P**ackage **T** -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a Dedibox server running on Ubuntu or Debian -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a Dedibox server running on Ubuntu or Debian ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a Dedibox server running on Ubuntu or Debian ## How to update repositories diff --git a/dedibox/dedicated-servers/how-to/migrate-server.mdx b/dedibox/dedicated-servers/how-to/migrate-server.mdx index 7b1cc167ca..5c3c3dec6d 100644 --- a/dedibox/dedicated-servers/how-to/migrate-server.mdx +++ b/dedibox/dedicated-servers/how-to/migrate-server.mdx @@ -17,13 +17,8 @@ All servers eventually reach their End of Life (EOL). Hardware vendors provide a -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to migrate your data diff --git a/dedibox/dedicated-servers/how-to/monitor-server.mdx b/dedibox/dedicated-servers/how-to/monitor-server.mdx index 7da4614c5d..80cec79333 100644 --- a/dedibox/dedicated-servers/how-to/monitor-server.mdx +++ b/dedibox/dedicated-servers/how-to/monitor-server.mdx @@ -21,13 +21,8 @@ Your management console includes a monitoring system that can notify you by e-ma -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to use the monitoring page diff --git a/dedibox/dedicated-servers/how-to/order-a-server.mdx b/dedibox/dedicated-servers/how-to/order-a-server.mdx index f199424589..03a8022241 100644 --- a/dedibox/dedicated-servers/how-to/order-a-server.mdx +++ b/dedibox/dedicated-servers/how-to/order-a-server.mdx @@ -17,13 +17,8 @@ categories: -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method) to your account ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account 1. Click **Order** on your Dedibox console homepage. 2. Click **Server**. The server offers page displays. diff --git a/dedibox/dedicated-servers/how-to/rescue-your-data.mdx b/dedibox/dedicated-servers/how-to/rescue-your-data.mdx index 7dd42866f6..cf5eef6e16 100644 --- a/dedibox/dedicated-servers/how-to/rescue-your-data.mdx +++ b/dedibox/dedicated-servers/how-to/rescue-your-data.mdx @@ -17,13 +17,8 @@ Whatever your operating system (Windows or Linux), as long as your server does n -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to boot into rescue mode diff --git a/dedibox/dedicated-servers/how-to/restart-server.mdx b/dedibox/dedicated-servers/how-to/restart-server.mdx index 2664f68e7c..65c43a4779 100644 --- a/dedibox/dedicated-servers/how-to/restart-server.mdx +++ b/dedibox/dedicated-servers/how-to/restart-server.mdx @@ -17,13 +17,8 @@ Your Dedibox server includes a remote reboot system, which we show you how to us -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server 1. From the console, click **Server** > **Server list**. A list of your servers displays. 2. Click **Manage** next to the server you want to restart. diff --git a/dedibox/dedicated-servers/how-to/use-dedibackup-ftp-backup.mdx b/dedibox/dedicated-servers/how-to/use-dedibackup-ftp-backup.mdx index 6d676a879d..28c12dd920 100644 --- a/dedibox/dedicated-servers/how-to/use-dedibackup-ftp-backup.mdx +++ b/dedibox/dedicated-servers/how-to/use-dedibackup-ftp-backup.mdx @@ -28,13 +28,8 @@ The storage system is backed by our [Object Storage](https://www.scaleway.com/en -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to activate the Dedibackup service diff --git a/dedibox/dedicated-servers/how-to/use-ipmi-on-server.mdx b/dedibox/dedicated-servers/how-to/use-ipmi-on-server.mdx index d04cb76e3f..005021ccff 100644 --- a/dedibox/dedicated-servers/how-to/use-ipmi-on-server.mdx +++ b/dedibox/dedicated-servers/how-to/use-ipmi-on-server.mdx @@ -34,13 +34,8 @@ In this document, we show you how to access the IPMI for a Dell or HP server. Se -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a Dedibox server with a dedicated KVM over IP device -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a Dedibox server with a dedicated KVM over IP device ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a Dedibox server with a dedicated KVM over IP device ## How to use IPMI via Dell iDRAC diff --git a/dedibox/dedicated-servers/how-to/use-rescue-mode.mdx b/dedibox/dedicated-servers/how-to/use-rescue-mode.mdx index 1e48efc1d3..a3741f9046 100644 --- a/dedibox/dedicated-servers/how-to/use-rescue-mode.mdx +++ b/dedibox/dedicated-servers/how-to/use-rescue-mode.mdx @@ -30,13 +30,8 @@ Currently, we offer three different types of rescue modes: -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) -======= - A Dedibox account logged into the [console](https://console.online.net) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- A [Dedibox server](/dedibox/dedicated-servers/how-to/order-a-server/) ## How to launch rescue mode diff --git a/dedibox/dedicated-servers/how-to/use-serial-console.mdx b/dedibox/dedicated-servers/how-to/use-serial-console.mdx index 38e74ac52f..e085d568ed 100644 --- a/dedibox/dedicated-servers/how-to/use-serial-console.mdx +++ b/dedibox/dedicated-servers/how-to/use-serial-console.mdx @@ -17,13 +17,8 @@ Some Dedibox server models do not have KVM over IP, but allow the visualization -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server ## How to access the serial console diff --git a/dedibox/dedicated-servers/quickstart.mdx b/dedibox/dedicated-servers/quickstart.mdx index 7b677a84da..ad5b91fa5a 100644 --- a/dedibox/dedicated-servers/quickstart.mdx +++ b/dedibox/dedicated-servers/quickstart.mdx @@ -17,13 +17,8 @@ categories: -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method) to your account ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account ## How to order a server @@ -103,15 +98,9 @@ You can also use FTP, SFTP, or SCP to transfer data to and from your server. -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) +- A Dedibox account logged into the [console](https://console.online.net) - [Created and uploaded your SSH key](/dedibox-console/account/how-to/upload-an-ssh-key/) - [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server and transferred your SSH key to the server during installation -======= -- A Dedibox account logged into the [console](https://console.online.net) -- [Created and uploaded your SSH key](/dedibox-console/account/how-to/upload-an-ssh-key) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server and transferred your SSH key to the server during installation ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) ## How to connect via SSH diff --git a/dedibox/kvm-over-ip/how-to/disable-boot-errors-idrac.mdx b/dedibox/kvm-over-ip/how-to/disable-boot-errors-idrac.mdx index e9f2075f27..90ecafcfe7 100644 --- a/dedibox/kvm-over-ip/how-to/disable-boot-errors-idrac.mdx +++ b/dedibox/kvm-over-ip/how-to/disable-boot-errors-idrac.mdx @@ -17,13 +17,8 @@ This document shows you how to disable boot errors, where your server gets "stuc -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server with a Dell iDRAC controller -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server with a Dell iDRAC controller ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server with a Dell iDRAC controller 1. [Connect to your server's iDRAC](/dedibox/dedicated-servers/how-to/use-ipmi-on-server/#how-to-use-ipmi-via-dell-idrac). 2. Click **System**, on the side menu. diff --git a/dedibox/kvm-over-ip/how-to/quantaplex.mdx b/dedibox/kvm-over-ip/how-to/quantaplex.mdx index 6fa863a0bc..663d6210f5 100644 --- a/dedibox/kvm-over-ip/how-to/quantaplex.mdx +++ b/dedibox/kvm-over-ip/how-to/quantaplex.mdx @@ -17,13 +17,8 @@ This page shows you how to use [KVM](/dedibox/kvm-over-ip/concepts/#kvm-over-ip) -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/install-a-server/) with a [Quanta Computer QuantaPlex](https://www.qct.io/) KVM-over-IP device -======= - A Dedibox account logged into the [console](https://console.online.net) -- A [Dedibox server](/dedibox/dedicated-servers/how-to/install-a-server) with a [Quanta Computer QuantaPlex](https://www.qct.io) KVM-over-IP device ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- A [Dedibox server](/dedibox/dedicated-servers/how-to/install-a-server/) with a [Quanta Computer QuantaPlex](https://www.qct.io) KVM-over-IP device ## Creating a KVM Session diff --git a/dedibox/kvm-over-ip/quickstart.mdx b/dedibox/kvm-over-ip/quickstart.mdx index 3889f83d01..df991aa42f 100644 --- a/dedibox/kvm-over-ip/quickstart.mdx +++ b/dedibox/kvm-over-ip/quickstart.mdx @@ -33,13 +33,8 @@ In this document, we show you how to access the IPMI for a Dell or HP server. Se -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server with a dedicated KVM over IP device -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Created](/dedibox/dedicated-servers/how-to/order-a-server) and [installed](/dedibox/dedicated-servers/how-to/install-a-server) a dedicated server with a dedicated KVM over IP device ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created](/dedibox/dedicated-servers/how-to/order-a-server/) and [installed](/dedibox/dedicated-servers/how-to/install-a-server/) a dedicated server with a dedicated KVM over IP device ## How to use IPMI via Dell iDRAC diff --git a/dedibox/vps/how-to/create-vps.mdx b/dedibox/vps/how-to/create-vps.mdx index 5562d95315..0c204933a4 100644 --- a/dedibox/vps/how-to/create-vps.mdx +++ b/dedibox/vps/how-to/create-vps.mdx @@ -20,13 +20,8 @@ VPS are suitable for various use cases, including hosting websites, web applicat -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method) to your account ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account 1. Log in to your [Dedibox console](https://console.online.net) account and click **Order** in the navigation at the top of the page. 2. From the drop-down menu, select **Dedibox VPS** to access the Dedibox VPS offers page. diff --git a/dedibox/vps/quickstart.mdx b/dedibox/vps/quickstart.mdx index 80794d0a61..277a8b8ab6 100644 --- a/dedibox/vps/quickstart.mdx +++ b/dedibox/vps/quickstart.mdx @@ -22,13 +22,8 @@ They offer a balance of performance, control, and affordability for businesses a -<<<<<<< HEAD -- A Dedibox account logged into the [console](https://console.online.net/) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account -======= - A Dedibox account logged into the [console](https://console.online.net) -- [Added a payment method](/dedibox-console/account/how-to/add-payment-method) to your account ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Added a payment method](/dedibox-console/account/how-to/add-payment-method/) to your account 1. Navigate to your [Dedibox console](https://console.online.net) home page and select **Order** from the top navigation. 2. Choose **Dedibox VPS** from the drop-down menu to access available offers. diff --git a/labs/ipfs-pinning/api-cli/getting-started-with-ipfs-cli.mdx b/labs/ipfs-pinning/api-cli/getting-started-with-ipfs-cli.mdx index 9cfd4e3e88..40f229917c 100644 --- a/labs/ipfs-pinning/api-cli/getting-started-with-ipfs-cli.mdx +++ b/labs/ipfs-pinning/api-cli/getting-started-with-ipfs-cli.mdx @@ -23,11 +23,7 @@ Scaleway IPFS Pinning allows you to permanently store a copy of your data from t With your content now available on both your local node and our resilient and reliable external nodes, you drastically minimize the risk of disruptions thanks to redundancy. You can also enhance your data storage efficiency by pinning your content to your Scaleway node, and then remove it from your local node. -<<<<<<< HEAD -In this quickstart, we show you how you can [create and manage your volumes](/labs/ipfs-pinning/api-cli/volumes-operations/) and [pins](/labs/ipfs-pinning/api-cli/pin-operations/) from the [console](https://console.scaleway.com/login/), via the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli/). -======= -In this quickstart, we show you how you can [create and manage your volumes](/labs/ipfs-pinning/api-cli/volumes-operations) and [pins](/labs/ipfs-pinning/api-cli/pin-operations) from the [console](https://console.scaleway.com/login), via the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +In this quickstart, we show you how you can [create and manage your volumes](/labs/ipfs-pinning/api-cli/volumes-operations/) and [pins](/labs/ipfs-pinning/api-cli/pin-operations/) from the [console](https://console.scaleway.com/login), via the [Scaleway Command Line Interface](https://github.com/scaleway/scaleway-cli). - Data is **public**: our IPFS nodes are bootstrapped with public IPFS nodes. This implies that any pinned content will be **available on the public IPFS network**. diff --git a/labs/ipfs-pinning/api-cli/ipfs-cli.mdx b/labs/ipfs-pinning/api-cli/ipfs-cli.mdx index 438efb1551..991b41bfab 100644 --- a/labs/ipfs-pinning/api-cli/ipfs-cli.mdx +++ b/labs/ipfs-pinning/api-cli/ipfs-cli.mdx @@ -97,10 +97,6 @@ ipfs pin remote rm --service=scaleway --cid= | Parameter | Description | | :----------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `REGION_ID` | Create volumes and pins in this given region. Possible values are `fr-par`, `pl-waw` and `nl-ams`. Default value is `fr-par`. | -<<<<<<< HEAD -| `VOLUME_ID` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes/) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations/) | -======= -| `VOLUME_ID` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations) | ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +| `VOLUME_ID` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations/) | | `SECRET_KEY` | Your [API secret key](/identity-and-access-management/iam/concepts/#api-key) | | `CID` | [CID](/labs/ipfs-pinning/concepts/#content-identifier-(cid)) of the content you wish to pin. | \ No newline at end of file diff --git a/labs/ipfs-pinning/api-cli/pin-operations.mdx b/labs/ipfs-pinning/api-cli/pin-operations.mdx index 65ad1979d7..278f8b3f7f 100644 --- a/labs/ipfs-pinning/api-cli/pin-operations.mdx +++ b/labs/ipfs-pinning/api-cli/pin-operations.mdx @@ -31,13 +31,8 @@ The [Scaleway Command Line Interface (CLI)](https://github.com/scaleway/scaleway - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization - A valid [API key](/identity-and-access-management/iam/how-to/create-api-keys/) -<<<<<<< HEAD -- Downloaded and installed the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2/) -- [Added data to your own local node](/labs/ipfs-pinning/reference-content/install-ipfs-desktop/) and retrieved its [CID](/labs/ipfs-pinning/concepts/#content-identifier-(cid)) -======= - Downloaded and installed the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2) -- [Added data to your own local node](/labs/ipfs-pinning/reference-content/install-ipfs-desktop) and retrieved its [CID](/labs/ipfs-pinning/concepts/#content-identifier-(cid)) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Added data to your own local node](/labs/ipfs-pinning/reference-content/install-ipfs-desktop/) and retrieved its [CID](/labs/ipfs-pinning/concepts/#content-identifier-(cid)) ## Pinning a content using its CID @@ -61,11 +56,7 @@ Enter the following CLI command to pin content to a volume using its CID. Just m | Parameter | Description | | :------------ | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -<<<<<<< HEAD - | `volume-id` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes/) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations/) | -======= - | `volume-id` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations) | ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + | `volume-id` | ID of the volume you wish to pin your content to. You can find it using either the [Scaleway console](https://console.scaleway.com/ipfs/volumes) or the [Scaleway API/CLI](/labs/ipfs-pinning/api-cli/volumes-operations/) | | `cid` | CID of the content you wish to pin. | | `name` | Create a pin with this given name. | diff --git a/managed-databases/postgresql-and-mysql/api-cli/migrating-endpoints.mdx b/managed-databases/postgresql-and-mysql/api-cli/migrating-endpoints.mdx index acbe34054f..9350c1c83f 100644 --- a/managed-databases/postgresql-and-mysql/api-cli/migrating-endpoints.mdx +++ b/managed-databases/postgresql-and-mysql/api-cli/migrating-endpoints.mdx @@ -45,11 +45,7 @@ The following commands are useful when you [upgrade the version of your database - If you want to migrate a `load_balancer` endpoint type the target Database Instance must not have a `load_balancer` endpoint - If you want to migrate a `private_network` endpoint type the target Database Instance must not have a `private_network` endpoint -<<<<<<< HEAD - You can remove existing endpoints in the target Database Instance via the [Scaleway console](/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint/) or [the CLI](https://github.com/scaleway/scaleway-cli/blob/master/docs/commands/rdb.md#delete-a-database-instance-endpoint/). -======= - You can remove existing endpoints in the target Database Instance via the [Scaleway console](/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint) or [the CLI](https://github.com/scaleway/scaleway-cli/blob/master/docs/commands/rdb.md#delete-a-database-instance-endpoint). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + You can remove existing endpoints in the target Database Instance via the [Scaleway console](/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint/) or [the CLI](https://github.com/scaleway/scaleway-cli/blob/master/docs/commands/rdb.md#delete-a-database-instance-endpoint). diff --git a/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint.mdx b/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint.mdx index 13065b9eab..c8d780aa63 100644 --- a/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint.mdx +++ b/managed-databases/postgresql-and-mysql/how-to/remove-public-endpoint.mdx @@ -46,13 +46,8 @@ If you are using a public endpoint with your Database Instances or Read Replicas -<<<<<<< HEAD -- A Scaleway account logged into the [console](https://console.scaleway.com/) -- A [Read Replica](/managed-databases/postgresql-and-mysql/how-to/create-read-replica/) -======= - A Scaleway account logged into the [console](https://console.scaleway.com) -- A [Read Replica](/managed-databases/postgresql-and-mysql/how-to/create-read-replica) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- A [Read Replica](/managed-databases/postgresql-and-mysql/how-to/create-read-replica/) 1. Click **PostgreSQL and MySQL** under **Managed Databases** on the side menu. A list of your Database Instances displays. 2. Click the database name or > **More info** to access the Database Instance information page. diff --git a/managed-services/iot-hub/api-cli/cli-db-tips-tricks.mdx b/managed-services/iot-hub/api-cli/cli-db-tips-tricks.mdx index 3bbe0a95ae..31b20244fc 100644 --- a/managed-services/iot-hub/api-cli/cli-db-tips-tricks.mdx +++ b/managed-services/iot-hub/api-cli/cli-db-tips-tricks.mdx @@ -189,13 +189,8 @@ This section presents similar examples using MySQL: -<<<<<<< HEAD - Followed the [Getting started with the IoT Hub CLI](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli/) tutorial -- A working MySQL database, with valid credentials (username and password). You can use a [Scaleway Database instance](https://console.scaleway.com/rdb/instances/), or any other MySQL instance publicly accessible -======= -- Followed the [Getting started with the IoT Hub CLI](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli) tutorial - A working MySQL database, with valid credentials (username and password). You can use a [Scaleway Database instance](https://console.scaleway.com/rdb/instances), or any other MySQL instance publicly accessible ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) - Set up environment variables as shown in the code box below ```bash diff --git a/managed-services/iot-hub/api-cli/iot-hub-routes.mdx b/managed-services/iot-hub/api-cli/iot-hub-routes.mdx index 2614a93532..e195ce3c37 100644 --- a/managed-services/iot-hub/api-cli/iot-hub-routes.mdx +++ b/managed-services/iot-hub/api-cli/iot-hub-routes.mdx @@ -23,11 +23,7 @@ Routes are integrations with the Scaleway ecosystem: they can forward MQTT messa - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization - Installed `mosquitto-clients` (mqtt client) and `jq` (JSON parsing tool) on your computer -<<<<<<< HEAD -- Installed the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2/) and [read the accompanying IoT document](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli/) -======= -- Installed the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2) and [read the accompanying IoT document](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- Installed the [Scaleway CLI](https://github.com/scaleway/scaleway-cli#scaleway-cli-v2) and [read the accompanying IoT document](/managed-services/iot-hub/api-cli/getting-started-with-iot-hub-cli/) - Installed and configured [`s3cmd`](/tutorials/s3cmd/) for Scaleway ## S3 Routes diff --git a/observability/cockpit/how-to/activate-managed-alerts.mdx b/observability/cockpit/how-to/activate-managed-alerts.mdx index d5303c156f..a8e2e13c3f 100644 --- a/observability/cockpit/how-to/activate-managed-alerts.mdx +++ b/observability/cockpit/how-to/activate-managed-alerts.mdx @@ -16,13 +16,8 @@ This page shows you how to activate [managed alerts](/observability/cockpit/conc -<<<<<<< HEAD - - A Scaleway account logged into the [console](https://console.scaleway.com/) - - [Enabled](/observability/cockpit/how-to/enable-alert-manager/) the alert manager -======= - A Scaleway account logged into the [console](https://console.scaleway.com) - - [Enabled](/observability/cockpit/how-to/enable-alert-manager) the alert manager ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) + - [Enabled](/observability/cockpit/how-to/enable-alert-manager/) the alert manager - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization ## Activate managed alerts diff --git a/serverless/messaging/reference-content/nats-overview.mdx b/serverless/messaging/reference-content/nats-overview.mdx index d6d95416eb..373dc27e96 100644 --- a/serverless/messaging/reference-content/nats-overview.mdx +++ b/serverless/messaging/reference-content/nats-overview.mdx @@ -25,11 +25,7 @@ You can easily create a NATS account from the [Scaleway console](https://console ## NATS credentials -<<<<<<< HEAD -When you create your NATS account, you next need to [create credentials](/serverless/messaging/how-to/create-credentials/). On the NATS side, these credentials are the equivalent of a 'user'. We configured Scaleway Messaging and Queuing to use the most secure connection type offered by NATS: [NKeys](https://docs.nats.io/running-a-nats-service/configuration/securing_nats/auth_intro/nkey_auth/). NKeys are a public-key signature system based on [Ed25519](https://ed25519.cr.yp.to/). -======= -When you create your NATS account, you next need to [create credentials](/serverless/messaging/how-to/create-credentials). On the NATS side, these credentials are the equivalent of a 'user'. We configured Scaleway Messaging and Queuing to use the most secure connection type offered by NATS: [NKeys](https://docs.nats.io/running-a-nats-service/configuration/securing_nats/auth_intro/nkey_auth). NKeys are a public-key signature system based on [Ed25519](https://ed25519.cr.yp.to/). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +When you create your NATS account, you next need to [create credentials](/serverless/messaging/how-to/create-credentials/). On the NATS side, these credentials are the equivalent of a 'user'. We configured Scaleway Messaging and Queuing to use the most secure connection type offered by NATS: [NKeys](https://docs.nats.io/running-a-nats-service/configuration/securing_nats/auth_intro/nkey_auth). NKeys are a public-key signature system based on [Ed25519](https://ed25519.cr.yp.to/). Your credentials are provided in the form of a downloadable `.creds` file. Each set of credentials gives you full access to your NATS account, but does not enable you to generate new users with specific rights or fine-grained permissions. @@ -41,11 +37,7 @@ Note that the Scaleway Messaging and Queuing NATS server is configured with TLS, ### NATS CLI -<<<<<<< HEAD -The [NATS CLI](https://docs.nats.io/using-nats/nats-tools/nats_cli/) is a great tool for administrating or testing your subjects and streams. See our [dedicated documentation](/serverless/messaging/api-cli/nats-cli/) for help getting started with the NATS CLI. -======= -The [NATS CLI](https://docs.nats.io/using-nats/nats-tools/nats_cli) is a great tool for administrating or testing your subjects and streams. See our [dedicated documentation](/serverless/messaging/api-cli/nats-cli) for help getting started with the NATS CLI. ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +The [NATS CLI](https://docs.nats.io/using-nats/nats-tools/nats_cli) is a great tool for administrating or testing your subjects and streams. See our [dedicated documentation](/serverless/messaging/api-cli/nats-cli/) for help getting started with the NATS CLI. ### NATS SDK diff --git a/storage/object/how-to/access-objects-via-https.mdx b/storage/object/how-to/access-objects-via-https.mdx index 20897c1efe..68acaccbc5 100644 --- a/storage/object/how-to/access-objects-via-https.mdx +++ b/storage/object/how-to/access-objects-via-https.mdx @@ -22,13 +22,8 @@ If an object is public, you can retreive the link to access it from the [Scalewa -<<<<<<< HEAD -- A Scaleway account logged into the [console](https://console.scaleway.com/) -- [Created an Object Storage bucket](/storage/object/how-to/create-a-bucket/) and have [uploaded objects](storage/object/how-to/upload-files-into-a-bucket/) to it -======= - A Scaleway account logged into the [console](https://console.scaleway.com) -- [Created an Object Storage bucket](/storage/object/how-to/create-a-bucket/) and have [uploaded objects](storage/object/how-to/upload-files-into-a-bucket) to it ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +- [Created an Object Storage bucket](/storage/object/how-to/create-a-bucket/) and have [uploaded objects](storage/object/how-to/upload-files-into-a-bucket/) to it 1. Click **Object Storage** on the side menu. The list of your buckets displays. 2. Click the bucket that contains the file you want to access. A list of your objects displays. diff --git a/tutorials/load-testing-vegeta/index.mdx b/tutorials/load-testing-vegeta/index.mdx index 58e7afe938..567a02be07 100644 --- a/tutorials/load-testing-vegeta/index.mdx +++ b/tutorials/load-testing-vegeta/index.mdx @@ -15,11 +15,7 @@ dates: ## Vegeta load testing -<<<<<<< HEAD -Load testing involves subjecting an application to real-world conditions through the simulation of concurrent user requests. This practice helps you understand how an application behaves when accessed by numerous users, simultaneously. This guide explains how to use [Vegeta](https://github.com/tsenart/vegeta/), an open-source tool coded in the [Go programming language](/tutorials/install-golang-ubuntu-bionic/), to execute load tests on an application. -======= -Load testing involves subjecting an application to real-world conditions through the simulation of concurrent user requests. This practice helps you understand how an application behaves when accessed by numerous users, simultaneously. This guide explains how to use [Vegeta](https://github.com/tsenart/vegeta), an open-source tool coded in the [Go programming language](/tutorials/install-golang-ubuntu-bionic), to execute load tests on an application. ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +Load testing involves subjecting an application to real-world conditions through the simulation of concurrent user requests. This practice helps you understand how an application behaves when accessed by numerous users, simultaneously. This guide explains how to use [Vegeta](https://github.com/tsenart/vegeta), an open-source tool coded in the [Go programming language](/tutorials/install-golang-ubuntu-bionic/), to execute load tests on an application. Before transitioning an application to a production environment, load testing helps you unearth the following issues: diff --git a/tutorials/terraform-quickstart/index.mdx b/tutorials/terraform-quickstart/index.mdx index 8a4f02d5f1..004d9066df 100644 --- a/tutorials/terraform-quickstart/index.mdx +++ b/tutorials/terraform-quickstart/index.mdx @@ -822,8 +822,4 @@ You have 3 options to use these variables: - As a command-line parameter variable: `terraform apply -var zone=${var.zone}` - As a variables file: `terraform apply -var-file=variables.tf` -<<<<<<< HEAD -To learn more, discover how to deploy your cloud resources using [Packer and Terraform](/tutorials/deploy-instances-packer-terraform/) and check out the full [Scaleway Provider documentation for Terraform](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/). -======= -To learn more, discover how to deploy your cloud resources using [Packer and Terraform](/tutorials/deploy-instances-packer-terraform) and check out the full [Scaleway Provider documentation for Terraform](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs). ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) +To learn more, discover how to deploy your cloud resources using [Packer and Terraform](/tutorials/deploy-instances-packer-terraform/) and check out the full [Scaleway Provider documentation for Terraform](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs). diff --git a/tutorials/use-container-registry-github-actions/index.mdx b/tutorials/use-container-registry-github-actions/index.mdx index 83e9786c14..8c03e356df 100644 --- a/tutorials/use-container-registry-github-actions/index.mdx +++ b/tutorials/use-container-registry-github-actions/index.mdx @@ -22,15 +22,9 @@ GitHub Actions is a platform for automating software development workflows in th - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization - A valid [API key](/identity-and-access-management/iam/how-to/create-api-keys/) -<<<<<<< HEAD - A private [Container Registry namespace](/containers/container-registry/how-to/create-namespace/) -- A [member role in a GitHub organization](https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization/) -- Created [a GitHub repository](https://docs.github.com/en/get-started/quickstart/create-a-repo/) in that organization -======= -- A private [Container Registry namespace](/containers/container-registry/how-to/create-namespace) - A [member role in a GitHub organization](https://docs.github.com/en/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization) - Created [a GitHub repository](https://docs.github.com/en/get-started/quickstart/create-a-repo) in that organization ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) - A [working Dockerfile in the root of the repository](https://docs.docker.com/engine/reference/builder/) in that organization ## Setting up your Scaleway secrets in GitHub diff --git a/tutorials/use-managed-redis-with-mysql/index.mdx b/tutorials/use-managed-redis-with-mysql/index.mdx index 430d6421ef..941ebecf81 100644 --- a/tutorials/use-managed-redis-with-mysql/index.mdx +++ b/tutorials/use-managed-redis-with-mysql/index.mdx @@ -23,15 +23,9 @@ This tutorial demonstrates the integration of a [Scaleway Redis™](https://www. - A Scaleway account logged into the [console](https://console.scaleway.com) - [Owner](/identity-and-access-management/iam/concepts/#owner) status or [IAM permissions](/identity-and-access-management/iam/concepts/#permission) allowing you to perform actions in the intended Organization -<<<<<<< HEAD - A [Redis™ Database Instance](/managed-databases/redis/how-to/create-a-database-for-redis/) - A [MySQL Database Instance](/managed-databases/postgresql-and-mysql/how-to/create-a-database/) -- Installed the [.NET 7 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0/) -======= -- A [Redis™ Database Instance](/managed-databases/redis/how-to/create-a-database-for-redis) -- A [MySQL Database Instance](/managed-databases/postgresql-and-mysql/how-to/create-a-database) - Installed the [.NET 7 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) ->>>>>>> parent of ff71e3252 (fix(gen): backslashes) ## Scaffold a project with Entity Framework