Skip to content

Commit 21f31ec

Browse files
Merge pull request #278181 from alexbuckgit/alexbuckgit/docutune-autopr-20240613-184702-7027085-ignore-build
[BULK] - DocuTune v1.4.1 - Standardize formatting of abbreviations (part 4)
2 parents dd52634 + a4307c9 commit 21f31ec

31 files changed

+55
-82
lines changed

articles/firewall/long-running-sessions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Session disconnection isn’t an issue for resilient applications that can handl
4545

4646
## Network security groups
4747

48-
You can deploy [network security groups](../virtual-network/virtual-network-vnet-plan-design-arm.md#security) (NSGs) to protect against unsolicited traffic into Azure subnets. Network security groups are simple, stateful packet inspection devices that use the 5-tuple approach (source IP, source port, destination IP, destination port, and layer 4 protocol) to create allow/deny rules for network traffic. You allow or deny traffic to and from a single IP address, to and from multiple IP addresses, or to and from entire subnets. NSG flow logs help with auditing by logging information about IP traffic flowing through an NSG. To learn more about NSG flow logging, see [Introduction to flow logging for network security groups](../network-watcher/network-watcher-nsg-flow-logging-overview.md).
48+
You can deploy [network security groups (NSGs)](../virtual-network/virtual-network-vnet-plan-design-arm.md#security) to protect against unsolicited traffic into Azure subnets. Network security groups are simple, stateful packet inspection devices that use the 5-tuple approach (source IP, source port, destination IP, destination port, and layer 4 protocol) to create allow/deny rules for network traffic. You allow or deny traffic to and from a single IP address, to and from multiple IP addresses, or to and from entire subnets. NSG flow logs help with auditing by logging information about IP traffic flowing through an NSG. To learn more about NSG flow logging, see [Introduction to flow logging for network security groups](../network-watcher/network-watcher-nsg-flow-logging-overview.md).
4949

5050
## Next steps
5151

articles/governance/blueprints/samples/caf-foundation/deploy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
title: Deploy CAF Foundation blueprint sample
2+
title: Deploy the CAF Foundation blueprint sample
33
description: Deploy steps for the CAF Foundation blueprint sample including blueprint artifact parameter details.
44
ms.date: 09/07/2023
55
ms.topic: sample
66
---
7-
# Deploy the Microsoft Cloud Adoption Framework for Azure Foundation blueprint sample
7+
# Deploy the CAF Foundation blueprint sample
88

99
[!INCLUDE [Blueprints deprecation note](../../../../../includes/blueprints-deprecation-note.md)]
1010

11-
To deploy the Microsoft Cloud Adoption Framework for Azure (CAF) Foundation blueprint sample, the
11+
To deploy the CAF Foundation blueprint sample (provided by the Microsoft Cloud Adoption Framework for Azure), the
1212
following steps must be taken:
1313

1414
> [!div class="checklist"]

articles/governance/blueprints/samples/caf-foundation/index.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
11
---
22
title: CAF Foundation blueprint sample overview
3-
description: Overview and architecture of the Cloud Adoption Framework (CAF) for Azure Foundation blueprint sample.
3+
description: Overview and architecture of the CAF Foundation blueprint sample, provided by the Microsoft Cloud Adoption Framework for Azure.
44
ms.date: 09/07/2023
55
ms.topic: sample
66
---
77
# Overview of the Microsoft Cloud Adoption Framework for Azure Foundation blueprint sample
88

99
[!INCLUDE [Blueprints deprecation note](../../../../../includes/blueprints-deprecation-note.md)]
1010

11-
The Microsoft Cloud Adoption Framework for Azure (CAF) Foundation blueprint deploys a set of core
12-
infrastructure resources and policy controls required for your first production grade Azure
13-
application. This foundation blueprint is based on the recommended pattern found in CAF.
11+
The CAF Foundation blueprint (provided by the Microsoft Cloud Adoption Framework for Azure) deploys a set of core infrastructure resources and policy controls required for your first production grade Azure application. This foundation blueprint is based on the recommended pattern found in the Cloud Adoption Framework.
1412

1513
## Architecture
1614

17-
The CAF Foundation blueprint sample deploys recommended infrastructure resources in Azure that can
18-
be used by organizations to put in place the foundation controls necessary to manage their cloud
19-
estate. This sample will deploy and enforce resources, policies, and templates that will allow an
20-
organization to confidently get started with Azure.
15+
The CAF Foundation blueprint sample deploys recommended infrastructure resources in Azure that can be used by organizations to put in place the foundation controls necessary to manage their cloud estate. This sample will deploy and enforce resources, policies, and templates that will allow an organization to confidently get started with Azure.
2116

2217
:::image type="complex" source="../../media/caf-blueprints/caf-foundation-architecture.png" alt-text="C A F Foundation, image describes what gets installed as part of C A F guidance for creating a foundation to get started with Azure." border="false":::
2318
Describes an Azure architecture which is achieved by deploying the C A F Foundation blueprint. It's applicable to a subscription with resource groups which consists of a storage account for storing logs, Log Analytics configured to store in the storage account. It also depicts Azure Key Vault configured with Microsoft Defender for Cloud standard setup. All these core infrastructures are accessed using Azure Active Directory and enforced using Azure Policy.
2419
:::image-end:::
2520

26-
This implementation incorporates several Azure services used to provide a secure, fully monitored,
27-
enterprise-ready foundation. This environment is composed of:
21+
This implementation incorporates several Azure services used to provide a secure, fully monitored, enterprise-ready foundation. This environment is composed of:
2822

2923
- An [Azure Key Vault](../../../../key-vault/general/overview.md) instance used to host secrets
3024
used for the VMs deployed in the shared services environment
@@ -46,8 +40,7 @@ enterprise-ready foundation. This environment is composed of:
4640
- Policy initiatives:
4741
- Enable Monitoring in Microsoft Defender for Cloud (100+ policy definitions)
4842

49-
All these elements abide to the proven practices published in the
50-
[Azure Architecture Center - Reference Architectures](/azure/architecture/reference-architectures/).
43+
All these elements abide to the proven practices published in the [Azure Architecture Center - Reference Architectures](/azure/architecture/reference-architectures/).
5144

5245
> [!NOTE]
5346
> The CAF Foundation lays out a foundational architecture for workloads.

articles/governance/blueprints/samples/caf-migrate-landing-zone/index.md

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
---
22
title: CAF Migration landing zone blueprint sample overview
3-
description: Overview and architecture of the Cloud Adoption Framework (CAF) for Azure Migration landing zone blueprint sample.
3+
description: Overview and architecture of the CAF Migration landing zone blueprint sample, provided by the Microsoft Cloud Adoption Framework for Azure.
44
ms.date: 09/07/2023
55
ms.topic: sample
66
---
7-
# Overview of the Microsoft Cloud Adoption Framework for Azure Migration landing zone blueprint sample
7+
# Overview of the CAF Migration landing zone blueprint sample
88

99
[!INCLUDE [Blueprints deprecation note](../../../../../includes/blueprints-deprecation-note.md)]
1010

11-
The Microsoft Cloud Adoption Framework for Azure (CAF) Migration landing zone blueprint is a set of
12-
infrastructure to help you set up for migrating your first workload and manage your cloud estate in
13-
alignment with CAF.
11+
The CAF Migration landing zone blueprint (provided by the Microsoft Cloud Adoption Framework for Azure) is a set of infrastructure to help you set up for migrating your first workload and manage your cloud estate in alignment with the Cloud Adoption Framework.
1412

1513
The [CAF Foundation](../caf-foundation/index.md) blueprint sample extends this sample.
1614

1715
## Architecture
1816

19-
The CAF Migration landing zone blueprint sample deploys foundation infrastructure resources in Azure
20-
that can be used by organizations to prepare their subscription for migrating virtual machines in
21-
to. It also helps put in place the governance controls necessary to manage their cloud estate. This
22-
sample will deploy and enforce resources, policies, and templates that will allow an organization to
17+
The CAF Migration landing zone blueprint sample deploys foundation infrastructure resources in Azure that can be used by organizations to prepare their subscription for migrating virtual machines in to. It also helps put in place the governance controls necessary to manage their cloud estate. This sample will deploy and enforce resources, policies, and templates that will allow an organization to
2318
confidently get started with Azure.
2419

2520
:::image type="complex" source="../../media/caf-blueprints/caf-migration-landing-zone-architecture.png" alt-text="C A F Migration landing zone, image describes what gets installed as part of C A F guidance for initial landing zone." border="false":::
@@ -29,26 +24,19 @@ confidently get started with Azure.
2924
This environment is composed of several Azure services used to provide a secure, fully monitored,
3025
enterprise-ready governance. This environment is composed of:
3126

32-
- An [Azure Key Vault](../../../../key-vault/general/overview.md) instance used to host secrets
33-
used for the Certificates, Keys, and Secrets deployed in the shared services environment
34-
- Deploy [Log Analytics](../../../../azure-monitor/overview.md) is deployed to ensure all actions
35-
and services log to a central location from the moment you start your migration
36-
- Deploy [Azure Virtual Network](../../../../virtual-network/virtual-networks-overview.md) providing
37-
an isolated network and subnets for your virtual machine.
27+
- An [Azure Key Vault](../../../../key-vault/general/overview.md) instance used to host secrets used for the Certificates, Keys, and Secrets deployed in the shared services environment
28+
- Deploy [Log Analytics](../../../../azure-monitor/overview.md) is deployed to ensure all actions and services log to a central location from the moment you start your migration
29+
- Deploy [Azure Virtual Network](../../../../virtual-network/virtual-networks-overview.md) providing an isolated network and subnets for your virtual machine.
3830
- Deploy [Azure Migrate Project](../../../../migrate/migrate-services-overview.md) for discovery and
39-
assessment. We're adding the tools for Server assessment, Server migration, Database assessment,
40-
and Database migration.
31+
assessment. We're adding the tools for Server assessment, Server migration, Database assessment, and Database migration.
4132

4233
All these elements abide to the proven practices published in the
4334
[Azure Architecture Center - Reference Architectures](/azure/architecture/reference-architectures/).
4435

4536
> [!NOTE]
46-
> The CAF Migration blueprint lays out a landing zone for your workloads. You still need to perform
47-
> the assessment and migration of your Virtual Machines / Databases on top of this foundational
48-
> architecture.
37+
> The CAF Migration blueprint lays out a landing zone for your workloads. You still need to perform the assessment and migration of your Virtual Machines / Databases on top of this foundational architecture.
4938
50-
For more information, see the
51-
[Microsoft Cloud Adoption Framework for Azure - Migrate](/azure/architecture/cloud-adoption/migrate/).
39+
For more information, see the [Microsoft Cloud Adoption Framework for Azure - Migrate](/azure/architecture/cloud-adoption/migrate/).
5240

5341
## Next steps
5442

articles/governance/blueprints/samples/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ quality and ready to deploy today to assist you in meeting your various complian
2323
| [ISO 27001 App Service Environment/SQL Database workload](./iso27001-ase-sql-workload/index.md) | Provides more infrastructure to the [ISO 27001 Shared Services](./iso27001-shared/index.md) blueprint sample. |
2424
| [SWIFT CSP-CSCF v2020](./swift-2020/index.md) | Aides in SWIFT CSP-CSCF v2020 compliance. |
2525
| [UK OFFICIAL and UK NHS Governance](./ukofficial-uknhs.md) | Provides a set of compliant infrastructure patterns and policy guardrails that help toward UK OFFICIAL and UK NHS attestation. |
26-
| [CAF Foundation](./caf-foundation/index.md) | Provides a set of controls to help you manage your cloud estate in alignment with the [Microsoft Cloud Adoption Framework for Azure (CAF)](/azure/architecture/cloud-adoption/governance/journeys/index). |
27-
| [CAF Migrate landing zone](./caf-migrate-landing-zone/index.md) | Provides a set of controls to help you set up for migrating your first workload and manage your cloud estate in alignment with the [Microsoft Cloud Adoption Framework for Azure (CAF)](/azure/architecture/cloud-adoption/migrate/index). |
26+
| [CAF Foundation](./caf-foundation/index.md) | Provides a set of controls to help you manage your cloud estate in alignment with the [Microsoft Cloud Adoption Framework for Azure](/azure/architecture/cloud-adoption/governance/journeys/index). |
27+
| [CAF Migrate landing zone](./caf-migrate-landing-zone/index.md) | Provides a set of controls to help you set up for migrating your first workload and manage your cloud estate in alignment with the [Microsoft Cloud Adoption Framework for Azure](/azure/architecture/cloud-adoption/migrate/index). |
2828

2929
## Samples strategy
3030

articles/governance/resource-graph/reference/supported-tables-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ For sample queries for this table, see [Resource Graph sample queries for resour
708708
- microsoft.Network/expressRoutePorts (ExpressRoute Direct)
709709
- microsoft.Network/firewallPolicies (Firewall policies)
710710
- microsoft.Network/frontdoors (Front Doors)
711-
- microsoft.Network/FrontDoorWebApplicationFirewallPolicies (Web Application Firewall policies (WAF))
711+
- microsoft.Network/FrontDoorWebApplicationFirewallPolicies (Web Application Firewall (WAF) policies)
712712
- microsoft.network/ipallocations
713713
- microsoft.Network/ipGroups (IP Groups)
714714
- microsoft.Network/LoadBalancers (Load balancers)

articles/hdinsight-aks/flink/azure-service-bus-demo.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,4 @@ This Flink source function, encapsulated within the `SessionBasedServiceBusSourc
333333

334334
- To learn more about Azure Service Bus, refer to the [What is Azure Service Bus?](/azure/service-bus-messaging/service-bus-messaging-overview).
335335
- For guidance on creating topics, consult the [Service Bus Explorer](/azure/service-bus-messaging/explorer).
336-
- Apache, Apache Flink, Flink, and associated open source project names are [trademarks](../trademarks.md) of the [Apache Software Foundation](https://www.apache.org/) (ASF).
337-
338-
339-
340-
341-
342-
343-
344-
336+
- Apache, Apache Flink, Flink, and associated open source project names are [trademarks](../trademarks.md) of the [Apache Software Foundation (ASF)](https://www.apache.org/).

articles/hdinsight/hadoop/apache-hadoop-deep-dive-advanced-analytics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ There are three scalable machine learning libraries that bring algorithmic model
6666

6767
### Apache Spark and Deep learning
6868

69-
[Deep learning](https://www.microsoft.com/research/group/dltc/) is a branch of machine learning that uses *deep neural networks* (DNNs), inspired by the biological processes of the human brain. Many researchers see deep learning as a promising approach to artificial intelligence. Some examples of deep learning are spoken language translators, image recognition systems, and machine reasoning. To help advance its own work in deep learning, Microsoft has developed the free, easy-to-use, open-source [Microsoft Cognitive Toolkit](/cognitive-toolkit/). The toolkit is being used extensively by a wide variety of Microsoft products, by companies worldwide with a need to deploy deep learning at scale, and by students interested in the latest algorithms and techniques.
69+
[Deep learning](https://www.microsoft.com/research/group/dltc/) is a branch of machine learning that uses *deep neural networks (DNNs)*, inspired by the biological processes of the human brain. Many researchers see deep learning as a promising approach to artificial intelligence. Some examples of deep learning are spoken language translators, image recognition systems, and machine reasoning. To help advance its own work in deep learning, Microsoft has developed the free, easy-to-use, open-source [Microsoft Cognitive Toolkit](/cognitive-toolkit/). The toolkit is being used extensively by a wide variety of Microsoft products, by companies worldwide with a need to deploy deep learning at scale, and by students interested in the latest algorithms and techniques.
7070

7171
## Scenario - Score Images to Identify Patterns in Urban Development
7272

articles/hdinsight/hadoop/apache-hadoop-use-hive-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ The following example relies on the `log4jLogs` table created in the previous pr
129129
> [!NOTE]
130130
> Unlike `EXTERNAL` tables, dropping an internal table also deletes the underlying data.
131131
132-
* `STORED AS ORC`: Stores the data in *optimized row columnar* (ORC) format. ORC is a highly optimized and efficient format for storing Hive data.
132+
* `STORED AS ORC`: Stores the data in *optimized row columnar (ORC)* format. ORC is a highly optimized and efficient format for storing Hive data.
133133
134134
* `INSERT OVERWRITE ... SELECT`: Selects rows from the `log4jLogs` table that contain `[ERROR]`, then inserts the data into the `errorLogs` table.
135135

articles/hdinsight/hdinsight-private-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Private Link can be used in cross-network scenarios where virtual network peerin
1919
2020
The use of Private Link to connect to an HDInsight cluster is an optional feature and is disabled by default. The feature is available only when the `resourceProviderConnection` network property is set to *outbound*, as described in the article [Restrict cluster connectivity in Azure HDInsight](./hdinsight-restrict-public-connectivity.md).
2121

22-
When `privateLink` is set as *enabled*, internal [standard load balancers](../load-balancer/load-balancer-overview.md) (SLBs) are created, and an Azure Private Link service is provisioned for each SLB. The Private Link service is what allows you to access the HDInsight cluster from private endpoints.
22+
When `privateLink` is set as *enabled*, internal [standard load balancers (SLBs)](../load-balancer/load-balancer-overview.md) are created, and an Azure Private Link service is provisioned for each SLB. The Private Link service is what allows you to access the HDInsight cluster from private endpoints.
2323

2424
## Private link deployment steps
2525
Successfully creating a Private Link cluster takes many steps, so we've outlined them here. Follow each of the steps below to ensure everything is set up correctly.

0 commit comments

Comments
 (0)