Merge branch 'main' into search-index-to-algolia

CONTRIBUTING.rst

@@ -209,14 +209,18 @@ Limited availability note template
 
 For features that are in the limited availability stage, add the following admonition directly undert the article title:
 
-.. important:: 
-    {feature name} is a limited availability feature. If you're interested in trying out this feature, contact the sales team at sales@Aiven.io.
+::
+
+    .. important:: 
+        {feature name} is a :doc:`limited availability feature </docs/platform/concepts/beta_services>`. If you're interested in trying out this feature, contact the sales team at sales@Aiven.io.
 
 
 Early availability note template
 '''''''''''''''''''''''''''''''''''
 
-For features that are in the early availability stage, add the following admonition directly undert the article title:
+For features that are in the early availability stage and can be enabled in the Console, add the following admonition directly under the article title:
+
+::
 
-.. important:: 
-    {feature name} is an early availability feature. To use it, :doc:`enable the feature preview </docs/platform/howto/feature-preview.html>` in your user profile.
+    .. important:: 
+        {feature name} is an :doc:`early availability feature </docs/platform/concepts/beta_services>`. To use it, :doc:`enable the feature preview </docs/platform/howto/feature-preview.html>` in your user profile.

docs/platform/concepts/beta_services.rst

@@ -1,30 +1,32 @@
-Beta services
-=============
+Service and feature releases
+=============================
 
-Aiven releases new services at the beta stage for all customers so that you have the opportunity to test and validate your business needs for these new services.
+Before general availability, the lifecycle of new services and features includes a limited availability stage and an early availability stage.
 
-The reason for the wide availability is that we believe that customer feedback is critical during the development cycle, and the feedback that we receive during the beta stage helps us shape the products that you use.
 
+Limited availability
+---------------------
 
-What does beta mean?
---------------------
+The limited availability stage is an initial release that customers can try out. If you are interested in trying a service or feature in this stage, contact the sales team at sales@Aiven.io.
 
-Any service tagged as beta is intended as early access for use in non-production environments. You can however test them with production-like workloads so that you can gauge how the service behaves under heavy loads.
 
-Issues raised for beta services are considered low severity issues and are handled according to our support SLAs.
+Early availability
+-------------------
 
-Using a beta service means that you consent to us contacting you to request qualitative feedback and to test the service to help Aiven improve its product offering.
+Features and services in the early availability stage are released to all users with some restrictions on the functionality and `service level agreement <https://aiven.io/sla>`_. They are intended for use in non-production environments, but you can test them with production-like workloads to gauge their behavior under heavy loads. Issues raised for these services and features are considered `low severity <https://aiven.io/support-services>`_.
 
+You can enable most early availability features yourself on the :doc:`feature preview page </docs/platform/howto/feature-preview>` in the user profile. This is also where you can provide feedback about the feature after trying it out.
 
-How long will it be in beta?
-----------------------------
+Using a service in this stage means that you consent to us contacting you to request qualitative feedback. The feedback we receive helps us shape the products you use.
 
-An Aiven service will advance from beta status and become generally available once we are confident that it is ready for production use at scale.
 
-The duration of the beta period largely depends on how quickly the service has been adopted by our customers and what changes are required to address the key issues that are discovered.
+General availability
+---------------------
 
+New services and features become generally available once they are ready for production use at scale. The duration of the early and limited availability stages depends on how quickly the service or feature has been adopted by our customers and what changes are required to address the key issues that are discovered.
 
-Billing for beta services
--------------------------
 
-We provide campaign credit codes to encourage you to try out our beta services. Once the campaign code expires or you have used the credit in full, we charge you for the service according to the normal rate.
+Billing for limited and early availability services
+----------------------------------------------------
+
+Aiven provides credits for you to try out limited and early availability services. Once the credit code expires or you have used all of the credits, you are charged for the service according to the normal rate.

docs/platform/concepts/service_backups.rst

@@ -61,6 +61,9 @@ Aiven for Apache Kafka®
 
 Aiven for Apache Kafka is usually used as a transport tool for data rather than a permanent store. Due to the way it stores data, traditional backup strategies are not feasible. As a result, Aiven does not perform backups for managed Apache Kafka services, and data durability is determined by data replication across the cluster.
 
+However, automatic backups for essential Apache Kafka® service configurations are offered through :doc:`configuration backups </docs/products/kafka/concepts/configuration-backup>`, and they come at no extra cost.
+If the Apache Kafka® service is powered off/on or if any incidents lead to the cluster's failure, the configuration backup facilitates restoring your Apache Kafka® service to its previous state.
+
 To back up data passing through Apache Kafka, we recommend using one of the following tools:
 
 * :doc:`MirrorMaker 2<../../products/kafka/kafka-mirrormaker>` to replicate the data to another cluster, which could be an Aiven service or a Apache Kafka cluster on your own infrastructure. With MirrorMaker 2, the backup cluster operates as an independent Apache Kafka service. You can freely choose a zone for your backup service since it operates independently from the primary service.
@@ -78,6 +81,7 @@ To back up data passing through Apache Kafka, we recommend using one of the foll
     * :doc:`Aiven for Apache Kafka® MirrorMaker 2 </docs/products/kafka/kafka-mirrormaker>`
     * Cloudera's `A look inside Kafka MirrorMaker 2 <https://blog.cloudera.com/a-look-inside-kafka-mirrormaker-2/>`_
     * :doc:`Configure AWS for an S3 sink connector </docs/products/kafka/kafka-connect/howto/s3-sink-prereq>`
+    * :doc:`Configuration Backups </docs/products/kafka/concepts/configuration-backup>`
 
 Aiven for PostgreSQL®
 '''''''''''''''''''''

docs/platform/howto/use-azure-privatelink.rst

@@ -1,5 +1,9 @@
-Use Azure Private Link with Aiven services |beta|
-=================================================
+Use Azure Private Link with Aiven services 
+===========================================
+
+.. important
+
+    Azure Private Link is an :doc:`early availability feature </docs/platform/concepts/beta_services>`.
 
 Azure Private Link lets you bring your Aiven services into your virtual network (VNet) over a private endpoint. The endpoint creates a network interface into one of the VNet subnets, and receives a private IP address from its IP range. The private endpoint is routed to your Aiven service.
 

docs/platform/howto/use-google-private-service-connect.rst

@@ -1,11 +1,11 @@
-Use Google Private Service Connect with Aiven services |beta|
-=============================================================
+Use Google Private Service Connect with Aiven services 
+=======================================================
 
 Discover Google Private Service Connect and benefits of using it with your Aiven services. Learn how to enable Google Private Service Connect for Aiven services.
 
 .. important::
 
-   Google Private Service Connect is in beta, and it is currently supported for Aiven for Apache Kafka®. Contact support@Aiven.io to enable it on your Aiven projects.
+    Google Private Service Connect is a :doc:`limited availability feature </docs/platform/concepts/beta_services>`. It's only supported for Aiven for Apache Kafka®. Contact support@Aiven.io to enable it on your Aiven projects.
 
 About Private Service Connect
 -----------------------------