Skip to content

Commit 2be2748

Browse files
adwilsoadwilso
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 3a3cb89 + 6c37e59 commit 2be2748

File tree

1,440 files changed

+19946
-14899
lines changed

Some content is hidden

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

1,440 files changed

+19946
-14899
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,7 @@
908908
".openpublishing.redirection.azure-percept.json",
909909
".openpublishing.redirection.azure-productivity.json",
910910
".openpublishing.redirection.azure-australia.json",
911+
".openpublishing.redirection.iot-hub-device-update.json",
911912
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912913
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913914
"articles/azure-relay/.openpublishing.redirection.relay.json",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5478,5 +5478,17 @@
54785478
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54795479
"redirect_document_id": false
54805480
}
5481+
,
5482+
{
5483+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
5484+
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
5485+
"redirect_document_id": false
5486+
}
5487+
,
5488+
{
5489+
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
5490+
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
5491+
"redirect_document_id": false
5492+
}
54815493
]
54825494
}

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,26 @@
734734
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
735735
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
736736
"redirect_document_id": true
737+
},
738+
{
739+
"source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-pull-request-annotations.md",
740+
"redirect_url": "/azure/defender-for-cloud/enable-pull-request-annotations",
741+
"redirect_document_id": true
742+
},
743+
{
744+
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
745+
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
746+
"redirect_document_id": true
747+
},
748+
{
749+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",
750+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-elastic",
751+
"redirect_document_id": true
752+
},
753+
{
754+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-acr.md",
755+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure",
756+
"redirect_document_id": true
737757
}
738758

739759
]

‎.openpublishing.redirection.iot-hub-device-update.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/iot-hub-device-update/migration-pp-to-ppr.md",
5+
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

‎.openpublishing.redirection.json

