Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into asc-melvyn-test

Author: memildin

articles/app-service/networking/private-endpoint.md

@@ -88,7 +88,7 @@ For example, the name resolution will be:
 
 |Name |Type |Value |Remark |
 |-----|-----|------|-------|
-|mywebapp.azurewebsites.net|CNAME|mywebapp.privatelink.azurewebsites.net|
+|mywebapp.azurewebsites.net|CNAME|mywebapp.privatelink.azurewebsites.net|<--Azure creates this entry in Azure Public DNS to point the app service to the privatelink and this is managed by us|
 |mywebapp.privatelink.azurewebsites.net|A|10.10.10.8|<--You manage this entry in your DNS system to point to your Private Endpoint IP address|
 
 After this DNS configuration you can reach your Web App privately with the default name mywebappname.azurewebsites.net. You must use this name, because the default certificate is issued for *.azurewebsites.net.

articles/media-services/video-indexer/media/video-indexer-get-started/progress.png

@@ -68,15 +68,15 @@ See the [input container/file formats](../latest/media-encoder-standard-formats.
 > A name of the video must be no greater than 80 characters.
 
 1. Sign in on the [Video Indexer](https://www.videoindexer.ai/) website.
-2. To upload a video, press the **Upload** button or link.
+1. To upload a video, press the **Upload** button or link.
 
-    ![Upload](./media/video-indexer-get-started/video-indexer-upload.png)
+    > [!div class="mx-imgBorder"]
+    > :::image type="content" source="./media/video-indexer-get-started/video-indexer-upload.png" alt-text="Upload":::
+1. Once your video has been uploaded, Video Indexer starts indexing and analyzing the video.
 
-    Once your video has been uploaded, Video Indexer starts indexing and analyzing the video.
-
-    ![Uploaded](./media/video-indexer-get-started/video-indexer-uploaded.png) 
-
-    Once Video Indexer is done analyzing, you will get a notification with a link to your video and a short description of what was found in your video. For example: people, topics, OCRs.
+    > [!div class="mx-imgBorder"]
+    > :::image type="content" source="./media/video-indexer-get-started/progress.png" alt-text="Progress of the upload":::
+1. Once Video Indexer is done analyzing, you will get an email with a link to your video and a short description of what was found in your video. For example: people, topics, OCRs.
 
 ## <a name="apis"></a>Upload and index with API
 

articles/media-services/video-indexer/media/video-indexer-get-started/uploaded.png

@@ -9,7 +9,7 @@ manager: femila
 ms.service: media-services
 ms.subservice: video-indexer
 ms.topic: quickstart
-ms.date: 03/17/2020
+ms.date: 10/19/2020
 ms.author: juliako
 ---
 
@@ -35,24 +35,28 @@ See the [input container/file formats](../latest/media-encoder-standard-formats.
 ### Upload a video
 
 1. Sign in on the [Video Indexer](https://www.videoindexer.ai/) website.
-2. To upload a video, press the **Upload** button or link.
+1. To upload a video, press the **Upload** button or link.
 
     > [!NOTE]
     > The name of the video must be no greater than 80 characters.
 
-    ![Upload](./media/video-indexer-get-started/video-indexer-upload.png)
+    > [!div class="mx-imgBorder"]
+    > :::image type="content" source="./media/video-indexer-get-started/video-indexer-upload.png" alt-text="Upload":::
+1. Once your video has been uploaded, Video Indexer starts indexing and analyzing the video. You see the progress. 
 
-    Once your video has been uploaded, Video Indexer starts indexing and analyzing the video.
-
-    ![Uploaded](./media/video-indexer-get-started/video-indexer-uploaded.png) 
-
-    Once Video Indexer is done analyzing, you will get a notification with a link to your video and a short description of what was found in your video. For example: people, topics, OCRs.
+    > [!div class="mx-imgBorder"]
+    > :::image type="content" source="./media/video-indexer-get-started/progress.png" alt-text="Progress of the upload":::
+1. Once Video Indexer is done analyzing, you will get an email with a link to your video and a short description of what was found in your video. For example: people, spoken and written words, topics, and named entities.
+1. You can later find your video in the library list and perform different operations. For example: search, re-index, edit.
 
+    > [!div class="mx-imgBorder"]
+    > :::image type="content" source="./media/video-indexer-get-started/uploaded.png" alt-text="Uploaded the upload":::
+ 
 ## See also
 
 See [Upload and index videos](upload-index-videos.md) for more details.
 
-After you upload and index a video, you can start using [Video Indexer](video-indexer-view-edit.md) website or [Video Indexer Developer Portal](video-indexer-use-apis.md) to see the insights of the video. 
+After you upload and index a video, you can start using [Video Indexer website](video-indexer-view-edit.md) or [Video Indexer Developer Portal](video-indexer-use-apis.md) to see the insights of the video. 
 
 [Start using APIs](video-indexer-use-apis.md)
 

articles/media-services/video-indexer/media/video-indexer-get-started/video-indexer-upload.png

@@ -49,20 +49,25 @@ You can check your extension version by using the Azure portal, the Azure CLI, o
 Run the following command from an Azure CLI prompt:
 
 ```azurecli
-az vm extension list --resource-group  <ResourceGroupName> --vm-name <VMName>
+az vm get-instance-view --resource-group  "SampleRG" --name "Sample-VM"
 ```
+Locate **"AzureNetworkWatcherExtension"** in the output and identify the version number from the *“TypeHandlerVersion”* field in the output.  
+Please note: Information about the extension appears multiple times in the JSON output. Please look under the "extensions" block and you should see the full version number of the extension. 
 
-Locate the AzureNetworkWatcher extension in the output. Identify the version number in the "TypeHandlerVersion" field in the output.  
+You should see something like the below:
+![Azure CLI Screenshot](./media/network-watcher/azure-cli-screenshot.png)
 
 #### Use PowerShell
 
 Run the following commands from a PowerShell prompt:
 
 ```powershell
-Get-AzVMExtension -ResourceGroupName <ResourceGroupName> -VMName <VMName>  
+Get-AzVM -ResourceGroupName "SampleRG" -Name "Sample-VM" -Status
 ```
+Locate the Azure Network Watcher extension in the output and identify the version number from the *“TypeHandlerVersion”* field in the output.   
 
-Locate the AzureNetworkWatcher extension in the output. Identify the version number in the "TypeHandlerVersion" field in the output.
+You should see something like the below:
+![PowerShell Screenshot](./media/network-watcher/powershell-screenshot.png)
 
 ### Update your extension
 
@@ -80,6 +85,25 @@ Set-AzVMExtension `  -ResourceGroupName "myResourceGroup1" `  -Location "WestUS"
 Set-AzVMExtension `  -ResourceGroupName "myResourceGroup1" `  -Location "WestUS" `  -VMName "myVM1" `  -Name "AzureNetworkWatcherExtension" `  -Publisher "Microsoft.Azure.NetworkWatcher" -Type "NetworkWatcherAgentWindows"   
 ```
 
+If that doesn't work. Remove and install the extension again, using the steps below. This will automatically add the latest version.
+
+Removing the extension 
+
+```powershell
+#Same command for Linux and Windows
+Remove-AzVMExtension -ResourceGroupName "SampleRG" -VMName "Sample-VM" -Name "AzureNetworkWatcherExtension"
+``` 
+
+Installing the extension again
+
+```powershell
+#Linux command
+Set-AzVMExtension -ResourceGroupName "SampleRG" -Location "centralus" -VMName "Sample-VM" -Name "AzureNetworkWatcherExtension" -Publisher "Microsoft.Azure.NetworkWatcher" -Type "NetworkWatcherAgentLinux" -typeHandlerVersion "1.4"
+
+#Windows command
+Set-AzVMExtension -ResourceGroupName "SampleRG" -Location "centralus" -VMName "Sample-VM" -Name "AzureNetworkWatcherExtension" -Publisher "Microsoft.Azure.NetworkWatcher" -Type "NetworkWatcherAgentWindows" -typeHandlerVersion "1.4"
+```
+
 #### Option 2: Use the Azure CLI
 
 Force an upgrade.
@@ -119,4 +143,4 @@ If you have auto-upgrade set to true for the Network Watcher extension, reboot y
 
 ## Support
 
-If you need more help at any point in this article, see the Network Watcher extension documentation for [Linux](./network-watcher-linux.md) or [Windows](./network-watcher-windows.md). You can also contact the Azure experts on the [MSDN Azure and Stack Overflow forums](https://azure.microsoft.com/support/forums/). Alternatively, file an Azure support incident. Go to the [Azure support site](https://azure.microsoft.com/support/options/), and select **Get support**. For information about using Azure Support, read the [Microsoft Azure support FAQ](https://azure.microsoft.com/support/faq/).
+If you need more help at any point in this article, see the Network Watcher extension documentation for [Linux](./network-watcher-linux.md) or [Windows](./network-watcher-windows.md). You can also contact the Azure experts on the [MSDN Azure and Stack Overflow forums](https://azure.microsoft.com/support/forums/). Alternatively, file an Azure support incident. Go to the [Azure support site](https://azure.microsoft.com/support/options/), and select **Get support**. For information about using Azure Support, read the [Microsoft Azure support FAQ](https://azure.microsoft.com/support/faq/).