Skip to content

Commit 582869d

Browse files
authored
Merge pull request #189777 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 87885ea + c5a3f14 commit 582869d

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

CONTRIBUTING.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@
22

33
Thank you for taking the time to contribute to the Microsoft Azure documentation.
44

5-
This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
5+
This guide covers some general topics related to contribution and refers to the [contributor guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
66

77
## Code of Conduct
88

99
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
10-
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/), or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
10+
11+
For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
1112

1213
## How can I contribute?
1314

14-
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
15+
There are many ways to contribute to the documentation. Review the following sections to find out which one is right for you.
1516

16-
### Reporting Bugs and Suggesting Enhancements
17+
### Reporting bugs and suggesting enhancements
1718

1819
Please use the Feedback tool at the bottom of any article to submit bugs and suggestions.
1920

2021
![Feedback Tool](media/feedback-tool.png)
2122

2223
### Editing in GitHub
2324

24-
Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
25+
Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributor guide.
26+
27+
### Pull requests
2528

26-
### Pull Request
29+
Review the guidance for [pull requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) and the contribution workflow in our contributor guide.
2730

28-
Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

articles/automation/add-user-assigned-identity.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.topic: conceptual
1212
This article shows you how to add a user-assigned managed identity for an Azure Automation account and how to use it to access other resources. For more information on how managed identities work with Azure Automation, see [Managed identities](automation-security-overview.md#managed-identities).
1313

1414
> [!NOTE]
15-
> User-assigned managed identities are supported for cloud jobs only.
15+
> User-assigned managed identities are supported for Azure jobs only.
1616
1717
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
1818

@@ -30,11 +30,6 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3030

3131
- An Azure resource that you want to access from your Automation runbook. This resource needs to have a role defined for the user-assigned managed identity, which helps the Automation runbook authenticate access to the resource. To add roles, you need to be an owner for the resource in the corresponding Azure AD tenant.
3232

33-
- If you want to execute hybrid jobs using a user-assigned managed identity, update the Hybrid Runbook Worker to the latest version. The minimum required versions are:
34-
35-
- Windows Hybrid Runbook Worker: version 7.3.1125.0
36-
- Linux Hybrid Runbook Worker: version 1.7.4.0
37-
3833
- To assign an Azure role, you must have ```Microsoft.Authorization/roleAssignments/write``` permissions, such as [User Access Administrator](../role-based-access-control/built-in-roles.md#user-access-administrator) or [Owner](../role-based-access-control/built-in-roles.md#owner).
3934

4035
## Add user-assigned managed identity for Azure Automation account
@@ -429,4 +424,4 @@ print(response.text)
429424

430425
- If you need to disable a managed identity, see [Disable your Azure Automation account managed identity](disable-managed-identity-for-automation.md).
431426

432-
- For an overview of Azure Automation account security, see [Automation account authentication overview](automation-security-overview.md).
427+
- For an overview of Azure Automation account security, see [Automation account authentication overview](automation-security-overview.md).

articles/batch/virtual-file-mount.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ You can mount an Azure file share on a Batch pool using [Azure PowerShell](/powe
7171
1. Create a Batch pool with the following settings. Replace the sample values with your own information as needed.
7272
7373
```powershell
74-
$fileShareConfig = New-Object -TypeName "Microsoft.Azure.Commands.Batch.Models.PSAzureFileShareConfiguration" -ArgumentList @("<Storage-Account-name>", https://<Storage-Account-name>.file.core.windows.net/batchfileshare1, "S", "Storage-Account-key")
74+
$fileShareConfig = New-Object -TypeName "Microsoft.Azure.Commands.Batch.Models.PSAzureFileShareConfiguration" -ArgumentList @("<Storage-Account-name>", "https://<Storage-Account-name>.file.core.windows.net/batchfileshare1", "S", "Storage-Account-key")
7575
7676
$mountConfig = New-Object -TypeName "Microsoft.Azure.Commands.Batch.Models.PSMountConfiguration" -ArgumentList @($fileShareConfig)
7777
7878
$imageReference = New-Object -TypeName "Microsoft.Azure.Commands.Batch.Models.PSImageReference" -ArgumentList @("WindowsServer", "MicrosoftWindowsServer", "2016-Datacenter", "latest")
7979
8080
$configuration = New-Object -TypeName "Microsoft.Azure.Commands.Batch.Models.PSVirtualMachineConfiguration" -ArgumentList @($imageReference, "batch.node.windows amd64")
8181
82-
New-AzBatchPool -Id "<Pool-Name>" -VirtualMachineSize "STANDARD_D2_V2" -VirtualMachineConfiguration $configuration -TargetDedicatedComputeNodes 1 -MountConfiguration @($mountConfig) -BatchContext $Context
82+
New-AzBatchPool -Id "<Pool-Name>" -VirtualMachineSize "STANDARD_D2_V2" -VirtualMachineConfiguration $configuration -TargetDedicatedComputeNodes 1 -MountConfiguration @($mountConfig) -BatchContext $context
8383
```
8484
8585
1. Access the mount files using your drive's direct path. For example:
@@ -472,4 +472,4 @@ When using virtual file mounts with [Azure Batch pools in a virtual network](bat
472472
- Learn more about mounting an Azure Files share with [Windows](../storage/files/storage-how-to-use-files-windows.md) or [Linux](../storage/files/storage-how-to-use-files-linux.md).
473473
- Learn about using and mounting [blobfuse](https://github.com/Azure/azure-storage-fuse) virtual file systems.
474474
- See [Network File System overview](/windows-server/storage/nfs/nfs-overview) to learn about NFS and its applications.
475-
- See [Microsoft SMB protocol and CIFS protocol overview](/windows/desktop/fileio/microsoft-smb-protocol-and-cifs-protocol-overview) to learn more about CIFS.
475+
- See [Microsoft SMB protocol and CIFS protocol overview](/windows/desktop/fileio/microsoft-smb-protocol-and-cifs-protocol-overview) to learn more about CIFS.

articles/service-bus-messaging/service-bus-partitioning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ using (TransactionScope ts = new TransactionScope(committableTransaction))
6868
ServiceBusMessage msg = new ServiceBusMessage("This is a message");
6969
msg.PartitionKey = "myPartitionKey";
7070
await sender.SendMessageAsync(msg);
71-
await ts.CompleteAsync();
71+
ts.Complete();
7272
}
7373
committableTransaction.Commit();
7474
```
@@ -88,7 +88,7 @@ using (TransactionScope ts = new TransactionScope(committableTransaction))
8888
ServiceBusMessage msg = new ServiceBusMessage("This is a message");
8989
msg.SessionId = "mySession";
9090
await sender.SendMessageAsync(msg);
91-
await ts.CompleteAsync();
91+
ts.Complete();
9292
}
9393
committableTransaction.Commit();
9494
```

articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-table-constraints.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Learn about table constraints in dedicated SQL pool, including primary key, fore
2020

2121
Dedicated SQL pool supports these table constraints:
2222
- PRIMARY KEY is only supported when NONCLUSTERED and NOT ENFORCED are both used.
23-
- UNIQUE constraint is only supported with NOT ENFORCED is used.
23+
- UNIQUE constraint is only supported when NOT ENFORCED is used.
2424

2525
For syntax, check [ALTER TABLE](/sql/t-sql/statements/alter-table-transact-sql) and [CREATE TABLE](/sql/t-sql/statements/create-table-azure-sql-data-warehouse).
2626

@@ -172,4 +172,4 @@ CREATE TABLE t6 (c1 INT UNIQUE NOT ENFORCED, c2 INT);
172172

173173
## Next steps
174174

175-
After creating the tables for your dedicated SQL pool, the next step is to load data into the table. For a loading tutorial, see [Loading data to dedicated SQL pool](load-data-wideworldimportersdw.md).
175+
After creating the tables for your dedicated SQL pool, the next step is to load data into the table. For a loading tutorial, see [Loading data to dedicated SQL pool](load-data-wideworldimportersdw.md).

0 commit comments

Comments
 (0)