Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr i…
Browse files Browse the repository at this point in the history
…nto robinsh-import-export
  • Loading branch information
robinsh committed Dec 14, 2016
2 parents 5d75bdb + 29a73cb commit b0e14ec
Show file tree
Hide file tree
Showing 141 changed files with 397 additions and 400 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 11/11/2016
ms.author: markusvi;andkjell
ms.author: markvi;andkjell

---
# Implementing password synchronization with Azure AD Connect sync
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi;andkjell
ms.author: markvi;andkjell

---
# Azure AD Connect sync: Technical Concepts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 08/31/2016
ms.author: markusvi;andkjell
ms.author: markvi;andkjell

---
# Azure AD Connect sync: Understanding Declarative Provisioning Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi;andkjell
ms.author: markvi;andkjell

---
# Azure AD Connect sync: Understanding Users and Contacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 11/01/2016
ms.author: markusvi
ms.author: markvi

---
# Azure AD Connect sync: Understand and customize synchronization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 09/29/2016
ms.author: markusvi
ms.author: markvi

---
# Identity synchronization and duplicate attribute resiliency
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Cloud App Discovery Registry Settings for Proxy Services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Cloud App Discovery Security and Privacy Considerations
Expand Down
2 changes: 1 addition & 1 deletion articles/active-directory/active-directory-faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: get-started-article
ms.date: 10/31/2016
ms.author: markusvi
ms.author: markvi

---
# Azure Active Directory FAQ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ms.topic: article
ms.tgt_pltfrm: na
ms.workload: identity
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Install a new Active Directory forest on an Azure virtual network
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Introduction to the Access Panel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Account Provisioning Notifications
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Customizing Attribute Mappings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Attribute-based app provisioning with scoping filters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Writing Expressions for Attribute Mappings in Azure Active Directory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Understanding resource access in Azure
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/10/2016
ms.author: markusvi
ms.author: markvi

---
# Windows Server Active Directory on Azure VMs
Expand Down
2 changes: 1 addition & 1 deletion articles/advisor/advisor-cost-recommendations.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---

# Advisor Cost recommendations
Expand Down
2 changes: 1 addition & 1 deletion articles/advisor/advisor-get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---

# Get started with Azure Advisor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---

# Advisor High Availability recommendations
Expand Down
2 changes: 1 addition & 1 deletion articles/advisor/advisor-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---

# Introduction to Azure Advisor
Expand Down
2 changes: 1 addition & 1 deletion articles/advisor/advisor-performance-recommendations.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---

# Advisor Performance recommendations
Expand Down
2 changes: 1 addition & 1 deletion articles/advisor/advisor-security-recommendations.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: NA
ms.workload: NA
ms.date: 11/16/2016
ms.author: kumudd
ms.author: kumud
---
# Advisor Security recommendations

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 02/12/2016
ms.author: yochayk
ms.author: yochaykk

