Skip to content

Commit 837bc4e

Browse files
authored
Merge pull request #113354 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 87a52aa + a509707 commit 837bc4e

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

articles/aks/private-clusters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ As mentioned, VNet peering is one way to access your private cluster. To use VNe
9797
## Limitations
9898
* IP authorized ranges cannot be applied to the private api server endpoint, they only apply to the public API server
9999
* Availability Zones are currently supported for certain regions, see the beginning of this document
100-
* [Azure Private Link service limitations][private-link-service] apply to private clusters, Azure private endpoints, and virtual network service endpoints, which aren't currently supported in the same virtual network.
100+
* [Azure Private Link service limitations][private-link-service] apply to private clusters.
101101
* No support for virtual nodes in a private cluster to spin private Azure Container Instances (ACI) in a private Azure virtual network
102102
* No support for Azure DevOps integration out of the box with private clusters
103103
* For customers that need to enable Azure Container Registry to work with private AKS, the Container Registry virtual network must be peered with the agent cluster virtual network.
@@ -112,7 +112,7 @@ As mentioned, VNet peering is one way to access your private cluster. To use VNe
112112
[az-feature-list]: /cli/azure/feature?view=azure-cli-latest#az-feature-list
113113
[az-extension-add]: /cli/azure/extension#az-extension-add
114114
[az-extension-update]: /cli/azure/extension#az-extension-update
115-
[private-link-service]: /azure/private-link/private-link-service-overview
115+
[private-link-service]: /azure/private-link/private-link-service-overview#limitations
116116
[virtual-network-peering]: ../virtual-network/virtual-network-peering-overview.md
117117
[azure-bastion]: ../bastion/bastion-create-host-portal.md
118118
[express-route-or-vpn]: ../expressroute/expressroute-about-virtual-network-gateways.md

articles/azure-resource-manager/managed-applications/publish-service-catalog-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Some of the parameters used in the preceding example are:
285285

286286
* **resource group**: The name of the resource group where the managed application definition is created.
287287
* **lock level**: The type of lock placed on the managed resource group. It prevents the customer from performing undesirable operations on this resource group. Currently, ReadOnly is the only supported lock level. When ReadOnly is specified, the customer can only read the resources present in the managed resource group. The publisher identities that are granted access to the managed resource group are exempt from the lock.
288-
* **authorizations**: Describes the principal ID and the role definition ID that are used to grant permission to the managed resource group. It's specified in the format of `<principalId>:<roleDefinitionId>`. If more than one value is needed, specify them in the form `<principalId1>:<roleDefinitionId1> <principalId2>:<roleDefinitionId2>`. The values are separated by a space.
288+
* **authorizations**: Describes the principal ID and the role definition ID that are used to grant permission to the managed resource group. It's specified in the format of `<principalId>:<roleDefinitionId>`. If more than one value is needed, specify them in the form `<principalId1>:<roleDefinitionId1>,<principalId2>:<roleDefinitionId2>`. The values are separated by a comma.
289289
* **package file URI**: The location of a .zip package that contains the required files.
290290

291291
## Bring your own storage for the managed application definition

