Skip to content

Commit a3f879b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sim-group-fix
2 parents 2a75021 + ed5be5d commit a3f879b

File tree

3,572 files changed

+37468
-20025
lines changed

Some content is hidden

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

3,572 files changed

+37468
-20025
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,8 @@
813813
"branch_mapping": {}
814814
},
815815
{
816-
"path_to_root": "azure-spring-cloud-reference-architecture",
817-
"url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
816+
"path_to_root": "azure-spring-apps-reference-architecture",
817+
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
818818
"branch": "main",
819819
"branch_mapping": {}
820820
},
@@ -947,7 +947,7 @@
947947
{
948948
"path_to_root": "azure-cosmos-mongodb-dotnet",
949949
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950-
"branch": "quickstart-test",
950+
"branch": "main",
951951
"branch_mapping": {}
952952
}
953953
],
@@ -1016,9 +1016,11 @@
10161016
"articles/mysql/.openpublishing.redirection.mysql.json",
10171017
"articles/container-apps/.openpublishing.redirection.container-apps.json",
10181018
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1019+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
10191020
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10201021
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10211022
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1022-
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
1023+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1024+
".openpublishing.redirection.virtual-desktop.json"
10231025
]
10241026
}

.openpublishing.redirection.active-directory.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
35+
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
36+
"redirect_document_id": true
37+
},
3338
{
3439
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
3540
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -10820,7 +10825,13 @@
1082010825
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
1082110826
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
1082210827
"redirect_document_id": true
10828+
},
10829+
{
10830+
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10831+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10832+
"redirect_document_id": false
1082310833
}
1082410834

10835+
1082510836
]
1082610837
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@
346346
"redirect_url": "/azure/azure-monitor/faq#vm-insights",
347347
"redirect_document_id": false
348348
},
349+
{
350+
"source_path_from_root": "/articles/azure-monitor/app/proactive-cloud-services.md" ,
351+
"redirect_url": "https://docs.microsoft.com/azure/azure-monitor/alerts/alerts-overview",
352+
"redirect_document_id": false
353+
},
349354
{
350355
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-log-search.md" ,
351356
"redirect_url": "/azure/azure-monitor/alerts/vminsights-log-query",
@@ -410,6 +415,71 @@
410415
"source_path_from_root": "/articles/azure-monitor/logs/custom-logs-overview.md" ,
411416
"redirect_url": "/azure/azure-monitor/logs/logs-ingestion-api-overview",
412417
"redirect_document_id": false
418+
},
419+
{
420+
"source_path_from_root": "/articles/azure-monitor/insights/cosmosdb-insights-overview.md" ,
421+
"redirect_url": "/azure/cosmos-db/cosmosdb-insights-overview",
422+
"redirect_document_id": false
423+
},
424+
{
425+
"source_path_from_root": "/articles/azure-monitor/insights/network-insights-overview.md" ,
426+
"redirect_url": "/azure/network-watcher/network-insights-overview",
427+
"redirect_document_id": false
428+
},
429+
{
430+
"source_path_from_root": "/articles/azure-monitor/insights/key-vault-insights-overview.md" ,
431+
"redirect_url": "/azure/key-vault/key-vault-insights-overview",
432+
"redirect_document_id": false
433+
},
434+
{
435+
"source_path_from_root": "/articles/azure-monitor/app/proactive-diagnostics.md" ,
436+
"redirect_url": "/azure/azure-monitor/alerts/proactive-diagnostics",
437+
"redirect_document_id": false
438+
},
439+
{
440+
"source_path_from_root": "/articles/azure-monitor/app/proactive-failure-diagnostics.md" ,
441+
"redirect_url": "/azure/azure-monitor/alerts/proactive-failure-diagnostics",
442+
"redirect_document_id": false
443+
},
444+
{
445+
"source_path_from_root": "/articles/azure-monitor/app/proactive-performance-diagnostics.md" ,
446+
"redirect_url": "/azure/azure-monitor/alerts/proactive-performance-diagnostics",
447+
"redirect_document_id": false
448+
},
449+
{
450+
"source_path_from_root": "/articles/azure-monitor/app/proactive-trace-severity.md" ,
451+
"redirect_url": "/azure/azure-monitor/alerts/proactive-trace-severity",
452+
"redirect_document_id": false
453+
},
454+
{
455+
"source_path_from_root": "/articles/azure-monitor/app/proactive-exception-volume.md" ,
456+
"redirect_url": "/azure/azure-monitor/alerts/proactive-exception-volume",
457+
"redirect_document_id": false
458+
},
459+
{
460+
"source_path_from_root": "/articles/azure-monitor/app/proactive-potential-memory-leak.md" ,
461+
"redirect_url": "/azure/azure-monitor/alerts/proactive-potential-memory-leak",
462+
"redirect_document_id": false
463+
},
464+
{
465+
"source_path_from_root": "/articles/azure-monitor/app/proactive-application-security-detection-pack.md" ,
466+
"redirect_url": "/azure/azure-monitor/alerts/proactive-application-security-detection-pack",
467+
"redirect_document_id": false
468+
},
469+
{
470+
"source_path_from_root": "/articles/azure-monitor/app/proactive-arm-config.md" ,
471+
"redirect_url": "/azure/azure-monitor/alerts/proactive-arm-config",
472+
"redirect_document_id": false
473+
},
474+
{
475+
"source_path_from_root": "/articles/azure-monitor/app/proactive-email-notification.md" ,
476+
"redirect_url": "/azure/azure-monitor/alerts/proactive-email-notification",
477+
"redirect_document_id": false
478+
},
479+
{
480+
"source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
481+
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
482+
"redirect_document_id": false
413483
}
414484
]
415485
}

