Skip to content

Commit 6231d19

Browse files
b-ahibbardb-ahibbard
committed
resolve merge conflict
2 parents 4c29118 + e95d18c commit 6231d19

File tree

722 files changed

+11340
-9274
lines changed

Some content is hidden

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

722 files changed

+11340
-9274
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: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5465,30 +5465,31 @@
54655465
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
54665466
"redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
54675467
"redirect_document_id": false
5468-
}
5469-
,
5468+
},
54705469
{
54715470
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
54725471
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
54735472
"redirect_document_id": false
5474-
}
5475-
,
5473+
},
54765474
{
54775475
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54785476
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54795477
"redirect_document_id": false
5480-
}
5481-
,
5478+
},
54825479
{
54835480
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
54845481
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54855482
"redirect_document_id": false
5486-
}
5487-
,
5483+
},
54885484
{
54895485
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
54905486
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54915487
"redirect_document_id": false
5488+
},
5489+
{
5490+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
5491+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
5492+
"redirect_document_id": false
54925493
}
54935494
]
54945495
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,16 @@
744744
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
745745
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
746746
"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
747757
}
748758

749759
]

‎.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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10183,6 +10183,101 @@
1018310183
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
1018410184
"redirect_document_id": false
1018510185
},
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+
},
1018610281
{
1018710282
"source_path_from_root": "/articles/app-service/app-service-web-tutorial-content-delivery-network.md",
1018810283
"redirect_url": "/azure/cdn/cdn-add-to-web-app",
@@ -29258,6 +29353,11 @@
2925829353
"source_path_from_root": "/articles/application-gateway/configuration-front-end-ip.md",
2925929354
"redirect_url": "/azure/application-gateway/configuration-frontend-ip",
2926029355
"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
2926129361
}
2926229362
]
2926329363
}

‎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/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 ######################

‎articles/active-directory/authentication/howto-authentication-temporary-access-pass.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To configure the Temporary Access Pass authentication method policy:
6363
|---|---|---|---|
6464
| Minimum lifetime | 1 hour | 10 – 43,200 Minutes (30 days) | Minimum number of minutes that the Temporary Access Pass is valid. |
6565
| Maximum lifetime | 8 hours | 10 – 43,200 Minutes (30 days) | Maximum number of minutes that the Temporary Access Pass is valid. |
66-
| Default lifetime | 1 hour | 10 – 43,200 Minutes (30 days) | Default values can be override by the individual passes, within the minimum and maximum lifetime configured by the policy. |
66+
| Default lifetime | 1 hour | 10 – 43,200 Minutes (30 days) | Default values can be overridden by the individual passes, within the minimum and maximum lifetime configured by the policy. |
6767
| One-time use | False | True / False | When the policy is set to false, passes in the tenant can be used either once or more than once during its validity (maximum lifetime). By enforcing one-time use in the Temporary Access Pass policy, all passes created in the tenant will be created as one-time use. |
6868
| Length | 8 | 8-48 characters | Defines the length of the passcode. |
6969

‎articles/active-directory/authentication/howto-mfa-app-passwords.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: multi-factor-authentication
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 06/20/2022
9+
ms.date: 11/01/2022
1010

1111
ms.author: justinha
1212
author: justinha
@@ -24,7 +24,7 @@ Modern authentication is supported for the Microsoft Office 2013 clients and lat
2424
This article shows you how to use app passwords for legacy applications that don't support multi-factor authentication prompts.
2525

2626
>[!NOTE]
27-
> App passwords don't work with Conditional Access based multi-factor authentication policies and modern authentication.
27+
> App passwords don't work with Conditional Access based multi-factor authentication policies and modern authentication. App passwords only work with legacy authentication protocols such as IMAP and SMTP.
2828
2929
## Overview and considerations
3030

0 commit comments

Comments
 (0)