Skip to content

Commit 4abc648

Browse files
authored
Merge pull request #103814 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 17c2dc3 + 1b9567b commit 4abc648

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

articles/api-management/api-management-authentication-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ In this example client certificate is identified by resource name.
150150

151151
|Name|Description|Required|Default|
152152
|----------|-----------------|--------------|-------------|
153-
|resource|String. The App ID URI of the target web API (secured resource) in Azure Active Directory.|Yes|N/A|
153+
|resource|String. The App ID of the target web API (secured resource) in Azure Active Directory.|Yes|N/A|
154154
|output-token-variable-name|String. Name of the context variable that will receive token value as an object type `string`. |No|N/A|
155155
|ignore-error|Boolean. If set to `true`, the policy pipeline will continue to execute even if an access token is not obtained.|No|false|
156156

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Here is a quick overview of the steps:
4343

4444
To protect an API with Azure AD, the first step is to register an application in Azure AD that represents the API.
4545

46-
1. Go to the [Azure portal](https://portal.azure.com) to register your application. Search for and select **API registrations**.
46+
1. Go to the [Azure portal](https://portal.azure.com) to register your application. Search for and select **APP registrations**.
4747

4848
1. Select **New registration**.
4949

articles/backup/backup-sql-server-database-azure-vms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ To create a rule using PowerShell:
8181

8282
**Allow access by using Azure Firewall tags**. If you're using Azure Firewall, create an application rule by using the AzureBackup [FQDN tag](https://docs.microsoft.com/azure/firewall/fqdn-tags). This allows outbound access to Azure Backup.
8383

84-
**Deploy an HTTP proxy server to route traffic**. When you back up a SQL Server database on an Azure VM, the backup extension on the VM uses the HTTPS APIs to send management commands to Azure Backup and data to Azure Storage. The backup extension also uses Azure AD for authentication. Route the backup extension traffic for these three services through the HTTP proxy. The extensions are the only component that's configured for access to the public internet.
84+
**Deploy an HTTP proxy server to route traffic**. When you back up a SQL Server database on an Azure VM, the backup extension on the VM uses the HTTPS APIs to send management commands to Azure Backup and data to Azure Storage. The backup extension also uses Azure AD for authentication. Route the backup extension traffic for these three services through the HTTP proxy. There are no wildcard domains in use with Azure Backup to add to the allow list for your proxy rules. You will need to use the public IP ranges for these services provided by Azure. The extensions are the only component that's configured for access to the public internet.
8585

8686
Connectivity options include the following advantages and disadvantages:
8787

@@ -90,7 +90,7 @@ Connectivity options include the following advantages and disadvantages:
9090
Allow IP ranges | No additional costs | Complex to manage because the IP address ranges change over time <br/><br/> Provides access to the whole of Azure, not just Azure Storage
9191
Use NSG service tags | Easier to manage as range changes are automatically merged <br/><br/> No additional costs <br/><br/> | Can be used with NSGs only <br/><br/> Provides access to the entire service
9292
Use Azure Firewall FQDN tags | Easier to manage as the required FQDNs are automatically managed | Can be used with Azure Firewall only
93-
Use an HTTP proxy | Granular control in the proxy over the storage URLs is allowed <br/><br/> Single point of internet access to VMs <br/><br/> Not subject to Azure IP address changes | Additional costs to run a VM with the proxy software
93+
Use an HTTP proxy | Single point of internet access to VMs <br/> | Additional costs to run a VM with the proxy software <br/> No published FQDN addresses, allow rules will be subject to Azure IP address changes
9494

9595
### Database naming guidelines for Azure Backup
9696

articles/cloud-shell/troubleshooting.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Known resolutions for troubleshooting issues in Azure Cloud Shell include:
2525

2626
## General troubleshooting
2727

28+
### Error running AzureAD cmdlets in PowerShell
29+
30+
- **Details**: When you run AzureAD cmdlets like `Get-AzureADUser` in Cloud Shell, you might see an error: `You must call the Connect-AzureAD cmdlet before calling any other cmdlets`.
31+
- **Resolution**: Run the `Connect-AzureAD` cmdlet. Previously, Cloud Shell ran this cmdlet automatically during PowerShell startup. To speed up start time, the cmdlet no longer runs automatically. You can choose to restore the previous behavior by adding `Connect-AzureAD` to the $PROFILE file in PowerShell.
32+
2833
### Early timeouts in FireFox
2934

3035
- **Details**: Cloud Shell utilizes an open websocket to pass input/output to your browser. FireFox has preset policies that can close the websocket prematurely causing early timeouts in Cloud Shell.

articles/dns/dns-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Yes. Azure DNS supports co-hosting domains with other DNS services.
144144

145145
To set up co-hosting, modify the NS records for the domain to point to the name servers of both providers. The name server (NS) records control which providers receive DNS queries for the domain. You can modify these NS records in Azure DNS, in the other provider, and in the parent zone. The parent zone is typically configured via the domain name registrar. For more information on DNS delegation, see [DNS domain delegation](dns-domain-delegation.md).
146146

147-
Also, make sure that the DNS records for the domain are in sync between both DNS providers. Azure DNS doesn't currently support DNS zone transfers. DNS records must be synchronized by using either the [Azure DNS management portal](dns-operations-recordsets-portal.md), [REST API](https://docs.microsoft.com/powershell/module/az.dns), [SDK](dns-sdk.md), [PowerShell cmdlets](dns-operations-recordsets.md), or the [CLI tool](dns-operations-recordsets-cli.md).
147+
Also, make sure that the DNS records for the domain are in sync between both DNS providers. Azure DNS doesn't currently support DNS zone transfers. DNS records must be synchronized by using either the [Azure DNS management portal](dns-operations-recordsets-portal.md), [REST API](https://docs.microsoft.com/rest/api/dns/), [SDK](dns-sdk.md), [PowerShell cmdlets](dns-operations-recordsets.md), or the [CLI tool](dns-operations-recordsets-cli.md).
148148

149149
### Do I have to delegate my domain to all four Azure DNS name servers?
150150

articles/hdinsight/r-server/r-server-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.author: hrasheed
77
ms.reviewer: jasonh
88
ms.custom: hdinsightactive
99
ms.topic: overview
10-
ms.date: 06/12/2019
10+
ms.date: 02/10/2020
1111
#Customer intent: As a developer I want to have a basic understanding of Microsoft's implementation of machine learning in Azure HDInsight so I can decide if I want to use it rather than build my own cluster.
1212
---
1313

@@ -47,6 +47,9 @@ ML Services in HDInsight provides the following benefits:
4747
Individuals embarking on the journey of making their applications intelligent or simply wanting to learn the new world of AI and machine learning, need the right resources to help them get started. In addition to this documentation, Microsoft provides several learning resources and has engaged several training partners to help you ramp up and become productive quickly.
4848
--->
4949

50+
> [!NOTE]
51+
> The ML Services cluster type on HDInsight is supported only on HDInsight 3.6. HDInsight 3.6 is scheduled to retire on December 31, 2020.
52+
5053
## Key features of ML Services on HDInsight
5154

5255
The following features are included in ML Services on HDInsight.

includes/storage-sync-files-agent-update-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The following instructions describe how to change the settings after you've comp
3434
Open a PowerShell console and navigate to the directory where you installed the sync agent then import the server cmdlets. By default this would look something like this:
3535
```powershell
3636
cd 'C:\Program Files\Azure\StorageSyncAgent'
37-
Import-Module -Name \StorageSync.Management.ServerCmdlets.dll
37+
Import-Module -Name .\StorageSync.Management.ServerCmdlets.dll
3838
```
3939

4040
You can run `Get-StorageSyncAgentAutoUpdatePolicy` to check the current policy setting and determine if you want to change it.

0 commit comments

Comments
 (0)