Merge branch 'main' into psc-pl-ga

src/current/netlify/build.sh

@@ -54,9 +54,9 @@ fi
 
 # Run Algolia if building main
 if [ "$CONTEXT" == "production" ]; then
-	echo "Temporarily skipping the Algolia index build"
-	#	echo "Building Algolia index..."
-	#	ALGOLIA_API_KEY=${PROD_ALGOLIA_API_KEY} bundle exec jekyll algolia --config _config_base.yml,_config_url.yml --builds-config _config_cockroachdb.yml
+	#echo "Temporarily skipping the Algolia index build"
+	echo "Building Algolia index..."
+	ALGOLIA_API_KEY=${PROD_ALGOLIA_API_KEY} bundle exec jekyll algolia --config _config_base.yml,_config_url.yml --builds-config _config_cockroachdb.yml
 else
   echo "Not building Algolia index for context $CONTEXT"
 fi

src/current/releases/index.md

@@ -601,4 +601,4 @@ All binaries available on this page released on or after the day 24.3.0 is relea
 
 All binaries available on this page released prior to the release date of 24.3.0 are variously licensed under the Business Source License 1.1 (BSL), the CockroachDB Community License (CCL), and other licenses specified in the source code.
 
-To review the CCL, refer to the [CockroachDB Community License](https://www.cockroachlabs.com/cockroachdb-community-license) page. You can find the applicable Business Source License or third party licenses by reviewing these in the `licenses` folder for the applicable version of CockroachDB in the GitHub repository [cockroachdb/cockroach](https://github.com/cockroachdb/cockroach). See individual files for details.
+To review the CCL, refer to the [CockroachDB Community License](https://www.cockroachlabs.com/cockroachdb-community-license) page. You can find the applicable Business Source License or third party licenses by reviewing these in the `licenses` folder for the applicable version of CockroachDB in the GitHub repository [cockroachdb/cockroach](https://github.com/cockroachdb/cockroach). See individual files for details. 

src/current/v23.2/migrate-from-avro.md

@@ -163,7 +163,7 @@ There are additional import [options][option] you can use when importing binary
 - `records_terminated_by`, which specifies the unicode character used to indicate new lines in the input binary or JSON file (default: `\n`).
 
 {{site.data.alerts.callout_info}}
-The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/ccl/importccl/testdata/avro).
+The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/sql/importer/testdata/avro).
 {{site.data.alerts.end}}
 
 For example, to import the data from `simple-schema.json` into a `simple` table, first [create the table]({% link {{ page.version.version }}/create-table.md %}) to import into. Then run `IMPORT INTO` with the following options:

src/current/v24.1/migrate-from-avro.md

@@ -161,7 +161,7 @@ There are additional import [options][option] you can use when importing binary
 - `records_terminated_by`, which specifies the unicode character used to indicate new lines in the input binary or JSON file (default: `\n`).
 
 {{site.data.alerts.callout_info}}
-The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/ccl/importccl/testdata/avro).
+The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/sql/importer/testdata/avro).
 {{site.data.alerts.end}}
 
 For example, to import the data from `simple-schema.json` into a `simple` table, first [create the table]({% link {{ page.version.version }}/create-table.md %}) to import into. Then run `IMPORT INTO` with the following options:

src/current/v24.2/migrate-from-avro.md

@@ -161,7 +161,7 @@ There are additional import [options][option] you can use when importing binary
 - `records_terminated_by`, which specifies the unicode character used to indicate new lines in the input binary or JSON file (default: `\n`).
 
 {{site.data.alerts.callout_info}}
-The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/ccl/importccl/testdata/avro).
+The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/sql/importer/testdata/avro).
 {{site.data.alerts.end}}
 
 For example, to import the data from `simple-schema.json` into a `simple` table, first [create the table]({% link {{ page.version.version }}/create-table.md %}) to import into. Then run `IMPORT INTO` with the following options:

src/current/v24.3/migrate-from-avro.md

@@ -161,7 +161,7 @@ There are additional import [options][option] you can use when importing binary
 - `records_terminated_by`, which specifies the unicode character used to indicate new lines in the input binary or JSON file (default: `\n`).
 
 {{site.data.alerts.callout_info}}
-The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/ccl/importccl/testdata/avro).
+The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/sql/importer/testdata/avro).
 {{site.data.alerts.end}}
 
 For example, to import the data from `simple-schema.json` into a `simple` table, first [create the table]({% link {{ page.version.version }}/create-table.md %}) to import into. Then run `IMPORT INTO` with the following options:

src/current/v25.1/migrate-from-avro.md

@@ -161,7 +161,7 @@ There are additional import [options][option] you can use when importing binary
 - `records_terminated_by`, which specifies the unicode character used to indicate new lines in the input binary or JSON file (default: `\n`).
 
 {{site.data.alerts.callout_info}}
-The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/ccl/importccl/testdata/avro).
+The following example uses sample data generated by [Avro tools](https://github.com/cockroachdb/cockroach/tree/master/pkg/sql/importer/testdata/avro).
 {{site.data.alerts.end}}
 
 For example, to import the data from `simple-schema.json` into a `simple` table, first [create the table]({% link {{ page.version.version }}/create-table.md %}) to import into. Then run `IMPORT INTO` with the following options: