Skip to content

Commit db8da88

Browse files
authored
Merge pull request #272276 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 7e1a94d + a48a74e commit db8da88

File tree

7 files changed

+9
-16
lines changed

7 files changed

+9
-16
lines changed

articles/ai-services/openai/how-to/latency.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Latency varies based on what model you're using. For an identical request, expec
5959
When you send a completion request to the Azure OpenAI endpoint, your input text is converted to tokens that are then sent to your deployed model. The model receives the input tokens and then begins generating a response. It's an iterative sequential process, one token at a time. Another way to think of it is like a for loop with `n tokens = n iterations`. For most models, generating the response is the slowest step in the process.
6060

6161
At the time of the request, the requested generation size (max_tokens parameter) is used as an initial estimate of the generation size. The compute-time for generating the full size is reserved by the model as the request is processed. Once the generation is completed, the remaining quota is released. Ways to reduce the number of tokens:
62-
- Set the `max_token` parameter on each call as small as possible.
62+
- Set the `max_tokens` parameter on each call as small as possible.
6363
- Include stop sequences to prevent generating extra content.
6464
- Generate fewer responses: The best_of & n parameters can greatly increase latency because they generate multiple outputs. For the fastest response, either don't specify these values or set them to 1.
6565

@@ -136,4 +136,4 @@ Time from the first token to the last token, divided by the number of generated
136136

137137
* **Streaming**: Enabling streaming can be useful in managing user expectations in certain situations by allowing the user to see the model response as it is being generated rather than having to wait until the last token is ready.
138138

