Skip to content

Commit 899aa77

Browse files
authored
Merge pull request #110026 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents ebbb8b1 + 3dc248a commit 899aa77

File tree

7 files changed

+8
-13
lines changed

7 files changed

+8
-13
lines changed

articles/active-directory/hybrid/whatis-azure-ad-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure AD Connect is the Microsoft tool designed to meet and accomplish your hybr
2121
- [Pass-through authentication](how-to-connect-pta.md) - A sign-in method that allows users to use the same password on-premises and in the cloud, but doesn't require the additional infrastructure of a federated environment.
2222
- [Federation integration](how-to-connect-fed-whatis.md) - Federation is an optional part of Azure AD Connect and can be used to configure a hybrid environment using an on-premises AD FS infrastructure. It also provides AD FS management capabilities such as certificate renewal and additional AD FS server deployments.
2323
- [Synchronization](how-to-connect-sync-whatis.md) - Responsible for creating users, groups, and other objects. As well as, making sure identity information for your on-premises users and groups is matching the cloud. This synchronization also includes password hashes.
24-
- [Health Monitoring](whatis-hybrid-identity-health.md) - Azure AD Connect Health can provide robust monitoring and provide a central location in the Azure portal to view this activity.
24+
- [Health Monitoring](whatis-hybrid-identity-health.md) - Azure AD Connect Health can provide robust monitoring and provide a central location in the Azure portal to view this activity.
2525

2626

2727
![What is Azure AD Connect](./media/whatis-hybrid-identity/arch.png)

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
3939
To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
4040

4141
- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
42-
- JIRA Core and Software 6.4 to 8.5.1 or JIRA Service Desk 3.0 to 4.6.0 should installed and configured on Windows 64-bit version
42+
- JIRA Core and Software 6.4 to 8.8.0 or JIRA Service Desk 3.0 to 4.8.0 should installed and configured on Windows 64-bit version
4343
- JIRA server is HTTPS enabled
4444
- Note the supported versions for JIRA Plugin are mentioned in below section.
4545
- JIRA server is reachable on internet particularly to Azure AD Login page for authentication and should able to receive the token from Azure AD
@@ -57,8 +57,8 @@ To get started, you need the following items:
5757

5858
## Supported versions of JIRA
5959

60-
* JIRA Core and Software: 6.4 to 8.5.1
61-
* JIRA Service Desk 3.0.0 to 4.6.0
60+
* JIRA Core and Software: 6.4 to 8.8.0
61+
* JIRA Service Desk 3.0.0 to 4.8.0
6262
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
6363

6464
> [!NOTE]

articles/azure-resource-manager/management/manage-resource-groups-portal.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ A resource group is a container that holds related resources for an Azure soluti
2323

2424
The resource group stores metadata about the resources. Therefore, when you specify a location for the resource group, you are specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region.
2525

26-
The resource group stores metadata about the resources. When you specify a location for the resource group, you're specifying where that metadata is stored.
2726

2827
## Create resource groups
2928

