Merge pull request #20415 from MicrosoftDocs/master

huypub · web-flow · commit 08dace2ee8a0 · 2021-10-08T15:34:07.000-07:00
10/08 PM Publish
diff --git a/docs/linux/sql-server-linux-ha-basics.md b/docs/linux/sql-server-linux-ha-basics.md
@@ -66,7 +66,8 @@ scp MyAGCert.cer username@servername:/folder/subfolder
 copies the file MyAGCert.cer to the folder specified on the other server. Note that you must have permissions - and possibly ownership - of the file to copy it, so `chown` may also need to be employed before copying. Similarly, on the receiving side, the right user needs access to manipulate the file. For example, to restore that certificate file, the `mssql` user must be able to access it.
 
 Samba, which is the Linux variant of server message block (SMB), can also be used to create shares accessed by UNC paths such as `\\SERVERNAME\SHARE`. For more information on configuring Samba, see the information at the following links for each distribution:
--   [RHEL](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Managing_Confined_Services/chap-Managing_Confined_Services-Samba.html)
+-   [RHEL](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/selinux_users_and_administrators_guide/chap-managing_confined_services-samba)
+
 -   [SLES](https://www.suse.com/documentation/sles11/book_sle_admin/data/cha_samba.html)
 -   [Ubuntu](https://help.ubuntu.com/community/Samba)
 
@@ -146,7 +147,7 @@ This solution is in some ways similar to, but in many ways different from deploy
 On Linux, while each supported distribution has Pacemaker available, each distribution can customize and have slightly different implementations and versions. Some of the differences will be reflected in the instructions in this article. The clustering layer is open source, so even though it ships with the distributions, it is not tightly integrated in the same way a WSFC is under Windows. This is why Microsoft provides *mssql-server-ha*, so that [!INCLUDE[ssnoversion-md](../includes/ssnoversion-md.md)] and the Pacemaker stack can provide close to, but not exactly the same, experience for AGs and FCIs as under Windows.
 
 For full documentation on Pacemaker, including a more in-depth explanation of what everything is with full reference information, for RHEL and SLES:
--   [RHEL](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/High_Availability_Add-On_Reference/ch-overview-HAAR.html)
+-   [RHEL](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/high_availability_add-on_reference/ch-overview-haar)
 -   [SLES](https://www.suse.com/documentation/sle_ha/book_sleha/data/book_sleha.html)
 
 Ubuntu does not have a guide for availability.
@@ -166,7 +167,7 @@ Pacemaker has standard and clone resources. Clone resources are ones that run si
 
 [!INCLUDE [bias-sensitive-term-t](../includes/bias-sensitive-term-t.md)]
 
-When an AG is created, it requires a specialized form of a clone resource called a multi-state resource. While an AG only has one primary replica, the AG itself is running across all nodes that it is configured to work on, and can potentially allow things such as read-only access. Because this is a "live" use of the node, the resources have the concept of two states: master and slave. For more information, see [Multi-state resources: Resources that have multiple modes](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Configuring_the_Red_Hat_High_Availability_Add-On_with_Pacemaker/s1-multistateresource-HAAR.html).
+When an AG is created, it requires a specialized form of a clone resource called a multi-state resource. While an AG only has one primary replica, the AG itself is running across all nodes that it is configured to work on, and can potentially allow things such as read-only access. Because this is a "live" use of the node, the resources have the concept of two states: master and slave. For more information, see [Multi-state resources: Resources that have multiple modes](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/high_availability_add-on_reference/s1-multistateresource-haar).
 
 #### Resource groups/sets
 
@@ -238,4 +239,4 @@ Currently, there is no direct way for a WSFC and a Pacemaker cluster to work tog
 On Linux, all nodes of a Pacemaker cluster must be on the same distribution. For example, this means that a RHEL node cannot be part of a Pacemaker cluster that has a SLES node. The main reason for this was previously stated: the distributions may have different versions and functionality, so things could not work properly. Mixing distributions has the same story as mixing WSFCs and Linux: use None or distributed AGs.
 
 ## Next steps
-[Deploy a Pacemaker cluster for SQL Server on Linux](sql-server-linux-deploy-pacemaker-cluster.md)
+[Deploy a Pacemaker cluster for SQL Server on Linux](sql-server-linux-deploy-pacemaker-cluster.md)
diff --git a/docs/linux/sql-server-linux-shared-disk-cluster-concepts.md b/docs/linux/sql-server-linux-shared-disk-cluster-concepts.md
@@ -20,7 +20,7 @@ To create a SQL Server FCI on Linux, see [Configure SQL Server FCI on Linux](sql
 
 ## The Clustering Layer
 
-* In RHEL, the clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/pdf/High_Availability_Add-On_Overview/Red_Hat_Enterprise_Linux-6-High_Availability_Add-On_Overview-en-US.pdf). 
+* In RHEL, the clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/pdf/high_availability_add-on_overview/red_hat_enterprise_linux-7-high_availability_add-on_overview-en-us.pdf). 
 
     > [!NOTE] 
     > Access to Red Hat HA add-on and documentation requires a subscription. 
diff --git a/docs/linux/sql-server-linux-shared-disk-cluster-configure-iscsi.md b/docs/linux/sql-server-linux-shared-disk-cluster-configure-iscsi.md
@@ -32,7 +32,7 @@ The most important thing to ensure is completed on the target is that the disks
 This section will cover how to configure an iSCSI initiator on the servers that will serve as nodes for the FCI. The instructions should work as is on RHEL and Ubuntu.
 
 For more information on iSCSI initiator for the supported distributions, consult the following links:
-- [Red Hat](https://access.redhat.com/documentation/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/iscsi-api.html)
+- [Red Hat](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/storage_administration_guide/osm-create-iscsi-initiator)
 - [SUSE](https://www.suse.com/documentation/sles11/stor_admin/data/sec_inst_system_iscsi_initiator.html) 
 - [Ubuntu](https://help.ubuntu.com/lts/serverguide/iscsi-initiator.html)
 
diff --git a/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-configure.md b/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-configure.md
@@ -15,7 +15,7 @@ ms.assetid: dcc0a8d3-9d25-4208-8507-a5e65d2a9a15
 
 [!INCLUDE [SQL Server - Linux](../includes/applies-to-version/sql-linux.md)]
 
-This guide provides instructions to create a two-node shared disk failover cluster for SQL Server on Red Hat Enterprise Linux. The clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/pdf/High_Availability_Add-On_Overview/Red_Hat_Enterprise_Linux-6-High_Availability_Add-On_Overview-en-US.pdf) built on top of [Pacemaker](https://clusterlabs.org/). The SQL Server instance is active on either one node or the other.
+This guide provides instructions to create a two-node shared disk failover cluster for SQL Server on Red Hat Enterprise Linux. The clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/pdf/high_availability_add-on_overview/red_hat_enterprise_linux-7-high_availability_add-on_overview-en-us.pdf) built on top of [Pacemaker](https://clusterlabs.org/). The SQL Server instance is active on either one node or the other.
 
 > [!NOTE] 
 > Access to Red Hat HA add-on and documentation requires a subscription. 
@@ -24,7 +24,7 @@ As the following diagram shows, storage is presented to two servers. Clustering
 
 ![Red Hat Enterprise Linux 7 Shared Disk SQL Cluster](./media/sql-server-linux-shared-disk-cluster-red-hat-7-configure/LinuxCluster.png) 
 
-For more information on cluster configuration, resource agents options, and management, visit [RHEL reference documentation](https://access.redhat.com/documentation/Red_Hat_Enterprise_Linux/7/html/High_Availability_Add-On_Reference/index.html).
+For more information on cluster configuration, resource agents options, and management, visit [RHEL reference documentation](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/high_availability_add-on_reference/index).
 
 
 > [!NOTE] 
diff --git a/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-operate.md b/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-operate.md
@@ -25,13 +25,13 @@ This document describes how to do the following tasks for SQL Server on a shared
 
 ## Architecture description
 
-The clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/pdf/High_Availability_Add-On_Overview/Red_Hat_Enterprise_Linux-6-High_Availability_Add-On_Overview-en-US.pdf) built on top of [Pacemaker](https://clusterlabs.org/). Corosync and Pacemaker coordinate cluster communications and resource management. The SQL Server instance is active on either one node or the other.
+The clustering layer is based on Red Hat Enterprise Linux (RHEL) [HA add-on](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/pdf/high_availability_add-on_overview/red_hat_enterprise_linux-7-high_availability_add-on_overview-en-us.pdf) built on top of [Pacemaker](https://clusterlabs.org/). Corosync and Pacemaker coordinate cluster communications and resource management. The SQL Server instance is active on either one node or the other.
 
 The following diagram illustrates the components in a Linux cluster with SQL Server. 
 
 ![Red Hat Enterprise Linux 7 Shared Disk SQL Cluster](./media/sql-server-linux-shared-disk-cluster-red-hat-7-configure/LinuxCluster.png) 
 
-For more information on cluster configuration, resource agents options, and management, visit [RHEL reference documentation](https://access.redhat.com/documentation/Red_Hat_Enterprise_Linux/7/html/High_Availability_Add-On_Reference/index.html).
+For more information on cluster configuration, resource agents options, and management, visit [RHEL reference documentation](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/high_availability_add-on_reference/index).
 
 ## <a name = "failManual"></a>Failover cluster manually
 
diff --git a/docs/machine-learning/python/reference/azureml-model-management-sdk/azureml-model-management-sdk.md b/docs/machine-learning/python/reference/azureml-model-management-sdk/azureml-model-management-sdk.md
@@ -36,7 +36,7 @@ This topic is a high-level description of package functionality. These classes a
 | Package details | Information |
 |--------|-|
 | Current version: |  1.0.1b7 |
-| Built on: | [Anaconda](https://www.continuum.io/why-anaconda) distribution of [Python 3.5](https://www.python.org/doc) |
+| Built on: | [Anaconda](https://www.anaconda.com/) distribution of [Python 3.5](https://www.python.org/doc) |
 | Package distribution: | [Machine Learning Server 9.x](/machine-learning-server/what-is-machine-learning-server) </br>[SQL Server 2017 Machine Learning Server (Standalone)](../../../r/r-server-standalone.md) |
 
 
diff --git a/docs/relational-databases/security/sql-server-certificates-and-asymmetric-keys.md b/docs/relational-databases/security/sql-server-certificates-and-asymmetric-keys.md
@@ -64,7 +64,7 @@ monikerRange: ">=aps-pdw-2016||=azuresqldb-current||=azure-sqldw-latest||>=sql-s
   
 | Tool | Purpose |
 | ---- | ------- |
-|[New-SelfSignedCertificate](/powershell/module/pkiclient/new-selfsignedcertificate)|Creates self-signed certificates.|  
+|[New-SelfSignedCertificate](/powershell/module/pki/new-selfsignedcertificate)|Creates self-signed certificates.|  
 |[makecert](/windows/desktop/SecCrypto/makecert)|Creates certificates. Deprecated in favor of **New-SelfSignedCertificate**.|  
 |[sn](/dotnet/framework/tools/sn-exe-strong-name-tool)|Creates strong names for symmetric keys.|  
   
diff --git a/docs/reporting-services/branding-the-web-portal.md b/docs/reporting-services/branding-the-web-portal.md
@@ -26,7 +26,7 @@ A brand package for Reporting Services consists of three items and is packaged a
 - metadata.xml  
 - logo.png (optional)  
   
-The files must have the names listed above. The zip file can be named however you like.  
+The files must have the names listed above. Package the files above into a zip file. The zip file can be named however you like.  
   
 ### metadata.xml
   
@@ -121,7 +121,7 @@ If you include a logo with your brand package, it will appear in the web portal
   
 The file you include for the logo must use the PNG file format. The file dimensions will be scaled once uploaded to the server. It should scale to around 290px x 60px.  
    
-## Applying the brand package to the web portal
+## <a name="#applying-the-brand-package-to-the-web-portal"></a>Applying the brand package to the web portal
   
 To add, download, or remove a brand package, you can do the following.  
   
@@ -137,7 +137,7 @@ To add, download, or remove a brand package, you can do the following.
   
 **Currently installed brand package** will either display the name of the package that has been uploaded, or it will display None.  
   
-**Upload brand package** will apply the package to the web portal. You will see it take effect immediately.  
+**Upload brand package** will prompt you to select a zip file from a local folder and then apply the package to the web portal. You will see it take effect immediately.  
   
 You can also **Download** or **Remove** the package. Removing the package will reset the web portal to the default brand immediately.  
   
@@ -253,6 +253,9 @@ You can also **Download** or **Remove** the package. Removing the package will r
 }  
 ```
 
+##  <a name="bkmk_download_samples"></a> To Download the Sample Branding Packages
+ Download the samples from the GitHub site [Sample Branding Packages](https://github.com/microsoft/sql-server-samples/tree/master/samples/features/reporting-services/branding) to a local folder. For more information, see the section [Applying the brand package to the web portal](#applying-the-brand-package-to-the-web-portal) in this article. 
+
 ## Next steps
 
 More questions? [Try asking the Reporting Services forum](/answers/search.html?c=&f=&includeChildren=&q=ssrs+OR+reporting+services&redirect=search%2fsearch&sort=relevance&type=question+OR+idea+OR+kbentry+OR+answer+OR+topic+OR+user)
diff --git a/docs/t-sql/statements/deny-object-permissions-transact-sql.md b/docs/t-sql/statements/deny-object-permissions-transact-sql.md
@@ -70,7 +70,7 @@ PRIVILEGES
  Specifies the name of a column in a table, view, or table-valued function on which the permission is being denied. The parentheses **( )** are required. Only SELECT, REFERENCES, and UPDATE permissions can be denied on a column. *column* can be specified in the permissions clause or after the securable name.  
   
 > [!CAUTION]  
->  A table-level DENY does not take precedence over a column-level GRANT. This inconsistency in the permissions hierarchy has been preserved for backward compatibility. In SQL Server this behavior is different if the Server is configured to run with the [Common Criteria Compliance Enabled Server Configuration](/../../database-engine/configure-windows/common-criteria-compliance-enabled-server-configuration-option.md). However, this should generally only be used with caution and not as a general practice.
+>  A table-level DENY does not take precedence over a column-level GRANT. This inconsistency in the permissions hierarchy has been preserved for backward compatibility. In SQL Server this behavior is different if the Server is configured to run with the [Common Criteria Compliance Enabled Server Configuration](/sql/database-engine/configure-windows/common-criteria-compliance-enabled-server-configuration-option). However, this should generally only be used with caution and not as a general practice.
   
  ON [ OBJECT **::** ] [ *schema_name* ] **.** *object_name*  
  Specifies the object on which the permission is being denied. The OBJECT phrase is optional if *schema_name* is specified. If the OBJECT phrase is used, the scope qualifier (**::**) is required. If *schema_name* is not specified, the default schema is used. If *schema_name* is specified, the schema scope qualifier (**.**) is required.  
