Merge pull request #4931 from MicrosoftDocs/master

6/27/2019 AM Publish

Author: Taojunshen

docs/containers/troubleshooting-docker-errors.md

@@ -51,6 +51,31 @@ which will refresh the network-related components on your host machine.
 
 When using Docker for macOS, you might encounter an error referencing the folder /usr/local/share/dotnet/sdk/NuGetFallbackFolder. Add the folder to the File Sharing tab in Docker
 
+## Docker users group
+
+You might encounter the following error in Visual Studio when working with containers:
+
+```
+The current user must be in the 'docker-users' group to use Docker Desktop. 
+Add yourself to the 'docker-users' group and then log out of Windows.
+```
+
+You must be a member of the 'docker-users' group in order to have permissions to work with Docker containers.  To add yourself to the group in Windows 10, follow these steps:
+
+1. From the Start menu, open **Computer Management**.
+1. Expand **Local Users and Groups**, and choose **Groups**.
+1. Find the **docker-users** group, right-click and choose **Add to group**.
+1. Add your user account or accounts.
+1. Sign out and sign back in again for these changes to take effect.
+
+You can also use the `net localgroup` command at the Administrator command prompt to add users to specific groups.
+
+```cmd
+net localgroup docker-users DOMAIN\username /add
+```
+
+In PowerShell, use the [Add-LocalGroupMember](/powershell/module/microsoft.powershell.localaccounts/add-localgroupmember) function.
+
 ## Microsoft/DockerTools GitHub repo
 
 For any other issues you encounter, see  [Microsoft/DockerTools](https://github.com/microsoft/dockertools/issues) issues.

docs/data-tools/entity-data-model-tools-in-visual-studio.md

@@ -13,7 +13,10 @@ ms.workload:
 
 Entity Framework is an object-relational mapping technology that enables .NET developers to work with relational data by using domain-specific objects. It eliminates the need for most of the data-access code that developers usually need to write. Entity Framework is the recommended object-relational mapping (ORM) modeling technology for new .NET applications.
 
-Entity Framework Tools are designed to help you build Entity Framework (EF) applications. The complete documentation for Entity Framework is here: [EF Core and EF 6](/ef/).
+Entity Framework Tools are designed to help you build Entity Framework (EF) applications. The complete documentation for Entity Framework is here: [Overview - EF 6](/ef/ef6/).
+
+  > [!NOTE]
+  > The Entity Framework Tools described on this page are used to generate *.edmx* files, which are not supported in EF Core. To generate an EF Core model from an existing database, see [Reverse Engineering - EF Core](/ef/core/managing-schemas/scaffolding). For more information on the differences between EF 6 and EF Core, see [Compare EF 6 and EF Core](/ef/efcore-and-ef6/).
 
 With Entity Framework Tools, you can create a *conceptual model* from an existing database and then graphically visualize and edit your conceptual model. Or, you can graphically create a conceptual model first, and then generate a database that supports your model. In either case, you can automatically update your model when the underlying database changes and automatically generate object-layer code for your application. Database generation and object-layer code generation are customizable.
 

docs/modeling/includes/modeling_sdk_info.md

@@ -2,4 +2,4 @@
 ms.topic: include
 ---
 > [!NOTE]
-> The **Text Template Transformation** component is automatically installed as part of the **Visual Studio extension development** workload. You can also install it from the **Individual components** tab of Visual Studio Installer, under the **Code tools** category. Install the **Modeling SDK** component from the **Individual components** tab.
+> The **Text Template Transformation** component is automatically installed as part of the **Visual Studio extension development** workload. You can also install it from the **Individual components** tab of Visual Studio Installer, under the **SDKs, libraries, and frameworks** category. Install the **Modeling SDK** component from the **Individual components** tab.