Merge pull request #84677 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 8c9dd9084246 · 2019-08-08T09:37:30.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/develop/authentication-flows-app-scenarios.md b/articles/active-directory/develop/authentication-flows-app-scenarios.md
@@ -140,7 +140,7 @@ For more information, read [Mobile app that calls web APIs](scenario-mobile-over
 
 ### Protected Web API
 
-You can use the Microsoft identity platform endpoint to secure web services, such as your app's RESTful Web API. A protected Web API is called with an access token to secure its data and to authenticate incoming requests. The caller of a Web API appends an access token in the authorization header of an HTTP request. If you want to protect you ASP.NET or ASP.NET Core Web API, you will need to validate the access token. For this, you'll use the ASP.NET JWT middleware. Under the hood, the validation is done by the [IdentityModel extensions for .NET](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/wiki) library, not MSAL.NET
+You can use the Microsoft identity platform endpoint to secure web services, such as your app's RESTful Web API. A protected Web API is called with an access token to secure its data and to authenticate incoming requests. The caller of a Web API appends an access token in the authorization header of an HTTP request. If you want to protect your ASP.NET or ASP.NET Core Web API, you will need to validate the access token. For this, you'll use the ASP.NET JWT middleware. Under the hood, the validation is done by the [IdentityModel extensions for .NET](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/wiki) library, not MSAL.NET
 
 For more information, read [Protected Web API](scenario-protected-web-api-overview.md).
 
diff --git a/articles/active-directory/devices/hybrid-azuread-join-federated-domains.md b/articles/active-directory/devices/hybrid-azuread-join-federated-domains.md
@@ -92,6 +92,8 @@ If you don't use WPAD and want to configure proxy settings on your computer, you
 
 If your organization requires access to the internet via an authenticated outbound proxy, you must make sure that your Windows 10 computers can successfully authenticate to the outbound proxy. Because Windows 10 computers run device registration by using machine context, you must configure outbound proxy authentication by using machine context. Follow up with your outbound proxy provider on the configuration requirements.
 
+To verify if the device is able to access the above Microsoft resources under the system account, you can use [Test Device Registration Connectivity](https://gallery.technet.microsoft.com/Test-Device-Registration-3dc944c0) script.
+
 ## Configure hybrid Azure AD join
 
 To configure a hybrid Azure AD join by using Azure AD Connect, you need:
diff --git a/articles/active-directory/devices/hybrid-azuread-join-manual.md b/articles/active-directory/devices/hybrid-azuread-join-manual.md
@@ -71,6 +71,8 @@ For Windows 10 devices on version 1703 or earlier, if your organization requires
 
 Beginning with Windows 10 1803, even if a hybrid Azure AD join attempt by a device in a federated domain through AD FS fails, and if Azure AD Connect is configured to sync the computer/device objects to Azure AD, the device will try to complete the hybrid Azure AD join by using the synced computer/device.
 
+To verify if the device is able to access the above Microsoft resources under the system account, you can use [Test Device Registration Connectivity](https://gallery.technet.microsoft.com/Test-Device-Registration-3dc944c0) script.
+
 ## Verify configuration steps
 
 You can configure hybrid Azure AD joined devices for various types of Windows device platforms. This topic includes the required steps for all typical configuration scenarios.  
diff --git a/articles/azure-monitor/app/correlation.md b/articles/azure-monitor/app/correlation.md
@@ -139,6 +139,39 @@ public void ConfigureServices(IServiceCollection services)
 > [!IMPORTANT]
 > Make sure that both incoming and outgoing configurations are exactly the same.
 
+#### Enable W3C distributed tracing support for Web apps
+
+This feature is in `Microsoft.ApplicationInsights.JavaScript`. It's disabled by default. To enable it, use `distributedTracingMode` config. AI_AND_W3C is provided for back-compatibility with any legacy Application Insights instrumented services:
+
+- **NPM Setup (ignore if using Snippet Setup)**
+
+  ```javascript
+  import { ApplicationInsights, DistributedTracingModes } from '@microsoft/applicationinsights-web';
+
+  const appInsights = new ApplicationInsights({ config: {
+    instrumentationKey: 'YOUR_INSTRUMENTATION_KEY_GOES_HERE',
+    distributedTracingMode: DistributedTracingModes.W3C
+    /* ...Other Configuration Options... */
+  } });
+  appInsights.loadAppInsights();
+  ```
+  
+- **Snippet Setup (Ignore if using NPM Setup)**
+
+  ```
+  <script type="text/javascript">
+  var sdkInstance="appInsightsSDK";window[sdkInstance]="appInsights";var aiName=window[sdkInstance],aisdk=window[aiName]||function(e){function n(e){i[e]=function(){var n=arguments;i.queue.push(function(){i[e].apply(i,n)})}}var i={config:e};i.initialize=!0;var a=document,t=window;setTimeout(function(){var n=a.createElement("script");n.src=e.url||"https://az416426.vo.msecnd.net/scripts/b/ai.2.min.js",a.getElementsByTagName("script")[0].parentNode.appendChild(n)});try{i.cookie=a.cookie}catch(e){}i.queue=[],i.version=2;for(var r=["Event","PageView","Exception","Trace","DependencyData","Metric","PageViewPerformance"];r.length;)n("track"+r.pop());n("startTrackPage"),n("stopTrackPage");var o="Track"+r[0];if(n("start"+o),n("stop"+o),!(!0===e.disableExceptionTracking||e.extensionConfig&&e.extensionConfig.ApplicationInsightsAnalytics&&!0===e.extensionConfig.ApplicationInsightsAnalytics.disableExceptionTracking)){n("_"+(r="onerror"));var s=t[r];t[r]=function(e,n,a,t,o){var c=s&&s(e,n,a,t,o);return!0!==c&&i["_"+r]({message:e,url:n,lineNumber:a,columnNumber:t,error:o}),c},e.autoExceptionInstrumented=!0}return i}
+  (
+    {
+      instrumentationKey:"INSTRUMENTATION_KEY",
+      distributedTracingMode: 2 // DistributedTracingModes.W3C
+      /* ...Other Configuration Options... */
+    }
+  );
+  window[aiName]=aisdk,aisdk.queue&&0===aisdk.queue.length&&aisdk.trackPageView({});
+  </script>
+  ```
+
 ## OpenTracing and Application Insights
 
 The [OpenTracing data model specification](https://opentracing.io/) and Application Insights data models map in the following way:
diff --git a/articles/backup/backup-azure-vms-encryption.md b/articles/backup/backup-azure-vms-encryption.md
@@ -147,11 +147,12 @@ You restore encrypted VMs as follows:
 1. [Restore the VM disk](backup-azure-arm-restore-vms.md#restore-disks).
 2. Then do one of the following:
     - Use the template that's generated during the restore operation to customize VM settings, and trigger VM deployment. [Learn more](backup-azure-arm-restore-vms.md#use-templates-to-customize-a-restored-vm).
-    - Create a new VM from the restored disks using Powershell. [Learn more](backup-azure-vms-automation.md#create-a-vm-from-restored-disks).
+    - Create a new VM from the restored disks using PowerShell. [Learn more](backup-azure-vms-automation.md#create-a-vm-from-restored-disks).
+    - For Linux VMs, reset the ADE extension so the data disks are open and mounted. 
 
 ## Next steps
 
-If you run into any issues, review
+If you run into any issues, review these articles:
 
 - [Common errors](backup-azure-vms-troubleshoot.md) when backing up and restoring encrypted Azure VMs.
 - [Azure VM agent/backup extension](backup-azure-troubleshoot-vm-backup-fails-snapshot-timeout.md) issues.
diff --git a/articles/data-factory/connector-oracle.md b/articles/data-factory/connector-oracle.md
@@ -205,7 +205,7 @@ To copy data from Oracle, set the source type in the copy activity to `OracleSou
 | partitionNames | The list of physical partitions that needs to be copied. <br>Apply when the partition option is `PhysicalPartitionsOfTable`. If you use a query to retrieve the source data, hook `?AdfTabularPartitionName` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
 | partitionColumnName | Specify the name of the source column **in integer type** that will be used by range partitioning for parallel copy. If not specified, the primary key of the table is auto-detected and used as the partition column. <br>Apply when the partition option is `DynamicRange`. If you use a query to retrieve the source data, hook  `?AdfRangePartitionColumnName` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
 | partitionUpperBound | The maximum value of the partition column to copy data out. <br>Apply when the partition option is `DynamicRange`. If you use a query to retrieve the source data, hook `?AdfRangePartitionUpbound` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
-| PartitionLowerBound | The minimum value of the partition column to copy data out. <br>Apply when the partition option is `DynamicRange`. If you use a query to retrieve the source data, hook `?AdfRangePartitionLowbound` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
+| partitionLowerBound | The minimum value of the partition column to copy data out. <br>Apply when the partition option is `DynamicRange`. If you use a query to retrieve the source data, hook `?AdfRangePartitionLowbound` in the WHERE clause. For an example, see the [Parallel copy from Oracle](#parallel-copy-from-oracle) section. | No |
 
 **Example: copy data by using a basic query without partition**
 
diff --git a/articles/lab-services/classroom-labs/tutorial-setup-classroom-lab.md b/articles/lab-services/classroom-labs/tutorial-setup-classroom-lab.md
@@ -39,7 +39,7 @@ A lab owner can add other users to the **Lab Creator** role. For example, a lab
 2. Select **Sign in** and enter your credentials. Azure Lab Services supports organizational accounts and Microsoft accounts. 
 3. In the **New Lab** window, do the following actions: 
     1. Specify a **name** for your lab. 
-    2. Specify the maximum **number of virtual machines** in the lab. You can increase or decreate the number of VMs after creating the lab or in an existing lab. For more information, see [Update number of VMs in a lab](how-to-configure-student-usage.md#update-number-of-virtual-machines-in-lab)
+    2. Specify the maximum **number of virtual machines** in the lab. You can increase or decrease the number of VMs after creating the lab or in an existing lab. For more information, see [Update number of VMs in a lab](how-to-configure-student-usage.md#update-number-of-virtual-machines-in-lab)
     6. Select **Save**.
 
         ![Create a classroom lab](../media/tutorial-setup-classroom-lab/new-lab-window.png)
diff --git a/articles/managed-applications/publish-service-catalog-app.md b/articles/managed-applications/publish-service-catalog-app.md
@@ -134,6 +134,7 @@ Add the following starter JSON to the file and save it.
             "location": "[location()]"
         }
     }
+}
 ```
 
 To learn more, see [Get started with CreateUiDefinition](create-uidefinition-overview.md).
diff --git a/articles/network-watcher/network-watcher-nsg-flow-logging-overview.md b/articles/network-watcher/network-watcher-nsg-flow-logging-overview.md
@@ -54,7 +54,7 @@ Flow logs include the following properties:
 			* **flows** - a collection of flows
 				* **mac** - The MAC address of the NIC for the VM where the flow was collected
 				* **flowTuples** - A string that contains multiple properties for the flow tuple in comma-separated format
-					* **Time Stamp** - This value is the time stamp of when the flow occurred in UNIX EPOCH format
+					* **Time Stamp** - This value is the time stamp of when the flow occurred in UNIX epoch format
 					* **Source IP** - The source IP
 					* **Destination IP** - The destination IP
 					* **Source Port** - The source port

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ Add the following starter JSON to the file and save it.`
`134`	`134`	`"location": "[location()]"`
`135`	`135`	`}`
`136`	`136`	`}`
	`137`	`+}`
`137`	`138`	```
`138`	`139`
`139`	`140`	`To learn more, see [Get started with CreateUiDefinition](create-uidefinition-overview.md).`