Skip to content

Commit f0027b5

Browse files
authored
Merge pull request #253808 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 1fae313 + 89c136e commit f0027b5

File tree

11 files changed

+21
-21
lines changed

11 files changed

+21
-21
lines changed

articles/active-directory/authentication/howto-sspr-windows.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\Credential Provide
193193

194194
- To enable verbose logging, create a `REG_DWORD: "EnableLogging"`, and set it to 1.
195195
- To disable verbose logging, change the `REG_DWORD: "EnableLogging"` to 0.
196+
- Review the debug logging in the Application event log under source AADPasswordResetCredentialProvider.
196197

197198
## What do users see
198199

articles/active-directory/develop/apple-sso-plugin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Use the following information to enable the SSO plug-in by using MDM.
6161

6262
If you use Microsoft Intune as your MDM service, you can use built-in configuration profile settings to enable the Microsoft Enterprise SSO plug-in:
6363

64-
1. Configure the [SSO app extension](/mem/intune/configuration/device-features-configure#single-sign-on-app-extension) settings of a configuration profile.
64+
1. Configure the [SSO app plug-in](/mem/intune/configuration/use-enterprise-sso-plug-in-ios-ipados-with-intune) settings of a configuration profile.
6565
1. If the profile isn't already assigned, [assign the profile to a user or device group](/mem/intune/configuration/device-profile-assign).
6666

6767
The profile settings that enable the SSO plug-in are automatically applied to the group's devices the next time each device checks in with Intune.

articles/ai-services/speech-service/includes/quickstarts/stt-diarization/cpp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Follow these steps to create a new console application and install the Speech SD
6666
std::promise<void> recognitionEnd;
6767
6868
// Subscribes to events.
69-
conversationTranscriber->Transcribing.Connect([](const SpeechRecognitionEventArgs& e)
69+
conversationTranscriber->Transcribing.Connect([](const ConversationTranscriptionEventArgs& e)
7070
{
7171
std::cout << "TRANSCRIBING:" << e.Result->Text << std::endl;
7272
});
7373
74-
conversationTranscriber->Transcribed.Connect([](const SpeechRecognitionEventArgs& e)
74+
conversationTranscriber->Transcribed.Connect([](const ConversationTranscriptionEventArgs& e)
7575
{
7676
if (e.Result->Reason == ResultReason::RecognizedSpeech)
7777
{
@@ -84,7 +84,7 @@ Follow these steps to create a new console application and install the Speech SD
8484
}
8585
});
8686
87-
conversationTranscriber->Canceled.Connect([&recognitionEnd](const SpeechRecognitionCanceledEventArgs& e)
87+
conversationTranscriber->Canceled.Connect([&recognitionEnd](const ConversationTranscriptionCanceledEventArgs& e)
8888
{
8989
auto cancellation = CancellationDetails::FromResult(e.Result);
9090
std::cout << "CANCELED: Reason=" << (int)cancellation->Reason << std::endl;

articles/cosmos-db/how-to-develop-emulator.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,8 @@ Use the [Azure Cosmos DB API for NoSQL .NET SDK](nosql/quickstart-dotnet.md) to
476476
> {
477477
> ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
478478
> }),
479-
> ConnectionMode = ConnectionMode.Gateway
479+
> ConnectionMode = ConnectionMode.Gateway,
480+
> LimitToEndpoint = true
480481
> };
481482
>
482483
> using CosmosClient client = new(

articles/dns/dns-private-resolver-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ The following restrictions hold with respect to virtual networks:
106106
### Subnet restrictions
107107

108108
Subnets used for DNS resolver have the following limitations:
109-
- A subnet must be a minimum of /28 address space or a maximum of /24 address space. A /28 subnet is sufficient to accomodate current endpoint limits. A subnet size of /27 to /24 can provide flexibility if these limits change.
109+
- A subnet must be a minimum of /28 address space or a maximum of /24 address space. A /28 subnet is sufficient to accommodate current endpoint limits. A subnet size of /27 to /24 can provide flexibility if these limits change.
110110
- A subnet can't be shared between multiple DNS resolver endpoints. A single subnet can only be used by a single DNS resolver endpoint.
111111
- All IP configurations for a DNS resolver inbound endpoint must reference the same subnet. Spanning multiple subnets in the IP configuration for a single DNS resolver inbound endpoint isn't allowed.
112112
- The subnet used for a DNS resolver inbound endpoint must be within the virtual network referenced by the parent DNS resolver.

articles/healthcare-apis/includes/healthcare-apis-azure-api-fhir-retirement.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,5 @@ ms.author: jasteppe
88
---
99

1010
> [!IMPORTANT]
11-
> **Azure API for FHIR will be retired on September 30, 2026.** Follow the [migration strategies](../fhir/migration-strategies.md) to transition to Azure Health Data Services FHIR service by that date. Due to the transition of Azure API for FHIR to Azure Health Data Services, new deployments won't be allowed beginning April 1, 2025.
12-
11+
> **Azure API for FHIR will be retired on September 30, 2026.** Follow the [migration strategies](../fhir/migration-strategies.md) to transition to **Azure Health Data Services FHIR service** by that date. Due to the retirement of Azure API for FHIR, new deployments won't be allowed beginning April 1, 2025.
1312
[Azure Health Data Services FHIR service](../healthcare-apis-overview.md) is the evolved version of Azure API for FHIR that enables customers to manage [FHIR](../fhir/overview.md), DICOM, and MedTech services with integrations into other Azure services.
14-

articles/machine-learning/how-to-deploy-online-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ To configure a deployment:
368368
```python
369369
model = Model(path="../model-1/model/sklearn_regression_model.pkl")
370370
env = Environment(
371-
conda_file="../model-1/environment/conda.yml",
371+
conda_file="../model-1/environment/conda.yaml",
372372
image="mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:latest",
373373
)
374374

articles/mysql/flexible-server/concepts-audit-logs.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following sections describe the output of MySQL audit logs based on the even
6666
| `ResourceProvider` | Name of the resource provider. Always `MICROSOFT.DBFORMYSQL` |
6767
| `ResourceType` | `Servers` |
6868
| `ResourceId` | Resource URI |
69-
| `Resource` | Name of the server |
69+
| `Resource` | Name of the server in upper case |
7070
| `Category` | `MySqlAuditLogs` |
7171
| `OperationName` | `LogEvent` |
7272
| `LogicalServerName_s` | Name of the server |
@@ -97,7 +97,7 @@ Schema below applies to GENERAL, DML_SELECT, DML_NONSELECT, DML, DDL, DCL, and A
9797
| `ResourceProvider` | Name of the resource provider. Always `MICROSOFT.DBFORMYSQL` |
9898
| `ResourceType` | `Servers` |
9999
| `ResourceId` | Resource URI |
100-
| `Resource` | Name of the server |
100+
| `Resource` | Name of the server in upper case|
101101
| `Category` | `MySqlAuditLogs` |
102102
| `OperationName` | `LogEvent` |
103103
| `LogicalServerName_s` | Name of the server |
@@ -128,7 +128,7 @@ Schema below applies to GENERAL, DML_SELECT, DML_NONSELECT, DML, DDL, DCL, and A
128128
| `ResourceProvider` | Name of the resource provider. Always `MICROSOFT.DBFORMYSQL` |
129129
| `ResourceType` | `Servers` |
130130
| `ResourceId` | Resource URI |
131-
| `Resource` | Name of the server |
131+
| `Resource` | Name of the server in upper case|
132132
| `Category` | `MySqlAuditLogs` |
133133
| `OperationName` | `LogEvent` |
134134
| `LogicalServerName_s` | Name of the server |
@@ -148,7 +148,7 @@ Once your audit logs are piped to Azure Monitor Logs through Diagnostic Logs, yo
148148

149149
```kusto
150150
AzureDiagnostics
151-
| where Resource == '<your server name>'
151+
| where Resource == '<your server name>' //Server name must be in Upper case
152152
| where Category == 'MySqlAuditLogs' and event_class_s == "general_log"
153153
| project TimeGenerated, Resource, event_class_s, event_subclass_s, event_time_t, user_s , ip_s , sql_text_s
154154
| order by TimeGenerated asc nulls last
@@ -158,7 +158,7 @@ Once your audit logs are piped to Azure Monitor Logs through Diagnostic Logs, yo
158158
159159
```kusto
160160
AzureDiagnostics
161-
| where Resource == '<your server name>'
161+
| where Resource == '<your server name>' //Server name must be in Upper case
162162
| where Category == 'MySqlAuditLogs' and event_class_s == "connection_log"
163163
| project TimeGenerated, Resource, event_class_s, event_subclass_s, event_time_t, user_s , ip_s , sql_text_s
164164
| order by TimeGenerated asc nulls last
@@ -168,7 +168,7 @@ Once your audit logs are piped to Azure Monitor Logs through Diagnostic Logs, yo
168168
169169
```kusto
170170
AzureDiagnostics
171-
| where Resource == '<your server name>'
171+
| where Resource == '<your server name>' //Server name must be in Upper case
172172
| where Category == 'MySqlAuditLogs'
173173
| project TimeGenerated, Resource, event_class_s, event_subclass_s, event_time_t, user_s , ip_s , sql_text_s
174174
| summarize count() by event_class_s, event_subclass_s, user_s, ip_s
@@ -178,7 +178,7 @@ Once your audit logs are piped to Azure Monitor Logs through Diagnostic Logs, yo
178178
179179
```kusto
180180
AzureDiagnostics
181-
| where Resource == '<your server name>'
181+
| where Resource == '<your server name>' //Server name must be in Upper case
182182
| where Category == 'MySqlAuditLogs'
183183
| project TimeGenerated, Resource, event_class_s, event_subclass_s, event_time_t, user_s , ip_s , sql_text_s
184184
| summarize count() by Resource, bin(TimeGenerated, 5m)

articles/static-web-apps/apis-container-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To link a container app to your static web app, you need to have an existing Con
3535

3636
## Example
3737

38-
Consider an existing Azure App Service instance that exposes an endpoint via the following location.
38+
Consider an existing Azure Container App instance that exposes an endpoint via the following location.
3939

4040
```url
4141
https://my-container-app.red-river-123.eastus2.azurecontainerapps.io/api/getProducts

articles/virtual-machines/b-series-cpu-credit-model/b-series-cpu-credit-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ Similarly, utilizing the example of a Standard_B32as_v2 VM size, if the workload
4141

4242

4343
## Credit monitoring
44-
To monitor B-series specific credit metrics, customers can utilize the Azure monitor data platform, see [Overview of metrics in Microsoft Azure](../../azure-monitor/data-platform.md). Azure monitor data platform can be accessed via Azure portal and other orchestration paths, and via programmatic API calls to Azure monitor.
45-
Via Azure monitor data platform, customers can access B-series credit model specific metrics such as 'CPU Credits Consumed', 'CPU Credits Remaining' and 'Percentage CPU' for their given B-series size in real time.
44+
To monitor B-series specific credit metrics, customers can utilize the Azure monitor data platform, see [Overview of metrics in Microsoft Azure](../../azure-monitor/data-platform.md). Azure monitor data platform can be accessed via the Azure portal and other orchestration paths, and via programmatic API calls to Azure monitor.
45+
Via Azure monitor data platform, customers can access B-series credit model-specific metrics such as 'CPU Credits Consumed', 'CPU Credits Remaining', and 'Percentage CPU' for their given B-series size in real time.
4646

4747

4848
## Other sizes and information

0 commit comments

Comments
 (0)