Skip to content

Commit

Permalink
Merge pull request #11694 from Azure/FromPublicRepo
Browse files Browse the repository at this point in the history
From public repo
  • Loading branch information
v-anpasi committed Jun 16, 2015
2 parents 203dafd + 5c5e08f commit 67a1e06
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
5 changes: 5 additions & 0 deletions articles/automation-graphical-authoring-intro.md
Expand Up @@ -118,6 +118,11 @@ When you specify a value for a parameter, you select a data source to determine
|Empty String|An empty string value.|
|Null|A Null value.|
|PowerShell Expression|Specify simple PowerShell expression. The expression will be evaluated before the activity and the result used for the parameter value. You can use variables to refer to the output of an activity or a runbook input parameter.|
|Runbook Input Parameter (*Coming soon)|Use one of runbook input parameters directly as value for the activity input parameter.|
|Automation Variable Asset (*Coming soon)|A value of existing Automation Variable.|
|Automation Credential Asset (*Coming soon)|A value of existing Automation Credential.|
|Automation Certificate Asset (*Coming soon)|An instance of existing Automation Certificate.|
|Automation Connection Asset (*Coming soon)|An instance of existing Automation Connection.|
|Unselect|Clears any value that was previously configured.|


Expand Down
3 changes: 1 addition & 2 deletions articles/expressroute-locations.md
Expand Up @@ -51,8 +51,7 @@ Connectivity across geopolitical regions is not supported. You can work with you
| **[Level 3 Communications - Exchange]( http://your.level3.com/LP=882?WT.tsrc=02192014LP882AzureVanityAzureText)** | Chicago, Dallas, London, Seattle, Silicon Valley, Washington DC |
| **NEXTDC** | Melbourne, Sydney+ |
| **[TeleCity Group]( http://www.telecitygroup.com/investor-centre/news_details.htm?locid=03100500400b00d&xml)** | Amsterdam, London |
| **[Telstra Corporation]( http://www.telstra.com.au/business-enterprise/network-services/networks/cloud-direct-connect/)** | Melbourne+, Sydney+ |

| **[Telstra Corporation]( http://www.telstra.com.au/business-enterprise/network-services/networks/cloud-direct-connect/)** | Melbourne+, Sydney+ |
| **[Zayo Group]( http://www.zayo.com/)** | Washington DC |

**+** denotes coming soon
Expand Down
4 changes: 2 additions & 2 deletions articles/search-howto-dotnet-sdk.md
Expand Up @@ -13,7 +13,7 @@
ms.workload="search"
ms.topic="article"
ms.tgt_pltfrm="na"
ms.date="04/17/2015"
ms.date="06/15/2015"
ms.author="brjohnst"/>

# How to use Azure Search from a .NET Application #
Expand All @@ -29,7 +29,7 @@ The client library defines classes like `Index`, `Field`, and `Document`, as wel
- [Microsoft.Azure.Search](https://msdn.microsoft.com/library/azure/microsoft.azure.search.aspx)
- [Microsoft.Azure.Search.Models](https://msdn.microsoft.com/library/azure/microsoft.azure.search.models.aspx)

The current version of the Azure Search .NET SDK is `0.10.0-preview`. This is a pre-release version of the SDK. If you would like to provide feedback for us to incorporate in the first stable version, please visit our [feedback page](http://feedback.azure.com/forums/263029-azure-search).
The current version of the Azure Search .NET SDK is a pre-release version. If you would like to provide feedback for us to incorporate in the first stable version, please visit our [feedback page](http://feedback.azure.com/forums/263029-azure-search).

The .NET SDK supports version `2015-02-28` of the Azure Search REST API, documented on [MSDN](https://msdn.microsoft.com/library/azure/dn798935.aspx). New features that are *not* part of this version, such as support for Microsoft's natural language processors or the `moreLikeThis` search parameter, are in [preview](../search-api-2015-02-28-preview/) and not yet available in the SDK. You can check back on [Search service versioning](https://msdn.microsoft.com/library/azure/dn864560.aspx) or [Latest updates to Azure Search](../search-latest-updates/) for status updates on either feature.

Expand Down
2 changes: 1 addition & 1 deletion articles/sql-database-elastic-pool-portal.md
Expand Up @@ -73,7 +73,7 @@ An elastic pool's pricing tier is somewhat analogous to a SQL database's service

### Add databases

At any time, you can select the specific databases you want to be included in the pool. When you create a new pool, Azure recommends the databases that will benefit from being in a pool and marks them for inclusion. You can add all the databases available on the server or you can select or clear databases from the initial list as desired.
At any time, you can select the specific databases you want to be included in the pool. When you create a new pool, Azure recommends the databases that will benefit from being in a pool and marks them for inclusion. Azure evaluates the utilization history of databases and recommends an elastic pool when it is more cost effective than using performance levels for single databases. If an elastic pool is recommended, Azure provides recommended amount of pool DTUs, min/max DTU settings for each database in the pool, and a list of recommended databases. In order for database to be considered as a candidate for elastic pool it must exist for at least 14 days and it must not be in Premium pricing tier (public preview is limited to Standard only, therefore Premium DBs are not considered as viable). You can add all the databases available on the server or you can select or clear databases from the initial list as desired.

![Add databases][5]

Expand Down

0 comments on commit 67a1e06

Please sign in to comment.