Skip to content

Commit d6d9412

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rs-ps
2 parents 7692dba + 5dddf5e commit d6d9412

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

articles/azure-functions/functions-premium-plan.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,12 @@ These are the currently supported maximum scale-out values for a single plan in
249249
|Canada Central| 100 | 100 |
250250
|Central India| 100 | 20 |
251251
|Central US| 100 | 100 |
252-
|China East 2| 100 | 20 |
253-
|China North 2| 100 | 20 |
252+
|China East 2| 20 | 20 |
253+
|China North 2| 20 | 20 |
254+
|China North 3| 20 | 20 |
254255
|East Asia| 100 | 20 |
255256
|East US | 100 | 100 |
256-
|East US 2| 100 | 100 |
257+
|East US 2| 80 | 100 |
257258
|France Central| 100 | 60 |
258259
|Germany West Central| 100 | 20 |
259260
|Israel Central| 100 | 20 |
@@ -278,9 +279,9 @@ These are the currently supported maximum scale-out values for a single plan in
278279
|UAE North| 100 | 20 |
279280
|UK South| 100 | 100 |
280281
|UK West| 100 | 20 |
281-
|USGov Arizona| 100 | 20 |
282-
|USGov Texas| 100 | Not Available |
283-
|USGov Virginia| 100 | 20 |
282+
|USGov Arizona| 20 | 20 |
283+
|USGov Texas| 20 | Not Available |
284+
|USGov Virginia| 80 | 20 |
284285
|West Central US| 100 | 20 |
285286
|West Europe| 100 | 100 |
286287
|West India| 100 | 20 |

