Skip to content

Commit 6a689a9

Browse files
authored
Merge pull request Azure#4738 from Azure/cabailey-azurepowershell
Text-only updates for 2 Key Vault files to carry thru to next version
2 parents 5cdaef1 + 6fb40bf commit 6a689a9

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

src/ResourceManager/KeyVault/Commands.KeyVault/help/New-AzureRmKeyVault.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ Accept wildcard characters: False
9696
```
9797
9898
### -EnableSoftDelete
99-
If specified, 'soft delete' functionality is enabled for this key vault.
99+
Specifies that the soft-delete functionality is enabled for this key vault. When soft-delete is enabled, for a grace period, you can recover this key vault and its contents after it is deleted.
100+
101+
For more information about this functionality, see [Azure Key Vault soft-delete overview](https://docs.microsoft.com/azure/key-vault/key-vault-ovw-soft-delete). For how-to instructions, see [How to use Key Vault soft-delete with PowerShell](https://docs.microsoft.com/azure/key-vault/key-vault-soft-delete-powershell).
100102
101103
```yaml
102104
Type: SwitchParameter
@@ -111,9 +113,7 @@ Accept wildcard characters: False
111113
```
112114
113115
### -Location
114-
Specifies the Azure region in which to create the key vault. Use the command Get-AzureLocation
115-
(https://msdn.microsoft.com/ library/azure/mt589064.aspx) to see your choices. For more
116-
information, type `Get-Help Get-AzureLocation`.
116+
Specifies the Azure region in which to create the key vault. Use the command [Get-AzureLocation](https://docs.microsoft.com/powershell/module/Azure/Get-AzureLocation) to see your choices.
117117
118118
```yaml
119119
Type: String
@@ -143,8 +143,7 @@ Accept wildcard characters: False
143143
```
144144
145145
### -Sku
146-
Specifies the SKU of the key vault instance. For information about which features are available for
147-
each SKU, see the Azure Key Vault Pricing website (http://go.microsoft.com/fwlink/?linkid=512521).
146+
Specifies the SKU of the key vault instance. For information about which features are available for each SKU, see the Azure Key Vault Pricing website (https://go.microsoft.com/fwlink/?linkid=512521).
148147
149148
```yaml
150149
Type: SkuName
@@ -239,4 +238,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
239238
240239
[Get-AzureRmKeyVault](./Get-AzureRmKeyVault.md)
241240
242-
[Remove-AzureRmKeyVault](./Remove-AzureRmKeyVault.md)
241+
[Remove-AzureRmKeyVault](./Remove-AzureRmKeyVault.md)

