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 landings
  • Loading branch information
squillace committed Nov 9, 2016
2 parents b4f682a + 375f462 commit 4a3abde
Show file tree
Hide file tree
Showing 58 changed files with 373 additions and 310 deletions.
4 changes: 2 additions & 2 deletions articles/active-directory/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@


# Reference
## [PowerShell cmdlets](https://docs.microsoft.com/powershell/azure%20ad%20cmdlets/ )
## [.NET API](https://msdn.microsoft.com/library/azure/microsoft.identitymodel.clients.activedirectory)
## [Service limits and restrictions](active-directory-service-limits-restrictions.md)
## [Authentication Library .NET reference](https://msdn.microsoft.com/library/azure/microsoft.identitymodel.clients.activedirectory)
## [PowerShell cmdlets](https://msdn.microsoft.com/library/azure/mt757189.aspx)

# Related
## [Multi-Factor Authentication](/azure/multi-factor-authentication/)
Expand Down
10 changes: 6 additions & 4 deletions articles/app-service-mobile/TOC.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# [Overview](../app-service/app-service-how-works-readme.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
# Overview
## [What are Mobile Apps?](app-service-mobile-value-prop.md)
## [What is App Service](../app-service/app-service-value-prop-what-is.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
## [How it works](../app-service/app-service-how-works-readme.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
## [App Service plans](../app-service/azure-web-sites-web-hosting-plans-in-depth-overview.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)

# Get Started
## Mobile Apps
## Create mobile apps
### [Android](app-service-mobile-android-get-started.md)
### [Cordova](app-service-mobile-cordova-get-started.md)
### [iOS](app-service-mobile-ios-get-started.md)
Expand All @@ -13,13 +14,13 @@
### [Xamarin.Forms](app-service-mobile-xamarin-forms-get-started.md)
### [Xamarin.iOS](app-service-mobile-xamarin-ios-get-started.md)

## API Apps
## Create API apps
### [.NET](../app-service-api/app-service-api-dotnet-get-started.md)
### [Java](../app-service-api/app-service-api-java-api-app.md)
### [Node.js](../app-service-api/app-service-api-nodejs-api-app.md)
### [CORS](../app-service-api/app-service-api-cors-consume-javascript.md)

## Web Apps
## Create Web apps
### [.NET](../app-service-web/web-sites-dotnet-get-started.md)
### [Node.js](../app-service-web/app-service-web-nodejs-get-started.md)
### [Python](../app-service-web/web-sites-python-ptvs-django-mysql.md)
Expand Down Expand Up @@ -206,6 +207,7 @@
### [Troubleshoot using Visual Studio](../app-service-web/web-sites-dotnet-troubleshoot-visual-studio.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)

# Reference
## [.NET API](https://msdn.microsoft.com/library/azure/dn961176.aspx)
## [Azure portal](../app-service-web/app-service-web-app-azure-portal.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
## [App Service reference](../app-service-web/app-service-changes-existing-services.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
## [WebJobs SDK](../app-service-web/websites-dotnet-webjobs-sdk-get-started.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
Expand Down
8 changes: 5 additions & 3 deletions articles/app-service/TOC.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# [Overview](app-service-how-works-readme.md)
# Overview
## [What is App Service](app-service-value-prop-what-is.md)
## [How it works](app-service-how-works-readme.md)
## [App Service plans](azure-web-sites-web-hosting-plans-in-depth-overview.md)

# Get started
Expand Down Expand Up @@ -149,9 +150,10 @@
## [App Service reference](../app-service-web/app-service-changes-existing-services.md?toc=%2fazure%2fapp-service%2ftoc.json)
## [Best practices](../app-service-web/app-service-best-practices.md?toc=%2fazure%2fapp-service%2ftoc.json)
## [WebJob resources](../app-service-web/websites-webjobs-resources.md?toc=%2fazure%2fapp-service%2ftoc.json)

# Related
## [WebJobs SDK](../app-service-web/websites-dotnet-webjobs-sdk-get-started.md?toc=%2fazure%2fapp-service%2ftoc.json)
## [REST](https://docs.microsoft.com/rest/api/appservice/)





Expand Down
7 changes: 4 additions & 3 deletions articles/application-gateway/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@
### [Diagnostics](application-gateway-diagnostics.md)
### [Troubleshoot](application-gateway-troubleshooting-502.md)
# Reference
## [Resource Manager APIs](https://msdn.microsoft.com/library/azure/mt684941)
## [Service Management APIs](https://msdn.microsoft.com/library/azure/mt299393)
## [PowerShell cmdlets](https://go.microsoft.com/fwlink/p/?LinkId=536407)
## [PowerShell cmdlets](https://docs.microsoft.com/en-us/powershell/resourcemanager)
## [REST](https://docs.microsoft.com/rest/api/appservice/)
## [Classic REST](https://msdn.microsoft.com/library/azure/mt299393)

