Skip to content

Commit 2343a98

Browse files
authored
Merge branch 'MicrosoftDocs:main' into cicd
2 parents 7c39ff6 + ae26e76 commit 2343a98

File tree

20 files changed

+30
-286
lines changed

20 files changed

+30
-286
lines changed

articles/active-directory/fundamentals/secure-with-azure-ad-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Below are some considerations when designing a governed subscription lifecycle p
276276

277277
## Operations
278278

279-
The following are additional operational considerations for Azure AD, specific to multiple isolated environments. Check the [Azure Cloud Adoption Framework](/azure/cloud-adoption-framework/manage/), [Azure Security Benchmark](/security/benchmark/azure/) and [Azure AD Operations guide](./active-directory-ops-guide-ops.md) for detailed guidance to operate individual environments.
279+
The following are additional operational considerations for Azure AD, specific to multiple isolated environments. Check the [Azure Cloud Adoption Framework](/azure/cloud-adoption-framework/manage/), the [Microsoft cloud security benchmark](/security/benchmark/azure/) and [Azure AD Operations guide](./active-directory-ops-guide-ops.md) for detailed guidance to operate individual environments.
280280

281281
### Cross-environment roles and responsibilities
282282

articles/active-directory/verifiable-credentials/plan-issuance-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ For security logging and monitoring, we recommend the following:
285285

286286
* Mitigate distributed denial of service (DDOS) and Key Vault resource exhaustion risks. Every request that triggers a VC issuance request generates Key Vault signing operations that accrue towards service limits. We recommend protecting traffic by incorporating authentication or captcha before generating issuance requests.
287287