articles/azure-functions/functions-scenarios.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ For example, in a retail solution, a partner system can submit product catalog i
2424
[ ![Diagram of a file upload process using Azure Functions.](./media/functions-scenarios/process-file-uploads.png) ](./media/functions-scenarios/process-file-uploads-expanded.png#lightbox)
2525

2626

27-
The following tutorials use an Event Grid trigger to process files in a blob container:
27+
The following tutorials use a Blob trigger (Event Grid based) to process files in a blob container:
2828

2929
::: zone pivot="programming-language-csharp"
3030

@@ -50,6 +50,7 @@ public static async Task Run([BlobTrigger("catalog-uploads/{name}", Source = Blo
5050
}
5151
```
5252

53+
+ [Event-based Blob storage triggered function that converts PDF documents to text at scale](https://github.com/Azure-Samples/azure-functions-flex-consumption-samples/tree/main/E2E/BLOB-PDF)
5354
+ [Upload and analyze a file with Azure Functions and Blob Storage](../storage/blobs/blob-upload-function-trigger.md?tabs=dotnet)
5455
+ [Automate resizing uploaded images using Event Grid](../event-grid/resize-images-on-storage-blob-upload-event.md?tabs=dotnet)
5556
+ [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-csharp)

articles/azure-netapp-files/backup-requirements-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Azure NetApp Files backup in a region can only protect an Azure NetApp Files vol
3838

3939
* In a [cross-region replication](cross-region-replication-introduction.md) (CRR) or [cross-zone replication](cross-zone-replication-introduction.md) (CZR) setting, Azure NetApp Files backup can be configured on a source volume.
4040

41-
Backups on a destination volume are only supported for manually created snapshots. To take backups of a destination volume, create a snapshot on the source volume then wait for the snapshot to be replicated to the destination volume. From the destination volume, you can select the snapshot for backup, where you can select this snapshot for backup. Scheduled backups on a destination volume aren't supported.
41+
Backups on a destination volume are only supported for manually created snapshots. To take backups of a destination volume, create a snapshot on the source volume then wait for the snapshot to be replicated to the destination volume. From the destination volume, you select the snapshot for backup. Scheduled backups on a destination volume aren't supported.
4242

4343
* See [Restore a backup to a new volume](backup-restore-new-volume.md) for additional considerations related to restoring backups.
4444

articles/azure-resource-manager/management/tag-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ The following limitations apply to tags:
7979
* Tag names can't contain these characters: `<`, `>`, `%`, `&`, `\`, `?`, `/`
8080

8181
> [!NOTE]
82-
> * Azure Domain Name System (DNS) zones don't support the use of spaces in the tag or a tag that starts with a number. Azure DNS tag names don't support special and unicode characters. The value can contain all characters.
82+
> * Azure Domain Name System (DNS) zones don't support the use of spaces or parentheses in the tag or a tag that starts with a number. Azure DNS tag names don't support special and unicode characters. The value can contain all characters.
8383
>
8484
> * Traffic Manager doesn't support the use of spaces, `#` or `:` in the tag name. The tag name can't start with a number.
8585
>

articles/communication-services/concepts/analytics/logs/email-logs.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ Communication Services offers the following types of logs that you can enable:
9494

9595
## Email Status Update operational logs
9696

97-
*Email status update operational logs* provide in-depth insights into message and recipient level delivery status updates on your sendmail API requests. These logs offer message-specific details, such as the time of delivery, as well as recipient-level details, such as email addresses and delivery status updates. By tracking these logs, you can ensure full visibility into your email delivery process, quickly identifying any issues that may arise and taking corrective action as necessary.
97+
*Email status update operational logs* provide in-depth insights into message-level and recipient-level delivery status updates on your sendmail API requests.
98+
- Message-level status updates provide the status of the long-running email send operation (similar to the status updates you receive through calling our GET APIs). These are marked by the absence of `RecipientId` property because these updates are for the entire message and not applicable to a specific recipient in that message request. `DeliveryStatus` property contains the message-level delivery status. Possible values for `DeliveryStatus` for this type of event are `Dropped`, `OutForDelivery`, and `Queued`.
99+
- Recipient-level status updates provide the status of email delivery for each individual recipient to whom the email was sent in a single message. These contain a `RecipientId` property with the recipient's email address. Recipient-level delivery status is provided in the `DeliveryStatus` property. Possible values for `DeliveryStatus` for this type of event are `Delivered`, `Expanded`, `Failed`, `Quarantined`, `FilteredSpam`, `Suppressed`, and `Bounced`.
100+
By tracking these logs, you can ensure full visibility into your email delivery process, quickly identifying any issues that may arise and taking corrective action as necessary.
98101

99102
| Property | Description |
100103
| -------- | ---------------|
@@ -104,8 +107,8 @@ Communication Services offers the following types of logs that you can enable:
104107
| `OperationVersion` | The `api-version` associated with the operation, if the `operationName` was performed using an API. If there's no API that corresponds to this operation, the version represents the version of that operation in case the properties associated with the operation change in the future. |
105108
| `Category` | The log category of the event. The category is the granularity at which you can enable or disable logs on a particular resource. The properties that appear within the properties blob of an event are the same within a particular log category and resource type. |
106109
| `CorrelationID` | The ID for correlated events. Can be used to identify correlated events between multiple tables. For all Email operational logs, the CorrelationId is mapped to the MessageId, which is returned from a successful SendMail request. |
107-
| `RecipientId` | The email address for the targeted recipient. If this is a message-level event, the property will be empty. |
108-
| `DeliveryStatus` | The terminal status of the message. |
110+
| `RecipientId` | The email address for the targeted recipient. It is only present for recipient-level events. If this is a message-level event, the property will be empty. |
111+
| `DeliveryStatus` | The terminal status of the message. Possible valuse for message-level event are: `Dropped`, `OutForDelivery`, `Queued`. Possible valuse for a recipient-level event are: `Delivered`, `Expanded`, `Failed`, `Quarantined`, `FilteredSpam`, `Suppressed`, `Bounced`. |
109112
| `SmtpStatusCode` | SMTP status code returned from the recipient email server in response to a send mail request.
110113
| `EnhancedSmtpStatusCode` | Enhanced SMTP status code returned from the recipient email server.
111114
| `SenderDomain` | The domain portion of the SenderAddress used in sending emails.
@@ -160,4 +163,4 @@ Communication Services offers the following types of logs that you can enable:
160163
"EngagementContext":"https://www.contoso.com/support?id=12345",
161164
"UserAgent":"Mozilla/5.0"
162165
}
163-
```
166+
```

articles/hdinsight/azure-monitor-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ We also improved the out-of-box dashboards both at the cluster-level. There's a
185185

186186
## Release and support timeline
187187

188-
* Classic Azure Monitoring integration isn't unavailable after October 15, 2021. You can't enable classic Azure Monitoring integration after that date.
188+
* Classic Azure Monitoring integration isn't available after October 15, 2021. You can't enable classic Azure Monitoring integration after that date.
189189

190190
* Classic Azure Monitoring integration ingestion will not be working after August 31, 2024.
191191

0 commit comments

Comments
 (0)