Merge pull request #107704 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 0fad94193d96 · 2020-03-16T09:49:28.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/aks/developer-best-practices-pod-security.md b/articles/aks/developer-best-practices-pod-security.md
@@ -103,7 +103,7 @@ This article focused on how to secure your pods. To implement some of these area
 * [Integrate Azure Key Vault with AKS][aks-keyvault-flexvol]
 
 <!-- EXTERNAL LINKS -->
-[aad-pod-identity]: https://github.com/Azure/aad-pod-identity#demo-pod
+[aad-pod-identity]: https://github.com/Azure/aad-pod-identity#demo
 [aks-keyvault-flexvol]: https://github.com/Azure/kubernetes-keyvault-flexvol
 [linux-capabilities]: http://man7.org/linux/man-pages/man7/capabilities.7.html
 [selinux-labels]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.12/#selinuxoptions-v1-core
diff --git a/articles/aks/windows-node-limitations.md b/articles/aks/windows-node-limitations.md
@@ -3,8 +3,7 @@ title: Limitations for Windows Server node pools in Azure Kubernetes Service (AK
 description: Learn about the known limitations when you run Windows Server node pools and application workloads in Azure Kubernetes Service (AKS)
 services: container-service
 ms.topic: article
-ms.date: 05/31/2019
-
+ms.date: 12/18/2019
 
 #Customer intent: As a cluster operator, I want to understand the current limitations when running Windows node pools and application workloads.
 ---
diff --git a/articles/app-service/app-service-ip-restrictions.md b/articles/app-service/app-service-ip-restrictions.md
@@ -38,7 +38,7 @@ The list will show all of the current restrictions that are on your app. If you
 
 ## Adding IP address rules
 
-You can click on **[+] Add** to add a new access restriction rule. Once you add a rule, it will become effective immediately. Rules are enforced in priority order starting from the lowest number and going up. There is an implicit deny all that is in effect once you add even a single rule.
+You can click on **[+] Add rule** to add a new access restriction rule. Once you add a rule, it will become effective immediately. Rules are enforced in priority order starting from the lowest number and going up. There is an implicit deny all that is in effect once you add even a single rule.
 
 When creating a rule, you must select allow/deny and also the type of rule. You are also required to provide the priority value and what you are restricting access to.  You can optionally add a name, and description to the rule.  
 
@@ -66,13 +66,13 @@ When you edit a rule, you cannot change the type between an IP address rule and
 
 ![edit an access restriction rule](media/app-service-ip-restrictions/access-restrictions-vnet-edit.png)
 
-To delete a rule, click the **...** on your rule and then click **remove**.
+To delete a rule, click the **...** on your rule and then click **Remove**.
 
 ![delete access restriction rule](media/app-service-ip-restrictions/access-restrictions-delete.png)
 
 ## Blocking a single IP Address ##
 
-When adding your first IP Restriction rule, the service will add an explicit **deny all** rule with a priority of 2147483647. In practice, the explicit **deny all** rule will be last rule executed and will block access to any IP address that is not explicitly allowed using an **Allow** rule.
+When adding your first IP Restriction rule, the service will add an explicit **Deny all** rule with a priority of 2147483647. In practice, the explicit **Deny all** rule will be last rule executed and will block access to any IP address that is not explicitly allowed using an **Allow** rule.
 
 For the scenario where users want to explicitly block a single IP address or IP address block, but allow everything else access, it is necessary to add an explicit **Allow All** rule.
 
@@ -124,7 +124,7 @@ The JSON syntax for the earlier example is:
 
 ## Azure Function App Access Restrictions
 
-Access restrictions are available for both Function Apps with the same functionality as App Service plans. Enabling access restrictions will disable the portal code editor for any disallowed IPs.
+Access restrictions are also available for Function Apps with the same functionality as App Service plans. Enabling access restrictions will disable the portal code editor for any disallowed IPs.
 
 ## Next steps
 [Access restrictions for Azure Function Apps](../azure-functions/functions-networking-options.md#inbound-ip-restrictions)
diff --git a/articles/application-gateway/ingress-controller-install-new.md b/articles/application-gateway/ingress-controller-install-new.md
@@ -134,15 +134,15 @@ To install AAD Pod Identity to your cluster:
 
    - *RBAC enabled* AKS cluster
 
-    ```bash
-    kubectl create -f https://raw.githubusercontent.com/Azure/aad-pod-identity/master/deploy/infra/deployment-rbac.yaml
-    ```
+     ```bash
+     kubectl create -f https://raw.githubusercontent.com/Azure/aad-pod-identity/master/deploy/infra/deployment-rbac.yaml
+     ```
 
    - *RBAC disabled* AKS cluster
 
-    ```bash
-    kubectl create -f https://raw.githubusercontent.com/Azure/aad-pod-identity/master/deploy/infra/deployment.yaml
-    ```
+     ```bash
+     kubectl create -f https://raw.githubusercontent.com/Azure/aad-pod-identity/master/deploy/infra/deployment.yaml
+     ```
 
 ### Install Helm
 [Helm](https://docs.microsoft.com/azure/aks/kubernetes-helm) is a package manager for
diff --git a/articles/azure-monitor/platform/template-workspace-configuration.md b/articles/azure-monitor/platform/template-workspace-configuration.md
@@ -173,7 +173,7 @@ The deployment can take a few minutes to complete. When it finishes, you see a m
 The following template sample illustrates how to:
 
 1. Add solutions to the workspace
-2. Create saved searches
+2. Create saved searches. To ensure that deployments don't override saved searches accidently, an eTag property should be added in the "savedSearches" resource to override and maintain the idempotency of saved searches.
 3. Create a computer group
 4. Enable collection of IIS logs from computers with the Windows agent installed
 5. Collect Logical Disk perf counters from Linux computers (% Used Inodes; Free Megabytes; % Used Space; Disk Transfers/sec; Disk Reads/sec; Disk Writes/sec)
@@ -315,11 +315,11 @@ The following template sample illustrates how to:
             "[concat('Microsoft.OperationalInsights/workspaces/', parameters('workspaceName'))]"
           ],
           "properties": {
-            "Category": "VMSS",
-            "ETag": "*",
-            "DisplayName": "VMSS Instance Count",
-            "Query": "Event | where Source == \"ServiceFabricNodeBootstrapAgent\" | summarize AggregatedValue = count() by Computer",
-            "Version": 1
+            "category": "VMSS",
+            "eTag": "*",
+            "displayName": "VMSS Instance Count",
+            "query": "Event | where Source == \"ServiceFabricNodeBootstrapAgent\" | summarize AggregatedValue = count() by Computer",
+            "version": 1
           }
         },
         {
diff --git a/articles/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart.md b/articles/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart.md
@@ -7,7 +7,7 @@ ms.topic: conceptual
 ms.date: 10/04/2018
 ms.author: tomfitz
 ---
-# Deploy service catalog app through Azure portal
+# Quickstart: Deploy service catalog app through Azure portal
 
 In the [preceding quickstart](publish-managed-app-definition-quickstart.md), you published a managed application definition. In this quickstart, you create a service catalog app from that definition.
 
@@ -59,4 +59,4 @@ After the service catalog app has been deployed, you have two new resource group
 
 * To learn how to create the definition files for a managed application, see [Create and publish a managed application definition](publish-service-catalog-app.md).
 * For Azure CLI, see [Deploy service catalog app with Azure CLI](./scripts/managed-application-cli-sample-create-application.md).
-* For PowerShell, see [Deploy service catalog app with PowerShell](./scripts/managed-application-poweshell-sample-create-application.md).
+* For PowerShell, see [Deploy service catalog app with PowerShell](./scripts/managed-application-poweshell-sample-create-application.md).
diff --git a/articles/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart.md b/articles/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart.md
@@ -7,7 +7,7 @@ ms.topic: quickstart
 ms.date: 09/13/2019
 ms.author: tomfitz
 ---
-# Publish an Azure managed application definition
+# Quickstart: Publish an Azure managed application definition
 
 This quickstart provides an introduction to working with managed applications. You add a managed application definition to an internal catalog for users in your organization. To simplify the introduction, we have already built the files for your managed application. Those files are available through GitHub. You learn how to build those files in the [Create service catalog application](publish-service-catalog-app.md) tutorial.
 
@@ -69,4 +69,4 @@ Some of the parameters used in the preceding example are:
 You've published the managed application definition. Now, learn how to deploy an instance of that definition.
 
 > [!div class="nextstepaction"]
-> [Quickstart: Deploy service catalog app](deploy-service-catalog-quickstart.md)
+> [Quickstart: Deploy service catalog app](deploy-service-catalog-quickstart.md)
diff --git a/articles/azure-resource-manager/managed-applications/publish-marketplace-app.md b/articles/azure-resource-manager/managed-applications/publish-marketplace-app.md
@@ -8,7 +8,7 @@ ms.date: 07/17/2019
 ms.author: tomfitz
 ---
 
-# Azure managed applications in the Marketplace
+# Tutorial: Publish Azure managed applications in the Marketplace
 
 Vendors can use Azure managed applications to offer their solutions to all Azure Marketplace customers. Those vendors can include managed service providers (MSPs), independent software vendors (ISVs), and system integrators (SIs). Managed applications reduce the maintenance and servicing overhead for customers. Vendors sell infrastructure and software through the marketplace. They can attach services and operational support to managed applications. For more information, see [Managed application overview](overview.md).
 
diff --git a/articles/azure-resource-manager/managed-applications/publish-service-catalog-app.md b/articles/azure-resource-manager/managed-applications/publish-service-catalog-app.md
@@ -7,7 +7,7 @@ ms.topic: tutorial
 ms.date: 10/04/2018
 ms.author: tomfitz
 ---
-# Create and publish a managed application definition
+# Tutorial: Create and publish a managed application definition
 
 [!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
 
diff --git a/articles/cognitive-services/Bing-Custom-Search/includes/quickstarts/custom-search-client-library-csharp.md b/articles/cognitive-services/Bing-Custom-Search/includes/quickstarts/custom-search-client-library-csharp.md
@@ -81,7 +81,7 @@ Use the Bing Custom Search client library for C# to:
     {
         Console.WriteLine("Didn't see any Web data..");
     }
-    ```csharp
+    ```
 
 ## Next steps
 
diff --git a/articles/data-factory/connector-azure-blob-storage.md b/articles/data-factory/connector-azure-blob-storage.md
@@ -509,7 +509,8 @@ Wildcard examples:
 * ```[]``` Matches one of more characters in the brackets
 
 * ```/data/sales/**/*.csv``` Gets all csv files under /data/sales
-* ```/data/sales/20??/**``` Gets all files in the 20th century
+* ```/data/sales/20??/**/``` Gets all files in the 20th century
+* ```/data/sales/*/*/*.csv``` Gets csv files two levels under /data/sales
 * ```/data/sales/2004/*/12/[XY]1?.csv``` Gets all csv files in 2004 in December starting with X or Y prefixed by a two-digit number
 
 **Partition Root Path:** If you have partitioned folders in your file source with  a ```key=value``` format (for example, year=2019), then you can assign the top level of that partition folder tree to a column name in your data flow data stream.
diff --git a/articles/data-factory/connector-azure-data-lake-storage.md b/articles/data-factory/connector-azure-data-lake-storage.md
@@ -404,7 +404,8 @@ Wildcard examples:
 * ```[]``` Matches one of more characters in the brackets
 
 * ```/data/sales/**/*.csv``` Gets all csv files under /data/sales
-* ```/data/sales/20??/**``` Gets all files in the 20th century
+* ```/data/sales/20??/**/``` Gets all files in the 20th century
+* ```/data/sales/*/*/*.csv``` Gets csv files two levels under /data/sales
 * ```/data/sales/2004/*/12/[XY]1?.csv``` Gets all csv files in 2004 in December starting with X or Y prefixed by a two-digit number
 
 **Partition Root Path:** If you have partitioned folders in your file source with  a ```key=value``` format (for example, year=2019), then you can assign the top level of that partition folder tree to a column name in your data flow data stream.
diff --git a/articles/data-factory/connector-azure-data-lake-store.md b/articles/data-factory/connector-azure-data-lake-store.md
@@ -347,7 +347,8 @@ Wildcard examples:
 * ```[]``` Matches one of more characters in the brackets
 
 * ```/data/sales/**/*.csv``` Gets all csv files under /data/sales
-* ```/data/sales/20??/**``` Gets all files in the 20th century
+* ```/data/sales/20??/**/``` Gets all files in the 20th century
+* ```/data/sales/*/*/*.csv``` Gets csv files two levels under /data/sales
 * ```/data/sales/2004/*/12/[XY]1?.csv``` Gets all csv files in 2004 in December starting with X or Y prefixed by a two-digit number
 
 **Partition Root Path:** If you have partitioned folders in your file source with  a ```key=value``` format (for example, year=2019), then you can assign the top level of that partition folder tree to a column name in your data flow data stream.
diff --git a/articles/data-factory/media/data-flow/partfile2.png b/articles/data-factory/media/data-flow/partfile2.png
diff --git a/articles/data-factory/media/data-flow/sourceOptions1.png b/articles/data-factory/media/data-flow/sourceOptions1.png
diff --git a/articles/machine-learning/team-data-science-process/predictive-maintenance-technical-guide.md b/articles/machine-learning/team-data-science-process/predictive-maintenance-technical-guide.md
@@ -170,7 +170,7 @@ service orchestrates the movement and processing of data. In the
 Predictive Maintenance for Aerospace Solution Template, the data factory
 is made up of three
 [pipelines](../../data-factory/concepts-pipelines-activities.md)
-that move and process the data using various technologies.  Access your data factory by opening the Data Factory node at the bottom of the solution template diagram created with the deployment of the solution. Errors under your datasets are due to data factory being deployed before the data generator was started. Those errors can be ignored and do not prevent your data factory from functioning
+that move and process the data using various technologies.  Access your data factory by opening the Data Factory node at the bottom of the solution template diagram created with the deployment of the solution. Errors under your datasets are due to data factory being deployed before the data generator was started. Those errors can be ignored and do not prevent your data factory from functioning.
 
 ![Data Factory dataset errors](./media/predictive-maintenance-technical-guide/data-factory-dataset-error.png)
 
@@ -269,7 +269,7 @@ specific to the data brought in.
 Once the Data Generator is launched, the pipeline begins to dehydrate, and the different components of your solution start kicking into action following the commands issued by the data factory. There are two ways to monitor the pipeline.
 
 * One of the Stream Analytics jobs writes the raw incoming data to blob storage. If you click on Blob Storage component of your solution from the screen you successfully deployed the solution and then click Open in the right panel, it takes you to the [Azure portal](https://portal.azure.com/). Once there, click on Blobs. In the next panel, you see a list of Containers. Click on **maintenancesadata**. In the next panel is the **rawdata** folder. Inside the rawdata folder are folders with names such as hour=17, and hour=18. The presence of these folders indicates raw data is being generated on your computer and stored in blob storage. You should see csv files with finite sizes in MB in those folders.
-* The last step of the pipeline is to write data (for example predictions from machine learning) into SQL Database. You might have to wait a maximum of three hours for the data to appear in SQL Database. One way to monitor how much data is available in your SQL Database is through the [Azure portal](https://portal.azure.com/). On the left panel, locate SQL DATABASES ![SQL icon](./media/predictive-maintenance-technical-guide/icon-SQL-databases.png) and click it. Then locate your database **pmaintenancedb** and click on it. On the next page at the bottom, click on MANAGE
+* The last step of the pipeline is to write data (for example predictions from machine learning) into SQL Database. You might have to wait a maximum of three hours for the data to appear in SQL Database. One way to monitor how much data is available in your SQL Database is through the [Azure portal](https://portal.azure.com/). On the left panel, locate SQL DATABASES ![SQL icon](./media/predictive-maintenance-technical-guide/icon-SQL-databases.png) and click it. Then locate your database **pmaintenancedb** and click on it. On the next page at the bottom, click on MANAGE.
    
     ![Manage icon](./media/predictive-maintenance-technical-guide/icon-manage.png)
    
@@ -363,7 +363,8 @@ containing data (for example, prediction results) for visualization.
      <br/>
    * To schedule refresh of the data, hover your mouse over the **PredictiveMaintenanceAerospace** dataset, click ![Ellipsis icon](./media/predictive-maintenance-technical-guide/icon-elipsis.png) and then choose **Schedule Refresh**.
      <br/>
-     **Note:** If you see a warning massage, click **Edit Credentials** and make sure your database credentials are the same as those described in step 1.
+     > [!NOTE]
+     > If you see a warning message, click **Edit Credentials** and make sure your database credentials are the same as those described in step 1.
      <br/>
      ![Schedule refresh](./media/predictive-maintenance-technical-guide/schedule-refresh.png)
      <br/>

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ Use the Bing Custom Search client library for C# to:`
`81`	`81`	`{`
`82`	`82`	`Console.WriteLine("Didn't see any Web data..");`
`83`	`83`	`}`
`84`		- ```csharp
	`84`	+ ```
`85`	`85`
`86`	`86`	`## Next steps`
`87`	`87`