288-
For guidance on managing your Azure environment, we recommend you review [Azure Security Benchmark](/security/benchmark/azure/) and [Securing Azure environments with Azure Active Directory](https://aka.ms/AzureADSecuredAzure). These guides provide best practices for managing the underlying Azure resources, including Azure Key Vault, Azure Storage, websites, and other Azure-related services and capabilities.
288+
For guidance on managing your Azure environment, we recommend you review the [Microsoft cloud security benchmark](/security/benchmark/azure/) and [Securing Azure environments with Azure Active Directory](https://aka.ms/AzureADSecuredAzure). These guides provide best practices for managing the underlying Azure resources, including Azure Key Vault, Azure Storage, websites, and other Azure-related services and capabilities.
289289

290290
## Additional considerations
291291

articles/aks/supported-kubernetes-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ For the past release history, see [Kubernetes](https://en.wikipedia.org/wiki/Kub
191191
| 1.22 | Aug-04-21 | Sept 2021 | Dec 2021 | 1.25 GA |
192192
| 1.23 | Dec 2021 | Jan 2022 | Apr 2022 | 1.26 GA |
193193
| 1.24 | Apr-22-22 | May 2022 | Jul 2022 | 1.27 GA
194-
| 1.25 | Aug 2022 | Oct 2022 | Nov 2022 | 1.28 GA
194+
| 1.25 | Aug 2022 | Oct 2022 | Dec 2022 | 1.28 GA
195195
| 1.26 | Dec 2022 | Jan 2023 | Mar 2023 | 1.29 GA
196196

197197
## FAQ

articles/applied-ai-services/form-recognizer/concept-invoice.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ See how data, including customer information, vendor details, and line items, is
105105
| PaymentTerm | String | The terms of payment for the invoice | |
106106
| SubTotal | Number | Subtotal field identified on this invoice | Integer |
107107
| TotalTax | Number | Total tax field identified on this invoice | Integer |
108-
| TotalVAT | Number | Total VAT field identified on this invoice | Integer |
109108
| InvoiceTotal | Number (USD) | Total new charges associated with this invoice | Integer |
110109
| AmountDue | Number (USD) | Total Amount Due to the vendor | Integer |
111110
| ServiceAddress | String | Explicit service address or property address for the customer | |
@@ -131,7 +130,6 @@ Following are the line items extracted from an invoice in the JSON output respon
131130
| Unit | String| The unit of the line item, e.g, kg, lb etc. | Hours | |
132131
| Date | Date| Date corresponding to each line item. Often it's a date the line item was shipped | 3/4/2021| 2021-03-04 |
133132
| Tax | Number | Tax associated with each line item. Possible values include tax amount, tax %, and tax Y/N | 10% | |
134-
| VAT | Number | Stands for Value added tax. VAT is a flat tax levied on an item. Common in European countries | €20.00 | |
135133

136134
The invoice key-value pairs and line items extracted are in the `documentResults` section of the JSON output.
137135

articles/automation/automation-security-guidelines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ ms.topic: conceptual
1010
# Security best practices in Azure Automation
1111

1212
> [!IMPORTANT]
13-
> Azure Automation Run As Account will retire on September 30, 2023 and will be replaced with Managed Identities. Before that date, you'll need to start migrating your runbooks to use [managed identities](automation-security-overview.md#managed-identities). For more information, see [migrating from an existing Run As accounts to managed identity](https://learn.microsoft.com/azure/automation/migrate-run-as-accounts-managed-identity?tabs=run-as-account#sample-scripts) to start migrating the runbooks from Run As account to managed identities before 30 September 2023.
13+
> Azure Automation Run As Account will retire on September 30, 2023 and will be replaced with Managed Identities. Before that date, you'll need to start migrating your runbooks to use [managed identities](automation-security-overview.md#managed-identities). For more information, see [migrating from an existing Run As accounts to managed identity](migrate-run-as-accounts-managed-identity.md?tabs=run-as-account#sample-scripts) to start migrating the runbooks from Run As account to managed identities before 30 September 2023.
1414
1515
This article details the best practices to securely execute the automation jobs.
1616
[Azure Automation](./overview.md) provides you the platform to orchestrate frequent, time consuming, error-prone infrastructure management and operational tasks, as well as mission-critical operations. This service allows you to execute scripts, known as automation runbooks seamlessly across cloud and hybrid environments.
1717

18-
The platform components of Azure Automation Service are actively secured and hardened. The service goes through robust security and compliance checks. [Azure security benchmark](/security/benchmark/azure/overview) details the best practices and recommendations to help improve the security of workloads, data, and services on Azure. Also see [Azure security baseline for Azure Automation](/security/benchmark/azure/baselines/automation-security-baseline?toc=/azure/automation/TOC.json).
18+
The platform components of Azure Automation Service are actively secured and hardened. The service goes through robust security and compliance checks. the [Microsoft cloud security benchmark](/security/benchmark/azure/overview) details the best practices and recommendations to help improve the security of workloads, data, and services on Azure. Also see [Azure security baseline for Azure Automation](/security/benchmark/azure/baselines/automation-security-baseline?toc=/azure/automation/TOC.json).
1919

2020
## Secure configuration of Automation account
2121

articles/azure-functions/create-first-function-vs-code-csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Create a C# function using Visual Studio Code - Azure Functions"
33
description: "Learn how to create a C# function, then publish the local project to serverless hosting in Azure Functions using the Azure Functions extension in Visual Studio Code. "
44
ms.topic: quickstart
5-
ms.date: 06/11/2022
5+
ms.date: 10/11/2022
66
ms.devlang: csharp
77
ms.custom: devx-track-csharp, mode-ui, vscode-azure-extension-update-complete
88
adobe-target: true
@@ -15,7 +15,7 @@ adobe-target-content: ./create-first-function-vs-code-csharp-ieux
1515

1616
In this article, you use Visual Studio Code to create a C# function that responds to HTTP requests. After testing the code locally, you deploy it to the serverless environment of Azure Functions. This article creates an HTTP triggered function that runs on .NET 6.0. There's also a [CLI-based version](create-first-function-cli-csharp.md) of this article.
1717

18-
By default, this article shows you how to create C# functions that run on .NET 6 [in the same process as the Functions host](functions-dotnet-class-library.md). These _in-process_ C# functions are only supported on Long Term Support (LTS) versions of .NET, such as .NET 6. To create C# functions on .NET 6 that can also run on .NET 5.0 and .NET Framework 4.8 (in preview) [in an isolated process](dotnet-isolated-process-guide.md), see the [alternate version of this article](create-first-function-vs-code-csharp.md?tabs=isolated-process).
18+
By default, this article shows you how to create C# functions that run [in the same process as the Functions host](functions-dotnet-class-library.md). These _in-process_ C# functions are only supported on Long Term Support (LTS) versions of .NET, such as .NET 6. To create C# functions on .NET 6 that can also run on [other supported versions](functions-versions.md) for Azure functions [in an isolated process](dotnet-isolated-process-guide.md).
1919

2020
Completing this quickstart incurs a small cost of a few USD cents or less in your Azure account.
2121

articles/azure-functions/functions-reference-csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Azure Functions lets you develop functions using C# in one of the following ways
1616
| Type | Execution process | Code extension | Development environment | Reference |
1717
| --- | ---- | --- | --- | --- |
1818
| C# script | in-process | .csx | [Portal](functions-create-function-app-portal.md)<br/>[Core Tools](functions-run-local.md) | This article |
19-
| C# class library | in-process | .cs | [Visual Studio](functions-develop-vs.md)<br/>[Visual Studio Code](functions-develop-vs-code.md)<br />[Core Tools](functions-run-local.md)s | [In-process C# class library functions](functions-dotnet-class-library.md) |
20-
| C# class library (isolated process)| out-of-process | .cs | [Visual Studio](functions-develop-vs.md)<br/>[Visual Studio Code](functions-develop-vs-code.md)<br />[Core Tools](functions-run-local.md) | [.NET isolated process functions](dotnet-isolated-process-guide.md) |
19+
| C# class library | in-process | .cs | [Visual Studio](functions-develop-vs.md)<br/>[Visual Studio Code](functions-develop-vs-code.md)<br />[Core Tools](functions-run-local.md)| [In-process C# class library functions](functions-dotnet-class-library.md) |
20+
| C# class library (isolated process)| in an isolated process | .cs | [Visual Studio](functions-develop-vs.md)<br/>[Visual Studio Code](functions-develop-vs-code.md)<br />[Core Tools](functions-run-local.md) | [.NET isolated process functions](dotnet-isolated-process-guide.md) |
2121

2222
This article assumes that you've already read the [Azure Functions developers guide](functions-reference.md).
2323

articles/azure-functions/functions-versions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ zone_pivot_groups: programming-languages-set-functions
1313

1414
| Version | Support level | Description |
1515
| --- | --- | --- |
16-
| 4.x | GA | **_Recommended runtime version for functions in all languages._** Use this version to [run C# functions on .NET 6.0, .NET 7.0, and .NET Framework 4.8](functions-dotnet-class-library.md#supported-versions). |
17-
| 3.x | GA | Supports all languages. Use this version to [run C# functions on .NET Core 3.1 and .NET 5.0](functions-dotnet-class-library.md#supported-versions).|
16+
| 4.x | GA | **_Recommended runtime version for functions in all languages._** Check out [Supported language versions](#languages). |
17+
| 3.x | GA | Supports all languages. Check out [Supported language versions](#languages).|
1818
| 2.x | GA | Supported for [legacy version 2.x apps](#pinning-to-version-20). This version is in maintenance mode, with enhancements provided only in later versions.|
1919
| 1.x | GA | Recommended only for C# apps that must use .NET Framework and only supports development in the Azure portal, Azure Stack Hub portal, or locally on Windows computers. This version is in maintenance mode, with enhancements provided only in later versions. |
2020

articles/azure-functions/security-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ In many ways, planning for secure development, deployment, and operation of serv
1313

1414
[!INCLUDE [app-service-security-intro](../../includes/app-service-security-intro.md)]
1515

16-
For a set of security recommendations that follow the [Azure Security Benchmark](../security/benchmarks/overview.md), see [Azure Security Baseline for Azure Functions](security-baseline.md).
16+
For a set of security recommendations that follow the [Microsoft cloud security benchmark](/security/benchmark/azure/introduction), see [Azure Security Baseline for Azure Functions](/security/benchmark/azure/baselines/functions-security-baseline).
1717

1818
## Secure operation
1919

articles/azure-vmware/includes/customer-communications.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: Azure VMware Solution customer communications
33
description: Azure VMware Solution customer communications description.
44
ms.topic: include
55
ms.service: azure-vmware
6-
ms.date: 03/24/2021
6+
ms.date: 10/17/2022
77
author: suzizuber
88
ms.author: v-szuber
99
---
1010

1111
<!-- Used in introduction.md and faq.yml -->
1212

13-
You can find service issues, planned maintenance, health advisories, security advisories notifications published through **Service Health** in the Azure portal. You can take timely actions when you set up activity log alerts for these notifications. You can take timely actions when you set up activity log alerts for these notifications. For more information, see [Create service health alerts using the Azure portal](../../service-health/alerts-activity-log-service-notifications-portal.md#create-service-health-alert-using-azure-portal).
13+
You can find service issues, planned maintenance, health advisories, and security advisories notifications published through **Service Health** in the Azure portal. You can take timely actions when you set up activity log alerts for these notifications. For more information, see [Create service health alerts using the Azure portal](../../service-health/alerts-activity-log-service-notifications-portal.md#create-service-health-alert-using-azure-portal).
1414

1515
:::image type="content" source="../media/service-health.png" alt-text="Screenshot of Service Health notifications.":::

0 commit comments

Comments
 (0)