Skip to content

Commit d4fd0a9

Browse files
authored
Merge pull request #271582 from MicrosoftDocs/main
Publish to Live Tuesday 4AM PST 4/9
2 parents 8a6cfdf + 22fb17b commit d4fd0a9

29 files changed

+357
-241
lines changed

articles/active-directory-b2c/custom-policy-developer-notes.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
3131
- Support requests for public preview features can be submitted through regular support channels.
3232

3333
## User flows
34-
3534
|Feature |User flow |Custom policy |Notes |
3635
|---------|:---------:|:---------:|---------|
3736
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
3837
| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
3938
| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
4039
| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| |
4140
| [Force password reset](force-password-reset.md) | GA | NA | |
42-
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
43-
| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications |
41+
| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies.
42+
| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
43+
| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
4444
| [Smart lockout](threat-management.md) | GA | GA | |
45+
| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
4546
| [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
4647

4748
## OAuth 2.0 application authorization flows
@@ -86,15 +87,15 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
8687

8788
|Feature |User flow |Custom policy |Notes |
8889
|---------|:---------:|:---------:|---------|
89-
| [Multi-language support](localization.md)| GA | GA | |
90-
| [Custom domains](custom-domain.md)| GA | GA | |
90+
| [Multi-language support](localization.md)| GA | GA | Available in China cloud, but only for custom policies. |
91+
| [Custom domains](custom-domain.md)| GA | GA | Available in China cloud, but only for custom policies. |
9192
| [Custom email verification](custom-email-mailjet.md) | NA | GA| |
9293
| [Customize the user interface with built-in templates](customize-ui.md) | GA| GA| |
9394
| [Customize the user interface with custom templates](customize-ui-with-html.md) | GA| GA| By using HTML templates. |
94-
| [Page layout version](page-layout.md) | GA | GA | |
95-
| [JavaScript](javascript-and-page-layout.md) | GA | GA | |
95+
| [Page layout version](page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
96+
| [JavaScript](javascript-and-page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
9697
| [Embedded sign-in experience](embedded-login.md) | NA | Preview| By using the inline frame element `<iframe>`. |
97-
| [Password complexity](password-complexity.md) | GA | GA | |
98+
| [Password complexity](password-complexity.md) | GA | GA | Available in China cloud, but only for custom policies. |
9899
| [Disable email verification](disable-email-verification.md) | GA| GA| Not recommended for production environments. Disabling email verification in the sign-up process may lead to spam. |
99100

100101

@@ -106,7 +107,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
106107
|---------|:---------:|:---------:|---------|
107108
|[AD FS](identity-provider-adfs.md) | NA | GA | |
108109
|[Amazon](identity-provider-amazon.md) | GA | GA | |
109-
|[Apple](identity-provider-apple-id.md) | GA | GA | |
110+
|[Apple](identity-provider-apple-id.md) | GA | GA | Available in China cloud, but only for custom policies. |
110111
|[Microsoft Entra ID (Single-tenant)](identity-provider-azure-ad-single-tenant.md) | GA | GA | |
111112
|[Microsoft Entra ID (multitenant)](identity-provider-azure-ad-multi-tenant.md) | NA | GA | |
112113
|[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |
@@ -121,7 +122,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
121122
|[Salesforce](identity-provider-salesforce.md) | GA | GA | |
122123
|[Salesforce (SAML protocol)](identity-provider-salesforce-saml.md) | NA | GA | |
123124
|[Twitter](identity-provider-twitter.md) | GA | GA | |
124-
|[WeChat](identity-provider-wechat.md) | Preview | GA | |
125+
|[WeChat](identity-provider-wechat.md) | Preview | GA | Available in China cloud, but only for custom policies. |
125126
|[Weibo](identity-provider-weibo.md) | Preview | GA | |
126127

127128
## Generic identity providers
@@ -153,18 +154,18 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
153154

154155
| Feature | Custom policy | Notes |
155156
| ------- | :--: | ----- |
156-
| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA | |
157-
| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA | |
158-
| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA | |
159-
| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider) | GA| |
157+
| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
158+
| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
159+
| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
160+
| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider) | GA| Available in China cloud, but only for custom policies. |
160161

161162

162163
### Components
163164

164165
| Feature | Custom policy | Notes |
165166
| ------- | :--: | ----- |
166167
| [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | GA | Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
167-
| [Phone factor authentication](phone-factor-technical-profile.md) | GA | |
168+
| [Phone factor authentication](phone-factor-technical-profile.md) | GA | Available in China cloud, but only for custom policies. |
168169
| [Microsoft Entra multifactor authentication authentication](multi-factor-auth-technical-profile.md) | GA | |
169170
| [One-time password](one-time-password-technical-profile.md) | GA | |
170171
| [Microsoft Entra ID](active-directory-technical-profile.md) as local directory | GA | |
1.16 KB
Loading

articles/azure-maps/weather-services-concepts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Some of the Weather service APIs return the `iconCode` in the response. The `ico
7070
| 20 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-flurries.png"::: | Yes | No | Mostly Cloudy with Flurries|
7171
| 21 | :::image type="icon" source="./media/weather-services-concepts/partly-sunny-flurries.png"::: | Yes | No | Partly Sunny with Flurries|
7272
| 22 | :::image type="icon" source="./media/weather-services-concepts/snow-i.png"::: | Yes | Yes | Snow|
73-
| 23 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-snow.png"::: | Yes | No | Mostly Cloudy with Snow|
73+
| 23 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-snow.png"::: | Yes | No | Mostly Cloudy with Snow|
7474
| 24 | :::image type="icon" source="./media/weather-services-concepts/ice-i.png"::: | Yes | Yes | Ice |
7575
| 25 | :::image type="icon" source="./media/weather-services-concepts/sleet-i.png"::: | Yes | Yes | Sleet|
7676
| 26 | :::image type="icon" source="./media/weather-services-concepts/freezing-rain.png"::: | Yes | Yes | Freezing Rain|
@@ -89,7 +89,7 @@ Some of the Weather service APIs return the `iconCode` in the response. The `ico
8989
| 41 | :::image type="icon" source="./media/weather-services-concepts/partly-cloudy-tstorms-night.png"::: | No | Yes | Partly Cloudy with Thunderstorms|
9090
| 42 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-tstorms-night.png"::: | No | Yes | Mostly Cloudy with Thunderstorms|
9191
| 43 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-flurries-night.png"::: | No | Yes | Mostly Cloudy with Flurries|
92-
| 44 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-snow.png"::: | No | Yes | Mostly Cloudy with Snow|
92+
| 44 | :::image type="icon" source="./media/weather-services-concepts/mostly-cloudy-snow-night.png"::: | No | Yes | Mostly Cloudy with Snow|
9393

9494
## Radar and satellite imagery color scale
9595

articles/azure-monitor/cost-estimate.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,6 @@ This section includes charges for the ingestion and query of Prometheus metrics
4141
| Metric Sample Ingestion | Number and frequency of the Prometheus metrics collected by your AKS nodes. See [Default Prometheus metrics configuration in Azure Monitor](containers/prometheus-metrics-scrape-default.md). |
4242
| Query Samples Processed | Number of query samples can be estimated from the dashboards and alerting rules that use them. |
4343

44-
45-
## Application Insights
46-
This section includes charges from [classic Application Insights resources](app/convert-classic-resource.md). Workspace-based Application Insights resources are included in the Log Data Ingestion category.
47-
48-
| Category | Description |
49-
|:---|:---|
50-
| Data ingestion | Volume of data that you expect from your classic Application Insights resources. This can be difficult to estimate so you should enable monitoring for a small group of resources and use the observed data volumes to extrapolate for a full environment. |
51-
| Data Retention | [Data retention setting](logs/data-retention-archive.md#set-data-retention-for-classic-application-insights-resources) for your classic Application Insights resources. |
52-
| Multi-step Web Test | Number of legacy [multi-step web tests](/previous-versions/azure/azure-monitor/app/availability-multistep) that you expect to run. |
53-
54-
5544
## Alert rules
5645
This section includes charges for alert rules.
5746

articles/azure-monitor/logs/create-custom-table.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,10 @@ Use the [Tables - Update PATCH API](/rest/api/loganalytics/tables/update) to cre
151151

152152
## Delete a table
153153

154-
There are several types of tables in Log Analytics and the delete experience is different for each:
155-
- [Azure table](../logs/manage-logs-tables.md#table-type-and-schema) -- Can't be deleted. Tables that are part of a solution are removed from workspace when [deleting the solution](/cli/azure/monitor/log-analytics/solution#az-monitor-log-analytics-solution-delete), but data remains in workspace for the duration of the retention policy defined for the tables, or if not exist, for the duration of the retention policy defined in workspace. If the [solution is re-created](/cli/azure/monitor/log-analytics/solution#az-monitor-log-analytics-solution-create) in the workspace, these tables and previously ingested data become visible again. To avoid charges, define [retention policy for tables in solutions](/rest/api/loganalytics/tables/update) to minimum (4-days) before deleting the solution.
156-
- [Restored table](./restore.md) (table_RST) -- Deletes the hot cache provisioned for the restore, but source table data isn't deleted.
157-
- [Search results table](./search-jobs.md) (table_SRCH) -- Deletes the table and data immediately and permanently.
158-
- [Custom log table](./create-custom-table.md#create-a-custom-table) (table_CL) -- Deletes the table definition immediately, but data remains in workspace for the duration of the retention policy defined for the table, or workspace. The retention policy for table is removed in 14-days and workspace retention governs. If custom log table is created with the same name and schema, the table and previously ingested data become visible again. To avoid charges and remove data from table, define [retention policy for table](/rest/api/loganalytics/tables/update) to minimum (4-days) before deleting the table.
154+
There are several types of tables in Azure Monitor Logs. You can delete any table that's not an Azure table, but what happens to the data when you delete the table is different for each type of table.
155+
156+
For more information, see [What happens to data when you delete a table in a Log Analytics workspace](../logs/data-retention-archive.md#what-happens-to-data-when-you-delete-a-table-in-a-log-analytics-workspace).
157+
159158

160159
# [Portal](#tab/azure-portal-2)
161160

0 commit comments

Comments
 (0)