Resolve merge conflicts

Author: epolevikov

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

@@ -8,7 +8,7 @@ The Report Designer works in one of the following data binding modes:
 
 * **Expressions** is the default binding mode.
 
-    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](../use-expressions/expression-syntax.md). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
+    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](../use-expressions/expression-language.md#functions). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
 
     Click a property's marker to see whether the invoked context menu has the **PropertyName Expression** item that invokes the **Expression Editor**.
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/report-designer-tools/ui-panels/field-list.md

@@ -69,6 +69,6 @@ The Field List can help you do the following:
 
 	![Field List - Add Calculated Field](../../../../../images/eurd-win-field-list-add-calculated-field.png)
 
-* Add [report parameters](../../shape-report-data/use-report-parameters.md) or change existing parameters.
+* Add [report parameters](../../use-report-parameters.md) or change existing parameters.
 
 	![Field List - Add Report Parameter](../../../../../images/eurd-winield-list-add-report-parameter.png)

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/use-expressions/data-binding-modes.md

@@ -8,7 +8,7 @@ The Report Designer works in one of the following data binding modes:
 
 * **Expressions** is the default binding mode.
 
-    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](expression-syntax.md). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
+    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](expression-language.md#functions). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
 
     Click a property's marker to see whether the invoked context menu has the **PropertyName Expression** item that invokes the **Expression Editor**.
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/use-expressions/expression-language.md

@@ -336,7 +336,7 @@ to bind the control to the UnitPrice data field from the Products data member
 
 ## Report Parameters
 
-Use the following syntax to insert [report parameters](../shape-report-data/use-report-parameters.md) in an expression:
+Use the following syntax to insert [report parameters](../use-report-parameters.md) in an expression:
 
 - Type a question mark before a parameter's name.  
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/use-expressions/functions-in-expressions.md

@@ -257,7 +257,7 @@ Below is a list of functions that are used to construct [expression bindings](da
   ```
 
 * Join()  
-  Concatenates the [multi-value report parameter](../shape-report-data/use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function is useful when you [bind a multi-value parameter to a label](../shape-report-data/use-report-parameters/create-a-report-parameter.md) to display the parameter's values in a report.
+  Concatenates the [multi-value report parameter](../use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function is useful when you [bind a multi-value parameter to a label](../use-report-parameters/create-a-report-parameter.md) to display the parameter's values in a report.
 
   This function has two overloads:
 
@@ -280,7 +280,7 @@ Below is a list of functions that are used to construct [expression bindings](da
 The following functions are used to [bind a report to a stored procedure](../bind-to-data/bind-a-report-to-a-stored-procedure.md):
 
 * Join()  
-  Concatenates the [multi-value report parameter](../shape-report-data/use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function can be used when mapping multi-value report parameters to query parameters generated from a stored procedure's parameters. Refer to the following topic for more information: [Query Parameters](../bind-to-data/specify-query-parameters.md).
+  Concatenates the [multi-value report parameter](../use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function can be used when mapping multi-value report parameters to query parameters generated from a stored procedure's parameters. Refer to the following topic for more information: [Query Parameters](../bind-to-data/specify-query-parameters.md).
 
   This function has two overloads:
 

interface-elements-for-desktop/articles/report-designer/report-designer-for-winforms/use-report-parameters/create-a-report-parameter.md

@@ -9,7 +9,7 @@ This topic demonstrates how to create a report parameter in the [Report Designer
 
 ## Create a Report Parameter in the Report Designer
 
-In the **Report Designer**, you can create a parameter from the [Field List](../report-designer-tools/ui-panels/field-list.md), [Properties window](../report-designer-tools/ui-panels/property-grid-tabbed-view.md), or [FilterString Editor](../use-expressions.md#filterstring-editor). The created parameter appears in the [Field List](../report-designer-tools/ui-panels/field-list.md)'s **Parameters** node.
+In the **Report Designer**, you can create a parameter from the [Field List](../report-designer-tools/ui-panels/field-list.md), [Properties window](../report-designer-tools/ui-panels/property-grid-tabbed-view.md), or [FilterString Editor](../use-expressions/expressions-overview.md#filterstring-editor). The created parameter appears in the [Field List](../report-designer-tools/ui-panels/field-list.md)'s **Parameters** node.
 
 ![A parameter in the Field List](../../../../images/field-list-parameters-section.png)
 
@@ -35,7 +35,7 @@ Click **Add** in the invoked **Report Parameters Editor** dialog to add a new pa
 
 ### Create From the FilterString Editor
 
-You can create a parameter when you construct a condition in the [FilterString Editor](../use-expressions.md#filterstring-editor). Choose the **Select a parameter** field, click the field, and select **Add Parameter** in the invoked context menu.
+You can create a parameter when you construct a condition in the [FilterString Editor](../use-expressions/expressions-overview.md#filterstring-editor). Choose the **Select a parameter** field, click the field, and select **Add Parameter** in the invoked context menu.
 
 ![Create a parameter from the Filter String editor](../../../../images/filter-string-editor-add-parameter.png)
 
@@ -103,7 +103,7 @@ You can specify an [expression](../use-expressions.md) for this option. For exam
 ![Specify an expression for a parameter's Default Value option](../../../../images/specify-expression-for-parameter-default-value.png)
 
 > [!NOTE]
-> You can use only [constants](../use-expressions/expression-syntax.md#constants), [operators](../use-expressions/expression-syntax.md#operators), and date-time / logical / math / string [functions](../use-expressions/expression-syntax.md#functions-basic) in an expression for a parameter's default value.
+> You can use only [constants](../use-expressions/expression-language.md#constants), [operators](../use-expressions/expression-language.md#operators), and date-time / logical / math / string [functions](../use-expressions/expression-language.md#functions) in an expression for a parameter's default value.
 
 ### Allow Null Value
 

interface-elements-for-web/articles/report-designer/use-expressions/data-binding-modes.md

@@ -8,11 +8,7 @@ The Report Designer works in one of the following data binding modes:
 
 * **Expressions** is the default binding mode.
 
-<<<<<<< HEAD
-    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](expression-syntax.md). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
-=======
-    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../shape-report-data/use-report-parameters.md), or [functions](functions-in-expressions.md). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
->>>>>>> 4b8f199246699d0c943117d341f07d01e0535b37
+    This mode enables you to specify complex [expressions](../use-expressions.md) that include two or more data fields, [report parameters](../use-report-parameters.md), or [functions](functions-in-expressions.md). You can also use expressions to [calculate summaries](../shape-report-data/calculate-summaries/calculate-a-summary.md) of any complexity or [conditionally shape your data](../shape-report-data/specify-conditions-for-report-elements.md).
 
     Click a property's marker to see whether the invoked context menu has the **PropertyName Expression** item that invokes the **Expression Editor**.
 

interface-elements-for-web/articles/report-designer/use-expressions/expression-language.md

@@ -336,7 +336,7 @@ to bind the control to the UnitPrice data field from the Products data member
 
 ## Report Parameters
 
-Use the following syntax to insert [report parameters](../shape-report-data/use-report-parameters.md) in an expression:
+Use the following syntax to insert [report parameters](../use-report-parameters.md) in an expression:
 
 - Type a question mark before a parameter's name.  
 

interface-elements-for-web/articles/report-designer/use-expressions/functions-in-expressions.md

@@ -257,7 +257,7 @@ Below is a list of functions that are used to construct [expression bindings](da
   ```
 
 * Join()  
-  Concatenates the [multi-value report parameter](../shape-report-data/use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function is useful when you [bind a multi-value parameter to a label](../shape-report-data/use-report-parameters/create-a-report-parameter.md) to display the parameter's values in a report.
+  Concatenates the [multi-value report parameter](../use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function is useful when you [bind a multi-value parameter to a label](../use-report-parameters/create-a-report-parameter.md) to display the parameter's values in a report.
 
   This function has two overloads:
 
@@ -280,7 +280,7 @@ Below is a list of functions that are used to construct [expression bindings](da
 The following functions are used to bind a report to a stored procedure:
 
 * Join()  
-  Concatenates the [multi-value report parameter](../shape-report-data/use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function can be used when mapping multi-value report parameters to query parameters generated from a stored procedure's parameters. Refer to the following topic for more information: [Query Parameters](../bind-to-data/specify-query-parameters.md).
+  Concatenates the [multi-value report parameter](../use-report-parameters/multi-value-report-parameters.md)'s values into a string. This function can be used when mapping multi-value report parameters to query parameters generated from a stored procedure's parameters. Refer to the following topic for more information: [Query Parameters](../bind-to-data/specify-query-parameters.md).
 
   This function has two overloads:
 

interface-elements-for-web/articles/report-designer/use-report-parameters/create-a-report-parameter.md

@@ -87,7 +87,7 @@ You can specify an [expression](../use-expressions.md) for this option. For exam
 ![Specify an expression for a parameter's Default Value option](../../../images/specify-expression-for-parameter-default-value.png)
 
 > [!NOTE]
-> You can use only [constants](../use-expressions/expression-syntax.md#constants), [operators](../use-expressions/expression-syntax.md#operators), and date-time / logical / math / string [functions](../use-expressions/expression-syntax.md#functions-basic) in an expression for a parameter's default value.
+> You can use only [constants](../use-expressions/expression-language.md#constants), [operators](../use-expressions/expression-language.md#operators), and date-time / logical / math / string [functions](../use-expressions/expression-language.md#functions) in an expression for a parameter's default value.
 
 ### Allow Null Value