Skip to content

Commit 6157450

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-elevate-access-list-role-assignments-root-scope
2 parents 18fc087 + eaee23c commit 6157450

File tree

6 files changed

+40
-35
lines changed

6 files changed

+40
-35
lines changed

articles/ai-services/language-service/native-document-support/use-native-documents.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ ms.author: lajanuar
2828
2929
Azure AI Language is a cloud-based service that applies Natural Language Processing (NLP) features to text-based data. The native document support capability enables you to send API requests asynchronously, using an HTTP POST request body to send your data and HTTP GET request query string to retrieve the processed data.
3030

31-
A native document refers to the file format used to create the original document such as Microsoft Word (docx) or a portable document file (pdf). Native document support eliminates the need for text preprocessing prior to using Azure AI Language resource capabilities. Currently, native document support is available for the following capabilities:
31+
A native document refers to the file format used to create the original document such as Microsoft Word (docx) or a portable document file (pdf). Native document support eliminates the need for text preprocessing before using Azure AI Language resource capabilities. Currently, native document support is available for the following capabilities:
3232

3333
* [Personally Identifiable Information (PII)](../personally-identifiable-information/overview.md). The PII detection feature can identify, categorize, and redact sensitive information in unstructured text. The `PiiEntityRecognition` API supports native document processing.
3434

3535
* [Document summarization](../summarization/overview.md). Document summarization uses natural language processing to generate extractive (salient sentence extraction) or abstractive (contextual word extraction) summaries for documents. Both `AbstractiveSummarization` and `ExtractiveSummarization` APIs support native document processing.
3636

3737
## Supported document formats
3838

39-
Applications use native file formats to create, save, or open native documents. Currently **PII** and **Document summarization** capabilities supports the following native document formats:
39+
Applications use native file formats to create, save, or open native documents. Currently **PII** and **Document summarization** capabilities supports the following native document formats:
4040

4141
|File type|File extension|Description|
4242
|---------|--------------|-----------|
@@ -69,7 +69,7 @@ A native document refers to the file format used to create the original document
6969

