fix build

Author: blinkov

ydb/docs/en/core/concepts/federated_query/_includes/connector_deployment.md

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{% if oss == "true" %}Deploy the [connector](../architecture.md#connectors) {% else %}Deploy the connector{% endif %} and {% if oss == true %}[configure](../../../devops/manual/federated-queries/index.md) {% else %}configure{% endif %} the {{ ydb-short-name }} dynamic nodes to interact with it. Additionally, ensure network access from the {{ ydb-short-name }} dynamic nodes to the external data source (at the address specified in the `LOCATION` parameter of the `CREATE EXTERNAL DATA SOURCE` request). If network connection encryption to the external source was enabled in the previous step, the connector will use the system's root certificates (more details on TLS configuration can be found in the [guide](../../../devops/manual/federated-queries/connector-deployment.md) on deploying the connector).
-=======
 {% if oss == "true" %}Deploy the [connector](../architecture.md#connectors) {% else %}Deploy the connector{% endif %} and {% if oss == "true" %}[configure](../../../devops/deployment-options/manual/federated-queries/index.md) {% else %}configure{% endif %} the {{ ydb-short-name }} dynamic nodes to interact with it. Additionally, ensure network access from the {{ ydb-short-name }} dynamic nodes to the external data source (at the address specified in the `LOCATION` parameter of the `CREATE EXTERNAL DATA SOURCE` request). If network connection encryption to the external source was enabled in the previous step, the connector will use the system's root certificates. More details on TLS configuration can be found in the [guide](../../../devops/deployment-options/manual/federated-queries/connector-deployment.md) on deploying the connector.
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))

ydb/docs/en/core/concepts/federated_query/architecture.md

