Skip to content

Commit dc1db62

Browse files
authored
Merge pull request #297 from MicrosoftDocs/master
rmerge
2 parents 6b33b1c + 9682a7d commit dc1db62

File tree

2,629 files changed

+25131
-11781
lines changed

Some content is hidden

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

2,629 files changed

+25131
-11781
lines changed

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
stale-pr-label: inactive
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
21-
operations-per-run: 700
21+
operations-per-run: 800
2222
ascending: true
23-
start-date: '2020-12-17'
23+
start-date: '2021-07-13'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
2626
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.redirection.json

Lines changed: 57 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,6 +2263,36 @@
22632263
"redirect_url": "/azure/machine-learning/overview-what-is-azure-machine-learning",
22642264
"redirect_document_id": true
22652265
},
2266+
{
2267+
"source_path_from_root": "/articles/machine-learning/classic/migrate-overview.md",
2268+
"redirect_url": "/azure/machine-learning/migrate-overview",
2269+
"redirect_document_id": true
2270+
},
2271+
{
2272+
"source_path_from_root": "/articles/machine-learning/classic/migrate-register-dataset.md",
2273+
"redirect_url": "/azure/machine-learning/migrate-register-dataset",
2274+
"redirect_document_id": true
2275+
},
2276+
{
2277+
"source_path_from_root": "/articles/machine-learning/classic/migrate-rebuild-experiment.md",
2278+
"redirect_url": "/azure/machine-learning/migrate-rebuild-experiment",
2279+
"redirect_document_id": true
2280+
},
2281+
{
2282+
"source_path_from_root": "/articles/machine-learning/classic/migrate-rebuild-web-service.md",
2283+
"redirect_url": "/azure/machine-learning/migrate-rebuild-web-service",
2284+
"redirect_document_id": true
2285+
},
2286+
{
2287+
"source_path_from_root": "/articles/machine-learning/classic/migrate-rebuild-integrate-with-client-app.md",
2288+
"redirect_url": "/azure/machine-learning/migrate-rebuild-integrate-with-client-app",
2289+
"redirect_document_id": true
2290+
},
2291+
{
2292+
"source_path_from_root": "/articles/machine-learning/classic/migrate-execute-r-script.md",
2293+
"redirect_url": "/azure/machine-learning/migrate-execute-r-script",
2294+
"redirect_document_id": true
2295+
},
22662296
{
22672297
"source_path": "articles/machine-learning/resource-known-issues.md",
22682298
"redirect_url": "/azure/machine-learning/how-to-configure-auto-train#troubleshooting",
@@ -2723,7 +2753,6 @@
27232753
"redirect_url": "/azure/app-service/",
27242754
"redirect_document_id": false
27252755
},
2726-
27272756
{
27282757
"source_path_from_root": "/articles/app-service-web/app-service-best-practices.md",
27292758
"redirect_url": "/azure/app-service/app-service-best-practices",
@@ -6349,6 +6378,11 @@
63496378
"redirect_url": "/azure/azure-functions/functions-openapi-definition",
63506379
"redirect_document_id": false
63516380
},
6381+
{
6382+
"source_path_from_root": "/articles/azure-functions/dotnet-isolated-process-developer-howtos.md",
6383+
"redirect_url": "/azure/azure-functions/dotnet-isolated-process-guide",
6384+
"redirect_document_id": false
6385+
},
63526386
{
63536387
"source_path_from_root": "/articles/functions/functions-overview.md",
63546388
"redirect_url": "/azure/azure-functions/functions-overview",
@@ -12489,7 +12523,6 @@
1248912523
"redirect_url": "/azure/applied-ai-services/form-recognizer",
1249012524
"redirect_document_id": false
1249112525
},
12492-
1249312526
{
1249412527
"source_path_from_root": "/articles/sql-database/sql-database-security-controls.md",
1249512528
"redirect_url": "/azure/azure-sql/database/security-controls",
@@ -13699,7 +13732,7 @@
1369913732
"source_path_from_root": "/articles/azure-vmware/concepts-monitor-protection.md",
1370013733
"redirect_url": "/azure/azure-vmware/integrate-azure-native-services",
1370113734
"redirect_document_id": false
13702-
},
13735+
},
1370313736
{
1370413737
"source_path_from_root": "/articles/azure-vmware/tutorial-deploy-vmware-hcx.md",
1370513738
"redirect_url": "/azure/azure-vmware/configure-vmware-hcx",
@@ -25840,6 +25873,11 @@
2584025873
"redirect_url": "/azure/sentinel/connect-azure-waf",
2584125874
"redirect_document_id": false
2584225875
},
25876+
{
25877+
"source_path_from_root": "/articles/sentinel/connect-cef-verify.md",
25878+
"redirect_url": "/azure/sentinel/troubleshooting-cef-syslog",
25879+
"redirect_document_id": false
25880+
},
2584325881
{
2584425882
"source_path_from_root": "/articles/sentinel/connect-fusion.md",
2584525883
"redirect_url": "/azure/sentinel/fusion",
@@ -28145,6 +28183,11 @@
2814528183
"redirect_url": "/azure/storage/blobs/storage-lifecycle-management-concepts",
2814628184
"redirect_document_id": true
2814728185
},
28186+
{
28187+
"source_path_from_root": "/articles/storage/blobs/storage-lifecycle-management-concepts.md",
28188+
"redirect_url": "/azure/storage/blobs/lifecycle-management-overview",
28189+
"redirect_document_id": false
28190+
},
2814828191
{
2814928192
"source_path_from_root": "/articles/storage/storage-manage-access-to-resources.md",
2815028193
"redirect_url": "/azure/storage/blobs/storage-manage-access-to-resources",
@@ -56195,11 +56238,6 @@
5619556238
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
5619656239
"redirect_document_id": false
5619756240
},
56198-
{
56199-
"source_path_from_root": "/articles/load-balancer/egress-only.md",
56200-
"redirect_url": "/azure/virtual-network/nat-gateway/tutorial-nat-gateway-load-balancer-internal-portal",
56201-
"redirect_document_id": false
56202-
},
5620356241
{
5620456242
"source_path_from_root": "/articles/communication-services/concepts/telephony-sms/sip-interface-infrastructure.md",
5620556243
"redirect_url": "/azure/communication-services/concepts/telephony-sms/direct-routing-infrastructure",
@@ -56209,11 +56247,16 @@
5620956247
"source_path_from_root": "/articles/cognitive-services/translator/translator-info-overview.md",
5621056248
"redirect_url": "/azure/cognitive-services/translator/translator-overview",
5621156249
"redirect_document_id": false
56212-
},
56213-
{
56214-
"source_path_from_root": "/articles/virtual-machines/network-overview.md",
56215-
"redirect_url": "/azure/virtual-network/network-overview",
56216-
"redirect_document_id": false
56217-
}
56250+
},
56251+
{
56252+
"source_path_from_root": "/articles/virtual-machines/network-overview.md",
56253+
"redirect_url": "/azure/virtual-network/network-overview",
56254+
"redirect_document_id": false
56255+
},
56256+
{
56257+
"source_path_from_root": "/articles/governance/policy/how-to/guestconfiguration-create-linux.md",
56258+
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
56259+
"redirect_document_id": false
56260+
}
5621856261
]
5621956262
}

