Skip to content

Commit 490fc8c

Browse files
authored
Merge pull request #188880 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a9a98fe + 799d3a7 commit 490fc8c

File tree

11 files changed

+20
-18
lines changed

11 files changed

+20
-18
lines changed

articles/applied-ai-services/form-recognizer/quickstarts/try-v3-javascript-sdk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ In this quickstart you'll use following features to analyze and extract data and
8282

8383
> [!TIP]
8484
>
85-
> * You can create a new file using Powershell.
86-
> * Open a Powershell window in your project directory by holding down the Shift key and right-clicking the folder.
85+
> * You can create a new file using PowerShell.
86+
> * Open a PowerShell window in your project directory by holding down the Shift key and right-clicking the folder.
8787
> * Type the following command **New-Item index.js**.
8888

8989
1. Open the `index.js` file in Visual Studio Code or your favorite IDE. First, we'll add the necessary libraries. Copy the following and paste it at the top of the file:

articles/applied-ai-services/immersive-reader/includes/how-to/how-to-launch-immersive-reader-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You need some values from the Azure AD auth configuration prerequisite step abov
4343
TenantId => Azure subscription TenantId
4444
ClientId => Azure AD ApplicationId
4545
ClientSecret => Azure AD Application Service Principal password
46-
Subdomain => Immersive Reader resource subdomain (resource 'Name' if the resource was created in the Azure portal, or 'CustomSubDomain' option if the resource was created with Azure CLI Powershell. Check the Azure portal for the subdomain on the Endpoint in the resource Overview page, for example, 'https://[SUBDOMAIN].cognitiveservices.azure.com/')
46+
Subdomain => Immersive Reader resource subdomain (resource 'Name' if the resource was created in the Azure portal, or 'CustomSubDomain' option if the resource was created with Azure CLI PowerShell. Check the Azure portal for the subdomain on the Endpoint in the resource Overview page, for example, 'https://[SUBDOMAIN].cognitiveservices.azure.com/')
4747
````
4848

4949
Once you have these values, create a new file called _.env_, and paste the following code into it, supplying your custom property values from above. Do not include quotation marks or the "{" and "}" characters.

