fix conflicts

dashboard-for-desktop/articles/dashboard-designer/appearance-customization/data-display-formatting.md

@@ -0,0 +1,18 @@
+---
+title: Data Display Formatting
+author: Boris Zaitsev
+---
+# Data Display Format
+
+The DevExpress Dashboard allows you to specify format settings for numeric and date-time values, as described in the [Formatting Data](../data-shaping/formatting-data.md) document. However, certain data labels and delta values can be formatted independently to give you more ways to improve data readability and optimize screen space usage.
+
+Visual elements whose format can be customized are different for different dashboard items. For more information refer to the topics listed below.
+
+
+* [Chart X-Axis Format](../designing-dashboard-items/chart/axes/x-axis.md)
+* [Chart Y-Axis Format](../designing-dashboard-items/chart/axes/y-axis.md)
+* [Scatter X and Y Axes Formats](../designing-dashboard-items/scatter-chart/axes.md)
+* [Grid Delta Column Formats](../designing-dashboard-items/grid/columns/delta-column.md)
+* [Gauge Scale Label Format](../designing-dashboard-items/gauges/gauge-scale.md)
+* [Choropleth Map Delta Format](../designing-dashboard-items/choropleth-map/map-coloring/delta.md)
+* [Card Formats](../designing-dashboard-items/cards/formatting.md)

dashboard-for-desktop/articles/dashboard-viewer/dashboard-items/filter-elements/filter-elements-overview.md

