Skip to content

Commit ff3d782

Browse files
rayne-wiselmanrayne-wiselman
authored
Merge branch 'master' into raynejanuary12
2 parents 4d7d726 + bad93a2 commit ff3d782

File tree

537 files changed

+5033
-3639
lines changed

Some content is hidden

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

537 files changed

+5033
-3639
lines changed

‎.openpublishing.redirection.json

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/azure/virtual-machines/linux/create-cli-complete",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path": "articles/virtual-machines/workloads/workloads.md",
60+
"redirect_url": "/azure/virtual-machines/",
61+
"redirect_document_id": false
62+
},
5863
{
5964
"source_path": "articles/virtual-machines/windows/maintenance-and-updates.md",
6065
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",
@@ -12560,6 +12565,11 @@
1256012565
"redirect_url": "/azure/event-hubs/event-hubs-node-get-started-send",
1256112566
"redirect_document_id": false
1256212567
},
12568+
{
12569+
"source_path": "articles/event-hubs/event-hubs-python.md",
12570+
"redirect_url": "/azure/event-hubs/event-hubs-python-get-started-send",
12571+
"redirect_document_id": false
12572+
},
1256312573
{
1256412574
"source_path": "articles/event-hubs/event-hubs-python-get-started-receive.md",
1256512575
"redirect_url": "/azure/event-hubs/event-hubs-python-get-started-send",
@@ -12677,7 +12687,12 @@
1267712687
},
1267812688
{
1267912689
"source_path": "articles/hdinsight/hdinsight-hadoop-create-windows-clusters-dotnet-sdk.md",
12680-
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-create-linux-clusters-dotnet-sdk",
12690+
"redirect_url": "https://docs.microsoft.com/dotnet/api/overview/azure/hdinsight?view=azure-dotnet",
12691+
"redirect_document_id": false
12692+
},
12693+
{
12694+
"source_path": "articles/hdinsight/hdinsight-hadoop-create-linux-clusters-dotnet-sdk.md",
12695+
"redirect_url": "https://docs.microsoft.com/dotnet/api/overview/azure/hdinsight?view=azure-dotnet",
1268112696
"redirect_document_id": false
1268212697
},
1268312698
{
@@ -28222,8 +28237,13 @@
2822228237
},
2822328238
{
2822428239
"source_path": "articles/hdinsight/hdinsight-deep-learning-caffe-spark.md",
28225-
"redirect_url": "/azure/hdinsight/spark/apache-spark-deep-learning-caffe",
28226-
"redirect_document_id": true
28240+
"redirect_url": "/azure/hdinsight/spark/apache-spark-machine-learning-mllib-ipython",
28241+
"redirect_document_id": false
28242+
},
28243+
{
28244+
"source_path": "articles/hdinsight/spark/apache-spark-deep-learning-caffe.md",
28245+
"redirect_url": "/azure/hdinsight/spark/apache-spark-machine-learning-mllib-ipython",
28246+
"redirect_document_id": false
2822728247
},
2822828248
{
2822928249
"source_path": "articles/hdinsight/hdinsight-develop-deploy-java-mapreduce-linux.md",
@@ -40799,6 +40819,11 @@
4079940819
"redirect_url": "/azure/azure-databricks/databricks-extract-load-sql-data-warehouse",
4080040820
"redirect_document_id": false
4080140821
},
40822+
{
40823+
"source_path": "articles/azure-databricks/vnet-injection.md",
40824+
"redirect_url": "/azure/databricks/administration-guide/cloud-configurations/azure/vnet-inject",
40825+
"redirect_document_id": false
40826+
},
4080240827
{
4080340828
"source_path": "articles/security/blueprints/gdpr-analytics-overview.md",
4080440829
"redirect_url": "https://aka.ms/azureblueprint",
@@ -41176,7 +41201,12 @@
4117641201
},
4117741202
{
4117841203
"source_path": "articles/hdinsight/hdinsight-hadoop-giraph-install.md",
41179-
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-giraph-install-linux",
41204+
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-hue-linux",
41205+
"redirect_document_id": false
41206+
},
41207+
{
41208+
"source_path": "articles/hdinsight/hdinsight-hadoop-giraph-install-linux.md",
41209+
"redirect_url": "/azure/hdinsight/hdinsight-hadoop-hue-linux",
4118041210
"redirect_document_id": false
4118141211
},
4118241212
{
@@ -45623,6 +45653,22 @@
4562345653
"source_path": "articles/media-services/latest/cae-experimental.md",
4562445654
"redirect_url": "/azure/media-services/latest/content-aware-encoding",
4562545655
"redirect_document_id": true
45656+
},
45657+
{
45658+
"source_path": "articles/virtual-machines/workloads/redhat/redhat-byos.md",
45659+
"redirect_url": "/azure/virtual-machines/workloads/redhat/byos",
45660+
"redirect_document_id": false
45661+
},
45662+
{
45663+
"source_path": "articles/virtual-machines/workloads/redhat/redhat-overview.md",
45664+
"redirect_url": "/azure/virtual-machines/workloads/redhat/overview",
45665+
"redirect_document_id": false
45666+
},
45667+
{
45668+
"source_path": "articles/load-balancer/load-balancer-arm.md",
45669+
"redirect_url": "/azure/load-balancer/load-balancer-overview",
45670+
"redirect_document_id": true
4562645671
}
4562745672
]
45628-
}
45673+
}
45674+

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-basic.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,17 +298,19 @@ After your RESTful service is protected by the client ID (username) and secret,
298298

