Skip to content

Commit 5e90c8f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into release-rebrand-sqldw
2 parents 4383ed3 + 15daa58 commit 5e90c8f

File tree

337 files changed

+3067
-1652
lines changed

Some content is hidden

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

337 files changed

+3067
-1652
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13391,6 +13391,11 @@
1339113391
"redirect_url": "/azure/event-hubs/event-hubs-faq",
1339213392
"redirect_document_id": false
1339313393
},
13394+
{
13395+
"source_path": "articles/event-hubs/event-hubs-authentication-and-security-model-overview.md",
13396+
"redirect_url": "/azure/event-hubs/authenticate-shared-access-signature",
13397+
"redirect_document_id": false
13398+
},
1339413399
{
1339513400
"source_path": "articles/event-hubs/event-hubs-c-ephcs-getstarted.md",
1339613401
"redirect_url": "/azure/event-hubs/event-hubs-c-getstarted-send",
@@ -48981,6 +48986,11 @@
4898148986
"source_path": "articles/aks/acs-aks-migration.md",
4898248987
"redirect_url": "/azure/aks/aks-migration",
4898348988
"redirect_document_id": false
48989+
},
48990+
{
48991+
"source_path": "articles/service-fabric/service-fabric-cicd-your-linux-applications-with-jenkins.md",
48992+
"redirect_url": "/azure/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins",
48993+
"redirect_document_id": true
4898448994
}
4898548995
]
4898648996
}

articles/active-directory-b2c/stringcollection-transformations.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: celestedg
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
12-
ms.date: 02/03/2020
12+
ms.date: 02/27/2020
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -22,13 +22,13 @@ This article provides examples for using the string collection claims transforma
2222

2323
## AddItemToStringCollection
2424

25-
Adds a string claim to a new stringCollection claim.
25+
Adds a string claim to a new unique values stringCollection claim.
2626

2727
| Item | TransformationClaimType | Data Type | Notes |
2828
| ---- | ----------------------- | --------- | ----- |
2929
| InputClaim | item | string | The ClaimType to be added to the output claim. |
3030
| InputClaim | collection | stringCollection | [Optional] If specified, the claims transformation copies the items from this collection, and adds the item to the end of the output collection claim. |
31-
| OutputClaim | collection | stringCollection | The ClaimTypes that are produced after this ClaimsTransformation has been invoked. |
31+
| OutputClaim | collection | stringCollection | The ClaimType that is produced after this claims transformation has been invoked, with the value specified in the input claim. |
3232

3333
Use this claims transformation to add a string to a new or existing stringCollection. It's commonly used in a **AAD-UserWriteUsingAlternativeSecurityId** technical profile. Before a new social account is created, **CreateOtherMailsFromEmail** claims transformation reads the ClaimType and adds the value to the **otherMails** ClaimType.
3434

@@ -56,13 +56,13 @@ The following claims transformation adds the **email** ClaimType to **otherMails
5656

5757
## AddParameterToStringCollection
5858

59-
Adds a string parameter to a new stringCollection claim.
59+
Adds a string parameter to a new unique values stringCollection claim.
6060

6161
| Item | TransformationClaimType | Data Type | Notes |
6262
| ---- | ----------------------- | --------- | ----- |
6363
| InputClaim | collection | stringCollection | [Optional] If specified, the claims transformation copies the items from this collection, and adds the item to the end of the output collection claim. |
6464
| InputParameter | item | string | The value to be added to the output claim. |
65-
| OutputClaim | collection | stringCollection | The ClaimTypes that will be produced after this ClaimsTransformation has been invoked. |
65+
| OutputClaim | collection | stringCollection | The ClaimType that is produced after this claims transformation has been invoked, with the value specified in the input parameter. |
6666

6767
Use this claims transformation to add a string value to a new or existing stringCollection. The following example adds a constant email address ([email protected]) to the **otherMails** claim.
6868

articles/active-directory-domain-services/scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The following deployment considerations apply to this example use case:
9393

9494
You can use Azure AD DS to provide managed domain services to remote desktop servers deployed in Azure. For more information about this deployment scenario, see [how to integrate Azure AD Domain Services with your RDS deployment][windows-rds].
9595

