CC Serverless

_data/products.yml

@@ -1,12 +1,9 @@
-serverless: CockroachCloud Free (beta)
-# to be CockroachCloud Serverless then CockroachDB Serverless (beta)
-serverless-plan: CockroachCloud Free #i.e. "1. Choose the **CockroachCloud Free** plan."
+serverless: CockroachDB Serverless (beta)
+# to be CockroachDB Serverless (beta)
+serverless-plan: CockroachDB Serverless #i.e. "1. Choose the **CockroachDB Serverless** plan."
 # to be CockroachCloud Serverless
-dedicated: CockroachCloud
+dedicated: CockroachDB Dedicated
 # to be CockroachDB Managed
-core: Core
-#stays the same
-enterprise: Enterprise
-# to be CockroachDB Self-Hosted
-db: CockroachCloud #i.e. "Sign up for a CockroachCloud account"
-# to be CockroachDB
+core: CockroachDB Self-Hosted
+# tbd
+db: CockroachDB Cloud #i.e. "Sign up for a CockroachDB Cloud account", tbd

_data/releases-cc.yml

@@ -1,4 +1,4 @@
-- title: CockroachCloud releases
+- title: CockroachDB Cloud releases
   releases:
     - name: September 2021 
       link: cockroachcloud-09072021

_includes/cockroachcloud/free-limitations.md

@@ -1,3 +1,3 @@
 {{site.data.alerts.callout_info}}
-{{ site.data.products.serverless-plan }} is currently in beta. For information about its limitations, see [{{ site.data.products.serverless }} FAQs](free-faqs.html).
+{{ site.data.products.serverless-plan }} is currently in beta. For information about its limitations, see [{{ site.data.products.serverless }} FAQs](serverless-faqs.html).
 {{site.data.alerts.end}}

_includes/cockroachcloud/planning-your-serverless-cluster.md

