Merge pull request #10502 from MicrosoftDocs/master

Sync with master

Author: MikeRayMSFT

.openpublishing.redirection.json

@@ -14379,6 +14379,11 @@
             "source_path": "docs/reporting-services/reports/view-and-explore-native-mode-reports-using-sharepoint-web-parts-ssrs.md",
             "redirect_url": "/sql/reporting-services/report-server-sharepoint/report-viewer-web-part-sharepoint-site",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/relational-databases/security/encryption/service-master-key.md",
+            "redirect_url": "/sql/relational-databases/security/encryption/sql-server-and-database-encryption-keys-database-engine",
+            "redirect_document_id": true
         }
     ]
 }

docs/2014/integration-services/azure-data-lake-store-connection-manager.md

@@ -29,7 +29,7 @@ manager: craigg
 
         1. Specify values for the **User Name** and **Password** field. 
 
-        2. Click **Test Connection** button to test the connection. If you and your tenant administrator didn't consent SSIS to access your Azure Data Lake Store data before, you need click **Accept** button to consent SSIS to access your Azure Data Lake Store data in the pop out dialog. For more information about this consent experience, see [Integrating applications with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-integrating-applications#updating-an-application).
+        2. Click **Test Connection** button to test the connection. If you and your tenant administrator didn't consent SSIS to access your Azure Data Lake Store data before, you need click **Accept** button to consent SSIS to access your Azure Data Lake Store data in the pop out dialog. For more information about this consent experience, see [Integrating applications with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/plan-an-application-integration#integrating-applications-with-azure-ad).
 
         > [!NOTE] 
         > For Azure AD User Identity authentication option, multi-factor authentication and Microsoft account is NOT supported.

docs/2014/reporting-services/install-uninstall-and-report-builder-support.md

@@ -146,7 +146,7 @@ manager: kfile
 
  However, with additional configuration the report server is available to Report Builder users. You can add [!INCLUDE[ssRSnoversion](../includes/ssrsnoversion-md.md)] URLs to trusted sites. By default, Internet Explorer 7.0 or later runs in Protected Mode on Windows Vista, Windows Server 2008, and Windows 7. Protected Mode is a feature that blocks browser requests from reaching high-level processes that run on the same computer. You can disable protected mode for the report server applications by adding them as Trusted Sites. You must have administrator permission to make this change.  
 