Lines changed: 100 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5943,11 +5943,6 @@
59435943
"redirect_url": "/azure/availability-zones/az-overview",
59445944
"redirect_document_id": false
59455945
},
5946-
{
5947-
"source_path_from_root": "/articles/partner-solutions/index.md",
5948-
"redirect_url": "/azure/partner-solutions/overview",
5949-
"redirect_document_id": false
5950-
},
59515946
{
59525947
"source_path_from_root": "/articles/fxt-edge-filer/fxt-add-nodes.md",
59535948
"redirect_url": "/azure/fxt-edge-filer/add-nodes",
@@ -10188,6 +10183,101 @@
1018810183
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
1018910184
"redirect_document_id": false
1019010185
},
10186+
{
10187+
"source_path_from_root": "/articles/blockchain/workbench/architecture.md",
10188+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10189+
"redirect_document_id": false
10190+
},
10191+
{
10192+
"source_path_from_root": "/articles/blockchain/workbench/configuration.md",
10193+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10194+
"redirect_document_id": false
10195+
},
10196+
{
10197+
"source_path_from_root": "/articles/blockchain/workbench/create-app.md",
10198+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10199+
"redirect_document_id": false
10200+
},
10201+
{
10202+
"source_path_from_root": "/articles/blockchain/workbench/data-excel.md",
10203+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10204+
"redirect_document_id": false
10205+
},
10206+
{
10207+
"source_path_from_root": "/articles/blockchain/workbench/data-powerbi.md",
10208+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10209+
"redirect_document_id": false
10210+
},
10211+
{
10212+
"source_path_from_root": "/articles/blockchain/workbench/data-sql-management-studio.md",
10213+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10214+
"redirect_document_id": false
10215+
},
10216+
{
10217+
"source_path_from_root": "/articles/blockchain/workbench/database-firewall.md",
10218+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10219+
"redirect_document_id": false
10220+
},
10221+
{
10222+
"source_path_from_root": "/articles/blockchain/workbench/database-views.md",
10223+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10224+
"redirect_document_id": false
10225+
},
10226+
{
10227+
"source_path_from_root": "/articles/blockchain/workbench/deploy.md",
10228+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10229+
"redirect_document_id": false
10230+
},
10231+
{
10232+
"source_path_from_root": "/articles/blockchain/workbench/getdb-details.md",
10233+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10234+
"redirect_document_id": false
10235+
},
10236+
{
10237+
"source_path_from_root": "/articles/blockchain/workbench/index.yml",
10238+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10239+
"redirect_document_id": false
10240+
},
10241+
{
10242+
"source_path_from_root": "/articles/blockchain/workbench/integration-patterns.md",
10243+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10244+
"redirect_document_id": false
10245+
},
10246+
{
10247+
"source_path_from_root": "/articles/blockchain/workbench/manage-users.md",
10248+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10249+
"redirect_document_id": false
10250+
},
10251+
{
10252+
"source_path_from_root": "/articles/blockchain/workbench/messages-overview.md",
10253+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10254+
"redirect_document_id": false
10255+
},
10256+
{
10257+
"source_path_from_root": "/articles/blockchain/workbench/overview.md",
10258+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10259+
"redirect_document_id": false
10260+
},
10261+
{
10262+
"source_path_from_root": "/articles/blockchain/workbench/troubleshooting.md",
10263+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10264+
"redirect_document_id": false
10265+
},
10266+
{
10267+
"source_path_from_root": "/articles/blockchain/workbench/use-api.md",
10268+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10269+
"redirect_document_id": false
10270+
},
10271+
{
10272+
"source_path_from_root": "/articles/blockchain/workbench/use.md",
10273+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10274+
"redirect_document_id": false
10275+
},
10276+
{
10277+
"source_path_from_root": "/articles/blockchain/workbench/version-app.md",
10278+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10279+
"redirect_document_id": false
10280+
},
1019110281
{
1019210282
"source_path_from_root": "/articles/app-service/app-service-web-tutorial-content-delivery-network.md",
1019310283
"redirect_url": "/azure/cdn/cdn-add-to-web-app",
@@ -29263,6 +29353,11 @@
2926329353
"source_path_from_root": "/articles/application-gateway/configuration-front-end-ip.md",
2926429354
"redirect_url": "/azure/application-gateway/configuration-frontend-ip",
2926529355
"redirect_document_id": false
29356+
},
29357+
{
29358+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6.md",
29359+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell",
29360+
"redirect_document_id": false
2926629361
}
2926729362
]
2926829363
}

‎articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,8 @@
249249
- name: Authentication options
250250
href: enable-authentication-in-node-web-app-with-api-options.md
251251
- name: Secure access to Web API (ASP.NET Core and Node.js)
252-
displayName: REST API
253-
- name: Enable authentication in your web API
254252
href: enable-authentication-web-api.md
253+
displayName: REST API
255254
- name: Secure API Management API
256255
href: secure-api-management.md
257256
displayName: api, api management, migrate, b2clogin.com

‎articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,12 @@ Add the following technical profiles to the `<ClaimsProviders>` element.
333333
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.OneTimePasswordProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
334334
<Metadata>
335335
<Item Key="Operation">GenerateCode</Item>
336-
<Item Key="CodeExpirationInSeconds">1200</Item>
336+
<Item Key="CodeExpirationInSeconds">600</Item>
337337
<Item Key="CodeLength">6</Item>
338338
<Item Key="CharacterSet">0-9</Item>
339-
<Item Key="ReuseSameCode">true</Item>
340339
<Item Key="NumRetryAttempts">5</Item>
340+
<Item Key="NumCodeGenerationAttempts">10</Item>
341+
<Item Key="ReuseSameCode">false</Item>
341342
</Metadata>
342343
<InputClaims>
343344
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="identifier" />

