Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-monitor

HeidiSteen · HeidiSteen · commit ba35674443a2 · 2020-02-13T13:50:14.000-08:00
diff --git a/articles/active-directory/app-provisioning/customize-application-attributes.md b/articles/active-directory/app-provisioning/customize-application-attributes.md
@@ -296,7 +296,7 @@ Certain attributes such as phoneNumbers and emails are multi-value attributes wh
 
 ## Restoring the default attributes and attribute-mappings
 
-Should you need to start over and reset your existing mappings back to their default state, you can select the **Restore default mappings** check box and save the configuration. Doing so sets all mappings as if the application was just added to your Azure AD tenant from the application gallery.
+Should you need to start over and reset your existing mappings back to their default state, you can select the **Restore default mappings** check box and save the configuration. Doing so sets all mappings and scoping filters as if the application was just added to your Azure AD tenant from the application gallery.
 
 Selecting this option will effectively force a resynchronization of all users while the provisioning service is running.
 
diff --git a/articles/cosmos-db/breadcrumb/TOC.yml b/articles/cosmos-db/breadcrumb/TOC.yml
@@ -0,0 +1,75 @@
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/data-factory/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/search/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/azure-functions/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/dms/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/hdinsight/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/private-link/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/logic-apps/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /azure/stream-analytics/
+    topicHref: /azure/cosmos-db/index
+
+- name: Azure
+  tocHref: /java/
+  topicHref: /azure/index
+  items:
+  - name: Azure Cosmos DB
+    tocHref: /java/azure/
+    topicHref: /azure/cosmos-db/index
+    items:
+    - name: Spring
+      tocHref: /java/azure/spring-framework/
+      topicHref: /azure/cosmos-db/index
diff --git a/articles/machine-learning/how-to-deploy-and-where.md b/articles/machine-learning/how-to-deploy-and-where.md
@@ -581,6 +581,20 @@ az ml model deploy -m mymodel:1 --ic inferenceconfig.json --dc deploymentconfig.
 
 For more information, see the [az ml model deploy](https://docs.microsoft.com/cli/azure/ext/azure-cli-ml/ml/model?view=azure-cli-latest#ext-azure-cli-ml-az-ml-model-deploy) documentation.
 
+### Understanding service state
+
+During model deployment, you may see the service state change while it fully deploys.
+
+The following table describes the different service states:
+
+| Webservice state | Description | Final state?
+| ----- | ----- | ----- |
+| Transitioning | The service is in the process of deployment. | No |
+| Unhealthy | The service has deployed but is currently unreachable.  | No |
+| Unschedulable | The service cannot be deployed at this time due to lack of resources. | No |
+| Failed | The service has failed to deploy due to an error or crash. | Yes |
+| Healthy | The service is healthy and the endpoint is available. | Yes |
+
 ### <a id="notebookvm"></a> Compute instance web service (dev/test)
 
 See [Deploy a model to Azure Machine Learning compute instance](how-to-deploy-local-container-notebook-vm.md).
diff --git a/articles/media-services/video-indexer/upload-index-videos.md b/articles/media-services/video-indexer/upload-index-videos.md
@@ -43,7 +43,7 @@ The article shows how to upload and index your videos with these options:
 
     If it is a private URL, the access token need to be provided in the request.
 - The URL has to point to a valid media file and not to a webpage, such as a link to the `www.youtube.com` page.
-- You can upload up to 60 movies per minute.
+- In a paid account you can upload up to 50 movies per minute, and in a trial account up to 5 movies per minute.
 
 > [!Tip]
 > It is recommended to use .NET framework version 4.6.2. or higher because older .NET frameworks do not default to TLS 1.2.
@@ -344,6 +344,7 @@ The status codes listed in the following table may be returned by the Upload ope
 |---|---|---|
 |409|VIDEO_INDEXING_IN_PROGRESS|Same video is already in progress of being processed in the given account.|
 |400|VIDEO_ALREADY_FAILED|Same video failed to process in the given account less than 2 hours ago. API clients should wait at least 2 hours before re-uploading a video.|
+|429||Trial accounts are allowed 5 uploads per minute. Paid accounts are allowed 50 uploads per minute.|
 
 ## Next steps
 
diff --git a/articles/storage/files/storage-files-active-directory-enable.md b/articles/storage/files/storage-files-active-directory-enable.md
@@ -5,17 +5,16 @@ author: roygara
 
 ms.service: storage
 ms.topic: conceptual
-ms.date: 08/08/2019
+ms.date: 01/06/2020
 ms.author: rogarana
 ms.subservice: files
 ---
 
-# Enable Azure Active Directory Domain Services authentication over SMB for Azure Files
+# Enable Azure Active Directory Domain Services authentication on Azure Files
 
 [!INCLUDE [storage-files-aad-auth-include](../../../includes/storage-files-aad-auth-include.md)]
 
-For an overview of Azure AD authentication over SMB for Azure Files, see [Overview of Azure Active Directory authentication over SMB for Azure Files](storage-files-active-directory-overview.md).
-
+For an overview of the identity-based authentication supported on Azure Files, see [Overview of Azure Active Directory authentication over SMB for Azure Files](storage-files-active-directory-overview.md). This article is focused on how to enable authentication with Azure Active Directory Domain Services (Azure AD DS) on Azure Files. 
 [!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
 
 ## Overview of the workflow
@@ -67,7 +66,7 @@ Before you enable Azure AD over SMB for Azure Files, make sure you have complete
 
 ## Enable Azure AD DS authentication for your account
 
-To enable Azure AD DS authentication over SMB for Azure Files, you can set a property on storage accounts created after September 24, 2018, by using the Azure portal, Azure PowerShell, or Azure CLI. Setting this property registers the storage account with the associated Azure AD DS deployment. Azure AD DS authentication over SMB is then enabled for all new and existing file shares in the storage account.
+To enable Azure AD DS authentication over SMB for Azure Files, you can set a property on storage accounts by using the Azure portal, Azure PowerShell, or Azure CLI. Setting this property implicitly "domain joins" the storage account with the associated Azure AD DS deployment. Azure AD DS authentication over SMB is then enabled for all new and existing file shares in the storage account.
 
 Keep in mind that you can enable Azure AD DS authentication over SMB only after you have successfully deployed Azure AD DS to your Azure AD tenant. For more information, see the [prerequisites](#prerequisites).
 
