Skip to content

Commit 37af015

Browse files
authored
Merge pull request #28607 from MicrosoftDocs/FromPublicRepo
From public repo
2 parents e3c1197 + b6d9ff1 commit 37af015

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

articles/active-directory/develop/active-directory-integrating-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ The following section shows you how to expose access scopes, by modifying the re
174174
}
175175
```
176176
> [!NOTE]
177-
> The "id" value must be generated using a GUID generation tool such as [guidgen]](https://msdn.microsoft.com/library/ms241442%28v=vs.80%29.aspx) or programmatically. It represents a unique identifier for the scope as exposed by the web API. Once a client is appropriately configured with permissions to access to your web API, it is issued an OAuth2.0 access token by Azure AD. When the client calls the web API, it presents the access token that has the scope (scp) claim set to the permissions requested in its application registration.
177+
> The "id" value must be generated using a GUID generation tool such as [guidgen](https://msdn.microsoft.com/library/ms241442%28v=vs.80%29.aspx) or programmatically. It represents a unique identifier for the scope as exposed by the web API. Once a client is appropriately configured with permissions to access your web API, it is issued an OAuth2.0 access token by Azure AD. When the client calls the web API, it presents the access token that has the scope (scp) claim set to the permissions requested in its application registration.
178178
>
179179
> You can expose additional scopes later as necessary. Consider that your web API might expose multiple scopes associated with a variety of different functions. Your resource can control access to the web API at runtime, by evaluating the scope (`scp`) claim(s) in the received OAuth 2.0 access token.
180180
>

articles/azure-policy/assign-policy-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ In this quickstart, we create a policy assignment and assign the *Audit Virtual
5858
5. Provide a display **Name** for the policy assignment. In this case, let’s use *Audit VMs that do not use managed disks*. You can also add an optional **Description**. The description provides details about how this policy assignment identifies all virtual machines created in this environment that do not use managed disks.
5959
6. Change the pricing tier to **Standard** to ensure that the policy gets applied to existing resources.
6060

61-
There are two pricing tiers within Azure Policy – *Free* and *Standard*. With the Free tier, you can only enforce policies on future resources, while with Standard, you can also enforce them on existing resources to better understand your compliance state. Because we are in Limited Preview, we have not yet released a pricing model, so you will not receive a bill for selecting *Standard*. To read more about pricing, look at: [Azure Policy pricing](https://acom-milestone-ignite.azurewebsites.net/pricing/details/azure-policy/).
61+
There are two pricing tiers within Azure Policy – *Free* and *Standard*. With the Free tier, you can only enforce policies on future resources, while with Standard, you can also enforce them on existing resources to better understand your compliance state. Because we are in Limited Preview, we have not yet released a pricing model, so you will not receive a bill for selecting *Standard*. To read more about pricing, look at: [Azure Policy pricing](https://azure.microsoft.com/pricing/details/azure-policy/).
6262

6363
7. Select the **Scope** you would like the policy to be applied to. A scope determines what resources or grouping of resources the policy assignment gets enforced on. It could range from a subscription to resource groups.
6464
8. Select the subscription (or resource group) you previously registered when you opted into Azure Policy. In this example, we are using this subscription - **Azure Analytics Capacity Dev**, but your options will differ.

articles/event-grid/concepts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The main concepts in Azure Event Grid are:
1717

1818
## Events
1919

20-
An event is the smallest amount of information that fully describes something that happened in the system. Every event has common information like: source of the event, time the event took place, and unique identifier. Every event also has specific information that is only relevant to the specific event. For example, an event about a new file being created in Azure Storage contains details about the file, such as the lastTimeModified value. Or, an event about a virtual machine rebooting contains the name of the virtual machine, and the reason for reboot. Each event is limited to 64 KB of data.
20+
An event is the smallest amount of information that fully describes something that happened in the system. Every event has common information like: source of the event, time the event took place, and unique identifier. Every event also has specific information that is only relevant to the specific type of event. For example, an event about a new file being created in Azure Storage contains details about the file, such as the `lastTimeModified` value. Or, an event about a virtual machine rebooting contains the name of the virtual machine, and the reason for reboot. Each event is limited to 64 KB of data.
2121

2222
## Event sources/publishers
2323

@@ -43,7 +43,7 @@ When subscribing to a topic, you can filter the events that are sent to the endp
4343

4444
## Security
4545

46-
Event provides security for subscribing to topics, and publishing topics. When subscribing, you must have adequate permissions on the resource or topic. When publishing, you must have a SAS token or key authentication for the topic. For more information, see [Event Grid security and authentication](security-authentication.md).
46+
Event Grid provides security for subscribing to topics, and publishing topics. When subscribing, you must have adequate permissions on the resource or topic. When publishing, you must have a SAS token or key authentication for the topic. For more information, see [Event Grid security and authentication](security-authentication.md).
4747

4848
## Failed delivery
4949

@@ -52,4 +52,4 @@ When Event Grid cannot confirm that an event has been received by the subscriber
5252
## Next steps
5353

5454
* For an introduction to Event Grid, see [About Event Grid](overview.md).
55-
* To quickly get started using Event Grid, see [Create and route custom events with Azure Event Grid](custom-event-quickstart.md).
55+
* To quickly get started using Event Grid, see [Create and route custom events with Azure Event Grid](custom-event-quickstart.md).

articles/virtual-machines/linux/terraform-install-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.author: echuvyrov
2323
Terraform provides an easy way to define, preview, and deploy cloud infrastructure by using a [simple templating language](https://www.terraform.io/docs/configuration/syntax.html). This article describes the necessary steps to use Terraform to provision resources in Azure.
2424

2525
> [!TIP]
26-
To learn more about how to use Terraform with Azure, visit the [Terraform Hub](/azure/terraform). Terraform is installed by default in the [Cloud Shell](/terraform/terraform-cloud-shell). By using Cloud Shell, you can skip the install/setup portions of this document.
26+
To learn more about how to use Terraform with Azure, visit the [Terraform Hub](/azure/terraform). Terraform is installed by default in the [Cloud Shell](/azure/terraform/terraform-cloud-shell). By using Cloud Shell, you can skip the install/setup portions of this document.
2727

2828
## Install Terraform
2929

articles/virtual-machines/windows/nested-virtualization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Follow the steps below to configure DHCP on the host virtual machine for dynamic
139139

140140
2. In wizard, click **Next** until the Server Roles page.
141141

142-
3. Click to select the **DHCP Server** checkbox, click **Add Features**, and then click**Next** until you complete the wizard.
142+
3. Click to select the **DHCP Server** checkbox, click **Add Features**, and then click **Next** until you complete the wizard.
143143

144144
4. Click **Install**.
145145

@@ -158,7 +158,7 @@ Follow the steps below to configure DHCP on the host virtual machine for dynamic
158158
6. Click **Next** until the wizard completes, leaving all default values, then click **Finish**.
159159

160160
### Option 2: Manually set a static IP address on the guest virtual machine
161-
If you did not configure DHCP to dynamically assign an IP address toe the guest virtual machine, follow these steps to set a static IP address.
161+
If you did not configure DHCP to dynamically assign an IP address to the guest virtual machine, follow these steps to set a static IP address.
162162

163163
1. On the Azure VM, open PowerShell as an Administrator.
164164

0 commit comments

Comments
 (0)