Merge branch 'main' into v25.2.0-alpha.2-release-notes

Author: taroface

src/current/_includes/v23.1/backups/schedule-options.md

@@ -1,7 +1,7 @@
  Option                     | Value                                   | Description
 ----------------------------+-----------------------------------------+------------------------------
 `first_run`                 | [`TIMESTAMPTZ`]({% link {{ page.version.version }}/timestamp.md %}) / `now` | Execute the schedule at the specified time in the future. If not specified, the default behavior is to execute the schedule based on its next `RECURRING` time.
-`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul><br>**Default**: `reschedule`
-<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul><br>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
+`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul>**Default**: `reschedule`
+<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
 `ignore_existing_backups`   | N/A                                     | If backups were already created in the [destination]({% link {{ page.version.version }}/use-cloud-storage.md %}) that the new schedule references, this option must be passed to acknowledge that the new schedule may be backing up different objects.
 `updates_cluster_last_backup_time_metric` | N/A | ([`admin` privileges]({% link {{ page.version.version }}/security-reference/authorization.md %}#admin-role) required) When set during backup schedule creation, this option updates the [`schedules_backup_last_completed_time`]({% link {{ page.version.version }}/backup-and-restore-monitoring.md %}#available-metrics) metric for the scheduled backup.

src/current/_includes/v23.1/sql/shell-options.md

@@ -13,7 +13,7 @@ Client Options | Description
 <a name="sql-option-echo"></a> `echo` | Reveal the SQL statements sent implicitly by the SQL shell.<br><br>**Default:** `false`<br><br>To enable this option, run `\set echo`. [See an example]({% link {{ page.version.version }}/cockroach-sql.md %}#reveal-the-sql-statements-sent-implicitly-by-the-command-line-utility).
 <a name="sql-option-errexit"></a> `errexit` | Exit the SQL shell upon encountering an error.<br /><br />**Default:** `false` for [interactive sessions]({% link {{ page.version.version }}/cockroach-sql.md %}#session-and-output-types); `true` otherwise<br><br>To enable this option, run `\set errexit`.
 <a name="sql-option-prompt1"></a> `prompt1` | Customize the interactive prompt within the SQL shell. See [Customizing the prompt](#customizing-the-prompt) for information on the available prompt variables.
-<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul><br>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
+<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
 
 #### Customizing the prompt
 

src/current/_includes/v23.2/backups/schedule-options.md

@@ -1,7 +1,7 @@
  Option                     | Value                                   | Description
 ----------------------------+-----------------------------------------+------------------------------
 `first_run`                 | [`TIMESTAMPTZ`]({% link {{ page.version.version }}/timestamp.md %}) / `now` | Execute the schedule at the specified time in the future. If not specified, the default behavior is to execute the schedule based on its next `RECURRING` time.
-`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul><br>**Default**: `reschedule`
-<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul><br>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
+`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul>**Default**: `reschedule`
+<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
 `ignore_existing_backups`   | N/A                                     | If backups were already created in the [destination]({% link {{ page.version.version }}/use-cloud-storage.md %}) that the new schedule references, this option must be passed to acknowledge that the new schedule may be backing up different objects.
 `updates_cluster_last_backup_time_metric` | N/A | ([`admin` privileges]({% link {{ page.version.version }}/security-reference/authorization.md %}#admin-role) required) When set during backup schedule creation, this option updates the [`schedules_backup_last_completed_time`]({% link {{ page.version.version }}/backup-and-restore-monitoring.md %}#available-metrics) metric for the scheduled backup.

src/current/_includes/v23.2/sql/shell-options.md

@@ -13,7 +13,7 @@ Client Options | Description
 <a name="sql-option-echo"></a> `echo` | Reveal the SQL statements sent implicitly by the SQL shell.<br><br>**Default:** `false`<br><br>To enable this option, run `\set echo`. [See an example]({% link {{ page.version.version }}/cockroach-sql.md %}#reveal-the-sql-statements-sent-implicitly-by-the-command-line-utility).
 <a name="sql-option-errexit"></a> `errexit` | Exit the SQL shell upon encountering an error.<br /><br />**Default:** `false` for [interactive sessions]({% link {{ page.version.version }}/cockroach-sql.md %}#session-and-output-types); `true` otherwise<br><br>To enable this option, run `\set errexit`.
 <a name="sql-option-prompt1"></a> `prompt1` | Customize the interactive prompt within the SQL shell. See [Customizing the prompt](#customizing-the-prompt) for information on the available prompt variables.
-<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul><br>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
+<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
 
 #### Customizing the prompt
 

src/current/_includes/v24.1/backups/schedule-options.md

@@ -1,7 +1,7 @@
  Option                     | Value                                   | Description
 ----------------------------+-----------------------------------------+------------------------------
 `first_run`                 | [`TIMESTAMPTZ`]({% link {{ page.version.version }}/timestamp.md %}) / `now` | Execute the schedule at the specified time in the future. If not specified, the default behavior is to execute the schedule based on its next `RECURRING` time.
-`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul><br>**Default**: `reschedule`
-<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul><br>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
+`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul>**Default**: `reschedule`
+<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
 `ignore_existing_backups`   | N/A                                     | If backups were already created in the [destination]({% link {{ page.version.version }}/use-cloud-storage.md %}) that the new schedule references, this option must be passed to acknowledge that the new schedule may be backing up different objects.
 `updates_cluster_last_backup_time_metric` | N/A | ([`admin` privileges]({% link {{ page.version.version }}/security-reference/authorization.md %}#admin-role) required) When set during backup schedule creation, this option updates the [`schedules_backup_last_completed_time`]({% link {{ page.version.version }}/backup-and-restore-monitoring.md %}#available-metrics) metric for the scheduled backup.

src/current/_includes/v24.1/sql/shell-options.md

@@ -13,7 +13,7 @@ Client Options | Description
 <a name="sql-option-echo"></a> `echo` | Reveal the SQL statements sent implicitly by the SQL shell.<br><br>**Default:** `false`<br><br>To enable this option, run `\set echo`. [See an example]({% link {{ page.version.version }}/cockroach-sql.md %}#reveal-the-sql-statements-sent-implicitly-by-the-command-line-utility).
 <a name="sql-option-errexit"></a> `errexit` | Exit the SQL shell upon encountering an error.<br /><br />**Default:** `false` for [interactive sessions]({% link {{ page.version.version }}/cockroach-sql.md %}#session-and-output-types); `true` otherwise<br><br>To enable this option, run `\set errexit`.
 <a name="sql-option-prompt1"></a> `prompt1` | Customize the interactive prompt within the SQL shell. See [Customizing the prompt](#customizing-the-prompt) for information on the available prompt variables.
-<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul><br>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
+<a name="sql-option-show-times"></a> `show_times` | Reveal the time a query takes to complete. Possible values:<br><ul><li>`execution` time refers to the time taken by the SQL execution engine to execute the query.</li><li>`network` time refers to the network latency between the server and the SQL client command.</li><li>`other` time refers to all other forms of latency affecting the total query completion time, including query planning.</li></ul>**Default:** `true`<br><br>To disable this option, run `\unset show_times`.
 
 #### Customizing the prompt
 

src/current/_includes/v24.2/backups/schedule-options.md

@@ -1,7 +1,7 @@
  Option                     | Value                                   | Description
 ----------------------------+-----------------------------------------+------------------------------
 `first_run`                 | [`TIMESTAMPTZ`]({% link {{ page.version.version }}/timestamp.md %}) / `now` | Execute the schedule at the specified time in the future. If not specified, the default behavior is to execute the schedule based on its next `RECURRING` time.
-`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul><br>**Default**: `reschedule`
-<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul><br>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
+`on_execution_failure`      | `retry` / `reschedule` / `pause`        | If an error occurs during the backup execution, do the following: <ul><li>`retry`: Retry the backup right away.</li><li>`reschedule`: Retry the backup by rescheduling it based on the `RECURRING` expression.</li><li>`pause`: Pause the schedule. This requires manual intervention to [resume the schedule]({% link {{ page.version.version }}/resume-schedules.md %}).</li></ul>**Default**: `reschedule`
+<a name="on-previous-running-option"></a>`on_previous_running`       | `start` / `skip` / `wait`               | If the previous backup started by the schedule is still running, do the following: <ul><li>`start`: Start the new backup anyway, even if the previous one is still running.</li><li>`skip`: Skip the new backup and run the next backup based on the `RECURRING` expression.</li><li>`wait`: Wait for the previous backup to complete.</li></ul>**Default**: `wait`. The option affects backups started by the full backup schedule only. Incremental backups are always set to `wait`. 
 `ignore_existing_backups`   | N/A                                     | If backups were already created in the [destination]({% link {{ page.version.version }}/use-cloud-storage.md %}) that the new schedule references, this option must be passed to acknowledge that the new schedule may be backing up different objects.
 `updates_cluster_last_backup_time_metric` | N/A | ([`admin` privileges]({% link {{ page.version.version }}/security-reference/authorization.md %}#admin-role) required) When set during backup schedule creation, this option updates the [`schedules_backup_last_completed_time`]({% link {{ page.version.version }}/backup-and-restore-monitoring.md %}#available-metrics) metric for the scheduled backup.