Skip to content

Commit a55e9e1

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ts_esp5
2 parents 8525c47 + b2c6785 commit a55e9e1

18 files changed

+56
-70
lines changed

articles/azure-app-configuration/howto-integrate-azure-managed-service-identity.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ To set up a managed identity in the portal, you first create an application and
9292
9393
```csharp-interactive
9494
using Azure.Identity;
95-
using Microsoft.Azure.Services.AppAuthentication;
9695
```
9796
9897
1. If you wish to access only values stored directly in App Configuration, update the `CreateWebHostBuilder` method by replacing the `config.AddAzureAppConfiguration()` method.
@@ -259,4 +258,4 @@ For example, you can update the .NET Framework console app created in the quicks
259258
In this tutorial, you added an Azure managed identity to streamline access to App Configuration and improve credential management for your app. To learn more about how to use App Configuration, continue to the Azure CLI samples.
260259

261260
> [!div class="nextstepaction"]
262-
> [CLI samples](./cli-samples.md)
261+
> [CLI samples](./cli-samples.md)

articles/azure-functions/functions-create-first-function-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ In Azure Functions, a function project is a container for one or more individual
9292
cd LocalFunctionProj
9393
```
9494
95-
1. Add a function to your project by using the following command, where the `--name` argument is the unique name of your function and the `--template` argument specifies the function's trigger. `func new` create a subfolder matching the function name that contains a code file appropriate to the project's chosen language and a configuration file named *function.json*.
95+
1. Add a function to your project by using the following command, where the `--name` argument specifies the unique name of your function (HttpExample in this case) and the `--template` argument specifies the function's trigger (HTTP trigger). This `func new` command creates a subfolder matching the function name that contains a code file appropriate to the project's chosen language and a configuration file named *function.json*.
9696
9797
```
9898
func new --name HttpExample --template "HTTP trigger"

articles/cosmos-db/create-table-java.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,14 @@ ms.custom: seo-java-august2019, seo-java-september2019
2020
> * [Python](create-table-python.md)
2121
>
2222
23-
This quickstart shows how to use Java and the Azure Cosmos DB [Table API](table-introduction.md) to build an app by cloning an example from GitHub. You'll learn how to create an Azure Cosmos DB account and how to use Data Explorer to create tables and entities in the web-based Azure portal.
24-
25-
Azure Cosmos DB is Microsoft’s globally distributed multi-model database service. You can quickly create and query document, key/value, and graph databases, all of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB.
23+
In this quickstart, you create an Azure Cosmos DB Table API account, and use Data Explorer and a Java app cloned from GitHub to create tables and entities. Azure Cosmos DB is a multi-model database service that lets you quickly create and query document, table, key-value, and graph databases with global distribution and horizontal scale capabilities.
2624

2725
## Prerequisites
2826

