Merge branch 'MicrosoftDocs:main' into main

Author: jesscioffi

articles/cognitive-services/language-service/custom-named-entity-recognition/service-limits.md

@@ -89,7 +89,7 @@ The following limits are observed for the custom named entity recognition.
 |Document length in characters | 1 | 128,000 characters; approximately 28,000 words or 56 pages. |
 |Count of entity types | 1 | 200 |
 |Entity length in characters | 1 | 500 |
-|Count of trained models per project| 0 | 50 |
+|Count of trained models per project| 0 | 10 |
 |Count of deployments per project| 0 | 10 |
 
 ## Naming limits

articles/cognitive-services/language-service/custom-text-classification/service-limits.md

@@ -92,7 +92,7 @@ The following limits are observed for the custom text classification.
 |Documents count | 10 | 100,000 |
 |Document length in characters | 1 | 128,000 characters; approximately 28,000 words or 56 pages. |
 |Count of classes | 1 | 200 |
-|Count of trained models per project| 0 | 50 |
+|Count of trained models per project| 0 | 10 |
 |Count of deployments per project| 0 | 10 |
 
 ## Naming limits

articles/cost-management-billing/manage/view-all-accounts.md

@@ -7,7 +7,7 @@ tags: billing
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 01/28/2022
+ms.date: 07/20/2022
 ms.author: banders
 ---
 
