Skip to content

Commit b83456e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into egridsystemtopic0316
2 parents 77b9438 + d01124a commit b83456e

File tree

278 files changed

+6280
-1540
lines changed

Some content is hidden

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

278 files changed

+6280
-1540
lines changed

.openpublishing.redirection.json

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2170,6 +2170,11 @@
21702170
"redirect_url": "/azure/cosmos-db/create-sql-api-python",
21712171
"redirect_document_id": false
21722172
},
2173+
{
2174+
"source_path": "articles/cosmos-db/cosmos-db-security-controls.md",
2175+
"redirect_url": "/azure/cosmos-db/security-baseline",
2176+
"redirect_document_id": false
2177+
},
21732178
{
21742179
"source_path": "articles/cosmos-db/powershell-samples.md",
21752180
"redirect_url": "/azure/cosmos-db/powershell-samples-sql",
@@ -13604,6 +13609,11 @@
1360413609
"redirect_url": "/azure/event-hubs/authorize-access-azure-active-directory",
1360513610
"redirect_document_id": false
1360613611
},
13612+
{
13613+
"source_path": "articles/event-hubs/event-hubs-tutorial-virtual-networks-firewalls.md",
13614+
"redirect_url": "/azure/event-hubs/event-hubs-service-endpoints",
13615+
"redirect_document_id": false
13616+
},
1360713617
{
1360813618
"source_path": "articles/active-directory/active-directory-saml-protocol-reference.md",
1360913619
"redirect_url": "/azure/active-directory/develop/active-directory-saml-protocol-reference",
@@ -15786,7 +15796,12 @@
1578615796
},
1578715797
{
1578815798
"source_path": "articles/machine-learning/machine-learning-dedicated-capacity-for-bes-jobs.md",
15789-
"redirect_url": "/azure/machine-learning/studio/dedicated-capacity-for-bes-jobs",
15799+
"redirect_url": "/azure/machine-learning/studio/consume-web-services",
15800+
"redirect_document_id": false
15801+
},
15802+
{
15803+
"source_path": "articles/machine-learning/studio/dedicated-capacity-for-bes-jobs.md",
15804+
"redirect_url": "/azure/machine-learning/studio/consume-web-services",
1579015805
"redirect_document_id": false
1579115806
},
1579215807
{
@@ -49284,6 +49299,11 @@
4928449299
"redirect_url": "/azure/azure-monitor/overview",
4928549300
"redirect_document_id": false
4928649301
},
49302+
{
49303+
"source_path": "articles/cli/index.yml",
49304+
"redirect_url": "/cli/azure",
49305+
"redirect_document_id": false
49306+
},
4928749307
{
4928849308
"source_path": "articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md",
4928949309
"redirect_url": "/azure/jenkins/tutorial-build-deploy-jenkins",
@@ -49383,6 +49403,21 @@
4938349403
"source_path": "articles/media-services/latest/create-account-cli-how-to.md",
4938449404
"redirect_url": "/azure/media-services/latest/create-account-howto",
4938549405
"redirect_document_id": false
49406+
},
49407+
{
49408+
"source_path": "articles/mariadb/howto-tls-configurations.md",
49409+
"redirect_url": "/azure/mariadb/howto-configure-ssl",
49410+
"redirect_document_id": false
49411+
},
49412+
{
49413+
"source_path": "articles/mysql/howto-tls-configurations.md",
49414+
"redirect_url": "/azure/mysql/howto-configure-ssl",
49415+
"redirect_document_id": false
49416+
},
49417+
{
49418+
"source_path": "articles/postgresql/howto-tls-configurations.md",
49419+
"redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
49420+
"redirect_document_id": false
4938649421
}
4938749422
]
4938849423
}

articles/active-directory/app-provisioning/application-provisioning-configure-api.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Content-type: application/json
171171

172172
### Retrieve the template for the provisioning connector
173173

