Merge branch 'master' into DOC-2827-serverless-movr

Author: Nick Vigilante

.github/workflows/changed_files.yml

@@ -44,8 +44,8 @@ jobs:
               major_version=${path[0]}
             fi
             file_name=${path[-1]}
-            mainRefs=($(grep -irl ${file_name} ${major_version} | sed -e 's/^\.\///g'))
-            includeRefs=($(grep -irl ${file_name} _includes/${major_version} | sed -e 's/^\.\///g'))
+            mainRefs=($(grep -irl /${file_name} ${major_version} | sed -e 's/^\.\///g'))
+            includeRefs=($(grep -irl /${file_name} _includes/${major_version} | sed -e 's/^\.\///g'))
             if [[ ${#mainRefs[@]} > 0 ]]
             then
               for ref in ${mainRefs[@]}; do

.htmltest.yml

@@ -3,16 +3,24 @@ ExternalTimeout: 30
 IgnoreDirs:
   - ^docs/stable
   - ^docs/dev
+  - ^docs/v1.0
+  - ^docs/v1.1
   - ^docs/v1.2
+  - ^docs/v2.0
+  - ^docs/v2.1
+  - ^docs/advisories
 IgnoreURLs:
-  - "http://localhost*"
+  - "http://localhost:*"
   - "https://github.com.*"
   - "https://movr.cloud"
   - "https://support.cockroachlabs.com/*"
   - "https://www.php.net/*"
   - "https://crates.io/*"
   - "https://docs.pipenv.org/*"
   - "https://arxiv.org/*"
+  - "https://fonts.googleapis.com/*"
+  - "https://fonts.gstatic.com/*"
+  - "https://typeorm.io/*"
 IgnoreInternalEmptyHash: true
 TestFilesConcurrently: true
 DocumentConcurrencyLimit: 16

Makefile

@@ -62,17 +62,22 @@ no-remote-cache: bootstrap
 .PHONY: profile
 profile: bootstrap
 	bundle exec jekyll $(jekyll-action) --incremental --profile --trace --config _config_base.yml,_config_cockroachdb.yml$(extra-config) $(JEKYLLFLAGS)
+	
 
 .PHONY: test
 test:
-	go get -u github.com/cockroachdb/htmltest
 	# Docker must be running locally for this to work.
 	./netlify/local
 	htmltest
 
+.PHONY: linkcheck
+linkcheck: cockroachdb-build
+	htmltest -s
+
 vendor:
 	gem install bundler
 	bundle install
+	go install github.com/wjdp/htmltest@master
 
 bootstrap: Gemfile | vendor
 	touch $@

StyleGuide.md

@@ -182,6 +182,7 @@ Avoid using socially-charged terms for features and technical concepts.
 - Use periods at the end of list items if they are sentences or complete a sentence.
 - Use the [Oxford (a.k.a. serial) comma](https://en.wikipedia.org/wiki/Serial_comma).
 - Avoid using slashes `/` and ampersands `&` as conjunctions in place of **or** and **and** respectively, unless space is very limited (e.g., in a table).
+- Avoid using _and/or_ unless space is very limited (e.g., in a table). Instead, decide whether **and** or **or** can stand alone or make use of **both** when the inclusivity must be explicit, e.g., **x or y or both**.
 
 For more detail about how to format text, see [Components](#components).
 
@@ -204,6 +205,13 @@ Each version's pages are found in a directory named for the version. For example
 
 Each version's images are stored in a versioned directory under the `images` directory. For example, images for CockroachDB v21.1 are in the `docs > images > v21.1` directory. For more information, see [Images](#images).
 
+### File naming
+
+File names should match the page title. If you need to change a file name, it is necessary to do the following:
+
+- Add the previous page URL with the new URL to `_redirects`.
+- Replace all links to the previous file name with the new file name in the applicable docs versions.
+
 ## Content types
 
 There are four fundamental content types:

_config_base.yml

@@ -85,16 +85,16 @@ release_info:
     start_time: 2022-05-10 14:15:58.748869 +0000 UTC
     version: v21.1.19
   v21.2:
-    build_time: 2022-05-23 00:00:00 (go1.16)
+    build_time: 2022-06-06 00:00:00 (go1.16)
     docker_image: cockroachdb/cockroach
-    name: v21.2.11
-    start_time: 2022-05-18 11:39:58.956639 +0000 UTC
-    version: v21.2.11
+    name: v21.2.12
+    start_time: 2022-06-02 14:27:35.870357 +0000 UTC
+    version: v21.2.12
   v22.1:
-    build_time: 2022-05-24 00:00:00 (go1.17)
+    build_time: 2022-06-22 00:00:00 (go1.17)
     docker_image: cockroachdb/cockroach
-    name: v22.1.0
-    start_time: 2022-05-24 11:14:49.970328 +0000 UTC
-    version: v22.1.0
+    name: v22.1.2
+    start_time: 2022-06-16 08:22:03.011199 +0000 UTC
+    version: v22.1.2
 site_title: CockroachDB Docs
 url: https://www.cockroachlabs.com

_data/releases.csv

@@ -279,3 +279,6 @@ v22.1.0-rc.1,v22.1,2022-05-09,false,False,Testing,False,go1.17,5b78463ed2e7106a8
 v21.1.19,v21.1,2022-05-09,false,False,Production,False,go1.15,bf2bef135b5be9c73ccc445f2d996781ee59e94f,cockroachdb/cockroach,false
 v21.2.11,v21.2,2022-05-23,false,False,Production,False,go1.16,b05bab30da2ff789dc232da4fac771c01a72a87f,cockroachdb/cockroach,false
 v22.1.0,v22.1,2022-05-24,false,False,Production,False,go1.17,5b78463ed2e7106a8477b63fa837564ad02bb510,cockroachdb/cockroach,true
+v22.1.1,v22.1,2022-06-06,false,False,Production,False,go1.17,242d13b1191e31a25a36ed9cd7abc5f5b24cb510,cockroachdb/cockroach,true
+v21.2.12,v21.2,2022-06-06,false,False,Production,False,go1.16,4f97a101e6c1ba12f1ff133d69beee4333b7216e,cockroachdb/cockroach,false
+v22.1.2,v22.1,2022-06-22,false,False,Production,False,go1.17,fc456a26830067b6dfbb8cd87e093a28d9b833d1,cockroachdb/cockroach,true

_data/versions.csv

@@ -9,4 +9,4 @@ v20.1,2020-05-12,2021-05-12,2021-11-12,v19.2
 v20.2,2020-11-10,2021-11-10,2022-05-10,v20.1
 v21.1,2021-05-18,2022-05-18,2022-11-18,v20.2
 v21.2,2021-11-16,2022-11-16,2023-05-16,v21.1
-v22.1,2022-05-24,2023-05-24,2022-11-24,v21.2
+v22.1,2022-05-24,2023-05-24,2023-11-24,v21.2

_includes/releases/v21.1/v21.1.0.md

@@ -113,7 +113,7 @@ For information about new and unresolved limitations in CockroachDB v21.1, with
 Area | Topic | Description
 -----|-------|------------
 Cockroach University | **New Intro Courses** | [Introduction to Distributed SQL and CockroachDB](https://university.cockroachlabs.com/courses/course-v1:crl+intro-to-distributed-sql-and-cockroachdb+self-paced/about) teaches you the core concepts behind distributed SQL databases and describes how CockroachDB fits into this landscape. [Practical First Steps with CockroachDB](https://university.cockroachlabs.com/courses/course-v1:crl+practical-first-steps-with-crdb+self-paced/about) is a hands-on sequel that gives you the tools to get started with CockroachDB.
-Cockroach University | **New Java Course** | [Fundamentals of CockroachDB for Java Developers](https://university.cockroachlabs.com/courses/course-v1:crl+fundamentals-of-crdb-for-java-devs+self-paced/about) walks you through building a full-stack vehicle-sharing app in Java using the popular Spring Data JPA framework with Spring Boot and a <a href="https://cockroachlabs.cloud/signup?referralId=docs_crdb_release_notes" rel="noopener" target="_blank">CockroachCloud Free</a> cluster as the backend.
+Cockroach University | **New Java Course** | [Fundamentals of CockroachDB for Java Developers](https://university.cockroachlabs.com/courses/course-v1:crl+fundamentals-of-crdb-for-java-devs+self-paced/about) guides you through building a full-stack vehicle-sharing app in Java using the popular Spring Data JPA framework with Spring Boot and a <a href="https://cockroachlabs.cloud/signup?referralId=docs_crdb_release_notes" rel="noopener" target="_blank">CockroachCloud Free</a> cluster as the backend.
 Cockroach University | **New Query Performance Course** | [CockroachDB Query Performance for Developers](https://university.cockroachlabs.com/courses/course-v1:crl+cockroachdb-query-performance-for-devs+self-paced/about) teaches you key CockroachDB features and skills to improve application performance and functionality, such as analyzing a query execution plan, using indexes to avoid expensive full table scans, improving sorting performance, and efficiently querying fields in JSON records.
 Docs | **Quickstart** | Documented the simplest way to [get started with CockroachDB](../cockroachcloud/quickstart.html) for testing and app development by using <a href="https://cockroachlabs.cloud/signup?referralId=docs_crdb_release_notes" rel="noopener" target="_blank">CockroachCloud Free</a>.
 Docs | **Developer Guidance** | Published more comprehensive, task-oriented [guidance for developers](../v21.1/developer-guide-overview.html) building applications on CockroachDB, including connecting to a cluster, designing a database schema, reading and writing data, optimizing query performance, and debugging applications.

_includes/releases/v21.2/v21.2.0.md

@@ -113,7 +113,7 @@ Area                 | Topic                     | Description
 ---------------------+---------------------------+------------
 Cockroach University | **New Serverless course** | [Introduction to Serverless Databases and {{ site.data.products.serverless }}](https://university.cockroachlabs.com/courses/course-v1:crl+intro-to-serverless+self-paced/about) teaches you the core concepts behind serverless databases and gives you the tools you need to get started with {{ site.data.products.serverless }}.
 Cockroach University | **New Schema Design Course** | [Foundations of Schema Design in CockroachDB](https://university.cockroachlabs.com/courses/course-v1:crl+foundations-schema-design-cockroachdb+self-paced/about) teaches you CockroachDB's rich data types and the best practices and anti-patterns to consider when designing schema for CockroachDB.
-Cockroach University | **New Node.js Course** | [Fundamentals of CockroachDB for Node.js Developers](https://university.cockroachlabs.com/courses/course-v1:crl+fundamentals-of-crdb-for-nodejs-devs+self-paced/about) walks you through building a full-stack vehicle-sharing app in Typescript using Node.js with TypeORM and a <a href="https://cockroachlabs.cloud/signup?referralId=docs_crdb_release_notes" rel="noopener" target="_blank">CockroachCloud Free</a> cluster as the backend.
+Cockroach University | **New Node.js Course** | [Fundamentals of CockroachDB for Node.js Developers](https://university.cockroachlabs.com/courses/course-v1:crl+fundamentals-of-crdb-for-nodejs-devs+self-paced/about) guides you through building a full-stack vehicle-sharing app in Typescript using Node.js with TypeORM and a <a href="https://cockroachlabs.cloud/signup?referralId=docs_crdb_release_notes" rel="noopener" target="_blank">CockroachCloud Free</a> cluster as the backend.
 Docs                 | **CockroachDB Cloud Guidance** | Added Node.js, Go, Python, and Java sample app code and connection guidance to the [{{ site.data.products.serverless }} Quickstart](../cockroachcloud/quickstart.html), as well as docs explaining the [{{ site.data.products.serverless }} Architecture](../cockroachcloud/architecture.html), important concepts for [planning/managing a Serverless cluster](../cockroachcloud/plan-your-cluster.html) (e.g., request units, cluster scaling), and how to run [bulk operations on {{ site.data.products.dedicated }} and {{ site.data.products.serverless }} clusters](../cockroachcloud/run-bulk-operations.html).
 Docs                 | **Multi-Region Guidance** | Added docs on [transitioning to the new multi-region SQL abstractions](../v21.2/migrate-to-multiregion-sql.html) from the legacy zone-configuration-based workflows, and on [data domiciling in multi-region clusters](../v21.2/data-domiciling.html).
 Docs                 | **Performance Tuning Recipes** | Added [solutions for common performance issues](../v21.2/performance-recipes.html).

_includes/releases/v21.2/v21.2.12.md

@@ -0,0 +1,16 @@
+## v21.2.12
+
+Release Date: June 6, 2022
+
+{% include releases/release-downloads-docker-image.md release=include.release %}
+
+<h3 id="v21-2-12-miscellaneous">Miscellaneous</h3>
+
+* Fixed an internal logging bug that affected the stability of the server. [#4f97a101e][#4f97a101e]
+
+<h3 id="v21-2-12-contributors">Contributors</h3>
+
+This release includes 2 commits by 2 authors.
+
+[#4d7c8f356]: https://github.com/cockroachdb/cockroach/commit/4d7c8f356
+[#4f97a101e]: https://github.com/cockroachdb/cockroach/commit/4f97a101e

_includes/releases/v22.1/v22.1.0-alpha.5.md

@@ -18,7 +18,7 @@ Release Date: March 28, 2022
 - Added support for the `MOVE` command, which moves a SQL cursor without fetching any rows from it. `MOVE` is identical to [`FETCH`](../v22.1/limit-offset.html), including in its arguments and syntax, except it doesn't return any rows. [#74877][#74877]
 - Added the `enable_implicit_transaction_for_batch_statements` [session variable](../v22.1/set-vars.html). It defaults to false. When true, multiple statements in a single query (a "batch statement") will all run in the same implicit transaction, which matches the PostgreSQL wire protocol. This setting is provided for users who want to preserve the behavior of CockroachDB versions v21.2 and lower. [#77865][#77865]
 - The `enable_implicit_transaction_for_batch_statements` session variable now defaults to false. [#77973][#77973]
-- The `experimental_enable_hash_sharded_indexes` session variable is deprecated as hash-sharded indexes are enabled by default. Enabling this setting results in a noop. [#78038][#78038]
+- The `experimental_enable_hash_sharded_indexes` session variable is deprecated as hash-sharded indexes are enabled by default. Enabling this setting results in a no-op. [#78038][#78038]
 - New `crdb_internal.merge_stats_metadata` [built-in function](../v22.1/functions-and-operators.html#built-in-functions) to group statement statistics metadata. [#78064][#78064]
 - [Changefeeds](../v22.1/use-changefeeds.html) can now specify column families to target, using the syntax `[TABLE] foo FAMILY bar`. For example, `CREATE CHANGEFEED FOR TABLE foo FAMILY bar, TABLE foo FAMILY baz, TABLE users` will create a feed that watches the `bar` and `baz` column families of `foo`, as well as the whole table `users`. A family must exist with that name when the feed is created. If all columns in a watched family are dropped in an `ALTER TABLE` statement, the feed will fail with an error, similar to dropping a table. The behavior is otherwise similar to feeds created using `split_column_families`. [#77964][#77964]
 - [Casts](../v22.1/data-types.html#data-type-conversions-and-casts) that are affected by the `DateStyle` or `IntervalStyle` session variables used in [computed columns](../v22.1/computed-columns.html) or [partial index](../v22.1/partial-indexes.html) definitions will be rewritten to use immutable functions after upgrading to v22.1. [#78229][#78229]

_includes/releases/v22.1/v22.1.0.md

@@ -126,7 +126,7 @@ Before [upgrading to CockroachDB v22.1](../v22.1/upgrade-cockroach-version.html)
 
 - Using the [`cockroach node drain`](../v22.1/cockroach-node.html) command without specifying a node ID is deprecated. [#73991][#73991]
 - The flag `--self` of the [`cockroach node decommission` command](../v22.1/cockroach-node.html) is deprecated. Instead, operators should specify the node ID of the target node as an explicit argument. The node that the command is connected to should not be a target node. [#74319][#74319]
-- The `experimental_enable_hash_sharded_indexes` session variable is deprecated as hash-sharded indexes are enabled by default. Enabling this setting results in a noop. [#78038][#78038]
+- The `experimental_enable_hash_sharded_indexes` session variable is deprecated as hash-sharded indexes are enabled by default. Enabling this setting results in a no-op. [#78038][#78038]
 - The [`BACKUP TO`](../v22.1/) syntax to take backups is deprecated, and will be removed in a future release. Create a backup collection using the `BACKUP INTO` syntax. [#78250][#78250]
 - Users can no longer define the subdirectory of their full backup. This deprecated syntax can be enabled by changing the new `bulkio.backup.deprecated_full_backup_with_subdir` [cluster setting](../v22.1/cluster-settings.html) to `true`. [#80145][#80145]
 - `SHOW BACKUP` without the `IN` keyword to specify a subdirectory is deprecated and will be removed from a future release. Users are recommended to only create collection based backups and view them with `SHOW BACKUP FROM <backup> IN <collection>`. [#79116][#79116]