Skip to content

Commit bf25266

Browse files
greg-lindsaygreg-lindsay
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dns-upd
2 parents 6e8eabb + 7cb8015 commit bf25266

File tree

1,497 files changed

+23309
-16267
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,497 files changed

+23309
-16267
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@
867867
"branch_mapping": {}
868868
},
869869
{
870-
"path_to_root": "reusable-content",
870+
"path_to_root": "articles/reusable-content",
871871
"url": "https://github.com/MicrosoftDocs/reusable-content",
872872
"branch": "main",
873873
"branch_mapping": {}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5467,10 +5467,28 @@
54675467
"redirect_document_id": false
54685468
}
54695469
,
5470+
{
5471+
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
5472+
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
5473+
"redirect_document_id": false
5474+
}
5475+
,
54705476
{
54715477
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54725478
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54735479
"redirect_document_id": false
54745480
}
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+
}
54755493
]
54765494
}

‎.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.healthcare-apis.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,13 +542,25 @@
542542
"redirect_url": "/azure/healthcare-apis/iot/how-to-enable-diagnostic-settings",
543543
"redirect_document_id": false
544544
},
545+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-collection-content-mappings.md",
546+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
547+
"redirect_document_id": false
548+
},
549+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-jsonpath-content-mappings.md",
550+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
551+
"redirect_document_id": false
552+
},
553+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-central-json-content-mappings.md",
554+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings",
555+
"redirect_document_id": false
556+
},
545557
{ "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
546558
"redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
547559
"redirect_document_id": false
548560
},
549561
{ "source_path_from_root": "/articles/healthcare-apis/events/events-export-logs-metrics.md",
550562
"redirect_url": "/azure/healthcare-apis/events/events-enable-diagnostic-settings",
551563
"redirect_document_id": false
552-
}
564+
}
553565
]
554566
}

‎.openpublishing.redirection.json

Lines changed: 95 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",

‎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/one-time-password-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ The following settings can be used to configure code generation mode:
7070

7171
| Attribute | Required | Description |
7272
| --------- | -------- | ----------- |
73+
| Operation | Yes | The operation to be performed. Possible value: `GenerateCode`. |
7374
| CodeExpirationInSeconds | No | Time in seconds until code expiration. Minimum: `60`; Maximum: `1200`; Default: `600`. Every time a code is provided (same code using `ReuseSameCode`, or a new code), the code expiration is extended. This time is also used to set retry timeout (once max attempts are reached, user is locked out from attempting to obtain new codes until this time expires) |
7475
| CodeLength | No | Length of the code. The default value is `6`. |
7576
| CharacterSet | No | The character set for the code, formatted for use in a regular expression. For example, `a-z0-9A-Z`. The default value is `0-9`. The character set must include a minimum of 10 different characters in the set specified. |
7677
| NumRetryAttempts | No | The number of verification attempts before the code is considered invalid. The default value is `5`. For example, if you set NumRetryAttempts to 2 it will allow you only 2 attempts in total (first + 1 retry). For the 3rd attempt it will throw max attempts reached irrespective of whether the code is correct or not.|
77-
| NumCodeGenerationAttempts | No | The number of maximum code generation attempts per identifier. The default value is 10 if not specified. |
78-
| Operation | Yes | The operation to be performed. Possible value: `GenerateCode`. |
78+
| NumCodeGenerationAttempts | No | The number of maximum code generation attempts per identifier. The default value is `10` if not specified. |
7979
| ReuseSameCode | No | Whether the same code should be given rather than generating a new code when given code has not expired and is still valid. The default value is `false`. |
8080

8181

@@ -94,7 +94,7 @@ The following example `TechnicalProfile` is used for generating a code:
9494
<Item Key="CodeLength">6</Item>
9595
<Item Key="CharacterSet">0-9</Item>
9696
<Item Key="NumRetryAttempts">5</Item>
97-
<Item Key="NumCodeGenerationAttempts">15</Item>
97+
<Item Key="NumCodeGenerationAttempts">10</Item>
9898
<Item Key="ReuseSameCode">false</Item>
9999
</Metadata>
100100
<InputClaims>

‎articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: reference
1111
ms.author: kengaderdus
12-
ms.date: 04/15/2022
12+
ms.date: 10/27/2022
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
1515
---
@@ -168,6 +168,7 @@ The following table lists the administrative configuration limits in the Azure A
168168
|Levels of [inheritance](custom-policy-overview.md#inheritance-model) in custom policies |10 |
169169
|Number of policies per Azure AD B2C tenant (user flows + custom policies) |200 |
170170
|Maximum policy file size |1024 KB |
171+
|Number of API connectors per tenant |19 |
171172

172173
<sup>1</sup> See also [Azure AD service limits and restrictions](../active-directory/enterprise-users/directory-service-limits-restrictions.md).
173174

0 commit comments

Comments
 (0)