Cosmos DB: DocumentDB->Cosmos DB cleanup work.

mimig1 · mimig1 · commit eb258e08fdff · 2017-06-05T15:55:57.000-05:00
diff --git a/articles/cosmos-db/TOC.yml b/articles/cosmos-db/TOC.yml
@@ -312,7 +312,7 @@
 - name: Resources
   items:
   - name: Pricing
-    href: https://azure.microsoft.com/pricing/details/documentdb/
+    href: https://azure.microsoft.com/pricing/details/cosmos-db/
   - name: FAQ
     href: faq.md
   - name: Stack Overflow
diff --git a/articles/cosmos-db/change-feed-hl7-fhir-logic-apps.md b/articles/cosmos-db/change-feed-hl7-fhir-logic-apps.md
@@ -230,6 +230,6 @@ The following image shows all of the Azure services for this solution running in
 - Using Azure Service Bus Queues to handle the distribution for the HL7 FHIR documents.
 
 ## Next steps
-For more information about Azure Cosmos DB, see the [Azure Cosmos DB home page](https://azure.microsoft.com/services/documentdb/). For more informaiton about Logic Apps, see [Logic Apps](https://azure.microsoft.com/services/logic-apps/).
+For more information about Azure Cosmos DB, see the [Azure Cosmos DB home page](https://azure.microsoft.com/services/cosmos-db/). For more informaiton about Logic Apps, see [Logic Apps](https://azure.microsoft.com/services/logic-apps/).
 
 
diff --git a/articles/cosmos-db/cli-samples.md b/articles/cosmos-db/cli-samples.md
@@ -14,7 +14,7 @@ ms.devlang: azurecli
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: database
-ms.date: 05/10/2017
+ms.date: 06/05/2017
 ms.author: mimig
 ---
 
@@ -25,7 +25,7 @@ The following table includes links to sample Azure CLI scripts for Azure Cosmos
 | |  |
 |---|---|
 |**Create Azure Cosmos DB account, database, and containers**||
-|[Create a Document, Graph, or Table API account](scripts/create-database-account-collections-cli.md)| Creates a single Azure Cosmos DB DocumentDB API account, database, and container. |
+|[Create a DocumentDB, Graph, or Table API account](scripts/create-database-account-collections-cli.md)| Creates a single Azure Cosmos DB API account, database, and container for use with the DocumentDB, Graph, or Table APIs. |
 | [Create a MongoDB API account](scripts/create-mongodb-database-account-cli.md) | Creates a single Azure Cosmos DB MongoDB API account, database, and collection. |
 |**Scale Azure Cosmos DB**||
 | [Scale container throughput](scripts/scale-collection-throughput-cli.md) | Changes the provisioned througput on a container.|
diff --git a/articles/cosmos-db/create-graph-dotnet.md b/articles/cosmos-db/create-graph-dotnet.md
@@ -56,7 +56,7 @@ Now let's clone a Graph API app from github, set the connection string, and run
 
 Let's make a quick review of what's happening in the app. Open the Program.cs file and you'll find that these lines of code create the Azure Cosmos DB resources. 
 
-* The DocumentClient is initialized. In the preview, we added a graph extension API on the DocumentDB client. We are working on a standalone graph client decoupled from the DocumentDB client and resources.
+* The DocumentClient is initialized. In the preview, we added a graph extension API on the Azure Cosmos DB client. We are working on a standalone graph client decoupled from the Azure Cosmos DB client and resources.
 
     ```csharp
     using (DocumentClient client = new DocumentClient(
diff --git a/articles/cosmos-db/create-graph-java.md b/articles/cosmos-db/create-graph-java.md
@@ -82,7 +82,7 @@ Now go back to the Azure portal to get your connection string information and co
 
 1. In the [Azure portal](http://portal.azure.com/), in your Azure Cosmos DB account, in the left navigation click **Keys**, and then click **Read-write Keys**. You use the copy buttons on the right side of the screen to copy the URI and Primary Key into the `Program.java` file in the next step.
 
-    ![View and copy an access key in the Azure portal, Keys blade](./media/create-documentdb-dotnet/keys.png)
+    ![View and copy an access key in the Azure portal, Keys blade](./media/create-graph-java/keys.png)
 
 2. In Open the `src/remote-secure.yaml` file. 
 
diff --git a/articles/cosmos-db/create-graph-nodejs.md b/articles/cosmos-db/create-graph-nodejs.md
@@ -95,7 +95,7 @@ Now go back to the Azure portal to get your connection string information, and c
 
 1. In the [Azure portal](http://portal.azure.com/), in your Azure Cosmos DB account, on the left navigation menu, click **Keys**, and then click **Read-write Keys**. You use the copy buttons at the right to copy the URI and primary key into the `app.js` file in the next step.
 
-    ![The Azure portal Keys blade](./media/create-documentdb-dotnet/keys.png)
+    ![The Azure portal Keys blade](./media/create-graph-nodejs/keys.png)
 
 2. Copy your Gremlin URI value from the portal (using the copy button) and make it the value of `config.endpoint` key in config.js. The Gremlin endpoint must be only the host name without the protocol/port number, like `mygraphdb.graphs.azure.com` (not `https://mygraphdb.graphs.azure.com` or `mygraphdb.graphs.azure.com:433`).
 
diff --git a/articles/cosmos-db/create-mongodb-nodejs.md b/articles/cosmos-db/create-mongodb-nodejs.md
@@ -24,7 +24,7 @@ Azure Cosmos DB is Microsoft’s globally distributed multi-model database servi
 
 This quickstart demonstrates how to use an existing [MongoDB](mongodb-introduction.md) app written in Node.js and connect it to your Azure Cosmos DB database, which supports MongoDB client connections. In other words, your Node.js application only knows that it's connecting to a database using MongoDB APIs. It is transparent to the application that the data is stored in Azure Cosmos DB.
 
-When you are done, you will have a MEAN application (MongoDB, Express, AngularJS, and Node.js) running on [Azure Cosmos DB](https://azure.microsoft.com/services/documentdb/). 
+When you are done, you will have a MEAN application (MongoDB, Express, AngularJS, and Node.js) running on [Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/). 
 
 ![MEAN.js app running in Azure App Service](./media/create-mongodb-nodejs/meanjs-in-azure.png)
 
diff --git a/articles/cosmos-db/create-table-dotnet.md b/articles/cosmos-db/create-table-dotnet.md
@@ -100,7 +100,7 @@ Now go back to the Azure portal to get your connection string information and co
 
 1. In the [Azure portal](http://portal.azure.com/), in your Azure Cosmos DB account, in the left navigation click **Keys**, and then click **Read-write Keys**. You'll use the copy buttons on the right side of the screen to copy the URI and Primary Key into the app.config file in the next step.
 
-    ![View and copy an access key in the Azure portal, Keys blade](./media/create-documentdb-dotnet-core/keys.png)
+    ![View and copy an access key in the Azure portal, Keys blade](./media/create-table-dotnet/keys.png)
 
 2. In Visual Studio, open the app.config file. 
 
diff --git a/articles/cosmos-db/create-website.md b/articles/cosmos-db/create-website.md
@@ -18,7 +18,7 @@ ms.author: mimig
 
 ---
 # Deploy Azure Cosmos DB and Azure App Service Web Apps using an Azure Resource Manager Template
-This tutorial shows you how to use an Azure Resource Manager template to deploy and integrate [Microsoft Azure Cosmos DB](https://azure.microsoft.com/services/documentdb/), an [Azure App Service](http://go.microsoft.com/fwlink/?LinkId=529714) web app, and a sample web application.
+This tutorial shows you how to use an Azure Resource Manager template to deploy and integrate [Microsoft Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/), an [Azure App Service](http://go.microsoft.com/fwlink/?LinkId=529714) web app, and a sample web application.
 
 Using Azure Resource Manager templates, you can easily automate the deployment and configuration of your Azure resources.  This tutorial shows how to deploy a web application and automatically configure Azure Cosmos DB account connection information.
 
@@ -80,7 +80,7 @@ Now let's deploy our first template.
    
    ![Sample Todo application](./media/create-website/image2.png)
 9. Go ahead and create a couple of tasks in the web app and then return to the Resource group blade in the Azure portal. Click the Azure Cosmos DB account resource in the Resources list and then click **Query Explorer**.
-    ![Screenshot of the Summary lens with the myotherdocumentdbwebapp web app highlighted](./media/create-website/TemplateDeployment8.png)  
+    ![Screenshot of the Summary lens with the web app highlighted](./media/create-website/TemplateDeployment8.png)  
 10. Run the default query, "SELECT * FROM c" and inspect the results.  Notice that the query has retrieved the JSON representation of the todo items you created in step 7 above.  Feel free to experiment with queries; for example, try running SELECT * FROM c WHERE c.isComplete = true to return all todo items which have been marked as complete.
     
     ![Screenshot of the Query Explorer and Results blades showing the query results](./media/create-website/image5.png)
diff --git a/articles/cosmos-db/documentdb-dotnetcore-get-started.md b/articles/cosmos-db/documentdb-dotnetcore-get-started.md
@@ -204,7 +204,7 @@ Congratulations! You have successfully created an Azure Cosmos DB database.
 
 ## <a id="CreateColl"></a>Step 5: Create a collection
 > [!WARNING]
-> **CreateDocumentCollectionAsync** will create a new collection with reserved throughput, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/documentdb/).
+> **CreateDocumentCollectionAsync** will create a new collection with reserved throughput, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/cosmos-db/).
 
 A [collection](documentdb-resources.md#collections) can be created by using the [CreateDocumentCollectionAsync](https://msdn.microsoft.com/library/microsoft.azure.documents.client.documentclient.createdocumentcollectionasync.aspx) method of the **DocumentClient** class. A collection is a container of JSON documents and associated JavaScript application logic.
 
diff --git a/articles/cosmos-db/documentdb-get-started.md b/articles/cosmos-db/documentdb-get-started.md
@@ -187,7 +187,7 @@ Congratulations! You have successfully created an Azure Cosmos DB database.
 
 ## <a id="CreateColl"></a>Step 5: Create a collection
 > [!WARNING]
-> **CreateDocumentCollectionIfNotExistsAsync** will create a new collection with reserved throughput, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/documentdb/).
+> **CreateDocumentCollectionIfNotExistsAsync** will create a new collection with reserved throughput, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/cosmos-db/).
 > 
 > 
 
diff --git a/articles/cosmos-db/documentdb-java-get-started.md b/articles/cosmos-db/documentdb-java-get-started.md
@@ -97,7 +97,7 @@ Your Azure Cosmos DB [database](documentdb-resources.md#databases) can be create
 
 ## <a id="CreateColl"></a>Step 5: Create a collection
 > [!WARNING]
-> **createCollection** creates a new collection with reserved throughput, which has pricing implications. For more details, visit our [pricing page](https://azure.microsoft.com/pricing/details/documentdb/).
+> **createCollection** creates a new collection with reserved throughput, which has pricing implications. For more details, visit our [pricing page](https://azure.microsoft.com/pricing/details/cosmos-db/).
 > 
 > 
 
diff --git a/articles/cosmos-db/documentdb-nodejs-get-started.md b/articles/cosmos-db/documentdb-nodejs-get-started.md
@@ -259,7 +259,7 @@ Congratulations! You have successfully created an Azure Cosmos DB database.
 
 ## <a id="CreateColl"></a>Step 6: Create a collection
 > [!WARNING]
-> **CreateDocumentCollectionAsync** will create a new collection, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/documentdb/).
+> **CreateDocumentCollectionAsync** will create a new collection, which has pricing implications. For more details, please visit our [pricing page](https://azure.microsoft.com/pricing/details/cosmos-db/).
 > 
 > 
 
diff --git a/articles/cosmos-db/faq.md b/articles/cosmos-db/faq.md
@@ -9,7 +9,7 @@ editor: monicar
 documentationcenter: ''
 
 ms.assetid: b68d1831-35f9-443d-a0ac-dad0c89f245b
-ms.service: documentdb
+ms.service: cosmos-db
 ms.workload: data-services
 ms.tgt_pltfrm: na
 ms.devlang: na
@@ -25,7 +25,7 @@ Azure Cosmos DB is a globally replicated, multi-model database service that that
 
 Azure Cosmos DB started in late 2010 to address developer pain-points that are faced by large-scale applications inside Microsoft. Since building globally distributed applications is not a problem unique to just to Microsoft, we made the service available externally to all Azure Developers in the form of Azure DocumentDB. Azure Cosmos DB is the next big leap in the evolution of DocumentDB and we are now making it available for you to use. As a part of this release of Azure Cosmos DB, DocumentDB customers (with their data) are automatically Azure Cosmos DB customers. The transition is seamless and they now have access to a broader range of new capabilities offered by Azure Cosmos DB. 
 
-For more database questions, answers, and instructions on deploying and using this service, see the [Azure Cosmos DB documentation page](https://azure.microsoft.com/documentation/services/documentdb/).
+For more database questions, answers, and instructions on deploying and using this service, see the [Azure Cosmos DB documentation page](https://docs.microsoft.com/azure/cosmos-db/).
 
 ### What happened to DocumentDB?
 The DocumentDB API is one of the supported APIs and data models for Azure Cosmos DB. In addition, Azure Cosmos DB supports you with Graph API (preview), Table API (preview) and MongoDB API. For more information, see [Answers to frequent questions from DocumentDB customers](#moving-to-cosmos-db).
@@ -51,7 +51,7 @@ There is no limit to the total amount of data that a container can store in Azur
 There is no limit to the total amount of throughput that a container can support in Azure Cosmos DB, the key here is that your workload needs to be distributed roughly evenly among a sufficiently large number of partition keys.
 
 ### How much does Azure Cosmos DB cost?
-Refer to the [Azure Cosmos DB pricing details](https://azure.microsoft.com/pricing/details/documentdb/) page for details. Azure Cosmos DB usage charges are determined by the number of containers provisioned, the number of hours the containers were online, and the provisioned throughput for each container. Containers here refer to DocumentDB API's collection, Graph API's graph, MongoDB API's collection, and Table API's tables. 
+Refer to the [Azure Cosmos DB pricing details](https://azure.microsoft.com/pricing/details/cosmos-db/) page for details. Azure Cosmos DB usage charges are determined by the number of containers provisioned, the number of hours the containers were online, and the provisioned throughput for each container. Containers here refer to DocumentDB API's collection, Graph API's graph, MongoDB API's collection, and Table API's tables. 
 
 ### Is there a free account available?
 If you are new to Azure, you can sign up for an [Azure free account](https://azure.microsoft.com/free/), which gives you 30 days and $200 to try all the Azure services. Or, if you have a Visual Studio subscription, you are eligible for [$150 in free Azure credits per month](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) to use on any Azure service.  
@@ -97,7 +97,7 @@ Yes, DocumentDB API supports cross-document transactions expressed as JavaScript
 ### What is a collection?
 A collection is a group of documents and their associated JavaScript application logic. A collection is a billable entity, where the [cost](performance-levels.md) is determined by the throughput and storage used. Collections can span one or more partitions/servers and can scale to handle practically unlimited volumes of storage or throughput.
 
-Collections are also the billing entities for Azure Cosmos DB. Each collection is billed hourly based on the provisioned throughput and the storage space used. For more information, see [DocumentDB API  pricing](https://azure.microsoft.com/pricing/details/documentdb/).  
+Collections are also the billing entities for Azure Cosmos DB. Each collection is billed hourly based on the provisioned throughput and the storage space used. For more information, see [Azure Cosmos DB pricing](https://azure.microsoft.com/pricing/details/cosmos-db/).  
 
 ### How do I create a database?
 You can create databases using the [Azure portal]() as described in [Add a collection](create-documentdb-dotnet.md#create-collection), one of the [Azure Cosmos DB SDKs](documentdb-sdk-dotnet.md), or through the [REST APIs](https://msdn.microsoft.com/library/azure/dn781481.aspx).  
diff --git a/articles/cosmos-db/geospatial.md b/articles/cosmos-db/geospatial.md
@@ -19,7 +19,7 @@ ms.custom: H1Hack27Feb2017
 
 ---
 # Working with geospatial and GeoJSON location data in Azure Cosmos DB
-This article is an introduction to the geospatial functionality in [Azure Cosmos DB](https://azure.microsoft.com/services/documentdb/). After reading this, you will be able to answer the following questions:
+This article is an introduction to the geospatial functionality in [Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/). After reading this, you will be able to answer the following questions:
 
 * How do I store spatial data in Azure Cosmos DB?
 * How can I query geospatial data in Azure Cosmos DB in SQL and LINQ?
diff --git a/articles/cosmos-db/key-value-store-cost.md b/articles/cosmos-db/key-value-store-cost.md
diff --git a/articles/cosmos-db/media/create-graph-java/keys.png b/articles/cosmos-db/media/create-graph-java/keys.png
diff --git a/articles/cosmos-db/media/create-graph-nodejs/keys.png b/articles/cosmos-db/media/create-graph-nodejs/keys.png
diff --git a/articles/cosmos-db/partition-data.md b/articles/cosmos-db/partition-data.md
diff --git a/articles/cosmos-db/performance-testing.md b/articles/cosmos-db/performance-testing.md
diff --git a/articles/cosmos-db/secure-access-to-data.md b/articles/cosmos-db/secure-access-to-data.md
