Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-pim-integration-conversion-powershell

Author: rolyon

articles/azure-sql-edge/configure.md

@@ -185,11 +185,11 @@ Your Azure SQL Edge configuration changes and database files are persisted in th
 The first option is to mount a directory on your host as a data volume in your container. To do that, use the `docker run` command with the `-v <host directory>:/var/opt/mssql` flag. This allows the data to be restored between container executions.
 
 ```bash
-docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
+docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
 ```
 
 ```PowerShell
-docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>" -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
+docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<password>" -p 1433:1433 -v <host directory>/data:/var/opt/mssql/data -v <host directory>/log:/var/opt/mssql/log -v <host directory>/secrets:/var/opt/mssql/secrets -d mcr.microsoft.com/azure-sql-edge
 ```
 
 This technique also enables you to share and view the files on the host outside of Docker.
@@ -205,11 +205,11 @@ This technique also enables you to share and view the files on the host outside
 The second option is to use a data volume container. You can create a data volume container by specifying a volume name instead of a host directory with the `-v` parameter. The following example creates a shared data volume named **sqlvolume**.
 
 ```bash
-docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>' -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
+docker run -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
 ```
 
 ```PowerShell
-docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong!Passw0rd>" -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
+docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<password>" -p 1433:1433 -v sqlvolume:/var/opt/mssql -d mcr.microsoft.com/azure-sql-edge
 ```
 
 > [!NOTE]

articles/azure-sql-edge/deploy-kubernetes.md

@@ -71,7 +71,7 @@ Create an SA password in the Kubernetes cluster. Kubernetes can manage sensitive
 The following command creates a password for the SA account:
 
    ```azurecli
-   kubectl create secret generic mssql --from-literal=MSQL_SA_PASSWORD="MyC0m9l&xP@ssw0rd" -n <namespace name>
+   kubectl create secret generic mssql --from-literal=MSQL_SA_PASSWORD="<password>" -n <namespace name>
    ```
 
    Replace `MyC0m9l&xP@ssw0rd` with a complex password.

articles/azure-sql-edge/troubleshoot.md

@@ -63,7 +63,7 @@ If the SQL Edge container fails to run, try the following tests:
 - If you get an error such as `failed to create endpoint CONTAINER_NAME on network bridge. Error starting proxy: listen tcp 0.0.0.0:1433 bind: address already in use.`, you're attempting to map the container port 1433 to a port that is already in use. This can happen if you're running SQL Edge locally on the host machine. It can also happen if you start two SQL Edge containers and try to map them both to the same host port. If this happens, use the `-p` parameter to map the container port 1433 to a different host port. For example:
 
   ```bash
-  sudo docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=1' -e 'MSSQL_SA_PASSWORD=yourStrong(!)Password' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge-developer.
+  sudo docker run --cap-add SYS_PTRACE -e 'ACCEPT_EULA=1' -e 'MSSQL_SA_PASSWORD=<password>' -p 1433:1433 --name azuresqledge -d mcr.microsoft.com/azure-sql-edge-developer.
   ```
 
 - If you get an error such as `Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Get http://%2Fvar%2Frun%2Fdocker.sock/v1.30tdout=1&tail=all: dial unix /var/run/docker.sock: connect: permission denied` when trying to start a container, then add your user to the docker group in Ubuntu. Then sign out and sign back in again, as this change affects new sessions.

articles/cost-management-billing/manage/direct-ea-billing-invoice-documents.md

@@ -120,11 +120,11 @@ The transactions file is a CSV file that includes the same information as the in
 | Extended Amount | The quantity multiplied by the unit price. |
 | Commitment Usage | The amount of monetary commitment that has been used. |
 | Net Amount | The extended amount minus the commitment usage. |
-| Tax Rate | The tax rate applicable to the product based on the country of billing. |
+| Tax Rate | The tax rate applicable to the product based on the country/region of billing. |
 | Tax Amount | The net amount multiplied by tax rate. |
 | Total | The sum of the net amount and tax amount. |
 | Is Third Party | Indicates whether the product or service is a third-party product. |
 
 ## Related content
 
