Skip to content

Commit 9b68296

Browse files
authored
Merge pull request #49814 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 6387277 + 5574ca1 commit 9b68296

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

articles/azure-policy/policy-compliance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ There are several ways to access the compliance information generated by your po
2323
assignments:
2424

2525
- Using the [Azure Portal](#portal)
26-
- Through [command line](#command_line) scripting
26+
- Through [command line](#command-line) scripting
2727

2828
Before looking at the methods to report on compliance, let's look at when compliance information is
2929
updated and the frequency and events that trigger an evaluation cycle.
@@ -429,4 +429,4 @@ items, such as more than 10 in the last 24 hours.
429429

430430
- Review the [Policy definition structure](policy-definition.md).
431431
- Review [Understanding policy effects](policy-effects.md).
432-
- Review what a management group is with [Organize your resources with Azure management groups](../azure-resource-manager/management-groups-overview.md)
432+
- Review what a management group is with [Organize your resources with Azure management groups](../azure-resource-manager/management-groups-overview.md)

articles/billing/billing-cost-analysis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Explore Azure costs with Cost analysis | Microsoft Docs
2+
title: Explore Azure costs with cost analysis | Microsoft Docs
33
description: This article helps you use cost analysis to explore and analyze your Azure organizational costs.
44
services: billing
55
keywords:
@@ -11,7 +11,7 @@ ms.service: billing
1111
manager: dougeby
1212
ms.custom:
1313
---
14-
# Explore and analyze costs with Cost analysis
14+
# Explore and analyze costs with cost analysis
1515

1616
Before you can properly control and optimize your Azure costs, you need to understand where costs originated within your organization. It's also useful to know how much money your services cost, and in support of what environments and systems. Visibility into the full spectrum of costs is critical to accurately understand organizational spending patterns, which can be used to enforce cost control mechanisms, like budgets.
1717

articles/expressroute/expressroute-faqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ If your service provider offers ExpressRoute at both sites, you can work with yo
153153

154154
### Can I have multiple ExpressRoute circuits in the same metro? Can I link them to the same virtual network?
155155

156-
Yes. You can have multiple ExpressRoute circuits with the same or different service providers. If the metro has multiple ExpressRoute peering locations and the circuits are created at different peering locations, you can link them to the same virtual network. If the circuits are created at the same peering location, you can’t link them to the same virtual network. Each location name in Azure Portal or in PowerShell/CLI API represents one peering location. For example, you can select the peering locations "Singapore" and "Singapore2" and connect circuits from each to the same virtuan network.
156+
Yes. You can have multiple ExpressRoute circuits with the same or different service providers. If the metro has multiple ExpressRoute peering locations and the circuits are created at different peering locations, you can link them to the same virtual network. If the circuits are created at the same peering location, you can’t link them to the same virtual network. Each location name in Azure Portal or in PowerShell/CLI API represents one peering location. For example, you can select the peering locations "Singapore" and "Singapore2" and connect circuits from each to the same virtual network.
157157

158158
### How do I connect my virtual networks to an ExpressRoute circuit
159159

articles/virtual-machines/linux/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ms.custom: H1Hack27Feb2017, mvc
1919
---
2020

2121
# Azure and Linux
22-
Microsoft Azure is a growing collection of integrated public cloud services including analytics, Virtual Machines, databases, mobile, networking, storage, and web—ideal for hosting your solutions. Microsoft Azure provides a scalable computing platform that allows you to only pay for what you use, when you want it - without having to invest in on-premises hardware. Azure is ready when you are to scale your solutions up and out to whatever scale you require to service the needs of your clients.
22+
Microsoft Azure is a growing collection of integrated public cloud services including analytics, virtual machines, databases, mobile, networking, storage, and web—ideal for hosting your solutions. Microsoft Azure provides a scalable computing platform that allows you to only pay for what you use, when you want it - without having to invest in on-premises hardware. Azure is ready when you are to scale your solutions up and out to whatever scale you require to service the needs of your clients.
2323

2424
If you are familiar with the various features of Amazon's AWS, you can examine the Azure vs AWS [definition mapping document](https://azure.microsoft.com/campaigns/azure-vs-aws/mapping/).
2525

2626
## Regions
27-
Microsoft Azure resources are distributed across multiple geographical regions around the world. A "region" represents multiple data centers in a single geographical area. Azure currently (as of November 2017) has 36 regions generally available around the world with an additional 6 regions announced. An updated list of existing and newly announced regions can be found in the following page:
27+
Microsoft Azure resources are distributed across multiple geographical regions around the world. A "region" represents multiple data centers in a single geographical area. Azure currently (as of August 2018) has 42 regions generally available around the world with an additional 12 regions announced - more global regions than any other cloud provider. An updated list of existing and newly announced regions can be found in the following page:
2828

2929
* [Azure Regions](https://azure.microsoft.com/regions/)
3030

articles/virtual-machines/linux/tutorial-custom-images.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If you choose to install and use the CLI locally, this tutorial requires that yo
3838

3939
## Before you begin
4040

41-
The steps below detail how to take an existing VM and turn it into a re-usable custom image that you can use to create new VM instances.
41+
The steps below detail how to take an existing VM and turn it into a reusable custom image that you can use to create new VM instances.
4242

4343
To complete the example in this tutorial, you must have an existing virtual machine. If needed, this [script sample](../scripts/virtual-machines-linux-cli-sample-create-vm-nginx.md) can create one for you. When working through the tutorial, replace the resource group and VM names where needed.
4444

0 commit comments

Comments
 (0)