Skip to content

Commit 88ae439

Browse files
authored
Merge pull request #87591 from MicrosoftDocs/master
9/5 PM Publish
2 parents 49c4b9c + 46c4b83 commit 88ae439

File tree

107 files changed

+1169
-1021
lines changed

Some content is hidden

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

107 files changed

+1169
-1021
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4480,6 +4480,11 @@
44804480
"redirect_url": "/azure/app-service/containers/configure-language-java",
44814481
"redirect_document_id": false
44824482
},
4483+
{
4484+
"source_path": "articles/app-service/containers/quickstart-docker-go.md",
4485+
"redirect_url": "/azure/app-service/containers/quickstart-docker",
4486+
"redirect_document_id": false
4487+
},
44834488
{
44844489
"source_path": "articles/app-service/containers/tutorial-ruby-mysql-app.md",
44854490
"redirect_url": "/azure/app-service/containers/tutorial-ruby-postgres-app",
@@ -31659,6 +31664,11 @@
3165931664
"redirect_url": "/azure/search/search-howto-indexing-azure-blob-storage",
3166031665
"redirect_document_id": false
3166131666
},
31667+
{
31668+
"source_path": "articles/storage/blobs/storage-quickstart-blobs-java-v10.md",
31669+
"redirect_url": "https://github.com/azure/azure-storage-java",
31670+
"redirect_document_id": false
31671+
},
3166231672
{
3166331673
"source_path": "articles/storage/data-lake-storage/index.md",
3166431674
"redirect_url": "/azure/storage/blobs/data-lake-storage-introduction",
@@ -41660,6 +41670,11 @@
4166041670
"source_path": "articles/azure-monitor/app/sample-mscrm.md",
4166141671
"redirect_url": "/azure/azure-monitor/app/javascript",
4166241672
"redirect_document_id": false
41673+
},
41674+
{
41675+
"source_path": "articles/sql-database/sql-database-managed-instance-pools.md",
41676+
"redirect_url": "/azure/sql-database/sql-database-instance-pools",
41677+
"redirect_document_id": false
4166341678
}
4166441679
]
4166541680
}

articles/active-directory/authentication/howto-password-ban-bad-on-premises-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ When a newer version of the Azure AD Password Protection Proxy software is avail
292292
293293
It is not required to uninstall the current version of the Proxy software - the installer will perform an in-place upgrade. No reboot should be required when upgrading the Proxy software. The software upgrade may be automated using standard MSI procedures, for example: `AzureADPasswordProtectionProxySetup.exe /quiet`.
294294
295-
The Proxy agent supports automatic upgrade. Automatic upgrade uses the Microsoft Azure AD Connect Agent Updater service which is installed side-by-side with the Proxy service. Automatic upgrade is on by default, and may be enabled or disabled using the Set-AzureADPasswordProtectionProxyConfiguration cmdlet. The current setting can be queried using the Get-AzureADPasswordProtectionProxyConfiguration cmdlet. Microsoft recommends that the automatic upgrade be left enabled.
295+
The Proxy agent supports automatic upgrade. Automatic upgrade uses the Microsoft Azure AD Connect Agent Updater service which is installed side-by-side with the Proxy service. Automatic upgrade is on by default, and may be enabled or disabled using the `Set-AzureADPasswordProtectionProxyConfiguration` cmdlet. The current setting can be queried using the `Get-AzureADPasswordProtectionProxyConfiguration` cmdlet. Microsoft recommends that the automatic upgrade be left enabled.
296296
297297
The `Get-AzureADPasswordProtectionProxy` cmdlet may be used to query the software version of all currently installed Proxy agents in a forest.
298298

articles/active-directory/develop/v1-protocols-openid-connect-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: conceptual
17-
ms.date: 05/22/2019
17+
ms.date: 09/05/2019
1818
ms.author: ryanwi
1919
ms.reviewer: hirsin
2020
ms.custom: aaddev
@@ -177,7 +177,7 @@ post_logout_redirect_uri=http%3A%2F%2Flocalhost%2Fmyapp%2F
177177

178178
| Parameter | | Description |
179179
| --- | --- | --- |
180-
| post_logout_redirect_uri |recommended |The URL that the user should be redirected to after successful sign out. If not included, the user is shown a generic message. |
180+
| post_logout_redirect_uri |recommended |The URL that the user should be redirected to after successful sign out. This URL must match one of the redirect URIs registered for your application in the app registration portal. If *post_logout_redirect_uri* is not included, the user is shown a generic message. |
181181

182182
## Single sign-out
183183

articles/active-directory/manage-apps/application-proxy-configure-custom-domain.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ We recommend that you set up custom domains for your applications whenever possi
3737

3838
Before you configure a custom domain, make sure that you have the following requirements prepared:
3939
- A [verified domain added to Azure Active Directory](../fundamentals/add-custom-domain.md).
40-
- A custom certificate for the domain, in the form of a PFX file.
40+
- A custom certificate for the domain, in the form of a PFX file.
4141
- An on-premises app [published through Application Proxy](application-proxy-add-on-premises-application.md).
4242

4343
### Configure your custom domain
@@ -70,6 +70,8 @@ There is no restriction on the certificate signature methods. Elliptic Curve Cry
7070

7171
You can use a wildcard certificate as long as the wildcard matches the desired external URL.
7272

73+
The certificate must include the private key.
74+
7375
Certificates issued by your own public key infrastructure (PKI) can be used if the certificate chain is installed on your client devices. Intune can be used to deploy these certificates to managed devices. For non-managed devices these certificates must be manually installed.
7476

7577
### Changing the domain