-- Learn how to download your Direct EA billing invoice documents at [View your Azure usage summary details and download reports for direct EA enrollments](direct-ea-azure-usage-charges-invoices.md).
+- Learn how to download your Direct EA billing invoice documents at [View your Azure usage summary details and download reports for direct EA enrollments](direct-ea-azure-usage-charges-invoices.md).

articles/databox/data-box-deploy-export-ordered.md

@@ -68,7 +68,7 @@ Perform the following steps in the Azure portal to order a device.
     |Subscription     | Select an EA, CSP, or Azure sponsorship subscription for Data Box service. <br> The subscription is linked to your billing account.       |
     |Resource group     |    Select an existing resource group. <br> A resource group is a logical container for the resources that can be managed or deployed together.         |
     |Source Azure region    |    Select the Azure region where your data currently is.         |
-    |Destination country     |     Select the country where you want to ship the device.        |
+    |Destination country     |     Select the country/region where you want to ship the device.        |
 
    ![Select your Data Box settings](media/data-box-deploy-export-ordered/azure-data-box-export-order-data-box-settings.png)
 

articles/databox/data-box-deploy-ordered.md

@@ -229,7 +229,7 @@ To order a device, perform the following steps:
    |street-address2| The secondary address information, such as apartment number or building number. | "Building 123" |
    |city| The city to which the device is shipped. | "Redmond" |
    |state-or-province| The state to which the device is shipped.| "WA" |
-   |country| The country to which the device is shipped. | "United States" |
+   |country| The country/region to which the device is shipped. | "United States" |
    |postal-code| The zip code or postal code associated with the shipping address.| "98052"|
    |company-name| The name of your company you work for.| "Contoso, LTD" |
    |storage account| The Azure Storage account from where you want to import data.| "mystorageaccount"|
