Skip to content

Commit ff3b9de

Browse files
committed
Merge remote-tracking branch 'refs/remotes/MicrosoftDocs/master' into nitinme-retire-services
2 parents d0e81f7 + 716d3b7 commit ff3b9de

File tree

109 files changed

+790
-4343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+790
-4343
lines changed

.openpublishing.redirection.json

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,120 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/virtual-network/create-virtual-network-classic.md",
5+
"redirect_url": "/previous-versions/azure/virtual-network/create-virtual-network-classic",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-pportal.md",
10+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-pportal",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps.md",
15+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-cli.md",
20+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
25+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file.md",
30+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/virtual-network/virtual-networks-using-network-configuration-file.md",
35+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-using-network-configuration-file",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/virtual-network/virtual-networks-migrate-to-regional-vnet.md",
40+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-migrate-to-regional-vnet",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-ps.md",
45+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-ps",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-cli.md",
50+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-cli",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/virtual-network/virtual-network-create-udr-classic-ps.md",
55+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-ps",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/virtual-network/virtual-network-create-udr-classic-cli.md",
60+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-ps.md",
65+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-ps",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-cli.md",
70+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-cli",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/virtual-network/virtual-networks-reserved-public-ip.md",
75+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/virtual-network/virtual-networks-reserved-private-ip.md",
80+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/virtual-network/virtual-networks-static-private-ip-classic-cli.md",
85+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-static-private-ip-classic-cli",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/virtual-network/virtual-networks-instance-level-public-ip.md",
90+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-instance-level-public-ip",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/virtual-network/virtual-networks-acl-powershell.md",
95+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl-powershell",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/virtual-network/virtual-networks-move-vm-role-to-subnet.md",
100+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-move-vm-role-to-subnet",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "articles/virtual-network/virtual-networks-sample-app.md",
105+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-sample-app",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "articles/virtual-network/virtual-network-ip-addresses-overview-classic.md",
110+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-ip-addresses-overview-classic",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "articles/virtual-network/virtual-networks-acl.md",
115+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl",
116+
"redirect_document_id": false
117+
},
3118
{
4119
"source_path": "articles/power-bi-workspace-collections/app-token-flow.md",
5120
"redirect_url": "/previous-versions/azure/power-bi-workspace-collections/app-token-flow",
@@ -14847,6 +14962,16 @@
1484714962
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
1484814963
"redirect_document_id": true
1484914964
},
14965+
{
14966+
"source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
14967+
"redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
14968+
"redirect_document_id": false
14969+
},
14970+
{
14971+
"source_path": "articles/machine-learning/machine-learning/how-to-ui-sample-classification-predict-flight-delay.md",
14972+
"redirect_url": "/azure/machine-learning/how-to-designer-sample-classification-flight-delay",
14973+
"redirect_document_id": false
14974+
},
1485014975
{
1485114976
"source_path": "articles/log-analytics/log-analytics-add-solutions.md",
1485214977
"redirect_url": "/azure/monitoring/monitoring-solutions",
@@ -47189,6 +47314,31 @@
4718947314
"source_path": "articles/mysql/concepts-aad-authentication.md",
4719047315
"redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
4719147316
"redirect_document_id": false
47317+
},
47318+
{
47319+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-portal.md",
47320+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
47321+
"redirect_document_id": false
47322+
},
47323+
{
47324+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-cli.md",
47325+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47326+
"redirect_document_id": false
47327+
},
47328+
{
47329+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-powershell.md",
47330+
"redirect_url": "articles/load-balancer/quickstart-load-balancer-standard-public-powershell",
47331+
"redirect_document_id": false
47332+
},
47333+
{
47334+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-arm-template.md",
47335+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-template",
47336+
"redirect_document_id": false
47337+
},
47338+
{
47339+
"source_path": "articles/load-balancer/create-load-balancer-rest-api.md",
47340+
"redirect_url": "/rest/api/load-balancer/loadbalancers/createorupdate",
47341+
"redirect_document_id": false
4719247342
}
4719347343
]
4719447344
}

