4d
diff --git a/‎docs/API/CollectionClass.md‎
Lines changed: 3 additions & 3 deletions b/‎docs/API/CollectionClass.md‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎docs/API/DataClassClass.md‎
Lines changed: 15 additions & 1 deletion b/‎docs/API/DataClassClass.md‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎docs/API/EntitySelectionClass.md‎
Lines changed: 2 additions & 0 deletions b/‎docs/API/EntitySelectionClass.md‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎docs/API/WebFormClass.md‎
Lines changed: 84 additions & 53 deletions b/‎docs/API/WebFormClass.md‎
Lines changed: 84 additions & 53 deletions
@@ -4,7 +4,7 @@ title: Collection
 ---
 
 
-The Collection class manages [Collection](Concepts/dt_collection.md) type variables.
+The Collection class manages [Collection](Concepts/dt_collection.md) type expressions.
 
 A collection is initialized with the [`New collection`](../commands/new-collection.md) or [`New shared collection`](../commands/new-shared-collection.md) commands.
 
@@ -295,13 +295,13 @@ $c.combine($fruits;3) //[1,2,3,"Orange","Banana","Apple","Grape",4,5,6]
 
 </details>
 
-<!-- REF #collection.concat().Syntax -->**.concat**( *value* : any { *;...valueN* } ) : Collection<!-- END REF -->
+<!-- REF #collection.concat().Syntax -->**.concat**( *value* : any { ; *...valueN* } ) : Collection<!-- END REF -->
 
 
 <!-- REF #collection.concat().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|value|Number, Text, Object, Collection, Date, Time, Boolean, Picture|->|Value(s) to concatenate. If *value* is a collection, all collection elements are added to the original collection|
+|value|any|->|Value(s) to concatenate. If *value* is a collection, all collection elements are added to the original collection|
 |Result|Collection|<-|New collection with value(s) added to the original collection|
 <!-- END REF -->
 
 
