Skip to content

Commit b3fd157

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram-0312
2 parents b756207 + d5b2ecf commit b3fd157

15 files changed

+172
-251
lines changed

articles/active-directory/develop/quickstart-create-new-tenant.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: develop
1111
ms.workload: identity
1212
ms.topic: quickstart
13-
ms.date: 02/05/2019
13+
ms.date: 03/12/2020
1414
ms.author: ryanwi
1515
ms.reviewer: jmprieur
1616
ms.custom: aaddev, identityplatformtop40, fasttrack-edit
@@ -69,6 +69,6 @@ To begin building apps that sign in social and local accounts, you'll need to cr
6969

7070
## Next steps
7171

72-
* Try a coding quickstart and begin authenticating users.
73-
* For more in-depth code samples, check out the **Tutorials** section of the documentation.
74-
* Want to deploy your app to the cloud? Check out [deploying containers to Azure](https://docs.microsoft.com/azure/index?pivot=products&panel=containers).
72+
* [Register an app](quickstart-register-app.md) and integrate with Microsoft identity platform.
73+
* Learn the [basics of authentication](authentication-scenarios.md).
74+
* See [How Azure subscriptions are associated with Azure Active Directory](../fundamentals/active-directory-how-subscriptions-associated-directory.md) for details on the relationship between subscriptions and an Azure AD tenant.

articles/active-directory/develop/quickstart-register-app.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.subservice: develop
1010
ms.topic: quickstart
1111
ms.workload: identity
12-
ms.date: 03/09/2020
12+
ms.date: 03/12/2020
1313
ms.author: ryanwi
1414
ms.custom: aaddev, identityplatformtop40
1515
ms.reviewer: aragra, lenalepa, sureshja
@@ -18,11 +18,14 @@ ms.reviewer: aragra, lenalepa, sureshja
1818

1919
# Quickstart: Register an application with the Microsoft identity platform
2020

21-
In this quickstart, you register an application using the **App registrations** experience in the Azure portal. Your app is integrated with the Microsoft identity platform. Enterprise developers and software-as-a-service (SaaS) providers can develop commercial cloud services or line-of-business applications that can be integrated with Microsoft identity platform. Integration provides secure sign-in and authorization for such services.
21+
In this quickstart, you register an application using the **App registrations** experience in the Azure portal.
22+
23+
Your app is integrated with the Microsoft identity platform by registering it with an Azure Active Directory tenant. Enterprise developers and software-as-a-service (SaaS) providers can develop commercial cloud services or line-of-business applications that can be integrated with Microsoft identity platform. Integration provides secure sign-in and authorization for such services.
2224

2325
## Prerequisites
2426

2527
* An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).
28+
* An [Azure AD tentant](quickstart-create-new-tenant.md).
2629

2730
## Register a new application using the Azure portal
2831

@@ -56,9 +59,7 @@ Azure AD assigns a unique application, or client, ID to your app. The portal ope
5659

5760
## Next steps
5861

59-
Advance to the next article to learn how to access web APIs.
60-
> [!div class="nextstepaction"]
61-
> [Quickstart: Configure a client application to access web APIs](quickstart-configure-app-access-web-apis.md)
62+
* To access web APIs, see [Quickstart: Configure a client application to access web APIs](quickstart-configure-app-access-web-apis.md)
6263

6364
* To learn about the permissions, see [Permissions and consent in the Microsoft identity platform endpoint](v2-permissions-and-consent.md).
6465

articles/azure-databricks/what-is-azure-databricks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Azure Databricks is an Apache Spark-based analytics platform optimized for the M
1818

1919
![What is Azure Databricks?](./media/what-is-azure-databricks/azure-databricks-overview.png "What is Azure Databricks?")
2020

21-
Azure Databricks is a fast, easy, and collaborative Apache Spark-based analytics service. For a big data pipeline, the data (raw or structured) is ingested into Azure through Azure Data Factory in batches, or streamed near real-time using Kafka, Event Hub, or IoT Hub. This data lands in a data lake for long term persisted storage, in Azure Blob Storage or Azure Data Lake Storage. As part of your analytics workflow, use Azure Databricks to read data from multiple data sources such as [Azure Blob Storage](../storage/blobs/storage-blobs-introduction.md), [Azure Data Lake Storage](../data-lake-store/index.md), [Azure Cosmos DB](../cosmos-db/index.yml), or [Azure SQL Data Warehouse](../sql-data-warehouse/index.yml) and turn it into breakthrough insights using Spark.
21+
Azure Databricks is a fast, easy, and collaborative Apache Spark-based analytics service. For a big data pipeline, the data (raw or structured) is ingested into Azure through Azure Data Factory in batches, or streamed near real-time using Kafka, Event Hub, or IoT Hub. This data lands in a data lake for long term persisted storage, in Azure Blob Storage or Azure Data Lake Storage. As part of your analytics workflow, use Azure Databricks to read data from multiple data sources such as [Azure Blob Storage](../storage/blobs/storage-blobs-introduction.md), [Azure Data Lake Storage](../data-lake-store/index.yml), [Azure Cosmos DB](../cosmos-db/index.yml), or [Azure SQL Data Warehouse](../sql-data-warehouse/index.yml) and turn it into breakthrough insights using Spark.
2222

