Skip to content

Commit 15989cb

Browse files
author
duongau
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into fdhttpheaders
2 parents 3cd3458 + 82942bc commit 15989cb

27 files changed

+393
-182
lines changed

articles/attestation/quickstart-template.md

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-resource-manager
77
ms.topic: quickstart
88
ms.custom: subject-armqs
99
ms.author: mbaldwin
10-
ms.date: 08/31/2020
10+
ms.date: 10/16/2020
1111
---
1212

1313
# Quickstart: Create an Azure Attestation provider with an ARM template
@@ -20,56 +20,18 @@ If your environment meets the prerequisites and you're familiar with using ARM t
2020

2121
[![Deploy To Azure](../media/template-deployments/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-attestation-provider-create%2Fazuredeploy.json)
2222

23+
## Prerequisites
24+
25+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2326

2427
## Review the template
2528

2629
The template used in this quickstart is from [Azure Quickstart Templates](https://azure.microsoft.com/resources/templates/101-attestation-provider-create).
2730

28-
```json
29-
{
30-
"$schema": "https://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#",
31-
"contentVersion": "1.0.0.0",
32-
"parameters": {
33-
"name": {
34-
"type": "string"
35-
},
36-
"location": {
37-
"type": "string"
38-
},
39-
"tags": {
40-
"type": "Object"
41-
},
42-
"policySigningCertificates": {
43-
"type": "string"
44-
}
45-
},
46-
"variables": {
47-
"PolicySigningCertificates": {
48-
"PolicySigningCertificates": {
49-
"keys": [
50-
{
51-
"kty": "RSA",
52-
"use": "sig",
53-
"x5c": [ "[parameters('policySigningCertificates')]" ]
54-
}
55-
]
56-
}
57-
}
58-
},
59-
"resources": [
60-
{
61-
"apiVersion": "2018-09-01-preview",
62-
"name": "[parameters('name')]",
63-
"location": "[parameters('location')]",
64-
"type": "Microsoft.Attestation/attestationProviders",
65-
"tags": "[parameters('tags')]",
66-
"Properties": "[if(empty(parameters('policySigningCertificates')), json('{}'), variables('PolicySigningCertificates'))]"
67-
}
68-
]
69-
}
70-
```
31+
:::code language="json" source="~/quickstart-templates/101-attestation-provider-create/azuredeploy.json":::
7132

7233
Azure resources defined in the template:
34+
7335
- Microsoft.Attestation/attestationProviders
7436

7537
## Deploy the template
@@ -78,15 +40,15 @@ Azure resources defined in the template:
7840

7941
[![Deploy To Azure](../media/template-deployments/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-attestation-provider-create%2Fazuredeploy.json)
8042

81-
2. Select or enter the following values.
43+
1. Select or enter the following values.
8244

8345
Unless it's specified, use the default value to create the attestation provider.
8446

85-
* **name**: Select a name for your Azure Attestation provider.
86-
* **location**: Select a location. For example, **Central US**.
87-
* **tags**: select a location. For example, **Central US**.
47+
- **Attestation Provider Name**: Select a name for your Azure Attestation provider.
48+
- **Location**: Select a location. For example, **Central US**.
49+
- **Tags**: Select a location. For example, **Central US**.
8850

89-
3. Select **Purchase**. After the attestation resource has been deployed successfully, you get a notification:
51+
1. Select **Purchase**. After the attestation resource has been deployed successfully, you get a notification.
9052

9153
The Azure portal is used to deploy the template. In addition to the Azure portal, you can also use the Azure PowerShell, Azure CLI, and REST API. To learn other deployment methods, see [Deploy templates](../azure-resource-manager/templates/deploy-powershell.md).
9254

@@ -98,7 +60,7 @@ You can use the Azure portal to check the attestation resource.
9860

9961
Other Azure Attestation build upon this quickstart. If you plan to continue on to work with subsequent quickstarts and tutorials, you may wish to leave these resources in place.
10062

101-
When no longer needed, delete the resource group, which deletes the Attestation resource . To delete the resource group by using Azure CLI or Azure PowerShell:
63+
When no longer needed, delete the resource group, which deletes the Attestation resource. To delete the resource group by using Azure CLI or Azure PowerShell:
10264

10365
# [CLI](#tab/CLI)
10466

@@ -121,4 +83,4 @@ Write-Host "Press [ENTER] to continue..."
12183

12284
## Next steps
12385

124-
In this quickstart, you created an attestation resource using an ARM template, and validated the deployment. To learn more about Azure Attestation, see [Overview of Azure Attestation](overview.md).
86+
In this quickstart, you created an attestation resource using an ARM template, and validated the deployment. To learn more about Azure Attestation, see [Overview of Azure Attestation](overview.md).

articles/attestation/toc.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
- name: About Microsoft Azure Attestation
66
href: overview.md
77
- name: Quickstarts
8-
items:
8+
items:
99
- name: ARM template
10+
displayName: Resource Manager
1011
href: quickstart-template.md
1112
- name: PowerShell
1213
href: quickstart-powershell.md
@@ -39,7 +40,7 @@
3940
- name: FAQ
4041
href: faq.md
4142
- name: REST
42-
href: /rest/api/attestation/
43+
href: /rest/api/attestation/
4344
- name: Azure PowerShell
4445
href: /powershell/module/az.attestation/?view=azps-4.3.0#attestation
4546
- name: Azure DCAP library for Windows
@@ -48,5 +49,3 @@
4849
href: https://packages.microsoft.com/ubuntu/18.04/prod/pool/main/a/az-dcap-client/
4950
- name: VBS attestation protocol
5051
href: virtualization-based-security-protocol.md
51-
52-

articles/azure-arc/data/show-configuration-postgresql-hyperscale-server-group.md

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,18 @@ By default, the prefix of the name of a PVC indicates its usage:
107107
For example:
108108

109109
```output
110-
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
111-
backups-postgres01-0 Bound local-pv-485e37db 1938Gi RWO local-storage 6d6h
112-
backups-postgres01-1 Bound local-pv-9d3d4a15 1938Gi RWO local-storage 6d6h
113-
backups-postgres01-2 Bound local-pv-7b8dd819 1938Gi RWO local-storage 6d6h
110+
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
111+
backups-few7hh0k4npx9phsiobdc3hq-postgres01-0 Bound local-pv-485e37db 1938Gi RWO local-storage 6d6h
112+
backups-few7hh0k4npx9phsiobdc3hq-postgres01-1 Bound local-pv-9d3d4a15 1938Gi RWO local-storage 6d6h
113+
backups-few7hh0k4npx9phsiobdc3hq-postgres01-2 Bound local-pv-7b8dd819 1938Gi RWO local-storage 6d6h
114114
...
115-
data-postgres01-0 Bound local-pv-3c1a8cc5 1938Gi RWO local-storage 6d6h
116-
data-postgres01-1 Bound local-pv-8303ab19 1938Gi RWO local-storage 6d6h
117-
data-postgres01-2 Bound local-pv-55572fe6 1938Gi RWO local-storage 6d6h
115+
data-few7hh0k4npx9phsiobdc3hq-postgres01-0 Bound local-pv-3c1a8cc5 1938Gi RWO local-storage 6d6h
116+
data-few7hh0k4npx9phsiobdc3hq-postgres01-1 Bound local-pv-8303ab19 1938Gi RWO local-storage 6d6h
117+
data-few7hh0k4npx9phsiobdc3hq-postgres01-2 Bound local-pv-55572fe6 1938Gi RWO local-storage 6d6h
118118
...
119-
logs-postgres01-0 Bound local-pv-5e852b76 1938Gi RWO local-storage 6d6h
120-
logs-postgres01-1 Bound local-pv-55d309a7 1938Gi RWO local-storage 6d6h
121-
logs-postgres01-2 Bound local-pv-5ccd02e6 1938Gi RWO local-storage 6d6h
119+
logs-few7hh0k4npx9phsiobdc3hq-postgres01-0 Bound local-pv-5e852b76 1938Gi RWO local-storage 6d6h
120+
logs-few7hh0k4npx9phsiobdc3hq-postgres01-1 Bound local-pv-55d309a7 1938Gi RWO local-storage 6d6h
121+
logs-few7hh0k4npx9phsiobdc3hq-postgres01-2 Bound local-pv-5ccd02e6 1938Gi RWO local-storage 6d6h
122122
...
123123
```
124124

@@ -292,26 +292,6 @@ Returns the below output in a format and content very similar to the one returne
292292
"uid": "8a9cd118-361b-4a2e-8a9d-5f9257bf6abb"
293293
},
294294
"spec": {
295-
"backups": {
296-
"deltaMinutes": 3,
297-
"fullMinutes": 10,
298-
"tiers": [
299-
{
300-
"retention": {
301-
"maximums": [
302-
"6",
303-
"512MB"
304-
],
305-
"minimums": [
306-
"3"
307-
]
308-
},
309-
"storage": {
310-
"volumeSize": "1Gi"
311-
}
312-
}
313-
]
314-
},
315295
"engine": {
316296
"extensions": [
317297
{

articles/azure-signalr/signalr-quickstart-dotnet-core.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,13 @@ In this section, you'll add the [Secret Manager tool](https://docs.microsoft.com
102102
This secret is accessed with the Configuration API. A colon (:) works in the configuration name with the Configuration API on all supported platforms. See [Configuration by environment](/dotnet/core/extensions/configuration-providers#environment-variable-configuration-provider).
103103
104104
105-
4. Open *Startup.cs* and update the `ConfigureServices` method to use Azure SignalR Service by calling the `AddSignalR()` method:
105+
4. Open *Startup.cs* and update the `ConfigureServices` method to use Azure SignalR Service by calling the `AddSignalR()` and `AddAzureSignalR()` methods:
106106
107107
```csharp
108108
public void ConfigureServices(IServiceCollection services)
109109
{
110-
services.AddAzureSignalR();
110+
services.AddSignalR()
111+
.AddAzureSignalR();
111112
}
112113
```
113114

articles/communication-services/quickstarts/telephony-sms/get-phone-number.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ To begin provisioning numbers, go to your Communication Services resource on the
3131

3232
### Getting new phone numbers
3333

34-
Navigate to the Phone Numbers blade in the resource menu.
34+
Navigate to the **Phone Numbers** blade in the resource menu.
3535

3636
:::image type="content" source="../media/manage-phone-azure-portal-phone-page.png" alt-text="Screenshot showing a Communication Services resource's phone page.":::
3737

38-
Press the `Get` button to launch the wizard. The wizard on the `Phone numbers` blade will walk you through a series of questions that helps you choose the phone number that best fits your scenario.
38+
Press the **Get** button to launch the wizard. The wizard on the **Phone numbers** blade will walk you through a series of questions that helps you choose the phone number that best fits your scenario.
3939

40-
You will first need to choose the `Country/region` where you would like to provision the phone number. After selecting the Country/region, you will then need to select the `use case` which best suites your needs.
40+
You will first need to choose the **Country/region** where you would like to provision the phone number. After selecting the Country/region, you will then need to select the **Use case** which best suites your needs.
4141

4242
:::image type="content" source="../media/manage-phone-azure-portal-get-numbers.png" alt-text="Screenshot showing the Get phone numbers view.":::
4343

@@ -48,32 +48,32 @@ Configuring your phone number is broken down into two steps:
4848
1. The selection of the [number type](../../concepts/telephony-sms/plan-solution.md#phone-number-types-in-azure-communication-services)
4949
2. The selection of the [number features](../../concepts/telephony-sms/plan-solution.md#phone-number-features-in-azure-communication-services)
5050

51-
You can select from two phone number types: `Geographic`, and `Toll-free`. When you've selected a number type, you can then choose the feature.
51+
You can select from two phone number types: **Geographic**, and **Toll-free**. When you've selected a number type, you can then choose the feature.
5252

53-
In our example, we've selected a `Toll-free` number type with the `Outbound calling` and `Inbound and Outbound SMS` features.
53+
In our example, we've selected a **Toll-free** number type with the **Outbound calling** and **Inbound and Outbound SMS** features.
5454

5555
:::image type="content" source="../media/manage-phone-azure-portal-select-plans.png" alt-text="Screenshot showing the Select features view.":::
5656

57-
From here, click the `Next: Numbers` button at the bottom of the page to customize the phone number(s) you would like to provision.
57+
From here, click the **Next: Numbers** button at the bottom of the page to customize the phone number(s) you would like to provision.
5858

5959
### Customizing phone numbers
6060

61-
On the `Numbers` page, you will customize the phone number(s) which you'd like to provision.
61+
On the **Numbers** page, you will customize the phone number(s) which you'd like to provision.
6262

6363
:::image type="content" source="../media/manage-phone-azure-portal-select-numbers-start.png" alt-text="Screenshot showing the Numbers selection page.":::
6464

6565
> [!NOTE]
66-
> This quickstart is showing the `Toll-free` Number type customization flow. The experience may be slightly different if you have chosen the `Geographic` Number type, but the end-result will be the same.
66+
> This quickstart is showing the **Toll-free** Number type customization flow. The experience may be slightly different if you have chosen the **Geographic** Number type, but the end-result will be the same.
6767
68-
Choose the `Area code` from the list of available Area codes and enter the quantity which you'd like to provision, then click `Search` to find numbers which meet your selected requirements. The phone numbers which meet your needs will be shown along with their monthly cost.
68+
Choose the **Area code** from the list of available Area codes and enter the quantity which you'd like to provision, then click **Search** to find numbers which meet your selected requirements. The phone numbers which meet your needs will be shown along with their monthly cost.
6969

7070
:::image type="content" source="../media/manage-phone-azure-portal-found-numbers.png" alt-text="Screenshot showing the Numbers selection page with reserved numbers.":::
7171

7272
> [!NOTE]
7373
> Availability depends on the Number type, location, and the features that you have selected.
7474
> Numbers are reserved for a short time before the transaction expires. If the transaction expires, you will need to re-select the numbers.
7575
76-
To view the purchase summary and place your order, click the `Next: Summary` button at the bottom of the page.
76+
To view the purchase summary and place your order, click the **Next: Summary** button at the bottom of the page.
7777

7878
### Place order
7979

@@ -82,7 +82,7 @@ The summary page will review the Number type, Features, Phone Numbers, and Total
8282
> [!NOTE]
8383
> The prices shown are the **monthly recurring charges** which cover the cost of leasing the selected phone number to you. Not included in this view is the **Pay-as-you-go costs** which are incurred when you make or receive calls. The price lists are [available here](../../concepts/pricing.md). These costs depend on number type and destinations called. For example, price-per-minute for a call from a Seattle regional number to a regional number in New York and a call from the same number to a UK mobile number may be different.
8484
85-
Finally, click `Place order` at the bottom of the page to confirm.
85+
Finally, click **Place order** at the bottom of the page to confirm.
8686

8787
:::image type="content" source="../media/manage-phone-azure-portal-get-numbers-summary.png" alt-text="Screenshot showing the Summary page with the Number type, Features, Phone Numbers, and Total monthly cost shown.":::
8888

@@ -102,11 +102,11 @@ Select the Phone Numbers blade in the menu to manage your phone numbers.
102102

103103
### Customizing phone numbers
104104

105-
On the `Numbers` page, you can select a phone number to configure it.
105+
On the **Numbers** page, you can select a phone number to configure it.
106106

107107
:::image type="content" source="../media/manage-phone-azure-portal-capability-update.png" alt-text="Screenshot showing the update features page.":::
108108

109-
Select the features from the available options, then click `Confirm` to apply your selection.
109+
Select the features from the available options, then click **Confirm** to apply your selection.
110110

111111
## Troubleshooting
112112

articles/communication-services/quickstarts/voice-video-calling/includes/get-started-ios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ You can build and run your app on iOS simulator by selecting **Product** > **Run
193193
You can make an outbound VOIP call by providing a user ID in the text field and tapping the **Start Call** button. Calling `8:echo123` connects you with an echo bot, this is great for getting started and verifying your audio devices are working.
194194

195195
> [!NOTE]
196-
> The first time you make a call, the system will prompt you for access to the microphone. In a production application, you should use the `AVAudioSession` API [check the permission status](https://developer.apple.com/documentation/uikit/protecting_the_user_s_privacy/requesting_access_to_protected_resources) and gracefully update your application's behavior when permission is not granted.
196+
> The first time you make a call, the system will prompt you for access to the microphone. In a production application, you should use the `AVAudioSession` API to [check the permission status](https://developer.apple.com/documentation/uikit/protecting_the_user_s_privacy/requesting_access_to_protected_resources) and gracefully update your application's behavior when permission is not granted.
197197
198198
## Sample Code
199199

articles/digital-twins/concepts-twins-graph.md

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,9 @@ Below is a snippet of client code that uses the [DigitalTwins APIs](how-to-use-a
4848

4949
In the current preview of Azure Digital Twins, all properties of a twin must be initialized before the twin can be created. This is done by creating a JSON document that provides the necessary initialization values.
5050

51-
```csharp
52-
public Task<boolean> CreateRoom(string id, double temperature, double humidity)
53-
{
54-
// Define the model for the twin to be created
55-
Dictionary<string, object> meta = new Dictionary<string, object>()
56-
{
57-
{ "$model", "dtmi:com:contoso:Room;2" }
58-
};
59-
// Initialize the twin properties
60-
Dictionary<string, object> initData = new Dictionary<string, object>()
61-
{
62-
{ "$metadata", meta },
63-
{ "Temperature", temperature},
64-
{ "Humidity", humidity},
65-
};
66-
try
67-
{
68-
await client.DigitalTwins.AddAsync(id, initData);
69-
return true;
70-
}
71-
catch (ErrorResponseException e)
72-
{
73-
Console.WriteLine($"*** Error creating twin {id}: {e.Response.StatusCode}");
74-
return false;
75-
}
76-
}
77-
```
51+
[!INCLUDE [Azure Digital Twins code: create twin](../../includes/digital-twins-code-create-twin.md)]
52+
53+
You can also use a helper class called `BasicDigitalTwin` to store property fields in a "twin" object more directly, as an alternative to using a dictionary. For more information about the helper class and examples of its use, see the [*Create a digital twin*](how-to-manage-twin.md#create-a-digital-twin) section of *How-to: Manage digital twins*.
7854

7955
### Create relationships
8056

articles/digital-twins/how-to-manage-twin.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,7 @@ You can create a parameter object either manually, or by using a provided helper
5555

5656
Without the use of any custom helper classes, you can represent a twin's properties in a `Dictionary<string, object>`, where the `string` is the name of the property and the `object` is an object representing the property and its value.
5757

58-
```csharp
59-
// Define the model type for the twin to be created
60-
Dictionary<string, object> meta = new Dictionary<string, object>()
61-
{
62-
{ "$model", "dtmi:com:contoso:Room;1" }
63-
};
64-
// Initialize the twin properties
65-
Dictionary<string, object> twin = new Dictionary<string, object>()
66-
{
67-
{ "$metadata", meta },
68-
{ "Temperature", temperature},
69-
{ "Humidity", humidity},
70-
};
71-
client.CreateDigitalTwin("myNewRoomID", JsonSerializer.Serialize<Dictionary<string, object>>(twin));
72-
```
58+
[!INCLUDE [Azure Digital Twins code: create twin](../../includes/digital-twins-code-create-twin.md)]
7359

7460
#### Create twins with the helper class
7561

0 commit comments

Comments
 (0)