articles/active-directory/develop/howto-add-app-roles-in-azure-ad-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ These application roles are defined in the [Azure portal](https://portal.azure.c
4040
1. Edit the app manifest by locating the `appRoles` setting and adding all your Application Roles.
4141

4242
> [!NOTE]
43-
> Each app role definition in this manifest must have a different valid GUID for the `id` property.
43+
> Each app role definition in this manifest must have a different valid GUID within the context of the manifest for the `id` property.
4444
>
4545
> The `value` property of each app role definition should exactly match the strings that are used in the code in the application. The `value` property can't contain spaces. If it does, you'll receive an error when you save the manifest.
4646

articles/active-directory/develop/scenario-desktop-acquire-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ To sign in a domain user on a domain or Azure AD joined machine, use Integrated
410410

411411
- The authority passed in `PublicClientApplicationBuilder` needs to be:
412412
- Tenanted of the form `https://login.microsoftonline.com/{tenant}/`, where `tenant` is either the GUID that represents the tenant ID or a domain associated with the tenant.
413-
- For any [work and school accounts](`https://login.microsoftonline.com/organizations/`).
413+
- For any work and school accounts: `https://login.microsoftonline.com/organizations/`.
414414
- Microsoft personal accounts aren't supported. You can't use /common or /consumers tenants.
415415

416416
- Because Integrated Windows Authentication is a silent flow:

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ It is typical to force a user to change their password during their first logon,
125125

126126
The temporary password functionality helps to ensure that the transfer of ownership of the credential is completed on first use, to minimize the duration of time in which more than one individual has knowledge of that credential.
127127

128-
To support temporary passwords in Azure AD for synchronized users, you can enable the *ForcePasswordResetOnLogonFeature* feature, by running the following command on your Azure AD Connect server:
128+
To support temporary passwords in Azure AD for synchronized users, you can enable the *ForcePasswordChangeOnLogOn* feature, by running the following command on your Azure AD Connect server:
129129

130-
`Set-ADSyncAADCompanyFeature  -ForcePasswordResetOnLogonFeature $true`
130+
`Set-ADSyncAADCompanyFeature  -ForcePasswordChangeOnLogOn $true`
131131

132132
> [!NOTE]
133133
> Forcing a user to change their password on next logon requires a password change at the same time. AD Connect will not pick up the force password change flag by itself; it is supplemental to the detected password change that occurs during password hash sync.

articles/active-directory/manage-apps/define-conditional-rules-for-provisioning-user-accounts.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ Scoping filters are configured as part of the attribute mappings for each Azure
8989
g. **REGEX MATCH**. Clause returns "true" if the evaluated attribute matches a regular expression pattern. For example: ([1-9][0-9]) matches any number between 10 and 99.
9090

9191
h. **NOT REGEX MATCH**. Clause returns "true" if the evaluated attribute doesn't match a regular expression pattern.
92-
92+
93+
i. **Greater_Than.** Clause returns "true" if the evaluated attribute is greater than the value. The value specified on the scoping filter must be an integer and the attribute on the user must be an integer [0,1,2,...].
94+
95+
j. **Greater_Than_OR_EQUALS.** Clause returns "true" if the evaluated attribute is greater than or equal to the value. The value specified on the scoping filter must be an integer and the attribute on the user must be an integer [0,1,2,...].
96+
97+
9398
>[!IMPORTANT]
9499
> The Includes and IsMemberOf filters are not supported. They will soon be removed from the UI.
95100

articles/active-directory/manage-apps/use-scim-to-provision-users-and-groups.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,8 @@ The SCIM spec does not define a SCIM-specific scheme for authentication and auth
13771377
* Client ID: The authorization server issues the registered client a client identifier, which is a unique string representing the registration information provided by the client. The client identifier is not a secret; it is exposed to the resource owner and **must not** be used alone for client authentication.
13781378
* Client secret: The client secret is a secret generated by the authorization server. It should be a unique value known only to the authorization server.
13791379

1380+
Note that OAuth v1 is not supported due to exposure of the client secret. OAuth v2 is supported.
1381+
13801382
Best practices (recommended but not required):
13811383
* Support multiple redirect URLs. Administrators can configure provisioning from both "portal.azure.com" and "aad.portal.azure.com". Supporting multiple redirect URLs will ensure that users can authorize access from either portal.
13821384
* Support multiple secrets to ensure smooth secret renewal, without downtime.

articles/active-directory/manage-apps/user-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Azure AD features pre-integrated support for many popular SaaS apps and human re
6262

6363
* **Applications that support SCIM 2.0**. For information on how to generically connect applications that implement SCIM 2.0-based user management APIs, see [Build a SCIM endpoint and configure user provisioning](use-scim-to-provision-users-and-groups.md).
6464

65-
## What is SCIM?
65+
## What is System for Cross-domain Identity Management (SCIM)?
6666

6767
To help automate provisioning and deprovisioning, apps expose proprietary user and group APIs. However, anyone who’s tried to manage users in more than one app will tell you that every app tries to perform the same simple actions, such as creating or updating users, adding users to groups, or deprovisioning users. Yet, all these simple actions are implemented just a little bit differently, using different endpoint paths, different methods to specify user information, and a different schema to represent each element of information.
6868

articles/active-directory/saas-apps/gigya-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ To configure Azure AD single sign-on with Gigya, perform the following steps:
108108
`https://fidm.gigya.com/saml/v2.0/<companyname>`
109109

110110
> [!NOTE]
111-
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Gigya Client support team](https://www.gigya.com/support-policy/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
111+
> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [Gigya Client support team](https://developers.gigya.com/display/GD/Opening+A+Support+Incident) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
112112

113113
5. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Certificate (Base64)** from the given options as per your requirement and save it on your computer.
114114

articles/active-directory/saas-apps/google-apps-provisioning-tutorial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ For more information on how to read the Azure AD provisioning logs, see [Reporti
205205

206206
## Common issues
207207
* Authorization failures can occur when the account used to establish a connection is not for an administrator in GSuite. Ensure that the account used to authorize access has admin permissions over **all domains** that users need to be provisioned with.
208+
* Azure AD supports disabling users in GSuite so that they cannot access the application, but it does not delete users in GSuite.
208209

209210
## Next steps
210211

articles/active-directory/users-groups-roles/groups-dynamic-membership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ You can also create a rule that selects device objects for membership in a group
365365
> [!NOTE]
366366
> systemlabels is a read-only attribute that cannot be set with Intune.
367367
>
368-
> For Windows 10, the correct format of the deviceOSVersion attribute is as follows: (device.deviceOSVersion -eq "10.0 (17763)"). The formatting can be validated with the Get-MsolDevice PowerShell cmdlet.
368+
> For Windows 10, the correct format of the deviceOSVersion attribute is as follows: (device.deviceOSVersion -eq "10.0.17763"). The formatting can be validated with the Get-MsolDevice PowerShell cmdlet.
369369
370370
The following device attributes can be used.
371371

0 commit comments

Comments
 (0)