@@ -0,0 +1,32 @@
+---
+title: Filter Elements Overivew
+author: Boris Zaitsev
+---
+# Filter Elements
+Filter elements provide the capability to [filter](../../data-presentation/master-filtering.md) other dashboard items.
+* [Combo Box](#combo-box)
+* [List Box](#list-box)
+* [Tree View](#tree-view)
+
+## <a name="combo-box"/>Combo Box
+The **Combo Box** dashboard item allows you to select a value(s) from the drop-down list.
+* The **Standard** type allows you to select only a single value.
+
+	![Combobox_Standard](../../../../images/img24834.png)
+* The **Checked** type allows you to select multiple values in the invoked drop-down list.
+
+	![Combobox_Checked](../../../../images/img24835.png)
+
+## <a name="list-box"/>List Box
+The **List Box** dashboard item allows you to select a value(s) from the list.
+* The **Checked** type allows you to select multiple values in the list box.
+
+	![Listbox_Checked](../../../../images/img24840.png)
+* The **Radio** type allows you to select only a single value in the radio group.
+
+	![Listbox_Radio](../../../../images/img24841.png)
+
+## <a name="tree-view"/>Tree View
+The **Tree View** dashboard item displays values in a hierarchical way and allows you to expand/collapse nodes.
+
+![Treeview_Checked](../../../../images/img24843.png)

dashboard-for-desktop/articles/dashboard-viewer/dashboard-items/filter-elements/neutral-filter-mode.md

@@ -0,0 +1,22 @@
+---
+title: Neutral Filter Mode
+author: Boris Zaitsev
+---
+
+# Neutral Filter Mode
+
+The filter elements show all items selected by default, to indicate that no filtering is currently taking place. Starting from this state, users typically begin each filtering operation by deselecting **All**, before they select individual items.
+
+An extra click is required to begin any actual filtering operation, because the **standard filter mode** shows all items selected. This is not an optimal implementation for performance reasons, because it generates filtering criteria that are evaluated by the data layer and/or the database.
+
+To solve these issues, the **Neutral Filter Mode** is implemented. It is neutral in the sense that it does not apply any criteria to the data source in its default state, resulting in improved performance.
+
+![](../../../../images/win-neutral-filter-mode-deselected.png)
+
+All items are shown deselected. This means that an extra click is no longer required in the most common scenarios, and this behavior is familiar to end users from websites world-wide.
+
+> Built-in UI does not provide a command to switch the filter mode. Reload a dashboard after switching the mode.
+
+The **Neutral Filter Mode** helps in a situation when there is a potential “dead lock”, due to the fact that multiple filter elements influence each other. The **Clear Master Filter** button resets the filters.
+
+![](../../../../images/win-neutral-filter-mode-clear-master-filter.png)

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-extra-information/add-watermarks-to-a-report.md

@@ -12,7 +12,6 @@ To add a watermark to a report, do the following.
 
 1. Switch to the [toolbar](..\report-designer-tools\toolbar.md)'s **Page** page and press **Watermark**.
 
-
 	![eurd-win-add-watermarks-use-toolbox](../../../../images/eurd-win-add-watermarks-use-toolbox.png)
 2. In the invoked **Watermark** dialog, select either the **Text Watermark** or **Picture Watermark** tab, depending on the type of watermark you wish to add.
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-extra-information/display-the-current-date-and-time-in-a-report.md

@@ -3,7 +3,7 @@ title: Display the Current Date and Time in a Report
 ---
 # Display the Current Date and Time in a Report
 
-This tutorial demonstrates how to insert the current system date and time into a report using the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control.
+This tutorial demonstrates how to insert the current system date and time into a report using the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control.
 
 ![eurd-win-insert-datetime-result](../../../../images/eurd-win-insert-datetime-result.png)
 
@@ -12,7 +12,7 @@ Do the following to include information about the current date and time into a r
 1. Typically, the current date and time are displayed within the [Report Header](..\introduction-to-banded-reports.md) band. To add it to the report, right click anywhere on the report's surface. In the invoked menu, point to **Insert Band** and click **ReportHeader**.
 
 	![eurd-win-insert-datetime-add-reportheader-band](../../../../images/eurd-win-insert-datetime-add-reportheader-band.png)
-2. Drop the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **ReportHeader** band.
+2. Drop the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **ReportHeader** band.
 
 	![eurd-win-insert-date-time-add-pageinfo](../../../../images/eurd-win-insert-date-time-add-pageinfo.png)
 3. Set the control's **PageInformation** property to *DateTime* (e.g. using the smart tag).

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-extra-information/display-the-user-name-in-a-report.md

@@ -3,7 +3,7 @@ title: Display the User Name in a Report
 ---
 # Display the User Name in a Report
 
-This tutorial demonstrates how to insert the current user name in a report using the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control.
+This tutorial demonstrates how to insert the current user name in a report using the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control.
 
 ![eurd-win-insert-username-result](../../../../images/eurd-win-insert-username-result.png)
 
@@ -12,10 +12,10 @@ Do the following to insert the user name into a report:
 1. Typically, the user name is displayed within the [Report Header](..\introduction-to-banded-reports.md) band. To add it to the report, right click anywhere on the report's surface. In the invoked menu, point to **Insert Band** and click **ReportHeader**.
 
 	![eurd-win-insert-datetime-add-reportheader-band](../../../../images/eurd-win-insert-datetime-add-reportheader-band.png)
-2. Drop the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **ReportHeader** band.
+2. Drop the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **ReportHeader** band.
 
 	![eurd-win-insert-date-time-add-pageinfo](../../../../images/eurd-win-insert-date-time-add-pageinfo.png)
-3. Set the control's **PageInfo** property to *UserName* (e.g. using the smart tag).
+3. Set the control's **Page Information** property to *User Name* (e.g. using the smart tag).
 
 	![eurd-win-insert-username-set-pageinfo](../../../../images/eurd-win-insert-username-set-pageinfo.png)
 4. Next, to apply a format string to the control's contents, type **Current User: {0}** into its **Text Format String** property.

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-navigation/add-a-table-of-contents.md

@@ -1,12 +1,10 @@
 ---
 title: Create a Table of Contents
-author: Yuri Shutov
-legacyId: 115690
 ---
 # Create a Table of Contents
 This tutorial describes the steps to create a report with a table of contents. A table of contents is automatically created based on the [bookmarks](add-bookmarks-and-a-document-map.md) existing in a report.
 
-To create a table of contents in a report, do the following.
+Do the following to create a table of contents in a report:
 1. From the [Control Toolbox](..\report-designer-tools\toolbox.md), drop the [Table of Contents](..\use-report-elements\use-basic-report-controls\table-of-contents.md) control onto the [Report Header band](..\introduction-to-banded-reports.md).
 
 	![eurd-win-drop-table-of-contents](../../../../images/eurd-win-drop-table-of-contents.png)

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-navigation/add-bookmarks-and-a-document-map.md

@@ -15,21 +15,21 @@ The following image illustrates the resulting report with a hierarchical Documen
 
 ![eurd-win-addbookmark_result](../../../../images/eurd-win-addbookmark_result.png)
 
-Use the following steps to generate a Documnet Map in your grouped report.
+Use the following steps to generate a Document Map in your grouped report:
 
-1. Select the label placed in the **Group Header** band and switch to the [Property Grid](..\report-designer-tools\ui-panels\property-grid.md)'s **Expressions** tab. Click the **Bookmark** property's ellipsis button, and in the invoked **Expression Editor**, select the **CategoryName** data field.
+1. Select the label placed in the **Group Header** band and switch to the [Property Grid](..\report-designer-tools\ui-panels\property-grid.md)'s **Miscellaneous** tab. Click the **Bookmark** property's marker and select the **Bookmark Expression** item. In the invoked **Expression Editor**, select the **CategoryName** data field.
 
 	![eurd-win-addbookmark-set-bookmark-for-group](../../../../images/eurd-win-addbookmark-set-bookmark-for-group.png)
 
-	In the legacy binding mode (if the Property Grid does not provide the **Expressions** tab), you can specify this property in the Property Grid's **DataBindings** category.
+	In the legacy binding mode (if the Property Grid does not provide the **Bookmark Expression** item), you can specify this property in the Property Grid's **Data Bindings** category.
 
 	![eurd-win-addbookmark_legacy](../../../../images/eurd-win-addbookmark_legacy.png)
 2. In the same way, select the label in the **Detail** band and bind its **Bookmark** property to the **ProductName** data field.
 
 	![eurd-win-addbookmark-set-bookmarks-for-details](../../../../images/eurd-win-addbookmark-set-bookmarks-for-details.png)
 
 	Most of the reporting controls (for example, [Table](..\use-report-elements\use-tables.md), TableCell, [CheckBox](..\use-report-elements\use-basic-report-controls\check-box.md), etc.) supports the **Bookmark** property.
-3. Set the same label's **BookmarkParent** property to the label in the group band. This arranges bookmarks into a parent-child structure reflecting the report elements' hierarchy in the Document Map.
+3. Set the same label's **Parent Bookmark** property to the label in the group band. This arranges bookmarks into a parent-child structure reflecting the report elements' hierarchy in the Document Map.
 
 	![eurd-win-addbookmark-bookmark-parent](../../../../images/eurd-win-addbookmark-bookmark-parent.png)
 
@@ -42,4 +42,4 @@ Use the following steps to generate a Documnet Map in your grouped report.
 	The root bookmark displays the report name if you do not specify this property.
 
 > [!NOTE]
-> Duplicated bookmarks are suppressed to prevent adding multiple bookmarks with the same name to a final document. You can disable the  report's **BookmarkDuplicateSuppress** property to allow duplicated bookmarks.
+> Duplicated bookmarks are suppressed to prevent adding multiple bookmarks with the same name to a final document. You can disable the  report's **Bookmark Duplicate Suppress** property to allow duplicated bookmarks.

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-navigation/add-cross-references-and-hyperlinks.md

@@ -12,11 +12,11 @@ You can improve report navigation using a cross-reference because the link's tar
 
 You can add a cross-reference for a [report control](..\use-report-elements.md) by setting the following properties:
 
-1. Set the **Target** property to *_self* to specify that the link is in the same document.
+1. Set the **Navigation Target** property to *_self* to specify that the link is in the same document.
 
     ![eurd-win-crossreferences_set-target](../../../../images/eurd-win-crossreferences_set-target.png)
 
-2. Set the **NavigateUrl** property to the target control's **Name** property value.
+2. Set the **Navigation URL** property to the target control's **Name** property value.
 
     ![eurd-win-crossreferences_set-url](../../../../images/eurd-win-crossreferences_set-url.png)
 
@@ -32,7 +32,7 @@ The link uses the first occurrence if there are multiple instances of an object
 ## <a name="hyper"></a>Add Hyperlinks
 A hyperlink means that a link's target is outside the report.
 
-You can use any control as a link by setting the **NavigateUrl** property to the required target document's URL.
+You can use any control as a link by setting the **Navigation Url** property to the required target document's URL.
 
 ![eurd-win-hiperlinks-set-url](../../../../images/eurd-win-hiperlinks-set-url.png)
 
@@ -45,7 +45,7 @@ The cursor automatically changes to a hand when hovering the control in a report
 
 ![eurd-win-hiperlinks-result](../../../../images/eurd-win-hiperlinks-result.png)
 
-Use the link's **Target** property to specify where to open the target document (in the same preview window, in a new blank window, etc.).
+Use the link's **Navigation Target** property to specify where to open the target document (in the same preview window, in a new blank window, etc.).
 
 > [!TIP]
 > A link's behavior is preserved when [exporting a report](..\preview-print-and-export-reports.md) to most of the available formats (in particular to PDF, HTML, MHT, RTF and Excel).

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-navigation/add-page-numbers.md

@@ -11,10 +11,10 @@ Do the following to add page numbers to a report:
 - Create a [PageFooterBand](..\introduction-to-banded-reports.md) in your report. To do this, right-click anywhere in the report designer, and in the context menu point to **Insert Band**, and then click **PageFooter**.
 
 	![eurd-win-add-page-footer](../../../../images/eurd-win-add-page-footer.png)
-- Drop the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) to the **PageFooter** band.
+- Drop the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) to the **PageFooter** band.
 
 	![eurd-win-drop-page-info](../../../../images/eurd-win-drop-page-info.png)
-- To change the control's display format, click its smart tag, and in the invoked actions list, specify the **TextFormatString** property (e.g., **Page {0} of {1}**, to display the current page number out of the total number of pages).
+- To change the control's display format, click its smart tag, and in the invoked actions list, specify the **Text Format String** property (e.g., **Page {0} of {1}**, to display the current page number out of the total number of pages).
 
 	![eurd-win-pageinfo-formatstring](../../../../images/eurd-win-pageinfo-formatstring.png)
 
@@ -30,21 +30,21 @@ Do the following to make your report display page numbers for groups or detail r
 	![eurd-win-add-groupfooter](../../../../images/eurd-win-add-groupfooter.png)
 
 	> [!NOTE]
-	> You can force the group header and/or the group footer to be repeated on each page, using the GroupBand's **RepeatEveryPage** property.
+	> You can force the group header and/or the group footer to be repeated on each page, using the GroupBand's **Repeat Every Page** property.
 - Next, force each new group to start on a separate page. Otherwise, group page numbers will be calculated incorrectly.
 
-	To do this, select the Group Footer, and set its **PageBreak** property to *AfterBand*.
+	To do this, select the Group Footer, and set its **Page Break** property to *After the Band*.
 
 	![eurd-win-pageinfo-pagebreak](../../../../images/eurd-win-pageinfo-pagebreak.png)
-- Drop the [PageInfo](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **GroupFooter** (or **GroupHeader**) band.
+- Drop the [Page Info](..\use-report-elements\use-basic-report-controls\page-info.md) control from the [Toolbox](..\report-designer-tools\toolbox.md) onto the **GroupFooter** (or **GroupHeader**) band.
 
 	![eurd-win-droppageinfo-to-grou-footer.png](../../../../images/eurd-win-droppageinfo-to-grou-footer.png)
-- Select the created control, and set its **RunningBand** property to *GroupHeader1*.
+- Select the created control, and set its **Running Band** property to *GroupHeader1*.
 
 	![eurd-win-pageinfo-runningband](../../../../images/eurd-win-pageinfo-runningband.png)
 
 	> [!TIP]
-	> You can use the **TextFormatString** and **PageInfo** properties to adjust the way the control represents its contents.
+	> You can use the **Text Format String** and **Page Information** properties to adjust the way the control represents its contents.
 
 The following image illustrates the resulting report:
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/add-new-reports.md

@@ -11,7 +11,7 @@ This topic explains how to create a new report in the Report Designer.
 
 ## Create a New Blank Report
 
-You can use one of the following commands to create a new report. The created report contains three [bands](introduction-to-banded-reports.md) - **Page Header**, **Detail**, and **Page Footer**. Refer to the [Use Report Elements](use-report-elements.md) section for information on how to add controls to the report.
+You can use one of the following commands to create a new report. The created report contains three [bands](introduction-to-banded-reports.md) - **Top Margin**, **Detail**, and **Bottom Margin**. Refer to the [Use Report Elements](use-report-elements.md) section for information on how to add controls to the report.
 
 ### Use the Ribbon's Home Tab
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/bind-to-data.md

@@ -13,6 +13,8 @@ The following tutorials illustrate how to bind a report to various data sources:
 * [Bind a Report to an Object Data Source](bind-to-data/bind-a-report-to-an-object-data-source.md)
 * [Bind a Report to an Excel Workbook](bind-to-data/bind-a-report-to-an-excel-workbook.md)
 * [Bind a Report to a CSV File](bind-to-data/bind-a-report-to-a-csv-file.md)
+* [Bind a Report to JSON Data](bind-to-data\bind-a-report-to-json-data.md)
+* [Bind a Report to XPO Persistent Object](bind-to-data\bind-a-report-to-an-xpo-persistent-object.md)
 
 The following topics describe how to bind report controls to data:
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/bind-to-data/bind-a-report-to-a-csv-file.md

@@ -7,7 +7,7 @@ author: Anna Gubareva
 This tutorial describes how to bind a report to data obtained from a CSV file:
 
 1. [Create a new report](../add-new-reports.md).
-2. Click the report's smart tag. In the invoked actions list, expand the drop-down menu for the **Data Source** property and click **Add Report DataSource**.
+2. Click the report's smart tag. In the invoked actions list, expand the drop-down menu for the **Data Source** property and click **Add New DataSource**.
 
 	![](../../../../images/eurd-win-report-smart-tag-add-new-data-source.png)