Skip to content

Commit 9e96b1d

Browse files
authored
Merge pull request #42321 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 854e9ca + 6cc6adb commit 9e96b1d

19 files changed

+421
-418
lines changed

articles/aks/azure-disks-dynamic-pv.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ managed-premium kubernetes.io/azure-disk 1h
3838

3939
A persistent volume claim (PVC) is used to automatically provision storage based on a storage class. In this case, a PVC can use one of the pre-created storage classes to create a standard or premium Azure managed disk.
4040

41-
Create a file named `azure-premimum.yaml`, and copy in the following manifest.
41+
Create a file named `azure-premium.yaml`, and copy in the following manifest.
4242

4343
Take note that the `managed-premium` storage class is specified in the annotation, and the claim is requesting a disk `5GB` in size with `ReadWriteOnce` access.
4444

@@ -60,7 +60,7 @@ spec:
6060
Create the persistent volume claim with the [kubectl apply][kubectl-apply] command.
6161
6262
```azurecli-interactive
63-
kubectl apply -f azure-premimum.yaml
63+
kubectl apply -f azure-premium.yaml
6464
```
6565

6666
## Using the persistent volume
@@ -112,4 +112,4 @@ Learn more about Kubernetes persistent volumes using Azure disks.
112112

113113
<!-- LINKS - internal -->
114114
[azure-files-pvc]: azure-files-dynamic-pv.md
115-
[premium-storage]: ../virtual-machines/windows/premium-storage.md
115+
[premium-storage]: ../virtual-machines/windows/premium-storage.md

articles/aks/kubernetes-walkthrough-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Select **Review + create** and then **Create** when complete.
5858

5959
![Create AKS cluster one](media/container-service-walkthrough-portal/aks-portal-3.png)
6060

61-
After a short wait, the ASK cluster is deployed and ready to use. Browse to the AKS cluster resource group, select the AKS resource, and you should see the AKS cluster dashboard.
61+
After a short wait, the AKS cluster is deployed and ready to use. Browse to the AKS cluster resource group, select the AKS resource, and you should see the AKS cluster dashboard.
6262

6363
![Create AKS cluster one](media/container-service-walkthrough-portal/aks-portal-5.png)
6464

articles/automation/automation-role-based-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In Azure Automation, access is granted by assigning the appropriate RBAC role to
3030
| Log Analytics Contributor | The Log Analytics Contributor role allows you to read all monitoring data and edit monitoring settings. Editing monitoring settings includes adding the VM extension to VMs, reading storage account keys to be able to configure collection of logs from Azure storage, creating and configuring Automation accounts, adding solutions, and configuring Azure diagnostics on all Azure resources.|
3131
| Log Analytics Reader | The Log Analytics Reader role allows you to view and search all monitoring data as well as view monitoring settings. This includes viewing the configuration of Azure diagnostics on all Azure resources. |
3232
| Monitoring Contributor | The Monitoring Contributor role allows you to read all monitoring data and update monitoring settings.|
33-
| Monitoring Reader | The Montioring Reader role allows you to read all monitoring data. |
33+
| Monitoring Reader | The Monitoring Reader role allows you to read all monitoring data. |
3434
| User Access Administrator |The User Access Administrator role allows you to manage user access to Azure Automation accounts. |
3535

3636
## Role permissions

articles/azure-policy/azure-policy-introduction.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ accompanying effect that takes place if the conditions are met.
6767
In Azure Policy, we offer some built-in policies that are available to you by default. For example:
6868

