Merge pull request #3058 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: gewarren

docs/cross-platform/system-requirements-for-the-visual-studio-emulator-for-android.md

@@ -121,11 +121,11 @@ Visual Studio Emulator for Android runs as a virtual machine on Hyper-V, the vir
  When you run the emulator, if you are not already a member of the Hyper-V Administrators group, you are prompted to join the group (the dialog box refers to the Windows Phone emulator). Joining the group requires administrator rights.  
 
 > [!IMPORTANT]
->  After you join the group, log off or reboot to make the change take effect.  
+> After you join the group, log off or reboot to make the change take effect.  
   
  ![Joining the Hyper-V Administrators security group](../cross-platform/media/android_emu_hyperv_admin.png "Android_Emu_HyperV_Admin")  
 
- To add yourself to a group manually, open the Local Users and Groups snap-in. For more information, see [Add a user account to a group](http://windows.microsoft.com/en-us/windows/add-user-account-to-group#1TC=windows-7). (This Windows 7 topic is also applicable to Windows 8.)  
+ To add yourself to a group manually, open the Local Users and Groups snap-in.  
 
 ##  <a name="BootableVHD"></a> Running the emulator from a bootable VHD is not supported  
  If you try to run an app on the Visual Studio Emulator for Android while you are running Windows from a bootable VHD, the emulator typically takes several minutes to start or fails to start. When the emulator fails to start, you see the following message: App deployment failed. Please try again.  
@@ -149,4 +149,4 @@ Visual Studio Emulator for Android runs as a virtual machine on Hyper-V, the vir
  In order for the emulator to emulate calls to the GPU, such as those used by OpenGL ES, your machine must have a DirectX compatible GPU with appropriate DirectX drivers installed.  
 
 ## See also  
- [Troubleshoot the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)
+ [Troubleshoot the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)

docs/cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md

@@ -128,7 +128,7 @@ This topic contains information to help you resolve issues that you may experien
 
      ![Android_Emu_V_Switch_Man](../cross-platform/media/android_emu_v_switch_man.png "Android_Emu_V_Switch_Man")  
 
-     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg -d command](http://windows.microsoft.com/en-us/windows-10/fix-network-connection-issues) (section 6).  
+     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg -d command](http://windows.microsoft.com/windows-10/fix-network-connection-issues) (section 6).  
 
 -   If these steps do not resolve the issue, see [Emulator fails to start (first use)](#NoStart) for information on 3rd party software that may be interfering with the emulator.  
 

docs/vs-2015/cross-platform/system-requirements-for-the-visual-studio-emulator-for-android.md

@@ -129,12 +129,12 @@ Visual Studio Emulator for Android runs as a virtual machine on Hyper-V, the vir
  When you run the emulator, if you are not already a member of the Hyper-V Administrators group, you are prompted to join the group (the dialog box refers to the Windows Phone emulator). Joining the group requires administrator rights.  
 
 > [!IMPORTANT]
->  After you join the group, log off or reboot to make the change take effect.  
+> After you join the group, log off or reboot to make the change take effect.  
   
  ![Joining the Hyper-V Administrators security group](../cross-platform/media/android-emu-hyperv-admin.png "Android_Emu_HyperV_Admin")  
 
- To add yourself to a group manually, open the Local Users and Groups snap-in. For more information, see [Add a user account to a group](http://windows.microsoft.com/en-us/windows/add-user-account-to-group#1TC=windows-7). (This Windows 7 topic is also applicable to Windows 8.)  
-  
+ To add yourself to a group manually, open the Local Users and Groups snap-in.
+ 
 ##  <a name="BootableVHD"></a> Running the emulator from a bootable VHD is not supported  
  If you try to run an app on the Visual Studio Emulator for Android while you are running Windows from a bootable VHD, the emulator typically takes several minutes to start or fails to start. When the emulator fails to start, you see the following message: App deployment failed. Please try again.  
 

docs/vs-2015/cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md

@@ -136,7 +136,7 @@ This topic contains information to help you resolve issues that you may experien
 
      ![Android_Emu_V_Switch_Man](../cross-platform/media/android-emu-v-switch-man.png "Android_Emu_V_Switch_Man")  
 
-     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg –d command](http://windows.microsoft.com/en-us/windows-10/fix-network-connection-issues) (section 6).  
+     If the setup is incorrect and you are using Windows 10, you might try  to [Reinstall network devices using netcfg –d command](http://windows.microsoft.com/windows-10/fix-network-connection-issues) (section 6).  
 
 -   If these steps do not resolve the issue, see [Emulator fails to start (first use)](#NoStart) for information on 3rd party software that may be interfering with the emulator.  
 

docs/vs-2015/extensibility/creating-an-options-page.md

@@ -110,7 +110,7 @@ This walkthrough creates a simple Tools/Options page that uses a property grid t
 
 2.  Add the following using statement.  
 
-    ```vb  
+    ```csharp  
     using System.Windows.Forms;  
     ```