src/ResourceManager/KeyVault/Commands.KeyVault/help/Set-AzureRmKeyVaultAccessPolicy.md

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ Set-AzureRmKeyVaultAccessPolicy [-VaultName] <String> [[-ResourceGroupName] <Str
5151
```
5252

5353
## DESCRIPTION
54-
The **Set-AzureRmKeyVaultAccessPolicy** cmdlet grants or modifies existing permissions for a user, application, or security group to perform the specified operations with a key vault.
55-
It does not modify the permissions that other users, applications, or security groups have on the key vault.
54+
The **Set-AzureRmKeyVaultAccessPolicy** cmdlet grants or modifies existing permissions for a user, application, or security group to perform the specified operations with a key vault. It does not modify the permissions that other users, applications, or security groups have on the key vault.
5655

5756
If you are setting permissions for a security group, this operation affects only users in that security group.
5857

@@ -72,7 +71,7 @@ Note that although specifying the resource group is optional for this cmdlet, yo
7271

7372
## EXAMPLES
7473

75-
### Example 1: Grant permissions to a user for a key vault Key Vault and modify the permissionskey vault
74+
### Example 1: Grant permissions to a user for a key vault and modify the permissions
7675
```
7776
PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -UserPrincipalName '[email protected]' -PermissionsToKeys create,import,delete,list -PermissionsToSecrets 'set,delete'
7877
PS C:\> Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -UserPrincipalName '[email protected]' -PermissionsToSecrets set,delete,get -PassThru
@@ -81,23 +80,19 @@ PS C:\> Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -UserPrincip
8180

8281
The first command grants permissions for a user in your Azure Active Directory, [email protected], to perform operations on keys and secrets with a key vault named Contoso03Vault.
8382

84-
The second command modifies the permissions that were granted to [email protected] in the first command, to now allow getting secrets in addition to setting and deleting them.
85-
The permissions to key operations remain unchanged after this command.
86-
The *PassThru* parameter results in the updated object being returned by the cmdlet.
83+
The second command modifies the permissions that were granted to [email protected] in the first command, to now allow getting secrets in addition to setting and deleting them. The permissions to key operations remain unchanged after this command. The *PassThru* parameter results in the updated object being returned by the cmdlet.
8784

88-
The final command further modifies the existing permissions for [email protected] to remove all permissions to key operations.
89-
The permissions to secret operations remain unchanged after this command.
90-
The *PassThru* parameter results in the updated object being returned by the cmdlet.
85+
The final command further modifies the existing permissions for [email protected] to remove all permissions to key operations. The permissions to secret operations remain unchanged after this command. The *PassThru* parameter results in the updated object being returned by the cmdlet.
9186

9287
### Example 2: Grant permissions for an application service principal to read and write secrets
9388
```
9489
PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -ServicePrincipalName 'http://payroll.contoso.com' -PermissionsToSecrets Get,Set
9590
```
9691

97-
This command grants permissions for an application for a key vault named Contoso03Vault.
98-
The *ServicePrincipalName* parameter specifies the application.
99-
The application must be registered in your Azure Active Directory.
100-
The value of the *ServicePrincipalName* parameter must be either the service principal name of the application or the application ID GUID.
92+
This command grants permissions for an application for a key vault named Contoso03Vault.
93+
94+
The *ServicePrincipalName* parameter specifies the application. The application must be registered in your Azure Active Directory. The value of the *ServicePrincipalName* parameter must be either the service principal name of the application or the application ID GUID.
95+
10196
This example specifies the service principal name http://payroll.contoso.com, and the command grants the application permissions to read and write secrets.
10297

10398
### Example 3: Grant permissions for an application using its object ID
@@ -106,6 +101,7 @@ PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -ObjectId 345
106101
```
107102

108103
This command grants the application permissions to read and write secrets.
104+
109105
This example specifies the application using the object ID of the service principal of the application.
110106

111107
### Example 4: Grant permissions for a user principal name
@@ -115,7 +111,7 @@ PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -UserPrincipa
115111

116112
This command grants get, list, and set permissions for the specified user principal name for access to secrets.
117113

118-
### Example 5: Enable secrets to be retrieved from a key vault vault by the Microsoft.Compute resource providerkey vault
114+
### Example 5: Enable secrets to be retrieved from a key vault vault by the Microsoft.Compute resource provider
119115
```
120116
PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso03Vault' -ResourceGroupName 'Group14' -EnabledForDeployment
121117
```
@@ -133,23 +129,21 @@ group2 b8a401eb-63ad-4a30
133129
group3 da07a6be-2c1e-4e42-934d-ceb57cf652b4
134130
```
135131

136-
The first command uses the Get-AzureRmADGroup cmdlet to get all Active Directory groups.
137-
From the output, you see 3 groups returned, named **group1**, **group2**, and **group3**.
138-
Multiple groups can have the same name but always have a unique ObjectId.
139-
When more than one group that has the same name is returned, use the ObjectId in the output to identify the one you want to use.
132+
The first command uses the Get-AzureRmADGroup cmdlet to get all Active Directory groups. From the output, you see 3 groups returned, named **group1**, **group2**, and **group3**. Multiple groups can have the same name but always have a unique ObjectId. When more than one group that has the same name is returned, use the ObjectId in the output to identify the one you want to use.
133+
134+
You then use the output of this command with Set-AzureRmKeyVaultAccessPolicy to grant permissions to group2 for your key vault, named **myownvault**. This example enumerates the groups named 'group2' inline in the same command line.
140135

141-
You then use the output of this command with Set-AzureRmKeyVaultAccessPolicy to grant permissions to group2 for your key vault, named **myownvault**.
142-
This example enumerates the groups named 'group2' inline in the same command line.
143136
There may be multiple groups in the returned list that are named 'group2'.
144137
This example picks the first one, indicated by index \[0\] in the returned list.
145138

146139
### Example 7: Grant Azure Information Protection access to the customer-managed tenant key (BYOK)
147140
```
148-
PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso04Vault' -ServicePrincipalName 00000012-0000-0000-c000-000000000000 -PermissionsToKeys decrypt,encrypt,unwrapkey,wrapkey,verify,sign,get
141+
PS C:\>Set-AzureRmKeyVaultAccessPolicy -VaultName 'Contoso04Vault' -ServicePrincipalName 00000012-0000-0000-c000-000000000000 -PermissionsToKeys decrypt,sign,get
149142
```
150143

151144
This command authorizes Azure Information Protection to use a customer-managed key (the bring your own key, or "BYOK" scenario) as the Azure Information Protection tenant key.
152-
When you run this command, specify your own vault name but you must specify the *ServicePrincipalName* parameter with the GUID **00000012-0000-0000-c000-000000000000** and specify all the permissions in the example.
145+
146+
When you run this command, specify your own key vault name but you must specify the *ServicePrincipalName* parameter with the GUID **00000012-0000-0000-c000-000000000000** and specify the permissions in the example.
153147

154148
## PARAMETERS
155149

@@ -170,6 +164,7 @@ Accept wildcard characters: False
170164
171165
### -BypassObjectIdValidation
172166
Enables you to specify an object ID without validating that the object exists in Azure Active Directory.
167+
173168
Use this parameter only if you want to grant access to your key vault to an object ID that refers to a delegated security group from another Azure tenant.
174169
175170
```yaml
@@ -186,6 +181,7 @@ Accept wildcard characters: False
186181
187182
### -EmailAddress
188183
Specifies the user email address of the user to whom to grant permissions.
184+
189185
This email address must exist in the directory associated with the current subscription and be unique.
190186
191187
```yaml
@@ -262,6 +258,7 @@ Accept wildcard characters: False
262258
263259
### -PassThru
264260
Returns an object representing the item with which you are working.
261+
265262
By default, this cmdlet does not generate any output.
266263
267264
```yaml
@@ -278,7 +275,8 @@ Accept wildcard characters: False
278275
279276
### -PermissionsToCertificates
280277
Specifies an array of certificate permissions to grant to a user or service principal.
281-
The acceptable values for this parameter are:
278+
279+
The acceptable values for this parameter:
282280
283281
- Get
284282
- List
@@ -308,7 +306,8 @@ Accept wildcard characters: False
308306
309307
### -PermissionsToKeys
310308
Specifies an array of key operation permissions to grant to a user or service principal.
311-
The acceptable values for this parameter are:
309+
310+
The acceptable values for this parameter:
312311
313312
- Decrypt
314313
- Encrypt
@@ -342,7 +341,8 @@ Accept wildcard characters: False
342341
343342
### -PermissionsToSecrets
344343
Specifies an array of secret operation permissions to grant to a user or service principal.
345-
The acceptable values for this parameter are:
344+
345+
The acceptable values for this parameter:
346346
347347
- Get
348348
- List
@@ -367,7 +367,7 @@ Accept wildcard characters: False
367367
```
368368
369369
### -PermissionsToStorage
370-
Specifies managed storage account and sas definition operation permissions to grant to a user or service principal.
370+
Specifies managed storage account and SaS-definition operation permissions to grant to a user or service principal.
371371
372372
```yaml
373373
Type: String[]
@@ -399,8 +399,8 @@ Accept wildcard characters: False
399399
400400
### -ServicePrincipalName
401401
Specifies the service principal name of the application to which to grant permissions.
402-
Specify the application ID, also known as client ID, registered for the application in AzureActive Directory.
403-
The application with the service principal name that this parameter specifies must be registered in the Azure directory that contains your current subscription.
402+
403+
Specify the application ID, also known as client ID, registered for the application in AzureActive Directory. The application with the service principal name that this parameter specifies must be registered in the Azure directory that contains your current subscription.
404404
405405
```yaml
406406
Type: String
@@ -416,6 +416,7 @@ Accept wildcard characters: False
416416
417417
### -UserPrincipalName
418418
Specifies the user principal name of the user to whom to grant permissions.
419+
419420
This user principal name must exist in the directory associated with the current subscription.
420421
421422
```yaml
@@ -432,6 +433,7 @@ Accept wildcard characters: False
432433
433434
### -VaultName
434435
Specifies the name of a key vault.
436+
435437
This cmdlet modifies the access policy for the key vault that this parameter specifies.
436438
437439
```yaml
@@ -462,8 +464,7 @@ Accept wildcard characters: False
462464
```
463465
464466
### -WhatIf
465-
Shows what would happen if the cmdlet runs.
466-
The cmdlet is not run.
467+
Shows what would happen if the cmdlet runs. The cmdlet is not run.
467468
468469
```yaml
469470
Type: SwitchParameter

0 commit comments

Comments
 (0)