2323
![Databricks pipeline](./media/what-is-azure-databricks/databricks-pipeline.png)
2424

articles/azure-netapp-files/azure-netapp-files-faqs.md

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: conceptual
16-
ms.date: 03/06/2020
16+
ms.date: 03/13/2020
1717
ms.author: b-juche
1818
---
1919
# FAQs About Azure NetApp Files
@@ -55,7 +55,7 @@ All Azure NetApp Files volumes are encrypted using the FIPS 140-2 standard. All
5555

5656
Key management for Azure NetApp Files is handled by the service. A unique XTS-AES-256 data encryption key is generated for each volume. An encryption key hierarchy is used to encrypt and protect all volume keys. These encryption keys are never displayed or reported in an unencrypted format. Encryption keys are deleted immediately when a volume is deleted.
5757

58-
Support for user-managed keys (Bring Your Own Keys) using Azure Dedicated HSM is available on a controlled basis in the US East, US West2, and US South Central regions. Customer can request access at [email protected], and as capacity is available, requests will be approved.
58+
Support for user-managed keys (Bring Your Own Keys) using Azure Dedicated HSM is available on a controlled basis in the US East, US West2, and US South Central regions. You can request access at **[email protected]**. As capacity is available, requests will be approved.
5959

6060
### Can I configure the NFS export policy rules to control access to the Azure NetApp Files service mount target?
6161

@@ -159,6 +159,26 @@ Azure NetApp Files provides capacity pool and volume usage metrics. You can also
159159

160160
No. Azure NetApp Files is not supported by Azure Storage Explorer.
161161

162+
### How do I determine if a directory is approaching the limit size?
163+
164+
You can use the `stat` command from a client to see whether a directory is approaching the maximum size limit (320 MB).
165+
166+
For a 320 MB directory, the number of blocks is 655360, with each block size being 512 bytes. (That is, 320x1024x1024/512.)
167+
168+
Examples:
169+
170+
[makam@cycrh6rtp07 ~]$ stat bin
171+
File: 'bin'
172+
Size: 4096 Blocks: 8 IO Block: 65536 directory
173+
174+
[makam@cycrh6rtp07 ~]$ stat tmp
175+
File: 'tmp'
176+
Size: 12288 Blocks: 24 IO Block: 65536 directory
177+
178+
[makam@cycrh6rtp07 ~]$ stat tmp1
179+
File: 'tmp1'
180+
Size: 4096 Blocks: 8 IO Block: 65536 directory
181+
162182
## Data migration and protection FAQs
163183

164184
### How do I migrate data to Azure NetApp Files?

articles/azure-netapp-files/azure-netapp-files-resource-limits.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: conceptual
16-
ms.date: 02/25/2020
16+
ms.date: 3/13/2020
1717
ms.author: b-juche
1818
---
1919
# Resource limits for Azure NetApp Files
@@ -36,8 +36,11 @@ The following table describes resource limits for Azure NetApp Files:
3636
| Maximum size of a single capacity pool | 500 TiB | No |
3737
| Minimum size of a single volume | 100 GiB | No |
3838
| Maximum size of a single volume | 100 TiB | No |
39-
| Maximum number of files ([maxfiles](#maxfiles)) per volume | 100 million | Yes |
4039
| Maximum size of a single file | 16 TiB | No |
40+
| Maximum size of a single directory | 320 MB | No |
41+
| Maximum number of files ([maxfiles](#maxfiles)) per volume | 100 million | Yes |
42+
43+
For more information, see [Capacity management FAQs](azure-netapp-files-faqs.md#capacity-management-faqs).
4144

4245
## Maxfiles limits <a name="maxfiles"></a>
4346

articles/data-catalog/data-catalog-frequently-asked-questions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The specific properties differ from data source to data source but, in general,
8181
>
8282
8383
> [!NOTE]
84-
> For data sources such as SQL Server Analysis Services that have a first-class **Description** property, the Data Catalog data source registration tool extracts that property value. For *on-premises* SQL Server relational databases that lack a first-class **Description** property, the Data Catalog data source registration tool extracts the value from the **ms_description** extended property for objects and columns. For more information, see [Using Extended Properties on Database Objects](https://technet.microsoft.com/library/ms190243%28v=sql.105%29.aspx).
84+
> For data sources such as SQL Server Analysis Services that have a first-class **Description** property, the Data Catalog data source registration tool extracts that property value. For *on-premises* SQL Server relational databases that lack a first-class **Description** property, the Data Catalog data source registration tool extracts the value from the **ms_description** extended property for objects and columns. This property is not supported for SQL Azure. For more information, see [Using Extended Properties on Database Objects](https://technet.microsoft.com/library/ms190243%28v=sql.105%29.aspx).
8585
>
8686
>
8787

articles/data-lake-store/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
- name: Data Lake Storage Gen1 Documentation
2-
href: index.md
1+
- name: Data Lake Storage Gen1 documentation
2+
href: index.yml
33
- name: Switch to Data Lake Storage Gen2 documentation
44
href: https://docs.microsoft.com/azure/storage/data-lake-storage/introduction
55
- name: Overview

articles/data-lake-store/index.md

Lines changed: 0 additions & 214 deletions
This file was deleted.

0 commit comments

Comments
 (0)