Skip to content

Commit d014e76

Browse files
authored
Merge pull request #97139 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 0e91a81 + 6b58652 commit d014e76

File tree

10 files changed

+24
-20
lines changed

10 files changed

+24
-20
lines changed

articles/active-directory/devices/manage-stale-devices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ If your device is under control of Intune or any other MDM solution, retire the
8888

8989
### System-managed devices
9090

91-
Don't delete system-managed devices. These are generally devices such as auto-pilot. Once deleted, these devices can't be reprovisioned. The new `get-msoldevice` cmdlet excludes system-managed devices by default.
91+
Don't delete system-managed devices. These are generally devices such as Autopilot. Once deleted, these devices can't be reprovisioned. The new `get-msoldevice` cmdlet excludes system-managed devices by default.
9292

9393
### Hybrid Azure AD joined devices
9494

@@ -124,7 +124,7 @@ Disable or delete Azure AD registered devices in the Azure AD.
124124
125125
## Clean up stale devices in the Azure portal
126126

127-
While you can cleanup stale devices in the Azure portal, it is more efficient, to handle this process using a PowerShell script. Use the latest PowerShell V1 module to use the timestamp filter and to filter out system-managed devices such as auto-pilot. At this point, using PowerShell V2 is not recommended.
127+
While you can cleanup stale devices in the Azure portal, it is more efficient, to handle this process using a PowerShell script. Use the latest PowerShell V1 module to use the timestamp filter and to filter out system-managed devices such as Autopilot. At this point, using PowerShell V2 is not recommended.
128128

129129
A typical routine consists of the following steps:
130130

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The synchronization of a password has no impact on the Azure user who is signed
155155

156156
## Password hash sync process for Azure AD Domain Services
157157

158-
If you use Azure AD Domain Services to provide legacy authentication for applications and services that need to use Keberos, LDAP, or NTLM, some additional processes are part of the password hash synchronization flow. Azure AD Connect uses the additional following process to synchronize password hashes to Azure AD for use in Azure AD Domain Services:
158+
If you use Azure AD Domain Services to provide legacy authentication for applications and services that need to use Kerberos, LDAP, or NTLM, some additional processes are part of the password hash synchronization flow. Azure AD Connect uses the additional following process to synchronize password hashes to Azure AD for use in Azure AD Domain Services:
159159

160160
> [!IMPORTANT]
161161
> Azure AD Connect should only be installed and configured for synchronization with on-premises AD DS environments. It's not supported to install Azure AD Connect in an Azure AD DS managed domain to synchronize objects back to Azure AD.

articles/api-management/api-management-howto-add-products.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ In this tutorial, you learn how to:
5353
| Requires approval | Check **Require approval** if you want an administrator to review and accept or reject subscription attempts to this product. If the box is unchecked, subscription attempts are auto-approved. |
5454
| Subscription count limit | To limit the count of multiple simultaneous subscriptions, enter the subscription limit. |
5555
| Legal terms | You can include the terms of use for the product which subscribers must accept in order to use the product. |
56-
| APIs | Products are associations of one or more APIs. You can include a number of APIs and offer them to developers through the developer portal. <br/> You can add an existing API during the product creation. You can add an API to the product later, either from the Products **Settings** page or while creating an API. |
56+
| APIs | Products are associations of one or more APIs. You can include a number of APIs and offer them to developers through the developer portal. <br/> You can add an existing API during the product creation. You can add an API to the product later, either from the Product's **Settings** page or while creating an API. |
5757

5858
3. Click **Create** to create the new product.
5959

@@ -63,7 +63,7 @@ You can continue configuring the product after saving it by choosing the **Setti
6363

6464
View/add subscribers to the product from the **Subscriptions** tab.
6565

66-
Set visibility of a product for developers or guest from the **Access control** tab.
66+
Set visibility of a product for developers or guests from the **Access control** tab.
6767

6868
## <a name="add-apis"> </a>Add APIs to a product
6969

