Merge branch 'next'

Author: vashkinazi

docs/calendar/api/calendar_dateformat_config.md

@@ -21,6 +21,10 @@ const calendar = new dhx.Calendar("calendar_container", {
 @descr:
 **Related sample**: [Calendar. Date format](https://snippet.dhtmlx.com/2co9z3bi)
 
+:::info
+The date format must include delimiters (space or symbol), otherwise an error will be thrown.
+:::
+
 DHTMLX Calendar uses the following characters for setting a date format:
 
 | Character | Definition                                        |

docs/combobox/adding_options.md

@@ -38,10 +38,11 @@ const dataset = [
 ]
 ~~~
 
-Each object in the data set contains a number of *key:value* pairs that represent attributes of Combo options. 
+Each object in the data set contains a number of *key:value* pairs that represent attributes of Combo options. [Check the details](combobox/api/combobox_data_config.md).
+
 You can specify your own template of rendering Combo options with the help of the [template](combobox/api/combobox_template_config.md) configuration option.
 
-{{note Note, that **value** is a mandatory property for a dataset item and **src** is a reserved one.}}
+{{note Note, until you use the [template](combobox/api/combobox_template_config.md) option, the **value** is a mandatory property for a dataset item and **src** is a reserved one.}}
 
 ## Loading data on initialization
 

docs/combobox/api/combobox_data_config.md

@@ -29,12 +29,24 @@ const combo = new dhx.Combobox("combo_container",{
 			"value": "Cyprus",
 			"src": "../common/flags/cy.png"
 		}
+	]
 });
 
 @descr: 
 
 **Related sample**: [Combobox. Initialization with config.data](https://snippet.dhtmlx.com/8bsb9dji)
 
+Each object in the data set contains a number of key:value pairs that represent attributes of Combo options. The available attributes are:
+
+- `id?: string | number` - optional, the id of the data option
+- `value?: string`- optional, the text value of the option
+- `src?: string`- optional, the path to the image
+- `icon?: string` - optional, the CSS class of the displayed icon (for example, "dxi dxi-check")
+
+:::info
+It is not possible to use the `src` and `icon` attributes together.
+:::
+
 @changelog: added in v6.4
 
 [comment]: # (@related: combobox/how_to_start.md#initialize-combobox)

docs/combobox/api/combobox_filter_config.md

@@ -27,7 +27,7 @@ A custom function takes two parameters:
 <table>
 	<tbody>
         <tr>
-			<td><b>item</b></td>
+			<td><b><a href="https://docs.dhtmlx.com/suite/combobox/api/combobox_data_config/">item</a></b></td>
 			<td>(<i>object</i>) an item of data collection</td>
 		</tr>
 		<tr>

docs/combobox/api/combobox_setvalue_method.md

@@ -8,17 +8,13 @@ description: You can explore the setValue method of Combo Box in the documentati
 
 @short: selects option(s) in ComboBox
 
-@signature: {'setValue(value: Id | Id[]): void;'}
+@signature: {'setValue(ids: Id | Id[]): void;'}
 
 @params:
-- `value: (string | number) | (string | number)[]` - the ID(s) of items from data collection that should be selected in Combo Box
+- `ids: (string | number) | (string | number)[]` - the ID(s) of items from data collection that should be selected in Combo Box
 
 @descr:
 
-:::info
-Note, that you need to pass the **ID(s)** of Combo options as a value of the **value** parameter.
-:::
-
 @example:
 // selects one option
 combo.setValue(combo.data.getId(1));

docs/combobox/api/combobox_value_config.md

@@ -8,7 +8,7 @@ description: You can explore the value config of Combo Box in the documentation
 
 @short: Optional. Specifies the values that will appear in the input on initialization of the combobox
 
-@signature: {'value?: string | string[];'}
+@signature: {'value?: Id | Id[];'}
 
 @example:
 const combobox = new dhx.Combobox("combo_container", {
@@ -25,7 +25,7 @@ const combobox = new dhx.Combobox("combo_container", {
 
 **Related sample**: [Combobox. Initial value](https://snippet.dhtmlx.com/spnausim)
 
-- If *multiselection:true* is set for a combo, the property takes an array of string values as:<br/> *value: ["1","2","3"]*;
+- If *multiselection:true* is set for a combo, the property takes an array of options' ids as:<br/> *value: ["1","2","3"]*;
 - If *multiselection:false* is set or the *multiselection* config is not defined, the property gets either of the two values: *value:"1"* or *value: ["1"]*.
 
 @changelog: added in v7.0

docs/combobox/configuration.md

@@ -88,8 +88,8 @@ const combobox = new dhx.Combobox("combo_container", {
 
 **Related sample**: [Combobox. Initial value](https://snippet.dhtmlx.com/spnausim)
 
-- If *multiselection:true* is set for a combo, the property takes an array of string values as: *value: ["1","2","3"]*,
-- If *multiselection:false* is set or the *multiselection* config is not defined, the property gets either of the two values: *value:"1"* or *value: ["1"]*.
+- If *multiselection:true* is set for a combo, the property takes an array with options' ids: for example, *value: ["id_1","id_2","id_3"]* or *value: [1, 2, 3]*,
+- If *multiselection:false* is set or the *multiselection* config is not defined, the property gets either of the two values: *value:"id_1"*, *value: 1*, or *value: ["id_1"]*.
 
 ## Label
 

docs/form/api/calendar/api_calendar_properties.md

@@ -113,7 +113,7 @@ description: You can explore the Properties of the Datepicker control of Form in
         </tr>
         <tr>
             <td><b>dateFormat</b></td>
-            <td>(optional) defines the format of dates in the calendar, "%d/%m/%y" by default</td>
+            <td>(optional) defines the format of dates in the calendar, "%d/%m/%y" by default. The date format must include delimiters (space or symbol), otherwise an error will be thrown</td>
         </tr>
         <tr>
             <td><b>disabledDates</b></td>

docs/form/api/combo/combo_setvalue_method.md

@@ -8,17 +8,13 @@ description: You can explore the setValue method of the Combo Box control of For
 
 @short: sets the value for a Combo control
 
-@signature: {'setValue(value: Id | Id[]): void;'}
+@signature: {'setValue(ids: Id | Id[]): void;'}
 
 @params:
 - `value: (string | number) | (string | number)[]` - the ID(s) of options from data collection that should be selected in the control
 
 @descr:
 
-:::info
-Note, that you need to pass the **ID(s)** of Combo options as a value of the **value** parameter.
-:::
-
 #### Example
 
 When the `multiselection` property of Combo control isn't specified or is set to *false*, you can set the value of ID as a string, number or array:

docs/grid/api/api_gridcolumn_properties.md

@@ -180,7 +180,7 @@ columns:[
 		</tr>
         <tr>
 			<td><a href="../../configuration#formatting-columns"><b>format</b></a></td>
-			<td>(optional) defines the format for the content of the column's cells</td>
+			<td>(optional) defines the format for the content of the column's cells. The date format must include delimiters (space or symbol), otherwise an error will be thrown</td>
 		</tr>
         <tr>
 			<td><b>options</b></td>