Skip to content

Commit 569712b

Browse files
authored
Merge pull request #177348 from alexbuckgit/alexbuckgit/docutune-autopr-20211025-002248-2822546
DocuTune: Fix indentation issues
2 parents 6cd946e + b8f638b commit 569712b

File tree

93 files changed

+1096
-931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1096
-931
lines changed

articles/active-directory-b2c/id-token-hint.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -249,24 +249,25 @@ For both symmetric and asymmetric approaches, the `id_token_hint` technical prof
249249
<OrchestrationStep Order="1" Type="GetClaims" CpimIssuerTechnicalProfileReferenceId="IdTokenHint_ExtractClaims" />
250250
```
251251
1. In your relying party policy, repeat the same input claims you configured in the IdTokenHint_ExtractClaims technical profile. For example:
252+
252253
```xml
253-
<RelyingParty>
254-
<DefaultUserJourney ReferenceId="SignUp" />
255-
<TechnicalProfile Id="PolicyProfile">
256-
<DisplayName>PolicyProfile</DisplayName>
257-
<Protocol Name="OpenIdConnect" />
258-
<InputClaims>
259-
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="userId" />
254+
<RelyingParty>
255+
<DefaultUserJourney ReferenceId="SignUp" />
256+
<TechnicalProfile Id="PolicyProfile">
257+
<DisplayName>PolicyProfile</DisplayName>
258+
<Protocol Name="OpenIdConnect" />
259+
<InputClaims>
260+
<InputClaim ClaimTypeReferenceId="email" PartnerClaimType="userId" />
260261
</InputClaims>
261-
<OutputClaims>
262-
<OutputClaim ClaimTypeReferenceId="displayName" />
263-
<OutputClaim ClaimTypeReferenceId="givenName" />
264-
<OutputClaim ClaimTypeReferenceId="surname" />
265-
<OutputClaim ClaimTypeReferenceId="email" />
266-
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub"/>
267-
<OutputClaim ClaimTypeReferenceId="identityProvider" />
268-
</OutputClaims>
269-
<SubjectNamingInfo ClaimType="sub" />
262+
<OutputClaims>
263+
<OutputClaim ClaimTypeReferenceId="displayName" />
264+
<OutputClaim ClaimTypeReferenceId="givenName" />
265+
<OutputClaim ClaimTypeReferenceId="surname" />
266+
<OutputClaim ClaimTypeReferenceId="email" />
267+
<OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="sub"/>
268+
<OutputClaim ClaimTypeReferenceId="identityProvider" />
269+
</OutputClaims>
270+
<SubjectNamingInfo ClaimType="sub" />
270271
</TechnicalProfile>
271272
</RelyingParty>
272273
```

articles/active-directory-b2c/partner-twilio.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,24 @@ The following components make up the Twilio solution:
6161
1. Open the B2C-WebAPI-DotNet solution and replace the following values with your own tenant-specific values in the web.config:
6262

6363
```xml
64-
<add key="ida:Tenant" value="yourtenant.onmicrosoft.com" />
65-
<add key="ida:TenantId" value="d6f33888-0000-4c1f-9b50-1590f171fc70" />
66-
<add key="ida:ClientId" value="6bd98cc8-0000-446a-a05e-b5716ef2651b" />
67-
<add key="ida:ClientSecret" value="secret" />
68-
<add key="ida:AadInstance" value="https://yourtenant.b2clogin.com/tfp/{0}/{1}" />
69-
<add key="ida:RedirectUri" value="https://your hosted psd2 demo app url/" />
70-
```
64+
<add key="ida:Tenant" value="yourtenant.onmicrosoft.com" />
65+
<add key="ida:TenantId" value="d6f33888-0000-4c1f-9b50-1590f171fc70" />
66+
<add key="ida:ClientId" value="6bd98cc8-0000-446a-a05e-b5716ef2651b" />
67+
<add key="ida:ClientSecret" value="secret" />
68+
<add key="ida:AadInstance" value="https://yourtenant.b2clogin.com/tfp/{0}/{1}" />
69+
<add key="ida:RedirectUri" value="https://your hosted psd2 demo app url/" />
70+
```
7171

