Merge branch '2025.1' of https://github.com/DevExpress/dotnet-eud into mz_root_topics

Author: ritazakhodyaeva

eud-for-bi-dashboards/dashboard-for-desktop/dashboard-designer/dashboard-item-settings/text-box/editing-text.md

@@ -12,7 +12,11 @@ This adds the **Text Box Editor** context category to the Dashboard Designer's r
 
 ![TextBoxEditorContextCategory](../../../images/img123328.png)
 
+<<<<<<<< HEAD:eud-for-bi-dashboards/dashboard-for-desktop/dashboard-designer/dashboard-item-settings/text-box/editing-text.md
 <!-- To learn how to edit the content within the Text Box, see [Rich Text Editor](~/interface-elements-for-desktop/rich-text-editor.md) - Link disabled: interface-elements not included.  After you change the document, click **Edit** again to finish editing.-->
+========
+<!-- To learn how to edit the content within the Text Box, see [Rich Text Editor](~/interface-elements-for-desktop/articles/rich-text-editor.md) - Link disabled: interface-elements not included.  After you change the document, click **Edit** again to finish editing.-->
+>>>>>>>> 05df5c28763b4aa9fb5c78d15422603198f71820:eud-for-bi-dashboards/dashboard-for-desktop/articles/dashboard-designer/dashboard-item-settings/text-box/editing-text.md
 
 > [!NOTE]
 > Note that the Text Box can be [bound](../../bind-dashboard-items-to-data.md) to data. To learn how to do this, see [Providing Data](providing-data.md).

eud-for-bi-dashboards/dashboard-for-desktop/dashboard-designer/provide-data/binding-to-extract-data-sources.md

@@ -23,7 +23,11 @@ To create a new data extract from the existing data source, perform the followin
 	* To establish a connection to an existing data extract, select **Load an existing data extract from a file** and locate the required _*.dat_ file. Click **Finish**.
 4. **(Conditional)** The next page only appears if you are creating the data extract based on the Entity Framework or Object data sources, and allows you to select the required fields.
 
+<<<<<<<< HEAD:eud-for-bi-dashboards/dashboard-for-desktop/dashboard-designer/provide-data/binding-to-extract-data-sources.md
 	![DataSourceWizard_Extract_SelectFields](../../images/img123955.png)
+========
+	![DataSourceWizard_Extract_SelectFields](../../../images/img123955.png)
+>>>>>>>> 05df5c28763b4aa9fb5c78d15422603198f71820:eud-for-bi-dashboards/dashboard-for-desktop/articles/dashboard-designer/provide-data/binding-to-extract-data-sources.md
 5. On the next page, you can specify the filter used to extract data. 
 
 	![DataSourceWizard_Extract_FilterData](../../images/img123131.png)

eud-for-bi-dashboards/dashboard-for-desktop/toc.yml

@@ -1,4 +1,4 @@
-items:
+items:
 - name: Dashboard Designer
   href: dashboard-designer.md
   items:
@@ -646,4 +646,4 @@
       - name: Neutral Filter Mode
         href: dashboard-viewer/dashboard-items/filter-elements/neutral-filter-mode.md
     - name: Tab Container
-      href: dashboard-viewer/dashboard-items/tab-container.md
+      href: dashboard-viewer/dashboard-items/tab-container.md

eud-for-bi-dashboards/dashboard-for-web/toc.yml

@@ -1,4 +1,4 @@
-items:
+items:
 - name: Web Dashboard - Designer Mode
   href: web-dashboard-designer-mode.md
   items:
@@ -503,4 +503,4 @@
     - name: Filter Elements
       href: web-dashboard-viewer-mode/dashboard-items/filter-elements.md
     - name: Tab Container
-      href: web-dashboard-viewer-mode/dashboard-items/tab-container.md
+      href: web-dashboard-viewer-mode/dashboard-items/tab-container.md

eud-for-bi-dashboards/toc.yml

@@ -4,4 +4,4 @@ items:
   topicHref: dashboard-for-desktop/index.md
 - name: Dashboard for Web
   href: dashboard-for-web/
-  topicHref: dashboard-for-web/index.md
+  topicHref: dashboard-for-web/index.md

eud-for-devexpress-reports/reporting-for-desktop/report-designer/report-designer-for-winforms/preview-print-and-export-reports.md

@@ -22,6 +22,7 @@ When in the Print Preview mode, you can export your report to files in different
 
 
 The following documents describe the basics of report exporting and format-specific export options.
+<<<<<<<< HEAD:eud-for-devexpress-reports/reporting-for-desktop/report-designer/report-designer-for-winforms/preview-print-and-export-reports.md
 * <!-- [Exporting from Print Preview](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/exporting-from-print-preview.md) - Link disabled: interface-elements not included -->
 * <!-- [PDF-Specific Export Options](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/pdf-specific-export-options.md) - Link disabled: interface-elements not included -->
 * <!-- [HTML-Specific Export Options](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/html-specific-export-options.md) - Link disabled: interface-elements not included -->
@@ -32,6 +33,18 @@ The following documents describe the basics of report exporting and format-speci
 * <!-- [CSV-Specific Export Options](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/csv-specific-export-options.md) - Link disabled: interface-elements not included -->
 * <!-- [TXT-Specific Export Options](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/txt-specific-export-options.md) - Link disabled: interface-elements not included -->
 * <!-- [Image-Specific Export Options](~/interface-elements-for-desktop/print-preview/print-preview-for-winforms/exporting/image-specific-export-options.md) - Link disabled: interface-elements not included -->
+========
+* <!-- [Exporting from Print Preview](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/exporting-from-print-preview.md) - Link disabled: interface-elements not included -->
+* <!-- [PDF-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/pdf-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [HTML-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/html-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [MHT-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/mht-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [RTF-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/rtf-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [XLS-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/xls-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [XLSX-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/xlsx-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [CSV-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/csv-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [TXT-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/txt-specific-export-options.md) - Link disabled: interface-elements not included -->
+* <!-- [Image-Specific Export Options](~/interface-elements-for-desktop/articles/print-preview/print-preview-for-winforms/exporting/image-specific-export-options.md) - Link disabled: interface-elements not included -->
+>>>>>>>> 05df5c28763b4aa9fb5c78d15422603198f71820:eud-for-devexpress-reports/reporting-for-desktop/articles/report-designer/report-designer-for-winforms/preview-print-and-export-reports.md
 
 
 ## Hide Report Controls in Documents Exported to Specific Formats

eud-for-devexpress-reports/reporting-for-desktop/toc.yml

@@ -1,4 +1,4 @@
-items:
+items:
 - name: Report Designer for WinForms
   href: report-designer/report-designer-for-winforms.md 
   items:

eud-for-devexpress-reports/reporting-for-web/toc.yml

@@ -1,4 +1,4 @@
-items:
+items:
 - name: Document Viewer
   href: document-viewer.md
   items:

eud-for-devexpress-reports/toc.yml

@@ -4,4 +4,4 @@ items:
   topicHref: reporting-for-desktop/index.md
 - name: Reporting for Web
   href: reporting-for-web/
-  topicHref: reporting-for-web/index.md
+  topicHref: reporting-for-web/index.md