Skip to content

Commit ae52e79

Browse files
rmca14rmca14
authored
Merge pull request #262286 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents dc054bd + 5c5c57d commit ae52e79

File tree

7 files changed

+23
-27
lines changed

7 files changed

+23
-27
lines changed

‎articles/ai-services/computer-vision/how-to/shelf-modify-images.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ To run the image stitching operation on a set of images, follow these steps:
4545
```bash
4646
curl.exe -H "Ocp-Apim-Subscription-Key: <subscriptionKey>" -H "Content-Type: application/json" "https://<endpoint>/computervision/imagecomposition:stitch?api-version=2023-04-01-preview" --output <your_filename> -d "{
4747
'images': [
48-
{
49-
'url':'<your_url_string>'
50-
},
51-
{
52-
'url':'<your_url_string_2>'
53-
},
48+
'<your_url_string_>',
49+
'<your_url_string_2>',
5450
...
5551
]
5652
}"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Each family includes models across a range of capability. The following list ind
4747

4848
| Base Model | Model(s) | Dimensions |
4949
|---|---|---|
50-
| Ada | | 1024 |
51-
| Babbage | | 2048 |
52-
| Curie | | 4096 |
53-
| Davinci | | 12288 |
50+
| Ada | | 1,024 |
51+
| Babbage | | 2,048 |
52+
| Curie | | 4,096 |
53+
| Davinci | | 12,288 |
5454

5555

5656
### Similarity embedding
@@ -116,7 +116,7 @@ Region availability is for customers with deployments of the models prior to Jul
116116
| --- | --- | --- | --- | --- |
117117
| text-similarity-ada-001| East US, South Central US, West Europe | N/A | 2,046 | Aug 2020 |
118118
| text-similarity-babbage-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
119-
| text-similarity-curie-001 | East US, South Central US, West Europe | N/A | 2046 | Aug 2020 |
119+
| text-similarity-curie-001 | East US, South Central US, West Europe | N/A | 2,046 | Aug 2020 |
120120
| text-similarity-davinci-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
121121
| text-search-ada-doc-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |
122122
| text-search-ada-query-001 | South Central US, West Europe | N/A | 2,046 | Aug 2020 |

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
9393
| `gpt-4-32k`(0314) | 32,768 | Sep 2021 |
9494
| `gpt-4` (0613) | 8,192 | Sep 2021 |
9595
| `gpt-4-32k` (0613) | 32,768 | Sep 2021 |
96-
| `gpt-4` (1106-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4096 | Apr 2023 |
97-
| `gpt-4` (vision-preview)**<sup>2</sup>**<br>**GPT-4 Turbo with Vision Preview** | Input: 128,000 <br> Output: 4096 | Apr 2023 |
96+
| `gpt-4` (1106-preview)**<sup>1</sup>**<br>**GPT-4 Turbo Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
97+
| `gpt-4` (vision-preview)**<sup>2</sup>**<br>**GPT-4 Turbo with Vision Preview** | Input: 128,000 <br> Output: 4,096 | Apr 2023 |
9898

9999
**<sup>1</sup>** GPT-4 Turbo Preview = `gpt-4` (1106-preview). To deploy this model, under **Deployments** select model **gpt-4**. For **Model version** select **1106-preview**.
100100

@@ -128,13 +128,13 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
128128

129129
| Model ID | Model Availability | Max Request (tokens) | Training Data (up to) |
130130
| --------- | -------------------- |:------:|:----:|
131-
| `gpt-35-turbo`**<sup>1</sup>** (0301) | East US <br> France Central <br> South Central US <br> UK South <br> West Europe | 4096 | Sep 2021 |
132-
| `gpt-35-turbo` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North <br> UK South | 4096 | Sep 2021 |
131+
| `gpt-35-turbo`**<sup>1</sup>** (0301) | East US <br> France Central <br> South Central US <br> UK South <br> West Europe | 4,096 | Sep 2021 |
132+
| `gpt-35-turbo` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North <br> UK South | 4,096 | Sep 2021 |
133133
| `gpt-35-turbo-16k` (0613) | Australia East <br> Canada East <br> East US <br> East US 2 <br> France Central <br> Japan East <br> North Central US <br> Sweden Central <br> Switzerland North<br> UK South | 16,384 | Sep 2021 |
134-
| `gpt-35-turbo-instruct` (0914) | East US <br> Sweden Central | 4097 |Sep 2021 |
134+
| `gpt-35-turbo-instruct` (0914) | East US <br> Sweden Central | 4,097 |Sep 2021 |
135135
| `gpt-35-turbo` (1106) | Australia East <br> Canada East <br> France Central <br> South India <br> Sweden Central<br> UK South <br> West US | Input: 16,385<br> Output: 4,096 | Sep 2021|
136136

137-
**<sup>1</sup>** This model will accept requests > 4096 tokens. It is not recommended to exceed the 4096 input token limit as the newer version of the model are capped at 4096 tokens. If you encounter issues when exceeding 4096 input tokens with this model this configuration is not officially supported.
137+
**<sup>1</sup>** This model will accept requests > 4,096 tokens. It is not recommended to exceed the 4,096 input token limit as the newer version of the model are capped at 4,096 tokens. If you encounter issues when exceeding 4,096 input tokens with this model this configuration is not officially supported.
138138

139139
### Embeddings models
140140

@@ -145,15 +145,15 @@ These models can only be used with Embedding API requests.
145145
146146
| Model ID | Model Availability | Max Request (tokens) | Training Data (up to) | Output Dimensions |
147147
|---|---| :---:|:---:|:---:|
148-
| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> Norway East <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1536 |
149-
| `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1536 |
148+
| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1,536 |
149+
| `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1,536 |
150150

151151
### DALL-E models (Preview)
152152

153153
| Model ID | Feature Availability | Max Request (characters) |
154154
| --- | --- | :---: |
155-
| dalle2 | East US | 1000 |
156-
| dalle3 | Sweden Central | 4000 |
155+
| dalle2 | East US | 1,000 |
156+
| dalle3 | Sweden Central | 4,000 |
157157

158158
### Fine-tuning models
159159

@@ -165,7 +165,7 @@ These models can only be used with Embedding API requests.
165165
| --- | --- | :---: | :---: |
166166
| `babbage-002` | North Central US <br> Sweden Central | 16,384 | Sep 2021 |
167167
| `davinci-002` | North Central US <br> Sweden Central | 16,384 | Sep 2021 |
168-
| `gpt-35-turbo` (0613) | North Central US <br> Sweden Central | 4096 | Sep 2021 |
168+
| `gpt-35-turbo` (0613) | North Central US <br> Sweden Central | 4,096 | Sep 2021 |
169169

170170
### Whisper models (Preview)
171171

‎articles/ai-services/openai/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYM
237237
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/chat/completions?api-version=2023-12-01-preview \
238238
-H "Content-Type: application/json" \
239239
-H "api-key: YOUR_API_KEY" \
240-
-d '{"messages":[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":[{"type":"text","text":"Describe this picture:"},{ "type": "image_url", "image_url": { "url": https://learn.microsoft.com/azure/ai-services/computer-vision/media/quickstarts/presentation.png, "detail": "high" } }]}]}'
240+
-d '{"messages":[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":[{"type":"text","text":"Describe this picture:"},{ "type": "image_url", "image_url": { "url": "https://learn.microsoft.com/azure/ai-services/computer-vision/media/quickstarts/presentation.png", "detail": "high" } }]}]}'
241241
```
242242

