Skip to content

Commit a6db98c

Browse files
authored
Merge pull request #265058 from MicrosoftDocs/main
2/2 11:00 AM IST Publish
2 parents 925ef28 + 5c796cd commit a6db98c

File tree

72 files changed

+1489
-600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1489
-600
lines changed

articles/ai-services/openai/concepts/models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
113113
| gpt-4 (0314) | | East US <br> France Central <br> South Central US <br> UK South |
114114
| gpt-4 (0613) | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | East US <br> East US 2 <br> Japan East <br> UK South |
115115
| gpt-4 (1106-preview) | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | |
116-
| gpt-4 (vision-preview) | Sweden Central <br> West US| Switzerland North <br> Australia East |
116+
| gpt-4 (vision-preview) | Sweden Central <br> West US <br> Japan East| Switzerland North <br> Australia East |
117117

118118
### GPT-3.5 models
119119

articles/ai-services/translator/toc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ items:
77
- name: What is Translator Service?
88
displayName: features,develop,development,free
99
href: translator-overview.md
10+
- name: Create a Translator resource
11+
displayName: endpoint,key,portal,azure,authentication,delete,resource
12+
href: create-translator-resource.md
1013
- name: Language Support
1114
displayName: iso,language code,translation,transliteration,detection,detect,pdf,document
1215
href: language-support.md
@@ -27,9 +30,6 @@ items:
2730
- name: What is Text Translation?
2831
displayName: features,develop,development,free
2932
href: text-translation-overview.md
30-
- name: Create a Translator resource
31-
displayName: endpoint,key,portal,azure,authentication,delete,resource
32-
href: create-translator-resource.md
3333
- name: 🆕 Text Translation SDK overview (preview)
3434
displayName: get started,sdk,keys,endpoint
3535
href: text-sdk-overview.md
@@ -293,4 +293,4 @@ items:
293293
- name: Compliance and certification
294294
href: https://www.microsoft.com/translator/business/notrace/
295295
- name: Code samples on GitHub
296-
href: https://aka.ms/TranslatorGitHub
296+
href: https://aka.ms/TranslatorGitHub

articles/aks/artifact-streaming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Now that you enabled Artifact Streaming on a premium ACR and connected that to a
123123
* Check if your node pool has Artifact Streaming enabled using the [`az aks nodepool show`][az-aks-nodepool-show] command.
124124
125125
```azurecli-interactive
126-
az aks nodepool show --resource-group myResourceGroup --cluster-name myAKSCluster --name myNodePool grep ArtifactStreamingConfig
126+
az aks nodepool show --resource-group myResourceGroup --cluster-name myAKSCluster --name myNodePool --query artifactStreamingProfile
127127
```
128128
129129
In the output, check that the `Enabled` field is set to `true`.

articles/app-service/includes/quickstart-python/deploy-local-git.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ You can deploy your application code from a local Git repository to Azure by con
1010