@@ -19,9 +19,9 @@ Azure portal supports the following type of billing accounts:
 
 - **Microsoft Online Services Program**: A billing account for a Microsoft Online Services Program is created when you sign up for Azure through the Azure website. For example, when you sign up for an [Azure Free Account](https://azure.microsoft.com/offers/ms-azr-0044p/), [account with pay-as-you-go rates](https://azure.microsoft.com/offers/ms-azr-0003p/) or as a [Visual studio subscriber](https://azure.microsoft.com/pricing/member-offers/credit-for-visual-studio-subscribers/).
 
-- **Enterprise Agreement**: A billing account for an Enterprise Agreement is created when your organization signs an [Enterprise Agreement (EA)](https://azure.microsoft.com/pricing/enterprise-agreement/) to use Azure. You can have a maximum of 5000 subscriptions in an Enterprise Agreement. You can also have an unlimited number of enrollment accounts, effectively allowing an unlimited number of subscriptions.
+- **Enterprise Agreement**: A billing account for an Enterprise Agreement (EA) is created when your organization signs an [Enterprise Agreement](https://azure.microsoft.com/pricing/enterprise-agreement/) to use Azure. An EA enrollment can contain an unlimited number of EA accounts. However, an EA account has a subscription limit of 5000. If you need more subscriptions than the limit, create more EA accounts. Generally speaking, a subscription is a billing container. We recommend that you avoid creating multiple subscriptions to implement access boundaries. To separate resources with an access boundary, consider using a resource group. For more information about resource groups, see [Manage Azure resource groups by using the Azure portal](../../azure-resource-manager/management/manage-resource-groups-portal.md).
 
-- **Microsoft Customer Agreement**: A billing account for a Microsoft Customer Agreement is created when your organization works with a Microsoft representative to sign a Microsoft Customer Agreement. Some customers in select regions, who sign up through the Azure website for an [account with pay-as-you-go rates](https://azure.microsoft.com/offers/ms-azr-0003p/) or an [Azure Free Account](https://azure.microsoft.com/offers/ms-azr-0044p/) may have a billing account for a Microsoft Customer Agreement as well. You can have a maximum of 20 subscriptions in a Microsoft Customer Agreement for an individual. A Microsoft Customer Agreement for an enterprise doesn't have a limit on the number of subscriptions. For more information, see [Get started with your billing account for Microsoft Customer Agreement](../understand/mca-overview.md).
+- **Microsoft Customer Agreement**: A billing account for a Microsoft Customer Agreement is created when your organization works with a Microsoft representative to sign a Microsoft Customer Agreement. Some customers in select regions, who sign up through the Azure website for an [account with pay-as-you-go rates](https://azure.microsoft.com/offers/ms-azr-0003p/) or an [Azure Free Account](https://azure.microsoft.com/offers/ms-azr-0044p/) may have a billing account for a Microsoft Customer Agreement as well. You can have a maximum of 20 subscriptions in a Microsoft Customer Agreement for an individual. A Microsoft Customer Agreement for an enterprise can have 5000 subscriptions under it.
 
 - **Microsoft Partner Agreement**: A billing account for a Microsoft Partner Agreement is created for Cloud Solution Provider (CSP) partners to manage their customers in the new commerce experience. Partners need to have at least one customer with an [Azure plan](/partner-center/purchase-azure-plan) to manage their billing account in the Azure portal. For more information, see [Get started with your billing account for Microsoft Partner Agreement](../understand/mpa-overview.md).
 

articles/firewall/compliance-certifications.md

@@ -109,7 +109,11 @@ The following Azure Firewall certifications are for Azure Government:
 
 ICSA Labs is a leading vendor in third-party testing and certification of security and health IT products, as well as network-connected devices. They measure product compliance, reliability, and performance for most of the world’s top technology vendors.
 
-Azure Firewall is the first cloud firewall service to attain the ICSA Labs Corporate Firewall Certification. For the Azure Firewall certification report, see the [ICSA Labs Certification Testing and Audit Report](https://aka.ms/ICSALabsCertification). For more information, see the [ICSA Labs Firewall Certification Program](https://www.icsalabs.com/technology-program/firewalls) page.
+Azure Firewall is the first cloud firewall service to attain the ICSA Labs Corporate Firewall Certification. 
+- For the Azure Firewall certification report, see the [ICSA Labs Certification Testing and Audit Report](https://www.icsalabs.com/sites/default/files/FINAL_Microsoft-Azure_Firewall_Report_210721.pdf).
+- For the Intrusion Prevention Systems (IPS) report, see [Network Intrusion Prevention Systems Certification Testing Report](https://www.icsalabs.com/sites/default/files/FINAL_Microsoft_NIPS_Cert_Testing_Report_20220715.pdf).
+
+For more information, see the [ICSA Labs Firewall Certification Program](https://www.icsalabs.com/technology-program/firewalls) page.
 
 
 ## Next steps

articles/machine-learning/how-to-configure-network-isolation-with-v2.md

@@ -44,7 +44,7 @@ The Azure Machine Learning CLI v2 uses our new v2 API platform. New features suc
 
 As mentioned in the previous section, there are two types of operations; with ARM and with the workspace. With the __legacy v1 API__, most operations used the workspace. With the v1 API, adding a private endpoint to the workspace provided network isolation for everything except CRUD operations on the workspace or compute resources.
 
-With the __new v2 API__, most operations use ARM. So enabling a private endpoint on your workspace doesn't provide the same level of network isolation. Operations that use ARM communicate  over public networks, and include any metadata (such as your resource IDs) or parameters used by the operation. For example, the [create or update job](/rest/api/azureml/jobs/create-or-update) api sends metadata, and [parameters](./reference-yaml-job-command.md).
+With the __new v2 API__, most operations use ARM. So enabling a private endpoint on your workspace doesn't provide the same level of network isolation. Operations that use ARM communicate  over public networks, and include any metadata (such as your resource IDs) or parameters used by the operation. For example, the [create or update job](/rest/api/azureml/2022-05-01/jobs/create-or-update) api sends metadata, and [parameters](./reference-yaml-job-command.md).
 
 > [!TIP]
 > * Public ARM operations do not surface data in your storage account on public networks. 

articles/machine-learning/how-to-manage-rest.md

@@ -232,7 +232,7 @@ providers/Microsoft.MachineLearningServices/workspaces/<YOUR-WORKSPACE-NAME>/com
 -H "Authorization:Bearer <YOUR-ACCESS-TOKEN>"
 ```
 
-To create or overwrite a named compute resource, you'll use a PUT request. In the following, in addition to the now-familiar replacements of `YOUR-SUBSCRIPTION-ID`, `YOUR-RESOURCE-GROUP`, `YOUR-WORKSPACE-NAME`, and `YOUR-ACCESS-TOKEN`, replace `YOUR-COMPUTE-NAME`, and values for `location`, `vmSize`, `vmPriority`, `scaleSettings`, `adminUserName`, and `adminUserPassword`. As specified in the reference at [Machine Learning Compute - Create Or Update SDK Reference](/rest/api/azureml/workspaces/createorupdate), the following command creates a dedicated, single-node Standard_D1 (a basic CPU compute resource) that will scale down after 30 minutes:
+To create or overwrite a named compute resource, you'll use a PUT request. In the following, in addition to the now-familiar replacements of `YOUR-SUBSCRIPTION-ID`, `YOUR-RESOURCE-GROUP`, `YOUR-WORKSPACE-NAME`, and `YOUR-ACCESS-TOKEN`, replace `YOUR-COMPUTE-NAME`, and values for `location`, `vmSize`, `vmPriority`, `scaleSettings`, `adminUserName`, and `adminUserPassword`. As specified in the reference at [Machine Learning Compute - Create Or Update SDK Reference](/rest/api/azureml/2022-05-01/workspaces/create-or-update), the following command creates a dedicated, single-node Standard_D1 (a basic CPU compute resource) that will scale down after 30 minutes:
 
 ```bash
 curl -X PUT \

articles/orbital/receive-real-time-telemetry.md

@@ -202,4 +202,4 @@ The ground station provides telemetry using Avro as a schema. The schema is belo
 ## Next steps
 
 - [Event Hubs using Python Getting Started](../event-hubs/event-hubs-python-get-started-send.md)
-- [Azure Event Hubs client library for Python code samples](/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/async_samples)
+- [Azure Event Hubs client library for Python code samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventhub/azure-eventhub/samples/async_samples)

articles/security/develop/secure-dev-overview.md

@@ -95,7 +95,7 @@ developers build more secure software. It helps you address security
 compliance requirements while reducing development costs.
 
 [Open Web Application Security Project
-(OWASP)](https://www.owasp.org/index.php/Main_Page) – OWASP is an online
+(OWASP)](https://www.owasp.org/) – OWASP is an online
 community that produces freely available articles, methodologies,
 documentation, tools, and technologies in the field of web application
 security.

articles/spring-cloud/how-to-prepare-app-deployment.md

@@ -153,15 +153,16 @@ The following table lists the supported Spring Boot and Spring Cloud combination
 
 | Spring Boot version | Spring Cloud version |
 |---------------------|----------------------|
-| 2.6.x               | 2021.0.0+            |
-| 2.5.x               | 2020.0+ aka Ilford+  |
+| 2.7.x               | 2021.0.3+ aka Jubilee|
+| 2.6.x               | 2021.0.0+ aka Jubilee|
 
 ### [Enterprise tier](#tab/enterprise-tier)
 
 | Spring Boot version | Spring Cloud version       |
 |---------------------|----------------------------|
-| 2.6.x               | 2021.0.0+                  |
-| 2.5.x               | 2020.0+ aka Ilford+        |
+| 2.7.x               | 2021.0.3+ aka Jubilee      |
+| 2.6.x               | 2021.0.0+ aka Jubilee      |
+| 2.5.x               | 2020.3+ aka Ilford+        |
 | 2.4.x               | 2020.0+ aka Ilford+        |
 | 2.3.x               | Hoxton (starting with SR5) |
 
@@ -179,7 +180,7 @@ For more information, see the following pages:
 > - Upgrade Spring Boot to 2.5.2 or 2.4.8 to address the following CVE report [CVE-2021-22119: Denial-of-Service attack with spring-security-oauth2-client](https://tanzu.vmware.com/security/cve-2021-22119). If you're using Spring Security, upgrade it to 5.5.1, 5.4.7, 5.3.10 or 5.2.11.
 > - An issue was identified with Spring Boot 2.4.0 on TLS authentication between apps and Spring Cloud Service Registry. Use version 2.4.1 or above. If you must use version 2.4.0, see the [FAQ](./faq.md?pivots=programming-language-java#development) for a workaround.
 
-### Dependencies for Spring Boot version 2.4/2.5/2.6
+### Dependencies for Spring Boot version 2.4/2.5/2.6/2.7
 
 For Spring Boot version 2.4/2.5, add the following dependencies to the application POM file.
 
@@ -205,14 +206,14 @@ For Spring Boot version 2.4/2.5, add the following dependencies to the applicati
 </dependencyManagement>
 ```
 
-For Spring Boot version 2.6, add the following dependencies to the application POM file.
+For Spring Boot version 2.6/2.7, add the following dependencies to the application POM file.
 
 ```xml
 <!-- Spring Boot dependencies -->
 <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.2</version>
 </parent>
 
 <!-- Spring Cloud dependencies -->
@@ -221,7 +222,7 @@ For Spring Boot version 2.6, add the following dependencies to the application P
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-dependencies</artifactId>
-            <version>2021.0.0</version>
+            <version>2021.0.3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>