Skip to content

Commit be9a67e

Browse files
authored
Merge pull request #42516 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 c02d242 + af40a53 commit be9a67e

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

articles/azure-stack/user/azure-stack-validate-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ This example validates all of the [Azure Stack Quickstart templates](https://git
9696
9797
```PowerShell
9898
test-AzureRMTemplate -TemplatePath C:\AzureStack-Quickstart-Templates `
99-
-CapabilitiesPath .\TemplateValidator\AzureStackCloudCapabilities_with_AddOns_20170627.json.json `
99+
-CapabilitiesPath .\TemplateValidator\AzureStackCloudCapabilities_with_AddOns_20170627.json `
100100
-TemplatePattern MyStandardTemplateName.json`
101101
-IncludeComputeCapabilities`
102102
-Report TemplateReport.html

articles/container-instances/container-instances-tutorial-deploy-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ az acr credential show --name <acrName> --query "passwords[0].value"
5252
Now, use the [az container create][az-container-create] command to deploy the container. Replace `<acrLoginServer>` and `<acrPassword>` with the values you obtained from the previous two commands. Replace `<acrName>` with the name of your container registry.
5353

5454
```azurecli
55-
az container create --resource-group myResourceGroup --name aci-tutorial-app --image <acrLoginServer>/aci-tutorial-app:v1 --cpu 1 --memory 1 --registry-username <acrName> --registry-password <acrPassword> --dns-name-label aci-demo --ports 80
55+
az container create --resource-group myResourceGroup --name aci-tutorial-app --image <acrLoginServer>/aci-tutorial-app:v1 --cpu 1 --memory 1 --registry-login-server <acrLoginServer> --registry-username <acrName> --registry-password <acrPassword> --dns-name-label aci-demo --ports 80
5656
```
5757

5858
Within a few seconds, you should receive an initial response from Azure. The `--dns-name-label` value must be unique within the Azure region you create the container instance. Modify the value in the preceding command if you receive a **DNS name label** error message when you execute the command.

articles/log-analytics/log-analytics-quick-collect-azurevm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Log Analytics can collect events from the Windows event logs or Linux Syslog and
7373
2. You add an event log by typing in the name of the log. Type **Syslog** and then click the plus sign **+**.
7474
3. In the table, uncheck the severities **Info**, **Notice** and **Debug**.
7575
4. Click **Save** at the top of the page to save the configuration.
76-
5. Select **Linux Performance Data** to enable collection of performance counters on a Windows computer.
76+
5. Select **Linux Performance Data** to enable collection of performance counters on a Linux computer.
7777
6. When you first configure Linux Performance counters for a new Log Analytics workspace, you are given the option to quickly create several common counters. They are listed with a checkbox next to each.<br> ![Default Windows performance counters selected](media/log-analytics-quick-collect-azurevm/linux-perfcounters-default.png).<br> Click **Add the selected performance counters**. They are added and preset with a ten second collection sample interval.
7878
7. Click **Save** at the top of the page to save the configuration.
7979

articles/security-center/security-center-just-in-time.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ One way to reduce exposure to a brute force attack is to limit the amount of tim
3838

3939
When just in time is enabled, Security Center locks down inbound traffic to your Azure VMs by creating an NSG rule. You select the ports on the VM to which inbound traffic will be locked down. These ports are controlled by the just in time solution.
4040

41-
When a user requests access to a VM, Security Center checks that the user has [Role-Based Access Control (RBAC)](../role-based-access-control/role-assignments-portal.md) permissions that provide write access for the VM. If they have write permissions, the request is approved and Security Center automatically configures the Network Security Groups (NSGs) to allow inbound traffic to the selected ports for the amount of time you specified. After the time has expired, Security Center restores the NSGs to their previous states.
41+
When a user requests access to a VM, Security Center checks that the user has [Role-Based Access Control (RBAC)](../role-based-access-control/role-assignments-portal.md) permissions that provide write access for the VM. If they have write permissions, the request is approved and Security Center automatically configures the Network Security Groups (NSGs) to allow inbound traffic to the selected ports for the amount of time you specified. After the time has expired, Security Center restores the NSGs to their previous states. Those connections that are already established are not being interrupted, however.
4242

4343
> [!NOTE]
4444
> Security Center just in time VM access currently supports only VMs deployed through Azure Resource Manager. To learn more about the classic and Resource Manager deployment models see [Azure Resource Manager vs. classic deployment](../azure-resource-manager/resource-manager-deployment-model.md).

articles/storage/blobs/storage-upload-process-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ az group create --name myResourceGroup --location westcentralus
5656
The sample uploads images to a blob container in an Azure Storage account. A storage account provides a unique namespace to store and access your Azure storage data objects. Create a storage account in the resource group you created by using the [az storage account create](/cli/azure/storage/account#az_storage_account_create) command.
5757

5858
> [!IMPORTANT]
59-
> In part 2 of the tutorial you use Event subscriptions for blob storage. Event subscriptions are currently only supported for Blob storage accounts in the West Central US and West US 2. Because of this restriction, you must create a Blob storage account that is used by the sample app to store images and thumbnails.
59+
> In part 2 of the tutorial you use Event subscriptions for blob storage. Event subscriptions are currently only supported for Blob storage accounts in the following locations: Asia Southeast, Asia East, Australia East, Australia Southeast, Central US, East US, East US 2, Europe West, Europe North, Japan East, Japan West, West Central US, West US and West US 2. Because of this restriction, you must create a Blob storage account that is used by the sample app to store images and thumbnails.
6060
6161
In the following command, substitute your own globally unique name for the Blob storage account where you see the `<blob_storage_account>` placeholder.
6262

0 commit comments

Comments
 (0)