Merge pull request #101672 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -27981,6 +27981,11 @@
       "redirect_url": "/azure/security-center/security-center-partner-integration",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/security-center/security-center-playbooks.md",
+      "redirect_url": "/azure/security-center/workflow-automation",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/security-center/security-center-compliance-rest-api.md",
       "redirect_url": "https://docs.microsoft.com/rest/api/securitycenter/compliances",

articles/active-directory/cloud-provisioning/tutorial-single-forest.md

@@ -29,7 +29,7 @@ You can use the environment you create in this tutorial for testing or for getti
 
 ### In your on-premises environment
 
-1. Identity a domain-joined host server running Windows Server 2012 R2 or greater with minimum of 4 GB RAM and .NET 4.7.1+ runtime 
+1. Identify a domain-joined host server running Windows Server 2012 R2 or greater with minimum of 4 GB RAM and .NET 4.7.1+ runtime 
 
 2. If there is a firewall between your servers and Azure AD, configure the following items:
    - Ensure that agents can make *outbound* requests to Azure AD over the following ports:

articles/azure-monitor/app/sampling.md

@@ -481,18 +481,18 @@ The accuracy of the approximation largely depends on the configured sampling per
 
   The following shows the default `ApplicationInsights.config` file generated. In ASP.NET Core, the same default behavior is enabled in code. Use the [examples in the earlier section of this page](#configuring-adaptive-sampling-for-aspnet-core-applications) to change this default behavior.
 
-```xml
-<TelemetryProcessors>
-    <Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
-        <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
-        <ExcludedTypes>Event</ExcludedTypes>
-    </Add>
-    <Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
-        <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
-        <IncludedTypes>Event</IncludedTypes>
-    </Add>
-</TelemetryProcessors>
-```
+    ```xml
+    <TelemetryProcessors>
+        <Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
+            <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
+            <ExcludedTypes>Event</ExcludedTypes>
+        </Add>
+        <Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
+            <MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
+            <IncludedTypes>Event</IncludedTypes>
+        </Add>
+    </TelemetryProcessors>
+    ```
 
 *Can telemetry be sampled more than once?*
 
@@ -530,18 +530,18 @@ The accuracy of the approximation largely depends on the configured sampling per
 
 * The best way to achieve this is to write a custom [TelemetryInitializer](../../azure-monitor/app/api-filtering-sampling.md#addmodify-properties-itelemetryinitializer), which sets the `SamplingPercentage` to 100 on the telemetry item you want retained, as shown below. As initializers are guaranteed to be run before telemetry processors (including sampling), this ensures that all sampling techniques will ignore this item from any sampling considerations.
 
-```csharp
-public class MyTelemetryInitializer : ITelemetryInitializer
-{
-    public void Initialize(ITelemetry telemetry)
+    ```csharp
+    public class MyTelemetryInitializer : ITelemetryInitializer
     {
-        if(somecondition)
+        public void Initialize(ITelemetry telemetry)
         {
-            ((ISupportSampling)telemetry).SamplingPercentage = 100;
+            if(somecondition)
+            {
+                ((ISupportSampling)telemetry).SamplingPercentage = 100;
+            }
         }
     }
-}
-```
+    ```
 
 ## Older SDK versions
 

articles/backup/backup-support-matrix-mars-agent.md

@@ -99,6 +99,8 @@ For more information, see [Supported MABS and DPM operating systems](backup-supp
 
 ## Backup limits
 
+### Size limits
+
 Azure Backup limits the size of a file or folder data source that can be backed up. The items that you back up from a single volume can't exceed the sizes summarized in this table:
 
 **Operating system** | **Size limit**
@@ -109,6 +111,10 @@ Windows Server 2008 SP2| 1,700 GB
 Windows 8 or later| 54,400 GB
 Windows 7| 1,700 GB
 
+### Other limitations
+
+- MARS does not support protection of multiple machines with the same name to a single vault.
+
 ## Supported file types for backup
 
 **Type** | **Support**

articles/cognitive-services/text-analytics/includes/find-azure-resource-info-v2.md

@@ -0,0 +1,18 @@
+---
+title: Find your Text Analytics resource endpoint and key - v2
+titleSuffix: Azure Cognitive Services
+description: Learn how to create a Cognitive Services Text Analytics resource.
+services: cognitive-services
+author: aahill
+manager: nitinme
+ms.service: cognitive-services
+ms.topic: include 
+ms.date: 01/08/2019
+ms.author: aahi
+---
+> [!IMPORTANT]
+> To find your key and endpoint on the Azure portal:
+> 1. Navigate to your azure resource at https://portal.azure.com/.
+> 2. Click on **Quick start**, located under **Resource Management**.
+>
+> Remember to remove your credentials from your code when you're done, and never post them publicly. For production, consider using a secure way of storing and accessing your credentials. For example, [Azure key vault](https://docs.microsoft.com/azure/key-vault/key-vault-overview).

articles/cognitive-services/text-analytics/includes/find-azure-resource-info.md

@@ -1,5 +1,5 @@
 ---
-title: Find your Text Analytics resource endpoint and key
+title: Find your Text Analytics resource endpoint and key - v3 client library
 titleSuffix: Azure Cognitive Services
 description: Learn how to create a Cognitive Services Text Analytics resource.
 services: cognitive-services
@@ -10,6 +10,7 @@ ms.topic: include
 ms.date: 01/14/2019
 ms.author: aahi
 ---
+
 > [!IMPORTANT]
 > Go to the resource you created to find your key and endpoint. They'll be located on the resource's **Quick start** page, under **resource management**.
 >

articles/cognitive-services/text-analytics/includes/quickstarts/csharp.md renamed to articles/cognitive-services/text-analytics/includes/quickstarts/v2/csharp.md

@@ -22,7 +22,7 @@ ms.author: aahi
 
 ### Create a Text Analytics Azure resource
 
-[!INCLUDE [text-analytics-resource-creation](resource-creation.md)]
+[!INCLUDE [text-analytics-resource-creation](../resource-creation.md)]
 
 ### Create a new .NET Core application
 
@@ -36,7 +36,7 @@ Open the *program.cs* file and add the following `using` directives:
 
 In the application's `Program` class, create variables for your resource's key and endpoint. 
 
-[!INCLUDE [text-analytics-find-resource-information](../find-azure-resource-info.md)]
+[!INCLUDE [text-analytics-find-resource-information](../../find-azure-resource-info-v2.md)]
 
 ```csharp
 private static readonly string key = "<replace-with-your-text-analytics-key-here>";

articles/cognitive-services/text-analytics/includes/quickstarts/go-sdk.md renamed to articles/cognitive-services/text-analytics/includes/quickstarts/v2/go-sdk.md

@@ -17,7 +17,7 @@ ms.author: aahi
 
 ### Create a Text Analytics Azure resource 
 
-[!INCLUDE [text-analytics-resource-creation](resource-creation.md)]
+[!INCLUDE [text-analytics-resource-creation](../resource-creation.md)]
 
 ### Create a new Go project
 
@@ -87,7 +87,7 @@ These code snippets show you how to do the following with the Text Analytics cli
 
 In a new function, create variables for your resource's Azure endpoint and subscription key.
 
-[!INCLUDE [text-analytics-find-resource-information](../find-azure-resource-info.md)]
+[!INCLUDE [text-analytics-find-resource-information](../../find-azure-resource-info-v2.md)]
 
 Create a new [BaseClient](https://godoc.org/github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.1/textanalytics#New) object. Pass your key to the [autorest.NewCognitiveServicesAuthorizer()](https://godoc.org/github.com/Azure/go-autorest/autorest#NewCognitiveServicesAuthorizer) function, which will then be passed to the client's `authorizer` property.
 

articles/cognitive-services/text-analytics/includes/quickstarts/nodejs-sdk.md renamed to articles/cognitive-services/text-analytics/includes/quickstarts/v2/nodejs-sdk.md

@@ -19,7 +19,7 @@ ms.author: aahi
 
 ### Create a Text Analytics Azure resource
 
-[!INCLUDE [text-analytics-resource-creation](resource-creation.md)]
+[!INCLUDE [text-analytics-resource-creation](../resource-creation.md)]
 
 ### Create a new Node.js application
 
@@ -41,7 +41,7 @@ Create a file named `index.js` and add the following libraries:
 
 Create variables for your resource's Azure endpoint and subscription key.
 
-[!INCLUDE [text-analytics-find-resource-information](../find-azure-resource-info.md)]
+[!INCLUDE [text-analytics-find-resource-information](../../find-azure-resource-info-v2.md)]
 
 ```javascript
 const subscription_key = '<paste-your-text-analytics-key-here>';

articles/cognitive-services/text-analytics/includes/quickstarts/python-sdk.md renamed to articles/cognitive-services/text-analytics/includes/quickstarts/v2/python-sdk.md

@@ -21,7 +21,7 @@ ms.author: aahi
 
 ### Create a Text Analytics Azure resource
 
-[!INCLUDE [text-analytics-resource-creation](resource-creation.md)]
+[!INCLUDE [text-analytics-resource-creation](../resource-creation.md)]
 
 ### Install the client library
 
@@ -39,7 +39,7 @@ Create a new Python file and import the following libraries.
 
 Create variables for your resource's Azure endpoint and subscription key.
 
-[!INCLUDE [text-analytics-find-resource-information](../find-azure-resource-info.md)]
+[!INCLUDE [text-analytics-find-resource-information](../../find-azure-resource-info-v2.md)]
 
 ```python
 subscription_key = "<paste-your-text-analytics-key-here>"