Skip to content

Commit 300e086

Browse files
authored
Merge pull request #42923 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 e3f7058 + e7dd7fc commit 300e086

File tree

12 files changed

+28
-25
lines changed

12 files changed

+28
-25
lines changed

articles/active-directory/device-management-azuread-joined-devices-frx.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ In the Windows *out-of-box experience*, joining an on-premises Active Directory
3636

3737
To join a Windows 10 device, the device registration service must be configured to enable you to register devices. In addition to having permission to joining devices in your Azure AD tenant, you must have fewer devices registered than the configured maximum. For more details, see [configure device settings](device-management-azure-portal.md#configure-device-settings).
3838

39+
In addition, if your tenant is federated, your Identity provider MUST support WS-Fed and WS-Trust username/password endpoint. This can be version 1.3 or 2005. This protocol support is required to both join the device to Azure AD and log on to the device with a password.
40+
3941
## Joining a device
4042

4143
**To join a Windows 10 device to Azure AD during FRX:**

articles/azure-stack/azure-stack-update-1802.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Azure Stack 1802 Update | Microsoft Docs
33
description: Learn about what's in the 1802 update for Azure Stack integrated systems, the known issues, and where to download the update.
44
services: azure-stack
@@ -34,7 +34,7 @@ The Azure Stack 1802 update build number is **20180302.1**.
3434

3535
## Before you begin
3636
> [!IMPORTANT]
37-
> Do not attempt to create virtual machines during the installation of this update. For more information about managing updates, see [Manage updates in Azure Stack overview](/azure-stack-updates#plan-for-updates).
37+
> Do not attempt to create virtual machines during the installation of this update. For more information about managing updates, see [Manage updates in Azure Stack overview](azure-stack-updates.md#plan-for-updates).
3838
3939

4040
### Prerequisites

articles/cloud-shell/features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Files outside of `$Home` and machine state are not persisted across sessions.
4747

4848
### Integration with open-source tooling
4949

50-
Bash in Cloud Shell includes pre-configured authentication for open-source tools such as Terraform, Ansible, and Chef Inspec. Try it out from the example walkthroughs.
50+
Bash in Cloud Shell includes pre-configured authentication for open-source tools such as Terraform, Ansible, and Chef InSpec. Try it out from the example walkthroughs.
5151

5252
## Tools
5353

@@ -60,7 +60,7 @@ Bash in Cloud Shell includes pre-configured authentication for open-source tools
6060
|Build tools |make<br> maven<br> npm<br> pip |
6161
|Containers |[Docker CLI](https://github.com/docker/cli)/[Docker Machine](https://github.com/docker/machine)<br> [Kubectl](https://kubernetes.io/docs/user-guide/kubectl-overview/)<br> [Helm](https://github.com/kubernetes/helm)<br> [DC/OS CLI](https://github.com/dcos/dcos-cli) |
6262
|Databases |MySQL client<br> PostgreSql client<br> [sqlcmd Utility](https://docs.microsoft.com/sql/tools/sqlcmd-utility)<br> [mssql-scripter](https://github.com/Microsoft/sql-xplat-cli) |
63-
|Other |iPython Client<br> [Cloud Foundry CLI](https://github.com/cloudfoundry/cli)<br> [Terraform](https://www.terraform.io/docs/providers/azurerm/)<br> [Ansible](https://www.ansible.com/microsoft-azure)<br> [Chef Inspec](https://www.chef.io/inspec/)|
63+
|Other |iPython Client<br> [Cloud Foundry CLI](https://github.com/cloudfoundry/cli)<br> [Terraform](https://www.terraform.io/docs/providers/azurerm/)<br> [Ansible](https://www.ansible.com/microsoft-azure)<br> [Chef InSpec](https://www.chef.io/inspec/)|
6464

6565
## Language support
6666

articles/cognitive-services/text-analytics/quickstarts/csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You must also have the [endpoint and access key](../How-tos/text-analytics-how-t
4242

4343
## Call the Text Analytics API using the SDK
4444
1. Replace Program.cs with the code provided below. This program demonstrates the capabilities of the Text Analytics API in 3 sections (language extraction, key-phrase extraction and sentiment analysis).
45-
1. Replace the `client.SubscriptionKey` value with an access key valid for your subscription.
45+
1. Replace the `Ocp-Apim-Subscription-Key` header value with an access key valid for your subscription.
4646
1. Replace the location in `client.AzureRegion` (currently `AzureRegions.Westus`) to the region you signed up for.
4747
1. Run the program.
4848

@@ -61,7 +61,7 @@ namespace ConsoleApp1
6161
class Program
6262
{
6363
/// <summary>
64-
/// container for subscription credentials. Make sure to enter
64+
/// Container for subscription credentials. Make sure to enter your valid key.
6565
/// </summary>
6666
class ApiKeyServiceClientCredentials : ServiceClientCredentials
6767
{

articles/iot-accelerators/iot-accelerators-remote-monitoring-sample-walkthrough.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ If you want to explore the source code and developer documentation, start with o
130130

131131
* [Solution accelerator for Remote Monitoring with Azure IoT (.NET)](https://github.com/Azure/azure-iot-pcs-remote-monitoring-dotnet/wiki/).
132132
* [Solution accelerator for Remote Monitoring with Azure IoT (Java)](https://github.com/Azure/azure-iot-pcs-remote-monitoring-java).
133-
* [Solution accelerator for Remote Monitoring architecture)](https://github.com/Azure/azure-iot-pcs-remote-monitoring-dotnet/wiki/Architecture).
133+
134+
Detailed solution architecture diagrams:
135+
* [Solution accelerator for Remote Monitoring architecture](https://github.com/Azure/azure-iot-pcs-remote-monitoring-dotnet/wiki/Architecture).
134136

135137
For more conceptual information about the Remote Monitoring solution accelerator, see [Customize the solution accelerator](../iot-accelerators/iot-accelerators-remote-monitoring-customize.md).

articles/key-vault/key-vault-developers-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Azure Key Vault Developer's Guide
33
description: Developers can use Azure Key Vault to manage cryptographic keys within the Microsoft Azure environment.
44
services: key-vault
@@ -51,7 +51,7 @@ Azure Key Vault provides a way to securely store credentials and other keys and
5151

5252
For more information on MSI, see [Managed Service Identity (MSI) for Azure resources](https://docs.microsoft.com/azure/active-directory/msi-overview).
5353

54-
For more information on working with AAD, see [Integrating applications with Azure Active Directory](/active-directory/develop/active-directory-integrating-applications).
54+
For more information on working with AAD, see [Integrating applications with Azure Active Directory](/azure/active-directory/develop/active-directory-integrating-applications).
5555

5656
Before working with keys, secrets or certificates in your key vault, you'll create and manage your key vault through CLI, PowerShell, Resource Manager Templates or REST, as described in the following articles:
5757

articles/security-center/security-center-os-coverage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ VMs running in a cloud service are also supported. Only cloud services web and w
5656
## Next steps
5757

5858
- [Azure Security Center Planning and Operations Guide](security-center-planning-and-operations-guide.md) — Learn how to plan and understand the design considerations to adopt Azure Security Center
59-
- [Security alerts by type in Azure Security Center](https://docs.microsoft.com/azure/security-center/security-center-alerts-type.md#virtual-machine-behavioral-analysis) - Learn more about virtual machine behavioral analysis and crash dump memory analysis in Security Center
59+
- [Security alerts by type in Azure Security Center](security-center-alerts-type.md#virtual-machine-behavioral-analysis) - Learn more about virtual machine behavioral analysis and crash dump memory analysis in Security Center
6060
- [Azure Security Center FAQ](security-center-faq.md) — Find frequently asked questions about using the service
6161
- [Azure Security blog](http://blogs.msdn.com/b/azuresecurity/) — Find blog posts about Azure security and compliance

articles/security/blueprints/uk-official-three-tier-applications-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Storage
147147

148148
**Internet Gateway and Public IP Address**: The internet gateway exposes application services to users through the internet. Traffic accessing these services is secured using an [Application Gateway](https://docs.microsoft.com/azure/application-gateway/application-gateway-introduction) offering Layer 7 routing and load balancing capabilities with web application firewall (WAF) protection.
149149

150-
**Management VNet**: This [VNet](https://docs.microsoft.com/azure/Virtual-Network/virtual-networks-overviewcontains) contains resources that implement management and monitoring capabilities for the workloads running in the production VNet.
150+
**Management VNet**: This [VNet](https://docs.microsoft.com/azure/virtual-network/virtual-networks-overview) contains resources that implement management and monitoring capabilities for the workloads running in the production VNet.
151151

152152
**Jumpbox**: Also called a [bastion host](https://en.wikipedia.org/wiki/Bastion_host), which is a secure VM on the network that administrators use to connect to VMs in the production VNet. The jumpbox has an NSG that allows remote traffic only from public IP addresses on a safe list. To permit remote desktop (RDP) traffic, the source of the traffic needs to be defined in the NSG. Management of production resources is via RDP using a secured Jumpbox VM.
153153

articles/sql-database/sql-database-troubleshoot-data-sync.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description: "Learn how to troubleshoot common issues with Azure SQL Data Sync (
44
services: sql-database
55
ms.date: 04/01/2018
66
ms.topic: conceptual
7-
ms.service: "sql-database"
8-
author: "douglaslMS"
9-
ms.author: "douglasl"
10-
manager: "craigg"
7+
ms.service: sql-database
8+
author: douglaslMS
9+
ms.author: douglasl
10+
manager: craigg
1111
ms.custom: data-sync
1212
---
1313
# Troubleshoot issues with SQL Data Sync (Preview)
@@ -235,9 +235,8 @@ Before you proceed, check for the following conditions:
235235

236236
- The SQL Data Sync (Preview) Windows service is running.
237237
- The service account for SQL Data Sync (Preview) Preview Windows service has network access.
238-
- The client agent can contact the Locator Service. Check that the following registry key has the value https://locator.sync.azure.com/LocatorServiceApi.svc:
239-
- On an x86 computer: `HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\SQL Azure Data Sync\\LOCATORSVCURI`
240-
- On an x64 computer: `HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\SQL Azure Data Sync\\LOCATORSVCURI`
238+
- The outbound 1433 port is open in your local firewall rule.
239+
- The local ip is added to the server or database firewall rule for the sync metadata database.
241240

242241
#### Cause
243242

articles/storage/files/storage-how-to-use-files-powershell.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Managing Azure file shares with Azure PowerShell
33
description: Learn to manage Azure file shares using Azure PowerShell.
44
services: storage
@@ -31,7 +31,7 @@ If you don't have an Azure subscription, you can create a [free account](https:/
3131

3232
[!INCLUDE [cloud-shell-powershell.md](../../../includes/cloud-shell-powershell.md)]
3333

34-
If would like to install and use the PowerShell locally, this guide requires the Azure PowerShell module version 5.1.1 or later. To find out which version of the Azure PowerShell module you are running, execute `Get-Module -ListAvailable AzureRM`. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/install-azurerm-ps). If you are running PowerShell locally, you also need to run `Connect-AzureRmAccount` to create a connection with Azure.
34+
If you would like to install and use the PowerShell locally, this guide requires the Azure PowerShell module version 5.1.1 or later. To find out which version of the Azure PowerShell module you are running, execute `Get-Module -ListAvailable AzureRM`. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/install-azurerm-ps). If you are running PowerShell locally, you also need to run `Connect-AzureRmAccount` to create a connection with Azure.
3535

3636
## Create a resource group
3737
A resource group is a logical container into which Azure resources are deployed and managed. If you don't already have an Azure resource group, you can create a new one with the [New-AzureRmResourceGroup](/powershell/module/azurerm.resources/new-azurermresourcegroup) cmdlet.
@@ -162,7 +162,7 @@ Now, if you list the files in the new share, you should see your copied file.
162162
Get-AzureStorageFile -Context $storageAcct.Context -ShareName "myshare2" -Path "myDirectory2"
163163
```
164164

165-
While the `Start-AzureStorageFileCopy` cmdlet is convenient for ad-hoc file moves between Azure file shares and Azure Blob storage containers, we recommend AzCopy for larger moves (in terms of number or size of files being moved). Learn more about [AzCopy for Windows](../common/storage-use-azcopy.md) and [AzCopy for Linux](../common/storage-use-azcopy-linux.md). AzCopy must be installed locally - it is not available in Cloud Shell
165+
While the `Start-AzureStorageFileCopy` cmdlet is convenient for ad-hoc file moves between Azure file shares and Azure Blob storage containers, we recommend AzCopy for larger moves (in terms of number or size of files being moved). Learn more about [AzCopy for Windows](../common/storage-use-azcopy.md) and [AzCopy for Linux](../common/storage-use-azcopy-linux.md). AzCopy must be installed locally - it is not available in Cloud Shell.
166166

167167
## Create and modify share snapshots
168168
One additional useful task you can do with an Azure file share is to create share snapshots. A snapshot preserves a point in time for an Azure file share. Share snapshots are similar to operating system technologies you may already be familiar with such as:

0 commit comments

Comments
 (0)