Merge branch 'master' of https://github.com/Azure/azure-content-pr in…

…to cabaileykeyvault

articles/architecture-overview.md

@@ -7,7 +7,7 @@ Resources for building applications that use Microsoft Azure.
 
 ##Microsoft Architecture Blueprints
 
-Microsoft is now publishing a set of high level architecture blueprints showing how to build specific types of systems using Microsoft Azure services. Eac blueprint includes a 2D Visio based file that you can download and modify, a more colorful 3D PDF file to introduce the blueprint and a video that walks through the 3D PDF. See 
+Microsoft is now publishing a set of high level architecture blueprints showing how to build specific types of systems using Microsoft Azure services. Each blueprint includes a 2D Visio based file that you can download and modify, a more colorful 3D PDF file to introduce the blueprint and a video that walks through the 3D PDF. See 
 [Microsoft Architecture Blueprints](http://msdn.microsoft.com/dn630664).
 
 ![Microsoft Architecture Blueprint 3D diagram][BluePrint]

articles/cdn-overview.md

@@ -0,0 +1,99 @@
+<properties urlDisplayName="CDN" pageTitle="Azure CDN Overview" metaKeywords="Azure CDN, Azure CDN, Azure blobs, Azure caching, Azure add-ons" description="Learn what the Azure Content Delivery Network (CDN) is and how to use it to deliver high-bandwidth content by caching blobs and static content." metaCanonical="" services="cdn" documentationCenter=".NET" title="" authors="akucer" solutions="" manager="dwrede" editor="" />
+
+<tags ms.service="cdn" ms.workload="tbd" ms.tgt_pltfrm="na" ms.devlang="na" ms.topic="article" ms.date="01/06/2015" ms.author="akucer" />
+
+#Overview of the Azure Content Delivery Network (CDN)
+
+The Azure Content Delivery Network (CDN) caches Azure blobs and static content used by cloud services at strategically placed locations to provide maximum bandwidth for delivering content to users. 
+
+If you are an existing CDN customer, you can now manage your CDN endpoints through the [Microsoft Azure Management Portal](https://manage.windowsazure.com). 
+
+
+>[AZURE.NOTE] Azure CDN has a separate [billing plan](http://www.microsoft.com/windowsazure/pricing/) from Azure Storage or Azure Cloud Services.
+ 
+
+The CDN offers developers a global solution for delivering high-bandwidth content by caching the content at physical nodes across the world. For a current list of CDN node locations, see [Azure Content Delivery Network (CDN) POP Locations](http://msdn.microsoft.com/en-us/library/azure/gg680302.aspx).
+
+The benefits of using the CDN to cache Azure data include:
+
+- Better performance and user experience for end users who are far from a content source, and are using applications where many "internet trips" are required to load content
+- Large distributed scale to better handle instantaneous high load, like at the start of a product launch event. 
+
+
+>[AZURE.IMPORTANT] When you create or enable a CDN endpoint, it may take up to 60 minutes to propagate worldwide.
+ 
+When a request for an object is first made to the CDN, the object is retrieved directly from the Blob service or from the cloud service. When a request is made using the CDN syntax, the request is redirected to the CDN endpoint closest to the location from which the request was made to provide access to the object. If the object is not found at that endpoint, then it is retrieved from the service and cached at the endpoint, where a time-to-live (TTL) setting is maintained for the cached object.
+
+##Caching content from Azure storage
+
+Once the CDN is enabled on a Azure storage account, any blobs that are in public containers and are available for anonymous access will be cached via the CDN. Only blobs that are publicly available can be cached with the Azure CDN. To make a blob publicly available for anonymous access, you must denote its container as public. Once you do so, all blobs within that container will be available for anonymous read access. You have the option of making container data public as well, or restricting access only to the blobs within it. See [Restrict Access to Containers and Blobs](http://msdn.microsoft.com/en-us/library/azure/dd179354.aspx) for information on managing access control for containers and blobs.
+
+For best performance, use CDN edge caching for delivering blobs less than 10 GB in size.
+
+When you enable CDN access for a storage account, the Management Portal provides you with a CDN domain name in the following format: http://<identifier>.vo.msecnd.net/. This domain name can be used to access blobs in a public container. For example, given a public container named music in a storage account named myaccount, users can access the blobs in that container using either of the following two URLs:
+
+- **Azure Blob service URL**: `http://myAccount.blob.core.windows.net/music/` 
+- **Azure CDN URL**: `http://<identifier>.vo.msecnd.net/music/` 
+
+##Caching content from Azure websites
+
+You can enable CDN from your websites to cache your web contents, such as images, scripts, and stylesheets. See [Integrate an Azure Website with Azure CDN](http://azure.microsoft.com/en-us/documentation/articles/cdn-websites-with-cdn/).
+
+When you enable CDN access for a website, the Management Portal provides you with a CDN domain name in the following format: http://<identifier>.vo.msecnd.net/. This domain name can be used to retrieve objects from a website. For example, given a public container named cdn and an image file called music.png, users can access the object using either of the following two URLs:
+
+- **Azure Website URL**: `http://mySiteName.azurewebsites.net/cdn/music.png` 
+- **Azure CDN URL**: `http://<identifier>.vo.msecnd.net/cdn/music.png` 
+##Caching content from Azure cloud services
+
+You can cache objects to the CDN that are provided by a Azure cloud service. 
+
+Caching for cloud services has the following constraints: 
+
+
+- The CDN should be used to cache static content only.
+
+	>[AZURE.WARNING] Caching of highly volatile or truly dynamic content may adversely affect your performance or cause content problems, all at increased cost.
+- Your cloud service must be deployed to in a production deployment.
+- Your cloud service must provide the object on port 80 using HTTP.
+- The cloud service must place the content to be cached in, or delivered from, the /cdn folder on the cloud service.
+
+When you enable CDN access for on a cloud service, the Management Portal provides you with a CDN domain name in the following format: http://<identifier>.vo.msecnd.net/. This domain name can be used to retrieve objects from a cloud service. For example, given a cloud service named myHostedService and an ASP.NET web page called music.aspx that delivers content, users can access the object using either of the following two URLs:
+
+
+- **Azure cloud service URL**: `http://myHostedService.cloudapp.net/cdn/music.aspx` 
+- **Azure CDN URL**: `http://<identifier>.vo.msecnd.net/music.aspx` 
+
+
+###Caching specific content with query strings
+
+You can use query strings to differentiate objects retrieved from a cloud service. For example, if the cloud service displays a chart that can vary you can pass a query string to retrieve the specific chart required. For example: 
+
+`http://<identifier>.vo.msecnd.net/chart.aspx?item=1`
+
+Query strings are passed as string literals. If you have an service that takes two parameters, such as `?area=2&item=1` and make subsequent call to the service using `?item=1&area=2`, you will cache two copies of the same object.
+
+
+##Accessing cached content over HTTPS
+
+
+Azure allows you to retrieve content from the CDN using HTTPS calls. This allows you to incorporate content cached in the CDN into secure web pages without receiving warnings about mixed security content types.
+
+Accessing CDN content using HTTPS has the following constraints:
+
+
+- You must use the certificate provided by the CDN. Third party certificates are not supported.
+- You must use the CDN domain to access content. HTTPS support is not available for custom domain names (CNAMEs) since the CDN does not support custom certificates at this time.
+
+
+
+Even when HTTPS is enabled, content from the CDN can be retrieved using both HTTP and HTTPS.
+
+For more information on enabling HTTPS for CDN content, see [How to Enable the Content Delivery Network (CDN) for Azure](http://msdn.microsoft.com/en-us/library/azure/gg680301.aspx).
+
+
+##Accessing cached content with custom domains
+
+You can map the CDN HTTP endpoint to a custom domain name and use that name to request objects from the CDN.
+
+For more information on mapping a custom domain, see [How to Map Content Delivery Network (CDN) Content to a Custom Domain](http://msdn.microsoft.com/en-us/library/azure/gg680307.aspx).
+

articles/data-factory-copy-activity.md

@@ -759,14 +759,16 @@ When copy data into SQL Server or Azure SQL Database, a user specified stored pr
     	    [State] [varchar](256) NOT NULL,
     	)
 
-The stored procedure feature takes advantage of Table-Valued Parameters. You can learn more information about Table-Valued Parameters from [here]( http://msdn.microsoft.com/en-us/library/bb675163(v=vs.110).aspx)
+The stored procedure feature takes advantage of [Table-Valued Parameters][table-valued-parameters]. 
 
 ## Walkthroughs
 See [Get started with Azure Data Factory][adfgetstarted] for a tutorial that shows how to copy data from a Azure blob storage to an Azure SQL Database using the Copy Activity.
 
 See [Enable your pipelines to work with on-premises data][use-onpremises-datasources] for a walkthrough that shows how to copy data from an on-premises SQL Server database to an Azure blob storage using the Copy Activity
 
 
+[table-valued-parameters]: http://msdn.microsoft.com/en-us/library/bb675163.aspx
+
 
 [adfgetstarted]: ../data-factory-get-started
 [use-onpremises-datasources]: ../data-factory-use-onpremises-datasources