@@ -243,7 +243,7 @@ To order a device, perform the following steps:
 2. In your command-prompt of choice or terminal, run [az data box job create](/cli/azure/databox/job#az-databox-job-create) to create your Azure Data Box order.
 
    ```azurecli
-   az databox job create --resource-group <resource-group> --name <order-name> --location <azure-location> --sku <databox-device-type> --contact-name <contact-name> --phone <phone-number> --email-list <email-list> --street-address1 <street-address-1> --street-address2 <street-address-2> --city "contact-city" --state-or-province <state-province> --country <country> --postal-code <postal-code> --company-name <company-name> --storage-account "storage-account"
+   az databox job create --resource-group <resource-group> --name <order-name> --location <azure-location> --sku <databox-device-type> --contact-name <contact-name> --phone <phone-number> --email-list <email-list> --street-address1 <street-address-1> --street-address2 <street-address-2> --city "contact-city" --state-or-province <state-province> --country <country/region> --postal-code <postal-code> --company-name <company-name> --storage-account "storage-account"
    ```
 
    The following sample command illustrates the command's usage:
@@ -349,7 +349,7 @@ Do the following steps using Azure PowerShell to order a device:
     |StreetAddress3| The tertiary address information. | |
     |City [Required]| The city to which the device is shipped. | "Redmond" |
     |StateOrProvinceCode [Required]| The state to which the device is shipped.| "WA" |
-    |CountryCode [Required]| The country to which the device is shipped. | "United States" |
+    |CountryCode [Required]| The country/region to which the device is shipped. | "United States" |
     |PostalCode [Required]| The zip code or postal code associated with the shipping address.| "98052"|
     |CompanyName| The name of your company you work for.| "Contoso, LTD" |
     |StorageAccountResourceId [Required]| The Azure Storage account ID from where you want to import data.| &lt;AzstorageAccount&gt;.id |

articles/databox/data-box-disk-faq.yml

@@ -60,7 +60,7 @@ sections:
           Data Box Disk is supported for all regions within US, Canada, EU, UK, Australia, Singapore, India, China, Hong Kong Special Administrative Region, Japan, Korea, and South Africa. Only the Azure public cloud regions are supported. The Azure Government or other sovereign clouds aren't supported.
 
       - question: |
-          How can I import source data present at my location in one country/region to an Azure region in a different country?
+          How can I import source data present at my location in one country/region to an Azure region in a different country/region?
         answer: |
           Data Box Disk supports data ingestion only within the same country/region as their destination and won't cross any international borders. The only exception is for orders in the European Union (EU), where Data Box Disks can ship to and from any EU country or region.
           
@@ -92,12 +92,12 @@ sections:
       - question: |
           Does my Data Box Disk region have to be in the same Azure region as my destination storage account?
         answer: |
-          No. The Data Box Disk resource doesn't need to be the same as the storage account region where you want to transfer data. You can choose a storage account in any region within the country or commerce boundary selected during the order. The Data Box Disk region is only used to deploy the resource during order creation. This is fixed for each country or commerce boundary and can't be changed.
+          No. The Data Box Disk resource doesn't need to be the same as the storage account region where you want to transfer data. You can choose a storage account in any region within the country/region or commerce boundary selected during the order. The Data Box Disk region is only used to deploy the resource during order creation. This is fixed for each country/region or commerce boundary and can't be changed.
           
       - question: |
           How can I recover my data if an entire region fails?
         answer: |
-          In extreme circumstances where a region is lost because of a significant disaster, Microsoft might initiate a regional failover. No action on your part is required in this case. Your order is fulfilled through the failover region if it is within the same country or commerce boundary. However, some Azure regions don't have a paired region in the same geographic or commerce boundary. If there is a disaster in any of those regions, you will need to create the Data Box order again from a different region that is available, and copy the data to Azure in the new region. For more information, see [Cross-region replication in Azure: Business continuity and disaster recovery](../availability-zones/cross-region-replication-azure.md).
+          In extreme circumstances where a region is lost because of a significant disaster, Microsoft might initiate a regional failover. No action on your part is required in this case. Your order is fulfilled through the failover region if it is within the same country/region or commerce boundary. However, some Azure regions don't have a paired region in the same geographic or commerce boundary. If there is a disaster in any of those regions, you will need to create the Data Box order again from a different region that is available, and copy the data to Azure in the new region. For more information, see [Cross-region replication in Azure: Business continuity and disaster recovery](../availability-zones/cross-region-replication-azure.md).
           
       - question: |
           Whom should I contact if I encounter any issues  with Data Box Disks?

articles/databox/data-box-faq.yml

@@ -56,11 +56,11 @@ sections:
 
           ### Does my Data Box region have to be in the same Azure region as my destination storage account?
 
-          No. The Data Box resource does not need to be the same as the storage account region where you want to transfer data. You can choose a storage account in any region within the country or commerce boundary selected during the order. The Data Box region is only used to deploy the resource during order creation. This is fixed for each country or commerce boundary and cannot be changed.
+          No. The Data Box resource does not need to be the same as the storage account region where you want to transfer data. You can choose a storage account in any region within the country/region or commerce boundary selected during the order. The Data Box region is only used to deploy the resource during order creation. This is fixed for each country/region or commerce boundary and cannot be changed.
 
           ### How can I recover my data if an entire region fails?
 
-          In extreme circumstances where a region is lost because of a significant disaster, Microsoft may initiate a regional failover. No action on your part is required in this case. Your order will be fulfilled through the failover region if it is within the same country or commerce boundary. However, some Azure regions don't have a paired region in the same geographic or commerce boundary. If there is a disaster in any of those regions, you will need to create the Data Box order again from a different region that is available, and copy the data to Azure in the new region. For more information, see [Business continuity and disaster recovery (BCDR): Azure Paired Regions](../best-practices-availability-paired-regions.md).
+          In extreme circumstances where a region is lost because of a significant disaster, Microsoft may initiate a regional failover. No action on your part is required in this case. Your order will be fulfilled through the failover region if it is within the same country/region or commerce boundary. However, some Azure regions don't have a paired region in the same geographic or commerce boundary. If there is a disaster in any of those regions, you will need to create the Data Box order again from a different region that is available, and copy the data to Azure in the new region. For more information, see [Business continuity and disaster recovery (BCDR): Azure Paired Regions](../best-practices-availability-paired-regions.md).
 
           ### Who should I contact if I come across any issues with Data Box?
 
@@ -113,11 +113,11 @@ sections:
 
           ### I ordered a couple of Data Box devices. I can't create any additional orders. Why?
 
-          We allow a maximum of five active orders per subscription per commerce boundary (combination of country and region selected) for any Data Box product. You can have five active Data Box orders and five active Data Box Heavy orders. If you need to order an additional device, contact Microsoft Support to increase the limit for your subscription. 
+          We allow a maximum of five active orders per subscription per commerce boundary (combination of country/region and region selected) for any Data Box product. You can have five active Data Box orders and five active Data Box Heavy orders. If you need to order an additional device, contact Microsoft Support to increase the limit for your subscription. 
 
           ### When I try to create an order, I receive a notification that the Data Box service is not available. What does this mean?
 
-          The Data Box service isn't available for the combination of country and region you selected for the selected product - either Data Box or Data Box Heavy. Changing this combination would likely allow you to avail of the Data Box service. For a list of the regions where the service is available, go to [Region availability for Data Box](data-box-overview.md#region-availability) or [Region availability for Data Box Heavy](data-box-heavy-overview.md#region-availability).
+          The Data Box service isn't available for the combination of country/region and region you selected for the selected product - either Data Box or Data Box Heavy. Changing this combination would likely allow you to avail of the Data Box service. For a list of the regions where the service is available, go to [Region availability for Data Box](data-box-overview.md#region-availability) or [Region availability for Data Box Heavy](data-box-heavy-overview.md#region-availability).
 
           ### My Data Box is dispatched, but now I want to cancel this order. Why is the cancel button not available?
 

articles/databox/data-box-heavy-overview.md

@@ -56,13 +56,13 @@ Data Box Heavy is designed to move massive amounts of data to Azure with little
 
 Previous releases of Data Box, Data Box Disk, and Data Box Heavy didn’t support cross-region data transfer. With the exception of transfers both originating and terminating between the United Kingdom (UK) and the European Union (EU), data couldn’t cross commerce boundaries.
 
-Data Box cross-region data transfer capabilities, now in preview, support offline seamless cross-region data transfers between many regions. This capability allows you to copy your data from a local source and transfer it to a destination within a different country, region, or boundary. It's important to note that the Data Box device isn't shipped across commerce boundaries. Instead, it's transported to an Azure data center within the originating country or region. Data transfer between the source country and the destination region takes place using the Azure network and incurs no additional cost.
+Data Box cross-region data transfer capabilities, now in preview, support offline seamless cross-region data transfers between many regions. This capability allows you to copy your data from a local source and transfer it to a destination within a different country, region, or boundary. It's important to note that the Data Box device isn't shipped across commerce boundaries. Instead, it's transported to an Azure data center within the originating country or region. Data transfer between the source country/region and the destination region takes place using the Azure network and incurs no additional cost.
 
 Although cross-region data transfer doesn't incur additional costs, the functionality is currently in preview and subject to change. Note, too, that some data transfer scenarios take place over large geographic areas. Higher than normal latencies might be encountered during such transfers.
 
 Cross-region transfers are currently supported between the following countries and regions:
 
-| Source Country |  Destination Region |
+| Source Country/Region |  Destination Region |
 |----------------|---------------------|
 | US<sup>1</sup> | EU<sup>2</sup>      |
 | EU<sup>2</sup> | US<sup>1</sup>      |