7272
1. The [web app](https://github.com/azure-ad-b2c/partner-integrations/tree/master/samples/Twilio-VerifyAPI/source-code/PSD2%20Demo%20App) also hosts the ID token hint generator and metadata endpoint.
73+
7374
- Create your signing certificate as described in this [sample description](https://github.com/azure-ad-b2c/samples/tree/master/policies/invite#creating-a-signing-certificate).
75+
7476
- Update the following lines based on your certificate in the web.config:
7577

76-
```xml
77-
<add key="ida:SigningCertThumbprint" value="4F39D6014818082CBB763E5BA5F230E545212E89" />
78-
<add key="ida:SigningCertAlgorithm" value="RS256" />
79-
```
78+
```xml
79+
<add key="ida:SigningCertThumbprint" value="4F39D6014818082CBB763E5BA5F230E545212E89" />
80+
<add key="ida:SigningCertAlgorithm" value="RS256" />
81+
```
8082

8183
1. Upload the demo application to your hosting provider of choice. Guidance for Azure App Service is provided in [this sample description](https://github.com/azure-ad-b2c/samples/tree/master/policies/invite#hosting-the-application-in-azure-app-service), including instructions for uploading your certificate.
8284

articles/active-directory/cloud-sync/how-to-prerequisites.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ For steps on how to upgrade an existing agent to use a gMSA account see [Group M
5252

5353
#### Create gMSA account with PowerShell
5454
You can use the following PowerShell script to create a custom gMSA account. Then you can use the [cloud sync gMSA cmdlets](how-to-gmsa-cmdlets.md) to apply more granular permissions.
55-
```powershell
55+
56+
```powershell
5657
# Filename: 1_SetupgMSA.ps1
5758
# Description: Creates and installs a custom gMSA account for use with Azure AD Connect cloud sync.
5859
#
@@ -84,7 +85,8 @@ New-ADServiceAccount -Name $Name `
8485
8586
# Install the new service account on Azure AD Cloud Sync server
8687
Install-ADServiceAccount -Identity $Name
87-
```
88+
```
89+
8890
For additional information on the cmdlets above, see [Getting Started with Group Managed Service Accounts](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/jj128431(v=ws.11)?redirectedfrom=MSDN).
8991

9092
### In the Azure Active Directory admin center

articles/active-directory/cloud-sync/how-to-troubleshoot.md

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,23 @@ By selecting the status, you can see additional information about the quarantine
162162

163163
![Screenshot that shows additional information about the quarantine.](media/how-to-troubleshoot/quarantine-2.png)
164164

165-
Right clicking on the status will bring up additional options:
166-
167-
- view provisioning logs
168-
- view agent
169-
- clear quarantine
165+
Right-clicking on the status will bring up additional options:
170166

171-
![Screenshot that shows the right-click menu options.](media/how-to-troubleshoot/quarantine-4.png)
167+
- view provisioning logs
168+
- view agent
169+
- clear quarantine
172170

171+
![Screenshot that shows the right-click menu options.](media/how-to-troubleshoot/quarantine-4.png)
173172

174173
### Resolve a quarantine
175-
There are two different ways to resolve a quarantine. They are:
176174

177-
- clear quarantine - clears the watermark and runs a delta sync
178-
- restart the provisioning job - clears the watermark and runs an initial sync
175+
There are two different ways to resolve a quarantine. They are:
176+
177+
- clear quarantine - clears the watermark and runs a delta sync
178+
- restart the provisioning job - clears the watermark and runs an initial sync
179179

180180
#### Clear quarantine
181+
181182
To clear the watermark and run a delta sync on the provisioning job once you have verified it, simply right-click on the status and select **clear quarantine**.
182183

183184
You should see an notice that the quarantine is clearing.
@@ -189,11 +190,13 @@ Then you should see the status on your agent as healthy.
189190
![Quarantine status information](media/how-to-troubleshoot/quarantine-6.png)
190191

191192
#### Restart the provisioning job
193+
192194
Use the Azure portal to restart the provisioning job. On the agent configuration page, select **Restart provisioning**.
193195

194196
![Restart provisioning](media/how-to-troubleshoot/quarantine-3.png)
195197

196198
- Use Microsoft Graph to [restart the provisioning job](/graph/api/synchronization-synchronizationjob-restart?tabs=http&view=graph-rest-beta&preserve-view=true). You'll have full control over what you restart. You can choose to clear:
199+
197200
- Escrows, to restart the escrow counter that accrues toward quarantine status.
198201
- Quarantine, to remove the application from quarantine.
199202
- Watermarks.
@@ -203,19 +206,25 @@ Use the Azure portal to restart the provisioning job. On the agent configuration
203206
`POST /servicePrincipals/{id}/synchronization/jobs/{jobId}/restart`
204207

205208
## Repairing the the Cloud Sync service account
206-
If you need to repair the cloud sync service account you can use the `Repair-AADCloudSyncToolsAccount`.
207-
208-
209-
1. Use the installation steps outlined [here](reference-powershell.md#install-the-aadcloudsynctools-powershell-module) to begin and then continue with the remaining steps.
210-
2. From a Windows PowerShell session with administrative privileges, type or copy and paste the following:
211-
```
212-
Connect-AADCloudSyncTools
213-
```
214-
3. Enter your Azure AD global admin credentials
215-
4. Type or copy and paste the following:
216-
```
217-
Repair-AADCloudSyncToolsAccount
218-
```
209+
210+
If you need to repair the cloud sync service account you can use the `Repair-AADCloudSyncToolsAccount`.
211+
212+
1. Use the installation steps outlined [here](reference-powershell.md#install-the-aadcloudsynctools-powershell-module) to begin and then continue with the remaining steps.
213+
214+
2. From a PowerShell session with administrative privileges, type or copy and paste the following:
215+
216+
```powershell
217+
Connect-AADCloudSyncTools
218+
```
219+
220+
3. Enter your Azure AD global admin credentials.
221+
222+
4. Type or copy and paste the following:
223+
224+
```powershell
225+
Repair-AADCloudSyncToolsAccount
226+
```
227+
219228
5. Once this completes it should say that the account was repaired successfully.
220229
221230
## Next steps

articles/active-directory/develop/quickstart-v2-python-webapp.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,16 @@ See [How the sample works](#how-the-sample-works) for an illustration.
120120
121121
1. You will need to install MSAL Python library, Flask framework, Flask-Sessions for server-side session management and requests using pip as follows:
122122
123-
```Shell
123+
```shell
124124
pip install -r requirements.txt
125125
```
126126
127-
2. Run app.py from shell or command line:
127+
2. Run `app.py` from shell or command line:
128128
129-
```Shell
129+
```shell
130130
python app.py
131131
```
132+
132133
> [!IMPORTANT]
133134
> This quickstart application uses a client secret to identify itself as confidential client. Because the client secret is added as a plain-text to your project files, for security reasons, it is recommended that you use a certificate instead of a client secret before considering the application as production application. For more information on how to use a certificate, see [these instructions](./active-directory-certificate-credentials.md).
134135

articles/active-directory/develop/tutorial-v2-windows-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ In this step, you create a class to handle interaction with MSAL, such as handli
126126
```csharp
127127
using Microsoft.Identity.Client;
128128
```
129-
<!-- Workaround for Docs conversion bug -->
129+
<!-- Workaround for Docs conversion bug -->
130130
131131
2. Update the app class to the following:
132132

articles/active-directory/managed-identities-azure-resources/msi-tutorial-linux-vm-access-arm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ To complete these steps, you need an SSH client. If you are using Windows, you c
158158
"properties":{"provisioningState":"Succeeded"}
159159
160160
```
161-
 
161+
162162
## Next steps
163163

164164
In this tutorial, you learned how to create a user-assigned managed identity and attach it to a Linux virtual machine to access the Azure Resource Manager API. To learn more about Azure Resource Manager see:

articles/active-directory/managed-identities-azure-resources/qs-configure-cli-windows-vm.md

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,9 @@ az vm update -n myVM -g myResourceGroup --set identity.type="none"
9090

9191
## User-assigned managed identity
9292

93-
In this section, you will learn how to add and remove a user-assigned managed identity from an Azure VM using Azure CLI. If you create your user-assigned managed identity in a different RG than your VM. You'll have to use the URL of your managed identity to assign it to your VM.
94-
For example `--identities "/subscriptions/<SUBID>/resourcegroups/<RESROURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER_ASSIGNED_ID_NAME>"`
93+
In this section, you will learn how to add and remove a user-assigned managed identity from an Azure VM using Azure CLI. If you create your user-assigned managed identity in a different RG than your VM. You'll have to use the URL of your managed identity to assign it to your VM. For example:
94+
95+
`--identities "/subscriptions/<SUBID>/resourcegroups/<RESROURCEGROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER_ASSIGNED_ID_NAME>"`
9596

9697
### Assign a user-assigned managed identity during the creation of an Azure VM
9798

@@ -139,34 +140,35 @@ To assign a user-assigned identity to a VM, your account needs the [Virtual Mach
139140

140141
1. Create a user-assigned identity using [az identity create](/cli/azure/identity#az_identity_create). The `-g` parameter specifies the resource group where the user-assigned identity is created, and the `-n` parameter specifies its name. Be sure to replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
141142

142-
> [!IMPORTANT]
143-
> Creating user-assigned managed identities with special characters (i.e. underscore) in the name is not currently supported. Please use alphanumeric characters. Check back for updates. For more information, see [FAQs and known issues](known-issues.md)
143+
> [!IMPORTANT]
144+
> Creating user-assigned managed identities with special characters (i.e. underscore) in the name is not currently supported. Please use alphanumeric characters. Check back for updates. For more information, see [FAQs and known issues](known-issues.md)
145+
146+
```azurecli-interactive
147+
az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
148+
```
144149

145-
```azurecli-interactive
146-
az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
147-
```
148150
The response contains details for the user-assigned managed identity created, similar to the following.
149151

150152
```json
151153
{
152-
"clientId": "73444643-8088-4d70-9532-c3a0fdc190fz",
153-
"clientSecretUrl": "https://control-westcentralus.identity.azure.net/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCE GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER ASSIGNED IDENTITY NAME>/credentials?tid=5678&oid=9012&aid=73444643-8088-4d70-9532-c3a0fdc190fz",
154-
"id": "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCE GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER ASSIGNED IDENTITY NAME>",
155-
"location": "westcentralus",
156-
"name": "<USER ASSIGNED IDENTITY NAME>",
157-
"principalId": "e5fdfdc1-ed84-4d48-8551-fe9fb9dedfll",
158-
"resourceGroup": "<RESOURCE GROUP>",
159-
"tags": {},
160-
"tenantId": "733a8f0e-ec41-4e69-8ad8-971fc4b533bl",
161-
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
154+
"clientId": "73444643-8088-4d70-9532-c3a0fdc190fz",
155+
"clientSecretUrl": "https://control-westcentralus.identity.azure.net/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCE GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER ASSIGNED IDENTITY NAME>/credentials?tid=5678&oid=9012&aid=73444643-8088-4d70-9532-c3a0fdc190fz",
156+
"id": "/subscriptions/<SUBSCRIPTON ID>/resourcegroups/<RESOURCE GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER ASSIGNED IDENTITY NAME>",
157+
"location": "westcentralus",
158+
"name": "<USER ASSIGNED IDENTITY NAME>",
159+
"principalId": "e5fdfdc1-ed84-4d48-8551-fe9fb9dedfll",
160+
"resourceGroup": "<RESOURCE GROUP>",
161+
"tags": {},
162+
"tenantId": "733a8f0e-ec41-4e69-8ad8-971fc4b533bl",
163+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities"
162164
}
163165
```
164166

165167
2. Assign the user-assigned identity to your VM using [az vm identity assign](/cli/azure/vm). Be sure to replace the `<RESOURCE GROUP>` and `<VM NAME>` parameter values with your own values. The `<USER ASSIGNED IDENTITY NAME>` is the user-assigned managed identity's resource `name` property, as created in the previous step. If you created your user-assigned managed identity in a different RG than your VM. You'll have to use the URL of your managed identity.
166168

167-
```azurecli-interactive
168-
az vm identity assign -g <RESOURCE GROUP> -n <VM NAME> --identities <USER ASSIGNED IDENTITY>
169-
```
169+
```azurecli-interactive
170+
az vm identity assign -g <RESOURCE GROUP> -n <VM NAME> --identities <USER ASSIGNED IDENTITY>
171+
```
170172

171173
### Remove a user-assigned managed identity from an Azure VM
172174

articles/active-directory/managed-identities-azure-resources/qs-configure-cli-windows-vmss.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,10 @@ This section walks you through creation of a virtual machine scale set and assig
140140

141141
1. Create a user-assigned managed identity using [az identity create](/cli/azure/identity#az_identity_create). The `-g` parameter specifies the resource group where the user-assigned managed identity is created, and the `-n` parameter specifies its name. Be sure to replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
142142

143-
```azurecli-interactive
144-
az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
145-
```
143+
```azurecli-interactive
144+
az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
145+
```
146+
146147
The response contains details for the user-assigned managed identity created, similar to the following.
147148

148149
```json

articles/active-directory/managed-identities-azure-resources/qs-configure-rest-vmss.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ In this section, you learn how to add and remove user-assigned managed identity
649649

650650
For example, if you have system-assigned identity and the user-assigned managed identity `ID1` currently assigned to your virtual machine scale set and would like to add the user-assigned managed identity `ID2` to it:
651651

652-
```bash
652+
```bash
653653
curl 'https://management.azure.com/subscriptions/<SUBSCRIPTION ID>/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMachineScaleSets/myVMSS?api-version=2017-12-01' -X PATCH -d '{"identity":{"type":"SystemAssigned, UserAssigned", "identityIds":["/subscriptions/<SUBSCRIPTION ID>/resourcegroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ID1","/subscriptions/<SUBSCRIPTION ID>/resourcegroups/myResourceGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/ID2"]}}' -H "Content-Type: application/json" -H Authorization:"Bearer <ACCESS TOKEN>"
654654
```
655655

0 commit comments

Comments
 (0)