Skip to content

Commit 00bc3d2

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into WI-196307-release-deprecated-recommendations-and-severity-change
2 parents c1c8f03 + 47a776a commit 00bc3d2

File tree

1,957 files changed

+21572
-14417
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,957 files changed

+21572
-14417
lines changed

.openpublishing.publish.config.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,7 @@
12171217
".openpublishing.redirection.json",
12181218
".openpublishing.redirection.key-vault.json",
12191219
".openpublishing.redirection.machine-configuration.json",
1220+
".openpublishing.redirection.marketplace.json",
12201221
".openpublishing.redirection.openshift.json",
12211222
".openpublishing.redirection.security-benchmark.json",
12221223
".openpublishing.redirection.sql-database.json",
@@ -1269,7 +1270,6 @@
12691270
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12701271
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
12711272
"articles/mariadb/.openpublishing.redirection.mariadb.json",
1272-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
12731273
"articles/mysql/.openpublishing.redirection.mysql.json",
12741274
"articles/network-watcher/.openpublishing.redirection.network-watcher.json",
12751275
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
@@ -1278,7 +1278,9 @@
12781278
"articles/purview/.openpublishing.redirection.purview.json",
12791279
"articles/route-server/.openpublishing.redirection.route-server.json",
12801280
"articles/sap/.openpublishing.redirection.sap.json",
1281+
"articles/security/.openpublishing.redirection.security.json",
12811282
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
1283+
"articles/site-recovery/.openpublishing.redirection.site-recovery.json",
12821284
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
12831285
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12841286
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",

.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6578,6 +6578,11 @@
65786578
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
65796579
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
65806580
"redirect_document_id": false
6581-
}
6581+
},
6582+
{
6583+
"source_path_from_root": "/articles/azure-monitor/containers/resource-manager-container-insights.md",
6584+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=arm#enable-container-insights",
6585+
"redirect_document_id": false
6586+
}
65826587
]
65836588
}

.openpublishing.redirection.json

Lines changed: 1693 additions & 3922 deletions
Large diffs are not rendered by default.

articles/marketplace/.openpublishing.redirection.marketplace.json renamed to .openpublishing.redirection.marketplace.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@
18321832
},
18331833
{
18341834
"source_path_from_root": "/articles/marketplace/partner-center-portal/get-paid.md",
1835-
"redirect_url": "/partner-center/marketplace-get-paid?context=/azure/marketplace/context/context",
1835+
"redirect_url": "/partner-center/marketplace-get-paid",
18361836
"redirect_document_id": false
18371837
},
18381838
{
@@ -1887,22 +1887,22 @@
18871887
},
18881888
{
18891889
"source_path_from_root": "/articles/marketplace/partner-center-portal/payment-thresholds-methods-timeframes.md",
1890-
"redirect_url": "/partner-center/payment-thresholds-methods-timeframes?context=/azure/marketplace/context/context",
1890+
"redirect_url": "/partner-center/payment-thresholds-methods-timeframes",
18911891
"redirect_document_id": false
18921892
},
18931893
{
18941894
"source_path_from_root": "/articles/marketplace/partner-center-portal/payout-policy-details.md",
1895-
"redirect_url": "/partner-center/payout-policy-details?context=/azure/marketplace/context/context",
1895+
"redirect_url": "/partner-center/payout-policy-details",
18961896
"redirect_document_id": false
18971897
},
18981898
{
18991899
"source_path_from_root": "/articles/marketplace/partner-center-portal/payout-summary-overview.md",
1900-
"redirect_url": "/partner-center/payout-statement?context=/azure/marketplace/context/context",
1900+
"redirect_url": "/partner-center/payout-statement",
19011901
"redirect_document_id": false
19021902
},
19031903
{
19041904
"source_path_from_root": "/articles/marketplace/partner-center-portal/payout-summary.md",
1905-
"redirect_url": "/partner-center/payout-statement?context=/azure/marketplace/context/context",
1905+
"redirect_url": "/partner-center/payout-statement",
19061906
"redirect_document_id": false
19071907
},
19081908
{
@@ -1917,7 +1917,7 @@
19171917
},
19181918
{
19191919
"source_path_from_root": "/articles/marketplace/partner-center-portal/set-up-your-payout-account-tax-forms.md",
1920-
"redirect_url": "/partner-center/set-up-your-payout-account?context=/azure/marketplace/context/context",
1920+
"redirect_url": "/partner-center/set-up-your-payout-account",
19211921
"redirect_document_id": false
19221922
},
19231923
{
@@ -1932,7 +1932,7 @@
19321932
},
19331933
{
19341934
"source_path_from_root": "/articles/marketplace/partner-center-portal/tax-details-paid-transactions.md",
1935-
"redirect_url": "/partner-center/tax-details-marketplace?context=/azure/marketplace/context/context",
1935+
"redirect_url": "/partner-center/tax-details-marketplace",
19361936
"redirect_document_id": false
19371937
},
19381938
{
@@ -2022,7 +2022,7 @@
20222022
},
20232023
{
20242024
"source_path_from_root": "/articles/marketplace/company-work-accounts.md",
2025-
"redirect_url": "/partner-center/azure-active-directory-tenants-and-partner-center?context=/azure/marketplace/context/context",
2025+
"redirect_url": "/partner-center/azure-active-directory-tenants-and-partner-center",
20262026
"redirect_document_id": false
20272027
},
20282028
{
@@ -3454,6 +3454,11 @@
34543454
"source_path_from_root": "/articles/marketplace/partner-center-portal/saas-fulfillment-apis-faq.yml",
34553455
"redirect_url": "/partner-center/marketplace/partner-center-portal/saas-fulfillment-apis-faq",
34563456
"redirect_document_id": false
3457+
},
3458+
{
3459+
"source_path_from_root": "/articles/marketplace/context/context.yml",
3460+
"redirect_url": "/partner-center/marketplace/",
3461+
"redirect_document_id": false
34573462
}
34583463
]
34593464
}

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ ms.service: active-directory
1010