@@ -934,7 +934,7 @@ When using a constant value, the following rules must be respected:
   * **date** type constants: "YYYY-MM-DD" format
   * **null** constant: using the "null" keyword will find **null** and **undefined** properties.  
   * in case of a query with an IN comparator, *value* must be a collection, or values matching the type of the attribute path between \[ ] separated by commas (for strings, `"` characters must be escaped with `\`).
-  * **object**: only [4D.Vector](../API/VectorClass.md) objects are supported, in the context of **vector similarity queries** (*attributePath* must also contain valid 4D.Vector objects). 
+  * **object**: only [4D.Vector](../API/VectorClass.md) objects are supported, in the context of [**vector similarity queries**](#query-by-vector-similarity) (*attributePath* must also contain valid 4D.Vector objects). 
 * **logicalOperator**: used to join multiple conditions in the query (optional). You can use one of the following logical operators (either the name or the symbol can be used):
 
  |Conjunction|Symbol(s)|
@@ -1206,6 +1206,20 @@ var $comparisonVector := {vector: $myVector; metric: mk euclidean; threshold: 1.
 var $results := ds.MyClass.query("myVectorField <= :1"; $comparisonVector)
 ```
 
+The **order by** statement is supported in the query string so that entities in the resulting entity selection are sorted by similarity. For example:
+
+```4d
+var $results := ds.MyClass.query("myVectorField > :1 order by myVectorField"; $comparisonVector)  
+  //default order, the first entity is the most similar
+```
+
+If the same vector appears multiple times in the query string, the order by will be applied to the results of the first one, for example:
+
+```4d
+var $results := ds.MyClass.query("myVectorField > :1 and myVectorField > :2 order by myVectorField" desc; /
+    {vector : $myVector1 };{vector : $myVector2 })  //myVectorField > :1 is used for the order by
+```
+
 See [more examples below](#example-4-2) (examples 4 and 5). 
 
 :::tip Related blog posts
 
@@ -1800,6 +1800,8 @@ In this example, the "marks" object field in the **Students** dataClass contains
 
 |Release|Changes|
 |---|---|
+|21 R2|Support of order by with 4D.Vector searches|
+|21|Support 4D.Vector objects|
 |17 R6|Support of Formula parameters|
 |17 R5|Support of placeholders for values|
 |17|Added|
 
@@ -4,7 +4,7 @@ title: WebForm
 ---
 
 
-The `WebForm` class contains functions and properties allowing to handle your Qodly webform components. This class is detailed in the [Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass).
+The `WebForm` class contains functions and properties allowing to handle your Qodly web page components. `4D.WebForm` objects are instantiated with the [`webForm`](../commands/web-form.md) command.
 
 <details><summary>History</summary>
 
@@ -16,21 +16,16 @@ The `WebForm` class contains functions and properties allowing to handle your Qo
 </details>
 
 
-
-
 ### Commands and functions
 
 ||
 |---|
-|[<!-- INCLUDE #WebFormClass.componentName.Syntax -->](#componentname)<br/><!-- INCLUDE #WebFormClass.componentName.Summary -->|
+|[<!-- INCLUDE WebFormClass.componentName.Syntax -->](#componentname)<br/><!-- INCLUDE #WebFormClass.componentName.Summary -->|
 |[<!-- INCLUDE #WebFormClass.disableState().Syntax -->](#disablestate)<br/><!-- INCLUDE #WebFormClass.disableState().Summary -->|
 |[<!-- INCLUDE #WebFormClass.enableState().Syntax -->](#enablestate)<br/><!-- INCLUDE #WebFormClass.enableState().Summary -->|
 |[<!-- INCLUDE #WebFormClass.setError().Syntax -->](#seterror)<br/><!-- INCLUDE #WebFormClass.setError().Summary -->|
 |[<!-- INCLUDE #WebFormClass.setMessage().Syntax -->](#setmessage)<br/><!-- INCLUDE #WebFormClass.setMessage().Summary -->|
 |[<!-- INCLUDE #WebFormClass.setWarning().Syntax -->](#setwarning)<br/><!-- INCLUDE #WebFormClass.setWarning().Summary -->|
-|[<!-- INCLUDE #_command_.Web Form.Syntax -->](#web-form)<br/><!-- INCLUDE #_command_.Web Form.Summary -->|
-|[<!-- INCLUDE #_command_.Web Event.Syntax -->](#web-event)<br/><!-- INCLUDE #_command_.Web Event.Summary -->|
-
 
 
 ### *.componentName*
@@ -39,11 +34,27 @@ The `WebForm` class contains functions and properties allowing to handle your Qo
 
 #### Description
 
-The components of webforms are <!-- REF #WebFormClass.componentName.Summary -->objects that are available directly as properties<!-- END REF --> of these webforms.
+The components of web pages are <!-- REF #WebFormClass.componentName.Summary -->objects that are available directly as properties<!-- END REF --> of these web pages.
+
+The returned objects are of the [`4D.WebFormItem`](WebFormItemClass.md) class. These objects have functions that you can use to manage your components dynamically.
+
+#### Example
+
+```4d  
+shared singleton Class constructor()
+	
+	var myForm : 4D.WebForm
+	var component : 4D.WebFormItem
+	
+	myForm:=webForm  //returns the web page as an object, each property is a component
+	component:=myForm.myImage  //returns the myImage component of the web page
 
-For more information, please refer to the [`.componentName` description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#componentname).
+```
+:::info
 
+While `myForm` may not display typical object properties when examined in the debugger, it behaves as if it were the actual `webForm` object. You can interact with the underlying `webForm` object's properties and functions through `myForm`. For example, you can dynamically manipulate page components or transmit messages to web pages using specialized functions like `myForm.setMessage()`.
 
+:::
 
 ### .disableState()
 
@@ -52,20 +63,20 @@ For more information, please refer to the [`.componentName` description in the Q
 <!-- REF #WebFormClass.disableState().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|state|string|->|Name of state to disable from the web form|
+|state|string|->|Name of state to disable from the web page|
 <!-- END REF -->
 
 #### Description
 
-The `.disableState()` function <!-- REF #WebFormClass.disableState().Summary -->disables the rendering of the *state* in the current web form<!-- END REF -->.
+The `.disableState()` function <!-- REF #WebFormClass.disableState().Summary -->disables the rendering of the *state* in the current web page<!-- END REF -->.
 
 This function does nothing if:
-- the *state* is currently not enabled in the web form,
-- the *state* does not exist for the web form.
+- the *state* is currently not enabled in the web page,
+- the *state* does not exist for the web page.
 
 If you [enable](#enablestate) or disable several states in the same user function, all modifications are sent at the same time to the client once the function ends.
 
-For more information on web form states, please refer to [developer.qodly.com](https://developer.qodly.com/docs/studio/pageLoaders/states).
+For more information on web pages states, please refer to the [States section in the Qodly documentation](https://developer.4d.com/qodly/4DQodlyPro/pageLoaders/states/stateOverview).
 
 
 
@@ -77,26 +88,26 @@ For more information on web form states, please refer to [developer.qodly.com](h
 <!-- REF #WebFormClass.enableState().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|state|string|->|Name of state to enable on the web form|
+|state|string|->|Name of state to enable on the web pages|
 <!-- END REF -->
 
 #### Description
 
-The `.enableState()` function <!-- REF #WebFormClass.enableState().Summary -->enables the rendering of the *state* in the current web form<!-- END REF -->.
+The `.enableState()` function <!-- REF #WebFormClass.enableState().Summary -->enables the rendering of the *state* in the current web page<!-- END REF -->.
 
 This function does nothing if:
-- the *state* has already been enabled on the web form,
-- the *state* does not exist for the web form.
+- the *state* has already been enabled on the web page,
+- the *state* does not exist for the web page.
 
 If you enable or [disable](#disablestate) several states within the same user function, all modifications are sent at the same time to the client once the function ends.
 
-For more information on web form states, please refer to [developer.qodly.com](https://developer.qodly.com/docs/studio/pageLoaders/states).
+For more information on web page states, please refer to the [States section in the Qodly documentation](https://developer.4d.com/qodly/4DQodlyPro/pageLoaders/states/stateOverview).
 
 #### Example
 
 You enable a specific state named "wrongCredentials" in case of error in your login page:
 
-```4d
+```4d  
 Function authenticationError()
 	If (Session.info.type#"remote")
 		Web Form.enableState("wrongCredentials")
@@ -111,16 +122,31 @@ Function authenticationError()
 <!-- REF #WebFormClass.setError().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|msg|string|->|Error message to display in the web form|
+|msg|string|->|Error message to display in the web page|
 <!-- END REF -->
 
 #### Description
 
-The `.setError()` function <!-- REF #WebFormClass.setError().Summary -->sends *msg* as an error message to the web form<!-- END REF -->.
+The `.setError()` function <!-- REF #WebFormClass.setError().Summary -->sends *msg* as an error message to the web page<!-- END REF -->.
+
+The function returns a response with a `200 OK` status and a `__WEBFORM` object in the body with a `__NOTIFICATION.message` property set to *msg* and a `__NOTIFICATION.type` set to "error".
 
-For more information, please refer to the [`.setError()` description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#seterror).
+#### Example
+
+```4d  
+shared singleton Class constructor()
+exposed function myError()
+
+var myForm : 4D.WebForm
+myForm:=web Form
+
+myForm.setError("My error message")
+
+```
 
+If the [**Provide feedback**](https://developer.4d.com/qodly/4DQodlyPro/pageLoaders/events/bindingActionToEvents#providing-feedback) feature is enabled for the event, the *message* is automatically displayed as a red *toast* at the bottom of the Page and disappears automatically after 5 seconds:
 
+![](../assets/en/API/webformClass-pic1.png)
 
 ### .setMessage()
 
@@ -129,62 +155,67 @@ For more information, please refer to the [`.setError()` description in the Qodl
 <!-- REF #WebFormClass.setMessage().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|msg|string|->|Information message to display in the web form|
+|msg|string|->|Information message to display in the web page|
 <!-- END REF -->
 
 #### Description
 
-The `.setMessage()` function <!-- REF #WebFormClass.setMessage().Summary -->sends *msg* as an information message to the web form<!-- END REF -->.
-
-For more information, please refer to the [`.setMessage()` description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#setmessage).
+The `.setMessage()` function <!-- REF #WebFormClass.setMessage().Summary -->sends *msg* as an information message to the web page<!-- END REF -->.
 
+The function returns a response with a `200 OK` status and a `__WEBFORM` object in the body with a `__NOTIFICATION.message` property set to *msg* and a `__NOTIFICATION.type` set to "message".
 
-### .setWarning()
+#### Example
 
-<!-- REF #WebFormClass.setWarning().Syntax -->**.setWarning**( *msg* : string)<!-- END REF -->
+```4d
+shared singleton Class constructor()
+exposed function myMessage()
 
-<!-- REF #WebFormClass.setWarning().Params -->
-|Parameter|Type||Description|
-|---------|--- |:---:|------|
-|msg|string|->|Warning message to display in the web form|
-<!-- END REF -->
+var myForm : 4D.WebForm
+myForm:=web Form
 
-#### Description
+myForm.setMessage("My information message")
 
-The `.setWarning()` function  <!-- REF #WebFormClass.setWarning().Summary -->sends *msg* as a warning message to the web form<!-- END REF -->.
+```
 
-For more information, please refer to the [`.setWarning()` description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#setwarning).
+If the [**Provide feedback**](https://developer.4d.com/qodly/4DQodlyPro/pageLoaders/events/bindingActionToEvents#providing-feedback) feature is enabled for the event, the *message* is automatically displayed as a green *toast* at the bottom of the Page and disappears automatically after 5 seconds:
 
+![](../assets/en/API/webformClass-pic2.png)
 
-## Web Form
+### .setWarning()
 
-<!-- REF #_command_.Web Form.Syntax -->**Web Form** : 4D.WebForm<!-- END REF -->
+<!-- REF #WebFormClass.setWarning().Syntax -->**.setWarning**( *msg* : string)<!-- END REF -->
 
-<!-- REF #_command_.Web Form.Params -->
+<!-- REF #WebFormClass.setWarning().Params -->
 |Parameter|Type||Description|
 |---------|--- |:---:|------|
-|Result|4D.WebForm|<-|New `WebForm` proxy object
+|msg|string|->|Warning message to display in the web page|
 <!-- END REF -->
 
 #### Description
 
-The `Web Form` command <!-- REF #_command_.Web Form.Summary --> returns a `4D.WebForm` proxy object that allows you to interact with the web form<!-- END REF -->.
+The `.setWarning()` function  <!-- REF #WebFormClass.setWarning().Summary -->sends *msg* as a warning message to the web page<!-- END REF -->.
 
-For more information, please refer to the [`webForm` command description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#webform).
+The function returns a response with a `200 OK` status and a `__WEBFORM` object in the body with a `__NOTIFICATION.message` property set to *msg* and a `__NOTIFICATION.type` set to "warning".
 
+#### Example
 
-## Web Event
+```4d
+shared singleton Class constructor()
+exposed function myWarning()
 
-<!-- REF #_command_.Web Event.Syntax -->**Web Event** : Object<!-- END REF -->
+var myForm : 4D.WebForm
+myForm:=web Form
 
-<!-- REF #_command_.Web Event.Params -->
-|Parameter|Type||Description|
-|---------|--- |:---:|------|
-|Result|object|<-| object
-<!-- END REF -->
+myForm.setWarning("My warning message")
 
-#### Description
+```
+
+If the [**Provide feedback**](https://developer.4d.com/qodly/4DQodlyPro/pageLoaders/events/bindingActionToEvents#providing-feedback) feature is enabled for the event, the *message* is automatically displayed as a yellow *toast* at the bottom of the web page and disappears automatically after 5 seconds:
+
+![](../assets/en/API/webformClass-pic3.png)
 
-The `Web Event` command <!-- REF #_command_.Web Event.Summary -->returns an object with information on a triggered event linked to a webform component<!-- END REF -->.
+## See also 
 
-For more information, please refer to the [`webEvent` command description in the Qodly documentation](https://developer.qodly.com/docs/language/WebFormClass#webevent).
+[Web Form](../commands/web-form.md)</br>
+[Web Event](../commands/web-event.md)</br>
+[WebFormItem class](../API/WebFormItemClass.md)