Skip to content

Commit 61d0131

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-overview
2 parents dc4833e + a6fe379 commit 61d0131

File tree

67 files changed

+223
-128
lines changed

Some content is hidden

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

67 files changed

+223
-128
lines changed

articles/ai-services/content-safety/overview.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,20 @@ To use the Content Safety APIs, you must create your Azure AI Content Safety res
115115
|Region | Moderation APIs | Prompt Shields | Protected material<br>detection | Groundedness<br>detection | Incident response | Blocklists |
116116
|---|---|---|---|---|---|---|
117117
| East US |||||||
118-
| East US 2 || | || | |
119-
| West US | | | | || |
120-
| West US 2 || | | | | |
121-
| Central US || | | | | |
122-
| North Central US || | | | | |
123-
| South Central US || | | | | |
124-
| Canada East || | | | | |
125-
| Switzerland North || | | | | |
126-
| Sweden Central || | ||| |
127-
| UK South || | | | | |
128-
| France Central || | | | | |
118+
| East US 2 || | || | |
119+
| West US | | | | || |
120+
| West US 2 || | | | | |
121+
| Central US || | | | | |
122+
| North Central US || | | | | |
123+
| South Central US || | | | | |
124+
| Canada East || | | | | |
125+
| Switzerland North || | | | | |
126+
| Sweden Central || | ||| |
127+
| UK South || | | | | |
128+
| France Central || | | | | |
129129
| West Europe |||| | ||
130-
| Japan East || | | | | |
131-
| Australia East||| | | | |
130+
| Japan East || | | | | |
131+
| Australia East||| | | | |
132132

133133
Feel free to [contact us](mailto:[email protected]) if you need other regions for your business.
134134

articles/ai-studio/how-to/deploy-jais-models.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ Response:
253253

254254
| **Sample Type** | **Sample Notebook** |
255255
|----------------|----------------------------------------|
256-
| CLI using CURL and Python web requests | [webrequests.ipynb](
257-
https://aka.ms/jais/webrequests-sample) |
256+
| CLI using CURL and Python web requests | [webrequests.ipynb](https://aka.ms/jais/webrequests-sample) |
258257
| OpenAI SDK (experimental) | [openaisdk.ipynb](https://aka.ms/jais/openaisdk) |
259258
| LiteLLM | [litellm.ipynb](https://aka.ms/jais/litellm-sample) |
260259

articles/ai-studio/how-to/develop/ai-template-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ author: eric-urban
1818
Streamline your code-first development with prebuilt, task-specific Azure AI templates. Benefit from using the latest features and best practices from Microsoft Azure AI, with popular frameworks like LangChain, prompt flow, and Semantic Kernel in multiple languages.
1919

2020
> [!TIP]
21-
> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/developer/azure-developer-cli/overview).
21+
> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/azure/developer/azure-developer-cli/).
2222
2323
## Start with a sample application
2424

articles/aks/start-stop-nodepools.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ You might not need to continuously run your AKS workloads. For example, you migh
1919
* The cluster and node pool must be running.
2020
* You can't stop node pools from clusters which use the [Node Autoprovisioning (NAP)](node-autoprovision.md) feature.
2121

22+
2223
## Before you begin
2324

2425
This article assumes you have an existing AKS cluster. If you need an AKS cluster, create one using the [Azure CLI][aks-quickstart-cli], [Azure PowerShell][aks-quickstart-powershell], or the [Azure portal][aks-quickstart-portal].
@@ -56,6 +57,10 @@ This article assumes you have an existing AKS cluster. If you need an AKS cluste
5657
> [!NOTE]
5758
> If the `provisioningState` shows `Stopping`, your node pool is still in the process of stopping.
5859
60+
61+
> [!NOTE]
62+
> Stopping the node pool will stop its Cluster Autoscaler, and starts it back when starting the node pool. So if you manually modify the number of VMSS instances in the pool while it's stopped, Cluster Autoscaler might show inconsistencies.
63+
5964
---
6065
6166
## Start a stopped AKS node pool

articles/app-service/includes/quickstart-java/quickstart-java-javase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If Maven isn't your preferred development tool, check out our similar tutorials
4444

4545
### [Spring Boot](#tab/springboot)
4646

47-
1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/creating-new-projects.html) command `spring boot new my-webapp`.
47+
1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/getting-started.html) command `spring boot new my-webapp`.
4848

