Skip to content

Commit 77233d1

Browse files
authored
Merge pull request #273583 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 4e21f47 + a58b6c2 commit 77233d1

File tree

8 files changed

+20
-7
lines changed

8 files changed

+20
-7
lines changed

articles/aks/image-integrity.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,13 @@ In this article, we use a self-signed CA cert from the official Ratify documenta
157157
name: store-oras
158158
spec:
159159
name: oras
160+
# If you want to you use Workload Identity for Ratify to access Azure Container Registry,
161+
# uncomment the following lines, and fill the proper ClientID:
162+
# See more: https://ratify.dev/docs/reference/oras-auth-provider
163+
# parameters:
164+
# authProvider:
165+
# name: azureWorkloadIdentity
166+
# clientID: XXX
160167
---
161168
apiVersion: config.ratify.deislabs.io/v1beta1
162169
kind: Verifier

articles/aks/learn/tutorial-kubernetes-workload-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ To help simplify steps to configure the identities required, the steps below def
103103
1. Create an Azure Key Vault in resource group you created in this tutorial using the [az keyvault create][az-keyvault-create] command.
104104
105105
```azurecli-interactive
106-
az keyvault create --resource-group "${RESOURCE_GROUP}" --location "${LOCATION}" --name "${KEYVAULT_NAME}"
106+
az keyvault create --resource-group "${RESOURCE_GROUP}" --location "${LOCATION}" --name "${KEYVAULT_NAME}" --enable-rbac-authorization false
107107
```
108108
109109
The output of this command shows properties of the newly created key vault. Take note of the two properties listed below:

articles/aks/tutorial-kubernetes-paas-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ In previous tutorials, you used a RabbitMQ container to store orders submitted b
143143
```
144144
145145
2. Open the `aks-store-quickstart.yaml` file in a text editor.
146-
3. Remove the existing `rabbitmq` Deployment, ConfigMap, and Service sections and replace the existing `order-service` Deployment section with the following content:
146+
3. Remove the existing `rabbitmq` StatefulSet, ConfigMap, and Service sections and replace the existing `order-service` Deployment section with the following content:
147147
148148
```yaml
149149
apiVersion: apps/v1

articles/aks/tutorial-kubernetes-prepare-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ You can use [Docker Compose][docker-compose] to automate building container imag
183183

184184
### Docker
185185

186-
1. Create the container image, download the Redis image, and start the application using the `docker compose` command:
186+
1. Create the container image, download the RabbitMQ image, and start the application using the `docker compose` command:
187187

188188
```console
189189
docker compose -f docker-compose-quickstart.yml up -d

articles/iot-hub-device-update/device-update-data-privacy.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Data privacy for Device Update for Azure IoT Hub
33
description: Understand how Device Update for IoT Hub protects data privacy.
44
author: eshashah-msft
55
ms.author: eshashah
6-
ms.date: 01/19/2023
6+
ms.date: 04/26/2024
77
ms.topic: conceptual
88
ms.service: iot-hub-device-update
99
---
@@ -29,3 +29,7 @@ Microsoft maintains no information and has no access to data that would allow co
2929
For more information on Microsoft's privacy commitments, see the "Enterprise and developer products" section of the [Microsoft Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement).
3030

3131
For more information about data residency with Device Update, see [Regional mapping for disaster recovery for Device Update](device-update-region-mapping.md).
32+
33+
**Device Update usage of Content Delivery Networks**
34+
35+
In order to maintain the scalability and availability of your imported updates, the Device Update for IoT Hub service distributes imported updates to select global Content Delivery Networks (CDNs). This allows your IoT devices to download your imported updates from the closest available CDN endpoint, increasing download speed and reliability. To learn more, visit [Content Delivery Networks](/azure/architecture/best-practices/cdn).

articles/key-vault/general/security-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ When you create a key vault in a resource group, you manage access by using Micr
102102
- **Resource group**: An Azure role assigned at the resource group level applies to all resources in that resource group.
103103
- **Specific resource**: An Azure role assigned for a specific resource applies to that resource. In this case, the resource is a specific key vault.
104104

105-
There are several predefined roles. If a predefined role doesn't fit your needs, you can define your own role. For more information, see [Azure RBAC: Built-in roles](../../role-based-access-control/built-in-roles.md)w
105+
There are several predefined roles. If a predefined role doesn't fit your needs, you can define your own role. For more information, see [Azure RBAC: Built-in roles](../../role-based-access-control/built-in-roles.md).
106106

107107
> [!IMPORTANT]
108108
> When using the Access Policy permission model, if a user has `Contributor`, `Key Vault Contributor` or other role with `Microsoft.KeyVault/vaults/write` permissions to a key vault management plane, the user can grant themselves access to the data plane by setting a Key Vault access policy. You should tightly control who has `Contributor` role access to your key vaults with the Access Policy permission model to ensure that only authorized persons can access and manage your key vaults, keys, secrets, and certificates. It is recommended to use the new **Role Based Access Control (RBAC) permission model** to avoid this issue. With the RBAC permission model, permission management is limited to 'Owner' and 'User Access Administrator' roles, which allows separation of duties between roles for security operations and general administrative operations.

articles/postgresql/index.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ landingContent:
4646
url: flexible-server/quickstart-create-server-portal.md
4747
- text: Create an Azure Database for PostgreSQL - Flexible Server instance using ARM template
4848
url: flexible-server/quickstart-create-server-arm-template.md
49+
- text: Create an Azure Database for PostgreSQL - Flexible Server instance using Azure CLI
50+
url: flexible-server/quickstart-create-server-cli.md
4951
- linkListType: tutorial
5052
links:
5153
- text: Create App and database server in virtual network
@@ -224,4 +226,4 @@ landingContent:
224226
- linkListType: learn
225227
links:
226228
- text: Azure Database for PostgreSQL - Flexible Server
227-
url: /training/paths/introduction-to-azure-postgres/
229+
url: /training/paths/introduction-to-azure-postgres/

articles/synapse-analytics/synapse-link/synapse-link-for-sql-known-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ The following sections list limitations for Azure Synapse Link for SQL.
118118
EXEC sys.sp_change_feed_disable_db
119119
```
120120

121-
### Trying to re-enable change feed on a table for that was recently disabled table will show an error. This is an uncommon behavior.
121+
### Trying to re-enable change feed on a table for which it was recently disabled will show an error. (This is an uncommon behavior.)
122122

123123
* Applies To - Azure Synapse Link for Azure SQL Database and SQL Server 2022
124124
* Issue - When you try to enable a table that has been recently disabled with its metadata not yet been cleaned up and state marked as DISABLED, an error is thrown stating `A table can only be enabled once among all table groups`.

0 commit comments

Comments
 (0)