Skip to content

Commit bfbb26c

Browse files
authored
Merge pull request #301754 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 4489b14 + 7d5fa27 commit bfbb26c

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

articles/cost-management-billing/understand/review-enterprise-agreement-bill.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ You receive an Azure invoice when any of the following events occur during your
4949
- Visual Studio Enterprise (Annual)
5050
- Visual Studio Professional (Monthly)
5151
- Visual Studio Professional (Annual)
52+
- Azure Communication Services (SMS and PSTN)
5253
- **Marketplace charges**: Azure Marketplace purchases and usage aren't covered by your organization's credit. So, you're invoiced for Marketplace charges despite your credit balance. In the Azure portal, an Enterprise Administrator can enable and disable Marketplace purchases.
5354

5455
Your invoice shows Azure usage charges with costs associated to them first, followed by any marketplace charges. If you have a credit balance, it gets applied to Azure usage and your invoice shows Azure usage and marketplace usage without any cost, last in the list.

articles/cyclecloud/how-to/cluster-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ all of the available machine types. The other ParameterType values are:
266266

267267
## Chef Server Support
268268

269-
Azure CycleCloud suports [ChefServer](https://docs.chef.io/server_components.html).
269+
Azure CycleCloud supports [ChefServer](https://docs.chef.io/server_components.html).
270270

271271
Create the file `chefserver.json` and add your credentials. `ValidationKey`
272272
corresponds to the validation.pem file for your chef server. You also must prove the

articles/cyclecloud/how-to/mount-disk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The above example shows there are three volumes that should be attached to the n
7676
## Disk Encryption
7777
CycleCloud supports server-side encryption (SSE) for OS and data disk Volumes using [Azure Disk Encryption Sets](/azure/virtual-machines/disk-encryption).
7878
Azure uses _Platform Managed Keys_ (PMK) by default. However, to use _Customer Managed Keys_ (CMK), you must first set up an Azure Disk Encryption Set and a Key Vault with your key.
79-
Follow the documention here to [set up your Disk Encryption Set](/azure/virtual-machines/disks-enable-customer-managed-keys-portal).
79+
Follow the documentation here to [set up your Disk Encryption Set](/azure/virtual-machines/disks-enable-customer-managed-keys-portal).
8080

8181
Record the ``Resource ID`` of the Disk Encryption Set when you create it. You can find this in the Azure Portal under **Properties** in the **Disk Encryption Sets** blade.
8282

articles/cyclecloud/how-to/running-in-locked-down-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ cd "${RELEASE_VERSION}"
130130
# Download release artifacts from githug (on a machine with github access)
131131
cyclecloud project fetch "${RELEASE_URL}" .
132132

133-
# Create a tarbal with the project files pre-staged
133+
# Create a tarball with the project files pre-staged
134134
cyclecloud project build
135135
mv ./build/slurm "./${RELEASE_VERSION}"
136136
tar czf "slurm-${RELEASE_VERSION}.tgz" ./blobs "./${RELEASE_VERSION}"

articles/data-factory/concepts-change-data-capture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ In the monitoring section, you always have the chance to rerun a pipeline. When
8686

8787
## Tutorials
8888

89-
The followings are the tutorials to start the change data capture in Azure Data Factory and Azure Synapse Analytics.
89+
The following are the tutorials to start the change data capture in Azure Data Factory and Azure Synapse Analytics.
9090

9191
- [SAP CDC tutorial in ADF](sap-change-data-capture-introduction-architecture.md#sap-cdc-capabilities)
9292
- [Incrementally copy data from a source data store to a destination data store tutorials](tutorial-incremental-copy-overview.md)
9393

9494
## Templates
9595

96-
The followings are the templates to use the change data capture in Azure Data Factory and Azure Synapse Analytics.
96+
The following are the templates to use the change data capture in Azure Data Factory and Azure Synapse Analytics.
9797

9898
- [Replicate multiple objects from SAP via SAP CDC](solution-template-replicate-multiple-objects-sap-cdc.md)
9999

articles/data-factory/copy-activity-fault-tolerance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To configure fault tolerance in a Copy activity in a pipeline with UI, complete
3535
:::image type="content" source="media/copy-activity-fault-tolerance/configure-fault-tolerance.png" alt-text="Shows the UI for a Copy Data activity on the Settings tab with the Fault Tolerance configuration highlighted.":::
3636

3737
### Configuration
38-
When you copy binary files between storage stores, you can enable fault tolerance as followings:
38+
When you copy binary files between storage stores, you can enable fault tolerance as following:
3939

4040
```json
4141
{
@@ -91,7 +91,7 @@ linkedServiceName | The linked service of [Azure Blob Storage](connector-azure-b
9191
path | The path of the log files. | Specify the path that you use to store the log files. If you do not provide a path, the service creates a container for you. | No
9292

9393
> [!NOTE]
94-
> The followings are the prerequisites of enabling fault tolerance in copy activity when copying binary files.
94+
> The following are the prerequisites of enabling fault tolerance in copy activity when copying binary files.
9595
> For skipping particular files when they are being deleted from source store:
9696
> - The source dataset and sink dataset have to be binary format, and the compression type cannot be specified.
9797
> - The supported data store types are Azure Blob storage, Azure Data Lake Storage Gen1, Azure Data Lake Storage Gen2, Azure Files, File System, FTP, SFTP, Amazon S3, Google Cloud Storage and HDFS.

articles/frontdoor/migrate-cdn-to-front-door.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ We recommend that your plan this migration well in advance and test the function
3333
3434
## Migrate your workloads
3535

36-
The followings steps assume you're using an Azure Blob Storage account as your origin. If you're using a different origin, adjust the steps accordingly.
36+
The following steps assume you're using an Azure Blob Storage account as your origin. If you're using a different origin, adjust the steps accordingly.
3737

3838
:::image type="content" source="./media/migrate-cdn-to-front-door/cdn-traffic-manager.png" alt-text="Diagram of Azure Traffic Manager distributing traffic between Azure Front Door and Azure CDN from Edgio.":::
3939

articles/sap/monitor/enable-trusted-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To use the trusted access using MSI feature, you need to meet the following prer
3737
1. Log in to the Azure portal and navigate to your Azure Monitor for SAP solutions resource.
3838
2. Migrate to Dedicated app service plan: [Follow steps here](https://go.microsoft.com/fwlink/?linkid=2306196)
3939
3. Go to the identity tab and enable the system assigned identity and wait for the operation to complete and monitor should be in succeeded state after the operation.
40-
![Screenshot of Enabling Trusted Access under Indentity tab.](../monitor/media/enable-trusted-access/enable-mi-existing-customer.png)
40+
![Screenshot of Enabling Trusted Access under Identity tab.](../monitor/media/enable-trusted-access/enable-mi-existing-customer.png)
4141

4242
## Disable Identity on existing AMS
4343
* Go to Identity tab for AMS and disable the identity and save.

articles/sap/workloads/dbms-guide-sqlserver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ There's some SQL Server in IaaS specific information you should know before cont
4848

4949

5050
## New M-series VMs and SQL Server
51-
Azure released a few new families of M-series SKUs under the family of Mv3. Some of the VM types in this family should't be used for SQL Server, including SQL Server 2022 without disabling SMT (Hyperthreading) in the Windows Server guest OS. Reason is the number of NUMA nodes presented into the Windows Server guest OS which with larger than 64 vCPUs is too large for SQL Server to accommodate. By disabling SMT in the Windows Server guest OS, the number of vCPUs is getting reduced. So, that the number of vCPUs is less than 64 in each NUMA node. The way how to disable SMT is described [here](/sql/sql-server/compute-capacity-limits-by-edition-of-sql-server?view=sql-server-ver16&preserve-view=true#disable-smt-in-an-azure-virtual-machine). The specific VM types are:
51+
Azure released a few new families of M-series SKUs under the family of Mv3. Some of the VM types in this family shouldn't be used for SQL Server, including SQL Server 2022 without disabling SMT (Hyperthreading) in the Windows Server guest OS. Reason is the number of NUMA nodes presented into the Windows Server guest OS which with larger than 64 vCPUs is too large for SQL Server to accommodate. By disabling SMT in the Windows Server guest OS, the number of vCPUs is getting reduced. So, that the number of vCPUs is less than 64 in each NUMA node. The way how to disable SMT is described [here](/sql/sql-server/compute-capacity-limits-by-edition-of-sql-server?view=sql-server-ver16&preserve-view=true#disable-smt-in-an-azure-virtual-machine). The specific VM types are:
5252
- M176(d)s_3_v3 - disable SMT or use M176bds_4_v3 or M176bds_4_v3 as alternative
5353
- M176(d)s_4_v3 - disable SMT or use M176bds_4_v3 as alternative
5454
- M624(d)s_12_v3 - disable SMT or use M416ms_v2 as alternative

articles/service-connector/how-to-use-service-connector-in-aks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ The Service Connector Kubernetes extension is built on top of [Azure Arc-enabled
203203

204204
### Check Kubernetes cluster logs
205205

206-
If an error occurs during the extension installation and the error message in the `statuses` property doesn't provide sufficient information, you can further investigate by checking the Kubernetes logs with the followings steps.
206+
If an error occurs during the extension installation and the error message in the `statuses` property doesn't provide sufficient information, you can further investigate by checking the Kubernetes logs with the following steps.
207207

208208
1. Connect to your AKS cluster.
209209

0 commit comments

Comments
 (0)