174-
Applications in the gallery that are enabled for provisioning have templates to streamline configuration. Use the request below to [retrieve the template for the provisioning configuration](https://docs.microsoft.com/graph/api/synchronization-synchronizationtemplate-list?view=graph-rest-beta&tabs=http).
174+
Applications in the gallery that are enabled for provisioning have templates to streamline configuration. Use the request below to [retrieve the template for the provisioning configuration](https://docs.microsoft.com/graph/api/synchronization-synchronizationtemplate-list?view=graph-rest-beta&tabs=http). Note that you will need to provide the ID. The ID refers to the preceding resource, which in this case is the ServicePrincipal.
175175

176176
#### *Request*
177177

@@ -263,10 +263,10 @@ Content-type: application/json
263263

264264
### Test the connection to the application
265265

266-
Test the connection with the third-party application. The example below is for an application that requires clientSecret and secretToken. Each application has its on requirements. Review the [API documentation](https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-validatecredentials?view=graph-rest-beta&tabs=http) to see the available options.
266+
Test the connection with the third-party application. The example below is for an application that requires clientSecret and secretToken. Each application has its on requirements. Applications often use BaseAddress in place of ClientSecret. To determine what credentials your app requires, navigate to the provisioning configuration page for your application and in developer mode click test connection. The network traffic will show the parameters used for credentials. The full list of credentials can be found [here](https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-validatecredentials?view=graph-rest-beta&tabs=http).
267267

268268
#### *Request*
269-
```http
269+
```msgraph-interactive
270270
POST https://graph.microsoft.com/beta/servicePrincipals/{id}/synchronization/jobs/{id}/validateCredentials
271271
{
272272
credentials: [
@@ -290,7 +290,7 @@ HTTP/1.1 204 No Content
290290
Configuring provisioning requires establishing a trust between Azure AD and the application. Authorize access to the third-party application. The example below is for an application that requires clientSecret and secretToken. Each application has its on requirements. Review the [API documentation](https://docs.microsoft.com/graph/api/synchronization-synchronizationjob-validatecredentials?view=graph-rest-beta&tabs=http) to see the available options.
291291

292292
#### *Request*
293-
```json
293+
```msgraph-interactive
294294
PUT https://graph.microsoft.com/beta/servicePrincipals/{id}/synchronization/secrets
295295
296296
{

articles/active-directory/develop/howto-convert-app-to-be-multi-tenant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: active-directory
1111
ms.subservice: develop
1212
ms.topic: conceptual
1313
ms.workload: identity
14-
ms.date: 02/19/2020
14+
ms.date: 03/17/2020
1515
ms.author: ryanwi
1616
ms.reviewer: jmprieur, lenalepa, sureshja, kkrishna
1717
ms.custom: aaddev
@@ -172,7 +172,7 @@ In this article, you learned how to build an application that can sign in a user
172172

173173
## Related content
174174

175-
* [Multi-tenant application sample](https://github.com/mspnp/multitenant-saas-guidance)
175+
* [Multi-tenant application sample](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/blob/master/2-WebApp-graph-user/2-3-Multi-Tenant/README.md)
176176
* [Branding guidelines for applications][AAD-App-Branding]
177177
* [Application objects and service principal objects][AAD-App-SP-Objects]
178178
* [Integrating applications with Azure Active Directory][AAD-Integrating-Apps]

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,15 @@ Based on the scenario that matches your identity infrastructure, see:
144144
- [Configure hybrid Azure Active Directory join for federated environment](hybrid-azuread-join-federated-domains.md)
145145
- [Configure hybrid Azure Active Directory join for managed environment](hybrid-azuread-join-managed-domains.md)
146146

147-
## Review on-premises AD UPN support for Hybrid Azure AD join
147+
## Review on-premises AD users UPN support for Hybrid Azure AD join
148148

149-
Sometimes, your on-premises AD UPNs could be different from your Azure AD UPNs. In such cases, Windows 10 Hybrid Azure AD join provides limited support for on-premises AD UPNs based on the [authentication method](/azure/security/fundamentals/choose-ad-authn), domain type and Windows 10 version. There are two types of on-premises AD UPNs that can exist in your environment:
149+
Sometimes, your on-premises AD users UPNs could be different from your Azure AD UPNs. In such cases, Windows 10 Hybrid Azure AD join provides limited support for on-premises AD UPNs based on the [authentication method](/azure/security/fundamentals/choose-ad-authn), domain type and Windows 10 version. There are two types of on-premises AD UPNs that can exist in your environment:
150150

151-
- Routable UPN: A routable UPN has a valid verified domain, that is registered with a domain registrar. For example, if contoso.com is the primary domain in Azure AD, contoso.org is the primary domain in on-premises AD owned by Contoso and [verified in Azure AD](/azure/active-directory/fundamentals/add-custom-domain)
152-
- Non-routable UPN: A non-routable UPN does not have a verified domain. It is applicable only within your organization's private network. For example, if contoso.com is the primary domain in Azure AD, contoso.local is the primary domain in on-premises AD but is not a verifiable domain in the internet and only used within Contoso's network.
151+
- Routable users UPN: A routable UPN has a valid verified domain, that is registered with a domain registrar. For example, if contoso.com is the primary domain in Azure AD, contoso.org is the primary domain in on-premises AD owned by Contoso and [verified in Azure AD](/azure/active-directory/fundamentals/add-custom-domain)
152+
- Non-routable users UPN: A non-routable UPN does not have a verified domain. It is applicable only within your organization's private network. For example, if contoso.com is the primary domain in Azure AD, contoso.local is the primary domain in on-premises AD but is not a verifiable domain in the internet and only used within Contoso's network.
153+
154+
> [!NOTE]
155+
> The information in this section applies only to an on-premises users UPN. It isn't applicable to an on-premises computer domain suffix (example: computer1.contoso.local).
153156
154157
The table below provides details on support for these on-premises AD UPNs in Windows 10 Hybrid Azure AD join
155158

articles/active-directory/fundamentals/active-directory-data-storage-australia-newzealand.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@ ms.custom: "it-pro, seodec18"
1515
ms.collection: M365-identity-device-management
1616
---
1717

18-
# Identity data storage for Australian customers in Azure Active Directory
18+
# Identity data storage for Australian and New Zealand customers in Azure Active Directory
1919

2020
Identity data is stored by Azure AD in a geographical location based on the address provided by your organization when subscribing for a Microsoft Online service such as Office 365 and Azure. For information on where your Identity Customer Data is stored, you can use the [Where is your data located?](https://www.microsoft.com/trustcenter/privacy/where-your-data-is-located) section of the Microsoft Trust Center.
2121

2222
> [!NOTE]
2323
> Services and applications that integrate with Azure AD have access to Identity Customer Data. Evaluate each service and application you use to determine how Identity Customer Data is processed by that specific service and application, and whether they meet your company's data storage requirements. For more information about Microsoft services' data residency, see the Where is your data located? section of the Microsoft Trust Center.
2424
25-
For customers who provided an address in Australia, Azure AD keeps identity data for these services within Australian datacenters:
26-
- Azure AD Directory Management
27-
- Authentication
25+
For customers who provided an address in Australia and New Zealand and uses Azure AD free edition, Azure AD keeps PII data at rest within Australian datacenters.
2826

29-
All other Azure AD services store customer data in global datacenters. To locate the datacenter for a service, see [Azure Active Directory – Where is your data located?](https://www.microsoft.com/trustcenter/privacy/where-your-data-is-located)
27+
All other Azure AD premium services store customer data in global datacenters. To locate the datacenter for a service, see [Azure Active Directory – Where is your data located?](https://www.microsoft.com/trustcenter/privacy/where-your-data-is-located)
3028

3129
## Microsoft Azure multi-factor authentication (MFA)
3230

33-
MFA stores Identity Customer Data in global datacenters. To learn more about the user information collected and stored by cloud-based Azure MFA and Azure MFA Server, see [Azure Multi-Factor Authentication user data collection](https://docs.microsoft.com/azure/active-directory/authentication/concept-mfa-data-residency).
31+
MFA service in Azure AD stores Identity Customer Data in global datacenters at rest. To learn more about the user information collected and stored by cloud-based Azure MFA and Azure MFA Server, see [Azure Multi-Factor Authentication user data collection](https://docs.microsoft.com/azure/active-directory/authentication/concept-mfa-data-residency). If customers use MFA their data will be stored outside of Australia datacenters at rest.
3432

3533
## Next steps
3634
For more information about any of the features and functionality described above, see these articles:

0 commit comments

Comments
 (0)