1111
ms.topic: how-to
1212
ms.custom: b2c-docs-improvements, devx-track-js
13-
ms.date: 01/11/2024
13+
ms.date: 01/22/2024
1414
ms.author: kengaderdus
1515
ms.reviewer: yoelh
1616
ms.subservice: B2C
1717

1818

19-
#Customer intent: As a developer using Azure Active Directory B2C custom policy, I want to learn how to call a REST API and handle errors returned by the service, so that I can validate user inputs and issue JWT tokens based on the response.
19+
#Customer intent: As a developer integrating customer-facing apps with Azure Active Directory B2C custom policy, I want to learn how to call a REST API from my custom policy, so that I can send and receive data from external services.
2020

2121
---
2222

@@ -35,7 +35,7 @@ In this article, you learn how to:
3535

3636
## Scenario overview
3737

38-
In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP `200 OK` response, and Azure AD B2C issues JWT token. Otherwise, the service returns an HTTP `409 Conflict` response, and the user must reenter an access code.
38+
In [Create branching in user journey by using Azure AD B2C custom policies](custom-policies-series-branch-user-journey.md), users who select *Personal Account* need to provide a valid invitation access code to proceed. We use a static access code, but real world apps don't work this way. If the service that issues the access codes is external to your custom policy, you must make a call to that service, and pass the access code input by the user for validation. If the access code is valid, the service returns an HTTP `200 OK` response, and Azure AD B2C issues JWT token. Otherwise, the service returns an HTTP 4xx response, and the user must reenter an access code.
3939

4040
:::image type="content" source="media/custom-policies-series-call-rest-api/screenshot-of-call-rest-api-call.png" alt-text="A flowchart of calling a R E S T A P I.":::
4141

@@ -141,6 +141,7 @@ You need to deploy an app, which serves as your external app. Your custom policy
141141
"moreInfo": "https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
142142
}
143143
```
144+
Your REST service can return HTTP 4xx status code, but the value of `status` in the JSON response must be `409`.
144145
145146
At this point, you're ready to deploy your Node.js app.
146147

articles/active-directory-b2c/customize-ui-with-html.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
title: Customize the user interface with HTML templates
33
titleSuffix: Azure AD B2C
44
description: Learn how to customize the user interface with HTML templates for your applications that use Azure Active Directory B2C.
5-
65
author: kengaderdus
76
manager: CelesteDG
8-
97
ms.service: active-directory
10-
118
ms.topic: how-to
12-
ms.date: 01/11/2024
9+
ms.date: 01/22/2024
1310
ms.author: kengaderdus
1411
ms.subservice: B2C
1512
zone_pivot_groups: b2c-policy-type
1613

1714

18-
#Customer intent: As a developer customizing the user interface in Azure Active Directory B2C, I want to know how to customize the default pages and host my own HTML and CSS files, so that I can provide a branded and seamless user experience in my application.
15+
#Customer intent: As a developer integrating apps with Azure Active Directory B2C, I want to learn how to customize the default user interfaces by using my own HTML, CSS files and JavaScript, so that I can provide a branded and seamless user experience in my application.
1916

2017
---
2118

@@ -330,6 +327,9 @@ To configure UI customization, copy the **ContentDefinition** and its child elem
330327

331328
1. Save the extensions file.
332329

330+
1. [Enable JavaScript](javascript-and-page-layout.md?pivots=b2c-custom-policy#enable-javascript)
331+
332+
333333
### 5. Upload and test your updated custom policy
334334

335335
#### 5.1 Upload the custom policy
88.1 KB
Loading

0 commit comments

Comments
 (0)