Skip to content

Commit 0b39887

Browse files
authored
Merge pull request #279198 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 ac16082 + 6fc2bd4 commit 0b39887

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

articles/aks/app-routing-nginx-configuration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,3 +551,4 @@ Learn about monitoring the ingress-nginx controller metrics included with the ap
551551
[azure-dns-overview]: ../dns/dns-overview.md
552552
[az-keyvault-certificate-show]: /cli/azure/keyvault/certificate#az-keyvault-certificate-show
553553
[prometheus-in-grafana]: app-routing-nginx-prometheus.md
554+
[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create

articles/container-apps/opentelemetry-agents.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,15 @@ While you can set up as many OTLP-configured endpoints as you like, each endpoin
199199
# [Azure CLI](#tab/azure-cli)
200200

201201
```azurecli
202-
az containerap env telemetry otlp add \
203-
--name "otlp1"
202+
az containerapp env telemetry otlp add \
203+
--name "otlp1" \
204204
--endpoint "ENDPOINT_URL_1" \
205205
--insecure false \
206206
--headers "api-key-1=key" \
207207
--enable-open-telemetry-traces true \
208208
--enable-open-telemetry-metrics true
209-
az containerap env telemetry otlp add \
210-
--name "otlp2"
209+
az containerapp env telemetry otlp add \
210+
--name "otlp2" \
211211
--endpoint "ENDPOINT_URL_2" \
212212
--insecure true \
213213
--enable-open-telemetry-traces true \

articles/container-apps/tutorial-event-driven-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: cshoe
1212

1313
# Tutorial: Deploy an event-driven job with Azure Container Apps
1414

15-
Azure Container Apps [jobs](jobs.md) allow you to run containerized tasks that execute for a finite duration and exit. You can trigger a job execution manually, on a schedule, or based on events. Jobs are best suited to for tasks such as data processing, machine learning, or any scenario that requires serverless ephemeral compute resources.
15+
Azure Container Apps [jobs](jobs.md) allow you to run containerized tasks that execute for a finite duration and exit. You can trigger a job execution manually, on a schedule, or based on events. Jobs are best suited to for tasks such as data processing, machine learning, resource cleanup, or any scenario that requires serverless ephemeral compute resources.
1616

1717
In this tutorial, you learn how to work with [event-driven jobs](jobs.md#event-driven-jobs).
1818

articles/cosmos-db/continuous-backup-restore-introduction.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ Currently the point in time restore functionality has the following limitations:
148148

149149
* Azure Cosmos DB for MongoDB accounts with continuous backup don't support creating a unique index for an existing collection. For such an account, unique indexes must be created along with their collection; it can be done using the create collection [extension commands](mongodb/custom-commands.md).
150150

151-
* The point-in-time restore functionality always restores to a new Azure Cosmos DB account. Restoring to an existing account is currently not supported. If you're interested in providing feedback about in-place restore, contact the Azure Cosmos DB team via your account representative.
152-
153151
* After restoring, it's possible that for certain collections the consistent index may be rebuilding. You can check the status of the rebuild operation via the [IndexTransformationProgress](how-to-manage-indexing-policy.md) property.
154152

155153
* The restore process restores all the properties of a container including its TTL configuration by default, you can pass parameter to disable TTL while doing the restore. As a result, it's possible that the data restored is deleted immediately if you configured that way. In order to prevent this situation, the restore timestamp must be before the TTL properties were added into the container.

articles/cosmos-db/mongodb/vcore/how-to-private-link.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ To create a private endpoint to a node in an existing cluster, open the
9090
> default values for the form fields might not be correct. Check them and
9191
> update if necessary.
9292
93-
3. Select **Next: Resource**. For **Target sub-resource**, choose the target
94-
node of the cluster. Usually **coordinator** is the desired node.
93+
3. Select **Next: Resource**. Choose "Microsoft.DocumentDB/mongoClusters" for **Resource type**, and choose the target cluster for **Resource**. For **Target sub-resource**, choose "MongoCluster".
9594

9695
4. Select **Next: Virtual Network**. Choose the desired **Virtual network** and
9796
**Subnet**. Under **Private IP configuration**, select **Statically allocate IP address** or keep the default, **Dynamically allocate IP address**.

articles/machine-learning/concept-compute-target.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ While Azure Machine Learning supports these VM series, they might not be availab
141141
:::moniker range="azureml-api-1"
142142
> [!NOTE]
143143
> Azure Machine Learning doesn't support all VM sizes that Azure Compute supports. To list the available VM sizes, use the following method:
144-
> * [REST API](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/examples/ListVMSizesResult.json)
144+
> * [REST API](/rest/api/azureml/virtual-machine-sizes/list)
145145
:::moniker-end
146146
:::moniker range="azureml-api-2"
147147
> [!NOTE]
148148
> Azure Machine Learning doesn't support all VM sizes that Azure Compute supports. To list the available VM sizes, use one of the following methods:
149-
> * [REST API](https://github.com/Azure/azure-rest-api-specs/blob/master/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-08-01/examples/ListVMSizesResult.json)
149+
> * [REST API](/rest/api/azureml/virtual-machine-sizes/list)
150150
> * The [Azure CLI extension 2.0 for machine learning](how-to-configure-cli.md) command, [az ml compute list-sizes](/cli/azure/ml/compute#az-ml-compute-list-sizes).
151151
:::moniker-end
152152

articles/static-web-apps/apex-domain-external.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ This guide demonstrates three options for configuring an apex domain.
3131

3232
* Use the steps to [set up with an A Record](#set-up-with-an-a-record) if the above options do not suit you. With an `A` record, your traffic is directed to a single Static Web Apps host, and your app no longer benefit from the performance improvements provided by global distribution.
3333

34+
> [!NOTE]
35+
> `CNAME` record maps a domain name to another domain (or subdomain) whereas `A` record maps a domain name to an IP address. If the IP address changes, a `CNAME` entry is still valid, unlike `A` record.
36+
37+
3438
## Set up with an ALIAS record
3539

3640
Before you create the `ALIAS` record, you first need to validate that you own the domain.

articles/static-web-apps/application-settings.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ procedureSection:
7777
7878
1. Open your static web app.
7979
80-
1. Select **Configuration** in the sidebar.
80+
1. Select **Environment variables** in the sidebar.
8181
82-
1. Select the environment to which you want to apply the application settings. You can configure application settings per environment. When you create a pull request, staging environments are automatically created, and then promoted into production when you merge the pull request.
82+
1. Select the environment to which you want to create environment variables. You can create variables per environment. When you create a pull request, staging environments are automatically created, and then promoted into production when you merge the pull request.
8383
84-
1. Select **+ Add** to add a new app setting.
85-
:::image type="content" source="media/application-settings/configuration.png" alt-text="Screenshot of Azure Static Web Apps configuration view":::
84+
1. Select **+ Add** to add a new environment variable.
85+
:::image type="content" source="media/application-settings/configuration.png" alt-text="Screenshot of Azure Static Web Apps environment variables view":::
8686
8787
1. Enter a **Name** and **Value**.
8888

0 commit comments

Comments
 (0)