139-
* **Content Filtering** improves safety, but it also impacts latency. Evaluate if any of your workloads would benefit from [modified content filtering policies](./content-filters.md).
139+
* **Content Filtering** improves safety, but it also impacts latency. Evaluate if any of your workloads would benefit from [modified content filtering policies](./content-filters.md).

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following environment variables are related to the app environment in genera
3333
| `WEBSITE_NPM_DEFAULT_VERSION` | Default npm version the app is using. ||
3434
| `WEBSOCKET_CONCURRENT_REQUEST_LIMIT` | Read-only. Limit for websocket's concurrent requests. For **Standard** tier and above, the value is `-1`, but there's still a per VM limit based on your VM size (see [Cross VM Numerical Limits](https://github.com/projectkudu/kudu/wiki/Azure-Web-App-sandbox#cross-vm-numerical-limits)). ||
3535
| `WEBSITE_PRIVATE_EXTENSIONS` | Set to `0` to disable the use of private site extensions. ||
36-
| `WEBSITE_TIME_ZONE` | By default, the time zone for the app is always UTC. You can change it to any of the valid values that are listed in [TimeZone](/previous-versions/windows/it-pro/windows-vista/cc749073(v=ws.10)). If the specified value isn't recognized, UTC is used. | `Atlantic Standard Time` |
36+
| `WEBSITE_TIME_ZONE` | By default, the time zone for the app is always UTC. You can change it to any of the valid values that are listed in [Default Time Zones](/windows-hardware/manufacture/desktop/default-time-zones). If the specified value isn't recognized, UTC is used. | `Atlantic Standard Time` |
3737
| `WEBSITE_ADD_SITENAME_BINDINGS_IN_APPHOST_CONFIG` | After slot swaps, the app may experience unexpected restarts. This is because after a swap, the hostname binding configuration goes out of sync, which by itself doesn't cause restarts. However, certain underlying storage events (such as storage volume failovers) may detect these discrepancies and force all worker processes to restart. To minimize these types of restarts, set the app setting value to `1`on all slots (default is`0`). However, don't set this value if you're running a Windows Communication Foundation (WCF) application. For more information, see [Troubleshoot swaps](deploy-staging-slots.md#troubleshoot-swaps)||
3838
| `WEBSITE_PROACTIVE_AUTOHEAL_ENABLED` | By default, a VM instance is proactively "autohealed" when it's using more than 90% of allocated memory for more than 30 seconds, or when 80% of the total requests in the last two minutes take longer than 200 seconds. If a VM instance has triggered one of these rules, the recovery process is an overlapping restart of the instance. Set to `false` to disable this recovery behavior. The default is `true`. For more information, see [Proactive Auto Heal](https://azure.github.io/AppService/2017/08/17/Introducing-Proactive-Auto-Heal.html). ||
3939
| `WEBSITE_PROACTIVE_CRASHMONITORING_ENABLED` | Whenever the w3wp.exe process on a VM instance of your app crashes due to an unhandled exception for more than three times in 24 hours, a debugger process is attached to the main worker process on that instance, and collects a memory dump when the worker process crashes again. This memory dump is then analyzed and the call stack of the thread that caused the crash is logged in your App Service’s logs. Set to `false` to disable this automatic monitoring behavior. The default is `true`. For more information, see [Proactive Crash Monitoring](https://azure.github.io/AppService/2021/03/01/Proactive-Crash-Monitoring-in-Azure-App-Service.html). ||

articles/azure-maps/power-bi-visual-add-tile-layer.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ There are three different tile service naming conventions supported by the Azure
4040

4141
* **X, Y, Zoom notation** - X is the column, Y is the row position of the tile in the tile grid, and the Zoom notation a value based on the zoom level.
4242
* **Quadkey notation** - Combines x, y, and zoom information into a single string value. This string value becomes a unique identifier for a single tile.
43-
* **Bounding Box** - Specify an image in the Bounding box coordinates format: `{west},{south},{east},{north}`. This format is commonly used by [Web Mapping Services (WMS)].
43+
* **Bounding Box** - Specify an image in the Bounding box coordinates format: `{west},{south},{east},{north}`.
4444

4545
The tile URL an https URL to a tile URL template that uses the following
4646
parameters:
@@ -54,7 +54,7 @@ parameters:
5454
As an example, here's a formatted tile URL for the [weather radar tile service] in Azure Maps.
5555

5656
```html
57-
`https://atlas.microsoft.com/map/tile?zoom={z}&x={x}&y={y}&tilesetId=microsoft.weather.radar.main&api-version=2.0&subscription-key={Your-Azure-Maps-Subscription-key}`
57+
https://atlas.microsoft.com/map/tile?zoom={z}&x={x}&y={y}&tilesetId=microsoft.weather.radar.main&api-version=2.0&subscription-key={Your-Azure-Maps-Subscription-key}
5858
```
5959

6060
For more information on Azure Maps tiling system, see [Zoom levels and tile grid].
@@ -66,7 +66,6 @@ Add more context to the map:
6666
> [!div class="nextstepaction"]
6767
> [Show real-time traffic]
6868
69-
[Web Mapping Services (WMS)]: https://www.opengeospatial.org/standards/wms
7069
[Show real-time traffic]: power-bi-visual-show-real-time-traffic.md
7170
[Zoom levels and tile grid]: zoom-levels-and-tile-grid.md
7271
[weather radar tile service]: /rest/api/maps/render/get-map-tile

articles/azure-monitor/agents/resource-manager-agent.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,9 +1068,6 @@ resource managedIdentity 'Microsoft.Compute/virtualMachines/extensions@2021-11-0
10681068
},
10691069
"workspaceResourceId": {
10701070
"value": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/my-resource-group/providers/microsoft.operationalinsights/workspaces/my-workspace"
1071-
},
1072-
"workspaceKey": {
1073-
"value": "Npl#3y4SmqG4R30ukKo3oxfixZ5axv1xocXgKR17kgVdtacU4cEf+SNr2TdHGVKTsZHZv3R8QKRXfh+ToVR9dA-="
10741071
}
10751072
}
10761073
}

articles/defender-for-cloud/defender-for-apis-deploy.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ When selecting a plan, consider these points:
4545

4646
To select the best plan for your subscription from the Microsoft Defender for Cloud [pricing page](https://azure.microsoft.com/pricing/details/defender-for-cloud/), follow these steps and choose the plan that matches your subscriptions’ API traffic requirements:
4747

48-
> [!NOTE]
49-
> The Defender for Cloud pricing page will be updated with the pricing information and pricing calculators by end of March 2024. In the meantime, use this document to select the correct Defender for APIs entitlements and enable the plan.
50-
5148
1. Sign into the [portal](https://portal.azure.com/), and in Defender for Cloud, select **Environment settings**.
5249

5350
1. Select the subscription that contains the managed APIs that you want to protect.

articles/deployment-environments/how-to-create-environment-with-azure-developer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ When your environment is provisioned, you can deploy your code to the environmen
374374
Deploy your application code to the remote Azure Deployment Environments environment you provisioned using the following command:
375375

376376
```bash
377-
azd env deploy
377+
azd deploy
378378
```
379379
Deploying your code to the remote environment can take several minutes.
380380

@@ -399,7 +399,7 @@ For this sample application, you see something like this:
399399
Deploy your application code to the remote Azure Deployment Environments environment you provisioned using the following command:
400400

401401
```bash
402-
azd env deploy
402+
azd deploy
403403
```
404404
Deploying your code to the remote environment can take several minutes.
405405

@@ -448,4 +448,4 @@ azd down --environment <environmentName>
448448
## Related content
449449
- [Create and configure a dev center](/azure/deployment-environments/quickstart-create-and-configure-devcenter)
450450
- [What is the Azure Developer CLI?](/azure/developer/azure-developer-cli/overview)
451-
- [Install or update the Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd)
451+
- [Install or update the Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd)

articles/storage/common/storage-private-endpoints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ This constraint is a result of the DNS changes made when account A2 creates a pr
151151

152152
You can copy blobs between storage accounts by using private endpoints only if you use the Azure REST API, or tools that use the REST API. These tools include AzCopy, Storage Explorer, Azure PowerShell, Azure CLI, and the Azure Blob Storage SDKs.
153153

154-
Only private endpoints that target the `blob` storage resource endpoint are supported. This includes REST API calls against Data Lake Storage Gen2 accounts in which the `blob` resource endpoint is referenced explicitly or implicitly. Private endpoints that target the Data Lake Storage Gen2 `dfs` endpoint or the `file` resource endpoint are not yet supported. Copying between storage accounts by using the Network File System (NFS) protocol is not yet supported.
154+
Only private endpoints that target the `blob` or `file` storage resource endpoint are supported. This includes REST API calls against Data Lake Storage Gen2 accounts in which the `blob` resource endpoint is referenced explicitly or implicitly. Private endpoints that target the Data Lake Storage Gen2 `dfs` resource endpoint are not yet supported. Copying between storage accounts by using the Network File System (NFS) protocol is not yet supported.
155155

156156
## Next steps
157157

0 commit comments

Comments
 (0)