articles/aks/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
href: configure-azure-cni.md
160160
- name: Create an internal load balancer
161161
href: internal-lb.md
162-
- name: Use a Standard Load Balancer (preview)
162+
- name: Use a Standard Load Balancer
163163
href: load-balancer-standard.md
164164
- name: Use a static IP address
165165
href: static-ip.md

articles/aks/availability-zones.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You need the Azure CLI version 2.0.66 or later installed and configured. Run `a
3030

3131
### Install aks-preview CLI extension
3232

33-
To create AKS clusters that use availability zones, you need the *aks-preview* CLI extension version 0.4.1 or higher. Install the *aks-preview* Azure CLI extension using the [az extension add][az-extension-add] command, then check for any available updates using the [az extension update][az-extension-update] command::
33+
To create AKS clusters that use availability zones, you need the *aks-preview* CLI extension version 0.4.1 or higher. Install the *aks-preview* Azure CLI extension using the [az extension add][az-extension-add] command, then check for any available updates using the [az extension update][az-extension-update] command:
3434

3535
```azurecli-interactive
3636
# Install the aks-preview extension
@@ -40,25 +40,21 @@ az extension add --name aks-preview
4040
az extension update --name aks-preview
4141
```
4242

43-
### Register feature flags for your subscription
43+
### Register the AvailabilityZonePreview feature flag for your subscription
4444

45-
To create an AKS cluster that availability zones, first enable some feature flags on your subscription. Clusters use a virtual machine scale set to manage the deployment and configuration of the Kubernetes nodes. The *standard* SKU of the Azure load balancer is also required to provide resiliency for the network components to route traffic into your cluster. Register the *AvailabilityZonePreview*, *AKSAzureStandardLoadBalancer*, and *VMSSPreview* feature flags using the [az feature register][az-feature-register] command as shown in the following example:
45+
To create an AKS cluster that availability zones, first enable the *AvailabilityZonePreview* feature flag on your subscription. Register the *AvailabilityZonePreview* feature flag using the [az feature register][az-feature-register] command as shown in the following example:
4646

4747
> [!CAUTION]
4848
> When you register a feature on a subscription, you can't currently un-register that feature. After you enable some preview features, defaults may be used for all AKS clusters then created in the subscription. Don't enable preview features on production subscriptions. Use a separate subscription to test preview features and gather feedback.
4949
5050
```azurecli-interactive
5151
az feature register --name AvailabilityZonePreview --namespace Microsoft.ContainerService
52-
az feature register --name AKSAzureStandardLoadBalancer --namespace Microsoft.ContainerService
53-
az feature register --name VMSSPreview --namespace Microsoft.ContainerService
5452
```
5553

5654
It takes a few minutes for the status to show *Registered*. You can check on the registration status using the [az feature list][az-feature-list] command:
5755

5856
```azurecli-interactive
5957
az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AvailabilityZonePreview')].{Name:name,State:properties.state}"
60-
az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/AKSAzureStandardLoadBalancer')].{Name:name,State:properties.state}"
61-
az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/VMSSPreview')].{Name:name,State:properties.state}"
6258
```
6359

6460
When ready, refresh the registration of the *Microsoft.ContainerService* resource provider using the [az provider register][az-provider-register] command:
@@ -86,7 +82,7 @@ The following limitations apply when you create an AKS cluster using availabilit
8682
* Clusters with availability zones enabled require use of Azure Standard Load Balancers for distribution across zones.
8783
* You must use Kubernetes version 1.13.5 or greater in order to deploy Standard Load Balancers.
8884

89-
AKS clusters that use availability zones must use the Azure load balancer *standard* SKU. The default *basic* SKU of the Azure load balancer doesn't support distribution across availability zones. For more information and the limitations of the standard load balancer, see [Azure load balancer standard SKU preview limitations][standard-lb-limitations].
85+
AKS clusters that use availability zones must use the Azure load balancer *standard* SKU. The default *basic* SKU of the Azure load balancer doesn't support distribution across availability zones. For more information and the limitations of the standard load balancer, see [Azure load balancer standard SKU limitations][standard-lb-limitations].
9086

9187
### Azure disks limitations
9288

articles/aks/cluster-autoscaler.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,6 @@ az extension add --name aks-preview
3838
az extension update --name aks-preview
3939
```
4040

41-
### Register scale set feature provider
42-
43-
To create an AKS that uses scale sets, you must also enable a feature flag on your subscription. To register the *VMSSPreview* feature flag, use the [az feature register][az-feature-register] command as shown in the following example:
44-
45-
> [!CAUTION]
46-
> When you register a feature on a subscription, you can't currently un-register that feature. After you enable some preview features, defaults may be used for all AKS clusters then created in the subscription. Don't enable preview features on production subscriptions. Use a separate subscription to test preview features and gather feedback.
47-
48-
```azurecli-interactive
49-
az feature register --name VMSSPreview --namespace Microsoft.ContainerService
50-
```
51-
52-
It takes a few minutes for the status to show *Registered*. You can check on the registration status using the [az feature list][az-feature-list] command:
53-
54-
```azurecli-interactive
55-
az feature list -o table --query "[?contains(name, 'Microsoft.ContainerService/VMSSPreview')].{Name:name,State:properties.state}"
56-
```
57-
58-
When ready, refresh the registration of the *Microsoft.ContainerService* resource provider using the [az provider register][az-provider-register] command:
59-
60-
```azurecli-interactive
61-
az provider register --namespace Microsoft.ContainerService
62-
```
63-
6441
## Limitations
6542

6643
The following limitations apply when you create and manage AKS clusters that use the cluster autoscaler:

0 commit comments

Comments
 (0)