7070
> [!NOTE]
7171
> The cURL package is pre-installed on most Windows 10 and Windows 11 and most macOS and Linux distributions. You can check the package version with the following commands:
72-
> Windows: `curl.exe -V`.
72+
> Windows: `curl.exe -V`
7373
> macOS `curl -V`
7474
> Linux: `curl --version`
7575
@@ -78,7 +78,7 @@ A native document refers to the file format used to create the original document
7878
* [Windows](https://curl.haxx.se/windows/).
7979
* [Mac or Linux](https://learn2torials.com/thread/how-to-install-curl-on-mac-or-linux-(ubuntu)-or-windows).
8080

81-
* An active [**Azure account**](https://azure.microsoft.com/free/cognitive-services/). If you don't have one, you can [**create a free account**](https://azure.microsoft.com/free/).
81+
* An active [**Azure account**](https://azure.microsoft.com/free/cognitive-services/). If you don't have one, you can [**create a free account**](https://azure.microsoft.com/free/).
8282

8383
* An [**Azure Blob Storage account**](https://portal.azure.com/#create/Microsoft.StorageAccount-ARM). You also need to [create containers](#create-azure-blob-storage-containers) in your Azure Blob Storage account for your source and target files:
8484

@@ -128,7 +128,7 @@ Your Language resource needs granted access to your storage account before it ca
128128

129129
* [**Shared access signature (SAS) tokens**](shared-access-signatures.md). User delegation SAS tokens are secured with Microsoft Entra credentials. SAS tokens provide secure, delegated access to resources in your Azure storage account.
130130

131-
* [**Managed identity role-based access control (RBAC)**](managed-identities.md). Managed identities for Azure resources are service principals that create a Microsoft Entra identity and specific permissions for Azure managed resources
131+
* [**Managed identity role-based access control (RBAC)**](managed-identities.md). Managed identities for Azure resources are service principals that create a Microsoft Entra identity and specific permissions for Azure managed resources.
132132

133133
For this project, we authenticate access to the `source location` and `target location` URLs with Shared Access Signature (SAS) tokens appended as query strings. Each token is assigned to a specific blob (file).
134134

@@ -177,7 +177,7 @@ For this quickstart, you need a **source document** uploaded to your **source co
177177
"language": "en-US",
178178
"id": "Output-excel-file",
179179
"source": {
180-
"location": "{your-source-container-with-SAS-URL}"
180+
"location": "{your-source-blob-with-SAS-URL}"
181181
},
182182
"target": {
183183
"location": "{your-target-container-with-SAS-URL}"
@@ -189,8 +189,8 @@ For this quickstart, you need a **source document** uploaded to your **source co
189189
{
190190
"kind": "PiiEntityRecognition",
191191
"parameters":{
192-
"excludePiiCategoriesredac" : ["PersonType", "Category2", "Category3"],
193-
"redactionPolicy": "UseEntityTypeName"
192+
"excludePiiCategories" : ["PersonType", "Category2", "Category3"],
193+
"redactionPolicy": "UseRedactionCharacterWithRefId"
194194
}
195195
}
196196
]
@@ -344,7 +344,7 @@ For this project, you need a **source document** uploaded to your **source conta
344344
"documents":[
345345
{
346346
"source":{
347-
"location":"{your-source-container-SAS-URL}"
347+
"location":"{your-source-blob-SAS-URL}"
348348
},
349349
"targets":
350350
{

articles/aks/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@
595595
- name: Bring your own keys for disks
596596
href: azure-disk-customer-managed-keys.md
597597
- name: Azure Container Storage
598-
href: ../storage/container-storage/container-storage-introduction.md
598+
href: ../storage/container-storage/container-storage-introduction.md?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json
599599
- name: Shared file storage
600600
items:
601601
- name: Azure Files storage

articles/aks/app-routing.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Kubernetes Service (AKS) managed nginx Ingress with the application routing add-on
2+
title: Azure Kubernetes Service (AKS) managed NGINX ingress with the application routing add-on
33
description: Use the application routing add-on to securely access applications deployed on Azure Kubernetes Service (AKS).
44
ms.subservice: aks-networking
55
ms.custom: devx-track-azurecli
@@ -9,17 +9,17 @@ ms.date: 11/21/2023
99
ms.author: allensu
1010
---
1111

12-
# Managed nginx Ingress with the application routing add-on
12+
# Managed NGINX ingress with the application routing add-on
1313

14-
One way to route Hypertext Transfer Protocol (HTTP) and secure (HTTPS) traffic to applications running on an Azure Kubernetes Service (AKS) cluster is to use the [Kubernetes Ingress object][kubernetes-ingress-object-overview]. When you create an Ingress object that uses the application routing add-on nginx Ingress classes, the add-on creates, configures, and manages one or more Ingress controllers in your AKS cluster.
14+
One way to route Hypertext Transfer Protocol (HTTP) and secure (HTTPS) traffic to applications running on an Azure Kubernetes Service (AKS) cluster is to use the [Kubernetes Ingress object][kubernetes-ingress-object-overview]. When you create an Ingress object that uses the application routing add-on NGINX Ingress classes, the add-on creates, configures, and manages one or more Ingress controllers in your AKS cluster.
1515

1616
This article shows you how to deploy and configure a basic Ingress controller in your AKS cluster.
1717

18-
## Application routing add-on with nginx features
18+
## Application routing add-on with NGINX features
1919

20-
The application routing add-on with nginx delivers the following:
20+
The application routing add-on with NGINX delivers the following:
2121

22-
* Easy configuration of managed nginx Ingress controllers based on [Kubernetes nginx Ingress controller][kubernetes-nginx-ingress].
22+
* Easy configuration of managed NGINX Ingress controllers based on [Kubernetes NGINX Ingress controller][kubernetes-nginx-ingress].
2323
* Integration with [Azure DNS][azure-dns-overview] for public and private zone management
2424
* SSL termination with certificates stored in Azure Key Vault.
2525

@@ -38,7 +38,7 @@ With the retirement of [Open Service Mesh][open-service-mesh-docs] (OSM) by the
3838
- The application routing add-on supports up to five Azure DNS zones.
3939
- All global Azure DNS zones integrated with the add-on have to be in the same resource group.
4040
- All private Azure DNS zones integrated with the add-on have to be in the same resource group.
41-
- Editing any resources in the `app-routing-system` namespace, including the Ingress-nginx ConfigMap isn't supported.
41+
- Editing any resources in the `app-routing-system` namespace, including the Ingress-nginx ConfigMap, isn't supported.
4242

4343
## Enable application routing using Azure CLI
4444

@@ -67,7 +67,7 @@ az aks approuting enable -g <ResourceGroupName> -n <ClusterName>
6767
6868
The following add-ons are required to support this configuration:
6969

70-
* **open-service-mesh**: If you require encrypted intra cluster traffic (recommended) between the nginx Ingress and your services, the Open Service Mesh add-on is required which provides mutual TLS (mTLS).
70+
* **open-service-mesh**: If you require encrypted intra cluster traffic (recommended) between the NGINX Ingress and your services, the Open Service Mesh add-on is required which provides mutual TLS (mTLS).
7171

7272
### Enable on a new cluster
7373

@@ -178,7 +178,7 @@ The application routing add-on uses annotations on Kubernetes Ingress objects to
178178
app: aks-helloworld
179179
```
180180

181-
### Create the Ingress
181+
### Create the Ingress object
182182

183183
The application routing add-on creates an Ingress class on the cluster named *webapprouting.kubernetes.azure.com*. When you create an Ingress object with this class, it activates the add-on.
184184

@@ -295,7 +295,7 @@ The application routing add-on creates an Ingress class on the cluster named *we
295295
app: aks-helloworld
296296
```
297297

298-
### Create the Ingress
298+
### Create the Ingress object
299299

300300
The application routing add-on creates an Ingress class on the cluster called *webapprouting.kubernetes.azure.com*. When you create an Ingress object with this class, it activates the add-on. The `kubernetes.azure.com/use-osm-mtls: "true"` annotation on the Ingress object creates an Open Service Mesh (OSM) [IngressBackend][ingress-backend] to configure a backend service to accept Ingress traffic from trusted sources.
301301

articles/aks/operator-best-practices-identity.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
title: Best practices for managing identity
2+
title: Best practices for managing authentication and authorization
33
titleSuffix: Azure Kubernetes Service
44
description: Learn the cluster operator best practices for how to manage authentication and authorization for clusters in Azure Kubernetes Service (AKS)
55
ms.topic: conceptual
6-
ms.date: 04/14/2023
6+
ms.date: 02/16/2024
77
---
88

99
# Best practices for authentication and authorization in Azure Kubernetes Service (AKS)
@@ -206,8 +206,7 @@ For more information about cluster operations in AKS, see the following best pra
206206
<!-- INTERNAL LINKS -->
207207
[aks-concepts-identity]: concepts-identity.md
208208
[azure-ad-integration]: managed-azure-ad.md
209-
[aks-aad]: azure-ad-integration-cli.md
210-
[managed-identities]: ../active-directory/managed-identities-azure-resources/overview.md
209+
[aks-aad]: enable-authentication-microsoft-entra-id.md
211210
[aks-best-practices-scheduler]: operator-best-practices-scheduler.md
212211
[aks-best-practices-advanced-scheduler]: operator-best-practices-advanced-scheduler.md
213212
[aks-best-practices-cluster-isolation]: operator-best-practices-cluster-isolation.md

articles/nat-gateway/manage-nat-gateway.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ author: asudbring
66
ms.author: allensu
77
ms.service: nat-gateway
88
ms.topic: how-to
9-
ms.date: 03/20/2023
9+
ms.date: 02/16/2024
1010
ms.custom: template-how-to, devx-track-azurecli, devx-track-azurepowershell
11+
#Customer intent: As a network administrator, I want to learn how to create and remove a NAT gateway resource from a virtual network subnet. I also want to learn how to add and remove public IP addresses and prefixes used for outbound connectivity.
1112
---
1213

1314
# Manage NAT gateway

articles/route-server/expressroute-vpn-support.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,29 @@ author: halkazwini
66
ms.author: halkazwini
77
ms.service: route-server
88
ms.topic: concept-article
9-
ms.date: 08/15/2023
9+
ms.date: 02/16/2024
10+
11+
#CustomerIntent: As an Azure administrator, I want to deploy Azure Route Server with ExpressRoute and Azure VPN so that routes can be exchanged between the two on-premises networks.
1012
---
1113

1214
# Azure Route Server support for ExpressRoute and Azure VPN
1315

14-
Azure Route Server supports not only third-party network virtual appliances (NVA) running on Azure but also seamlessly integrates with ExpressRoute and Azure VPN gateways. You don’t need to configure or manage the BGP peering between the gateway and Azure Route Server. You can enable route exchange between the gateways and Azure Route Server by enabling [branch-to-branch](quickstart-configure-route-server-portal.md#configure-route-exchange) in Azure portal. If you prefer, you can use [Azure PowerShell](quickstart-configure-route-server-powershell.md#route-exchange) or [Azure CLI](quickstart-configure-route-server-cli.md#configure-route-exchange) to enable the route exchange with the Route Server.
16+
Azure Route Server supports not only third-party network virtual appliances (NVA) in Azure but also seamlessly integrates with ExpressRoute and Azure VPN gateways. You don’t need to configure or manage the BGP peering between the gateway and Azure Route Server. You can enable route exchange between the gateways and Azure Route Server by enabling [branch-to-branch](quickstart-configure-route-server-portal.md#configure-route-exchange) in Azure portal. If you prefer, you can use [Azure PowerShell](quickstart-configure-route-server-powershell.md#route-exchange) or [Azure CLI](quickstart-configure-route-server-cli.md#configure-route-exchange) to enable the route exchange with the Route Server.
1517

1618
[!INCLUDE [downtime note](../../includes/route-server-note-vng-downtime.md)]
1719

1820
## How does it work?
1921

2022
When you deploy an Azure Route Server along with a virtual network gateway and an NVA in a virtual network, by default Azure Route Server doesn’t propagate the routes it receives from the NVA and virtual network gateway between each other. Once you enable **branch-to-branch** in Route Server, the virtual network gateway and the NVA exchange their routes.
2123

22-
For example, in the following diagram:
24+
> [!IMPORTANT]
25+
> ExpressRoute branch-to-branch connectivity is not supported. If you have two (or more) ExpressRoute circuits connected to the same ExpressRoute virtual network gateway, routes from one circuit are not advertised to the other. If you want to enable on-premises to on-premises connectivity over ExpressRoute, consider configuring ExpressRoute Global Reach. For more information, see [About Azure ExpressRoute Global Reach](../expressroute/expressroute-global-reach.md).
26+
27+
The following diagram shows an example of using Route Server to exchange routes between an ExpressRoute and SDWAN appliance:
2328

24-
* The SDWAN appliance receives from Azure Route Server the route of *On-premises 2*, which is connected to ExpressRoute circuit, along with the route of the virtual network.
29+
- The SDWAN appliance receives from Azure Route Server the route of *On-premises 2*, which is connected to ExpressRoute circuit, along with the route of the virtual network.
2530

26-
* The ExpressRoute gateway receives from Azure Route Server the route of *On-premises 1*, which is connected to the SDWAN appliance, along with the route of the virtual network.
31+
- The ExpressRoute gateway receives from Azure Route Server the route of *On-premises 1*, which is connected to the SDWAN appliance, along with the route of the virtual network.
2732

2833
:::image type="content" source="./media/expressroute-vpn-support/expressroute-with-route-server.png" alt-text="Diagram showing ExpressRoute gateway and SDWAN NVA exchanging routes through Azure Route Server.":::
2934

@@ -37,10 +42,10 @@ If you enable BGP on the VPN gateway, the gateway learns *On-premises 1* routes
3742
:::image type="content" source="./media/expressroute-vpn-support/expressroute-and-vpn-with-route-server.png" alt-text="Diagram showing ExpressRoute and VPN gateways exchanging routes through Azure Route Server.":::
3843

3944
> [!NOTE]
40-
> When the same route is learned over ExpressRoute, Azure VPN or an SDWAN appliance, the ExpressRoute network will be preferred.
45+
> When the same route is learned over ExpressRoute, Azure VPN or an SDWAN appliance, the ExpressRoute network will be preferred by default. You can configure routing preference to influence Route Server route selection. For more information, see [Routing preference (preview)](hub-routing-preference.md).
4146
42-
## Next steps
47+
## Related content
4348

44-
- Learn more about [Azure Route Server](route-server-faq.md).
45-
- Learn how to [configure Azure Route Server](quickstart-configure-route-server-powershell.md).
46-
- Learn more about [Azure ExpressRoute and Azure VPN coexistence](../expressroute/how-to-configure-coexisting-gateway-portal.md).
49+
- [Azure Route Server frequently asked questions (FAQ)](route-server-faq.md).
50+
- [Configure Azure Route Server](quickstart-configure-route-server-powershell.md).
51+
- [Azure ExpressRoute and Azure VPN coexistence](../expressroute/how-to-configure-coexisting-gateway-portal.md?toc=/azure/route-server/toc.json).

0 commit comments

Comments
 (0)