4949
```bash
5050
git clone https://github.com/rd-1-2022/rest-service my-webapp

articles/azure-cache-for-redis/cache-best-practices-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If your Azure Cache for Redis client application runs on a Linux-based container
3232

3333
## Potential connection collision with _Istio/Envoy_
3434

35-
Currently, Azure Cache for Redis uses ports 15xxx for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15001 and 15006.
35+
Currently, Azure Cache for Redis uses ports 15xxx for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/application-requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15001 and 15006.
3636

3737
When using _Istio_ with an Azure Cache for Redis cluster, consider excluding the potential collision ports with an [istio annotation](https://istio.io/latest/docs/reference/config/annotations/).
3838

articles/azure-government/documentation-government-csp-list.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
3232
|[ACP Technologies](https://acp.us.com)|
3333
|[ActioNet](https://www.actionet.com/)|
3434
|[ADNET Technologies](https://thinkadnet.com/)|
35-
|[Adoxio Business Solutions Limited](https://www.adoxio.com)|
3635
|[Advisicon, Inc](https://advisicon.com/)|
3736
|[Advizex Technologies](https://advizex.com/)|
3837
|[Aeon Nexus Corp.](https://www.aeonnexus.com/)|

articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ You can define a data collection rule to send data from multiple machines to mul
9999
|:---|:---|
100100
| Get rules | [Get-AzDataCollectionRule](/powershell/module/az.monitor/get-azdatacollectionrule) |
101101
| Create a rule | [New-AzDataCollectionRule](/powershell/module/az.monitor/new-azdatacollectionrule) |
102-
| Update a rule | [Set-AzDataCollectionRule](/powershell/module/az.monitor/set-azdatacollectionrule) |
102+
| Update a rule | [Update-AzDataCollectionRule](/powershell/module/az.monitor/update-azdatacollectionrule) |
103103
| Delete a rule | [Remove-AzDataCollectionRule](/powershell/module/az.monitor/remove-azdatacollectionrule) |
104104
| Update "Tags" for a rule | [Update-AzDataCollectionRule](/powershell/module/az.monitor/update-azdatacollectionrule) |
105105

articles/azure-monitor/alerts/alerts-create-activity-log-alert-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Alerts triggered by these alert rules contain a payload that uses the [common al
9696

9797
1. Enter values for the **Alert rule name** and the **Alert rule description**.
9898
1. Select **Enable upon creation** for the alert rule to start running as soon as you're done creating it.
99-
1. (Optional) Select a region in which your alert rule will be processed. If you need to make sure the rule is processed within [EU Data Boundary](https://learn.microsoft.com/privacy/eudb/eu-data-boundary-learn), select the North Europe or West Europe region. In all other cases you can select the Global region (which is the default).
99+
1. (Optional) Select a region in which your alert rule will be processed. If you need to make sure the rule is processed within [EU Data Boundary](/privacy/eudb/eu-data-boundary-learn), select the North Europe or West Europe region. In all other cases you can select the Global region (which is the default).
100100

101101
> [!NOTE]
102102
> Service Health alert rules can only be located in the Global region.

articles/azure-monitor/alerts/alerts-create-log-alert-rule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Alerts triggered by these alert rules contain a payload that uses the [common al
4444

4545
Limitations for log search alert rule queries:
4646
- Log search alert rule queries do not support the 'bag_unpack()', 'pivot()' and 'narrow()'.
47-
- Log search alert rule queries support ['ago()'](https://learn.microsoft.com/azure/data-explorer/kusto/query/ago-function) with [timespan literals](https://learn.microsoft.com/azure/data-explorer/kusto/query/scalar-data-types/timespan#timespan-literals) only.
47+
- Log search alert rule queries support ['ago()'](/azure/data-explorer/kusto/query/ago-function) with [timespan literals](/azure/data-explorer/kusto/query/scalar-data-types/timespan#timespan-literals) only.
4848
- The word "AggregatedValue" is a reserved word, it cannot be used in the query on Log search Alerts rules.
4949
- The combined size of all data in the log alert rule properties cannot exceed 64KB.
5050

0 commit comments

Comments
 (0)