- For more information about configuring [!INCLUDE[ssRSnoversion](../includes/ssrsnoversion-md.md)], see [Reporting Services Configuration Manager (del)](/sql/2014/sql-server/install/reporting-services-configuration-manager-native-mode) in the [Reporting Services documentation](https://go.microsoft.com/fwlink/?linkid=121312) on msdn.microsoft.com.  
+ For more information about configuring [!INCLUDE[ssRSnoversion](../includes/ssrsnoversion-md.md)], see [Reporting Services Configuration Manager (del)](https://docs.microsoft.com/sql/sql-server/install/reporting-services-configuration-manager-native-mode) in the [Reporting Services documentation](https://go.microsoft.com/fwlink/?linkid=121312) on msdn.microsoft.com.  
 
 
 ##  <a name="SampleDatabases"></a> SQL Server Sample Databases  

docs/2014/sql-server/install/create-a-report-server-database-ssrs-configuration-manager.md

@@ -66,6 +66,6 @@ manager: craigg
  When creating a report server database, be aware that not all editions of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] can be used to host the database. For more information, see the "Report Server Database Server Edition Requirements" section of [Features Supported by the Editions of SQL Server 2014](../../../2014/getting-started/features-supported-by-the-editions-of-sql-server-2014.md).  
 
 ## See Also  
- [Reporting Services Configuration Manager (del)](/sql/2014/sql-server/install/reporting-services-configuration-manager-native-mode)  
+ [Reporting Services Configuration Manager (del)](https://docs.microsoft.com/sql/sql-server/install/reporting-services-configuration-manager-native-mode)  
 
 

docs/advanced-analytics/concepts/security.md

@@ -106,7 +106,7 @@ By default, members of **SQLRUserGroup** have read and execute permissions on fi
 
 To protect sensitive resources on SQL Server, you can optionally define an access control list (ACL) that denies access to **SQLRUserGroup**. Conversely, you could also grant permissions to local data resources that exist on host computer, apart from SQL Server itself. 
 
-By design, **SQLRUserGroup** does not have a database login or permissions to any data. Under certain circumstances, you might want to create a login to allow loop back connections, particularly when a trusted Windows identity is the calling user. This capability is called [*implied authentication*](#implied-authentication). For more information, see [Add SQLRUserGroup as a database user](../../advanced-analytics/security/add-sqlrusergroup-to-database.md).
+By design, **SQLRUserGroup** does not have a database login or permissions to any data. Under certain circumstances, you might want to create a login to allow loop back connections, particularly when a trusted Windows identity is the calling user. This capability is called [*implied authentication*](#implied-authentication). For more information, see [Add SQLRUserGroup as a database user](../../advanced-analytics/security/create-a-login-for-sqlrusergroup.md).
 
 ## Identity mapping
 
@@ -122,7 +122,7 @@ During execution, Launchpad creates temporary folders to store session data, del
 
 Trusted connections are workable from R and Python script, but only with additional configuration. In the extensibility architecture, R and Python processes run under worker accounts, inheriting permissions from the parent **SQLRUserGroup**. When a connection string specifies `Trusted_Connection=True`, the identity of the worker account is presented on the connection request, which is unknown by default to SQL Server.
 
-To make trusted connections successful, you must create a database login for the **SQLRUserGroup**. After doing so, any trusted connection from any member of **SQLRUserGroup** has login rights to SQL Server. For step-by-step instructions, see [Add SQLRUserGroup to a database login](../../advanced-analytics/security/add-sqlrusergroup-to-database.md).
+To make trusted connections successful, you must create a database login for the **SQLRUserGroup**. After doing so, any trusted connection from any member of **SQLRUserGroup** has login rights to SQL Server. For step-by-step instructions, see [Add SQLRUserGroup to a database login](../../advanced-analytics/security/create-a-login-for-sqlrusergroup.md).
 
 Trusted connections are not the most widely used formulation of a connection request. When R or Python script specifies a connection, it can be more common to use a SQL login, or a fully-specified user name and password if the connection is to an ODBC data source.
 
@@ -148,4 +148,4 @@ In the case of [Always Encrypted](../../relational-databases/security/encryption
 
 In this article, you learned the components and interaction model of the security architecture built into the [extensibility framework](../../advanced-analytics/concepts/extensibility-framework.md). Key points covered in this article include the purpose of Launchpad, SQLRUserGroup and worker accounts, process isolation of R and Python, and how user identities are mapped to worker accounts. 
 
-As a next step, review the instructions for [granting permissions](../../advanced-analytics/security/user-permission.md). For servers that use Windows authentication, you should also review [Add SQLRUserGroup to a database login](../../advanced-analytics/security/add-sqlrusergroup-to-database.md) to learn when additional configuration is required.
+As a next step, review the instructions for [granting permissions](../../advanced-analytics/security/user-permission.md). For servers that use Windows authentication, you should also review [Add SQLRUserGroup to a database login](../../advanced-analytics/security/create-a-login-for-sqlrusergroup.md) to learn when additional configuration is required.

docs/advanced-analytics/install/sql-machine-learning-services-ver15.md

@@ -47,7 +47,7 @@ As with previous releases, the **SQLRUserGroup** continues to provide read and e
 
 ## Implied authentication
 
-As before, additional configuration is still required for *implied authentication* in cases where script or code has to connect back to SQL Server using trusted authentication to retrieve data or resources. The additional configuration involves creating a database login for **SQLRUserGroup**, whose sole member is now the single SQL Server Launchpad service account instead of multiple worker accounts. For more information about this task, see [Add SQLRUserGroup as a database user](../security/add-sqlrusergroup-to-database.md).
+As before, additional configuration is still required for *implied authentication* in cases where script or code has to connect back to SQL Server using trusted authentication to retrieve data or resources. The additional configuration involves creating a database login for **SQLRUserGroup**, whose sole member is now the single SQL Server Launchpad service account instead of multiple worker accounts. For more information about this task, see [Add SQLRUserGroup as a database user](../security/create-a-login-for-sqlrusergroup.md).
 
 
 ## Symbolic link created by Setup

docs/advanced-analytics/install/sql-r-services-windows-install.md

@@ -211,7 +211,7 @@ At the instance level, additional configuration might include:
 On the database, you might need the following configuration updates:
 
 * [Give users permission to SQL Server Machine Learning Services](../../advanced-analytics/security/user-permission.md)
-* [Add SQLRUserGroup as a database user](../../advanced-analytics/security/add-sqlrusergroup-to-database.md)
+* [Add SQLRUserGroup as a database user](../../advanced-analytics/security/create-a-login-for-sqlrusergroup.md)
 
 > [!NOTE]
 > Not all the listed changes are required, and none might be required. Requirements depend on your security schema, where you installed SQL Server, and how you expect users to connect to the database and run external scripts. Additional troubleshooting tips can be found here: [Upgrade and installation FAQ](../r/upgrade-and-installation-faq-sql-server-r-services.md)

docs/advanced-analytics/r/installing-sql-server-r-services-on-an-azure-virtual-machine.md

@@ -17,7 +17,7 @@ You can install R and Python integration with Machine Learning Services on a SQL
 
 For step by step instructions, see [How to provision a Windows SQL Server virtual machine in the Azure portal](https://docs.microsoft.com/azure/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-server-provision).
 
-The [Configure SQL server settings](https://docs.microsoft.com/azure/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-server-provision#4-configure-sql-server-settings) step is where you add machine learning to your instance.
+The [Configure SQL server settings](https://docs.microsoft.com/azure/virtual-machines/windows/sql/virtual-machines-windows-portal-sql-server-provision#3-configure-sql-server-settings) step is where you add machine learning to your instance.
 
 <a name="firewall"></a>
 
@@ -39,7 +39,7 @@ To enable access from remote data science clients:
 
 If you expect that clients calling the server will need to issue ODBC queries as part of their machine learning solutions, you must ensure that the Launchpad can make ODBC calls on behalf of the remote client. 
 
-To do this, you must allow the SQL worker accounts that are used by Launchpad to log into the instance. For more information, see [Add SQLRUserGroup as a database user](../security/add-sqlrusergroup-to-database.md).
+To do this, you must allow the SQL worker accounts that are used by Launchpad to log into the instance. For more information, see [Add SQLRUserGroup as a database user](../security/create-a-login-for-sqlrusergroup.md).
 
 <a name="network"></a>
 

docs/advanced-analytics/r/managing-and-monitoring-r-solutions.md

@@ -54,7 +54,7 @@ Least-privilege accounts are created during setup and placed in a Windows *user
 As a DBA, you can use SQL Server data security to specify who has permission to execute scripts, and that data used in jobs is managed under the same security roles that control access through T-SQL queries. As a system administrator, you can explicitly deny **SQLRUserGroup** access to sensitive data on the local server by creating ACLs.
 
 >[!NOTE]
-> By default, the **SQLRUserGroup** does not have a login or permissions in SQL Server itself. Should worker accounts require a login for data access, you must create it yourself. A scenario that specifically calls for the creation of a login is to support requests from a script in execution, for data or operations on the database engine instance, when the user identity is a Windows user and the connection string specifies a trusted user. For more information, see [Add SQLRUserGroup as a database user](../../advanced-analytics/security/add-sqlrusergroup-to-database.md).
+> By default, the **SQLRUserGroup** does not have a login or permissions in SQL Server itself. Should worker accounts require a login for data access, you must create it yourself. A scenario that specifically calls for the creation of a login is to support requests from a script in execution, for data or operations on the database engine instance, when the user identity is a Windows user and the connection string specifies a trusted user. For more information, see [Add SQLRUserGroup as a database user](../../advanced-analytics/security/create-a-login-for-sqlrusergroup.md).
 
 ## Disable script execution
 

docs/advanced-analytics/tutorials/quickstart-python-verify.md

@@ -57,7 +57,7 @@ If you get errors, there are a variety of things you can do to ensure that the i
 
 First, rule out any installation issues. Post-install configuration is required to enable use of external code libraries. See [Install SQL Server 2017 Machine Learning Services](../install/sql-machine-learning-services-windows-install.md). Likewise, make sure that the Launchpad service is running.
 
-You must also add the Windows user group `SQLRUserGroup` as a login on the instance, to ensure that Launchpad can provide communication between Python and SQL Server. (The same group is used for both R and Python code execution.) For more information, see [Enabled implied authentication](../security/add-sqlrusergroup-to-database.md).
+You must also add the Windows user group `SQLRUserGroup` as a login on the instance, to ensure that Launchpad can provide communication between Python and SQL Server. (The same group is used for both R and Python code execution.) For more information, see [Create a login for SQLRUserGroup](../security/create-a-login-for-sqlrusergroup.md).
 
 Additionally, you might need to enable network protocols that have been disabled, or open the firewall so that SQL Server can communicate with external clients. For more information, see [Troubleshooting setup](../common-issues-external-script-execution.md).