Merge pull request #56942 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 475ae84f1c6e · 2018-11-02T09:45:23.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/active-directory/manage-apps/application-proxy-qlik.md b/articles/active-directory/manage-apps/application-proxy-qlik.md
@@ -11,7 +11,7 @@ ms.workload: identity
 ms.topic: article
 ms.date: 09/06/2018
 ms.author: barbkess
-ms.reviewer: harshja
+ms.reviewer: japere
 ms.custom: it-pro
 
 ---
@@ -53,7 +53,11 @@ Follow the same steps as for Application #1, with the following exceptions:
 ## Testing 
 Your application is now ready to test. Access the external URL you used to publish QlikSense in Application #1, and login as a user assigned to both applications.  
 
-## Next Steps
+## Additional references
+For more information about publishing Qlik Sense with Application Proxy, refer to the Qlik Community Article: [Azure AD with Integrated Windows Authentication using a Kerberos Constrained Delegation with Qlik Sense](https://community.qlik.com/docs/DOC-20183).
+
+## Next steps
 
 - [Publish applications with Application Proxy](application-proxy-publish-azure-portal.md)
-- [Working with Application Proxy connectors](application-proxy-connector-groups.md).
+- [Working with Application Proxy connectors](application-proxy-connector-groups.md)
+
diff --git a/articles/dms/tutorial-sql-server-managed-instance-online.md b/articles/dms/tutorial-sql-server-managed-instance-online.md
@@ -140,7 +140,7 @@ After an instance of the service is created, locate it within the Azure portal,
 
 3. Provide **SQL User** and **Password** to connect to target instance of Azure SQL Database Managed Instance.
 
-       ![Select Target](media\tutorial-sql-server-to-managed-instance-online\dms-target-details3.png)
+    ![Select Target](media\tutorial-sql-server-to-managed-instance-online\dms-target-details3.png)
 
 2.  Select **Save**.
 
diff --git a/articles/marketplace/marketplace-virtual-machines.md b/articles/marketplace/marketplace-virtual-machines.md
@@ -26,18 +26,18 @@ These are transaction offers which are deployed and billed through the Marketpla
 
 ## Free Trial 
 
-You can arrange for users to test your offer by accessing limited term software licenses when using the Bring Your Own License (BYOL) blling model. Below are the requirements to deploy this offer. 
+You can arrange for users to test your offer by accessing limited term software licenses when using the Bring Your Own License (BYOL) billing model. Below are the requirements to deploy this offer. 
 
 |Requirements  |Details  |
 |---------|---------|
-|Free trial period and trial experience     |   Your customer may try your app for free for a limited time. Your customer is not required to pay any license or subscription fees for your offer. Your customers are not required to pay for the underlying Microsoft first-party product or service. All trial options are deployed to your Azure subscription. You have sole control of the cost optimization and management. You may choose a free trial or interactive demo. No matter what you choose, your free trial must provide the customer a pre-set amount of time to try your offer at no additional cost.|
+|Free trial period and trial experience     |   Your customers may try your app for free for a limited time. Your customers are note required to pay any license or subscription fees for your offer. Your customers are not required to pay for the underlying Microsoft first-party product or service. All trial options are deployed to your Azure subscription. You have sole control of the cost optimization and management. You may choose a free trial or interactive demo. No matter what you choose, your free trial must provide customers a pre-set amount of time to try your offer at no additional cost.|
 |Easily configurable, ready-to-use solution    |  Your app must be easy and quick to configure and set up.       |
 |Availability / uptime    |    Your SaaS app or platform must have an uptime of at least 99.9%.     |
 |Azure Active Directory     |    Your offer must allow Azure Active Directory (Azure AD) federated single sign-on (SSO) (Azure AD federated SSO) with consent enabled.     |
 
 ## Test Drive
 
-You deploy one or more virtual machines through infrastructure-as-a-service(IaaS) or SaaS apps. A benefit of the test drive publishing option is the automated provisioning of a virtual machine or entire solution led by a partner-hosted guided tour. A test drive provides an evaluation at no additional cost to your customer. Your customer does not need to be an existing Azure customer to engage with the trial experience. 
+You deploy one or more virtual machines through infrastructure-as-a-service (IaaS) or software-as-a-service (SaaS) apps. A benefit of the test drive publishing option is the automated provisioning of a virtual machine or entire solution led by a partner-hosted guided tour. A test drive provides an evaluation at no additional cost to your customer. Your customer does not need to be an existing Azure customer to engage with the trial experience. 
 
 Contact us at [amp-testdrive](mailto:amp-testdrive@microsoft.com) to get started. 
 
diff --git a/articles/site-recovery/azure-to-azure-support-matrix.md b/articles/site-recovery/azure-to-azure-support-matrix.md
@@ -199,7 +199,7 @@ General purpose V2 storage accounts (Both Hot and Cool tier) | No | Transaction
 ## Replicated machines - networking
 **Configuration** | **Support** | **Details**
 --- | --- | ---
-NIC | Maximum number supported for a pecific Azure VM size | NICs are created when the VM is created during failover.<br/><br/> The number of NICs on the failover VM depends on the number of NICs on the source VM when replication was enabled. If you add or remove a NIC after enabling replication, it doesn't impact the number of NICs on the replicated VM after failover.
+NIC | Maximum number supported for a specific Azure VM size | NICs are created when the VM is created during failover.<br/><br/> The number of NICs on the failover VM depends on the number of NICs on the source VM when replication was enabled. If you add or remove a NIC after enabling replication, it doesn't impact the number of NICs on the replicated VM after failover.
 Internet Load Balancer | Supported | Associate the preconfigured load balancer using an Azure Automation script in a recovery plan.
 Internal Load balancer | Supported | Associate the preconfigured load balancer using an Azure Automation script in a recovery plan.
 Public IP address | Supported | Associate an existing public IP address with the NIC. Or, create a public IP address and associate it with the NIC using an Azure Automation script in a recovery plan.
diff --git a/articles/sql-data-warehouse/sql-data-warehouse-integrate-azure-stream-analytics.md b/articles/sql-data-warehouse/sql-data-warehouse-integrate-azure-stream-analytics.md
@@ -15,7 +15,7 @@ ms.reviewer: igorstan
 # Use Azure Stream Analytics with SQL Data Warehouse
 Azure Stream Analytics is a fully managed service providing low-latency, highly available, scalable complex event processing over streaming data in the cloud. You can learn the basics by reading [Introduction to Azure Stream Analytics][Introduction to Azure Stream Analytics]. You can then learn how to create an end-to-end solution with Stream Analytics by following the [Get started using Azure Stream Analytics][Get started using Azure Stream Analytics] tutorial.
 
-In this article, you will learn how to use your Azure SQL Data Warehouse database as an output sink for your Steam Analytics jobs.
+In this article, you will learn how to use your Azure SQL Data Warehouse database as an output sink for your Stream Analytics jobs.
 
 ## Prerequisites
 First, run through the following steps in the [Get started using Azure Stream Analytics][Get started using Azure Stream Analytics] tutorial.  
diff --git a/articles/stream-analytics/stream-analytics-documentdb-output.md b/articles/stream-analytics/stream-analytics-documentdb-output.md
@@ -32,6 +32,13 @@ Stream Analytics integration with Azure Cosmos DB allows you to insert or update
 
 Stream Analytics uses an optimistic upsert approach, where updates are only done when insert fails with a Document ID conflict. This update is performed as a PATCH, so it enables partial updates to the document, that is, addition of new properties or replacing an existing property is performed incrementally. However, changes in the values of array properties in your JSON document result in the entire array getting overwritten, that is, the array isn't merged.
 
+If the incoming JSON document has an existing ID field, that field is automatically used as the Document ID column in Cosmos DB and any subsequent writes are handled as such, leading to one of these situations:
+- unique IDs lead to insert
+- duplicate IDs and 'Document ID' set to 'ID' leads to upsert
+- duplicate IDs and 'Document ID' not set leads to error, after the first document
+
+If you want to save <i>all</i> documents including the ones with a duplicate ID, rename the ID field in your query (with the AS keyword) and let Cosmos DB create the ID field or replace the ID with another column's value (using the AS keyword or by using the 'Document ID' setting).
+
 ## Data partitioning in Cosmos DB
 Azure Cosmos DB [unlimited](../cosmos-db/partition-data.md) are the recommended approach for partitioning your data, as Azure Cosmos DB automatically scales partitions based on your workload. When writing to unlimited containers, Stream Analytics uses as many parallel writers as previous query step or input partitioning scheme.
 > [!Note]
diff --git a/includes/network-watcher-limits.md b/includes/network-watcher-limits.md
@@ -1,4 +1,4 @@
 | Resource | Default limit | Maximum Limit | Note |
 | --- | --- | --- | --- |
 | Network Watcher | 1 per region  | 1 per region |  Network Watcher resource is created to enable access to the service. Only 1 Network Watcher resource is required per subscription per region |
-| Packet Capture sessions |10 per region | |# of sessions only, not saved captures |
+| Packet Capture sessions |100 per region | 10,000 |# of sessions only, not saved captures |
