Skip to content

Commit 17eb06c

Browse files
ShawnJacksonShawnJackson
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into seven-azure-communication-services-email-articles
2 parents e54cde2 + 1e9f141 commit 17eb06c

File tree

394 files changed

+5910
-3662
lines changed

Some content is hidden

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

394 files changed

+5910
-3662
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,6 +1065,11 @@
10651065
"redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
10661066
"redirect_document_id": false
10671067
},
1068+
{
1069+
"source_path_from_root": "/articles/container-instances/container-instances-region-availability.md",
1070+
"redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
1071+
"redirect_document_id": false
1072+
},
10681073
{
10691074
"source_path_from_root": "/articles/cassandra-managed-instance/compare-cosmosdb-managed-instance.md",
10701075
"redirect_url": "/azure/managed-instance-apache-cassandra/compare-cosmosdb-managed-instance",

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

‎articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,12 +636,31 @@
636636
"redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api",
637637
"redirect_document_id": true
638638
},
639+
{
640+
"source_path_from_root": "/articles/ai-services/translator/containers/translator-container-configuration.md",
641+
"redirect_url": "/azure/ai-services/translator/containers/configuration",
642+
"redirect_document_id": true
643+
},
644+
{
645+
"source_path_from_root": "/articles/ai-services/translator/containers/translator-container-supported-parameters.md",
646+
"redirect_url": "/azure/ai-services/translator/containers/translate-text-parameters",
647+
"redirect_document_id": true
648+
},
649+
{
650+
"source_path_from_root": "/articles/ai-services/translator/containers/translator-disconnected-containers.md",
651+
"redirect_url": "/azure/ai-services/translator/containers/install-run",
652+
"redirect_document_id": false
653+
},
654+
{
655+
"source_path_from_root": "/articles/ai-services/translator/containers/translator-how-to-install-container.md",
656+
"redirect_url": "/azure/ai-services/translator/containers/install-run",
657+
"redirect_document_id": true
658+
},
639659
{
640660
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
641661
"redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
642662
"redirect_document_id": true
643663
}
644664

645-
646665
]
647666
}