29-
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
30-
[!INCLUDE [cosmos-db-emulator-docdb-api](../../includes/cosmos-db-emulator-docdb-api.md)]
31-
32-
In addition:
33-
34-
* [Java Development Kit (JDK) 8](https://aka.ms/azure-jdks)
35-
* Be sure to set the JAVA_HOME environment variable to point to the folder where the JDK is installed.
36-
* [Download](https://maven.apache.org/download.cgi) and [install](https://maven.apache.org/install.html) a [Maven](https://maven.apache.org/) binary archive
37-
* On Ubuntu, you can run `apt-get install maven` to install Maven.
38-
* [Git](https://www.git-scm.com/)
39-
* On Ubuntu, you can run `sudo apt-get install git` to install Git.
27+
- An Azure account with an active subscription. [Create one for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio). Or [try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) without an Azure subscription. You can also use the [Azure Cosmos DB Emulator](https://aka.ms/cosmosdb-emulator) with a URI of `https://localhost:8081` and the key `C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==`.
28+
- [Java Development Kit (JDK) 8](https://www.azul.com/downloads/azure-only/zulu/?&version=java-8-lts&architecture=x86-64-bit&package=jdk). Point your `JAVA_HOME` environment variable to the folder where the JDK is installed.
29+
- A [Maven binary archive](https://maven.apache.org/download.cgi).
30+
- [Git](https://www.git-scm.com/downloads).
4031

4132
## Create a database account
4233

@@ -80,13 +71,13 @@ Now let's clone a Table app from GitHub, set the connection string, and run it.
8071

8172
Now go back to the Azure portal to get your connection string information and copy it into the app. This enables your app to communicate with your hosted database.
8273

83-
1. In the [Azure portal](https://portal.azure.com/), select **Connection String**.
74+
1. In your Azure Cosmos DB account in the [Azure portal](https://portal.azure.com/), select **Connection String**.
8475

8576
![View the connection string information in the Connection String pane](./media/create-table-java/cosmos-db-quickstart-connection-string.png)
8677

8778
2. Copy the PRIMARY CONNECTION STRING using the copy button on the right.
8879

89-
3. Open config.properties from the C:\git-samples\storage-table-java-getting-started\src\main\resources folder.
80+
3. Open *config.properties* from the *C:\git-samples\storage-table-java-getting-started\src\main\resources* folder.
9081

9182
5. Comment out line one and uncomment line two. The first two lines should now look like this.
9283

@@ -101,7 +92,7 @@ Now go back to the Azure portal to get your connection string information and co
10192
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
10293
>
10394

104-
7. Save the config.properties file.
95+
7. Save the *config.properties* file.
10596

10697
You've now updated your app with all the info it needs to communicate with Azure Cosmos DB.
10798
@@ -113,15 +104,15 @@ You've now updated your app with all the info it needs to communicate with Azure
113104
cd "C:\git-samples\storage-table-java-getting-started"
114105
```
115106
116-
2. In the git terminal window, run the following commands to run start the Java application.
107+
2. In the git terminal window, run the following commands to run the Java application.
117108
118109
```git
119110
mvn compile exec:java
120111
```
121112
122113
The console window displays the table data being added to the new table database in Azure Cosmos DB.
123114
124-
You can now go back to Data Explorer and see query, modify, and work with this new data.
115+
You can now go back to Data Explorer and see, query, modify, and work with this new data.
125116
126117
## Review SLAs in the Azure portal
127118
@@ -133,7 +124,7 @@ You've now updated your app with all the info it needs to communicate with Azure
133124
134125
## Next steps
135126
136-
In this quickstart, you've learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run an app. Now you can query your data using the Table API.
127+
In this quickstart, you learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run a Java app to add table data. Now you can query your data using the Table API.
137128
138129
> [!div class="nextstepaction"]
139130
> [Import table data to the Table API](table-import.md)

articles/cosmos-db/create-table-nodejs.md

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,13 @@ ms.author: sngun
1919
> * [Python](create-table-python.md)
2020
>
2121
22-
This quickstart shows how to use Node.js and the Azure Cosmos DB [Table API](table-introduction.md) to build an app by cloning an example from GitHub. This quickstart also shows you how to create an Azure Cosmos DB account and how to use Data Explorer to create tables and entities in the web-based Azure portal.
23-
24-
Azure Cosmos DB is Microsoft’s globally distributed multi-model database service. You can quickly create and query document, key/value, wide-column, and graph databases, all of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB.
22+
In this quickstart, you create an Azure Cosmos DB Table API account, and use Data Explorer and a Node.js app cloned from GitHub to create tables and entities. Azure Cosmos DB is a multi-model database service that lets you quickly create and query document, table, key-value, and graph databases with global distribution and horizontal scale capabilities.
2523

2624
## Prerequisites
2725

28-
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
29-
[!INCLUDE [cosmos-db-emulator-docdb-api](../../includes/cosmos-db-emulator-docdb-api.md)]
30-
31-
In addition:
32-
33-
* [Node.js](https://nodejs.org/en/) version v0.10.29 or higher
34-
* [Git](https://git-scm.com/)
26+
- An Azure account with an active subscription. [Create one for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio). Or [try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) without an Azure subscription. You can also use the [Azure Cosmos DB Emulator](https://aka.ms/cosmosdb-emulator) with a URI of `https://localhost:8081` and the key `C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==`.
27+
- [Node.js 0.10.29+](https://nodejs.org/) .
28+
- [Git](https://git-scm.com/downloads).
3529

3630
## Create a database account
3731

@@ -75,19 +69,19 @@ Now let's clone a Table app from GitHub, set the connection string, and run it.
7569

7670
Now go back to the Azure portal to get your connection string information and copy it into the app. This enables your app to communicate with your hosted database.
7771

78-
1. In the [Azure portal](https://portal.azure.com/), click **Connection String**.
72+
1. In your Azure Cosmos DB account in the [Azure portal](https://portal.azure.com/), select **Connection String**.
7973

8074
![View and copy the required connection string information from the in the Connection String pane](./media/create-table-nodejs/connection-string.png)
8175

82-
2. Copy the PRIMARY CONNECTION STRING using the copy button on the right-side.
76+
2. Copy the PRIMARY CONNECTION STRING using the copy button on the right side.
8377

84-
3. Open the app.config file, and paste the value into the connectionString on line three.
78+
3. Open the *app.config* file, and paste the value into the connectionString on line three.
8579

8680
> [!IMPORTANT]
8781
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
8882
>
8983

90-
3. Save the app.config file.
84+
3. Save the *app.config* file.
9185

9286
You've now updated your app with all the info it needs to communicate with Azure Cosmos DB.
9387
@@ -99,21 +93,21 @@ You've now updated your app with all the info it needs to communicate with Azure
9993
cd "C:\git-samples\storage-table-node-getting-started"
10094
```
10195
102-
2. Run the following command to install the [azure], [node-uuid], [nconf] and [async] modules locally as well as to save an entry for them to the package.json file
96+
2. Run the following command to install the [azure], [node-uuid], [nconf] and [async] modules locally as well as to save an entry for them to the *package.json* file.
10397
10498
```
10599
npm install azure-storage node-uuid async nconf --save
106100
```
107101
108-
2. In the git terminal window, run the following commands to run start the Node application.
102+
2. In the git terminal window, run the following commands to run the Node.js application.
109103
110104
```
111105
node ./tableSample.js
112106
```
113107
114108
The console window displays the table data being added to the new table database in Azure Cosmos DB.
115109
116-
You can now go back to Data Explorer and see query, modify, and work with this new data.
110+
You can now go back to Data Explorer and see, query, modify, and work with this new data.
117111
118112
## Review SLAs in the Azure portal
119113
@@ -125,7 +119,7 @@ You've now updated your app with all the info it needs to communicate with Azure
125119
126120
## Next steps
127121
128-
In this quickstart, you've learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run an app. Now you can query your data using the Table API.
122+
In this quickstart, you learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run a Node.js app to add table data. Now you can query your data using the Table API.
129123
130124
> [!div class="nextstepaction"]
131125
> [Import table data to the Table API](table-import.md)

articles/cosmos-db/create-table-python.md

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@ ms.custom: seo-python-october2019
2020
> * [Python](create-table-python.md)
2121
>
2222
23-
This quickstart shows how to use Python and the Azure Cosmos DB [Table API](table-introduction.md) to build an app by cloning an example from GitHub. This quickstart also shows you how to create an Azure Cosmos DB account and how to use Data Explorer to create tables and entities in the web-based Azure portal.
24-
25-
Azure Cosmos DB is Microsoft’s globally distributed multi-model database service. You can quickly create and query document, key/value, wide-column, and graph databases, all of which benefit from the global distribution and horizontal scale capabilities at the core of Azure Cosmos DB.
23+
In this quickstart, you create and manage an Azure Cosmos DB Table API account from the Azure portal, and from Visual Studio with a Python app cloned from GitHub. Azure Cosmos DB is a multi-model database service that lets you quickly create and query document, table, key-value, and graph databases with global distribution and horizontal scale capabilities.
2624

2725
## Prerequisites
2826

29-
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
30-
[!INCLUDE [cosmos-db-emulator-docdb-api](../../includes/cosmos-db-emulator-docdb-api.md)]
31-
32-
In addition:
33-
34-
* If you don’t already have Visual Studio 2019 installed, you can download and use the **free** [Visual Studio 2019 Community Edition](https://www.visualstudio.com/downloads/). Make sure that you select the **Azure development** and **Python development** workloads during the Visual Studio setup.
35-
* Also select the Python 2 option in the **Python development** workload, or download Python 2.7 from [python.org](https://www.python.org/downloads/release/python-2712/).
27+
- An Azure account with an active subscription. [Create one for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio). Or [try Azure Cosmos DB for free](https://azure.microsoft.com/try/cosmosdb/) without an Azure subscription. You can also use the [Azure Cosmos DB Emulator](https://aka.ms/cosmosdb-emulator) with a URI of `https://localhost:8081` and the key `C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==`.
28+
- [Visual Studio 2019](https://www.visualstudio.com/downloads/), with the **Azure development** and **Python development** workloads selected during setup.
29+
- [Git](https://git-scm.com/downloads).
3630

3731
## Create a database account
3832

@@ -78,29 +72,31 @@ Now let's clone a Table app from GitHub, set the connection string, and run it.
7872

7973
Now go back to the Azure portal to get your connection string information and copy it into the app. This enables your app to communicate with your hosted database.
8074

81-
1. In the [Azure portal](https://portal.azure.com/), select **Connection String**.
75+
1. In your Azure Cosmos DB account in the [Azure portal](https://portal.azure.com/), select **Connection String**.
8276

8377
![View and copy the CONNECTION STRING in the Connection String settings](./media/create-table-python/view-and-copy-connection-string-in-connection-string-settings.png)
8478

8579
2. Copy the ACCOUNT NAME using the button on the right side.
8680

87-
3. Open the config.py file, and paste the ACCOUNT NAME from the portal into the STORAGE_ACCOUNT_NAME value on line 19.
81+
3. Open the *config.py* file, and paste the ACCOUNT NAME from the portal into the STORAGE_ACCOUNT_NAME value on line 19.
8882

8983
4. Go back to the portal and copy the PRIMARY KEY.
9084

9185
5. Paste the PRIMARY KEY from the portal into the STORAGE_ACCOUNT_KEY value on line 20.
9286

93-
6. Save the config.py file.
87+
6. Save the *config.py* file.
9488

9589
## Run the app
9690

97-
1. In Visual Studio, right-click on the project in **Solution Explorer**, select the current Python environment, then right click.
91+
1. In Visual Studio, right-click on the project in **Solution Explorer**.
92+
93+
2. Select the current Python environment, then right click.
9894

99-
2. Select Install Python Package, then enter **azure-storage-table**
95+
2. Select **Install Python Package**, then enter *azure-storage-table*.
10096

101-
3. Run F5 to run the application. Your app displays in your browser.
97+
3. Press F5 to run the application. Your app displays in your browser.
10298

103-
You can now go back to Data Explorer and see query, modify, and work with this new data.
99+
You can now go back to Data Explorer and see, query, modify, and work with this new data.
104100

105101
## Review SLAs in the Azure portal
106102

@@ -112,7 +108,7 @@ You can now go back to Data Explorer and see query, modify, and work with this n
112108

113109
## Next steps
114110

115-
In this quickstart, you've learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run an app. Now you can query your data using the Table API.
111+
In this quickstart, you've learned how to create an Azure Cosmos DB account, create a table using the Data Explorer, and run a Python app in Visual Studio to add table data. Now you can query your data using the Table API.
116112
117113
> [!div class="nextstepaction"]
118114
> [Import table data to the Table API](table-import.md)
6.56 KB
Loading
6.56 KB
Loading
Binary file not shown.
6.56 KB
Loading

0 commit comments

Comments
 (0)