Skip to content

Commit d0ed0a3

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-link-sidandrews
2 parents 44ba7cb + 65e1da1 commit d0ed0a3

File tree

1,525 files changed

+19894
-14492
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,525 files changed

+19894
-14492
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@
437437
{
438438
"path_to_root": "media-services-video-indexer",
439439
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
440-
"branch": "main",
440+
"branch": "master",
441441
"branch_mapping": {}
442442
},
443443
{
@@ -473,7 +473,7 @@
473473
{
474474
"path_to_root": "azureml-examples-online-endpoint-vnet",
475475
"url": "https://github.com/azure/azureml-examples",
476-
"branch": "rsethur/mvnet",
476+
"branch": "main",
477477
"branch_mapping": {}
478478
},
479479
{

.openpublishing.redirection.active-directory.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8792,8 +8792,8 @@
87928792
},
87938793
{
87948794
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8795-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8796-
"redirect_document_id": true
8795+
"redirect_url": "/azure",
8796+
"redirect_document_id": false
87978797
},
87988798
{
87998799
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",

.openpublishing.redirection.azure-monitor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,16 @@
181181
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
182182
"redirect_document_id": false
183183
},
184+
{
185+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
186+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
187+
"redirect_document_id": false
188+
},
189+
{
190+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-combine-data.md",
191+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-data-sources",
192+
"redirect_document_id": false
193+
},
184194
{
185195
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
186196
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,16 @@
585585
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",
586586
"redirect_document_id": true
587587
},
588+
{
589+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-sql-enable-azure-sql-protections.md",
590+
"redirect_url": "/azure/defender-for-cloud/quickstart-enable-database-protections",
591+
"redirect_document_id": true
592+
},
593+
{
594+
"source_path_from_root": "/articles/defender-for-cloud/quickstart-enable-defender-for-cosmos.md",
595+
"redirect_url": "/azure/defender-for-cloud/defender-for-databases-enable-cosmos-protections",
596+
"redirect_document_id": true
597+
},
588598
{
589599
"source_path_from_root": "/articles/security-center/auto-deploy-vulnerability-assessment.md",
590600
"redirect_url": "/azure/defender-for-cloud/auto-deploy-vulnerability-assessment",

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18911,6 +18911,11 @@
1891118911
"redirect_url": "/connectors/todo",
1891218912
"redirect_document_id": false
1891318913
},
18914+
{
18915+
"source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
18916+
"redirect_url": "/connectors/bingsearch",
18917+
"redirect_document_id": false
18918+
},
1891418919
{
1891518920
"source_path_from_root": "/articles/logic-apps/logic-apps-scenario-error-and-exception-handling.md",
1891618921
"redirect_url": "/azure/logic-apps/logic-apps-exception-handling",
@@ -40177,6 +40182,16 @@
4017740182
"redirect_url": "/azure/private-link/create-private-endpoint-powershell",
4017840183
"redirect_document_id": true
4017940184
},
40185+
{
40186+
"source_path_from_root": "/articles/app-service/environment/overview-zone-redundancy.md",
40187+
"redirect_url": "/azure/availability-zones/migrate-app-service-environment",
40188+
"redirect_document_id": true
40189+
},
40190+
{
40191+
"source_path_from_root": "/articles/app-service/how-to-zone-redundancy.md",
40192+
"redirect_url": "/azure/availability-zones/migrate-app-service",
40193+
"redirect_document_id": true
40194+
},
4018040195
{
4018140196
"source_path_from_root": "/articles/azure-monitor/insights/sql-insights-alerts.md",
4018240197
"redirect_url": "/azure/azure-sql/database/sql-insights-alerts",

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,8 @@
508508
href: partner-n8identity.md
509509
- name: Saviynt
510510
href: partner-saviynt.md
511+
- name: WhoIAM Rampart
512+
href: partner-whoiam-rampart.md
511513
- name: Logs
512514
items:
513515
- name: Audit logs

articles/active-directory-b2c/custom-email-mailjet.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: how-to
12-
ms.date: 04/25/2022
12+
ms.date: 06/22/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
@@ -35,8 +35,8 @@ Custom email verification requires the use of a third-party email provider like
3535

3636
If you don't already have one, start by setting up a Mailjet account (Azure customers can unlock 6,000 emails with a limit of 200 emails/day).
3737

38-
1. Follow the setup instructions at [Create a Mailjet Account](https://www.mailjet.com/guides/azure-mailjet-developer-resource-user-guide/enabling-mailjet/).
39-
1. To be able to send email, [register and validate](https://www.mailjet.com/guides/azure-mailjet-developer-resource-user-guide/enabling-mailjet/#how-to-configure-mailjet-for-use) your Sender email address or domain.
38+
1. Follow the setup instructions at [Create a Mailjet Account](https://dev.mailjet.com/email/guides/getting-started/).
39+
1. To be able to send email, [register and validate](https://dev.mailjet.com/email/guides/verify-your-domain) your Sender email address or domain.
4040
2. Navigate to the [API Key Management page](https://dev.mailjet.com/email/guides/senders-and-domains/#use-a-sender-on-all-api-keys-(metasender)). Record the **API Key** and **Secret Key** for use in a later step. Both keys are generated automatically when your account is created.
4141

4242
> [!IMPORTANT]

articles/active-directory-b2c/direct-signin.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
---
2-
title: Set up direct sign in using Azure Active Directory B2C
3-
description: Learn how to prepopulate the sign in name or redirect straight to a social identity provider.
2+
title: Set up direct sign-in using Azure Active Directory B2C
3+
description: Learn how to prepopulate the sign-in name or redirect straight to a social identity provider.
44
services: active-directory-b2c
55
author: kengaderdus
66
manager: CelesteDG
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 03/31/2022
11+
ms.date: 06/21/2022
1212
ms.custom: project-no-code
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
1616
---
1717

18-
# Set up direct sign in using Azure Active Directory B2C
18+
# Set up direct sign-in using Azure Active Directory B2C
1919

2020
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2121

articles/active-directory-b2c/embedded-login.md

Lines changed: 8 additions & 8 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: 08/17/2021
12+
ms.date: 06/17/2022
1313
ms.custom: project-no-code
1414
ms.author: kengaderdus
1515
ms.subservice: B2C
@@ -74,11 +74,11 @@ The **Sources** attribute contains the URI of your web application. Add a space
7474
- The URI must use the https scheme.
7575
- The full URI of the web app must be specified. Wildcards are not supported.
7676

77-
In addition, we recommend that you also block your own domain name from being embedded in an iframe by setting the Content-Security-Policy and X-Frame-Options headers respectively on your application pages. This will mitigate security concerns around older browsers related to nested embedding of iframes.
77+
In addition, we recommend that you also block your own domain name from being embedded in an iframe by setting the `Content-Security-Policy` and `X-Frame-Options` headers respectively on your application pages. This will mitigate security concerns around older browsers related to nested embedding of iframes.
7878

7979
## Adjust policy user interface
8080

81-
With Azure AD B2C [user interface customization](customize-ui.md), you have almost full control over the HTML and CSS content presented to users. Follow the steps for customizing an HTML page using content definitions. To fit the Azure AD B2C user interface into the iframe size, provide clean HTML page without background and extra spaces.
81+
With Azure AD B2C [user interface customization](customize-ui.md), you have almost full control over the HTML and CSS content presented to users. Follow the steps for customizing an HTML page using content definitions. To fit the Azure AD B2C user interface into the iframe size, provide clean HTML page without a background and extra spaces.
8282

8383
The following CSS code hides the Azure AD B2C HTML elements and adjusts the size of the panel to fill the iframe.
8484

@@ -96,9 +96,9 @@ div.api_container{
9696
}
9797
```
9898

99-
In some cases, you might want to notify to your application of which Azure AD B2C page is currently being presented. For example, when a user selects the sign-up option, you might want the application to respond by hiding the links for signing in with a social account or adjusting the iframe size.
99+
In some cases, you may want to notify your application about the Azure AD B2C page that's currently being presented. For example, when a user selects the sign-up option, you may want the application to respond by hiding the links for signing in with a social account or adjusting the iframe size.
100100

101-
To notify your application of the current Azure AD B2C page, [enable your policy for JavaScript](./javascript-and-page-layout.md), and then use HTML5 post messages. The following JavaScript code sends a post message to the app with `signUp`:
101+
To notify your application about the current Azure AD B2C page, [enable your policy for JavaScript](./javascript-and-page-layout.md), and then use HTML5 to post messages. The following JavaScript code sends a post message to the app with `signUp`:
102102

103103
```javascript
104104
window.parent.postMessage("signUp", '*');
@@ -108,7 +108,7 @@ window.parent.postMessage("signUp", '*');
108108

109109
When a user selects the sign-in button, the [web app](integrate-with-app-code-samples.md#web-apps-and-apis) generates an authorization request that takes the user to Azure AD B2C sign-in experience. After sign-in is complete, Azure AD B2C returns an ID token, or authorization code, to the configured redirect URI within your application.
110110

111-
To support embedded login, the iframe **src** property points to the sign-in controller, such as `/account/SignUpSignIn`, which generates the authorization request and redirects the user to Azure AD B2C policy.
111+
To support embedded login, the iframe `src` attribute points to the sign-in controller, such as `/account/SignUpSignIn`, which generates the authorization request and redirects the user to Azure AD B2C policy.
112112

113113
```html
114114
<iframe id="loginframe" frameborder="0" src="/account/SignUpSignIn"></iframe>
@@ -134,9 +134,9 @@ The redirect URI can be the same redirect URI used by the iframe. You can skip t
134134

135135
## Configure a single-page application
136136

137-
For a single-page application, you'll also need to a second "sign-in" HTML page that loads into the iframe. This sign-in page hosts the authentication library code that generates the authorization code and returns the token.
137+
For a single-page application, you'll also need a second "sign-in" HTML page that loads into the iframe. This sign-in page hosts the authentication library code that generates the authorization code and returns the token.
138138

139-
When the single-page application needs the access token, use JavaScript code to obtain the access token from the iframe and object that contains it.
139+
When the single-page application needs the access token, use JavaScript code to obtain the access token from the iframe and the object that contains it.
140140

141141
> [!NOTE]
142142
> Running MSAL 2.0 in an iframe is not currently supported.

0 commit comments

Comments
 (0)