trying again

windows/deployment/update/windows-analytics-FAQ-troubleshooting.md

@@ -99,57 +99,6 @@ If you know that devices are experiencing stop error crashes that do not seem to
    [![Event viewer detail showing Event 1001 details](images/event_1001.png)](images/event_1001.png)
  
    You can use the following Windows PowerShell snippet to summarize recent occurences of Event 1001. Most events should have a value for BucketID (a few intermittent blank values are OK, however).
-<<<<<<< HEAD
-
-   ```powershell
-
-   $limitToMostRecentNEvents = 20
-   Get-WinEvent -FilterHashTable @{ProviderName="Windows Error Reporting"; ID=1001} | 
-     ?{ $_.Properties[2].Value -match "crash|blue" } |
-     % { [pscustomobject]@{ 
-       TimeCreated=$_.TimeCreated
-       WEREvent=$_.Properties[2].Value
-       BucketId=$_.Properties[0].Value
-       ContextHint = $(
-          if($_.Properties[2].Value -eq "bluescreen"){"kernel"}
-          else{ $_.Properties[5].Value }
-       )
-     }} | Select-Object -First $limitToMostRecentNEvents
-
-
-   ```
-   The output should look something like this:
-
-   [![Typical out put of this PowerShell snippet](images/device-reliability-event1001-PSoutput.png)](images/device-reliablity-event1001-PSoutput.png)
-
-6. Check that some other installed device, app, or crash monitoring solution is not intercepting crash events.
-7. Wait 48 hours for activity to appear in the reports.
-8. If you need additional troubleshooting, contact Microsoft Support.
-
-#### Endpoint connectivity
-
-Devices must be able to reach the endpoints specified in [Enrolling devices in Windows Analytics](windows-analytics-get-started.md).
-
-If you are using proxy server authentication, it's worth taking extra care to check the configuration. Prior to Windows 10, version 1703, WER only uploads error reports in the machine context, so whitelisting endpoints to allow non-authenticated access was typically used. In Windows 10, version 1703 and later versions, WER will attempt to use the context of the user that is logged on for proxy authentication such that only the user account requires proxy access.
-
-
-For more information, see [Enrolling devices in Windows Analytics](windows-analytics-get-started.md#configuring-endpoint-access-with-proxy-server-authentication).
-
-### Apps not appearing in Device Health App Reliability
-
-[![App Reliability tile showing relability events trend](images/app-reliability.png)](images/app-reliability.png)
-
-If apps that you know are crashing do not appear in App Reliability, follow these steps to investigate the issue:
-
-1. Double-check the steps in the [Devices not appearing in Device Health Device Reliability](#devices-not-appearing-in-device-health-device-reliability) and [Device crashes not appearing in Device Health Device Reliability](#device-crashes-not-appearing-in-device-health-device-reliability) sections of this topic.
-2. Confirm that an in-scope application has crashed on an enrolled device. Keep the following points in mind:
-    - Not all user-mode crashes are included in App Reliability, which tracks only apps that have a GUI, have been used interactively by a user, and are not part of the operating system.
-    - Enrolling more devices helps to ensure that there are enough naturally occurring app crashes.
-    - You can also use test apps which are designed to crash on demand.
-
-3. Verify that *per-user* Windows Error Reporting (WER) is not disabled or redirected by confirming the registry settings in **HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting** (or **HKCU\Software\Policies\Microsoft\Windows\DataCollection**, which will take precedence if set):
-
-=======
 
    ```powershell
    $limitToMostRecentNEvents = 20
@@ -195,7 +144,6 @@ If apps that you know are crashing do not appear in App Reliability, follow thes
 
 3. Verify that *per-user* Windows Error Reporting (WER) is not disabled or redirected by confirming the registry settings in **HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting** (or **HKCU\Software\Policies\Microsoft\Windows\DataCollection**, which will take precedence if set):
 
->>>>>>> 3e50323e04da8c8c155ca39ad5e95f7e4447b349
     - Verify that the value "Disabled" (REG_DWORD), if set, is 0.
     - Verify that the value "DontSendAdditionalData" (REG_DWORD), if set, is 0.
     - Verify that the value "CorporateWERServer" (REG_SZ) is not configured.