Skip to content

Commit b9b3956

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-secureScoreEnhanced
2 parents 4de4106 + c6365f2 commit b9b3956

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

articles/data-factory/quickstart-create-data-factory-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.author: jingwang
2424
This quickstart describes how to use the Azure Data Factory UI to create and monitor a data factory. The pipeline that you create in this data factory *copies* data from one folder to another folder in Azure Blob storage. To *transform* data by using Azure Data Factory, see [Mapping data flow](concepts-data-flow-overview.md) and [Wrangling data flow (Preview)](wrangling-data-flow-overview.md).
2525

2626
> [!NOTE]
27-
> If you are new to Azure Data Factory, see [Introduction to Azure Data Factory](data-factory-introduction.md) before doing this quickstart.
27+
> If you are new to Azure Data Factory, see [Introduction to Azure Data Factory](introduction.md) before doing this quickstart.
2828
2929
[!INCLUDE [data-factory-quickstart-prerequisites](../../includes/data-factory-quickstart-prerequisites.md)]
3030

articles/storage/common/storage-redundancy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The following table indicates whether your data is durable and available in a gi
155155
| Outage scenario | LRS | ZRS | GRS/RA-GRS | GZRS/RA-GZRS |
156156
| :------------------------------------------------------------------------------------------------------- | :------------------------------ | :------------------------------- | :----------------------------------- | :----------------------------------- |
157157
| A node within a data center becomes unavailable | Yes | Yes | Yes | Yes |
158-
| An entire data center (zonal or non-zonal) becomes unavailable | No | Yes | Yes | Yes |
158+
| An entire data center (zonal or non-zonal) becomes unavailable | No | Yes | Yes<sup>1</sup> | Yes |
159159
| A region-wide outage occurs in the primary region | No | No | Yes<sup>1</sup> | Yes<sup>1</sup> |
160160
| Read access to the secondary region is available if the primary region becomes unavailable | No | No | Yes (with RA-GRS) | Yes (with RA-GZRS) |
161161

@@ -167,7 +167,7 @@ The following table shows which redundancy options are supported by each type of
167167

168168
| LRS | ZRS | GRS/RA-GRS | GZRS/RA-GZRS |
169169
| :------------------------------ | :------------------------------- | :----------------------------------- | :----------------------------------- |
170-
| GPv2, GPv1, BlockBlobStorage, BlobStorage, FileStorage | GPv2, BlockBlobStorage, FileStorage | GPv2, GPv1, BlobStorage | GPv2 |
170+
| General-purpose v2<br /> General-purpose v1<br /> Block blob storage<br /> Blob storage<br /> File storage | General-purpose v2<br /> Block blob storage<br /> File storage | General-purpose v2<br /> General-purpose v1<br /> Blob storage | General-purpose v2 |
171171

172172
All data for all storage accounts is copied according to the redundancy option for the storage account. Objects including block blobs, append blobs, page blobs, queues, tables, and files are copied. Data in all tiers, including the archive tier, is copied. For more information about blob tiers, see [Azure Blob storage: hot, cool, and archive access tiers](../blobs/storage-blob-storage-tiers.md).
173173

0 commit comments

Comments
 (0)