---
# Azure App Service and existing Azure services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Testing in production, or live-testing your web app using live customer traffic,
With the Traffic Routing feature in [Azure App Service](http://go.microsoft.com/fwlink/?LinkId=529714), you can direct a portion of live user traffic to one or more [deployment slots](web-sites-staged-publishing.md), and then analyze your app with [Azure Application Insights](/services/application-insights/) or [Azure HDInsight](/services/hdinsight/), or a third-party tool like [New Relic](/marketplace/partners/newrelic/newrelic/) to validate your change. For example, you can implement the following scenarios with App Service:

* Discover functional bugs or pinpoint performance bottlenecks in your updates prior to site-wide deployment
* Perform "controlled test flights" of your changes by measuring usibility metrics on the beta app
* Perform "controlled test flights" of your changes by measuring usability metrics on the beta app
* Gradually ramp up to a new update, and gracefully back down to the current version if an error occurs
* Optimize your app's business results by running [A/B tests](https://en.wikipedia.org/wiki/A/B_testing) or [multivariate tests](https://en.wikipedia.org/wiki/Multivariate_testing_in_marketing) in multiple deployment slots

Expand Down
2 changes: 1 addition & 1 deletion articles/app-service/app-service-how-works-readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: hero-article
ms.date: 02/10/2016
ms.author: yochay
ms.author: yochayk

---
# How App Service works
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ $subnet = $vnet.subnets[0]

This assigns the subnet object to variable $subnet for the next steps.

## Create an application gateway configuration objec
## Create an application gateway configuration object

### Step 1

Expand Down
2 changes: 1 addition & 1 deletion articles/automation/automation-schedules.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: article
ms.tgt_pltfrm: na
ms.workload: infrastructure-services
ms.date: 10/10/2016
ms.author: mgoedtel
ms.author: magoedte

---
# Scheduling a runbook in Azure Automation
Expand Down
2 changes: 1 addition & 1 deletion articles/backup/backup-client-automation-classic.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 11/28/2016
ms.author: saurabhsensharma;markgal;jimpark;nkolli;trinadhk
ms.author: saurse;markgal;jimpark;nkolli;trinadhk

---
# Deploy and manage backup to Azure for Windows Server/Windows Client using PowerShell
Expand Down
2 changes: 1 addition & 1 deletion articles/backup/backup-client-automation.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 11/28/2016
ms.author: saurabhsensharma;markgal;jimpark;nkolli;trinadhk
ms.author: saurse;markgal;jimpark;nkolli;trinadhk

---
# Deploy and manage backup to Azure for Windows Server/Windows Client using PowerShell
Expand Down
3 changes: 1 addition & 2 deletions articles/cloud-services/automation-manage-cloud-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 06/20/2016
ms.author: jolevy
ms.author: timlt

---
# Managing Azure Cloud Services using Azure Automation
Expand All @@ -41,4 +41,3 @@ Now that you've learned the basics of Azure Automation and how it can be used to
* [Azure Automation Overview](../automation/automation-intro.md)
* [My first runbook](../automation/automation-first-runbook-graphical.md)
* [Azure Automation learning map](https://azure.microsoft.com/documentation/learning-paths/automation/)

4 changes: 2 additions & 2 deletions articles/documentdb/documentdb-connect-mongodb-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ Where the values of this string are available in the Connection String blade sho
* Port (required)
* 10250
* Database (optional)
* The default database used by the connection
* The default database used by the connection (if no database is provided, the default database is "test")
* ssl=true (required)

For example, consider the account shown in the Connection String Information above. A valid connection string is:

mongodb://contoso123:<password@anhohmongo.documents.azure.com:10250/mydatabase?ssl=true
mongodb://contoso123:0Fc3IolnL12312asdfawejunASDF@asdfYXX2t8a97kghVcUzcDv98hawelufhawefafnoQRGwNj2nMPL1Y9qsIr9Srdw==@anhohmongo.documents.azure.com:10250/mydatabase?ssl=true

## Next steps
* Learn how to [use MongoChef](documentdb-mongodb-mongochef.md) with a DocumentDB account with protocol support for MongoDB.
Expand Down
2 changes: 1 addition & 1 deletion articles/expressroute/expressroute-asymmetric-routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: get-started-article
ms.tgt_pltfrm: na
ms.workload: infrastructure-services
ms.date: 10/10/2016
ms.author: osamazia
ms.author: osamam

---
# Asymmetric routing with multiple network paths
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ ms.author: charwen
---
# Configure a virtual network gateway for ExpressRoute using the classic deployment model and PowerShell
> [!div class="op_single_selector"]
> * [PowerShell - Resource Manager](expressroute-howto-add-gateway-resource-manager.md)
> * [PowerShell - Classic](expressroute-howto-add-gateway-classic.md)
> * [Resource Manager - PowerShell](expressroute-howto-add-gateway-resource-manager.md)
> * [Classic - PowerShell](expressroute-howto-add-gateway-classic.md)
> * [Video - Azure Portal](http://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-a-vpn-gateway-for-your-virtual-network)
>
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ ms.author: charwen
---
# Configure a virtual network gateway for ExpressRoute using Resource Manager and PowerShell
> [!div class="op_single_selector"]
> * [PowerShell - Resource Manager](expressroute-howto-add-gateway-resource-manager.md)
> * [PowerShell - Classic](expressroute-howto-add-gateway-classic.md)
> * [Resource Manager - PowerShell](expressroute-howto-add-gateway-resource-manager.md)
> * [Classic - PowerShell](expressroute-howto-add-gateway-classic.md)
> * [Video - Azure Portal](http://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-a-vpn-gateway-for-your-virtual-network)
>
>
Expand Down
2 changes: 1 addition & 1 deletion articles/expressroute/expressroute-routing-nat.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: get-started-article
ms.tgt_pltfrm: na
ms.workload: infrastructure-services
ms.date: 10/12/2016
ms.author: osamazia
ms.author: osamam

---
# ExpressRoute routing requirements
Expand Down
2 changes: 1 addition & 1 deletion articles/expressroute/expressroute-routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.topic: get-started-article
ms.tgt_pltfrm: na
ms.workload: infrastructure-services
ms.date: 12/12/2016
ms.author: osamazia
ms.author: osamam

---
# ExpressRoute routing requirements
Expand Down
15 changes: 10 additions & 5 deletions articles/iot-hub/iot-hub-devguide-messaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ms.devlang: multiple
ms.topic: article
ms.tgt_pltfrm: na
ms.workload: na
ms.date: 12/12/2016
ms.date: 12/13/2016
ms.author: dobett

---
Expand Down Expand Up @@ -239,15 +239,20 @@ When you use the [Azure Service Bus SDK for .NET][lnk-servicebus-sdk] or the [Ev

When you use SDKs (or product integrations) that are unaware of IoT Hub, you must retrieve an Event Hub-compatible endpoint and Event Hub-compatible name from the IoT Hub settings in the [Azure portal][lnk-management-portal]:

1. In the IoT hub blade, click **Messaging**.
2. In the **Device-to-cloud settings** section, you find the following values: **Event Hub-compatible endpoint**, **Event Hub-compatible name**, and **Partitions**.
1. In the IoT hub blade, click **Endpoints**.
2. In the **Built-in endpoints** section, click on **Events**. The blade contains the following values: **Event Hub-compatible endpoint**, **Event Hub-compatible name**, **Partitions**, **Retention time**, and **Consumer groups**.

![Device-to-cloud settings][img-eventhubcompatible]

> [!NOTE]
> If the SDK requires a **Hostname** or **Namespace** value, remove the scheme from the **Event Hub-compatible endpoint**. For example, if your Event Hub-compatible endpoint is **sb://iothub-ns-myiothub-1234.servicebus.windows.net/**, the **Hostname** would be **iothub-ns-myiothub-1234.servicebus.windows.net**, and the **Namespace** would be **iothub-ns-myiothub-1234**.
>
> The IoT Hub SDK requires the IoT Hub endpoint name, which is **messages/events** as shown in the **Endpoints** blade.
>
>
> [!NOTE]
> If the SDK you are using requires a **Hostname** or **Namespace** value, remove the scheme from the **Event Hub-compatible endpoint**. For example, if your Event Hub-compatible endpoint is **sb://iothub-ns-myiothub-1234.servicebus.windows.net/**, the **Hostname** would be **iothub-ns-myiothub-1234.servicebus.windows.net**, and the **Namespace** would be **iothub-ns-myiothub-1234**.
>
>
You can then use any shared access policy that has the **ServiceConnect** permissions to connect to the specified Event Hub.

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 10/03/2016
ms.author: xstof;xpouyat;juliako
ms.author: christoc;xpouyat;juliako

---
# Advanced Media Encoder Premium Workflow tutorials
Expand Down
Loading

0 comments on commit b0e14ec

Please sign in to comment.