Skip to content

Commit 9abea50

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into anf-nfs4.1-domain
2 parents 42fa49f + 21803c6 commit 9abea50

File tree

14 files changed

+51
-31
lines changed

14 files changed

+51
-31
lines changed

articles/ai-services/document-intelligence/toc.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ items:
5757
- name: Create a Document Intelligence resource
5858
displayName: endpoint, key, portal
5959
href: create-document-intelligence-resource.md
60+
- name: Migrate to Document Intelligence v3.1
61+
displayName: get started, confidence, bounding box, boundingBox, polygon, analyze, AnalyzeResult, train, build, sas, compose, copy
62+
href: v3-1-migration-guide.md
6063
- name: Migrate to Document Intelligence v3.0
6164
displayName: get started, confidence, bounding box, boundingBox, polygon, analyze, AnalyzeResult, train, build, sas, compose, copy
62-
href: v3-migration-guide.md
65+
href: v3-migration-guide.md
6366
- name: Check my usage and estimate the cost
6467
displayName: price, metrics, dashboard, check, estimate
6568
href: how-to-guides/estimate-cost.md

articles/ai-services/document-intelligence/v3-1-migration-guide.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ monikerRange: '<=doc-intel-3.1.0'
1515
<!-- markdownlint-disable MD004 -->
1616
# Document Intelligence v3.1 migration
1717

18+
::: moniker range="<=doc-intel-3.1.0"
19+
[!INCLUDE [applies to v3.1, v3.0, and v2.1](includes/applies-to-v3-1-v3-0-v2-1.md)]
20+
::: moniker-end
21+
1822
> [!IMPORTANT]
1923
>
2024
> Document Intelligence REST API v3.1 introduces breaking changes in the REST API request and analyze response JSON.

articles/app-service/manage-automatic-scaling.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: How to enable automatic scaling
33
description: Learn how to scale automatically in Azure App Service with zero configuration.
44
ms.topic: article
5-
ms.date: 05/12/2023
5+
ms.date: 08/02/2023
66
ms.author: msangapu
77

88
---
99
# Automatic scaling in Azure App Service
1010

