Skip to content

Commit 3d8b64b

Browse files
authored
Merge pull request #266384 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 b8e3d84 + b31ecaf commit 3d8b64b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

articles/cosmos-db/get-started-change-data-capture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ First, create a straightforward [Azure Blob Storage](../storage/blobs/index.yml)
158158

159159
:::image type="content" source="media/get-started-change-data-capture/sink-container-name.png" alt-text="Screenshot of the blob container named output set as the sink target.":::
160160

161-
1. Locate the **Update method** section and change the selections to only allow **delete** and **update** operations. Also, specify the **Key columns** as a **List of columns** using the field `_{rid}` as the unique identifier.
161+
1. Locate the **Update method** section and change the selections to only allow **delete** and **update** operations. Also, specify the **Key columns** as a **List of columns** using the field `{_rid}` as the unique identifier.
162162

163163
:::image type="content" source="media/get-started-change-data-capture/sink-methods-columns.png" alt-text="Screenshot of update methods and key columns being specified for the sink.":::
164164

articles/key-vault/general/rbac-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ More about Azure Key Vault management guidelines, see:
5151
| Key Vault Administrator| Perform all data plane operations on a key vault and all objects in it, including certificates, keys, and secrets. Cannot manage key vault resources or manage role assignments. Only works for key vaults that use the 'Azure role-based access control' permission model. | 00482a5a-887f-4fb3-b363-3b7fe8e74483 |
5252
| Key Vault Reader | Read metadata of key vaults and its certificates, keys, and secrets. Cannot read sensitive values such as secret contents or key material. Only works for key vaults that use the 'Azure role-based access control' permission model. | 21090545-7ca7-4776-b22c-e363652d74d2 |
5353
| Key Vault Certificates Officer | Perform any action on the certificates of a key vault, except manage permissions. Only works for key vaults that use the 'Azure role-based access control' permission model. | a4417e6f-fecd-4de8-b567-7b0420556985 |
54-
| Key Vault Certificates User | Read entire certificate contents including secret and key portion. Only works for key vaults that use the 'Azure role-based access control' permission model. | db79e9a7-68ee-4b58-9aeb-b90e7c24fcba |
54+
| Key Vault Certificate User | Read entire certificate contents including secret and key portion. Only works for key vaults that use the 'Azure role-based access control' permission model. | db79e9a7-68ee-4b58-9aeb-b90e7c24fcba |
5555
| Key Vault Crypto Officer | Perform any action on the keys of a key vault, except manage permissions. Only works for key vaults that use the 'Azure role-based access control' permission model. | 14b46e9e-c2b7-41b4-b07b-48a6ebf60603 |
5656
| Key Vault Crypto Service Encryption User | Read metadata of keys and perform wrap/unwrap operations. Only works for key vaults that use the 'Azure role-based access control' permission model. | e147488a-f6f5-4113-8e2d-b22465e65bf6 |
5757
| Key Vault Crypto User | Perform cryptographic operations using keys. Only works for key vaults that use the 'Azure role-based access control' permission model. | 12338af0-0e69-4776-bea7-57ae8d297424 |

articles/virtual-machines/extensions/key-vault-windows.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The following JSON shows the schema for the Key Vault VM extension. Before you c
115115
"autoUpgradeMinorVersion": true,
116116
"settings": {
117117
"secretsManagementSettings": {
118-
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: 3600>,
118+
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: "3600">,
119119
"linkOnRenewal": <Windows only. Ensures s-channel binding when the certificate renews without necessitating redeployment. Example: true>,
120120
"requireInitialSync": <Initial synchronization of certificates. Example: true>,
121121
"observedCertificates": <An array of KeyVault URIs that represent monitored certificates, including certificate store location and ACL permission to certificate private key. Example:
@@ -191,8 +191,8 @@ The JSON schema includes the following properties.
191191
| `apiVersion` | 2022-08-01 | date |
192192
| `publisher` | Microsoft.Azure.KeyVault | string |
193193
| `type` | KeyVaultForWindows | string |
194-
| `typeHandlerVersion` | 3.0 | int |
195-
| `pollingIntervalInS` | 3600 | string |
194+
| `typeHandlerVersion` | "3.0" | string |
195+
| `pollingIntervalInS` | "3600" | string |
196196
| `linkOnRenewal` (optional) | true | boolean |
197197
| `requireInitialSync` (optional) | false | boolean |
198198
| `observedCertificates` | [{...}, {...}] | string array |
@@ -211,8 +211,8 @@ The JSON schema includes the following properties.
211211
| `apiVersion` | 2022-08-01 | date |
212212
| `publisher` | Microsoft.Azure.KeyVault | string |
213213
| `type` | KeyVaultForWindows | string |
214-
| `typeHandlerVersion` | 1.0 | int |
215-
| `pollingIntervalInS` | 3600 | string |
214+
| `typeHandlerVersion` | "1.0" | string |
215+
| `pollingIntervalInS` | "3600" | string |
216216
| `certificateStoreName` | MY | string |
217217
| `linkOnRenewal` | true | boolean |
218218
| `certificateStoreLocation` | LocalMachine or CurrentUser (case sensitive) | string |
@@ -249,7 +249,7 @@ The following JSON snippets provide example settings for an ARM template deploym
249249
"autoUpgradeMinorVersion": true,
250250
"settings": {
251251
"secretsManagementSettings": {
252-
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: 3600>,
252+
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: "3600">,
253253
"linkOnRenewal": <Windows only. Ensures s-channel binding when the certificate renews without necessitating redeployment. Example: true>,
254254
"observedCertificates": <An array of KeyVault URIs that represent monitored certificates, including certificate store location and ACL permission to certificate private key. Example:
255255
[
@@ -300,7 +300,7 @@ The following JSON snippets provide example settings for an ARM template deploym
300300
"autoUpgradeMinorVersion": true,
301301
"settings": {
302302
"secretsManagementSettings": {
303-
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: 3600>,
303+
"pollingIntervalInS": <A string that specifies the polling interval in seconds. Example: "3600">,
304304
"linkOnRenewal": <Windows only. Ensures s-channel binding when the certificate renews without necessitating redeployment. Example: true>,
305305
"certificateStoreName": <The certificate store name. Example: "MY">,
306306
"certificateStoreLocation": <The certificate store location, which currently works locally only. Example: "LocalMachine">,

0 commit comments

Comments
 (0)