Skip to content

Commit b7c5c30

Browse files
authored
Merge pull request #235142 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 77b4beb + 50c68f9 commit b7c5c30

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

articles/active-directory/external-identities/reset-redemption-status.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Connect-MgGraph -Scopes "User.ReadWrite.All"
8282
$user = Get-MgUser -Filter "startsWith(mail, '[email protected]')"
8383
New-MgInvitation `
8484
-InvitedUserEmailAddress $user.Mail `
85-
-InviteRedirectUrl "http://myapps.microsoft.com" `
85+
-InviteRedirectUrl "https://myapps.microsoft.com" `
8686
-ResetRedemption `
8787
-SendInvitationMessage `
8888
-InvitedUser $user

articles/cognitive-services/openai/quotas-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following sections provide you with a quick guide to the quotas and limits t
2222

2323
| Limit Name | Limit Value |
2424
|--|--|
25-
| OpenAI resources per region | 2 |
25+
| OpenAI resources per region within Azure subscription | 2 |
2626
| Requests per minute per model* | Davinci-models (002 and later): 120 <br> ChatGPT model (preview): 300 <br> GPT-4 models (preview): 18 <br> All other models: 300 |
2727
| Tokens per minute per model* | Davinci-models (002 and later): 40,000 <br> ChatGPT model: 120,000 <br> All other models: 120,000 |
2828
| Max fine-tuned model deployments* | 2 |

articles/event-grid/handler-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ We recommend that you use the first approach (Event Grid trigger) as it has the
4747
{
4848
"resourceId": "/subscriptions/<AZURE SUBSCRIPTION ID>/resourceGroups/<RESOURCE GROUP NAME>/providers/Microsoft.Web/sites/<FUNCTION APP NAME>/functions/<FUNCTION NAME>",
4949
"maxEventsPerBatch": 10,
50-
"preferredBatchSizeInKilobytes": 6400
50+
"preferredBatchSizeInKilobytes": 64
5151
}
5252
},
5353
"eventDeliverySchema": "EventGridSchema"

articles/network-watcher/traffic-analytics-schema.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ The following table lists the fields in the schema and what they signify.
107107
| SrcIP_s | Source IP address | Will be blank in case of AzurePublic and ExternalPublic flows. |
108108
| DestIP_s | Destination IP address | Will be blank in case of AzurePublic and ExternalPublic flows. |
109109
| VMIP_s | IP of the VM | Used for AzurePublic and ExternalPublic flows. |
110-
| PublicIP_s | Public IP addresses | Used for AzurePublic and ExternalPublic flows. |
111110
| DestPort_d | Destination Port | Port at which traffic is incoming. |
112111
| L4Protocol_s | * T <br> * U | Transport Protocol. T = TCP <br> U = UDP. |
113112
| L7Protocol_s | Protocol Name | Derived from destination port. |

articles/resource-mover/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can move resources across regions in the Resource Mover hub or from within a
5757

5858
Using Resource Mover, you can currently move the following resources across regions:
5959

60-
- Azure VMs and associated disks
60+
- Azure VMs and associated disks (Azure Spot VMs are not currently supported)
6161
- Encrypted Azure VMs and associated disks. This includes VMs with Azure disk encryption enabled and Azure VMs using default server-side encryption (both with platform-managed keys and customer-managed keys)
6262
- NICs
6363
- Availability sets

articles/synapse-analytics/sql-data-warehouse/maintenance-scheduling.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ All maintenance operations should finish within the specified maintenance window
3232

3333
Integration with Service Health notifications and the Resource Health Check Monitor allows customers to stay informed of impending maintenance activity. This automation takes advantage of Azure Monitor. You can decide how you want to be notified of impending maintenance events. Also, you can choose which automated flows will help you manage downtime and minimize operational impact.
3434

35-
A 24-hour advance notification precedes all maintenance events that aren't for the DW400c and lower tiers.
36-
3735
> [!NOTE]
38-
> In the event we are required to deploy a time critical update, advanced notification times may be significantly reduced. This could occur outside an identified maintenance window due to the critical nature of the update.
36+
> A 24-hour advance notification precedes all maintenance events. In the event we are required to deploy a time critical update, advanced notification times may be significantly reduced. This could occur outside an identified maintenance window due to the critical nature of the update.
3937
4038
If you received advance notification that maintenance will take place, but maintenance can't be performed during the time period in the notification, you'll receive a cancellation notification. Maintenance will then resume during the next scheduled maintenance period.
4139

0 commit comments

Comments
 (0)