Merge branch 'development' into ad-session

Author: Adam Dupaski

content/en/docs/howto7/data-models/query-over.md

@@ -12,7 +12,7 @@ When using more generic domain models, you often turn to using inheritance or se
 
 {{< figure src="/attachments/howto7/data-models/query-over/18581639.png" >}}
 
-There are 5 groups relevant to this example. Group with ID 4 and 5 are the parent groups and each have the same three subgroups. 
+There are five groups relevant to this example. Group with ID 4 and 5 are the parent groups and each have the same three subgroups. 
 
 If you have the ParentGroup available in your microflow you can easily retrieve the subgroup. The platform automatically determines which of the two groups from the association is used. Each association has a left side (the association owner) and a right side (child in the association). XPath constraint can are read from left to right as well, and this is key to how you should interpret which of the two groups is being used.  
 

content/en/docs/howto7/data-models/setting-up-data-validation.md

@@ -21,7 +21,7 @@ This section will explain how you can add validation rules to the domain model o
 
     {{< figure src="/attachments/howto7/data-models/setting-up-data-validation/18582148.png" >}}
 
-5. Select the **attribute** of which the value should be validated.
+5. Select the **attribute** for which the value should be validated.
 6. Enter an **error message** that is shown to the user if the validation fails.
 7. Select the **rule type**.
 8. Click **OK** to save this validation rule.

content/en/docs/howto7/integration/consume-a-rest-service.md

@@ -167,5 +167,3 @@ Congratulations! You can now start your app and get summaries from Wikipedia.
 * [How to Consume a Simple Web Service](/howto7/integration/consume-a-simple-web-service/)
 * [How to Export XML Documents](/howto7/integration/export-xml-documents/)
 * [How to Import XML Documents](/howto7/integration/importing-xml-documents/)
-* [How to Import Excel Documents](/howto7/integration/importing-excel-documents/)
-* [How to Expose a Web Service](/howto7/integration/expose-a-web-service/)

content/en/docs/refguide7/desktop-modeler/java-actions.md

@@ -64,9 +64,7 @@ The Import mapping parameter type was introduced in Mendix 7.2.0.
 The **Export mapping** parameter type allows users of Java Actions to pass an export mapping into a Java action. In the generated Java action template code, this type is represented as a string (the name of the export mapping).
 
 {{% alert color="info" %}}
-
 The Export mapping parameter type was introduced in version 7.2.0.
-
 {{% /alert %}}
 
 #### 2.2.5 Return Type