.openpublishing.redirection.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24728,11 +24728,6 @@
2472824728
"redirect_url": "/azure/traffic-manager/traffic-manager-manage-profiles",
2472924729
"redirect_document_id": false
2473024730
},
24731-
{
24732-
"source_path_from_root": "/articles/virtual-desktop/connect-windows-7-and-10.md",
24733-
"redirect_url": "/azure/virtual-desktop/connect-windows-7-10",
24734-
"redirect_document_id": true
24735-
},
2473624731
{
2473724732
"source_path_from_root": "/articles/troubleshoot-client-connection.md",
2473824733
"redirect_url": "/azure/virtual-desktop/troubleshoot-client",
@@ -40312,6 +40307,11 @@
4031240307
"source_path_from_root": "/articles/virtual-machines/windows/winrm.md",
4031340308
"redirect_url": "/azure/virtual-machines/windows/connect-winrm",
4031440309
"redirect_document_id": false
40310+
},
40311+
{
40312+
"source_path_from_root": "/articles/applied-ai-services/form-recognizer/tutorial-ai-builder.md",
40313+
"redirect_url": "https://docs.microsoft.com/ai-builder/create-form-processing-model",
40314+
"redirect_document_id": false
4031540315
}
4031640316
]
4031740317
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/virtual-desktop/connect-windows-7-and-10.md",
5+
"redirect_url": "/azure/virtual-desktop/connect-windows-7-10",
6+
"redirect_document_id": true
7+
},
8+
{
9+
"source_path_from_root": "/articles/virtual-desktop/create-file-share.md",
10+
"redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/virtual-desktop/azure-files-authorization.md",
15+
"redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/virtual-desktop/create-profile-container-adds.md",
20+
"redirect_url": "/azure/virtual-desktop/fslogix-profile-container-configure-azure-files-active-directory",
21+
"redirect_document_id": true
22+
}
23+
]
24+
}

CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ articles/advisor @rboucher
2525
articles/service-health @rboucher
2626