1111
> [!NOTE]
12-
> Automatic scaling is in preview. It's available for Premium Pv2 and Pv3 pricing tiers, and supported for all app types: Windows, Linux, and Windows container.
12+
> Automatic scaling is in preview. It's available for Premium V2 (P1V2, P2V2, P3V2) and Premium V3 (P1V3, P2V3, P3V3) pricing tiers, and supported for all app types: Windows, Linux, and Windows container.
1313
>
1414
1515
Automatic scaling is a new scale out option that automatically handles scaling decisions for your web apps and App Service Plans. It's different from the pre-existing **[Azure autoscale](../azure-monitor/autoscale/autoscale-overview.md)**, which lets you define scaling rules based on schedules and resources. With automatic scaling, you can adjust scaling settings to improve your app's performance and avoid cold start issues. The platform prewarms instances to act as a buffer when scaling out, ensuring smooth performance transitions. You can use Application Insights [Live Metrics](../azure-monitor/app/live-stream.md) to check your current instance count, and [performanceCounters](../azure-functions/analyze-telemetry-data.md#query-telemetry-data) to see the instance count history. You're charged per second for every instance, including prewarmed instances.
@@ -18,7 +18,7 @@ A comparison of scale out and scale in options available on App Service:
1818

1919
| | **Manual** | **Autoscale** | **Automatic scaling** |
2020
| --- | --- | --- | --- |
21-
| Available pricing tiers | Basic and Up | Standard and Up | Premium v2 and Premium v3 |
21+
| Available pricing tiers | Basic and Up | Standard and Up | Premium V2 (P1V2, P2V2, P3V2) and Premium V3 (P1V3, P2V3, P3V3)|
2222
|Rule-based scaling |No |Yes |No, the platform manages the scale out and in based on HTTP traffic. |
2323
|Schedule-based scaling |No |Yes |No|
2424
|Always ready instances | No, your web app runs on the number of manually scaled instances. | No, your web app runs on other instances available during the scale out operation, based on threshold defined for autoscale rules. | Yes (minimum 1) |

articles/container-registry/container-registry-oras-artifacts.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ For more information on oras attach, see [ORAS documentation][oras-docs].
102102
## Attach a multi-file artifact as a reference
103103

104104
When OCI artifacts are pushed to a registry with ORAS, each file reference is pushed as a blob. To push separate blobs, reference the files individually, or collection of files by referencing a directory.
105-
For more information how to push a collection of files, see [Pushing artifacts with multiple files][oras-push-multifiles]
105+
For more information how to push a collection of files, see [Pushing artifacts with multiple files][oras-push-multifiles].
106106

107107
Create some documentation around an artifact:
108108

@@ -385,7 +385,7 @@ In this article, a graph of supply chain artifacts is created, discovered, promo
385385

386386
## Next steps
387387

388-
* Learn more about [the ORAS CLI](https://oras.land/docs/category/cli)
388+
* Learn more about [the ORAS CLI][oras-cli]
389389
* Learn more about [OCI Artifact Manifest][oci-artifact-manifest] for how to push, discover, pull, copy a graph of supply chain artifacts
390390

391391
<!-- LINKS - external -->
@@ -395,9 +395,9 @@ In this article, a graph of supply chain artifacts is created, discovered, promo
395395
[oci-spec]: https://github.com/opencontainers/distribution-spec/blob/main/spec.md/
396396
[oci-1_1-spec]: https://github.com/opencontainers/distribution-spec/releases/tag/v1.1.0-rc1
397397
[oras-docs]: https://oras.land/
398-
[oras-install-docs]: https://oras.land/docs/category/cli
399-
[oras-cli]: https://oras.land/docs/category/cli-reference
400-
[oras-push-multifiles]: https://oras.land/docs/cli/pushing/#pushing-artifacts-with-multiple-files
398+
[oras-install-docs]: https://oras.land/docs/installation
399+
[oras-cli]: https://oras.land/docs/category/oras-commands/
400+
[oras-push-multifiles]: https://oras.land/docs/how_to_guides/pushing_and_pulling#pushing-artifacts-with-multiple-files
401401

402402

403403
<!-- LINKS - internal -->

articles/governance/resource-graph/first-query-portal.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ functions to achieve your intended results.
7676
To download CSV results from the Azure portal, browse to the Azure Resource Graph Explorer and run a
7777
query. On the toolbar, click **Download as CSV** as shown in the following screenshot:
7878

79-
:::image type="content" source="./arg-export-csv.png" alt-text="Screenshot of Azure Resource Graph Explorer in Azure portal with Download as CSV button highlighted.":::
79+
:::image type="content" source="./media/first-query-portal/arg-export-csv.png" alt-text="Screenshot of Azure Resource Graph Explorer in Azure portal with Download as CSV button highlighted.":::
8080

8181
> [!NOTE]
8282
> When using the comma-separated value (CSV) export functionality of Azure Resource Graph Explorer, the result set is limited to 55,000 records. This is a platform limit that cannot be overridden by filing an Azure support ticket.
@@ -134,11 +134,11 @@ your Azure portal workflow, try out these example dashboards.
134134

135135
- [Resource Graph Explorer - Sample Dashboard #1](https://github.com/Azure-Samples/Governance/blob/master/src/resource-graph/portal-dashboards/sample-1/resourcegraphexplorer-sample-1.json)
136136

137-
:::image type="content" source="./media/arge-sample1-small.png" alt-text="Example image for Sample Dashboard #1" lightbox="./media/arge-sample1-large.png":::
137+
:::image type="content" source="./media/first-query-portal/arge-sample1-small.png" alt-text="Example image for Sample Dashboard #1" lightbox="./media/first-query-portal/arge-sample1-large.png":::
138138

139139
- [Resource Graph Explorer - Sample Dashboard #2](https://github.com/Azure-Samples/Governance/blob/master/src/resource-graph/portal-dashboards/sample-2/resourcegraphexplorer-sample-2.json)
140140

141-
:::image type="content" source="./media/arge-sample2-small.png" alt-text="Example image for Sample Dashboard #2" lightbox="./media/arge-sample2-large.png":::
141+
:::image type="content" source="./media/first-query-portal/arge-sample2-small.png" alt-text="Example image for Sample Dashboard #2" lightbox="./media/first-query-portal/arge-sample2-large.png":::
142142

143143
> [!NOTE]
144144
> Counts and charts in the above example dashboard screenshots vary depending on your Azure

articles/governance/resource-graph/arg-export-csv.png renamed to articles/governance/resource-graph/media/first-query-portal/arg-export-csv.png

File renamed without changes.

articles/governance/resource-graph/media/arge-sample1-large.png renamed to articles/governance/resource-graph/media/first-query-portal/arge-sample1-large.png

File renamed without changes.

articles/governance/resource-graph/media/arge-sample1-small.png renamed to articles/governance/resource-graph/media/first-query-portal/arge-sample1-small.png

File renamed without changes.

articles/governance/resource-graph/media/arge-sample2-large.png renamed to articles/governance/resource-graph/media/first-query-portal/arge-sample2-large.png

File renamed without changes.

articles/governance/resource-graph/media/arge-sample2-small.png renamed to articles/governance/resource-graph/media/first-query-portal/arge-sample2-small.png

File renamed without changes.

0 commit comments

Comments
 (0)