# Related
## [ExpressRoute](https://azure.microsoft.com/documentation/services/expressroute/)
## [Virtual network](https://azure.microsoft.com/documentation/services/virtual-network/)
Expand Down
2 changes: 1 addition & 1 deletion articles/architecture-overview.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
---
title: Application Architecture on Microsoft Azure | Microsoft Docs
description: Architecture overview that covers common design patterns
services: ''
Expand Down
2 changes: 1 addition & 1 deletion articles/azure-government-image-gallery.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ The below resources should provide more information on deploying from the image

### Other Resources:
* [Deploying a Windows Virtual Machine](virtual-machines/virtual-machines-windows-hero-tutorial.md)
* [Virtual Machine FAQ](http://msdn.microsoft.com/library/azure/dn683781.aspx)
* [Virtual Machine FAQ](virtual-machines/virtual-machines-windows-faq.md)
* [Capture Linux VM Image](virtual-machines/virtual-machines-linux-classic-capture-image.md)

<!--- **<A href="/azure-government-service-description">Azure Government Service Descriptions</a>**-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: ryansoc
---
# Azure Government Networking
## ExpressRoute (Private Connectivity)
ExpressRoute is generally available in Azure Government. For more information (including partners and peering locations), see the <a href="https://azure.microsoft.com/en-us/documentation/services/expressroute/"> ExpressRoute public documentation </a>.
ExpressRoute is generally available in Azure Government. For more information (including partners and peering locations), see the [ExpressRoute public documentation](../expressroute/index.md).

### Variations
ExpressRoute is generally available (GA) in Azure Government.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Secure key management is essential for protecting data in the cloud. Customers s
* Application code and templates should only contain URI references to the secrets (which means the actual secrets are not in code, configuration or source code repositories). This prevents key phishing attacks on internal or external repos, such as harvest-bots in GitHub.
* Utilize strong RBAC controls within Key Vault. If a trusted operator leaves the company or transfers to a new group within the company, they should be prevented from being able to access the secrets.

For more information <a href="https://azure.microsoft.com/documentation/services/key-vault">Azure Key Vault public documentation. </a>
For more information [Azure Key Vault public documentation](../key-vault/index.md).

### Isolation to Restrict Data Access
Isolation is all about using boundaries, segmentation, and containers to limit data access to only authorized users, services, and applications. For example, the separation between tenants is an essential security mechanism for multitenant cloud platforms such as Microsoft Azure. Logical isolation helps prevent one tenant from interfering with the operations of any other tenant.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: ryansoc
---
# Azure Government Databases
## SQL Database
Refer to the<a href="https://msdn.microsoft.com/en-us/library/bb510589.aspx"> Microsoft Security Center for SQL Database Engine </a> and [Azure SQL Database Public Documentation](https://azure.microsoft.com/documentation/services/sql-database/) for additional guidance on metadata visibility configuration, and protection best practices.
Refer to the<a href="https://msdn.microsoft.com/en-us/library/bb510589.aspx"> Microsoft Security Center for SQL Database Engine </a> and [Azure SQL Database Public Documentation](../sql-database/index.md) for additional guidance on metadata visibility configuration, and protection best practices.

### Variations
SQL V12 Database is generally available in Azure Government.
Expand All @@ -39,7 +39,7 @@ The following information identifies the Azure Government boundary for Azure SQL
| All data stored and processed in Microsoft Azure SQL can contain Azure Government-regulated data. You must use database tools for data transfer of Azure Government-regulated data. |Azure SQL metadata is not permitted to contain export controlled data. This metadata includes all configuration data entered when creating and maintaining your storage product. Do not enter regulated/controlled data into the following fields: Database name, Subscription name, Resource groups, Server name, Server admin login, Deployment names, Resource names, Resource tags |

## Azure Redis Cache
For details on this service and how to use it, see [Azure Redis Cache public documentation](https://azure.microsoft.com/documentation/services/redis-cache/).
For details on this service and how to use it, see [Azure Redis Cache public documentation](../redis-cache/index.md).

### Variations
The URLs for accessing and managing Azure Redis Cache in Azure Government are different:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: ryansoc
---
# Azure Government Security and Identity
## Key Vault
For details on this service and how to use it, see the <a href="https://azure.microsoft.com/documentation/services/key-vault">Azure Key Vault public documentation. </a>
For details on this service and how to use it, see the [Azure Key Vault public documentation](../key-vault/index.md).

### Data Considerations
The following information identifies the Azure Government boundary for Azure Key Vault:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ms.author: ryansoc
---
# Azure Government Storage
## Azure Storage
For details on this service and how to use it, see [Azure Storage public documentation](https://azure.microsoft.com/documentation/services/storage/).
For details on this service and how to use it, see [Azure Storage public documentation](../storage/index.md).

### Variations
The URLs for storage accounts in Azure Government are different:
Expand Down
8 changes: 5 additions & 3 deletions articles/azure-resource-manager/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@
### [View deployment operations with Azure CLI](../resource-manager-troubleshoot-deployments-cli.md?toc=%2fazure%2fazure-resource-manager%2ftoc.json)
### [View deployment operations with REST API](../resource-manager-troubleshoot-deployments-rest.md?toc=%2fazure%2fazure-resource-manager%2ftoc.json)
# Reference
## [PowerShell cmdlets](https://docs.microsoft.com/en-us/powershell/azureps-cmdlets-docs/)
## [Azure CLI](https://docs.microsoft.com/cli/azure)
## [Java](https://docs.microsoft.com/java/api)
## [.NET API](https://docs.microsoft.com/dotnet/api)
## [Template schemas](https://github.com/Azure/azure-resource-manager-schemas)
## [PowerShell cmdlets](https://msdn.microsoft.com/library/dn757692(v=azure.200).aspx)
## [REST API](https://msdn.microsoft.com/en-us/library/azure/dn790568)
## [.NET client library](https://msdn.microsoft.com/en-us/library/azure/mt418626)
## [Throttling requests](../resource-manager-request-limits.md?toc=%2fazure%2fazure-resource-manager%2ftoc.json)
## [REST](https://docs.microsoft.com/rest/api/resources/)
14 changes: 8 additions & 6 deletions articles/billing/TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## [Limits and quotas](../azure-subscription-service-limits.md)
## [Frequently asked questions](../billing-subscription-faq.md)
# How to
## Track usage and costs
## Monitor usage and costs
### [Download invoice and usage](../billing-download-azure-invoice-daily-usage-date.md)
### [Understand your bill](billing-understand-your-bill.md)
### [Understand external service charges](../billing-understand-your-azure-marketplace-charges.md)
Expand All @@ -23,14 +23,16 @@
### [Edit profile](../billing-how-to-change-azure-account-profile.md)
### [Update payment information](../billing-how-to-change-credit-card.md)
### [Link Office 365 tenant](../billing-add-office-365-tenant-to-azure-subscription.md)
## Troubleshoot
### [Sign-up issues](../billing-troubleshoot-azure-sign-up-issues.md)
### [Declined card](../billing-credit-card-fails-during-azure-sign-up.md)
### [Sign-in issues](../billing-cannot-login-subscription.md)

# Reference
## [API Overview](../billing-usage-rate-card-overview.md)
## [REST API reference](https://msdn.microsoft.com/en-us/library/azure/1ea5b323-54bb-423d-916f-190de96c6a3c)
## [Partner solution: Cloud Cruiser](../billing-usage-rate-card-partner-solution-cloudcruiser.md)
## [Partner solution: Cloudyn](../billing-usage-rate-card-partner-solution-cloudyn.md)
# Troubleshoot
## [Sign-up issues](../billing-troubleshoot-azure-sign-up-issues.md)
## [Declined card](../billing-credit-card-fails-during-azure-sign-up.md)
## [Sign-in issues](../billing-cannot-login-subscription.md)
# Support

# Resources
## [Contact support](../billing-how-to-create-billing-support-ticket.md)
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,11 @@ Sample JSON document in the Person collection in a DocumentDB database:

DocumentDB supports querying documents using a SQL like syntax over hierarchical JSON documents.

Example:
SELECT Person.PersonId, Person.Name.First AS FirstName, Person.Name.Middle as MiddleName, Person.Name.Last AS LastName FROM Person
Example:

```sql
SELECT Person.PersonId, Person.Name.First AS FirstName, Person.Name.Middle as MiddleName, Person.Name.Last AS LastName FROM Person
```

The following pipeline copies data from the Person collection in the DocumentDB database to an Azure blob. As part of the copy activity the input and output datasets have been specified.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ms.workload: data-services
ms.tgt_pltfrm: na
ms.devlang: na
ms.topic: article
ms.date: 09/06/2016
ms.date: 11/09/2016
ms.author: shlo

---
Expand Down Expand Up @@ -309,7 +309,7 @@ Let's look at a scenario for using Web service parameters. You have a deployed A
}
}

You can also use [Data Factory Functions](https://msdn.microsoft.com/library/dn835056.aspx) in passing values for the Web service parameters as shown in the following example:
You can also use [Data Factory Functions](data-factory-functions-variables.md) in passing values for the Web service parameters as shown in the following example:

"typeProperties": {
"globalParameters": {
Expand Down Expand Up @@ -508,7 +508,7 @@ The **takeaways** are:

* If your experiment endpoint uses a webServiceInput: it is represented by a blob dataset and is included in the activity inputs and the webServiceInput property. Otherwise, the webServiceInput property is omitted.
* If your experiment endpoint uses webServiceOutput(s): they are represented by blob datasets and are included in the activity outputs and in the webServiceOutputs property. The activity outputs and webServiceOutputs are mapped by the name of each output in the experiment. Otherwise, the webServiceOutputs property is omitted.
* If your experiment endpoint exposes globalParameter(s), they are given in the activity globalParameters property as key, value pairs. Otherwise, the globalParameters property is omitted. The keys are case-sensitive. [Azure Data Factory functions](data-factory-scheduling-and-execution.md#data-factory-functions-reference) may be used in the values.
* If your experiment endpoint exposes globalParameter(s), they are given in the activity globalParameters property as key, value pairs. Otherwise, the globalParameters property is omitted. The keys are case-sensitive. [Azure Data Factory functions](data-factory-functions-variables.md) may be used in the values.
* Additional datasets may be included in the Activity inputs and outputs properties, without being referenced in the Activity typeProperties. These datasets govern execution using slice dependencies but are otherwise ignored by the AzureMLBatchExecution Activity.

## Updating models using Update Resource Activity
Expand Down Expand Up @@ -809,7 +809,7 @@ To specify values for Web service parameters, add a **typeProperties** section t
}


You can also use [Data Factory Functions](https://msdn.microsoft.com/library/dn835056.aspx) in passing values for the Web service parameters as shown in the following example:
You can also use [Data Factory Functions](data-factory-functions-variables.md) in passing values for the Web service parameters as shown in the following example:

"typeProperties": {
"webServiceParameters": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
---
title: Build your first data factory (PowerShell) | Microsoft Docs
description: In this tutorial, you create a sample Azure Data Factory pipeline using Azure PowerShell.
services: data-factory
Expand Down Expand Up @@ -88,7 +88,7 @@ In this step, you link your Azure Storage account to your data factory. You use
}
}

Replace **account name** with the name of your Azure storage account and **account key** with the access key of the Azure storage account. To learn how to get your storage access key, see [View, copy and regenerate storage access keys](https://azure.microsoft.com/documentation/articles/storage-create-storage-account/#view-copy-and-regenerate-storage-access-keys).
Replace **account name** with the name of your Azure storage account and **account key** with the access key of the Azure storage account. To learn how to get your storage access key, see [View, copy and regenerate storage access keys](https://azure.microsoft.com/documentation/articles/storage-create-storage-account/#manage-your-storage-access-keys).
2. In Azure PowerShell, switch to the ADFGetStarted folder.
3. You can use the **New-AzureRmDataFactoryLinkedService** cmdlet that creates a linked service. This cmdlet and other Data Factory cmdlets you use in this tutorial requires you to pass values for the *ResourceGroupName* and *DataFactoryName* parameters. Alternatively, you can use **Get-AzureRmDataFactory** to get a **DataFactory** object and pass the object without typing *ResourceGroupName* and *DataFactoryName* each time you run a cmdlet. Run the following command to assign the output of the **Get-AzureRmDataFactory** cmdlet to a **$df** variable.

Expand Down Expand Up @@ -280,7 +280,7 @@ In this step, you create your first pipeline with a **HDInsightHive** activity.

In the activity JSON, you specify that the Hive script runs on the compute specified by the **linkedServiceName****HDInsightOnDemandLinkedService**.

> [ACOM.NOTE] See [Anatomy of a Pipeline](data-factory-create-pipelines.md#anatomy-of-a-pipeline) for details about JSON properties used in the example.
> [ACOM.NOTE] See [Create pipelines](data-factory-create-pipelines.md) article for details about JSON properties used in the example.
>
>
2. Confirm that you see the **input.log** file in the **adfgetstarted/inputdata** folder in the Azure blob storage, and run the following command to deploy the pipeline. Since the **start** and **end** times are set in the past and **isPaused** is set to false, the pipeline (activity in the pipeline) runs immediately after you deploy.
Expand Down
Loading

0 comments on commit 4a3abde

Please sign in to comment.