@@ -0,0 +1,11 @@
+### Request Units
+
+Most resource usage in {{ site.data.products.serverless }} is measured in Request Units, or RUs. RUs represent the compute and I/O resources used by a query. All database operations cost a certain amount of RUs depending on the resources used. For example, a "small read" might cost 1 RU, and a "large read" such as a full table scan with indexes could cost a large number of RUs. You can see how many request units your cluster has used on the [Cluster Overview](#view-cluster-overview) page.
+
+### Cluster scaling
+
+{{ site.data.products.serverless }} clusters scale based on your workload. Free clusters include 250M RUs with 10M RUs reserved for [burst performance](architecture.html#concepts) per month and 5 GiB of storage. They have a guaranteed baseline performance of 100 RUs per second, or up to 100 QPS.
+
+You can set your spend limit higher to maintain a high level of performance with larger workloads. You will only be charged for the resources you use up to your spend limit. If you reach your spend limit, your cluster will revert to the baseline performance of free clusters. All [Console Admins](console-access-management.html#console-admin) will receive email alerts when your cluster reaches 50%, 75%, and 100% of its spend limit, burst capacity, or storage limit.
+
+To see a graph of your monthly resource usage and recommended spend limit, navigate to the [Edit cluster](#edit-your-spend-limit) page.

_includes/cockroachcloud/quickstart/create-a-free-cluster.md

@@ -7,8 +7,6 @@
     This cluster will be free forever.
     {{site.data.alerts.end}}
 
-1. _(Optional)_ Select a cloud provider (GCP or AWS) in the **Additional configuration** section.
-1. _(Optional)_ Select a region in the **Additional configuration** section. For optimal performance, select the cloud provider region closest to the region in which you are running your application.
 1. Click **Create your free cluster**.
 
 Your cluster will be created in approximately 20-30 seconds.

_includes/footer.html

@@ -10,7 +10,7 @@
             </li>
             <li>
               <a href="https://www.cockroachlabs.com/product/cockroachcloud/"
-                >CockroachCloud</a
+                >CockroachDB Cloud</a
               >
             </li>
             <li>

_includes/main-menu-contained-dropdown.html

@@ -113,12 +113,12 @@ <h6 class="font-weight-bold  callout-title text-center">
                         </div>
                         <div>
                           <h6 class="font-weight-bold  callout-title text-center">
-                            CockroachCloud
+                            CockroachDB Cloud
                         </h6>
                         <p class="nav-link text-small text-center">
                           CockroachDB hosted <br>as a service.
                         </p>
-                        <p class="text-small mb-0 text-electric-purple">Explore CockroachCloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <p class="text-small mb-0 text-electric-purple">Explore CockroachDB Cloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path d="M1 0.664551L5 5.24403L1 9.82351" stroke="#6933FF"/>
                             </svg>
                           </p>
@@ -349,12 +349,12 @@ <h6 class="font-weight-bold  callout-title text-center">
                           </div>
                           <div>
                             <h6 class="font-weight-bold  callout-title text-center">
-                              CockroachCloud
+                              CockroachDB Cloud
                           </h6>
                           <p class="nav-link text-small text-center">
                             CockroachDB hosted <br>as a service.
                           </p>
-                          <p class="text-small mb-0 text-electric-purple">Explore CockroachCloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+                          <p class="text-small mb-0 text-electric-purple">Explore CockroachDB Cloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
                               <path d="M1 0.664551L5 5.24403L1 9.82351" stroke="#6933FF"/>
                               </svg>
                             </p>

_includes/marketing-menu.html

@@ -143,12 +143,12 @@ <h6 class="font-weight-bold  callout-title text-center">
                             <img src="https://crl2020.imgix.net/img/icons/icon-db-cloud.svg" alt="CockroachDB" />
                           </div>
                           <h6 class="font-weight-bold  callout-title text-center">
-                            CockroachCloud
+                            CockroachDB Cloud
                           </h6>
                           <p class="nav-link text-small text-center">
                             CockroachDB hosted <br />as a service.
                           </p>
-                          <a href="https://www.cockroachlabs.com/product/cockroachcloud/" class="text-small">Explore CockroachCloud <svg width="6"
+                          <a href="https://www.cockroachlabs.com/product/cockroachcloud/" class="text-small">Explore CockroachDB Cloud <svg width="6"
                               height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
                               <path d="M1 0.664551L5 5.24403L1 9.82351" stroke="#6933FF"></path>
                             </svg>

_includes/menu-main-product.html

@@ -24,12 +24,12 @@ <h6 class="font-weight-bold  callout-title text-center">
             <a href="/product/cockroachcloud/"><img src="{{ $.Site.Params.img_url}}/img/icons/icon-db-cloud.svg" alt="CockroachDB"></a>
           </div>
           <h6 class="font-weight-bold  callout-title text-center">
-              CockroachCloud
+              CockroachDB Cloud
           </h6>
           <p class="nav-link text-small text-center">
             CockroachDB hosted <br>as a service.
           </p>
-          <a href="/product/cockroachcloud/" class="text-small">Explore CockroachCloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <a href="/product/cockroachcloud/" class="text-small">Explore CockroachDB Cloud <svg width="6" height="11" viewBox="0 0 6 11" fill="none" xmlns="http://www.w3.org/2000/svg">
               <path d="M1 0.664551L5 5.24403L1 9.82351" stroke="#6933FF"/>
               </svg>
           </a>

_includes/sidebar-data-cockroachcloud.json

@@ -1,5 +1,5 @@
 {
-  "title": "CockroachCloud",
+  "title": "CockroachDB Cloud",
   "is_top_level": true,
   "urls": [
     "/cockroachcloud/index.html"
@@ -15,16 +15,16 @@
       	  ]
       	},
       	{
-      	  "title": "Create a CockroachCloud Cluster",
+      	  "title": "Create a CockroachDB Cloud Cluster",
       	  "urls": [
-      	    "/cockroachcloud/create-a-free-cluster.html",
+      	    "/cockroachcloud/create-a-serverless-cluster.html",
             "/cockroachcloud/create-your-cluster.html"
       	  ]
       	},
         {
       	  "title": "Connect to Your Cluster",
       	  "urls": [
-      	    "/cockroachcloud/connect-to-a-free-cluster.html",
+      	    "/cockroachcloud/connect-to-a-serverless-cluster.html",
             "/cockroachcloud/connect-to-your-cluster.html"
       	  ]
       	},
@@ -45,6 +45,13 @@
     {
       "title": "Use Your Cluster",
       "items": [
+        {
+          "title": "Manage Your Cluster",
+          "urls": [
+            "/cockroachcloud/serverless-cluster-management.html",
+            "/cockroachcloud/cluster-management.html"
+          ]
+        },
       	{
       	  "title": "Secure Your Cluster",
       	  "items": [
@@ -90,11 +97,11 @@
       	      ]
       	    },
             {
-      	      "title": "Migrate from a Free to Paid Cluster",
-      	      "urls": [
-      		      "/cockroachcloud/migrate-from-free-to-dedicated.html"
-      	      ]
-      	    },
+              "title": "Migrate from Serverless to Dedicated",
+              "urls": [
+                "/cockroachcloud/migrate-from-serverless-to-dedicated.html"
+              ]
+            },
             {
       	      "title": "Migrate from Oracle",
       	      "urls": [
@@ -133,12 +140,23 @@
             }
       	  ]
       	},
-      	{
-      	  "title": "Tune Performance",
-      	  "urls": [
-      	    "/{{site.versions["stable"]}}/performance-best-practices-overview.html"
-      	  ]
-      	},
+        {
+          "title": "Perfomance",
+          "items": [
+          	{
+          	  "title": "Tune Performance",
+          	  "urls": [
+          	    "/{{site.versions["stable"]}}/performance-best-practices-overview.html"
+          	  ]
+          	},
+            {
+              "title": "Serverless Performance Benchmarking",
+              "urls": [
+                "/cockroachcloud/serverless-benchmarking.html"
+              ]
+            }
+          ]
+        },   
       	{
       	  "title": "Move into Production",
       	  "urls": [
@@ -186,12 +204,6 @@
       	    "/cockroachcloud/troubleshooting-page.html"
       	  ]
       	},
-      	{
-      	  "title": "Manage Your Cluster",
-      	  "urls": [
-      	    "/cockroachcloud/cluster-management.html"
-      	  ]
-      	},
         {
           "title": "Run Bulk Operations",
           "urls": [
@@ -241,11 +253,23 @@
 	       "/cockroachcloud/console-access-management.html"
       ]
     },
+    {
+      "title": "Manage Billing",
+      "urls": [
+         "/cockroachcloud/billing-management.html"
+      ]
+    },
+    {
+      "title": "Architecture",
+      "urls": [
+         "/cockroachcloud/architecture.html"
+      ]
+    },
     {
       "title": "Tutorials",
       "items": [
       	{
-      	  "title": "Deploy a Python To-Do App with Flask, Kubernetes, and CockroachCloud",
+      	  "title": "Deploy a Python To-Do App with Flask, Kubernetes, and CockroachDB Cloud",
       	  "urls": [
       	    "/cockroachcloud/deploy-a-python-to-do-app-with-flask-kubernetes-and-cockroachcloud.html"
       	  ]
@@ -261,7 +285,7 @@
     {
       "title": "FAQs",
       "urls": [
-        "/cockroachcloud/free-faqs.html",
+        "/cockroachcloud/serverless-faqs.html",
         "/cockroachcloud/frequently-asked-questions.html"
       ]
     },

_includes/v19.1/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, create a table with geo-partitioning and a computed column:
 

_includes/v19.2/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, create a table with geo-partitioning and a computed column:
 

_includes/v2.0/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, let's create a table with geo-partitioning and a computed column:
 

_includes/v2.1/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, create a table with geo-partitioning and a computed column:
 

_includes/v20.1/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, create a table with geo-partitioning and a computed column:
 

_includes/v20.2/computed-columns/partitioning.md

@@ -1,4 +1,4 @@
-{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">{{ site.data.products.enterprise }} Licensing</a>.{{site.data.alerts.end}}
+{{site.data.alerts.callout_info}}Partioning is an enterprise feature. To request and enable a trial or full enterprise license, see <a href="enterprise-licensing.html">Enterprise Licensing</a>.{{site.data.alerts.end}}
 
 In this example, create a table with geo-partitioning and a computed column:
 

_includes/v21.1/known-limitations/cdc.md

@@ -9,4 +9,4 @@
 - When an [`IMPORT INTO`](import-into.html) statement is run, changefeed jobs targeting that table will fail.
 - Using a [cloud storage sink](create-changefeed.html#cloud-storage-sink) only works with `JSON` and emits [newline-delimited json](http://ndjson.org) files.
 - Currently, [changefeeds](stream-data-out-of-cockroachdb-using-changefeeds.html) connected to [Kafka versions < v1.0](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) are not supported in CockroachDB v21.1.
-- {{ site.data.products.enterprise }} changefeeds are currently disabled for [{{ site.data.products.serverless }} clusters](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart). Core changefeeds are enabled.    
+- Enterprise changefeeds are currently disabled for [{{ site.data.products.serverless }} clusters](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart). Core changefeeds are enabled.    

_includes/v21.2/known-limitations/cdc.md

@@ -9,4 +9,4 @@
 - When an [`IMPORT INTO`](import-into.html) statement is run, changefeed jobs targeting that table will fail.
 - Using a [cloud storage sink](create-changefeed.html#cloud-storage-sink) only works with `JSON` and emits [newline-delimited json](http://ndjson.org) files.
 - Currently, [changefeeds](stream-data-out-of-cockroachdb-using-changefeeds.html) connected to [Kafka versions < v1.0](https://docs.confluent.io/platform/current/installation/versions-interoperability.html) are not supported.
-- {{ site.data.products.enterprise }} changefeeds are currently disabled for [{{ site.data.products.serverless }} clusters](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart). Core changefeeds are enabled.    
+- Enterprise changefeeds are currently disabled for [{{ site.data.products.serverless }} clusters](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart). Core changefeeds are enabled.    

_layouts/homepage.html

@@ -50,9 +50,9 @@ <h4 class="mt-auto mb-0  text-electric-purple font-poppins-sb">Learn more <img c
 
     <div class="row pt-5 mt-5 pb-5 mb-5">
       <div class="col-lg-8">
-        <p class="overline">CockroachCloud</p>
+        <p class="overline">CockroachDB Cloud</p>
         <h2 class="mt-0">Build fast. Scale fast.</h2>
-        <p class="sub-heading">CockroachCloud is a fully hosted and fully managed service created and owned by Cockroach Labs that makes deploying, scaling, and managing CockroachDB effortless.</p>
+        <p class="sub-heading">CockroachDB Cloud is a fully hosted and fully managed service created and owned by Cockroach Labs that makes deploying, scaling, and managing CockroachDB effortless.</p>
         <a class="btn btn-redirect mt-3" href="https://cockroachlabs.cloud/signup?referralId=docs_homepage">Start a Free Cluster <img class="m-0" src="{{ 'images/arrow-left.svg' | relative_url }}" alt="arro left" /></a>
       </div>
     </div>
@@ -93,7 +93,7 @@ <h3 class="mt-3">Develop</h3>
         <h3 class="mt-3">Deploy</h3>
         <div class="landing-column-content">
           <ul>
-            <li><a href="{{ '/cockroachcloud/create-your-cluster.html' | relative_url }}">CockroachCloud Deployment</a></li>
+            <li><a href="{{ '/cockroachcloud/create-your-cluster.html' | relative_url }}">CockroachDB Cloud Deployment</a></li>
             <li><a href="{{ '/stable/orchestration.html' | relative_url }}">Self-Managed Deployment</a></li>
             <li><a href="{{ '/stable/recommended-production-settings.html' | relative_url }}">Production Checklist</a></li>
             <li><a href="{{ '/stable/performance.html' | relative_url }}">Performance Profiles</a></li>
@@ -106,7 +106,7 @@ <h3 class="mt-3">FAQs</h3>
         <div class="landing-column-content">
           <ul>
             <li><a href="{{ '/stable/frequently-asked-questions.html' | relative_url }}">CockroachDB FAQs</a></li>
-            <li><a href="{{ '/cockroachcloud/frequently-asked-questions.html' | relative_url }}">CockroachCloud FAQs</a></li>
+            <li><a href="{{ '/cockroachcloud/frequently-asked-questions.html' | relative_url }}">CockroachDB Cloud FAQs</a></li>
             <li><a href="{{ '/stable/sql-faqs.html' | relative_url }}">SQL FAQs</a></li>
             <li><a href="{{ '/stable/licensing-faqs.html' | relative_url }}">Licensing FAQs</a></li>
             <li><a href="{{ '/stable/cockroachdb-in-comparison.html' | relative_url }}">DB Comparisons</a></li>