Skip to content

Commit 52e4745

Browse files
authored
Merge pull request #104352 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 032303e + a0e240e commit 52e4745

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

articles/active-directory/azuread-dev/active-directory-authentication-libraries.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ The Azure Active Directory Authentication Library (ADAL) v1.0 enables applicatio
3636
| Platform | Library | Download | Source Code | Sample | Reference
3737
| --- | --- | --- | --- | --- | --- |
3838
| .NET Client, Windows Store, UWP, Xamarin iOS and Android |ADAL .NET v3 |[NuGet](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet) | [Desktop app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-dotnet) |[Reference](https://docs.microsoft.com/dotnet/api/microsoft.identitymodel.clients.activedirectory?view=azure-dotnet) |
39-
| .NET Client, Windows Store, Windows Phone 8.1 |ADAL .NET v2 |[NuGet](https://www.nuget.org/packages/Microsoft.IdentityModel.Clients.ActiveDirectory/2.28.4) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-dotnet/releases/tag/v2.28.4) | [Desktop app](https://github.com/AzureADQuickStarts/NativeClient-DotNet/releases/tag/v2.X) | |
4039
| JavaScript |ADAL.js |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-js) |[Single-page app](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi) | |
4140
| iOS, macOS |ADAL |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc/releases) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-objc) |[iOS app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-ios) | [Reference](http://cocoadocs.org/docsets/ADAL/2.5.1/)|
4241
| Android |ADAL |[Maven](https://search.maven.org/search?q=g:com.microsoft.aad+AND+a:adal&core=gav) |[GitHub](https://github.com/AzureAD/azure-activedirectory-library-for-android) |[Android app](https://docs.microsoft.com/azure/active-directory/active-directory-devquickstarts-android) | [JavaDocs](https://javadoc.io/doc/com.microsoft.aad/adal/)|

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Users in this role can read settings and administrative information across Micro
242242
> These features are currently in development.
243243
>
244244
245-
### [Group Administrator](#group-administrator-permissions)
245+
### [Groups Administrator](#groups-administrator-permissions)
246246

247247
Users in this role can create/manage groups and its settings like naming and expiration policies. It is important to understand that assigning a user to this role gives them the ability to manage all groups in the tenant across various workloads like Teams, SharePoint, Yammer in addition to Outlook. Also the user will be able to manage the various groups settings across various admin portals like Microsoft Admin Center, Azure portal, as well as workload specific ones like Teams and SharePoint Admin Centers.
248248

@@ -1077,7 +1077,7 @@ Can read everything that a Global Administrator can, but not edit anything.
10771077
| microsoft.office365.usageReports/allEntities/read | Read Office 365 usage reports. |
10781078
| microsoft.office365.webPortal/allEntities/standard/read | Read standard properties on all resources in microsoft.office365.webPortal. |
10791079

1080-
### Group Administrator permissions
1080+
### Groups Administrator permissions
10811081
Can manage all aspects of groups and group settings like naming and expiration policies.
10821082

10831083
| **Actions** | **Description** |
@@ -1714,7 +1714,7 @@ Directory Writers | Directory writers | 9360feb5-f418-4baa-8175-e2a00bac4301
17141714
Exchange Service Administrator | Exchange administrator | 29232cdf-9323-42fd-ade2-1d097af3e4de
17151715
External Identity Provider Administrator | External Identity Provider Administrator | be2f45a1-457d-42af-a067-6ec1fa63bc45
17161716
Global Reader | Global reader | f2ef992c-3afb-46b9-b7cf-a126ee74c451
1717-
Group Administrator | Group administrator | fdd7a751-b60b-444a-984c-02652fe8fa1c
1717+
Groups Administrator | Groups administrator | fdd7a751-b60b-444a-984c-02652fe8fa1c
17181718
Guest Inviter | Guest inviter | 95e79109-95c0-4d8e-aee3-d01accf2d47b
17191719
Helpdesk Administrator | Helpdesk administrator | 729827e3-9c14-49f7-bb1b-9608f156bbb8
17201720
Intune Service Administrator | Intune administrator | 3a2c62db-5318-420d-8d74-23affee5d9d5

articles/aks/windows-container-cli.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ az aks create \
147147
> If you get a password validation error, try creating your resource group in another region.
148148
> Then try creating the cluster with the new resource group.
149149
150+
> [!Note]
151+
> If you are unable to create the AKS cluster because the version is not supported in this region then you can use the [az aks get-versions --location eastus] command to find the supported version list for this region.
152+
153+
150154
After a few minutes, the command completes and returns JSON-formatted information about the cluster. Occasionally the cluster can take longer than a few minutes to provision. Allow up to 10 minutes in these cases.
151155

152156
## Add a Windows Server node pool
@@ -287,6 +291,9 @@ To see the sample app in action, open a web browser to the external IP address o
287291

288292
![Image of browsing to ASP.NET sample application](media/windows-container/asp-net-sample-app.png)
289293

294+
> [!Note]
295+
> If you receive a connection timeout when trying to load the page then you should verify the sample app is ready with the following command [kubectl get pods --watch]. Sometimes the windows container will not be started by the time your external IP address is available.
296+
290297
## Delete cluster
291298

292299
When the cluster is no longer needed, use the [az group delete][az-group-delete] command to remove the resource group, container service, and all related resources.

articles/api-management/configure-custom-domain.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ When you create an Azure API Management service instance, Azure assigns it a sub
2424
> API Management accepts only requests with [host header](https://tools.ietf.org/html/rfc2616#section-14.23) values matching the default domain name or any of the configured custom domain names.
2525
2626
> [!WARNING]
27-
> Customers who wish to use certificate pinning to improve the security of their applications must use a custom domain name > and certificate which they manage, not the default certificate. Customers that pin the default certificate instead will be taking a hard dependency on the properties of the certificate they don't control, which is not a recommended practice.
27+
> Customers who wish to use certificate pinning to improve the security of their applications must use a custom domain name and certificate which they manage, not the default certificate. Customers that pin the default certificate instead will be taking a hard dependency on the properties of the certificate they don't control, which is not a recommended practice.
2828
2929
## Prerequisites
3030

@@ -52,7 +52,7 @@ To perform the steps described in this article, you must have:
5252
- **SCM** (default is: `<apim-service-name>.scm.azure-api.net`).
5353

5454
> [!NOTE]
55-
> Only the **Gateway** endpoint in available for configuration in the Consumption tier.
55+
> Only the **Gateway** endpoint is available for configuration in the Consumption tier.
5656
> You can update all of the endpoints or some of them. Commonly, customers update **Gateway** (this URL is used to call the API exposed through API Management) and **Portal** (the developer portal URL).
5757
> **Management** and **SCM** endpoints are used internally by the API Management instance owners only and thus are less frequently assigned a custom domain name.
5858
> The **Premium** tier supports setting multiple host names for the **Gateway** endpoint.
@@ -70,7 +70,7 @@ To perform the steps described in this article, you must have:
7070
> We recommend using Azure Key Vault for managing certificates and setting them to autorotate.
7171
> If you use Azure Key Vault to manage the custom domain SSL certificate, make sure the certificate is inserted into Key Vault [as a _certificate_](https://docs.microsoft.com/rest/api/keyvault/CreateCertificate/CreateCertificate), not a _secret_.
7272
>
73-
> To fetch an SSL certificate, API Management must have the list an get secrets permissions on the Azure Key Vault containing the certificate. When using Azure portal all the necessary configuration steps will be completed automatically. When using command line tools or management API, these permissions must be granted manually. This is done in two steps. First, use Managed identities page on your API Management instance to make sure that Managed Identity is enabled and make a note of the principal id shown on that page. Second, give permission list and get secrets permissions to this principal id on the Azure Key Vault containing the certificate.
73+
> To fetch an SSL certificate, API Management must have the list and get secrets permissions on the Azure Key Vault containing the certificate. When using Azure portal all the necessary configuration steps will be completed automatically. When using command line tools or management API, these permissions must be granted manually. This is done in two steps. First, use Managed identities page on your API Management instance to make sure that Managed Identity is enabled and make a note of the principal id shown on that page. Second, give permission list and get secrets permissions to this principal id on the Azure Key Vault containing the certificate.
7474
>
7575
> If the certificate is set to autorotate, API Management will pick up the latest version automatically without any downtime to the service (if your API Management tier has SLA - i. e. in all tiers except the Developer tier).
7676

articles/application-gateway/redirect-http-to-https-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Set-AzVmssStorageProfile $vmssConfig `
278278
-ImageReferencePublisher MicrosoftWindowsServer `
279279
-ImageReferenceOffer WindowsServer `
280280
-ImageReferenceSku 2016-Datacenter `
281-
-ImageReferenceVersion latest
281+
-ImageReferenceVersion latest `
282282
-OsDiskCreateOption FromImage
283283
Set-AzVmssOsProfile $vmssConfig `
284284
-AdminUsername azureuser `

articles/application-gateway/url-route-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In the following example, Application Gateway is serving traffic for contoso.com
2222
Requests for http\://contoso.com/video/* are routed to VideoServerPool, and http\://contoso.com/images/* are routed to ImageServerPool. DefaultServerPool is selected if none of the path patterns match.
2323

2424
> [!IMPORTANT]
25-
> Rules are processed in the order they are listed in the portal. It is highly recommended to configure multi-site listeners first prior to configuring a basic listener. This ensures that traffic gets routed to the right back end. If a basic listener is listed first and matches an incoming request, it gets processed by that listener.
25+
> For the v1 SKU, rules are processed in the order they are listed in the portal. If a basic listener is listed first and matches an incoming request, it gets processed by that listener. For the v2 SKU, exact matches have higher precedence. However, it is highly recommended to configure multi-site listeners first prior to configuring a basic listener. This ensures that traffic gets routed to the right back end.
2626
2727
## UrlPathMap configuration element
2828

articles/mysql/howto-data-encryption-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Learn how to use the Azure portal to set up and manage data encryption for your
2020
* [Soft delete](../key-vault/key-vault-ovw-soft-delete.md)
2121

2222
```azurecli-interactive
23-
az resource update --id $(az keyvault show --name \ <key_vault_name> -test -o tsv | awk '{print $1}') --set \ properties.enableSoftDelete=true
23+
az resource update --id $(az keyvault show --name \ <key_vault_name> -o tsv | awk '{print $1}') --set \ properties.enableSoftDelete=true
2424
```
2525
2626
* [Purge protected](../key-vault/key-vault-ovw-soft-delete.md#purge-protection)

articles/security/benchmarks/security-control-network-security.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ https://docs.microsoft.com/azure/governance/policy/tutorials/create-and-manage
182182

183183
Azure Policy samples for networking:
184184

185-
https://docs.microsoft.com/azure/governance/policy/samples/#network
185+
https://docs.microsoft.com/azure/governance/policy/samples/built-in-policies#network
186186

187187
How to create an Azure Blueprint:
188188

@@ -222,8 +222,8 @@ https://docs.microsoft.com/azure/governance/policy/tutorials/create-and-manage
222222

223223
Azure Policy samples for networking:
224224

225-
https://docs.microsoft.com/azure/governance/policy/samples/#network
225+
https://docs.microsoft.com/azure/governance/policy/samples/built-in-policies#network
226226

227227
## Next steps
228228

229-
- See the next security control: [Logging and Monitoring](security-control-logging-monitoring.md)
229+
- See the next security control: [Logging and Monitoring](security-control-logging-monitoring.md)

0 commit comments

Comments
 (0)