@@ -30,20 +30,10 @@ Users can deploy [one of the ready-made connectors](../../devops/deployment-opti
 
 | Source | Support |
 |--------|---------|
-<<<<<<< HEAD
-| [ClickHouse](https://clickhouse.com/) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-| [Greenplum](https://www.greenplum.org/) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-| [Microsoft SQL Server](https://learn.microsoft.com/en-us/sql/?view=sql-server-ver16) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-| [MySQL](https://www.mysql.com/) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-| [PostgreSQL](https://www.postgresql.org/) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-| [S3](https://aws.amazon.com/ru/s3/) | Built into `ydbd` |
-| [{{ydb-short-name}}](https://ydb.tech/) | Via connector [fq-connector-go](../../devops/manual/federated-queries/connector-deployment.md#fq-connector-go) |
-=======
 | [ClickHouse](https://clickhouse.com/) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
 | [Greenplum](https://www.greenplum.org/) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
 | [Microsoft SQL Server](https://learn.microsoft.com/en-us/sql/?view=sql-server-ver16) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
 | [MySQL](https://www.mysql.com/) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
 | [PostgreSQL](https://www.postgresql.org/) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
 | [S3](https://aws.amazon.com/s3/) | Built into `ydbd` |
 | [{{ydb-short-name}}](https://ydb.tech/) | Via connector [fq-connector-go](../../devops/deployment-options/manual/federated-queries/connector-deployment.md#fq-connector-go) |
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))

ydb/docs/en/core/devops/configuration-management/_includes/node-authorization.md

@@ -77,7 +77,7 @@ To enable mandatory database node authorization, the following configuration blo
       - "registerNode@cert"
     ```
 
-    For more information on configuring cluster authentication parameters, see [{#T}](../../../reference/configuration/security_config.md#security-access-levels).
+    For more information on configuring cluster authentication parameters, see [{#T}](../../../reference/configuration/index.md).
 
 3. Update the static configuration files on all cluster nodes manually or using the [Ansible playbook](../../deployment-options/ansible/update-config.md).
 

ydb/docs/en/core/devops/deployment-options/ansible/initial-deployment.md

@@ -84,9 +84,6 @@ Next, you need to make the following changes in the `vars` section of the invent
   * `ydb_archive`: a local filesystem path for a {{ ydb-short-name }} distribution archive [downloaded](../../../downloads/index.md#ydb-server) or otherwise prepared in advance.
   * `ydbd_binary` and `ydb_cli_binary`: local filesystem paths for {{ ydb-short-name }} server and client executables, [downloaded](../../../downloads/index.md#ydb-server) or otherwise prepared in advance.
 
-<<<<<<< HEAD:ydb/docs/en/core/devops/ansible/initial-deployment.md
-#### Optional changes in the inventory files
-=======
 #### Installing fq-connector-go
 
 Installing a [connector](../../../concepts/federated_query/architecture.md#connectors) may be necessary for using [federated queries](../../../concepts/federated_query/index.md). The playbook can deploy the [fq-connector-go](../manual/federated-queries/connector-deployment.md#fq-connector-go) to the hosts with dynamic nodes. Use the following settings:
@@ -99,7 +96,6 @@ Installing a [connector](../../../concepts/federated_query/architecture.md#conne
   * `ydb_fq_connector_binary`: local filesystem paths for fq-connector-go executable, [downloaded](https://github.com/ydb-platform/fq-connector-go/releases) or otherwise prepared in advance.
 
 #### Optional Changes in the Inventory Files
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927)):ydb/docs/en/core/devops/deployment-options/ansible/initial-deployment.md
 
 Feel free to change these settings if needed, but it is not necessary in straightforward cases:
 
@@ -198,15 +194,11 @@ The default {{ ydb-short-name }} configuration file already includes almost all
 
 The rest of the sections and settings in the configuration file can remain unchanged.
 
-<<<<<<< HEAD:ydb/docs/en/core/devops/ansible/initial-deployment.md
-## Deploying the {{ ydb-short-name }} cluster {#erasure-setup}
-=======
 ### fq-connector-go Configuration File
 
 Configuration file for fq-connector-go located in the `/files/fq-connector-go/config.yaml`. In straightforward cases, it can remain unchanged.
 
 ## Deploying the {{ ydb-short-name }} Cluster {#erasure-setup}
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927)):ydb/docs/en/core/devops/deployment-options/ansible/initial-deployment.md
 
 {% note info %}
 

ydb/docs/en/core/devops/deployment-options/manual/initial-deployment.md

@@ -109,8 +109,6 @@ sudo usermod -aG disk ydb
 
 {% include [_includes/storage-device-requirements.md](../../../_includes/storage-device-requirements.md) %}
 
-<<<<<<< HEAD:ydb/docs/en/core/devops/manual/initial-deployment.md
-=======
 To get a list of available block devices on the server, you can use the `lsblk` command. Example output:
 
 ```txt
@@ -130,7 +128,6 @@ The names of block devices depend on the operating system settings provided by t
 - A device sequential identifier (which can be a letter or a number)
 - A partition sequential identifier on the given device (usually a number)
 
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927)):ydb/docs/en/core/devops/deployment-options/manual/initial-deployment.md
 1. Create partitions on the selected disks:
 
   {% note alert %}
@@ -519,11 +516,7 @@ To perform initial account setup in the created {{ ydb-short-name }} cluster, ru
       yql -s 'ALTER USER root PASSWORD "passw0rd"'
   ```
 
-<<<<<<< HEAD:ydb/docs/en/core/devops/manual/initial-deployment.md
-  Replace the `passw0rd` value with the required password.
-=======
   Replace the value `passw0rd` with the required password. Save the password in a separate file. Subsequent commands as the root user will be executed using the password passed with the `--password-file <path_to_user_password>` option. Additionally, the password can be saved in the connection profile, as described in the [documentation for {{ ydb-short-name }} CLI](../../../reference/ydb-cli/profile/index.md).
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927)):ydb/docs/en/core/devops/deployment-options/manual/initial-deployment.md
 
 1. Create additional accounts:
 
@@ -541,7 +534,7 @@ To perform initial account setup in the created {{ ydb-short-name }} cluster, ru
 
 In the command examples above, `<node.ydb.tech>` is the FQDN of the server running any dynamic node that serves the `/Root/testdb` database.
 
-When running the account creation and group assignment commands, the {{ ydb-short-name }} CLI client will request the `root` user's password. You can avoid multiple password entries by creating a connection profile as described in the [{{ ydb-short-name }} CLI documentation](../../reference/ydb-cli/profile/index.md).
+When running the account creation and group assignment commands, the {{ ydb-short-name }} CLI client will request the `root` user's password. You can avoid multiple password entries by creating a connection profile as described in the [{{ ydb-short-name }} CLI documentation](../../../reference/ydb-cli/profile/index.md).
 
 ## Start Using the Created Database {#try-first-db}
 

ydb/docs/en/core/integrations/vectorsearch/langchain.md

@@ -15,6 +15,7 @@ To use this integration, install the following software:
     ```shell
     pip install -qU langchain-ydb
     ```
+
 - embedding model
 
     This tutorial uses `HuggingFaceEmbeddings`. To install this package, run the following command:

ydb/docs/en/core/maintenance/manual/dynamic-config.md

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 ## Dynamic cluster configuration
-=======
-# Dynamic Cluster Configuration
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))
 
 Dynamic configuration allows running dynamic [nodes](../../concepts/cluster/common_scheme_ydb#nodes) by configuring them centrally without manually distributing files across the nodes. {{ ydb-short-name }} acts as a configuration management system, providing tools for reliable storage, versioning, and delivery of configurations, as well as a [DSL (Domain Specific Language)](./dynamic-config-selectors.md) for overriding parts of the configuration for specific groups of nodes. The configuration is a YAML document and is an extended version of the static configuration:
 
@@ -138,27 +134,17 @@ vim dynconfig.yaml
 Additional configuration options are described on the [selectors](./dynamic-config-selectors.md) and [temporary configuration](./dynamic-config-volatile-config.md) pages.
 All commands for working with configuration are described in the [{#T}](../../reference/ydb-cli/configs.md) section.
 
-<<<<<<< HEAD
 ### Operation mechanism
 
 #### Configuration update from the administrator's perspective
-=======
-## Operation Mechanism
-
-### Configuration Update from the Administrator's Perspective
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))
 
 1. The configuration file is uploaded by the user using a [grpc call](https://github.com/ydb-platform/ydb/blob/5251c9ace0a7617c25d50f1aa4d0f13e3d56f985/ydb/public/api/grpc/draft/ydb_dynamic_config_v1.proto#L22) or [{{ ydb-short-name }} CLI](../../reference/ydb-cli/index.md) to the cluster.
 2. The file is checked for validity, basic constraints, version correctness, cluster name correctness, and the correctness of the configurations obtained after DSL transformation are verified.
 3. The configuration version in the file is incremented by one.
 4. The file is reliably stored in the cluster using the Console [tablet](../../concepts/glossary.md#tablet).
 5. File updates are distributed across the cluster nodes.
 
-<<<<<<< HEAD
 #### Configuration update from the cluster node's perspective
-=======
-### Configuration Update from the Cluster Node's perspective
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))
 
 1. Each node requests the entire configuration at startup.
 2. Upon receiving the configuration, the node [generates the final configuration](./dynamic-config-selectors.md#selectors-resolve) for its set of [labels](./dynamic-config-selectors.md#selectors-intro).
@@ -168,19 +154,11 @@ All commands for working with configuration are described in the [{#T}](../../re
 
 Steps 1 and 2 are performed only for dynamic cluster nodes.
 
-<<<<<<< HEAD
 #### Configuration versioning
 
 This mechanism prevents concurrent configuration modifications and makes updates idempotent. When a modification request is received, the server compares the version of the received modification with the stored one. If the version is one less, the configurations are compared: if they are identical, it means the user is attempting to upload the configuration again, the user receives OK, and the cluster configuration is not updated. If the version matches the current one on the cluster, the configuration is replaced with the new one, and the version field is incremented by one. In all other cases, the user receives an error.
 
 ### Dynamically updated settings {#dynamic-kinds}
-=======
-### Configuration Versioning
-
-This mechanism prevents concurrent configuration modifications and makes updates idempotent. When a modification request is received, the server compares the version of the received modification with the stored one. If the version is one less, the configurations are compared: if they are identical, it means the user is attempting to upload the configuration again, the user receives OK, and the cluster configuration is not updated. If the version matches the current one on the cluster, the configuration is replaced with the new one, and the version field is incremented by one. In all other cases, the user receives an error.
-
-## Dynamically Updated Settings {#dynamic-kinds}
->>>>>>> 7e2446459dc ([docs] translate config v2 and other DevOps-related content (#18927))
 
 Some system settings are updated without restarting nodes. To change them, upload a new configuration and wait for it to propagate across the cluster.
 
@@ -200,4 +178,3 @@ The list may be expanded in the future.
 
 * Using more than 30 different [labels](./dynamic-config-selectors.md) in [selectors](./dynamic-config-selectors.md) can lead to validation delays of several seconds, as {{ ydb-short-name }} needs to check the validity of each possible final configuration. The number of values for a single label has much less impact.
 * Using large files (more than 500KiB for a cluster with 1000 nodes) can lead to increased network traffic in the cluster when updating the configuration. The traffic volume is directly proportional to the number of nodes and the configuration size.
-