Fix 404 and fix files names. (#1032)

* Fix 404 and fix files names.

* Fix link err in ydb-cli/export-import/

* Fix links to export-import.

* Fix link in /en/maintenance/backup_and_recovery.md

* Add new pages to TOC.

* Add federated query to concepts TOC.

* rename no_translation to no-translation.

* Rebase on main.

* Add redirect from export_import/* to export-import/*.

* Add redirects.

57 files changed, 132 insertions, 56 deletions

diff --git a/ydb/docs/en/core/_includes/alerts/no-translation.md b/ydb/docs/en/core/_includes/alerts/no-translation.md
new file mode 100644
index 00000000000..257d7072572
--- /dev/null
+++ b/ydb/docs/en/core/_includes/alerts/no-translation.md
@@ -0,0 +1,5 @@
+{% note info %}
+
+This а article is currently in development and will soon be available on the website. 
+
+{% endnote %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/changelog-cli.md b/ydb/docs/en/core/changelog-cli.md
index 25521ca8788..39b71d53a8c 100644
--- a/ydb/docs/en/core/changelog-cli.md
+++ b/ydb/docs/en/core/changelog-cli.md
@@ -10,9 +10,9 @@ Released on January 12, 2024. To update to version **2.8.0**, select the [Downlo
 
 * Added configuration management commands for the cluster `ydb admin config` and `ydb admin volatile-config`.
 
-* Added support for loading PostgreSQL-compatible data types by [ydb import file csv|tsv|json](reference/ydb-cli/export_import/import-file.md) command. Only for row-oriented tables.
+* Added support for loading PostgreSQL-compatible data types by [ydb import file csv|tsv|json](reference/ydb-cli/export-import/import-file.md) command. Only for row-oriented tables.
 
-* Added support for directory load from an S3-compatible storage in the [ydb import s3](reference/ydb-cli/export_import/s3_import.md) command. Currently only available on Linux and Mac OS.
+* Added support for directory load from an S3-compatible storage in the [ydb import s3](reference/ydb-cli/export-import/import-s3.md) command. Currently only available on Linux and Mac OS.
 
 * Added support for outputting the results of [ydb table query execute](reference/ydb-cli/table-query-execute.md), [ydb yql](reference/ydb-cli/yql.md) and [ydb scripting yql](reference/ydb-cli/scripting-yql.md) commands in the [Apache Parquet](https://parquet.apache.org/docs/) format.
 
@@ -90,17 +90,17 @@ Released on September 7, 2023. To update to version **2.6.0**, select the [Downl
 
 **Bug fixes:**
 
-* Fixed string loss when loading with the [ydb import file json](reference/ydb-cli/export_import/import-file.md) command.
+* Fixed string loss when loading with the [ydb import file json](reference/ydb-cli/export-import/import-file.md) command.
 
 * Fixed ignored statistics during the warm-up of commands [ydb workload topic run write|read|full](reference/ydb-cli/workload-topic.md#run-write).
 
 * Fixed incomplete statistics output in the [ydb scripting yql](reference/ydb-cli/scripting-yql.md) and [ydb yql](reference/ydb-cli/yql.md) commands.
 
-* Fixed incorrect output of progress bar in [ydb tools dump](reference/ydb-cli/export_import/tools_dump.md) and [ydb tools restore](reference/ydb-cli/export_import/tools_restore.md) commands.
+* Fixed incorrect output of progress bar in [ydb tools dump](reference/ydb-cli/export-import/tools-dump.md) and [ydb tools restore](reference/ydb-cli/export-import/tools-restore.md) commands.
 
-* Fixed loading large files with the header in the [ydb import file csv|tsv](reference/ydb-cli/export_import/import-file.md) command.
+* Fixed loading large files with the header in the [ydb import file csv|tsv](reference/ydb-cli/export-import/import-file.md) command.
 
-* Fixed hanging of the [ydb tools restore --import-data](reference/ydb-cli/export_import/tools_restore.md#optional) command.
+* Fixed hanging of the [ydb tools restore --import-data](reference/ydb-cli/export-import/tools-restore.md#optional) command.
 
 * Fixed error `Unknown value Rejected` when executing the [ydb operation list build index](reference/ydb-cli/operation-list.md) command.
 
@@ -110,17 +110,17 @@ Released on June 20, 2023. To update to version **2.5.0**, select the [Downloads
 
 **Features:**
 
-* For the `ydb import file` command, a parameter [--timeout](reference/ydb-cli/export_import/import-file.md#optional) has been added that specifies the time within which the operation should be performed on the server.
-* Added a progress bar in commands [ydb scheme rmdir --recursive](reference/ydb-cli/commands/dir.md#rmdir) and [ydb import file](reference/ydb-cli/export_import/import-file.md).
+* For the `ydb import file` command, a parameter [--timeout](reference/ydb-cli/export-import/import-file.md#optional) has been added that specifies the time within which the operation should be performed on the server.
+* Added a progress bar in commands [ydb scheme rmdir --recursive](reference/ydb-cli/commands/dir.md#rmdir) and [ydb import file](reference/ydb-cli/export-import/import-file.md).
 * Added the command [ydb workload kv run read-rows](reference/ydb-cli/workload-kv.md#read-rows-kv), which loads the database with requests to read rows using a new experimental API call ReadRows (implemented only in the [main](https://github.com/ydb-platform/ydb) branch), which performs faster key reading than [select](reference/ydb-cli/workload-kv.md#select-kv).
 * New parameters `--warmup-time`, `--percentile`, `--topic` have been added to the [ydb workload topic](reference/ydb-cli/workload-topic.md), setting the test warm-up time, the percentile in the statistics output and the topic name, respectively.
 * Added the [ydb workload tpch](reference/ydb-cli/workload-tpch.md) command to run the TPC-H benchmark.
-* Added the `--ordered` flag in the command [ydb tools dump](reference/ydb-cli/export_import/tools_dump.md), which preserves the order by primary key in tables.
+* Added the `--ordered` flag in the command [ydb tools dump](reference/ydb-cli/export-import/tools-dump.md), which preserves the order by primary key in tables.
 
 **Performance:**
 
-* The data loading speed in the `ydb import file` command has been increased by adding parallel loading. The number of threads is set by the new parameter [--threads](reference/ydb-cli/export_import/import-file.md#optional).
-* A performance of the [ydb import file json](reference/ydb-cli/export_import/import-file.md) command has been increased by reducing the number of data copies.
+* The data loading speed in the `ydb import file` command has been increased by adding parallel loading. The number of threads is set by the new parameter [--threads](reference/ydb-cli/export-import/import-file.md#optional).
+* A performance of the [ydb import file json](reference/ydb-cli/export-import/import-file.md) command has been increased by reducing the number of data copies.
 
 ## Version 2.4.0 {#2-4-0}
 
@@ -128,7 +128,7 @@ Released on May 24, 2023. To update to version **2.4.0**, select the [Downloads]
 
 **Features:**
 
-* Added the ability to upload multiple files in parallel with the command [ydb import file](reference/ydb-cli/export_import/import-file.md#multiple-files).
+* Added the ability to upload multiple files in parallel with the command [ydb import file](reference/ydb-cli/export-import/import-file.md#multiple-files).
 * Added support for deleting column tables for the command [ydb scheme rmdir --recursive](reference/ydb-cli/commands/dir.md#rmdir).
 * Improved stability of the command [ydb workload topic](reference/ydb-cli/workload-topic.md).
 
@@ -144,8 +144,8 @@ Release date: May 1, 2023. To update to version **2.3.0**, select the [Downloads
 * Added the [--recursive](reference/ydb-cli/commands/dir.md#rmdir-options) option for the `ydb scheme rmdir` command. Use it to delete a directory recursively, with all its content.
 * Added support for the `topic` and `coordination node` types in the [ydb scheme describe](reference/ydb-cli/commands/scheme-describe.md) command.
 * Added the [--commit](reference/ydb-cli/topic-read.md#osnovnye-opcionalnye-parametry) option for the `ydb topic consumer` command. Use it to commit messages you have read.
-* Added the [--columns](reference/ydb-cli/export_import/import-file.md#optional) option for the `ydb import file csv|tsv` command. Use it as an alternative to the file header when specifying a column list.
-* Added the [--newline-delimited](reference/ydb-cli/export_import/import-file.md#optional) option for the `ydb import file csv|tsv` command. Use it to make sure that your data is newline-free. This option streamlines import by reading data from several file sections in parallel.
+* Added the [--columns](reference/ydb-cli/export-import/import-file.md#optional) option for the `ydb import file csv|tsv` command. Use it as an alternative to the file header when specifying a column list.
+* Added the [--newline-delimited](reference/ydb-cli/export-import/import-file.md#optional) option for the `ydb import file csv|tsv` command. Use it to make sure that your data is newline-free. This option streamlines import by reading data from several file sections in parallel.
 
 **Bug fixes:**
 
@@ -172,8 +172,8 @@ Release date: December 30, 2022. To update to version **2.1.1**, select the [Dow
 **Improvements:**
 
 * Added support for the `--stats` option of the [ydb scheme describe](reference/ydb-cli/commands/scheme-describe.md) command for column-oriented tables.
-* Added support for Parquet files to enable their import with the [ydb import](reference/ydb-cli/export_import/import-file.md) command.
-* Added support for additional logging and retries for the [ydb import](reference/ydb-cli/export_import/import-file.md) command.
+* Added support for Parquet files to enable their import with the [ydb import](reference/ydb-cli/export-import/import-file.md) command.
+* Added support for additional logging and retries for the [ydb import](reference/ydb-cli/export-import/import-file.md) command.
 
 ## Version 2.1.0 {#2-1-0}
 
@@ -186,7 +186,7 @@ Release date: November 18, 2022. To update to version **2.1.0**, select the [Dow
 * Added the `-1` option for the [ydb scheme ls](reference/ydb-cli/commands/scheme-ls.md) command to enable output of a single object per row.
 * You can now save the IAM service URL in a profile.
 * Added support for username and password-based authentication without specifying the password.
-* Added support for AWS profiles in the [ydb export s3](reference/ydb-cli/export_import/s3_conn.md#auth) command.
+* Added support for AWS profiles in the [ydb export s3](reference/ydb-cli/export-import/auth-s3.md#auth) command.
 * You can now create profiles using `stdin`. For example, you can pass the [YC CLI](https://cloud.yandex.ru/docs/cli/) `yc ydb database get information` command output to the `ydb config profile create` command input.
 
 **Bug fixes:**
@@ -230,5 +230,5 @@ Release date: June 25, 2022. To update to version **1.9.1**, select the [Downloa
 
 **Features:**
 
-* Added the ability to compress data when exporting it to S3-compatible storage (see the `--compression` option of the [ydb export s3](reference/ydb-cli/export_import/s3_export.md) command).
+* Added the ability to compress data when exporting it to S3-compatible storage (see the `--compression` option of the [ydb export s3](reference/ydb-cli/export-import/export-s3.md) command).
 * Added the ability to manage new {{ ydb-short-name }} CLI version availability auto checks (see the `--disable-checks` and `--enable-checks` options of the [ydb version](reference/ydb-cli/version.md) command).
diff --git a/ydb/docs/en/core/concepts/datamodel/external_data_source.md b/ydb/docs/en/core/concepts/datamodel/external_data_source.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/datamodel/external_data_source.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/datamodel/external_table.md b/ydb/docs/en/core/concepts/datamodel/external_table.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/datamodel/external_table.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/datamodel/secrets.md b/ydb/docs/en/core/concepts/datamodel/secrets.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/datamodel/secrets.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/datamodel/toc_i.yaml b/ydb/docs/en/core/concepts/datamodel/toc_i.yaml
index 0f42349ff3f..0fc511daf67 100644
--- a/ydb/docs/en/core/concepts/datamodel/toc_i.yaml
+++ b/ydb/docs/en/core/concepts/datamodel/toc_i.yaml
@@ -3,3 +3,6 @@ items:
 - { name: Directory,                                 href: dir.md }
 - { name: Table,                                     href: table.md }
 - { name: Topic,                                     href: ../topic.md }
+- { name: Secrets,                                   href: secrets.md }
+- { name: External tables,                           href: external_table.md }
+- { name: External data source,                      href: external_data_source.md }
diff --git a/ydb/docs/en/core/concepts/federated_query.md b/ydb/docs/en/core/concepts/federated_query.md
new file mode 100644
index 00000000000..3667a042788
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query.md
@@ -0,0 +1 @@
+{% include [no-translation](../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/clickhouse.md b/ydb/docs/en/core/concepts/federated_query/clickhouse.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/clickhouse.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/index.md b/ydb/docs/en/core/concepts/federated_query/index.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/index.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/postgresql.md b/ydb/docs/en/core/concepts/federated_query/postgresql.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/postgresql.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/external_data_source.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/external_table.md b/ydb/docs/en/core/concepts/federated_query/s3/external_table.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/external_table.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/formats.md b/ydb/docs/en/core/concepts/federated_query/s3/formats.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/formats.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/partition_projection.md b/ydb/docs/en/core/concepts/federated_query/s3/partition_projection.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/partition_projection.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/partitioning.md b/ydb/docs/en/core/concepts/federated_query/s3/partitioning.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/partitioning.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/toc_i.yaml b/ydb/docs/en/core/concepts/federated_query/s3/toc_i.yaml
new file mode 100644
index 00000000000..1765ecf92b6
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/toc_i.yaml
@@ -0,0 +1,8 @@
+items:
+- { name: Reading data through connections,             href: external_data_source.md }
+- { name: Reading data through external tables,         href: external_table.md }
+- { name: Upload data to S3 buckets,                    href: write_data.md }
+- { name: Data formats and compression algorithms,      href: formats.md }
+- { name: Data partitioning,                            href: partitioning.md }
+- { name: Advanced partitioning,                        href: partition_projection.md }
+
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/toc_p.yaml b/ydb/docs/en/core/concepts/federated_query/s3/toc_p.yaml
new file mode 100644
index 00000000000..5bfec4365de
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/toc_p.yaml
@@ -0,0 +1,2 @@
+items:
+- include: { mode: link, path: toc_i.yaml }
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/s3/write_data.md b/ydb/docs/en/core/concepts/federated_query/s3/write_data.md
new file mode 100644
index 00000000000..376e9dddd6c
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/s3/write_data.md
@@ -0,0 +1 @@
+{% include [no-translation](../../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/toc_i.yaml b/ydb/docs/en/core/concepts/federated_query/toc_i.yaml
new file mode 100644
index 00000000000..2031060ef36
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/toc_i.yaml
@@ -0,0 +1,6 @@
+items:
+- { name: Overview,        href: index.md }
+- { name: PostgreSQL,      href: postgresql.md }
+- { name: ClickHouse,      href: clickhouse.md }
+- name: S3
+  include: { path: s3/toc_i.yaml, mode: link }
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/federated_query/toc_p.yaml b/ydb/docs/en/core/concepts/federated_query/toc_p.yaml
new file mode 100644
index 00000000000..5bfec4365de
--- /dev/null
+++ b/ydb/docs/en/core/concepts/federated_query/toc_p.yaml
@@ -0,0 +1,2 @@
+items:
+- include: { mode: link, path: toc_i.yaml }
\ No newline at end of file
diff --git a/ydb/docs/en/core/concepts/toc_i.yaml b/ydb/docs/en/core/concepts/toc_i.yaml
index 7a85563e60c..00493dad118 100644
--- a/ydb/docs/en/core/concepts/toc_i.yaml
+++ b/ydb/docs/en/core/concepts/toc_i.yaml
@@ -22,3 +22,5 @@ items:
     href: cluster/common_scheme_ydb.md
   - name: Disk subsystem of a cluster
     href: cluster/distributed_storage.md
+- name: Federated query
+  include: { path: federated_query/toc_p.yaml, mode: link }
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/backup_and_recovery.md b/ydb/docs/en/core/maintenance/backup_and_recovery.md
index 6ff4ba85f03..ca7693f102e 100644
--- a/ydb/docs/en/core/maintenance/backup_and_recovery.md
+++ b/ydb/docs/en/core/maintenance/backup_and_recovery.md
@@ -13,15 +13,15 @@ Backups protect against data loss by letting you restore data.
 
 ### Files {#files}
 
-To back up data to a file, run the `ydb tools dump` command. To learn more about this command, follow the [link](../reference/ydb-cli/export_import/tools_dump.md) to the {{ ydb-short-name }} CLI reference.
+To back up data to a file, run the `ydb tools dump` command. To learn more about this command, follow the [link](../reference/ydb-cli/export-import/tools-dump.md) to the {{ ydb-short-name }} CLI reference.
 
-To restore data from a backup, run the `ydb tools restore` command. To learn more about this command, follow the [link](../reference/ydb-cli/export_import/tools_restore.md) to the {{ ydb-short-name }} CLI reference.
+To restore data from a backup, run the `ydb tools restore` command. To learn more about this command, follow the [link](../reference/ydb-cli/export-import/tools-restore.md) to the {{ ydb-short-name }} CLI reference.
 
 ### S3-compatible storage {#s3}
 
-To back up data to S3-compatible storage (such as [AWS S3](https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html)), run the `ydb export s3` command. To learn more about this command, follow the [link](../reference/ydb-cli/export_import/s3_export.md) to the {{ ydb-short-name }} CLI reference.
+To back up data to S3-compatible storage (such as [AWS S3](https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html)), run the `ydb export s3` command. To learn more about this command, follow the [link](../reference/ydb-cli/export-import/export-s3.md) to the {{ ydb-short-name }} CLI reference.
 
-To restore data from a backup created in S3-compatible storage, run the `ydb import s3` command. To learn more about this command, follow the [link](../reference/ydb-cli/export_import/s3_import.md) to the {{ ydb-short-name }} CLI reference.
+To restore data from a backup created in S3-compatible storage, run the `ydb import s3` command. To learn more about this command, follow the [link](../reference/ydb-cli/export-import/import-s3.md) to the {{ ydb-short-name }} CLI reference.
 
 {% include [_includes/backup_and_recovery/cli_overlay.md](_includes/backup_and_recovery/cli_overlay.md) %}
 
diff --git a/ydb/docs/en/core/maintenance/manual/config-overview.md b/ydb/docs/en/core/maintenance/manual/config-overview.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/maintenance/manual/config-overview.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/manual/dynamic-config-selectors.md b/ydb/docs/en/core/maintenance/manual/dynamic-config-selectors.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/maintenance/manual/dynamic-config-selectors.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/manual/dynamic-config-volatile-config.md b/ydb/docs/en/core/maintenance/manual/dynamic-config-volatile-config.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/maintenance/manual/dynamic-config-volatile-config.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/manual/dynamic-config.md b/ydb/docs/en/core/maintenance/manual/dynamic-config.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/maintenance/manual/dynamic-config.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/manual/replacing_nodes.md b/ydb/docs/en/core/maintenance/manual/replacing_nodes.md
new file mode 100644
index 00000000000..3f37eb7224d
--- /dev/null
+++ b/ydb/docs/en/core/maintenance/manual/replacing_nodes.md
@@ -0,0 +1 @@
+{% include [no-translation](../../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/maintenance/manual/toc_i.yaml b/ydb/docs/en/core/maintenance/manual/toc_i.yaml
index 2bfb8fc52b9..a0205a2c723 100644
--- a/ydb/docs/en/core/maintenance/manual/toc_i.yaml
+++ b/ydb/docs/en/core/maintenance/manual/toc_i.yaml
@@ -33,3 +33,13 @@ items:
   href: balancing_load.md
 - name: Freeing up space on physical devices
   href: disk_end_space.md
+- name: Replacing a node's FQDN
+  href: replacing_nodes.md
+- name: Config overview
+  href: config-overview.md
+- name: Dynamic cluster configuration
+  href: dynamic-config.md
+- name: Cluster configuration DSL    
+  href: dynamic-config-selectors.md
+- name: Temporary configurations
+  href: dynamic-config-volatile-config.md  
\ No newline at end of file
diff --git a/ydb/docs/en/core/operations/crud.md b/ydb/docs/en/core/operations/crud.md
index e69de29bb2d..3667a042788 100644
--- a/ydb/docs/en/core/operations/crud.md
+++ b/ydb/docs/en/core/operations/crud.md
@@ -0,0 +1 @@
+{% include [no-translation](../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/operations/query_plans_optimization.md b/ydb/docs/en/core/operations/query_plans_optimization.md
new file mode 100644
index 00000000000..3667a042788
--- /dev/null
+++ b/ydb/docs/en/core/operations/query_plans_optimization.md
@@ -0,0 +1 @@
+{% include [no-translation](../_includes/alerts/no-translation.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/operations/toc_i.yaml b/ydb/docs/en/core/operations/toc_i.yaml
index 11abf5fc12c..e030da13fea 100644
--- a/ydb/docs/en/core/operations/toc_i.yaml
+++ b/ydb/docs/en/core/operations/toc_i.yaml
@@ -3,4 +3,6 @@ items:
   href: crud.md
   hidden: true
 - name: Custom attributes in tables
-  href: manage-users-attr.md
\ No newline at end of file
+  href: manage-users-attr.md
+- name: Query plans optimization
+  href: query_plans_optimization.md
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md b/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
index 100f15c1993..be9bfb2dccf 100644
--- a/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
+++ b/ydb/docs/en/core/reference/ydb-cli/_includes/commands.md
@@ -31,10 +31,10 @@ Any command can be run from the command line with the `--help` option to get hel
 | [config profile set](../profile/activate.md) | Activating a [profile](../profile/index.md) |
 | [discovery list](../commands/discovery-list.md) | List of endpoints |
 | [discovery whoami](../commands/discovery-whoami.md) | Authentication |
-| [export s3](../export_import/s3_export.md) | Exporting data to S3 storage |
-| [import file csv](../export_import/import-file.md) | Importing data from a CSV file |
-| [import file tsv](../export_import/import-file.md) | Importing data from a TSV file |
-| [import s3](../export_import/s3_import.md) | Importing data from S3 storage |
+| [export s3](../export-import/export-s3.md) | Exporting data to S3 storage |
+| [import file csv](../export-import/import-file.md) | Importing data from a CSV file |
+| [import file tsv](../export-import/import-file.md) | Importing data from a TSV file |
+| [import s3](../export-import/import-s3.md) | Importing data from S3 storage |
 | [init](../profile/create.md) | Initializing the CLI, creating a [profile](../profile/index.md) |
 | [operation cancel](../operation-cancel.md) | Aborting long-running operations |
 | [operation forget](../operation-forget.md) | Deleting long-running operations from the list |
@@ -64,9 +64,9 @@ Any command can be run from the command line with the `--help` option to get hel
 | [table ttl set](../table-ttl-set.md) | Setting TTL parameters |
 | [table ttl reset](../table-ttl-reset.md) | Resetting TTL parameters |
 | [tools copy](../tools-copy.md) | Copying tables |
-| [tools dump](../export_import/tools_dump.md) | Dumping a directory or table to the file system |
+| [tools dump](../export-import/tools-dump.md) | Dumping a directory or table to the file system |
 | [tools rename](../commands/tools/rename.md) | Renaming tables |
-| [tools restore](../export_import/tools_restore.md) | Restoring data from the file system |
+| [tools restore](../export-import/tools-restore.md) | Restoring data from the file system |
 | [topic create](../topic-create.md) | Creating a topic |
 | [topic alter](../topic-alter.md) | Updating topic parameters and consumers |
 | [topic drop](../topic-drop.md) | Deleting a topic |
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/file_structure.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/file_structure.md
index 36ff17ec657..36ff17ec657 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/file_structure.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/file_structure.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/import-file.md
index 9765edd8c36..9765edd8c36 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/import-file.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/import-file.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/index.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/index.md
index 033653e80fa..0dc8633ff9d 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/index.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/index.md
@@ -2,15 +2,15 @@
 
 The YDB CLI contains a set of commands designed to export and import data and descriptions of data schema objects. Data can be exported to create backups for subsequent recovery and for other purposes.
 
-- [The export file structure](../file_structure.md) is used for exporting data both to the file system and S3-compatible object storage.
+- [The export file structure](../file-structure.md) is used for exporting data both to the file system and S3-compatible object storage.
 
-- [Exporting data to the file system using `tools dump`](../tools_dump.md)
+- [Exporting data to the file system using `tools dump`](../tools-dump.md)
 
-- [Importing data from the file system using `tools restore`](../tools_restore.md)
+- [Importing data from the file system using `tools restore`](../tools-restore.md)
 
-- [Connecting to and authenticating with S3-compatible object storage](../s3_conn.md)
+- [Connecting to and authenticating with S3-compatible object storage](../auth-s3.md)
 
-- [Exporting data to S3-compatible object storage using `export s3`](../s3_export.md)
+- [Exporting data to S3-compatible object storage using `export s3`](../export-s3.md)
 
-- [Importing data from S3-compatible object storage using `import s3`](../s3_import.md)
+- [Importing data from S3-compatible object storage using `import s3`](../import-s3.md)
 
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_conn.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_conn.md
index 97ddfcad732..97ddfcad732 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_conn.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_conn.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_conn_procure_overlay.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_conn_procure_overlay.md
index e69de29bb2d..e69de29bb2d 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_conn_procure_overlay.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_conn_procure_overlay.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_export.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_export.md
index 4b0e2fd790d..8d0ae93f75f 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_export.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_export.md
@@ -1,6 +1,6 @@
 # Exporting data to S3-compatible storage
 
-The `export s3` command starts exporting data and information on the server side about data schema objects to S3-compatible storage, in the format described under [File structure](../file_structure.md):
+The `export s3` command starts exporting data and information on the server side about data schema objects to S3-compatible storage, in the format described under [File structure](../file-structure.md):
 
 ```bash
 {{ ydb-cli }} [connection options] export s3 [options]
@@ -14,7 +14,7 @@ The `export s3` command starts exporting data and information on the server side
 
 ### S3 connection parameters {#s3-conn}
 
-To run the command to export data to S3 storage, specify the [S3 connection parameters](../s3_conn.md). Since data is exported by the YDB server asynchronously, the specified endpoint must be available to establish a connection on the server side.
+To run the command to export data to S3 storage, specify the [S3 connection parameters](../auth-s3.md). Since data is exported by the YDB server asynchronously, the specified endpoint must be available to establish a connection on the server side.
 
 ### List of exported items {#items}
 
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_import.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_import.md
index 9aba155be37..86aab464a61 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/s3_import.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/s3_import.md
@@ -1,6 +1,6 @@
 # Importing data from an S3 compatible storage
 
-The `import s3` command starts, on the server side, the process of importing data and schema object details from an S3-compatible storage, in the format described in the [File structure](../file_structure.md) section:
+The `import s3` command starts, on the server side, the process of importing data and schema object details from an S3-compatible storage, in the format described in the [File structure](../file-structure.md) section:
 
 ```bash
 {{ ydb-cli }} [connection options] import s3 [options]
@@ -8,9 +8,9 @@ The `import s3` command starts, on the server side, the process of importing dat
 
 {% include [conn_options_ref.md](../../commands/_includes/conn_options_ref.md) %}
 
-As opposed to the [`tools restore` command](../tools_restore.md), the `import s3` command always creates objects in entirety, so none of the imported objects (directories or tables) should already exist.
+As opposed to the [`tools restore` command](../tools-restore.md), the `import s3` command always creates objects in entirety, so none of the imported objects (directories or tables) should already exist.
 
-If you need to import some more data to your existing S3 tables (for example, using [S3cmd](https://s3tools.org/s3cmd)), you can copy the S3 contents to the file system and use the [`tools restore`](../tools_restore.md) command.
+If you need to import some more data to your existing S3 tables (for example, using [S3cmd](https://s3tools.org/s3cmd)), you can copy the S3 contents to the file system and use the [`tools restore`](../tools-restore.md) command.
 
 ## Command line parameters {#pars}
 
@@ -18,7 +18,7 @@ If you need to import some more data to your existing S3 tables (for example, us
 
 ### S3 connection parameters {#s3-conn}
 
-To run the command to import data from an S3 storage, specify the [S3 connection parameters](../s3_conn.md). As data is imported by the YDB server asynchronously, the specified endpoint must be available so that a connection can be established from the server side.
+To run the command to import data from an S3 storage, specify the [S3 connection parameters](../auth-s3.md). As data is imported by the YDB server asynchronously, the specified endpoint must be available so that a connection can be established from the server side.
 
 ### List of imported objects {#items}
 
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/tools_dump.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/tools_dump.md
index cffb5cf0af6..4b05cb23b76 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/tools_dump.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/tools_dump.md
@@ -1,6 +1,6 @@
 # Exporting data to the file system
 
-The `tools dump` command dumps the database data and objects schema to the client file system, in the format described in the [File system](../file_structure.md):
+The `tools dump` command dumps the database data and objects schema to the client file system, in the format described in the [File system](../file-structure.md):
 
 ```bash
 {{ ydb-cli }} [connection options] tools dump [options]
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/tools_restore.md b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/tools_restore.md
index 7955c5dc1b9..a0ec4cedc91 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/_includes/tools_restore.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/_includes/tools_restore.md
@@ -1,6 +1,6 @@
 # Importing data from the file system
 
-The `tools restore` command creates the items of the database schema in the database, and populates them with the data previously exported there with the `tools dump` command or prepared manually as per the rules from the [File structure](../file_structure.md) article:
+The `tools restore` command creates the items of the database schema in the database, and populates them with the data previously exported there with the `tools dump` command or prepared manually as per the rules from the [File structure](../file-structure.md) article:
 
 ```bash
 {{ ydb-cli }} [connection options] tools restore -p PATH -i PATH [options]
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_conn.md b/ydb/docs/en/core/reference/ydb-cli/export-import/auth-s3.md
index 3dcccf4c5f5..3dcccf4c5f5 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_conn.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/auth-s3.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export-import/export-s3.md b/ydb/docs/en/core/reference/ydb-cli/export-import/export-s3.md
new file mode 100644
index 00000000000..c7fdba6301e
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/export-s3.md
@@ -0,0 +1 @@
+{% include [s3_export](_includes/s3_export.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export-import/file-structure.md b/ydb/docs/en/core/reference/ydb-cli/export-import/file-structure.md
new file mode 100644
index 00000000000..b18e40ce9e3
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/file-structure.md
@@ -0,0 +1 @@
+{% include [file_structure](_includes/file_structure.md) %}
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md b/ydb/docs/en/core/reference/ydb-cli/export-import/import-file.md
index 49e7eb5a643..49e7eb5a643 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/import-file.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/import-file.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export-import/import-s3.md b/ydb/docs/en/core/reference/ydb-cli/export-import/import-s3.md
new file mode 100644
index 00000000000..7e4590fca4b
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/import-s3.md
@@ -0,0 +1 @@
+{% include [s3_import](_includes/s3_import.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/index.md b/ydb/docs/en/core/reference/ydb-cli/export-import/index.md
index b3cf50bcae9..12643df0737 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/index.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/index.md
@@ -1,2 +1 @@
-
 {% include [index.md](_includes/index.md) %}
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml b/ydb/docs/en/core/reference/ydb-cli/export-import/toc_i.yaml
index d12d1af46d2..ca79d0ebe95 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_i.yaml
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/toc_i.yaml
@@ -1,15 +1,15 @@
 items:
 - name: File structure of data export
-  href: file_structure.md
+  href: file-structure.md
 - name: Exporting data to the file system
-  href: tools_dump.md
+  href: tools-dump.md
 - name: Importing data from the file system
-  href: tools_restore.md
+  href: tools-restore.md
 - name: Connecting to and authenticating with S3
-  href: s3_conn.md
+  href: auth-s3.md
 - name: Exporting data to S3
-  href: s3_export.md
+  href: export-s3.md
 - name: Importing data from S3
-  href: s3_import.md
+  href: import-s3.md
 - name: Importing data from a file to an existing table
   href: import-file.md
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_p.yaml b/ydb/docs/en/core/reference/ydb-cli/export-import/toc_p.yaml
index 94ce1108684..94ce1108684 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/toc_p.yaml
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/toc_p.yaml
diff --git a/ydb/docs/en/core/reference/ydb-cli/export-import/tools-dump.md b/ydb/docs/en/core/reference/ydb-cli/export-import/tools-dump.md
new file mode 100644
index 00000000000..5b4541bab2b
--- /dev/null
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/tools-dump.md
@@ -0,0 +1 @@
+{% include [tools_dump](_includes/tools_dump.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/tools_restore.md b/ydb/docs/en/core/reference/ydb-cli/export-import/tools-restore.md
index 4856ba9b5b1..4856ba9b5b1 100644
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/tools_restore.md
+++ b/ydb/docs/en/core/reference/ydb-cli/export-import/tools-restore.md
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/file_structure.md b/ydb/docs/en/core/reference/ydb-cli/export_import/file_structure.md
deleted file mode 100644
index b3f76f809c0..00000000000
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/file_structure.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-{% include [file_structure.md](_includes/file_structure.md) %}
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_export.md b/ydb/docs/en/core/reference/ydb-cli/export_import/s3_export.md
deleted file mode 100644
index f8a7bae0aba..00000000000
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_export.md
+++ /dev/null
@@ -1 +0,0 @@
-{% include [s3_export.md](_includes/s3_export.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_import.md b/ydb/docs/en/core/reference/ydb-cli/export_import/s3_import.md
deleted file mode 100644
index b9b1861f64c..00000000000
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/s3_import.md
+++ /dev/null
@@ -1 +0,0 @@
-{% include [s3_import.md](_includes/s3_import.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/export_import/tools_dump.md b/ydb/docs/en/core/reference/ydb-cli/export_import/tools_dump.md
deleted file mode 100644
index ce24f8e2f50..00000000000
--- a/ydb/docs/en/core/reference/ydb-cli/export_import/tools_dump.md
+++ /dev/null
@@ -1 +0,0 @@
-{% include [tools_dump.md](_includes/tools_dump.md) %}
\ No newline at end of file
diff --git a/ydb/docs/en/core/reference/ydb-cli/toc_i.yaml b/ydb/docs/en/core/reference/ydb-cli/toc_i.yaml
index 0b974a0fe5d..bd642cf6660 100644
--- a/ydb/docs/en/core/reference/ydb-cli/toc_i.yaml
+++ b/ydb/docs/en/core/reference/ydb-cli/toc_i.yaml
@@ -44,7 +44,7 @@ items:
     - name: Scan queries
       href: commands/scan-query.md
   - name: Importing and exporting data
-    include: { mode: link, path: export_import/toc_p.yaml }
+    include: { mode: link, path: export-import/toc_p.yaml }
   - name: Working with topics
     items:
     - name: Commands for topics
diff --git a/ydb/docs/redirects.yaml b/ydb/docs/redirects.yaml
index 733eb4fa3b8..f8b50826749 100644
--- a/ydb/docs/redirects.yaml
+++ b/ydb/docs/redirects.yaml
@@ -26,6 +26,24 @@ common:
   - from: /getting_started/index.md
     to: /getting_started/quickstart.md
 
+# Redirect from export_import to export-import   
+  - from: /reference/ydb-cli/export_import/s3_conn.md
+    to: /reference/ydb-cli/export-import/auth-s3.md
+  - from: /reference/ydb-cli/export_import/s3_export.md
+    to: /reference/ydb-cli/export-import/export-s3.md    
+  - from: /reference/ydb-cli/export_import/file_structure.md
+    to: /reference/ydb-cli/export-import/file-structure.md     
+  - from: /reference/ydb-cli/export_import/import-file.md
+    to: /reference/ydb-cli/export-import/import-file.md      
+  - from: /reference/ydb-cli/export_import/s3_import.md
+    to: /reference/ydb-cli/export-import/import-s3.md   
+  - from: /reference/ydb-cli/export_import/index.md
+    to: /reference/ydb-cli/export-import/index.md   
+  - from: /reference/ydb-cli/export_import/tools_dump.md
+    to: /reference/ydb-cli/export-import/tools-dump.md   
+  - from: /reference/ydb-cli/export_import/tools_restore.md
+    to: /reference/ydb-cli/export-import/tools-restore.md
+
 ru:
   - from: /concepts/column-table.md
     to: /concepts/datamodel/table.md