Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into java-sas

Author: pauljewellmsft

articles/cost-management-billing/costs/tutorial-improved-exports.md

@@ -168,8 +168,8 @@ Agreement types, scopes, and required roles are explained at [Understand and wor
 
 | **Data types** | **Supported agreement** | **Supported scopes** |
 | --- | --- | --- |
-| Cost and usage (actual) | • EA<br> • MCA that you bought through the Azure website <br> • MCA enterprise<br> • MCA that you buy through a Microsoft partner <br> • Microsoft Online Service Program (MOSP), also known as pay-as-you-go  <br> • Azure internal | • EA - Enrollment, department, account, subscription, and resource group <br> • MCA - Billing account, billing profile, Invoice section, subscription, and resource group <br> • Microsoft Partner Agreement (MPA) - Customer, subscription, and resource group |
-| Cost and usage (amortized) | • EA <br> • MCA that you bought through the Azure website <br> • MCA enterprise <br> • MCA that you buy through a Microsoft partner <br> • Microsoft Online Service Program (MOSP), also known as pay-as-you-go  <br> • Azure internal | • EA - Enrollment, department, account, subscription, and resource group <br> • MCA - Billing account, billing profile, Invoice section, subscription, and resource group <br> • MPA - Customer, subscription, and resource group |
+| Cost and usage (actual) | • EA<br> • MCA that you bought through the Azure website <br> • MCA enterprise<br> • MCA that you buy through a Microsoft partner <br> • Azure internal | • EA - Enrollment, department, account, subscription, and resource group <br> • MCA - Billing account, billing profile, Invoice section, subscription, and resource group <br> • Microsoft Partner Agreement (MPA) - Customer, subscription, and resource group |
+| Cost and usage (amortized) | • EA <br> • MCA that you bought through the Azure website <br> • MCA enterprise <br> • MCA that you buy through a Microsoft partner  <br> • Azure internal | • EA - Enrollment, department, account, subscription, and resource group <br> • MCA - Billing account, billing profile, Invoice section, subscription, and resource group <br> • MPA - Customer, subscription, and resource group |
 | Cost and usage (FOCUS) | • EA <br> • MCA that you bought through the Azure website <br> • MCA enterprise <br> • MCA that you buy through a Microsoft partner| • EA - Enrollment, department, account, subscription, and resource group <br> • MCA - Billing account, billing profile, invoice section, subscription, and resource group <br> • MPA - Customer, subscription, resource group. **NOTE**: The management group scope isn't supported for Cost and usage details (FOCUS) exports. |
 | All available prices | • EA <br>  • MCA that you bought through the Azure website <br> • MCA enterprise <br> • MCA that you buy through a Microsoft partner  | • EA - Billing account <br> • All other supported agreements - Billing profile |
 | Reservation recommendations | • EA <br> • MCA that you bought through the Azure website <br> • MCA enterprise <br> • MCA that you buy through a Microsoft partner | • EA - Billing account <br> • All other supported agreements - Billing profile |
@@ -182,7 +182,8 @@ The improved exports experience currently has the following limitations.
 
 - The new exports experience doesn't fully support the management group scope, and it has feature limitations.
 
-- Azure internal and MOSP billing scopes and subscriptions don’t support FOCUS datasets.
+- Azure internal accounts and the Microsoft Online Service Program (MOSP), commonly referred to as pay-as-you-go, support only the 'Cost and Usage Details (Usage Only)' dataset for billing scopes and subscriptions. 
+
 - Shared access service (SAS) key-based cross tenant export is only supported for Microsoft partners at the billing account scope. It isn't supported for other partner scenarios like any other scope, EA indirect contract, or Azure Lighthouse.
 
 ## FAQ

articles/cost-management-billing/dataset-schema/cost-usage-details-pay-as-you-go.md

@@ -12,9 +12,9 @@ ms.author: banders
 
 # Pay-as-you-go cost and usage details file schema
 
-This article applies to the pay-as-you-go cost and usage details file schema. Pay-as-you-go is also called Microsoft Online Services Program (MOSP) and Microsoft Online Subscription Agreement (MOSA).
+This article applies to the pay-as-you-go cost and usage details (usage only) file schema. Pay-as-you-go is also called Microsoft Online Services Program (MOSP) and Microsoft Online Subscription Agreement (MOSA).
 
-The following information lists the cost and usage details (formerly known as usage details) fields found in the pay-as-you-go cost and usage details file. The file contains contains all of the cost details and usage data for the Azure services that were used.
+The schema outlined here is applicable only to the 'Cost and Usage Details (Usage Only)' dataset and does not cover purchase information.
 
 ## Version 2019-11-01
 

articles/cost-management-billing/reservations/save-compute-costs-reservations.md

@@ -104,7 +104,7 @@ For more information, see [Self-service exchanges and refunds for Azure Reservat
 Software plans:
 
 - **SUSE Linux** - A reservation covers the software plan costs. The discounts apply only to SUSE meters and not to the virtual machine usage.
-- **Red Hat Plans** (***temporarily unavailable***) - A reservation covers the software plan costs. The discounts apply only to RedHat meters and not to the virtual machine usage.
+- **Red Hat Plans** (***plans and renewal are temporarily unavailable***) - A reservation covers the software plan costs. The discounts apply only to RedHat meters and not to the virtual machine usage.
 - **Azure Red Hat OpenShift** - A reservation applies to the OpenShift costs, not to Azure infrastructure costs.
 
 For Windows virtual machines and SQL Database, the reservation discount doesn't apply to the software costs. You can cover the licensing costs with [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/).

articles/cost-management-billing/reservations/understand-rhel-reservation-charges.md

@@ -13,17 +13,17 @@ ms.author: banders
 # Understand how the Red Hat Linux Enterprise software reservation plan discount is applied for Azure
 
 > [!NOTE]
-> The Red Hat Linux Enterprise software reservation plan is temporarily unavailable.
+> The Red Hat Linux Enterprise software reservation plan and renewal are temporarily unavailable. Disregard any renewal emails until the plan is available.
 
 When you buy a Red Hat Linux Enterprise software plan, you get a discount on the cost of running Red Hat software on Azure virtual machines. This article explains how the discount is applied to your Red Hat software costs.
 
-After you buy a Red Hat Linux plan, the discount is automatically applied to deployed Red Hat virtual machines (VMs) that match the reservation. A Red Hat Linux plan covers the cost of running the Red Hat software on an Azure VM.
+After you buy a Red Hat Linux plan, the discount is automatically applied to deployed Red Hat virtual machines (VM) that match the reservation. A Red Hat Linux plan covers the cost of running the Red Hat software on an Azure VM.
 
 To buy the right Red Hat Linux plan, you need to understand what Red Hat VMs you run and the number of vCPUs on those VMs. Use the following sections to help identify from your usage CSV file what plan to buy.
 
 ## Discount applies to different VM sizes
 
-Like Reserved VM Instances, Red Hat plan purchases offer instance size flexibility. This means that your discount applies even when you deploy a VM with a different vCPU count. The discount applies to different VM sizes within the software plan.
+Like Reserved VM Instances, Red Hat plan purchases offer instance size flexibility. Instance size flexibility applies your discount even when you deploy a VM with a different vCPU count and to different VM sizes within the software plan.
 
 The discount amount depends on the VM vCPU ratio listed at [Instance size flexibility ratio for VMs](/azure/virtual-machines/reserved-vm-instance-size-flexibility#instance-size-flexibility-ratio-for-vms). Use the ratio value to calculate how many VM instances get the Red Hat Linux plan discount.
 
@@ -42,7 +42,7 @@ To learn more about reservations, see the following articles:
 - [Prepay for Red Hat software plans with Azure reservations](/azure/virtual-machines/linux/prepay-suse-software-charges)
 - [Prepay for Virtual Machines with Azure Reserved VM Instances](/azure/virtual-machines/prepay-reserved-vm-instances)
 - [Manage reservations for Azure](manage-reserved-vm-instance.md)
-- [Understand reservation usage for your Pay-As-You-Go subscription](understand-reserved-instance-usage.md)
+- [Understand reservation usage for your pay-as-you-go subscription](understand-reserved-instance-usage.md)
 - [Understand reservation usage for your Enterprise enrollment](understand-reserved-instance-usage-ea.md)
 
 ## Related content

articles/load-balancer/load-balancer-nat-pool-migration.md

@@ -15,7 +15,7 @@ An [inbound NAT rule](inbound-nat-rules.md) is used to forward traffic from a lo
 
 ## NAT rule version 1 
 
-[Version 1](inbound-nat-rules.md) is the legacy approach for assigning an Azure Load Balancer’s frontend port to each backend instance. Rules are applied to the backend instance’s network interface card (NIC). For Azure Virtual Machine Scale Sets instances, inbound NAT rules are automatically created/deleted as new instances are scaled up/down.  
+[Version 1](inbound-nat-rules.md) is the legacy approach for assigning an Azure Load Balancer’s frontend port to each backend instance. Rules are applied to the backend instance’s network interface card (NIC). For Azure Virtual Machine Scale Sets (VMSS) instances, inbound NAT rules are automatically created/deleted as new instances are scaled up/down. For VMSS instanes use the `Inbound NAT Pool` property to manage Inbound NAT rules version 1. 
 
 ## NAT rule version 2 
 

articles/storage/.openpublishing.redirection.storage.json

@@ -490,6 +490,16 @@
             "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-xamarin",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/storage/blobs/sas-service-create-dotnet-container.md",
+            "redirect_url": "/azure/storage/blobs/sas-service-create-dotnet",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/storage/blobs/storage-blob-container-user-delegation-sas-create-dotnet.md",
+            "redirect_url": "/azure/storage/blobs/storage-blob-user-delegation-sas-create-dotnet",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/storage/common/authorize-active-directory-cli.md",
             "redirect_url": "/azure/storage/common/authorize-data-operations-cli",

articles/storage/blobs/TOC.yml

@@ -585,6 +585,14 @@ items:
               href: /dotnet/azure/sdk/authentication-azure-hosted-apps?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
             - name: Auth from on-premises apps
               href: /dotnet/azure/sdk/authentication-on-premises-apps?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
+          - name: Shared access signature (SAS)
+            items:
+            - name: Authorize using a user delegation SAS
+              href: storage-blob-user-delegation-sas-create-dotnet.md
+            - name: Authorize using a service SAS
+              href: sas-service-create-dotnet.md
+            - name: Authorize using an account SAS
+              href: ../common/storage-account-sas-create-dotnet.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
         - name: Container actions
           items:
           - name: Create a container
@@ -597,14 +605,6 @@ items:
             href: storage-blob-container-lease.md
           - name: Manage properties and metadata
             href: storage-blob-container-properties-metadata.md
-          - name: Generate a shared access signature (SAS)
-            items:
-            - name: Create a user delegation SAS for a container
-              href: storage-blob-container-user-delegation-sas-create-dotnet.md
-            - name: Create a service SAS for a container
-              href: sas-service-create-dotnet-container.md
-            - name: Create an account SAS
-              href: ../common/storage-account-sas-create-dotnet.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
         - name: Blob actions
           items:
           - name: Upload blobs
@@ -635,14 +635,6 @@ items:
             href: versions-manage-dotnet.md
           - name: Set or change a blob's access tier
             href: storage-blob-use-access-tier-dotnet.md
-          - name: Generate a shared access signature (SAS)
-            items:
-            - name: Create a user delegation SAS for a blob
-              href: storage-blob-user-delegation-sas-create-dotnet.md
-            - name: Create a service SAS for a blob
-              href: sas-service-create-dotnet.md
-            - name: Create an account SAS
-              href: ../common/storage-account-sas-create-dotnet.md?toc=/azure/storage/blobs/toc.json&bc=/azure/storage/blobs/breadcrumb/toc.json
         - name: Append blob actions
           items:
           - name: Append data to an append blob