2727
# Azure Synapse Analytics
28-
/articles/synapse-analytics/ @julieMSFT @ryanmajidi @saveenr
29-
/articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT
28+
/articles/synapse-analytics/ @SnehaGunda @WilliamDAssafMSFT @ryanmajidi @saveenr
29+
/articles/synapse-analytics/backuprestore/ @joannapea @WilliamDAssafMSFT
3030
/articles/synapse-analytics/catalog-governance/@djpmsft @chanuengg
31-
/articles/synapse-analytics/ccid/ @liudan66 @julieMSFT
31+
/articles/synapse-analytics/ccid/ @liudan66
3232
/articles/synapse-analytics/data-integration/ @kromerm @jonburchel
3333
/articles/synapse-analytics/machine-learning/ @garyericson @NelGson @midesa
34-
/articles/synapse-analytics/metadata/@MikeRys @julieMSFT @jocaplan
35-
/articles/synapse-analytics/security/ @RonyMSFT @nanditavalsan @meenalsri @julieMSFT
34+
/articles/synapse-analytics/metadata/@MikeRys @jocaplan
35+
/articles/synapse-analytics/security/ @RonyMSFT @meenalsri
3636
/articles/synapse-analytics/spark/ @euangms @mlee3gsd @midesa
37-
/articles/synapse-analytics/sql/ @filippopovic @azaricstefan @anumjs @WilliamDAssafMSFT @jovanpop-msft
38-
/articles/synapse-analytics/sql-data-warehouse/ @anumjs @ronortloff @julieMSFT
37+
/articles/synapse-analytics/sql/ @filippopovic @azaricstefan @WilliamDAssafMSFT @jovanpop-msft
38+
/articles/synapse-analytics/sql-data-warehouse/ @SnehaGunda @WilliamDAssafMSFT
3939
/articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
4040