articles/cloud-shell/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Cloud Shell includes pre-configured authentication for open-source tools such as
6868
|Category |Name |
6969
|---|---|
7070
|Linux tools |bash<br> zsh<br> sh<br> tmux<br> dig<br> |
71-
|Azure tools |[Azure CLI](https://github.com/Azure/azure-cli) and [Azure classic CLI](https://github.com/Azure/azure-xplat-cli)<br> [AzCopy](https://docs.microsoft.com/previous-versions/azure/storage/storage-use-azcopy#writing-your-first-azcopy-command)<br> [Azure Functions CLI](https://github.com/Azure/azure-functions-core-tools)<br> [Service Fabric CLI](https://docs.microsoft.com/azure/service-fabric/service-fabric-cli)<br> [Batch Shipyard](https://github.com/Azure/batch-shipyard)<br> [blobxfer](https://github.com/Azure/blobxfer)|
71+
|Azure tools |[Azure CLI](https://github.com/Azure/azure-cli) and [Azure classic CLI](https://github.com/Azure/azure-xplat-cli)<br> [AzCopy](https://docs.microsoft.com/azure/storage/common/storage-use-azcopy-v10)<br> [Azure Functions CLI](https://github.com/Azure/azure-functions-core-tools)<br> [Service Fabric CLI](https://docs.microsoft.com/azure/service-fabric/service-fabric-cli)<br> [Batch Shipyard](https://github.com/Azure/batch-shipyard)<br> [blobxfer](https://github.com/Azure/blobxfer)|
7272
|Text editors |code (Cloud Shell editor)<br> vim<br> nano<br> emacs |
7373
|Source control |git |
7474
|Build tools |make<br> maven<br> npm<br> pip |

articles/hdinsight/hdinsight-hadoop-compare-storage-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ ms.date: 04/21/2020
1515
You can choose between a few different Azure storage services when creating HDInsight clusters:
1616

1717
* [Azure Storage](./overview-azure-storage.md)
18-
* [Azure Data Lake Storage Gen2](./overview-data-lake-storage-gen1.md)
19-
* [Azure Data Lake Storage Gen1](./overview-data-lake-storage-gen2.md)
18+
* [Azure Data Lake Storage Gen2](./overview-data-lake-storage-gen2.md)
19+
* [Azure Data Lake Storage Gen1](./overview-data-lake-storage-gen1.md)
2020

2121
This article provides an overview of these storage types and their unique features.
2222

articles/security-center/faq-azure-monitor-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ When Security Center identifies that a VM is already connected to a workspace yo
3838
## I already have workspaces in my environment, can I use them to collect security data?
3939
If a VM already has the Log Analytics agent installed as an Azure extension, Security Center uses the existing connected workspace. A Security Center solution is installed on the workspace if not present already, and the solution is applied only to the relevant VMs via [solution targeting](../operations-management-suite/operations-management-suite-solution-targeting.md).
4040

41-
When Security Center installs the Log Analytics agent on VMs, it uses the default workspace(s) created by Security Center.
41+
When Security Center installs the Log Analytics agent on VMs, it uses the default workspace(s) created by Security Center if Security Center isn't pointed to an existing workspace.
4242

4343
## I already have security solution on my workspaces. What are the billing implications?
44-
The Security & Audit solution is used to enable Security Center standard tier features for Azure VMs. If the Security & Audit solution is already installed on a workspace, Security Center uses the existing solution. There is no change in billing.
44+
The Security & Audit solution is used to enable Security Center standard tier features for Azure VMs. If the Security & Audit solution is already installed on a workspace, Security Center uses the existing solution. There is no change in billing.

articles/service-fabric/service-fabric-patch-orchestration-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ You can configure POA behavior to meet your needs. Override the default values b
162162
| WUOperationTimeOutInMinutes | Int <br>(Default: *90*) | Specifies the timeout for any Windows Update operation (search or download or install). If the operation is not completed within the specified timeout, it is aborted. |
163163
| WURescheduleCount | Int <br> (Default: *5*) | The maximum number of times the service reschedules the Windows update if an operation fails persistently. |
164164
| WURescheduleTimeInMinutes | Int <br>(Default: *30*) | The interval at which the service reschedules the Windows updates if failure persists. |
165-
| WUFrequency | Comma-separated string (Default: *Weekly, Wednesday, 7:00:00*) | The frequency for installing Windows updates. The format and possible values are: <br>&nbsp;&nbsp;- Monthly: DD, HH:MM:SS (for example, *Monthly, 5,12:22:32*)<br>Permitted values for field DD (day) are numbers from 1 through 28 and "last". <br> &nbsp;&nbsp;- Weekly, DAY, HH:MM:SS (for example, *Weekly, Tuesday, 12:22:32*) <br> &nbsp;&nbsp;- Daily, HH:MM:SS (for example, *Daily, 12:22:32*) <br> &nbsp;&nbsp;- *None* indicates that Windows updates shouldn't be done. <br><br> Times are in UTC.|
165+
| WUFrequency | Comma-separated string (Default: *Weekly, Wednesday, 7:00:00*) | The frequency for installing Windows updates. The format and possible values are: <br>- Monthly, DD, HH:MM:SS (example: *Monthly, 5, 12:22:32*). Permitted values for field _DD_ (day) are numbers from 1 through 28 and _last_. <br>- Weekly, Day, HH:MM:SS (example: *Weekly, Tuesday, 12:22:32*) <br>- Daily, HH:MM:SS (example: *Daily, 12:22:32*) <br>- Week, Day, HH:MM:SS (example: *2, Friday, 21:00:00* indicates 9:00 PM UTC on Friday of the 2nd week of every month) <br>- *None* indicates that Windows updates shouldn't be done. <br><br> Times are in UTC.|
166166
| AcceptWindowsUpdateEula | Boolean <br>(Default: *true*) | By setting this flag, the application accepts the End-User License Agreement for Windows Update on behalf of the owner of the machine. |
167167

168168
> [!TIP]

articles/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You should also have a general understanding of these technologies:
4242
> [!IMPORTANT]
4343
> At this time, SQL Server failover cluster instances on Azure virtual machines are only supported with the [lightweight management mode](virtual-machines-windows-sql-register-with-resource-provider.md#management-modes) of the [SQL Server IaaS Agent Extension](virtual-machines-windows-sql-server-agent-extension.md). To change from full extension mode to lightweight, delete the **SQL Virtual Machine** resource for the corresponding VMs and then register them with the SQL VM resource provider in lightweight mode. When deleting the **SQL Virtual Machine** resource using the Azure portal, **clear the checkbox next to the correct Virtual Machine**. The full extension supports features such as automated backup, patching, and advanced portal management. These features will not work for SQL VMs after the agent is reinstalled in lightweight management mode.
4444
45-
Premium file shares provide IOPS and throughout capacities that will meet the needs of many workloads. For IO-intensive workloads, consider [SQL Server Failover Cluster Instances with Storage Spaces Direct](virtual-machines-windows-portal-sql-create-failover-cluster.md), based on managed premium disks or ultra disks.
45+
Premium file shares provide IOPS and throughput capacities that will meet the needs of many workloads. For IO-intensive workloads, consider [SQL Server Failover Cluster Instances with Storage Spaces Direct](virtual-machines-windows-portal-sql-create-failover-cluster.md), based on managed premium disks or ultra disks.
4646

4747
Check the IOPS activity of your environment and verify that premium file shares will provide the IOPS you need before you start a deployment or migration. Use Windows Performance Monitor disk counters to monitor the total IOPS (Disk Transfers/second) and throughput (Disk Bytes/second) required for SQL Server Data, Log, and Temp DB files.
4848

articles/web-application-firewall/cdn/waf-cdn-create-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In this tutorial, you learn how to:
1717

1818
> [!div class="checklist"]
1919
> * Create a WAF policy
20-
> * Associate it with a CDN endpoint
20+
> * Associate it with a CDN endpoint. You can associate a WAF policy only with endpoints that are hosted on the **Azure CDN Standard from Microsoft** SKU.
2121
> * Configure WAF rules
2222
2323
## Prerequisites

0 commit comments

Comments
 (0)