Merge branch 'master' of https://github.com/KimForss/azure-docs-pr

Author: KimForss

articles/active-directory/app-provisioning/toc.yml

@@ -18,8 +18,14 @@
       href: customize-application-attributes.md
     - name: App specific provisioning tutorials
       href: /azure/active-directory/saas-apps/tutorial-list
-    - name: Provisioning to SQL based apps
-      href: tutorial-ecma-sql-connector.md
+    - name: On-prem app provisioning tutorials
+      items:
+      - name: Provisioning to On-premises SCIM-enabled apps
+        href: on-premises-scim-provisioning.md
+      - name: Provisioning to SQL based apps
+        href: on-premises-sql-connector-configure.md
+      - name: Provisioning to LDAP based apps
+        href: on-premises-ldap-connector-configure.md
   - name: Concepts
     expanded: true
     items: 
@@ -62,10 +68,6 @@
         href: export-import-provisioning-configuration.md  
       - name: Provisioning reports
         href: ../reports-monitoring/concept-provisioning-logs.md?context=%2fazure%2factive-directory%2fapp-provisioning%2fcontext%2fapp-provisioning-context
-    - name: Automate configuration using MS Graph
-      href: application-provisioning-configuration-api.md
-    - name: Enable accidental deletions prevention
-      href: accidental-deletions.md
     - name: Troubleshoot application provisioning
       items:
       - name: Known issues
@@ -82,16 +84,6 @@
         href: on-premises-ecma-troubleshoot.md
       - name: Provisioning logs
         href: ../reports-monitoring/concept-provisioning-logs.md?context=%2fazure%2factive-directory%2fapp-provisioning%2fcontext%2fapp-provisioning-context
-    - name: On-premises app provisioning
-      items:
-      - name: Provisioning to SQL based apps
-        href: on-premises-sql-connector-configure.md
-      - name: Generic LDAP Connector configuration
-        href: on-premises-ldap-connector-configure.md
-      - name: On-premises application provisioning to SCIM-enabled apps
-        href: on-premises-scim-provisioning.md
-      - name: Migrate connector from MIM Sync
-        href: on-premises-migrate-microsoft-identity-manager.md
     - name: Troubleshoot HR provisioning
       items:
       - name: Attribute retrieval issues
@@ -104,14 +96,18 @@
         href: hr-manager-update-issues.md
       - name: HR writeback issues
         href: hr-writeback-issues.md
+    - name: Enable accidental deletions prevention
+      href: accidental-deletions.md
+    - name: Automate configuration using MS Graph
+      href: application-provisioning-configuration-api.md
   - name: Reference
     items:
+    - name: Function reference for writing expressions for attribute mappings
+      href: functions-for-customizing-application-data.md
     - name: SCIM 2.0 protocol compliance
       href: application-provisioning-config-problem-scim-compatibility.md
     - name: SCIM and Graph scenarios
       href: scim-graph-scenarios.md
-    - name: Function reference for writing expressions for attribute mappings
-      href: functions-for-customizing-application-data.md
     - name: Cloud HR provisioning
       items:
       - name: SuccessFactors attribute reference
@@ -120,6 +116,8 @@
         href: workday-attribute-reference.md
       - name: Provisioning Agent version history
         href: provisioning-agent-release-version-history.md
+      - name: Migrate connector from MIM Sync
+        href: on-premises-migrate-microsoft-identity-manager.md
   - name: Resources
     items:
     - name: Support and help options for developers

articles/active-directory/fundamentals/azure-active-directory-parallel-identity-options.md

@@ -33,7 +33,7 @@ To add or deactivate custom security attributes, you must have:
 
 ## Add an attribute set
 
-An attribute set is a group of related attributes. All custom security attributes must be part of an attribute set. Attribute sets cannot be renamed or deleted.
+An attribute set is a collection of related attributes. All custom security attributes must be part of an attribute set. Attribute sets cannot be renamed or deleted.
 
 1. Sign in to the [Azure portal](https://portal.azure.com) or [Azure AD admin center](https://aad.portal.azure.com).
 

articles/active-directory/fundamentals/custom-security-attributes-add.md

@@ -108,7 +108,7 @@ To better understand custom security attributes, you can refer back to the follo
 | Term | Definition |
 | --- | --- |
 | attribute definition | The schema of a custom security attribute or key-value pair. For example, the custom security attribute name, description, data type, and predefined values. |
-| attribute set | A group of related custom security attributes. Attribute sets can be delegated to other users for defining and assigning custom security attributes. |
+| attribute set | A collection of related custom security attributes. Attribute sets can be delegated to other users for defining and assigning custom security attributes. |
 | attribute name | A unique name of a custom security attribute within an attribute set. The combination of attribute set and attribute name forms a unique attribute for your tenant. |
 | attribute assignment | The assignment of a custom security attribute to an Azure AD object, such as users, enterprise applications (service principals), and managed identities. |
 | predefined value | A value that is allowed for a custom security attribute. |
@@ -122,7 +122,7 @@ The following table lists the properties you can specify for attribute sets and
 | Attribute set name  | :heavy_check_mark: |  | Name of the attribute set. Must be unique within a tenant. Cannot include spaces or special characters. |
 | Attribute set description |  | :heavy_check_mark: | Description of the attribute set. |
 | Maximum number of attributes |  | :heavy_check_mark: | Maximum number of custom security attributes that can be defined in an attribute set. Default value is `null`. If not specified, the administrator can add up to the maximum of 500 active attributes per tenant. |
-| Attribute set | :heavy_check_mark: |  | A group of related custom security attributes. Every custom security attribute must be part of an attribute set. |
+| Attribute set | :heavy_check_mark: |  | A collection of related custom security attributes. Every custom security attribute must be part of an attribute set. |
 | Attribute name  | :heavy_check_mark: |  | Name of the custom security attribute. Must be unique within an attribute set. Cannot include spaces or special characters. |
 | Attribute description |  | :heavy_check_mark: | Description of the custom security attribute. |
 | Data type | :heavy_check_mark: |  | Data type for the custom security attribute values. Supported types are `Boolean`, `Integer`, and `String`. |