Skip to content

Commit 126a2f0

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into davidbel-AzFiles-clarification
2 parents 3c5fc9f + 837fbf3 commit 126a2f0

File tree

11 files changed

+216
-57
lines changed

11 files changed

+216
-57
lines changed

articles/active-directory/develop/v2-oauth2-on-behalf-of-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ A service-to-service request for a SAML assertion contains the following paramet
213213

214214
The response contains a SAML token encoded in UTF8 and Base64url.
215215

216-
- **SubjectConfirmationData for a SAML assertion sourced from an OBO call**: If the target application requires a recipient value in **SubjectConfirmationData**, then the value must be a non-wildcard Reply URL in the resource application configuration.
217-
- **The SubjectConfirmationData node**: The node can't contain an **InResponseTo** attribute since it's not part of a SAML response. The application receiving the SAML token must be able to accept the SAML assertion without an **InResponseTo** attribute.
216+
- **SubjectConfirmationData for a SAML assertion sourced from an OBO call**: If the target application requires a `Recipient` value in `SubjectConfirmationData`, then the value must be configured as the first non-wildcard Reply URL in the resource application configuration. Since the default Reply URL isn't used to determine the `Recipient` value, you might have to reorder the Reply URLs in the application configuration.
217+
- **The SubjectConfirmationData node**: The node can't contain an `InResponseTo` attribute since it's not part of a SAML response. The application receiving the SAML token must be able to accept the SAML assertion without an `InResponseTo` attribute.
218218
- **API permissions**: You have to [add the necessary API permissions](quickstart-configure-app-access-web-apis.md) on the middle-tier application to allow access to the SAML application, so that it can request a token for the `/.default` scope of the SAML application.
219219
- **Consent**: Consent must have been granted to receive a SAML token containing user data on an OAuth flow. For information, see [Gaining consent for the middle-tier application](#gaining-consent-for-the-middle-tier-application) below.
220220

articles/cognitive-services/Translator/quickstart-translator.md

Lines changed: 188 additions & 24 deletions
Large diffs are not rendered by default.

articles/cosmos-db/analytical-store-introduction.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +407,15 @@ Analytical store relies on Azure Storage and offers the following protection aga
407407
Although analytical store has built-in protection against physical failures, backup can be necessary for accidental deletes or updates in transactional store. In those cases, you can restore a container and use the restored container to backfill the data in the original container, or fully rebuild analytical store if necessary.
408408

409409
> [!NOTE]
410-
> Currently analytical store isn't backuped and can't be restored, and your backup policy can't be planned relying on that.
410+
> Currently analytical store isn't backuped and can't be restored, and your backup policy can't be planned relying on that.
411411
412412
Synapse Link, and analytical store by consequence, has different compatibility levels with Azure Cosmos DB backup modes:
413413

414-
* Periodic backup mode is fully compatible with Synapse Link and these 2 features can be used in the same database account without any restriction.
414+
* Periodic backup mode is fully compatible with Synapse Link and these 2 features can be used in the same database account.
415415
* Continuous backup mode isn't fully supported yet:
416-
* Currently continuous backup mode can't be used in database accounts with Synapse Link enabled.
417-
* Currently database accounts with continuous backup mode enabled can enable Synapse Link through a support case.
418-
* Currently new database accounts can be created with continous backup mode and Synapse Link enabled, using Azure CLI or PowerShell. Those two features must be turned on at the same time, in the exact same command that creates the database account.
416+
* Database accounts with Synapse Link enabled currently can't use continuous backup mode.
417+
* Database accounts with continuous backup mode enabled can enable Synapse Link through a support case. This capability is in preview now.
418+
* Database accounts that have neither continuous backup nor Synapse Link enabled can use these two features together through a support case. This capability is in preview now.
419419

420420
### Backup Polices
421421

articles/cosmos-db/continuous-backup-restore-introduction.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ Currently the point in time restore functionality has the following limitations:
132132

133133
* Multi-regions write accounts aren't supported.
134134

135-
* Azure Synapse Link and periodic backup mode can coexist in the same database account. However, analytical store data isn't included in backups and restores. When Azure Synapse Link is enabled, Azure Cosmos DB will continue to automatically take backups of your data in the transactional store at a scheduled backup interval.
136-
137-
* Azure Synapse Link and continuous backup mode can't coexist in the same database account. Currently database accounts with Azure Synapse Link enabled can't use continuous backup mode and vice-versa.
135+
* Currently Synapse Link isn't fully compatible with continuous backup mode. Click [here](analytical-store-introduction.md#backup) for more information.
138136

139137
* The restored account is created in the same region where your source account exists. You can't restore an account into a region where the source account didn't exist.
140138

articles/cosmos-db/synapse-link.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,9 @@ Synapse Link isn't recommended if you're looking for traditional data warehouse
116116

117117
* Enabling Synapse Link on existing Cosmos DB containers is only supported for SQL API accounts. Synapse Link can be enabled on new containers for both SQL API and MongoDB API accounts.
118118

119-
* Backup and restore:
120-
* You can recreate your analytical store data in some scenarios as below. In this mode, your transactional store data will be automatically backed up. If `transactional TTL` is equal or greater than your `analytical TTL` on your container, you can fully recreate your analytical store data by enabling analytical store on the restored container:
121-
- Azure Synapse Link can be enabled on accounts configured with periodic backups.
122-
- If continuous backup (point-in-time restore) is enabled on your account, you can now restore your analytical data. To enable Synapse Link for such accounts, please reach out to [email protected]. This is applicable only for SQL API.
123-
* Restoring analytical data is not supported in following scenarios, for SQL API and API for Mongo DB:
124-
- If you already enabled Synapse Link on your database account, you cannot enable point-in-time restore on such accounts.
125-
- If `analytical TTL` is greater than `transactional TTL`, data that only exists in analytical store cannot be restored. You can continue to access full data from analytical store in the parent region.
119+
* Although analytical store data is not backed up, and therefore cannot be restored, you can rebuild your analytical store by reenabling Synapse Link in the restored container. Click [here](analytical-store-introduction.md#backup) for more information.
120+
121+
* Currently Synapse Link isn't fully compatible with continuous backup mode. Click [here](analytical-store-introduction.md#backup) for more information.
126122

127123
* Granular Role-based Access (RBAC)s isn't supported when querying from Synapse. Users that have access to your Synapse workspace and have access to the Cosmos DB account can access all containers within that account. We currently don't support more granular access to the containers.
128124

articles/iot-edge/configure-connect-verify-gpu.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ We'll use the Azure portal, the Azure Cloud Shell, and your VM's command line to
2121

2222
## Prerequisites
2323

24-
* Azure account - [create a free account](https://azure.microsoft.com/account/free)
24+
* Azure account - [create a free account](https://azure.microsoft.com/free/search/)
2525

26-
* Azure IoT Hub - [create an IoT Hub](https://azure.microsoft.com/services/iot_hub)
26+
* Azure IoT Hub - [create an IoT Hub](https://azure.microsoft.com/services/iot-hub/#overview)
2727

2828
* Azure IoT Edge device
2929

@@ -33,7 +33,7 @@ We'll use the Azure portal, the Azure Cloud Shell, and your VM's command line to
3333
az iot hub device-identity create --device-id <YOUR-DEVICE-NAME> --edge-enabled --hub-name <YOUR-IOT-HUB-NAME>
3434
```
3535

36-
For more information on creating an IoT Edge device, see [Quickstart: Deploy your first IoT Edge module to a virtual Linux device](/quickstart-linux). Later in this tutorial, we'll add an NVIDIA module to our IoT Edge device.
36+
For more information on creating an IoT Edge device, see [Quickstart: Deploy your first IoT Edge module to a virtual Linux device](quickstart-linux.md). Later in this tutorial, we'll add an NVIDIA module to our IoT Edge device.
3737

3838
## Create a GPU-optimized virtual machine
3939

articles/iot-hub/iot-hub-csharp-csharp-twin-getstarted.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ In this article, you create these .NET console apps:
4848

4949
In this section, you create a .NET console app, using C#, that adds location metadata to the device twin associated with **myDeviceId**. It then queries the device twins stored in the IoT hub selecting the devices located in the US, and then the ones that reported a cellular connection.
5050

51-
1. In Visual Studio, select **Create a new project**. In **Create new project**, select **Console App (.NET Framework)**, and then select **Next**.
51+
1. In Visual Studio, select **File > New > Project**. In **Create a new project**, select **Console App (.NET Framework)**, and then select **Next**.
5252

53-
1. In **Configure your new project**, name the project **AddTagsAndQuery**.
53+
1. In **Configure your new project**, name the project **AddTagsAndQuery**, the select **Next**.
5454

55-
![Configure your AddTagsAndQuery project](./media/iot-hub-csharp-csharp-twin-getstarted/config-addtagsandquery-app.png)
55+
:::image type="content" source="./media/iot-hub-csharp-csharp-twin-getstarted/config-addtagsandquery-app.png" alt-text="Screenshot of how to create a new Visual Studio project." lightbox="./media/iot-hub-csharp-csharp-twin-getstarted/config-addtagsandquery-app.png":::
56+
57+
1. Accept the default version of the .NET Framework, then select **Create** to create the project.
5658

5759
1. In Solution Explorer, right-click the **AddTagsAndQuery** project, and then select **Manage NuGet Packages**.
5860

553 Bytes
Loading

articles/virtual-machines/disks-types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ With Premium SSD v2 disks, you can individually set the capacity, throughput, an
111111

112112
#### Premium SSD v2 capacities
113113

114-
Premium SSD v2 capacities range from 1 GiB to 64 TiB, in 1-GiB increments. You're billed on a per GiB ratio, see the [pricing page](https://azure.microsoft.com/pricing/details/managed-disks/) for details.
114+
Premium SSD v2 capacities range from 1 GiB to 64 TiBs, in 1-GiB increments. You're billed on a per GiB ratio, see the [pricing page](https://azure.microsoft.com/pricing/details/managed-disks/) for details.
115115

116-
Premium SSD v2 offers up to 32 TiB per region per subscription by default in the public preview, but supports higher capacity by request. To request an increase in capacity, request a quota increase or contact Azure Support.
116+
Premium SSD v2 offers up to 32 TiBs per region per subscription by default in the public preview, but supports higher capacity by request. To request an increase in capacity, request a quota increase or contact Azure Support.
117117

118118
#### Premium SSD v2 IOPS
119119

120-
All Premium SSD v2 disks have a baseline IOPS of 3000 that is free of charge. After 6 GiB, the maximum IOPS a disk can have increases at a rate of 500 per GiB, up to 80,000 IOPS. So an 8 GiB disk can have up to 4,000 IOPS, and a 10 GiB can have up to 5,000 IOPS. To be able to set 80,000 IOPS on a disk, that disk must have at least 160 GiB. Increasing your IOPS beyond 3000 increases the price of your disk.
120+
All Premium SSD v2 disks have a baseline IOPS of 3000 that is free of charge. After 6 GiB, the maximum IOPS a disk can have increases at a rate of 500 per GiB, up to 80,000 IOPS. So an 8 GiB disk can have up to 4,000 IOPS, and a 10 GiB can have up to 5,000 IOPS. To be able to set 80,000 IOPS on a disk, that disk must have at least 160 GiBs. Increasing your IOPS beyond 3000 increases the price of your disk.
121121

122122
#### Premium SSD v2 throughput
123123

@@ -132,7 +132,7 @@ The following table provides a comparison of disk capacities and performance max
132132

133133
|Disk Size |Maximum available IOPS |Maximum available throughput (MB/s) |
134134
|---------|---------|---------|
135-
|1 GiB-64 TiB |3,000-80,000 (Increases by 500 IOPS per GiB) |125-1,200 (increases by 0.25 MB/s per set IOPS) |
135+
|1 GiB-64 TiBs |3,000-80,000 (Increases by 500 IOPS per GiB) |125-1,200 (increases by 0.25 MB/s per set IOPS) |
136136

137137
To deploy a Premium SSD v2, see [Deploy a Premium SSD v2 (preview)](disks-deploy-premium-v2.md).
138138

includes/iot-hub-include-find-custom-connection-string.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ To create a shared access policy that grants **service connect** and **registry
1717

1818
1. On the left-side pane of your hub, select **Shared access policies**.
1919

20-
1. From the top menu above the list of policies, select **Add**.
20+
1. From the top menu above the list of policies, select **Add shared policy access policy**.
2121

22-
1. Under **Add shared access policy**, enter a descriptive name for your policy, such as *serviceAndRegistryRead*. Under **Permissions**, select **Registry read** and **Service connect**, and then select **Add**.
22+
1. In the **Add shared access policy** pane on the right, enter a descriptive name for your policy, such as *serviceAndRegistryRead*. Under **Permissions**, select **Registry Read** and **Service Connect**, and then select **Add**.
2323

24-
:::image type="content" source="./media/iot-hub-include-find-custom-connection-string/iot-hub-add-custom-policy.png" alt-text="Screen capture that shows how to add a new shared access policy" border="true":::
24+
:::image type="content" source="./media/iot-hub-include-find-custom-connection-string/iot-hub-add-custom-policy.png" alt-text="Screen capture that shows how to add a new shared access policy." border="true" lightbox="./media/iot-hub-include-find-custom-connection-string/iot-hub-add-custom-policy.png":::
2525

2626
1. Select your new policy from the list of policies.
2727

2828
1. Select the copy icon for the **Primary connection string** and save the value.
2929

30-
:::image type="content" source="./media/iot-hub-include-find-custom-connection-string/iot-hub-get-connection-string.png" alt-text="Screen capture that shows how to retrieve the connection string" border="true":::
30+
:::image type="content" source="./media/iot-hub-include-find-custom-connection-string/iot-hub-get-connection-string.png" alt-text="Screen capture that shows how to retrieve the connection string." border="true" lightbox="./media/iot-hub-include-find-custom-connection-string/iot-hub-get-connection-string.png":::
3131

3232
For more information about IoT Hub shared access policies and permissions, see [Access control and permissions](../articles/iot-hub/iot-hub-dev-guide-sas.md#access-control-and-permissions).

0 commit comments

Comments
 (0)