‎articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,12 @@ Add the following technical profiles to the `<ClaimsProviders>` element.
322322
<Protocol Name="Proprietary" Handler="Web.TPEngine.Providers.OneTimePasswordProtocolProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
323323
<Metadata>
324324
<Item Key="Operation">GenerateCode</Item>
325-
<Item Key="CodeExpirationInSeconds">1200</Item>
325+
<Item Key="CodeExpirationInSeconds">600</Item>
326326
<Item Key="CodeLength">6</Item>
327327
<Item Key="CharacterSet">0-9</Item>
328-
<Item Key="ReuseSameCode">true</Item>
329328
<Item Key="NumRetryAttempts">5</Item>
329+
<Item Key="NumCodeGenerationAttempts">10</Item>
330+
<Item Key="ReuseSameCode">false</Item>
330331
</Metadata>
331332
<InputClaims>
332333
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="identifier" />

‎articles/active-directory-b2c/error-codes.md

Lines changed: 3 additions & 3 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: 07/18/2022
12+
ms.date: 10/28/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -33,7 +33,7 @@ The following errors can be returned by the Azure Active Directory B2C service.
3333
| `AADB2C90016` | The requested client assertion type '{0}' does not match the expected type '{1}'. | deprecated |
3434
| `AADB2C90017` | The client assertion provided in the request is invalid: {0} | deprecated |
3535
| `AADB2C90018` | The client ID '{0}' specified in the request is not registered in tenant '{1}'. | [Register a web application](tutorial-register-applications.md), [Sending authentication requests](openid-connect.md#send-authentication-requests) |
36-
| `AADB2C90019` | The key container with ID '{0}' in tenant '{1}' does not has a valid key. Reason: {2}. | |
36+
| `AADB2C90019` | The key container with ID '{0}' in tenant '{1}' does not have a valid key. Reason: {2}. | |
3737
| `AADB2C90021` | The technical profile '{0}' does not exist in the policy '{1}' of tenant '{2}'. | |
3838
| `AADB2C90022` | Unable to return metadata for the policy '{0}' in tenant '{1}'. | [Share the application's metadata publicly](saml-service-provider.md) |
3939
| `AADB2C90023` | Profile '{0}' does not contain the required metadata key '{1}'. | |
@@ -43,7 +43,7 @@ The following errors can be returned by the Azure Active Directory B2C service.
4343
| `AADB2C90031` | Policy '{0}' does not specify a default user journey. Ensure that the policy or it's parents specify a default user journey as part of a relying party section. | [Default user journey](relyingparty.md#defaultuserjourney) |
4444
| `AADB2C90035` | The service is temporarily unavailable. Please retry after a few minutes. | |
4545
| `AADB2C90036` | The request does not contain a URI to redirect the user to post logout. Specify a URI in the post_logout_redirect_uri parameter field. | [Send a sign-out request](openid-connect.md#send-a-sign-out-request) |
46-
| `AADB2C90037` | An error occurred while processing the request. Please contact administrator of the site you are trying to access. | |
46+
| `AADB2C90037` | An error occurred while processing the request. Please locate the `CorellationId` from the response. | [Submit a new support request](find-help-open-support-ticket.md), and include the `CorrelationId`. |
4747
| `AADB2C90039` | The request contains a client assertion, but the provided policy '{0}' in tenant '{1}' is missing a client_secret in RelyingPartyPolicy. | deprecated |
4848
| `AADB2C90040` | User journey '{0}' does not contain a send claims step. | [User journey orchestration steps](userjourneys.md#orchestrationsteps) |
4949
| `AADB2C90043` | The prompt included in the request contains invalid values. Expected 'none', 'login', 'consent' or 'select_account'. | |

‎articles/active-directory-b2c/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ productDirectory:
8787

8888
## BAND 3 - CONCEPTUAL CONTENT #############################################################################################################################
8989
conceptualContent:
90-
title: Quickly access to Azure AD B2C documentation
90+
title: Quick access to Azure AD B2C documentation
9191
summary: Get quick access to our guides and tutorials for your most common scenarios.
9292
items:
9393
## CARD 1 ######################

0 commit comments

Comments
 (0)