6969
- **Require SQL Server 12.0**: This policy definition has conditions/rules to ensure that all SQL servers use version 12.0. Its effect is to deny all servers that do not meet these criteria.
70-
- **Allowed Storage Account SKUs**: This policy definition has a set of conditions/rules that determine if a storage account that is being deployed is within a set of SKU sizes. Its effect is to deny all servers that do not adhere to the set of defined SKU sizes.
70+
- **Allowed Storage Account SKUs**: This policy definition has a set of conditions/rules that determine if a storage account that is being deployed is within a set of SKU sizes. Its effect is to deny all storage accounts that do not adhere to the set of defined SKU sizes.
7171
- **Allowed Resource Type**: This policy definition has a set of conditions/rules to specify the resource types that your organization can deploy. Its effect is to deny all resources that are not part of this defined list.
7272
- **Allowed Locations**: This policy enables you to restrict the locations that your organization can specify when deploying resources. Its effect is used to enforce your geo-compliance requirements.
7373
- **Allowed Virtual Machine SKUs**: This policy enables you to specify a set of virtual machine SKUs that your organization can deploy.
@@ -235,3 +235,4 @@ next steps:
235235
- [Assign a policy definition using PowerShell](assign-policy-definition-ps.md)
236236
- Review what a management group is with [Organize your resources with Azure Management Groups](../azure-resource-manager/management-groups-overview.md)
237237
- View [Govern your Azure environment through Azure Policy](https://channel9.msdn.com/events/Build/2018/THR2030) on Channel 9.
238+

articles/cloud-shell/features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Bash in Cloud Shell includes pre-configured authentication for open-source tools
7070
|Go |1.9 |
7171
|Java |1.8 |
7272
|Node.js |8.9.4 |
73-
|PowerShell |[6.0.1](https://github.com/PowerShell/powershell/releases) |
73+
|PowerShell |[6.0.2](https://github.com/PowerShell/powershell/releases) |
7474
|Python |2.7 and 3.5 (default)|
7575

7676
## Next steps

articles/cloud-shell/quickstart-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ TestVm10 MyResourceGroup2 eastus Standard_DS1_v2 Windows mytest
190190

191191
``` PowerShell
192192
PS Azure:\> cd MySubscriptionName\MyResourceGroup\Microsoft.Compute\virtualMachines
193-
PS Azure:\MySubscriptionName\MyResourceGroup\Microsoft.Compute\virtualMachines> Get-Item MyVM1 | Invoke-AzureRmVMCommand -Scriptblock{Get-ComputerInfo}
193+
PS Azure:\MySubscriptionName\MyResourceGroup\Microsoft.Compute\virtualMachines> Get-Item MyVM1 | Invoke-AzureRmVMCommand -Scriptblock {Get-ComputerInfo}
194194
```
195195
You see output similar to the following:
196196

articles/cloud-shell/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ exit
9191

9292
2. Delete your resource group and any resources within it.
9393
```azurecli-interactive
94-
Run `az group delete -n MyRG`
94+
az group delete -n MyRG
9595
```
9696

9797
## Next steps

articles/cloud-shell/troubleshooting.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Azure Cloud Shell troubleshooting | Microsoft Docs
33
description: Troubleshooting Azure Cloud Shell
44
services: azure
@@ -41,11 +41,6 @@ Known resolutions for troubleshooting issues in Azure Cloud Shell include:
4141

4242
## Bash troubleshooting
4343

44-
### Cannot run az login
45-
46-
- **Details**: Running `az login` will not work as you are already authenticated under the account used to sign into Cloud Shell or Azure portal.
47-
- **Resolution**: Utilize your account used to sign in or sign out and reauthenticate with your intended Azure account.
48-
4944
### Cannot run the docker daemon
5045

5146
- **Details**: Cloud Shell utilizes a container to host your shell environment, as a result running the daemon is disallowed.

articles/cognitive-services/video-indexer/migrate-from-v1-to-v2.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ When calling the **Operations** APIs, the subscription key won't be used anymore
3838

3939
Each request should have a valid token, matching the access level of the API you are calling. For example, operations on your user, such as getting your accounts, require a user access token. Operations on the account level, such as list all videos, require an account access token. Operations on videos, such as reindex video, require a video access token.
4040

41+
To make things easier, you can use **Authorization** API > **GetAccounts** to get your accounts without obtaining a user token first. You can also ask to get the accounts with valid tokens, enabling you to skip an additional call to get an account token.
42+
4143
For more information about the different access tokens, see [Use Azure Video Indexer API](video-indexer-use-apis.md).
4244

4345
### Locations

articles/cognitive-services/video-indexer/video-indexer-use-apis.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ Each call to the Operations API should be associated with an access token, match
5454
- Account level – account level access tokens let you perform operations on the account level. for example, Upload video, list all videos, create a language model, etc.
5555
- Video level – video level access tokens let you perform operations on specific videos. for example, get video insights, download captions, get widgets, etc.
5656

57+
To make things easier, you can use the **Authorization** API > **GetAccounts** to get your accounts without obtaining a user token first. You can also ask to get the accounts with valid tokens, enabling you to skip an additional call to get an account token.
58+
5759
Access tokens expire after 1 hour. Make sure your access token is valid before using the Operations API. If expires, call the Authorization API again to get a new access token.
5860

5961
You are ready to start integrating with the API. Find [the detailed description of each Video Indexer REST API](http://api-portal.videoindexer.ai/).

0 commit comments

Comments
 (0)