96-
## Domain-joined HDInsight clusters (preview)
96+
## Domain-joined HDInsight clusters
9797

9898
You can set up an Azure HDInsight cluster that is joined to an Azure AD DS managed domain with Apache Ranger enabled. You can create and apply Hive policies through Apache Ranger, and allow users, such as data scientists, to connect to Hive using ODBC-based tools like Excel or Tableau. We continue to work to add other workloads, such as HBase, Spark, and Storm to domain-joined HDInsight.
9999

articles/active-directory/cloud-provisioning/reference-cloud-provisioning-faq.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: daveba
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: overview
10-
ms.date: 12/02/2019
10+
ms.date: 02/26/2020
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313
ms.collection: M365-identity-device-management
@@ -66,6 +66,14 @@ No, cloud provisioning does not support writeback of ms-ds-consistencyGUID for a
6666

6767
When you delete the configuration, cloud provisioning does not cleanup the synced objects in Azure AD. To ensure you do not have the old objects, change the scope of the configuration to an empty group or Organizational Units. Once the provisioning runs and cleans up the objects, disable and delete the configuration.
6868

69+
**Q: What does it mean that Exchange hybrid is not supported?**
70+
71+
The Exchange Hybrid Deployment feature allows for the co-existence of Exchange mailboxes both on-premises and in Office 365. Azure AD Connect is synchronizing a specific set of attributes from Azure AD back into your on-premises directory. The cloud provisioning agent currently does not synchronize these attributes back into your on-premises directory and thus it is not supported as a replacement for Azure AD Connect.
72+
73+
**Q: Can I install the cloud provisioning agent on Windows Server Core?**
74+
75+
No, installing the agent on server core is not supported.
76+
6977
## Next steps
7078

7179
- [What is provisioning?](what-is-provisioning.md)