articles/azure-databricks/store-secrets-azure-key-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Sign in to the [Azure portal](https://portal.azure.com/).
124124

125125
4. Once your Azure Databricks workspace is open in a separate window, append **#secrets/createScope** to the URL. The URL should have the following format:
126126

127-
**https://<\location>.azuredatabricks.net/?o=<\id>#secrets/createScope**.
127+
**https://<\location>.azuredatabricks.net/#secrets/createScope**.
128128

129129
5. Enter a scope name, and enter the Azure Key Vault DNS name and Resource ID you saved earlier. Save the scope name in a text editor for use later in this tutorial. Then, select **Create**.
130130

articles/azure-monitor/insights/solution-office-365.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ To enable the administrative account for the first time, you must provide admini
197197
198198
The last step is to subscribe the application to your Log Analytics workspace. You also do this with a PowerShell script.
199199
200-
The last step is to subscribe the application to your Log Analytics workspace. You also do this with a PowerShell script.
201-
202200
1. Save the following script as *office365_subscription.ps1*.
203201
204202
```powershell
@@ -457,15 +455,17 @@ You can remove the Office 365 management solution using the process in [Remove a
457455
# Create Authentication Context tied to Azure AD Tenant
458456
$authContext = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationContext" -ArgumentList $authority
459457
# Acquire token
460-
$global:authResultARM = $authContext.AcquireToken($resourceAppIdURIARM, $clientId, $redirectUri, "Auto")
461-
$authHeader = $global:authResultARM.CreateAuthorizationHeader()
458+
$platformParameters = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.PlatformParameters" -ArgumentList "Auto"
459+
$global:authResultARM = $authContext.AcquireTokenAsync($resourceAppIdURIARM, $clientId, $redirectUri, $platformParameters)
460+
$global:authResultARM.Wait()
461+
$authHeader = $global:authResultARM.Result.CreateAuthorizationHeader()
462462
$authHeader
463463
}
464464
465465
Function Office-UnSubscribe-Call{
466466
467467
#----------------------------------------------------------------------------------------------------------------------------------------------
468-
$authHeader = $global:authResultARM.CreateAuthorizationHeader()
468+
$authHeader = $global:authResultARM.Result.CreateAuthorizationHeader()
469469
$ResourceName = "https://manage.office.com"
470470
$SubscriptionId = $Subscription[0].Subscription.Id
471471
$OfficeAPIUrl = $ARMResource + 'subscriptions/' + $SubscriptionId + '/resourceGroups/' + $ResourceGroupName + '/providers/Microsoft.OperationalInsights/workspaces/' + $WorkspaceName + '/datasources/office365datasources_' + $SubscriptionId + $OfficeTennantId + '?api-version=2015-11-01-preview'
@@ -503,6 +503,8 @@ You can remove the Office 365 management solution using the process in [Remove a
503503
.\office365_unsubscribe.ps1 -WorkspaceName MyWorkspace -ResourceGroupName MyResourceGroup -SubscriptionId '60b79d74-f4e4-4867-b631-yyyyyyyyyyyy' -OfficeTennantID 'ce4464f8-a172-4dcf-b675-xxxxxxxxxxxx'
504504
```
505505
506+
You will be prompted for credentials. Provide the credentials for your Log Analytics workspace.
507+
506508
## Data collection
507509
508510
### Supported agents

articles/cosmos-db/local-emulator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ While emulation of the Azure Cosmos DB service is faithful, the emulator's imple
2222

2323
You can migrate data between the Azure Cosmos Emulator and the Azure Cosmos DB service by using the [Azure Cosmos DB Data Migration Tool](https://github.com/azure/azure-documentdb-datamigrationtool).
2424

25-
You can run Azure Cosmos Emulator on the Windows Docker container, see the [Docker Hub](https://hub.docker.com/r/microsoft/azure-cosmosdb-emulator/) for the docker pull command and [GitHub](https://github.com/Azure/azure-cosmos-db-emulator-docker) for the emulator source code.
25+
You can run Azure Cosmos Emulator on the Windows Docker container, see the [Docker Hub](https://hub.docker.com/r/microsoft/azure-cosmosdb-emulator/) for the docker pull command and [GitHub](https://github.com/Azure/azure-cosmos-db-emulator-docker) for the `Dockerfile` and more information.
2626

2727
## Differences between the emulator and the service
2828

articles/data-explorer/ingest-data-event-hub.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ Now you connect to the event hub from Azure Data Explorer. When this connection
134134
> [!NOTE]
135135
> * Select **My data includes routing info** to use dynamic routing, where your data includes the necessary routing information as seen in the [sample app](https://github.com/Azure-Samples/event-hubs-dotnet-ingest) comments. If both static and dynamic properties are set, the dynamic properties override the static ones.
136136
> * Only events enqueued after you create the data connection are ingested.
137+
> * Enable GZip compression for static routing by opening a [support request in the Azure portal](https://ms.portal.azure.com/#blade/Microsoft_Azure_Support/HelpAndSupportBlade/overview). Enable GZip compression for dynamic routing as seen in the [sample app](https://github.com/Azure-Samples/event-hubs-dotnet-ingest).
138+
> * Avro format and event system properties aren't supported on compression payload.
137139
138140
## Copy the connection string
139141

articles/hdinsight/hdinsight-component-versioning.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ The following table lists the versions of HDInsight that are available in the Az
6868
| HDInsight version | VM OS | Release date | Support expiration date | Retirement date | High availability | Availability in the Azure portal |
6969
| --- | --- | --- | --- | --- | --- | --- |
7070
| HDInsight 4.0 |Ubuntu 16.0.4 LTS |September 24, 2018 | | |Yes |Yes |
71-
| HDInsight 3.6 |Ubuntu 16.0.4 LTS |April 4, 2017 | June 30, 2020 |December 31, 2020 |Yes |Yes |
71+
| HDInsight 3.6 |Ubuntu 16.0.4 LTS |April 4, 2017 | December 31, 2020 |December 31, 2020 |Yes |Yes |
7272

73-
Spark 2.1, 2.2 & Kafka 1.0 support will expire on June 30th, 2020 and retirement on Dec 31st 2020.
73+
Spark 2.1, 2.2 & Kafka 1.0 support will expire on June 30th, 2020.
7474

7575
> [!NOTE]
7676
> After support for a version has expired, it might not be available through the Microsoft Azure portal. However, cluster versions continue to be available using the `Version` parameter in the Windows PowerShell [New-AzHDInsightCluster](https://docs.microsoft.com/powershell/module/az.hdinsight/new-azhdinsightcluster) command and the .NET SDK until the version retirement date.

articles/openshift/cluster-administration-cluster-admin-role.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ ms.date: 09/25/2019
1515

1616
You're the cluster administrator of an Azure Red Hat OpenShift cluster. Your account has increased permissions and access to all user-created projects.
1717

18-
When your account has the osa-customer-admin authorization role bound to it, it can automatically manage a project.
18+
When your account has the customer-admin-cluster authorization role bound to it, it can automatically manage a project.
1919

2020
> [!Note]
21-
> The osa-customer-admin cluster role is not the same as the cluster-admin cluster role.
21+
> The customer-admin-cluster cluster role is not the same as the cluster-admin cluster role.
2222
2323

2424
For example, you can execute actions associated with a set of verbs (`create`) to operate on a set of resource names (`templates`). To view the details of these roles and their sets of verbs and resources, run the following command:
2525

26-
`$ oc describe clusterrole/osa-customer-admin`
26+
`$ oc get clusterroles customer-admin-cluster -o yaml`
2727

2828
The verb names don't necessarily all map directly to `oc` commands. They equate more generally to the types of CLI operations that you can perform.
2929

3030
For example, having the `list` verb means that you can display a list of all objects of a resource name (`oc get`). The `get` verb means that you can display the details of a specific object if you know its name (`oc describe`).
3131

3232
## Configure the customer administrator role
3333

34-
You can configure the customer administrator role only during cluster creation by providing the flag `--customer-admin-group-id`. To learn how to configure Azure Active Directory and the Administrators group, see [Azure Active Directory integration for Azure Red Hat OpenShift](howto-aad-app-configuration.md).
34+
You can configure the customer-admin-cluster cluster role only during cluster creation by providing the flag `--customer-admin-group-id`. To learn how to configure Azure Active Directory and the Administrators group, see [Azure Active Directory integration for Azure Red Hat OpenShift](howto-aad-app-configuration.md).
3535

3636
## Next steps
3737

38-
Configure the osa-customer-admin role:
38+
Configure the customer-admin-cluster cluster role:
3939
> [!div class="nextstepaction"]
4040
> [Azure Active Directory integration for Azure Red Hat OpenShift](howto-aad-app-configuration.md)

articles/sql-data-warehouse/pause-and-resume-compute-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: seo-lt-2019
1414
---
1515
# Quickstart: Pause and resume compute in Azure SQL Data Warehouse with Azure PowerShell
1616

17-
Use PowerShell to pause compute in Azure SQL Data Warehouse to save costs. [Resume compute](sql-data-warehouse-manage-compute-overview.md) when you are ready to use the data warehouse.
17+
Use Azure PowerShell to pause compute in Azure SQL Data Warehouse to save costs. [Resume compute](sql-data-warehouse-manage-compute-overview.md) when you are ready to use the data warehouse.
1818

1919
If you don't have an Azure subscription, create a [free](https://azure.microsoft.com/free/) account before you begin.
2020

0 commit comments

Comments
 (0)