4141
# Cognitive Services

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/12/2022
11+
ms.date: 07/29/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
@@ -60,7 +60,7 @@ client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
6060
|{tenant}| Required | Name of your Azure AD B2C tenant|
6161
| {policy} | Required | The user flow to be run. Specify the name of a user flow you've created in your Azure AD B2C tenant. For example: `b2c_1_sign_in`, `b2c_1_sign_up`, or `b2c_1_edit_profile`. |
6262
| client_id |Required |The application ID assigned to your app in the [Azure portal](https://portal.azure.com). |
63-
| response_type |Required |The response type, which must include `code` for the authorization code flow. |
63+
| response_type |Required |The response type, which must include `code` for the authorization code flow. You can receive an ID token if you include it in the response type, such as `code+id_token`, and in this case, the scope needs to include `openid`.|
6464
| redirect_uri |Required |The redirect URI of your app, where authentication responses are sent and received by your app. It must exactly match one of the redirect URIs that you registered in the portal, except that it must be URL-encoded. |
6565
| scope |Required |A space-separated list of scopes. The `openid` scope indicates a permission to sign in the user and get data about the user in the form of ID tokens. The `offline_access` scope is optional for web applications. It indicates that your application will need a *refresh token* for extended access to resources.The client-id indicates the token issued are intended for use by Azure AD B2C registered client. The `https://{tenant-name}/{app-id-uri}/{scope}` indicates a permission to protected resources, such as a web API. For more information, see [Request an access token](access-tokens.md#scopes). |
6666
| response_mode |Recommended |The method that you use to send the resulting authorization code back to your app. It can be `query`, `form_post`, or `fragment`. |

articles/active-directory-b2c/azure-ad-external-identities-videos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Get a deeper view into the features and technical aspects of the Azure AD B2C se
2929
|[Azure AD B2C sign-up sign-in](https://www.youtube.com/watch?v=c8rN1ZaR7wk&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=6&t=2s) 10:25 | [:::image type="icon" source="./media/external-identities-videos/customer-sign-up-sign-in.png" border="false":::](https://www.youtube.com/watch?v=c8rN1ZaR7wk&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=6) | [Azure AD B2C single sign on and self service password reset](https://www.youtube.com/watch?v=kRV-7PSLK38&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=7) 8:40 | [:::image type="icon" source="./media/external-identities-videos/single-sign-on.png" border="false":::](https://www.youtube.com/watch?v=kRV-7PSLK38&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=7) |
3030
| [Application and identity migration to Azure AD B2C](https://www.youtube.com/watch?v=Xw_YwSJmhIQ&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=9) 10:34 | [:::image type="icon" source="./media/external-identities-videos/identity-migration-aad-b2c.png" border="false":::](https://www.youtube.com/watch?v=Xw_YwSJmhIQ&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=9) | [Build resilient and scalable flows using Azure AD B2C](https://www.youtube.com/watch?v=8f_Ozpw9yTs&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=12) 16:47 | [:::image type="icon" source="./media/external-identities-videos/b2c-scalable-flows.png" border="false":::](https://www.youtube.com/watch?v=8f_Ozpw9yTs&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=12) |
3131
| [Building a custom CIAM solution with Azure AD B2C and ISV alliances](https://www.youtube.com/watch?v=UZjiGDD0wa8&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=8) 10:01 | [:::image type="icon" source="./media/external-identities-videos/build-custom-b2c-solution.png" border="false":::](https://www.youtube.com/watch?v=UZjiGDD0wa8&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=8) | [Protecting Web APIs with Azure AD B2C](https://www.youtube.com/watch?v=wuUu71RcsIo&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=10) 19:03 | [:::image type="icon" source="./media/external-identities-videos/protecting-web-apis.png" border="false":::](https://www.youtube.com/watch?v=wuUu71RcsIo&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=10) |
32-
| [Integration of SAML with Azure AD B2C](https://www.youtube.com/watch?v=r2TIVBCm7v4&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=11) 9:09 | [:::image type="icon" source="./media/external-identities-videos/saml-integration.png" border="false":::](https://www.youtube.com/watch?v=r2TIVBCm7v4&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=11) |
32+
| [Integration of SAML with Azure AD B2C](https://www.youtube.com/watch?v=r2TIVBCm7v4&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=11) 9:09 | [:::image type="icon" source="./media/external-identities-videos/saml-integration.png" border="false":::](https://www.youtube.com/watch?v=r2TIVBCm7v4&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=11) | [Azure AD B2C Identity Protection and Conditional Access](https://www.youtube.com/watch?v=frn5jVqbmUo&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=15) 14:44 | [:::image type="icon" source="./media/external-identities-videos/identity-protection-and-conditional-access.png" border="false":::](https://www.youtube.com/watch?v=frn5jVqbmUo&list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0&index=15)
3333

3434
## Azure Active Directory B2C how to series
3535

articles/active-directory-b2c/best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ Stay up to date with the state of the service and find support options.
8787
|--|--|
8888
| [Service updates](https://azure.microsoft.com/updates/?product=active-directory-b2c) | Stay up to date with Azure AD B2C product updates and announcements. |
8989
| [Microsoft Support](support-options.md) | File a support request for Azure AD B2C technical issues. Billing and subscription management support is provided at no cost. |
90-
| [Azure status](https://status.azure.com/status) | View the current health status of all Azure services. |
90+
| [Azure status](https://azure.status.microsoft/status) | View the current health status of all Azure services. |

articles/active-directory-b2c/custom-domain.md

Lines changed: 10 additions & 2 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: how-to
12-
ms.date: 05/13/2022
12+
ms.date: 07/26/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
ms.custom: "b2c-support"
@@ -116,13 +116,21 @@ Follow these steps to create an Azure Front Door:
116116
|Tier| Select either Standard or Premium tier. Standard tier is content delivery optimized. Premium tier builds on Standard tier and is focused on security. See [Tier Comparison](../frontdoor/standard-premium/tier-comparison.md).|
117117
|Endpoint name| Enter a globally unique name for your endpoint, such as `b2cazurefrontdoor`. The **Endpoint hostname** is generated automatically. |
118118
|Origin type| Select `Custom`.|
119-
|Origin host name| Enter `<tenant-name>.b2clogin.com`. Replace `<tenant-name>` with the [name of your Azure AD B2C tenant](tenant-management.md#get-your-tenant-name).|
119+
|Origin host name| Enter `<tenant-name>.b2clogin.com`. Replace `<tenant-name>` with the [name of your Azure AD B2C tenant](tenant-management.md#get-your-tenant-name) such as `contoso.b2clogin.com`.|
120120

121121
Leave the **Caching** and **WAF policy** empty.
122122

123123
124124
1. Once the Azure Front Door resource is created, select **Overview**, and copy the **Endpoint hostname**. It looks something like `b2cazurefrontdoor-ab123e.z01.azurefd.net`.
125125

126+
1. Make sure the **Host name** and **Origin host header** of your origin have the same value:
127+
1. Under **Settings**, select **Origin groups**.
128+
1. Select your origin group from the list, such as **default-origin-group**.
129+
1. On the right pane, select your **Origin host name** such as `contoso.b2clogin.com`.
130+
1. On the **Update origin** pane, update the **Host name** and **Origin host header** to have the same value.
131+
132+
:::image type="content" source="./media/custom-domain/azure-front-door-custom-domain-origins.png" alt-text="Screenshot of how to update custom domain origins.":::
133+
126134

127135
## Step 3. Set up your custom domain on Azure Front Door
128136

0 commit comments

Comments
 (0)