Skip to content

Commit d386c63

Browse files
authored
Merge pull request #7763 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents ebe4ac0 + d077562 commit d386c63

55 files changed

Lines changed: 70 additions & 70 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2688,12 +2688,12 @@
26882688
},
26892689
{
26902690
"source_path": "docs/relational-databases/replication/replication-to-sql-database.md",
2691-
"redirect_url": "https://docs.microsoft.com/en-us/azure/sql-database/replication-to-sql-database",
2691+
"redirect_url": "https://docs.microsoft.com/azure/sql-database/replication-to-sql-database",
26922692
"redirect_document_id": false
26932693
},
26942694
{
26952695
"source_path": "docs/relational-databases/replication/replication-with-sql-database-managed-instance.md",
2696-
"redirect_url": "https://docs.microsoft.com/en-us/azure/sql-database/replication-with-sql-database-managed-instance",
2696+
"redirect_url": "https://docs.microsoft.com/azure/sql-database/replication-with-sql-database-managed-instance",
26972697
"redirect_document_id": false
26982698
},
26992699
{

contributor-guide/templates/tutorial-template-annotated-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
<!------------------
33

4-
This is an annotated example of a tutorial with high CSAT (https://docs.microsoft.com/en-us/azure/app-service-web/web-sites-dotnet-get-started).
4+
This is an annotated example of a tutorial with high CSAT (https://docs.microsoft.com/azure/app-service-web/web-sites-dotnet-get-started).
55

66
Tutorials show users how to solve a problem. They include prerequisites and steps. They are not "learn concepts" topics.
77

contributor-guide/templates/tutorial-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
<!------------------
33

4-
This is an outline of a tutorial that has high CSAT (https://docs.microsoft.com/en-us/azure/app-service-web/web-sites-dotnet-get-started).
4+
This is an outline of a tutorial that has high CSAT (https://docs.microsoft.com/azure/app-service-web/web-sites-dotnet-get-started).
55

66
Tutorials show users how to solve a problem. They include prerequisites and steps. They are not "learn concepts" topics.
77

docs/2014/analysis-services/lesson-5-4-defining-dimension-granularity-within-a-measure-group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ manager: craigg
215215
![Sales Quota measure group dimensioned correctly](../../2014/tutorials/media/l5-granularity-7.gif "Sales Quota measure group dimensioned correctly")
216216

217217
## Next Lesson
218-
[Lesson 6: Defining Calculations]((lesson-6-defining-calculations.md)
218+
[Lesson 6: Defining Calculations](lesson-6-defining-calculations.md)
219219

220220
## See Also
221221
[Dimension Relationships](multidimensional-models-olap-logical-cube-objects/dimension-relationships.md)

docs/2014/database-engine/availability-groups/windows/monitor-availability-groups-transact-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ manager: craigg
7474
> [!NOTE]
7575
> Also see **sys.dm_hadr_availability_replica_cluster_nodes** and **sys.dm_hadr_availability_replica_cluster_states** in the [Monitoring Availability Replicas](#AvReplicas) section and **sys.availability_databases_cluster** and **sys.dm_hadr_database_replica_cluster_states** in the [Monitoring Availability Databases](#AvDbs) section, later in this topic.
7676
77-
For information about WSFC clusters and [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)], see [Windows Server Failover Clustering &#40;WSFC&#41; with SQL Server]((../../../sql-server/failover-clusters/windows/windows-server-failover-clustering-wsfc-with-sql-server.md) and [Failover Clustering and AlwaysOn Availability Groups &#40;SQL Server&#41;](failover-clustering-and-always-on-availability-groups-sql-server.md).
77+
For information about WSFC clusters and [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)], see [Windows Server Failover Clustering &#40;WSFC&#41; with SQL Server](../../../sql-server/failover-clusters/windows/windows-server-failover-clustering-wsfc-with-sql-server.md) and [Failover Clustering and AlwaysOn Availability Groups &#40;SQL Server&#41;](failover-clustering-and-always-on-availability-groups-sql-server.md).
7878

7979
## <a name="AvGroups"></a> Monitoring Availability Groups
8080
To monitor the availability groups for which the server instance hosts an availability replica, use the following views:

docs/2014/database-engine/behavior-changes-to-full-text-search.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ manager: craigg
9797
The full-text engine indexes the contents of the FILESTREAM BLOBs. Indexing files such as images might not be useful. When a FILESTREAM BLOB is updated it is reindexed.
9898

9999
## See Also
100-
[Full-Text Search]((../relational-databases/search/full-text-search.md)
100+
[Full-Text Search](../relational-databases/search/full-text-search.md)
101101
[Full-Text Search Backward Compatibility](../../2014/database-engine/full-text-search-backward-compatibility.md)
102102
[Upgrade Full-Text Search](../relational-databases/search/upgrade-full-text-search.md)
103103
[Get Started with Full-Text Search](../relational-databases/search/get-started-with-full-text-search.md)

docs/2014/database-engine/breaking-changes-to-full-text-search.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ manager: craigg
5353

5454
## See Also
5555
[Behavior Changes to Full-Text Search](../relational-databases/search/full-text-search.md)
56-
[Full-Text Search]((../relational-databases/search/full-text-search.md)
56+
[Full-Text Search](../relational-databases/search/full-text-search.md)
5757

5858

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ manager: craigg
3030

3131
1. Specify values for the **User Name** and **Password** field.
3232

33-
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/en-us/azure/active-directory/active-directory-integrating-applications#updating-an-application).
33+
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).
3434

3535
> [!NOTE]
3636
> For Azure AD User Identity authentication option, multi-factor authentication and Microsoft account is NOT supported.
3737
3838
2. If you selected **Azure AD Service Identity** authentication option, do the following:
3939
1. Create an AAD application and service principal that can access Azure Data Lake resources.
4040

41-
2. Assign this AAD application corresponding permissions to access your Azure Data Lake resources. For more information about this authentication option, see [Use portal to create Active Directory application and service principal that can access resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal).
41+
2. Assign this AAD application corresponding permissions to access your Azure Data Lake resources. For more information about this authentication option, see [Use portal to create Active Directory application and service principal that can access resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal).
4242

4343
3. Specify values for **Client Id**, **Secret Key** and **Tenant Name** field.
4444

docs/2014/integration-services/azure-resource-manager-connection-manager.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ ms.author: douglasl
1616
manager: craigg
1717
---
1818
# Azure Resource Manager Connection Manager
19-
The **Azure Resource Manager Connection Manager** enables an SSIS package to manage Azure resources using a [service principal](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal).
19+
The **Azure Resource Manager Connection Manager** enables an SSIS package to manage Azure resources using a [service principal](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal).
2020

2121
To create and configure an **Azure Resource Manager Connection Manager**, follow the steps below:
2222

2323
1. In the **Add SSIS Connection Manager** dialog box, select **AzureResourceManager**, and click **Add**.
24-
2. In the **Azure Resource Manager Connection Manager Editor** dialog box, specify the **Application ID**, **Application Key**, and **Tenant ID** for the service principal. For details about these properties, please refer to [this](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal) article.
24+
2. In the **Azure Resource Manager Connection Manager Editor** dialog box, specify the **Application ID**, **Application Key**, and **Tenant ID** for the service principal. For details about these properties, please refer to [this](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-create-service-principal-portal) article.
2525
3. Click **OK** to close the dialog box.
2626
4. You can see the properties of the connection manager you created in the **Properties** window.

docs/2014/integration-services/data-flow/transformations/aggregate-values-in-a-dataset-by-using-the-aggregate-transformation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ manager: craigg
6767
[Aggregate Transformation](aggregate-transformation.md)
6868
[Integration Services Transformations](integration-services-transformations.md)
6969
[Integration Services Paths](../integration-services-paths.md)
70-
[Data Flow Task]((../../control-flow/data-flow-task.md)
70+
[Data Flow Task](../../control-flow/data-flow-task.md)
7171

7272

0 commit comments

Comments
 (0)