243243
**Enhanced chat with vision**

‎articles/governance/policy/samples/built-in-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ State Configuration.
3434
|[Audit Windows machines that have extra accounts in the Administrators group](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F3d2a3320-2a72-4c67-ac5f-caa40fbee2b2)|[AdministratorsGroupMembers](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AdministratorsGroupMembers/AdministratorsGroupMembers.mof)|[LocalGroup](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/LocalGroup)|
3535
|[Audit Windows machines that have the specified members in the Administrators group](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F69bf4abd-ca1e-4cf6-8b5a-762d42e61d4f)|[AdministratorsGroupMembersToExclude](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AdministratorsGroupMembersToExclude/AdministratorsGroupMembersToExclude.mof)|[LocalGroup](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/LocalGroup)|
3636
|[Audit Windows machines missing any of specified members in the Administrators group](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F30f71ea1-ac77-4f26-9fc5-2d926bbd4ba7)|[AdministratorsGroupMembersToInclude](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AdministratorsGroupMembersToInclude/AdministratorsGroupMembersToInclude.mof)|[LocalGroup](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/LocalGroup)|
37-
|[Windows web servers should be configured to use secure communication protocols](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F5752e6d6-1206-46d8-8ab1-ecc2f71a8112)|[AuditSecureProtocol](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AuditSecureProtocol/AuditSecureProtocol.mof)|[SecureProtocolWebServer](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/SecureProtocolWebServer)|
37+
|[Windows machines should be configured to use secure communication protocols](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F5752e6d6-1206-46d8-8ab1-ecc2f71a8112)|[AuditSecureProtocol](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AuditSecureProtocol/AuditSecureProtocol.mof)|[SecureProtocolWebServer](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/SecureProtocolWebServer)|
3838
|[\[Preview\]: Linux machines should meet requirements for the Azure compute security baseline](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Ffc9b3da7-8347-4380-8e70-0a0361d8dedd)|[AzureLinuxBaseline](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AzureLinuxBaseline/AzureLinuxBaseline.mof)||
3939
|[\[Preview\]: Windows machines should meet requirements of the Azure compute security baseline](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F72650e9f-97bc-4b2a-ab5f-9781a9fcecbc)|[AzureWindowsBaseline](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/AzureWindowsBaseline/AzureWindowsBaseline.mof)||
4040
|[Audit Windows machines that contain certificates expiring within the specified number of days](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F1417908b-4bff-46ee-a2a6-4acc899320ab)|[CertificateExpiration](https://github.com/Azure/azure-policy/blob/master/samples/GuestConfiguration/package-samples/configurations/CertificateExpiration/CertificateExpiration.mof)|[CertificateManagement](https://github.com/Azure/azure-policy/tree/master/samples/GuestConfiguration/package-samples/resource-modules/CertificateManagement)|

‎articles/postgresql/flexible-server/how-to-server-logs-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ To enable the server logs feature, perform the following steps.
4343

4444
4. To configure retention period (in days), choose the slider. Minimum retention 1 days and Maximum retention is 7 days.
4545

46-
> [!NOTE]
47-
> In managing server logs, you should be aware of two key parameters: `logfiles.download_enable` and `logfiles.retention_days`. It is important to note that users are not required to explicitly configure these settings. The Azure portal simplifies this process through its server logs management interface. The `logfiles.download_enable` parameter, which controls the enabling or disabling of server logs, is managed via the '**Enable**' checkbox in the server logs section. Similarly, the `logfiles.retention_days` parameter, which sets the duration for retaining server logs can be easily adjusted using the '**Retention Period (in days)**' slider.
46+
> [!Note]
47+
> You can configure your server logs in the same way as above using the [Server Parameters](./howto-configure-server-parameters-using-portal.md), setting the appropriate values for these parameters: _logfiles.download_enable_ to ON to enable this feature, and _logfiles.retention_days_ to define retention in days.
4848
4949
## Download Server logs
5050

‎includes/azure-stack-edge-gateway-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ms.author: alkohli
77
---
88

99
- The storage account should be physically closest to the region where the device is deployed (can be different from where the service is deployed).
10-
- Moving a Azure Stack Edge resource to a different subscription or resource group is not supported. For more details, go to [Move resources to new resource group or subscription](../articles/azure-resource-manager/management/move-resource-group-and-subscription.md).
10+
- Moving an Azure Stack Edge resource to a different subscription or resource group is not supported. For more details, go to [Move resources to new resource group or subscription](../articles/azure-resource-manager/management/move-resource-group-and-subscription.md).

0 commit comments

Comments
 (0)