@@ -107,4 +106,4 @@ For information about exporting templates, see [Single and multi-resource export
107106
- To learn Azure Resource Manager, see [Azure Resource Manager overview](overview.md).
108107
- To learn the Resource Manager template syntax, see [Understand the structure and syntax of Azure Resource Manager templates](../templates/template-syntax.md).
109108
- To learn how to develop templates, see the [step-by-step tutorials](/azure/azure-resource-manager/).
110-
- To view the Azure Resource Manager template schemas, see [template reference](/azure/templates/).
109+
- To view the Azure Resource Manager template schemas, see [template reference](/azure/templates/).

articles/key-vault/create-certificate-scenarios.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ ms.author: mbaldwin
1717
# Monitor and manage certificate creation
1818
Applies To: Azure
1919

20-
The following
21-
2220
The scenarios / operations outlined in this article are:
2321

2422
- Request a KV Certificate with a supported issuer

articles/kinect-dk/sensor-sdk-download.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This page has the download links for each version of the Azure Kinect Sensor SDK
2323

2424
## Windows download link
2525

26-
[Microsoft installer](https://download.microsoft.com/download/e/6/6/e66482b2-b6c1-4e34-bfee-95294163fc40/Azure%20Kinect%20SDK%201.3.0.exe) | [GitHub source code](https://github.com/microsoft/Azure-Kinect-Sensor-SDK/issues/800)
26+
[Microsoft installer](https://download.microsoft.com/download/4/5/a/45aa3917-45bf-4f24-b934-5cff74df73e1/Azure%20Kinect%20SDK%201.4.0.exe) | [GitHub source code](https://github.com/microsoft/Azure-Kinect-Sensor-SDK/issues/1093)
2727

2828
> [!NOTE]
2929
> When installing the SDK, remember the path you install to. For example, "C:\Program Files\Azure Kinect SDK 1.2". You will find the tools referenced in articles in this path.

articles/sql-database/sql-database-managed-instance-failover-group-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ Create the gateway for the virtual network of your primary managed instance usin
750750
| --- | --- |
751751
| **Subscription** | The subscription where your primary managed instance is. |
752752
| **Name** | The name for your virtual network gateway, such as `primary-mi-gateway`. |
753-
| **Region** | The region where your secondary managed instance is. |
753+
| **Region** | The region where your primary managed instance is. |
754754
| **Gateway type** | Select **VPN**. |
755755
| **VPN Type** | Select **Route-based** |
756756
| **SKU**| Leave default of `VpnGw1`. |

articles/synapse-analytics/sql-data-warehouse/cheat-sheet.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ Learn more how to work with [resource classes and concurrency](resource-classes-
118118
A key feature of Azure Synapse is the ability to [manage compute resources](sql-data-warehouse-manage-compute-overview.md). You can pause SQL pool when you're not using it, which stops the billing of compute resources. You can scale resources to meet your performance demands. To pause, use the [Azure portal](../../synapse-analytics/sql-data-warehouse/pause-and-resume-compute-portal.md) or [PowerShell](../../synapse-analytics/sql-data-warehouse/pause-and-resume-compute-powershell.md). To scale, use the [Azure portal](quickstart-scale-compute-portal.md), [Powershell](quickstart-scale-compute-powershell.md), [T-SQL](quickstart-scale-compute-tsql.md), or a [REST API](sql-data-warehouse-manage-compute-rest-api.md#scale-compute).
119119

120120

121-
A key feature of Azure Synapse is the ability to [manage compute resources](sql-data-warehouse-manage-compute-overview.md). You can pause SQL pool when you're not using it, which stops the billing of compute resources. You can scale resources to meet your performance demands. To pause, use the [Azure portal](../../sql-data-warehouse/pause-and-resume-compute-portal.md) or [PowerShell](../../sql-data-warehouse/pause-and-resume-compute-powershell.md). To scale, use the [Azure portal](quickstart-scale-compute-portal.md), [Powershell](quickstart-scale-compute-powershell.md), [T-SQL](quickstart-scale-compute-tsql.md), or a [REST API](sql-data-warehouse-manage-compute-rest-api.md#scale-compute).
122-
123121
Autoscale now at the time you want with Azure Functions:
124122

125123
<a href="https://ms.portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Fsql-data-warehouse-samples%2Fmaster%2Farm-templates%2FsqlDwTimerScaler%2Fazuredeploy.json" target="_blank">
@@ -136,4 +134,4 @@ Deploy in one click your spokes in SQL databases from SQL pool:
136134

137135
<a href="https://ms.portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Fsql-data-warehouse-samples%2Fmaster%2Farm-templates%2FsqlDwSpokeDbTemplate%2Fazuredeploy.json" target="_blank">
138136
<img src="https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.png"/>
139-
</a>
137+
</a>

0 commit comments

Comments
 (0)