Merge pull request #33934 from github/repo-sync

Repo sync

content/code-security/codeql-cli/codeql-cli-manual/database-bundle.md

@@ -47,24 +47,30 @@ that results, logs, TRAP, or similar should be included.
 
 \[Mandatory] The output file, typically with the extension ".zip".
 
-#### `--include-diagnostics`
+#### `--[no-]include-diagnostics`
 
 Include diagnostics in the bundle.
 
 Available since `v2.16.0`.
 
-#### `--include-results`
+#### `--[no-]include-results`
 
 Include any precomputed query results in the bundle.
 
-#### `--include-temp`
+#### `--[no-]include-logs`
+
+Include the logs directory in the bundle.
+
+Available since `v2.17.6`.
+
+#### `--[no-]include-temp`
 
 Includes the "temp" directory, where any generated packs, queries, and
 suites are located.
 
 Available since `v2.13.3`.
 
-#### `--include-uncompressed-source`
+#### `--[no-]include-uncompressed-source`
 
 Include an uncompressed version of the source archive directory. This is
 necessary for legacy CodeQL plugins (like CodeQL for Eclipse).

content/code-security/codeql-cli/codeql-cli-manual/database-create.md

@@ -54,8 +54,15 @@ Maven project would not be a suitable choice.
 #### `--[no-]overwrite`
 
 \[Advanced] If the database already exists, delete it and proceed with
-this command instead of failing. This option should be used with caution
-as it may recursively delete the entire database directory.
+this command instead of failing. If the directory exists, but it does
+not look like a database, an error will be thrown.
+
+#### `--[no-]force-overwrite`
+
+\[Advanced] If the database already exists, delete it even if it does
+not look like a database and proceed with this command instead of
+failing. This option should be used with caution as it may recursively
+delete the entire database directory.
 
 #### `--codescanning-config=<file>`
 

content/code-security/codeql-cli/codeql-cli-manual/database-init.md

@@ -67,8 +67,15 @@ referred to by their relative path from this directory.
 #### `--[no-]overwrite`
 
 \[Advanced] If the database already exists, delete it and proceed with
-this command instead of failing. This option should be used with caution
-as it may recursively delete the entire database directory.
+this command instead of failing. If the directory exists, but it does
+not look like a database, an error will be thrown.
+
+#### `--[no-]force-overwrite`
+
+\[Advanced] If the database already exists, delete it even if it does
+not look like a database and proceed with this command instead of
+failing. This option should be used with caution as it may recursively
+delete the entire database directory.
 
 #### `--codescanning-config=<file>`