articles/active-directory/develop/quickstart-v2-android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ We'll now look at these files in more detail and call out the MSAL-specific code
168168
MSAL ([com.microsoft.identity.client](https://javadoc.io/doc/com.microsoft.identity.client/msal)) is the library used to sign in users and request tokens used to access an API protected by Microsoft identity platform. Gradle 3.0+ installs the library when you add the following to **Gradle Scripts** > **build.gradle (Module: app)** under **Dependencies**:
169169
170170
```gradle
171-
implementation 'com.microsoft.identity.client:msal:1.0.0'
171+
implementation 'com.microsoft.identity.client:msal:1.+'
172172
```
173173
174174
You can see this in the sample project in build.gradle (Module: app):
175175
176176
```java
177177
dependencies {
178178
...
179-
implementation 'com.microsoft.identity.client:msal:1.0.+'
179+
implementation 'com.microsoft.identity.client:msal:1.+'
180180
...
181181
}
182182
```

articles/active-directory/develop/tutorial-v2-android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ If you do not already have an Android application, follow these steps to set up
153153
jcenter()
154154
}
155155
dependencies{
156-
implementation 'com.microsoft.identity.client:msal:1.2.+'
156+
implementation 'com.microsoft.identity.client:msal:1.+'
157157
implementation 'com.microsoft.graph:microsoft-graph:1.5.+'
158158
}
159159
packagingOptions{

articles/active-directory/devices/concept-primary-refresh-token.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ A PRT can get a multi-factor authentication (MFA) claim in specific scenarios. W
113113
* As Windows Hello for Business is considered multi-factor authentication, the MFA claim is updated when the PRT itself is refreshed, so the MFA duration will continually extend when users sign in with WIndows Hello for Business
114114
* **MFA during WAM interactive sign in**: During a token request through WAM, if a user is required to do MFA to access the app, the PRT that is renewed during this interaction is imprinted with an MFA claim.
115115
* In this case, the MFA claim is not updated continuously, so the MFA duration is based on the lifetime set on the directory.
116+
* When a previous existing PRT and RT are used for access to an app, the PRT and RT will be regarded as the first proof of authentication. A new AT will be required with a second proof and an imprinted MFA claim. This will also issue a new PRT and RT.
116117
* **MFA during device registration**: If an admin has configured their device settings in Azure AD to [require MFA to register devices](device-management-azure-portal.md#configure-device-settings), the user needs to do MFA to complete the registration. During this process, the PRT that is issued to the user has the MFA claim obtained during the registration. This capability only applies to the user who did the join operation, not to other users who sign in to that device.
117118
* Similar to the WAM interactive sign in, the MFA claim is not updated continuously, so the MFA duration is based on the lifetime set on the directory.
118119

articles/active-directory/devices/device-management-azure-portal.md

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@ This article:
2828

2929
## Manage device identities
3030

31-
The Azure AD portal provides you with a central place to manage your device identities. You can get to this place by either using a [direct link](https://portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/Devices) or by following these manual steps:
31+
The Azure AD portal provides you with a central place to manage your device identities. You can get to this place by either using a [direct link](https://portal.azure.com/#blade/Microsoft_AAD_IAM/DevicesMenuBlade/Devices) or:
3232

33-
1. Sign in to the [Azure portal](https://portal.azure.com) as administrator.
34-
35-
2. Search for and select **Azure Active Directory** or select it from the **Home** page.
36-
37-
3. In the **Manage** section, click **Devices**.
38-
39-
![Configure device settings](./media/device-management-azure-portal/74.png)
33+
1. Sign in to the [Azure portal](https://portal.azure.com).
34+
1. Browse to **Azure Active Directory** > **Devices**.
4035

4136
The **Devices** page enables you to:
4237

@@ -49,9 +44,7 @@ The **Devices** page enables you to:
4944

5045
To manage your device identities using the Azure AD portal, your devices need to be either [registered or joined](overview.md) to Azure AD. As an administrator, you can fine-tune the process of registering and joining devices by configuring the device settings.
5146

52-
![Configure device settings](./media/device-management-azure-portal/22.png)
53-
54-
The device settings page enables you to configure:
47+
The device settings page enables you to configure settings related to device identities:
5548

5649
![Manage an Intune device](./media/device-management-azure-portal/21.png)
5750

@@ -81,13 +74,8 @@ This option is a premium capability available through products such as Azure AD
8174
You have two options to locate registered and joined devices:
8275

8376
- **All devices** in the **Manage** section of the **Devices** page
84-
85-
![All devices](./media/device-management-azure-portal/41.png)
86-
8777
- **Devices** in the **Manage** section of a **User** page
8878

89-
![All devices](./media/device-management-azure-portal/43.png)
90-
9179
With both options, you can get to a view that:
9280

9381
- Enables you to search for devices using the display name or device ID as filter.
@@ -193,9 +181,7 @@ Device activities are available through the activity logs. These logs include ac
193181

194182
Your entry point to the auditing data is **Audit logs** in the **Activity** section of the **Devices** page.
195183

196-
![Audit logs](./media/device-management-azure-portal/61.png)
197-
198-
An audit log has a default list view that shows:
184+
The audit log has a default list view that shows:
199185

200186
- The date and time of the occurrence
201187
- The targets

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,8 @@
375375
href: kube-advisor-tool.md
376376
- name: SSH node access
377377
href: ssh.md
378+
- name: Linux performance tools
379+
href: troubleshoot-linux.md
378380
- name: Reference
379381
items:
380382
- name: Azure CLI

articles/aks/faq.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ No AKS is a managed service, and manipulation of the IaaS resources is not suppo
182182

183183
<!-- LINKS - internal -->
184184

185-
[aks-regions]: ./quotas-skus-regions.md#region-availability
186185
[aks-upgrade]: ./upgrade-cluster.md
187186
[aks-cluster-autoscale]: ./autoscaler.md
188187
[aks-advanced-networking]: ./configure-azure-cni.md
@@ -201,7 +200,7 @@ No AKS is a managed service, and manipulation of the IaaS resources is not suppo
201200
[availability-zones]: ./availability-zones.md
202201

203202
<!-- LINKS - external -->
204-
203+
[aks-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service
205204
[auto-scaler]: https://github.com/kubernetes/autoscaler
206205
[cordon-drain]: https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/
207206
[hexadite]: https://github.com/Hexadite/acs-keyvault-agent

0 commit comments

Comments
 (0)