1111
| Instructions | Screenshot |
1212
|:----------------|-----------:|
13-
| [!INCLUDE [Deploy local Git Azure portal 1](<./deploy-local-git-azure-portal-1.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-1-240px.png" alt-text="A screenshot showing how to locate your App Service using the search toolbar at the top of the Azure portal." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-1.png"::: |
14-
| [!INCLUDE [Deploy local Git Azure portal 2](<./deploy-local-git-azure-portal-2.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-2-240px.png" alt-text="A screenshot showing how to navigate to the deployment center in App Service and select Local Git as the deployment method." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-2.png"::: |
15-
| [!INCLUDE [Deploy local Git Azure portal 3](<./deploy-local-git-azure-portal-3.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-3-240px.png" alt-text="A screenshot showing the deployment center after saving and the remote Git URL to use for deployments." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-3.png"::: |
16-
| [!INCLUDE [Deploy local Git Azure portal 4](<./deploy-local-git-azure-portal-4.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-4-240px.png" alt-text="A screenshot showing the location of the deployment credentials in the deployment center in App Service." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-4.png"::: |
13+
| [!INCLUDE [Deploy local Git Azure portal 1](./deploy-local-git-azure-portal-1.md)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-1-240px.png" alt-text="A screenshot showing how to locate your App Service using the search toolbar at the top of the Azure portal." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-1.png"::: |
14+
| [!INCLUDE [Deploy local Git Azure portal 2](./deploy-local-git-azure-portal-2.md)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-2-240px.png" alt-text="A screenshot showing how to navigate to the deployment center in App Service and select Local Git as the deployment method." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-2.png"::: |
15+
| [!INCLUDE [Deploy local Git Azure portal 3](./deploy-local-git-azure-portal-3.md)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-3-240px.png" alt-text="A screenshot showing the deployment center after saving and the remote Git URL to use for deployments." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-3.png"::: |
16+
| [!INCLUDE [Deploy local Git Azure portal 4](./deploy-local-git-azure-portal-4.md)] | :::image type="content" source="../../media/quickstart-python/deploy-local-git-azure-portal-4-240px.png" alt-text="A screenshot showing the location of the deployment credentials in the deployment center in App Service." lightbox="../../media/quickstart-python/deploy-local-git-azure-portal-4.png"::: |
1717

1818
Next, in the root directory of your application, configure a [Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) that points to Azure using the Git URL of the Azure remote obtained in a previous step.
1919

@@ -27,17 +27,17 @@ You can now push code from your local Git repository to Azure using the Git remo
2727
git push azure main:master
2828
```
2929

30-
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in the previous step. Git will then cache these credentials so you will not have to reenter them on subsequent deployments.
30+
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in the previous step. Git will then cache these credentials so you won't have to reenter them on subsequent deployments.
3131

3232
### [Azure CLI](#tab/deploy-instructions-azcli)
3333

3434
First, configure the deployment source for your web app to be local Git using the `az webapp deployment source` command. This command will output the URL of the remote Git repository that you will be pushing code to. Make a copy of this value as you will need it in a later step.
3535

36-
[!INCLUDE [CLI deploy configure](<./deploy-local-instructions-cli-1.md>)]
36+
[!INCLUDE [CLI deploy configure](./deploy-local-instructions-cli-1.md)]
3737

3838
Retrieve the deployment credentials for your application. These will be needed for Git to authenticate to Azure when you push code to Azure in a later step.
3939

40-
[!INCLUDE [CLI deploy retrieve credentials](<./deploy-local-instructions-cli-2.md>)]
40+
[!INCLUDE [CLI deploy retrieve credentials](./deploy-local-instructions-cli-2.md)]
4141

4242
Next, in the root directory of your application, configure a [Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) that points to Azure using the Git URL of the Azure remote obtained in a previous step.
4343

@@ -51,4 +51,4 @@ You can now push code from your local Git repository to Azure using the Git remo
5151
git push azure main:master
5252
```
5353

54-
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in a previous step. Git will then cache these credentials so you will not have to reenter them on subsequent deployments.
54+
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in a previous step. Git will then cache these credentials so you won't have to reenter them on subsequent deployments.

articles/app-service/includes/quickstart-python/deploy-zip-file.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Build automation in Azure is enabled by setting the `SCM_DO_BUILD_DURING_DEPLOYM
1616

1717
| Instructions | Screenshot |
1818
|:----------------|-----------:|
19-
| [!INCLUDE [Enable build automation from Azure portal 1](<./deploy-zip-azure-portal-1.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-1-240px.png" alt-text="A screenshot showing the app settings for a web app and how to add a new setting in the Azure portal." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-1.png"::: |
20-
| [!INCLUDE [Enable build automation from Azure portal 2](<./deploy-zip-azure-portal-2.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-2-240px.png" alt-text="A screenshot showing the dialog box used to add an app setting in the Azure portal." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-2.png"::: |
21-
| [!INCLUDE [Enable build automation from Azure portal 3](<./deploy-zip-azure-portal-3.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-3-240px.png" alt-text="A screenshot showing the location of the save button." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-3.png"::: |
19+
| [!INCLUDE [Enable build automation from Azure portal 1](./deploy-zip-azure-portal-1.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-1-240px.png" alt-text="A screenshot showing the app settings for a web app and how to add a new setting in the Azure portal." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-1.png"::: |
20+
| [!INCLUDE [Enable build automation from Azure portal 2](./deploy-zip-azure-portal-2.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-2-240px.png" alt-text="A screenshot showing the dialog box used to add an app setting in the Azure portal." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-2.png"::: |
21+
| [!INCLUDE [Enable build automation from Azure portal 3](./deploy-zip-azure-portal-3.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-azure-portal-build-3-240px.png" alt-text="A screenshot showing the location of the save button." lightbox="../../media/quickstart-python/deploy-zip-azure-portal-build-3.png"::: |
2222

2323
##### [Azure CLI](#tab/deploy-instructions-azcli)
2424

2525
Use the [az webapp config appsettings set](/cli/azure/webapp/config/appsettings#az-webapp-config-appsettings-set) command to set the `SCM_DO_BUILD_DURING_DEPLOYMENT` setting to a value of `true`.
2626

27-
[!INCLUDE [Azure CLI build automation commands](<./deploy-zip-build-settings.md>)]
27+
[!INCLUDE [Azure CLI build automation commands](./deploy-zip-build-settings.md)]
2828

2929
---
3030

@@ -56,7 +56,7 @@ Once you have a ZIP file, the file can be uploaded to Azure using either Azure C
5656

5757
The [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command can be used to upload and deploy a zip file to Azure.
5858

59-
[!INCLUDE [Azure CLI deploy commands](<./deploy-zip-cli-commands.md>)]
59+
[!INCLUDE [Azure CLI deploy commands](./deploy-zip-cli-commands.md)]
6060

6161
#### [Postman](#tab/deploy-instructions-zip-postman)
6262

@@ -72,10 +72,10 @@ In Postman, upload your file using the following steps.
7272

7373
| Instructions | Screenshot |
7474
|:----------------|-----------:|
75-
| [!INCLUDE [Postman upload step 1](<./deploy-zip-postman-1.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-1-240px.png" alt-text="A screenshot showing how to create a new POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-1.png"::: |
76-
| [!INCLUDE [Postman upload step 2](<./deploy-zip-postman-2.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-2-240px.png" alt-text="A screenshot showing how to configure basic authorization for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-2.png"::: |
77-
| [!INCLUDE [Postman upload step 3](<./deploy-zip-postman-3.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-3-240px.png" alt-text="A screenshot showing how to select a file for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-3.png"::: |
78-
| [!INCLUDE [Postman upload step 4](<./deploy-zip-postman-4.md>)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-4-240px.png" alt-text="A screenshot showing how to send a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-4.png"::: |
75+
| [!INCLUDE [Postman upload step 1](./deploy-zip-postman-1.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-1-240px.png" alt-text="A screenshot showing how to create a new POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-1.png"::: |
76+
| [!INCLUDE [Postman upload step 2](./deploy-zip-postman-2.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-2-240px.png" alt-text="A screenshot showing how to configure basic authorization for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-2.png"::: |
77+
| [!INCLUDE [Postman upload step 3](./deploy-zip-postman-3.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-3-240px.png" alt-text="A screenshot showing how to select a file for a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-3.png"::: |
78+
| [!INCLUDE [Postman upload step 4](./deploy-zip-postman-4.md)] | :::image type="content" source="../../media/quickstart-python/deploy-zip-postman-4-240px.png" alt-text="A screenshot showing how to send a POST request in Postman." lightbox="../../media/quickstart-python/deploy-zip-postman-4.png"::: |
7979

8080
#### [cURL](#tab/deploy-instructions-zip-curl)
8181

@@ -89,7 +89,7 @@ To use cURL to upload your ZIP file to Azure, you will need the deployment usern
8989

9090
Run the following `curl` command to upload your zip file to Azure and deploy your application. The username is the deployment username obtained in step 3. When this command is run, you will be prompted for the deployment password.
9191

92-
[!INCLUDE [cURL commands](<./deploy-zip-curl-commands.md>)]
92+
[!INCLUDE [cURL commands](./deploy-zip-curl-commands.md)]
9393

9494
Depending on your network bandwidth, files usually take between 10 and 30 seconds to upload to Azure.
9595

0 commit comments

Comments
 (0)