.openpublishing.redirection.key-vault.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,11 @@
485485
"redirect_url": "/azure/key-vault/general/authentication",
486486
"redirect_document_id": false
487487
},
488-
488+
{
489+
"source_path_from_root": "/articles/key-vault/general/key-vault-integrate-kubernetes.md",
490+
"redirect_url": "/azure/aks/csi-secrets-store-driver",
491+
"redirect_document_id": false
492+
}
489493

490494
]
491495
}

.openpublishing.redirection.media-services.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,11 @@
619619
"source_path_from_root": "/articles/media-services/video-indexer/index.yml",
620620
"redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs",
621621
"redirect_document_id": false
622-
}
622+
},
623+
{
624+
"source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",
625+
"redirect_url": "/articles/media-services/latest/frequently-asked-questions.yml",
626+
"redirect_document_id": false
627+
}
623628
]
624629
}

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@
160160
- name: Secure API Management API
161161
href: secure-api-management.md
162162
displayName: apim, api management, migrate, b2clogin.com
163+
- name: Microsoft Power Apps
164+
href: /powerapps/maker/portals/configure/configure-azure-ad-b2c-provider
163165
- name: SAML application
164166
items:
165167
- name: Configure a SAML application

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
320320
## Test the custom policy
321321

322322
1. Sign in to the [Azure portal](https://portal.azure.com).
323-
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
323+
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
324+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
324325
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
325326
1. Select **Identity Experience Framework**.
326327
1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensions.xml*, *SignUpOrSignin.xml*, *ProfileEdit.xml*, and *PasswordReset.xml*.

articles/active-directory-b2c/add-api-connector.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,8 @@ To return the promo code claim back to the relying party application, add an out
572572
## Test the custom policy
573573

574574
1. Sign in to the [Azure portal](https://portal.azure.com).
575-
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
575+
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
576+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
576577
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
577578
1. Select **Identity Experience Framework**.
578579
1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkExtensions.xml*, and *SignUpOrSignin.xml*.

articles/active-directory-b2c/add-password-change-policy.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,14 @@ In Azure Active Directory B2C (Azure AD B2C), you can enable users who are signe
144144
## Upload and test the policy
145145

146146
1. Sign in to the [Azure portal](https://portal.azure.com/).
147-
2. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your tenant.
148-
3. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
149-
4. Select **Identity Experience Framework**.
150-
5. On the Custom Policies page, click **Upload Policy**.
151-
6. Select **Overwrite the policy if it exists**, and then search for and select the *TrustframeworkExtensions.xml* file.
152-
7. Click **Upload**.
153-
8. Repeat steps 5 through 7 for the relying party file, such as *ProfileEditPasswordChange.xml*.
147+
1. Make sure you're using the directory that contains your Azure AD B2C tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
148+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
149+
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **Azure AD B2C**.
150+
1. Select **Identity Experience Framework**.
151+
1. On the Custom Policies page, click **Upload Policy**.
152+
1. Select **Overwrite the policy if it exists**, and then search for and select the *TrustframeworkExtensions.xml* file.
153+
1. Click **Upload**.
154+
1. Repeat steps 5 through 7 for the relying party file, such as *ProfileEditPasswordChange.xml*.
154155

155156
### Run the policy
156157

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ The self-service password reset experience can be configured for the **Sign-in (
6969
To enable self-service password reset for the sign-up or sign-in user flow:
7070

7171
1. Sign in to the [Azure portal](https://portal.azure.com).
72-
1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
72+
1. Select the **Directories + Subscriptions** icon in the portal toolbar.
73+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
7374
1. In the Azure portal, search for and select **Azure AD B2C**.
7475
1. Select **User flows**.
7576
1. Select a sign-up or sign-in user flow (of type **Recommended**) that you want to customize.
@@ -267,7 +268,8 @@ Your application might need to detect whether the user signed in via the Forgot
267268
### Upload the custom policy
268269

269270
1. Sign in to the [Azure portal](https://portal.azure.com).
270-
1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
271+
1. Select the **Directories + Subscriptions** icon in the portal toolbar.
272+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
271273
1. In the Azure portal, search for and select **Azure AD B2C**.
272274
1. Under **Policies**, select **Identity Experience Framework**.
273275
1. Select **Upload Custom Policy**, and then upload the two policy files that you changed in the following order:

articles/active-directory-b2c/add-sign-in-policy.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ If you haven't already done so, [register a web application in Azure Active Dire
4242
To add sign-in policy:
4343

4444
1. Sign in to the [Azure portal](https://portal.azure.com).
45-
1. Select the **Directory + Subscription** icon in the portal toolbar, and then select the directory that contains your Azure AD B2C tenant.
45+
1. Select the **Directories + Subscriptions** icon in the portal toolbar.
46+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
4647
1. In the Azure portal, search for and select **Azure AD B2C**.
4748
1. Under **Policies**, select **User flows**, and then select **New user flow**.
4849
1. On the **Create a user flow** page, select the **Sign in** user flow.
@@ -112,7 +113,8 @@ The **SelfAsserted-LocalAccountSignin-Email** technical profile is a [self-asser
112113
## Update and test your policy
113114

114115
1. Sign in to the [Azure portal](https://portal.azure.com).
115-
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
116+
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
117+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
116118
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
117119
1. Select **Identity Experience Framework**.
118120
1. Select **Upload Custom Policy**, and then upload the policy file that you changed, *TrustFrameworkExtensions.xml*.

0 commit comments

Comments
 (0)