update: merge move to marketplace subscriptions (#164)

docs/marketplace-setup.md

@@ -84,7 +84,7 @@ Aiven makes its services available through the various Marketplaces and you can
 1. Choose or create an Aiven
    organization to use the AWS subscription for.
 
-To move existing Aiven projects to this AWS subscription, see [Move from Aiven direct billing to AWS Marketplace](/docs/platform/howto/move-to-aws-marketplace-billing).
+To move existing Aiven projects to this AWS subscription, see [Move from Aiven direct billing to AWS Marketplace](/docs/platform/howto/list-marketplace-payments).
 
 If you have any issues linking Aiven to your AWS subscription, repeat the process
 in the AWS web console by finding the Aiven subscription and clicking
@@ -155,4 +155,4 @@ show your usage per service:
 
 ## Related pages
 
-- [Move from Aiven direct billing to AWS Marketplace](/docs/platform/howto/move-to-aws-marketplace-billing)
+- [Use marketplace subscriptions to pay for Aiven services](/docs/platform/howto/list-marketplace-payments)

docs/platform/howto/list-marketplace-payments.md

@@ -2,5 +2,63 @@
 title: Use marketplace subscriptions to pay for Aiven services
 ---
 
-Browse through instructions for using marketplace subscriptions to pay
-for Aiven services.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+Aiven makes its services available through various Marketplaces. If you already have services running in a project, which is billed directly through Aiven, you can move to a Marketplace subscription without disrupting your services.
+
+<Tabs groupId="group1">
+<TabItem value="aws" label="AWS Marketplace" default>
+
+1. [Set up AWS Marketplace for Aiven services](/docs/marketplace-setup).
+   The new Aiven organization will contain your projects.
+
+1. Collect the required information:
+
+   1. From your **existing Aiven account**, retrieve The name of the Aiven projects
+      that contain the services you wish to move.
+
+   1. From your **new Aiven organization** with the AWS Marketplace
+      subscription, retrieve the Aiven organization name.
+
+1. Send the information by email to [the sales team](mailto:sales@aiven.io).
+
+</TabItem>
+<TabItem value="azure" label="Azure Marketplace">
+
+1. [Set up Azure Marketplace for Aiven services](/docs/marketplace-setup).
+   The new Aiven organization will contain your projects.
+
+1. Collect the required information:
+
+   1. From your **existing Aiven account**, retrieve The name of the Aiven projects
+      that contain the services you wish to move.
+
+   1. From your **new Aiven organization** with the Azure Marketplace
+      subscription, retrieve the Aiven organization name.
+
+1. Send the information by email to [the sales team](mailto:sales@aiven.io).
+
+</TabItem>
+<TabItem value="google" label="Google Cloud Marketplace">
+
+1. [Set up Google Cloud Marketplace for Aiven Services](/docs/marketplace-setup).
+   The new Aiven organization will contain your projects.
+
+1. Collect the required information:
+
+   1. From your **existing Aiven account**, retrieve The name of the Aiven projects
+      that contain the services you wish to move.
+
+   1. From your **new Aiven organization** with the GCP marketplace
+      subscription, retrieve the Aiven organization name, as shown in the
+      [Aiven GCP console](https://console.gcp.aiven.io/).
+
+1. Send the information by email to [the sales team](mailto:sales@aiven.io).
+
+</TabItem>
+</Tabs>
+<!-- vale off -->
+## Related pages
+
+- [Set up Marketplace subscription](/docs/marketplace-setup)

sidebars.ts

@@ -63,19 +63,7 @@ const sidebars: SidebarsConfig = {
           },
           items: [
             'platform/howto/manage-payment-card',
-            {
-              type: 'category',
-              label: 'Marketplace subscriptions',
-              link: {
-                type: 'doc',
-                id: 'platform/howto/list-marketplace-payments',
-              },
-              items: [
-                'platform/howto/move-to-aws-marketplace-billing',
-                'platform/howto/move-to-azure-marketplace-billing',
-                'platform/howto/move-to-gcp-marketplace-billing',
-              ],
-            },
+            'platform/howto/list-marketplace-payments',
           ],
         },
         {

static/_redirects

@@ -52,3 +52,6 @@
 /platform/howto/billing-google-cloud-platform-marketplace-subscription https://aiven.io/docs/marketplace-setup
 /platform/howto/billing-aws-marketplace-subscription   https://aiven.io/docs/marketplace-setup
 /platform/howto/billing-azure-marketplace-subscription https://aiven.io/docs/marketplace-setup
+/platform/howto/move-to-azure-marketplace-billing      https://aiven.io/docs/platform/howto/list-marketplace-payments
+/platform/howto/move-to-gcp-marketplace-billing        https://aiven.io/docs/platform/howto/list-marketplace-payments
+/platform/howto/move-to-aws-marketplace-billing        https://aiven.io/docs/platform/howto/list-marketplace-payments