Merge branch 'main' into DOC-8247-Update-Deployment-Options

StyleGuide.md

@@ -64,6 +64,11 @@ Included in this guide:
     - [Italics](#italics)
     - [Underline](#underline)
   - [Links](#links)
+    - [Link capitalization](#link-capitalization)
+    - [Links to CockroachDB docs pages in the same folder](#links-to-cockroachdb-docs-pages-in-the-same-folder)
+    - [Links to CockroachDB docs pages outside of the current folder](#links-to-cockroachdb-docs-pages-outside-of-the-current-folder)
+    - [Links to a specific location on a page that is not a heading](#links-to-a-specific-location-on-a-page-that-is-not-a-heading)
+    - [Localized external links](#localized-external-links)
     - [GitHub issues and pull requests](#github-issues-and-pull-requests)
   - [Tips, notes, and warnings](#tips-notes-and-warnings)
     - [Tips](#tips)
@@ -535,52 +540,80 @@ Do not use underlined text in CockroachDB docs. If it seems beneficial to emphas
 
 Whenever a CockroachDB feature is referenced, provide a link to the relevant documentation. You can also provide links to external resources, but only if the resource is confirmed to be accurate by a technical reviewer or the author is a Cockroach Labs SME and no CockroachDB documentation covers the topic.
 
+Links are marked with inline text surrounded by square brackets followed by the link address in parentheses.
+
 Avoid using non-descriptive link names such as `here`, `this page`, or `go`.
 
-Use Markdown reference-style links when several parts of the same page refer to the same target URL (e.g., [Release Notes](releases/v22.1.html)).
+Use Markdown reference-style links when several parts of the same page refer to the same target URL. Reference-style links contain two sets of square brackets. The first set of brackets contains the link text that will appear on the final rendered page. The second set of brackets contains the reference name.
 
-For websites that automatically localize pages, avoid using localization elements directly within the URL. For example:
+**Example:**
 
-- GitHub
-  - Instead of `https://docs.github.com/**en/**graphql/overview/explorer`
-  - Use `https://docs.github.com/graphql/overview/explorer`
-- Wikipedia
-  - Instead of `https://en.wikipedia.org/wiki/SQL:2011`
-  - Use `https://www.wikipedia.org/wiki/SQL:2011` or `https://wikipedia.org/wiki/SQL:2011`
+```
+This text has a [link to a page][docs].
+...
+This text has a [link as well][docs].
+...
+[docs]: https://www.cockroachlabs.com/docs
+```
+
+#### Link capitalization
 
 Link capitalization should match our [capitalization rules](#capitalization-rules) for page titles and headers:
 
 - **Use title case** when referring to the linked doc by its page title (e.g., "See __Best Practices__ for more information").
 - **Use sentence case** when referring to the linked doc by one of its headers (e.g., "See __Clock synchronization__ for further guidance").
 - **Use sentence case** - when referring to a linked doc without explicitly citing a page title or header (e.g., "[…] follow the __identifier rules__ when creating […]").
 
-Links are marked with inline text surrounded by square brackets followed by the link address in parentheses. If you are including a relative (i.e., internal) link:
+#### Links to CockroachDB docs pages in the same folder
 
-- To link to another page in the docs, use just the name of the file.
+To link to a page within the same folder (e.g., a page in `v23.1` to another page in `v23.1`), use the [Jekyll link syntax](https://jekyllrb.com/docs/liquid/tags/#links).
 
-    **Example:** `[here](name-of-article.html)`
+If the page is a versioned doc, use `{{ page.version.version }}` instead of the hardcoded version. Otherwise, use the regular path (e.g., `cockroachcloud`).
 
-- To link to a specific heading on another page, use the name of the file plus the heading.
+**Example:** `[Foreign Key Constraint]({% link {{ page.version.version }}/foreign-key.md %})`
 
-    **Example:** `[xyz](name-of-article.html#heading-on-page)`
+**Example:** `[Foreign Key Constraint]({% link cockroachcloud/quickstart.md %})`
 
-- To link to a specific heading on the current page, use just the heading.
+To include a subsection, place it outside of the Liquid tag.
 
-    **Example:** `[xyz](#heading-on-page)`
+**Example:** `[Rules for creating foreign keys]({% link {{ page.version.version }}/foreign-key.md %}#rules-for-creating-foreign-keys)`
 
-- To link to a specific location on a page that is not a heading (e.g., a specific command-line flag in a table), add a manual anchor and use the `name` parameter:
+This also applies to files within a subfolder of the same folder (e.g., a link from `v23.1/abc.md` to `v23.1/architecture/xyz.md` or from `v23.1/architecture/xyz.md` to `v23.1/abc.md`).
 
-    **Example:**
+**Example:** `[Multi-active availability]({% link {{ page.version.version }}/architecture/glossary.md %}#multi-active-availability)`
 
-    ```
-    # Anchor:
-    <a name="flags-max-offset"></a>`--max-offset`
-    ```
+#### Links to CockroachDB docs pages outside of the current folder
 
-    ```
-    # Link:
-    [--max-offset](#flags-max-offset)
-    ```
+To link to a page outside of the current folder (e.g., a link from `v23.1` to `cockroachcloud`), use the fully qualified production URL:
+
+**Example:** `[Quickstart with CockroachDB](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart)`
+
+#### Links to a specific location on a page that is not a heading
+
+To link to a specific location on a page that is not a heading (e.g., a specific command-line flag in a table), add a manual anchor and use the `name` parameter:
+
+**Example:**
+
+```
+# Anchor:
+<a id="flags-max-offset"></a>`--max-offset`
+```
+
+```
+# Link:
+[--max-offset](#flags-max-offset)
+```
+
+#### Localized external links
+
+For websites that automatically localize pages, avoid using localization elements directly within the URL. For example:
+
+- GitHub
+  - Instead of `https://docs.github.com/**en/**graphql/overview/explorer`
+  - Use `https://docs.github.com/graphql/overview/explorer`
+- Wikipedia
+  - Instead of `https://en.wikipedia.org/wiki/SQL:2011`
+  - Use `https://www.wikipedia.org/wiki/SQL:2011` or `https://wikipedia.org/wiki/SQL:2011`
 
 #### GitHub issues and pull requests
 

src/current/.htmltest.yml

@@ -22,7 +22,6 @@ IgnoreURLs:
   - "https://docs.github.com/*"
   - "https://movr.cloud"
   - "https://support.cockroachlabs.com/*"
-  - "https://www.cockroachlabs.com/*"
   - "https://www.php.net/*"
   - "https://crates.io/*"
   - "https://docs.pipenv.org/*"

src/current/_config_base.yml

@@ -145,19 +145,19 @@ release_info:
     start_time: 2023-06-01 14:44:42.739193 +0000 UTC
     version: v22.1.21
   v22.2:
-    build_time: 2023-07-24 00:00:00 (go1.19)
+    build_time: 2023-08-09 00:00:00 (go1.19)
     crdb_branch_name: release-22.2
     docker_image: cockroachdb/cockroach
-    name: v22.2.12
-    start_time: 2023-07-19 13:53:46.640049 +0000 UTC
-    version: v22.2.12
+    name: v22.2.13
+    start_time: 2023-08-07 09:12:27.510172 +0000 UTC
+    version: v22.2.13
   v23.1:
-    build_time: 2023-07-24 00:00:00 (go1.19)
+    build_time: 2023-08-08 00:00:00 (go1.19)
     crdb_branch_name: release-23.1
     docker_image: cockroachdb/cockroach
-    name: v23.1.6
-    start_time: 2023-07-24 17:28:15.362753 +0000 UTC
-    version: v23.1.6
+    name: v23.1.8
+    start_time: 2023-08-02 18:09:24.963700 +0000 UTC
+    version: v23.1.8
 sass:
   quiet_deps: 'true'
   sass_dir: css

src/current/_config_cockroachdb.yml

@@ -1,8 +1,8 @@
 baseurl: /docs
-current_cloud_date: '2023-07-06'
+current_cloud_date: '2023-08-03'
 current_cloud_version: v23.1
-current_dedicated_hotfix: v23.1.5
-current_serverless_hotfix: v23.1.3
+current_dedicated_hotfix: v23.1.6
+current_serverless_hotfix: v23.1.6
 destination: _site/docs
 homepage_title: CockroachDB Docs
 versions:

src/current/_data/cloud_releases.csv

@@ -55,3 +55,6 @@ date,sha
 2023-07-21,null
 2023-07-24,null
 2023-07-26,null
+2023-07-31,null
+2023-08-01,null
+2023-08-09,null

src/current/_data/redirects.yml

@@ -81,11 +81,10 @@
 
 - destination: migration-overview.md
   sources: 
-    - migrate-from-mysql.md
     - migrate-from-oracle.md
     - migrate-from-postgres.md
   temporary: true
-  versions: ['v21.2', 'v22.1', 'v22.2']
+  versions: ['v21.2', 'v22.1', 'v22.2', 'v23.1']
 
 # Renamed pages
 

src/current/_data/releases.yml

@@ -4567,3 +4567,66 @@
     docker_arm: true
   source: true
   previous_release: v23.1.5
+
+- release_name: v23.1.7
+  major_version: v23.1
+  release_date: '2023-07-31'
+  release_type: Production
+  go_version: go1.19
+  sha: c7c48dc26aec31a84ebcbe33df885350a90ac77b
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+  windows: true
+  linux:
+    linux_arm: true
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+  source: true
+  previous_release: v23.1.6
+
+- release_name: v23.1.8
+  major_version: v23.1
+  release_date: '2023-08-07'
+  release_type: Production
+  go_version: go1.19
+  sha: 2c1d4afd2c2de091a00a4dba4392ceeaf8504a95
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+  windows: true
+  linux:
+    linux_arm: true
+    linux_intel_fips: true
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+  source: true
+  previous_release: v23.1.7
+
+- release_name: v22.2.13
+  major_version: v22.2
+  release_date: '2023-08-08'
+  release_type: Production
+  go_version: go1.19
+  sha: c9cdbe4417ec387382cf6c0edafee51b3d58e278
+  has_sql_only: true
+  has_sha256sum: true
+  mac:
+    mac_arm: true
+  windows: true
+  linux:
+    linux_arm: true
+    linux_intel_fips: false
+    linux_arm_fips: false
+  docker:
+    docker_image: cockroachdb/cockroach
+    docker_arm: true
+  source: true
+  previous_release: v22.2.12

src/current/_includes/cockroachcloud/app/before-you-begin.md

@@ -1,5 +1,5 @@
-1. [Install CockroachDB](../{{site.current_cloud_version}}/install-cockroachdb.html).
-1. Start up a [secure](../{{site.current_cloud_version}}/secure-a-cluster.html) or [insecure](../{{site.current_cloud_version}}/start-a-local-cluster.html) local cluster.
+1. [Install CockroachDB](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/install-cockroachdb).
+1. Start up a [secure](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/secure-a-cluster) or [insecure](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/start-a-local-cluster) local cluster.
 1. Choose the instructions that correspond to whether your cluster is secure or insecure:
 
 <div class="filters filters-big clearfix">

src/current/_includes/cockroachcloud/app/see-also-links.md

@@ -1,8 +1,8 @@
 You might also be interested in the following pages:
 
-- [Client Connection Parameters](../{{site.current_cloud_version}}/connection-parameters.html)
-- [Data Replication](../{{site.current_cloud_version}}/demo-data-replication.html)
-- [Fault Tolerance & Recovery](../{{site.current_cloud_version}}/demo-fault-tolerance-and-recovery.html)
-- [Automatic Rebalancing](../{{site.current_cloud_version}}/demo-automatic-rebalancing.html)
-- [Cross-Cloud Migration](../{{site.current_cloud_version}}/demo-automatic-cloud-migration.html)
-- [Automated Operations](../{{site.current_cloud_version}}/orchestrate-a-local-cluster-with-kubernetes-insecure.html)
+- [Client Connection Parameters](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/connection-parameters)
+- [Data Replication](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/demo-data-replication)
+- [Fault Tolerance & Recovery](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/demo-fault-tolerance-and-recovery)
+- [Automatic Rebalancing](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/demo-automatic-rebalancing)
+- [Cross-Cloud Migration](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/demo-automatic-cloud-migration)
+- [Automated Operations](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/orchestrate-a-local-cluster-with-kubernetes-insecure)

src/current/_includes/cockroachcloud/backup-examples.md

@@ -1,6 +1,6 @@
 #### Back up a cluster
 
-To take a [full backup](../{{site.current_cloud_version}}/take-full-and-incremental-backups.html#full-backups) of a cluster:
+To take a [full backup](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/take-full-and-incremental-backups#full-backups) of a cluster:
 
 {% include_cached copy-clipboard.html %}
 ~~~ sql
@@ -11,7 +11,7 @@ AS OF SYSTEM TIME '-10s';
 
 #### Back up a database
 
-To take a [full backup](../{{site.current_cloud_version}}/take-full-and-incremental-backups.html#full-backups) of a single database:
+To take a [full backup](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/take-full-and-incremental-backups#full-backups) of a single database:
 
 {% include_cached copy-clipboard.html %}
 ~~~ sql
@@ -20,7 +20,7 @@ INTO 's3://{BUCKET NAME}/{PATH}?AWS_ACCESS_KEY_ID={KEY ID}&AWS_SECRET_ACCESS_KEY
 AS OF SYSTEM TIME '-10s';
 ~~~
 
-To take a [full backup](../{{site.current_cloud_version}}/take-full-and-incremental-backups.html#full-backups) of multiple databases:
+To take a [full backup](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/take-full-and-incremental-backups#full-backups) of multiple databases:
 
 {% include_cached copy-clipboard.html %}
 ~~~ sql
@@ -31,7 +31,7 @@ AS OF SYSTEM TIME '-10s';
 
 #### Back up a table or view
 
-To take a [full backup](../{{site.current_cloud_version}}/take-full-and-incremental-backups.html#full-backups) of a single table or view:
+To take a [full backup](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/take-full-and-incremental-backups#full-backups) of a single table or view:
 
 {% include_cached copy-clipboard.html %}
 ~~~ sql
@@ -40,4 +40,4 @@ INTO 's3://{BUCKET NAME}/{PATH}?AWS_ACCESS_KEY_ID={KEY ID}&AWS_SECRET_ACCESS_KEY
 AS OF SYSTEM TIME '-10s';
 ~~~
 
-To resolve database or table naming conflicts during a restore, see [Troubleshooting naming conflicts](use-managed-service-backups.html#troubleshooting).
+To resolve database or table naming conflicts during a restore, see [Troubleshooting naming conflicts]({% link cockroachcloud/use-managed-service-backups.md %}#troubleshooting).

src/current/_includes/cockroachcloud/backup-types.md

@@ -1,4 +1,4 @@
 CockroachDB supports two types of backups:
 
-- **Managed-service backups**: Cockroach Labs takes automated backups of {{ site.data.products.serverless }} and {{ site.data.products.dedicated }} clusters that are stored in Cockroach Labs' cloud storage. {% if page.name != "use-managed-service-backups.md" %} See [Use Managed-Service Backups](../cockroachcloud/use-managed-service-backups.html) to learn more about the type and frequency of backups supported for both {{ site.data.products.db }} clusters. {% else %}  {% endif %}
-- {% if page.name == "take-and-restore-customer-owned-backups.md" %} **Customer-owned backups**: {% else %} **[Customer-owned backups](../cockroachcloud/take-and-restore-customer-owned-backups.html)**: {% endif %} You can take manual backups and store them in your [cloud storage buckets](../{{site.versions["stable"]}}/use-cloud-storage.html) using the [`BACKUP`](../{{site.versions["stable"]}}/backup.html) statement. Customer-owned backups are supported in {{ site.data.products.serverless }}, {{ site.data.products.dedicated }}, and {{ site.data.products.core }}.
+- **Managed-service backups**: Cockroach Labs takes automated backups of {{ site.data.products.serverless }} and {{ site.data.products.dedicated }} clusters that are stored in Cockroach Labs' cloud storage. {% if page.name != "use-managed-service-backups.md" %} See [Use Managed-Service Backups]({% link cockroachcloud/use-managed-service-backups.md %}) to learn more about the type and frequency of backups supported for both {{ site.data.products.db }} clusters. {% else %}  {% endif %}
+- {% if page.name == "take-and-restore-customer-owned-backups.md" %} **Customer-owned backups**: {% else %} **[Customer-owned backups]({% link cockroachcloud/take-and-restore-customer-owned-backups.md %})**: {% endif %} You can take manual backups and store them in your [cloud storage buckets](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/use-cloud-storage) using the [`BACKUP`](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/backup) statement. Customer-owned backups are supported in {{ site.data.products.serverless }}, {{ site.data.products.dedicated }}, and {{ site.data.products.core }}.