‎articles/ai-services/openai/how-to/monitoring.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ The following table summarizes the current subset of metrics available in Azure
5656
|Metric|Category|Aggregation|Description|Dimensions|
5757
|---|---|---|---|---|
5858
|`Azure OpenAI Requests`|HTTP|Count|Total number of calls made to the Azure OpenAI API over a period of time. Applies to PayGo, PTU, and PTU-managed SKUs.| `ApiName`, `ModelDeploymentName`,`ModelName`,`ModelVersion`, `OperationName`, `Region`, `StatusCode`, `StreamType`|
59-
| `Generated Completion Tokens` | Usage | Sum | Number of generated tokens (output) from an OpenAI model. Applies to PayGo, PTU, and PTU-manged SKUs | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
60-
| `Processed FineTuned Training Hours` | Usage |Sum| Number of Training Hours Processed on an OpenAI FineTuned Model | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
61-
| `Processed Inference Tokens` | Usage | Sum| Number of inference tokens processed by an OpenAI model. Calculated as prompt tokens (input) + generated tokens. Applies to PayGo, PTU, and PTU-manged SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
62-
| `Processed Prompt Tokens` | Usage | Sum | Total number of prompt tokens (input) processed on an OpenAI model. Applies to PayGo, PTU, and PTU-managed SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
59+
| `Generated Completion Tokens` | Usage | Sum | Number of generated tokens (output) from an Azure OpenAI model. Applies to PayGo, PTU, and PTU-manged SKUs | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
60+
| `Processed FineTuned Training Hours` | Usage |Sum| Number of training hours processed on an Azure OpenAI fine-tuned model. | `ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
61+
| `Processed Inference Tokens` | Usage | Sum| Number of inference tokens processed by an Azure OpenAI model. Calculated as prompt tokens (input) + generated tokens. Applies to PayGo, PTU, and PTU-manged SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
62+
| `Processed Prompt Tokens` | Usage | Sum | Total number of prompt tokens (input) processed on an Azure OpenAI model. Applies to PayGo, PTU, and PTU-managed SKUs.|`ApiName`, `ModelDeploymentName`,`ModelName`, `Region`|
6363
| `Provision-managed Utilization V2` | Usage | Average | Provision-managed utilization is the utilization percentage for a given provisioned-managed deployment. Calculated as (PTUs consumed/PTUs deployed)*100. When utilization is at or above 100%, calls are throttled and return a 429 error code. | `ModelDeploymentName`,`ModelName`,`ModelVersion`, `Region`, `StreamType`|
6464

6565
## Configure diagnostic settings

‎articles/ai-services/openai/includes/assistants-ai-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ By default there are three panels: assistant setup, chat session, and Logs. **Sh
119119
120120
## Clean up resources
121121
122-
If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
122+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
123123
124124
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
125125
- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)

‎articles/ai-services/openai/includes/assistants-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ New messages can be created on the thread before re-running, which will see the
147147

148148
## Clean up resources
149149

150-
If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
150+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
151151

152152
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
153153
- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)

‎articles/ai-services/openai/includes/assistants-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To successfully make a call against the Azure OpenAI service, you'll need the fo
4848

4949
Go to your resource in the Azure portal. The **Keys and Endpoint** can be found in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
5050

51-
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview blade for an OpenAI Resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
51+
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview blade for an Azure OpenAI resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
5252

5353
Create and assign persistent environment variables for your key and endpoint.
5454

@@ -205,7 +205,7 @@ It is important to remember that while code interpreter gives the model the capa
205205

206206
## Clean up resources
207207

208-
If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
208+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
209209

210210
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
211211
- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)

‎articles/ai-services/openai/includes/assistants-rest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To successfully make a call against Azure OpenAI, you'll need the following:
3636

3737
Go to your resource in the Azure portal. The **Endpoint and Keys** can be found in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
3838

39-
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview blade for an OpenAI Resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
39+
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview blade for an Azure OpenAI resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
4040

4141
Create and assign persistent environment variables for your key and endpoint.
4242

@@ -139,7 +139,7 @@ It is important to remember that while code interpreter gives the model the capa
139139

140140
## Clean up resources
141141

142-
If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
142+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
143143

144144
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
145145
- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)

‎articles/ai-services/openai/includes/assistants-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ You could also consult the logs in the right-hand panel to confirm that code int
118118
119119
## Clean up resources
120120
121-
If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
121+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
122122
123123
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
124124
- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)

‎articles/ai-services/openai/includes/chatgpt-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To successfully make a call against Azure OpenAI, you'll need an **endpoint** an
3333

3434
Go to your resource in the Azure portal. The **Endpoint and Keys** can be found in the **Resource Management** section. Copy your endpoint and access key as you'll need both for authenticating your API calls. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
3535

36-
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview UI for an OpenAI Resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
36+
:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot of the overview UI for an Azure OpenAI resource in the Azure portal with the endpoint & access keys location circled in red." lightbox="../media/quickstarts/endpoint.png":::
3737

3838
Create and assign persistent environment variables for your key and endpoint.
3939

@@ -155,7 +155,7 @@ The [GPT-35-Turbo & GPT-4 how-to guide](../how-to/chatgpt.md) provides an in-dep
155155

156156
## Clean up resources
157157

158-
If you want to clean up and remove an OpenAI resource, you can delete the resource. Before deleting the resource, you must first delete any deployed models.
158+
If you want to clean up and remove an Azure OpenAI resource, you can delete the resource. Before deleting the resource, you must first delete any deployed models.
159159

160160
- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
161161
- [Azure PowerShell](../../multi-service-resource.md?pivots=azpowershell#clean-up-resources)

0 commit comments

Comments
 (0)