299299
## Step 5: Upload the policy to your tenant
300300

301-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then open **Azure AD B2C**.
301+
1. In the [Azure portal](https://portal.azure.com), select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
302302
303-
2. Select **Identity Experience Framework**.
303+
1. In the Azure portal, search for and select **Azure AD B2C**.
304304

305-
3. Open **All Policies**.
305+
1. Select **Identity Experience Framework**.
306306

307-
4. Select **Upload Policy**.
307+
1. Open **All Policies**.
308308

309-
5. Select the **Overwrite the policy if it exists** check box.
309+
1. Select **Upload Policy**.
310310

311-
6. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
311+
1. Select the **Overwrite the policy if it exists** check box.
312+
313+
1. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
312314

313315
## Step 6: Test the custom policy by using Run Now
314316

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw-secure-cert.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,19 @@ To support client certificate authentication in your custom policy, change the t
9696

9797
## Step 4: Upload the policy to your tenant
9898

99-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then select **Azure AD B2C**.
99+
1. In the [Azure portal](https://portal.azure.com), select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
100100

101-
2. Select **Identity Experience Framework**.
101+
1. In the Azure portal, search for and select **Azure AD B2C**.
102102

103-
3. Select **All Policies**.
103+
1. Select **Identity Experience Framework**.
104104

105-
4. Select **Upload Policy**.
105+
1. Select **All Policies**.
106106

107-
5. Select the **Overwrite the policy if it exists** check box.
107+
1. Select **Upload Policy**.
108108

109-
6. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
109+
1. Select the **Overwrite the policy if it exists** check box.
110+
111+
1. Upload the *TrustFrameworkExtensions.xml* file, and then ensure that it passes validation.
110112

111113
## Step 5: Test the custom policy by using Run Now
112114
1. Open **Azure AD B2C Settings**, and then select **Identity Experience Framework**.

‎articles/active-directory-b2c/active-directory-b2c-custom-rest-api-netfw.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,9 @@ After you add the new claim, the relying party code looks like this:
333333

334334
## Step 7: Upload the policy to your tenant
335335

336-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then open **Azure AD B2C**.
336+
1. In the [Azure portal](https://portal.azure.com), Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
337+
338+
1. In the Azure portal, search for and select **Azure AD B2C**.
337339

338340
1. Select **Identity Experience Framework**.
339341

‎articles/active-directory-b2c/active-directory-b2c-how-to-enable-billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ The management of Azure AD B2C using role-based access control is not affected b
130130

131131
Azure AD B2C tenants can be moved to another subscription if the source and destination subscriptions exist within the same Azure Active Directory tenant.
132132

133-
To learn how to move Azure resources like your Azure AD B2C tenant to another subscription, see [Move resources to new resource group or subscription](../azure-resource-manager/resource-group-move-resources.md).
133+
To learn how to move Azure resources like your Azure AD B2C tenant to another subscription, see [Move resources to new resource group or subscription](../azure-resource-manager/management/move-resource-group-and-subscription.md).
134134

135135
Before you initiate the move, be sure to read the entire article to fully understand the limitations and requirements for such a move. In addition to instructions for moving resources, it includes critical information like a pre-move checklist and how to validate the move operation.
136136

‎articles/active-directory-b2c/active-directory-b2c-ui-customization-custom-dynamic.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,19 @@ To configure `ContentDefinition`, do the following:
213213
![Example XML snippet with LoadUri element highlighted](media/active-directory-b2c-ui-customization-custom-dynamic/aadb2c-ief-ui-customization-content-definition.png)
214214

215215
## Step 6: Upload the policy to your tenant
216-
1. In the [Azure portal](https://portal.azure.com), switch to the [context of your Azure AD B2C tenant](active-directory-b2c-navigate-to-b2c-context.md), and then select **Azure AD B2C**.
216+
1. In the [Azure portal](https://portal.azure.com), select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
217217
218-
2. Select **Identity Experience Framework**.
218+
1. In the Azure portal, search for and select **Azure AD B2C**.
219219

220-
3. Select **All Policies**.
220+
1. Select **Identity Experience Framework**.
221221

222-
4. Select **Upload Policy**.
222+
1. Select **All Policies**.
223223

224-
5. Select the **Overwrite the policy if it exists** check box.
224+
1. Select **Upload Policy**.
225225

226-
6. Upload the *TrustFrameworkExtensions.xml* file, and ensure that it passes validation.
226+
1. Select the **Overwrite the policy if it exists** check box.
227+
228+
1. Upload the *TrustFrameworkExtensions.xml* file, and ensure that it passes validation.
227229

228230
## Step 7: Test the custom policy by using Run Now
229231
1. Select **Azure AD B2C Settings**, and then select **Identity Experience Framework**.
@@ -341,7 +343,3 @@ If you select the **Sign up now** link on the sign-in page, the browser displays
341343
## (Optional) Download the complete policy files and code
342344
* After you complete the [Get started with custom policies](active-directory-b2c-get-started-custom.md) walkthrough, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [Sample policy files](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-ui-customization).
343345
* You can download the complete code from [Sample Visual Studio solution for reference](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/scenarios/aadb2c-ief-ui-customization).
344-
345-
346-
347-

‎articles/active-directory-b2c/cookie-definitions.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ The following table lists the cookies used in Azure Active Directory B2C.
1919

2020
| Name | Domain | Expiration | Purpose |
2121
| ----------- | ------ | -------------------------- | --------- |
22-
| x-ms-cpim-admin | main.b2cadmin.ext.azure.com | End of [browser session](active-directory-b2c-token-session-sso.md) | Holds user membership data across tenants. The tenants a user is a member of and level of membership (Admin or User). |
23-
| x-ms-cpim-slice | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used to route requests to the appropriate production instance. |
24-
| x-ms-cpim-trans | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used for tracking the transactions (number of authentication requests to Azure AD B2C) and the current transaction. |
25-
| x-ms-cpim-sso:{Id} | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used for maintaining the SSO session. |
26-
| x-ms-cpim-cache:{id}_n | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md), successful authentication | Used for maintaining the request state. |
27-
| x-ms-cpim-csrf | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Cross-Site Request Forgery token used for CRSF protection. |
28-
| x-ms-cpim-dc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used for Azure AD B2C network routing. |
29-
| x-ms-cpim-ctx | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Context |
30-
| x-ms-cpim-rp | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used for storing membership data for the resource provider tenant. |
31-
| x-ms-cpim-rc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](active-directory-b2c-token-session-sso.md) | Used for storing the relay cookie. |
32-
22+
| x-ms-cpim-admin | main.b2cadmin.ext.azure.com | End of [browser session](session-behavior.md) | Holds user membership data across tenants. The tenants a user is a member of and level of membership (Admin or User). |
23+
| x-ms-cpim-slice | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used to route requests to the appropriate production instance. |
24+
| x-ms-cpim-trans | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for tracking the transactions (number of authentication requests to Azure AD B2C) and the current transaction. |
25+
| x-ms-cpim-sso:{Id} | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for maintaining the SSO session. |
26+
| x-ms-cpim-cache:{id}_n | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md), successful authentication | Used for maintaining the request state. |
27+
| x-ms-cpim-csrf | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Cross-Site Request Forgery token used for CRSF protection. |
28+
| x-ms-cpim-dc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for Azure AD B2C network routing. |
29+
| x-ms-cpim-ctx | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Context |
30+
| x-ms-cpim-rp | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for storing membership data for the resource provider tenant. |
31+
| x-ms-cpim-rc | login.microsoftonline.com, b2clogin.com, branded domain | End of [browser session](session-behavior.md) | Used for storing the relay cookie. |

‎articles/active-directory-b2c/relyingparty.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ The **OutputClaim** element contains the following attributes:
204204
### SubjectNamingInfo
205205

206206
With the **SubjectNameingInfo** element, you control the value of the token subject:
207-
- **JWT token** - the `sub` claim. This is a principal about which the token asserts information, such as the user of an application. This value is immutable and cannot be reassigned or reused. It can be used to perform safe authorization checks, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. For more information, see [Token, session and single sign-on configuration](active-directory-b2c-token-session-sso.md).
207+
- **JWT token** - the `sub` claim. This is a principal about which the token asserts information, such as the user of an application. This value is immutable and cannot be reassigned or reused. It can be used to perform safe authorization checks, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. For more information, see [Token, session and single sign-on configuration](session-behavior.md).
208208
- **SAML token** - the `<Subject><NameID>` element which identifies the subject element.
209209

210210
The **SubjectNamingInfo** element contains the following attribute:
@@ -242,5 +242,3 @@ The JWT token includes the `sub` claim with the user objectId:
242242
...
243243
}
244244
```
245-
246-

‎articles/active-directory-domain-services/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
href: ../active-directory/fundamentals/active-directory-whatis.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
5050
- name: Azure Active Directory architecture
5151
href: ../active-directory/fundamentals/active-directory-architecture.md?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
52-
- name: Implement least-privilege administrative models
53-
href: /windows-server/identity/ad-ds/plan/security-best-practices/implementing-least-privilege-administrative-models?context=/azure/active-directory-domain-services/context/azure-ad-ds-context
5452
- name: How to
5553
items:
5654
- name: Configure common settings

0 commit comments

Comments
 (0)