articles/applied-ai-services/immersive-reader/includes/quickstarts/immersive-reader-client-library-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Now, we'll configure the controller to obtain the Azure AD values from _secrets.
7272
private readonly string TenantId; // Azure subscription TenantId
7373
private readonly string ClientId; // Azure AD ApplicationId
7474
private readonly string ClientSecret; // Azure AD Application Service Principal password
75-
private readonly string Subdomain; // Immersive Reader resource subdomain (resource 'Name' if the resource was created in the Azure portal, or 'CustomSubDomain' option if the resource was created with Azure CLI Powershell. Check the Azure portal for the subdomain on the Endpoint in the resource Overview page, for example, 'https://[SUBDOMAIN].cognitiveservices.azure.com/')
75+
private readonly string Subdomain; // Immersive Reader resource subdomain (resource 'Name' if the resource was created in the Azure portal, or 'CustomSubDomain' option if the resource was created with Azure CLI PowerShell. Check the Azure portal for the subdomain on the Endpoint in the resource Overview page, for example, 'https://[SUBDOMAIN].cognitiveservices.azure.com/')
7676
7777
public HomeController(Microsoft.Extensions.Configuration.IConfiguration configuration)
7878
{

articles/azure-sql/database/database-import.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ sqlpackage.exe /a:Import /sf:testExport.bacpac /tdn:NewDacFX /tsn:apptestserver.
8383
> [A SQL Managed Instance](../managed-instance/sql-managed-instance-paas-overview.md) does not currently support migrating a database into an instance database from a BACPAC file using Azure PowerShell. To import into a SQL Managed Instance, use SQL Server Management Studio or SQLPackage.
8484
8585
> [!NOTE]
86-
> The machines processing import/export requests submitted through portal or Powershell need to store the bacpac file as well as temporary files generated by Data-Tier Application Framework (DacFX). The disk space required varies significantly among DBs with same size and can take up to 3 times of the database size. Machines running the import/export request only have 450GB local disk space. As result, some requests may fail with "There is not enough space on the disk" error. In this case, the workaround is to run sqlpackage.exe on a machine with enough local disk space. When importing/exporting databases larger than 150GB, use SqlPackage to avoid this issue.
86+
> The machines processing import/export requests submitted through portal or PowerShell need to store the bacpac file as well as temporary files generated by Data-Tier Application Framework (DacFX). The disk space required varies significantly among DBs with same size and can take up to 3 times of the database size. Machines running the import/export request only have 450GB local disk space. As result, some requests may fail with "There is not enough space on the disk" error. In this case, the workaround is to run sqlpackage.exe on a machine with enough local disk space. When importing/exporting databases larger than 150GB, use SqlPackage to avoid this issue.
8787
8888
# [PowerShell](#tab/azure-powershell)
8989

@@ -142,7 +142,7 @@ az sql db import --resource-group "<resourceGroup>" --server "<server>" --name "
142142
## Cancel the import request
143143

144144
Use the [Database Operations - Cancel API](/rest/api/sql/databaseoperations/cancel)
145-
or the Powershell [Stop-AzSqlDatabaseActivity command](/powershell/module/az.sql/Stop-AzSqlDatabaseActivity), here an example of powershell command.
145+
or the PowerShell [Stop-AzSqlDatabaseActivity command](/powershell/module/az.sql/Stop-AzSqlDatabaseActivity), here an example of powershell command.
146146

147147
```cmd
148148
Stop-AzSqlDatabaseActivity -ResourceGroupName $ResourceGroupName -ServerName $ServerName -DatabaseName $DatabaseName -OperationId $Operation.OperationId

articles/backup/backup-azure-afs-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This article explains how to:
3232
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
3333

3434
> [!NOTE]
35-
> Azure Powershell currently doesn't support backup policies with hourly schedule. Please use Azure Portal to leverage this feature. [Learn more](manage-afs-backup.md#create-a-new-policy)
35+
> Azure PowerShell currently doesn't support backup policies with hourly schedule. Please use Azure Portal to leverage this feature. [Learn more](manage-afs-backup.md#create-a-new-policy)
3636
3737
Set up PowerShell as follows:
3838

articles/backup/backup-azure-sql-automation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Azure Backup can restore SQL Server databases that are running on Azure VMs as f
270270
Check the prerequisites mentioned [here](restore-sql-database-azure-vm.md#restore-prerequisites) before restoring SQL DBs.
271271

272272
> [!WARNING]
273-
> Due to a security issue related to RBAC, we had to introduce a breaking change in the restore commands for SQL DB via Powershell. Please upgrade to Az 6.0.0 version or above for the proper restore commands to be submitted via Powershell. The latest PS commands are provided below.
273+
> Due to a security issue related to RBAC, we had to introduce a breaking change in the restore commands for SQL DB via PowerShell. Please upgrade to Az 6.0.0 version or above for the proper restore commands to be submitted via PowerShell. The latest PS commands are provided below.
274274
275275
First fetch the relevant backed up SQL DB using the [Get-AzRecoveryServicesBackupItem](/powershell/module/az.recoveryservices/get-azrecoveryservicesbackupitem) PowerShell cmdlet.
276276

@@ -465,7 +465,7 @@ PointInTime : 1/1/0001 12:00:00 AM
465465
#### Alternate workload restore to a vault in secondary region
466466

467467
> [!IMPORTANT]
468-
> Support for secondary region restores for SQL from Powershell is available from Az 6.0.0
468+
> Support for secondary region restores for SQL from PowerShell is available from Az 6.0.0
469469
470470
If you have enabled cross region restore, then the recovery points will be replicated to the secondary, paired region as well. Then, you can fetch those recovery points and trigger a restore to a machine, present in that paired region. As with the normal restore, the target machine should be registered to the target vault in the secondary region. The following sequence of steps should clarify the end-to-end process.
471471

articles/backup/restore-blobs-storage-account-ps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Restore Azure blobs via Azure Powershell
3-
description: Learn how to restore Azure blobs to any point-in-time using Azure Powershell.
2+
title: Restore Azure blobs via Azure PowerShell
3+
description: Learn how to restore Azure blobs to any point-in-time using Azure PowerShell.
44
ms.topic: conceptual
55
ms.date: 05/05/2021
66
---
77

8-
# Restore Azure blobs to point-in-time using Azure Powershell
8+
# Restore Azure blobs to point-in-time using Azure PowerShell
99

1010
This article describes how to restore [blobs](blob-backup-overview.md) to any point-in-time using Azure Backup.
1111

articles/cloud-services-extended-support/deploy-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This tutorial explains how to create a Cloud Service (extended support) deployme
3434
## Deploy a Cloud Service (extended support)
3535

3636
> [!NOTE]
37-
> An easier and faster way of generating your ARM template and parameter file is via the [Azure portal](https://portal.azure.com). You can [download the generated ARM template](generate-template-portal.md) via the portal to create your Cloud Service via Powershell
37+
> An easier and faster way of generating your ARM template and parameter file is via the [Azure portal](https://portal.azure.com). You can [download the generated ARM template](generate-template-portal.md) via the portal to create your Cloud Service via PowerShell
3838
3939
1. Create virtual network. The name of the virtual network must match the references in the Service Configuration (.cscfg) file. If using an existing virtual network, omit this section from the ARM template.
4040

articles/cloud-services-extended-support/post-migration-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Customers need to update their tooling and automation to start using the new API
4444

4545
## Changes to Certificate Management Post Migration
4646

47-
As a standard practice to manage your certificates, all the valid .pfx certificate files should be added to certificate store in Key Vault and update would work perfectly fine via any client - Portal, Powershell or Rest API.
47+
As a standard practice to manage your certificates, all the valid .pfx certificate files should be added to certificate store in Key Vault and update would work perfectly fine via any client - Portal, PowerShell or Rest API.
4848

4949
Currently, Azure Portal does a validation for you to check if all the required Certificates are uploaded in certificate store in Key Vault and warns if a certificate is not found. However, if you are planning to use Certificates as secrets, then these certificates cannot be validated for their thumbprint and any update operation which involves addition of secrets would fail via Portal. Customers are reccomended to use PowerShell or RestAPI to continue updates involving Secrets.
5050

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ If you recently invited a user when creating a role assignment, this security pr
126126
127127
However, if this security principal is not a recently invited user, it might be a deleted security principal. If you assign a role to a security principal and then you later delete that security principal without first removing the role assignment, the security principal will be listed as **Identity not found** and an **Unknown** type.
128128
129-
If you list this role assignment using Azure PowerShell, you might see an empty `DisplayName` and `SignInName`. For example, [Get-AzRoleAssignment](/powershell/module/az.resources/get-azroleassignment) returns a role assignment that is similar to the following output:
129+
If you list this role assignment using Azure PowerShell, you might see an empty `DisplayName` and `SignInName`, or a value for `ObjectType` of `Unknown`. For example, [Get-AzRoleAssignment](/powershell/module/az.resources/get-azroleassignment) returns a role assignment that is similar to the following output:
130130
131131
```
132132
RoleAssignmentId : /subscriptions/11111111-1111-1111-1111-111111111111/providers/Microsoft.Authorization/roleAssignments/22222222-2222-2222-2222-222222222222

0 commit comments

Comments
 (0)