Merge pull request #284210 from MicrosoftDocs/repo_sync_working_branch

PhilKang0704 · web-flow · commit 46b7b6c84b34 · 2024-08-12T13:08:22.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/azure-functions/functions-app-settings.md b/articles/azure-functions/functions-app-settings.md
@@ -22,7 +22,7 @@ When using app settings, you should be aware of the following considerations:
 
 + Changes to function app settings require your function app to be restarted.
 
-+ In setting names, double-underscore (`__`) and semicolon (`:`) are considered reserved values. Double-underscores are interpreted as hierarchical delimiters on both Windows and Linux, and colons are interpreted in the same way only on Linux. For example, the setting `AzureFunctionsWebHost__hostid=somehost_123456` would be interpreted as the following JSON object:
++ In setting names, double-underscore (`__`) and colon (`:`) are considered reserved values. Double-underscores are interpreted as hierarchical delimiters on both Windows and Linux, and colons are interpreted in the same way only on Linux. For example, the setting `AzureFunctionsWebHost__hostid=somehost_123456` would be interpreted as the following JSON object:
 
     ```json
     "AzureFunctionsWebHost": {
diff --git a/articles/cost-management-billing/manage/subscription-disabled.md b/articles/cost-management-billing/manage/subscription-disabled.md
@@ -43,14 +43,12 @@ To resolve the issue, [switch to a different credit card](change-credit-card.md)
 
 If you're the Account Administrator or subscription Owner and you canceled a pay-as-you-go subscription, you can reactivate it in the Azure portal.
 
-If you're a billing administrator (partner billing administrator or Enterprise Administrator), you might not have the required permission to reactive the subscription. If this situation applies to you, contact the Account Administrator, or subscription Owner and ask them to reactivate the subscription.
-
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Go to Subscriptions and then select the canceled subscription.
 1. Select **Reactivate**.  
     :::image type="content" source="./media/subscription-disabled/reactivate-sub.png" alt-text="Screenshot that shows Confirm reactivation." :::
 
-For other subscription types, [contact support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade) to have your subscription reactivated.
+For other subscription types (for example, Enterprise Subscription), [contact support](https://portal.azure.com/?#blade/Microsoft_Azure_Support/HelpAndSupportBlade) to have your subscription reactivated.
 
 ## After reactivation
 
diff --git a/articles/cost-management-billing/reservations/view-reservations.md b/articles/cost-management-billing/reservations/view-reservations.md
@@ -137,7 +137,7 @@ When you use the PowerShell script to assign the ownership role and it runs succ
 [User Access Administrator](../../role-based-access-control/built-in-roles.md#user-access-administrator) rights are required before you can grant users or groups the Reservations Administrator and Reservations Reader roles at the tenant level. In order to get User Access Administrator rights at the tenant level, follow [Elevate access](../../role-based-access-control/elevate-access-global-admin.md) steps.
 
 ### Add a Reservations Administrator role or Reservations Reader role at the tenant level
-You can assign these roles from the [Azure portal](https://portal.azure.com).
+Only Global Administrators can assign these roles from the [Azure portal](https://portal.azure.com).
 
 1. Sign in to the Azure portal and navigate to **Reservations**.
 1. Select a reservation that you have access to.
diff --git a/articles/oracle/oracle-db/faq-oracle-database-azure.md b/articles/oracle/oracle-db/faq-oracle-database-azure.md
@@ -10,7 +10,7 @@ ms.custom: engagement-fy24
 ---
 
 # Oracle Database@Azure FAQs
-This article answers frequently asked questions (FAQs) about the Oracle Database@Azure partnership with Microsoft.
+This article answers frequently asked questions (FAQs) about the Oracle Database@Azure offering.
 
 ## General
 In this section, we cover general questions about Oracle Database@Azure.
@@ -22,7 +22,7 @@ Oracle Database@Azure is enabled by hosting OCI’s infrastructure in Azure and
 
 - Oracle Database@Azure: Oracle Database@Azure (Oracle Database Service for Azure) is hosted on OCI’s infrastructure in Azure datacenters enabling you to host your mission critical Oracle databases closer to your application tier hosted in Azure. Azure virtual network integration with subnet delegation enables private IPs from customer virtual network to serve as database endpoints. This solution is Oracle managed and supported service in Azure.
 
-- Oracle on Azure VMs: You can also deploy and self-manage your Oracle workloads on Azure VMs. Specifically, workloads that don't require features like RAC, Smart Scan or Exadata, performance are best suited for this operation.
+- Oracle on Azure VMs: You can also deploy and self-manage your Oracle workloads on Azure VMs. Specifically, workloads that don't require features like RAC, Smart Scan or Exadata performance are best suited for this operation.
 
 - OCI Interconnect: OCI interconnect is used to connect your Oracle deployments in OCI with Applications and services in Azure over OCI FastConnect and Azure ExpressRoute. This typically suits workloads/solutions that can work with the high latency envelope, have dependency on services, features, and functionalities running in both clouds.
 
@@ -40,34 +40,34 @@ Oracle versions supported on Oracle Cloud Infrastructure (OCI) are supported on
 
 ### Do you have any documented benchmark latency-wise between Azure resources and Oracle Database@Azure?
 
-Latency between Azure resources and Oracle Database@Azure is within the Azure regional latency envelope as the Exadata infrastructure is within the Azure Data Centers. Latency can be further fine-tuned dependent on Co-Location within Availability Zones.
+Latency between Azure resources and Oracle Database@Azure is within the Azure regional latency envelope as the Exadata infrastructure is within the Azure Data Centers. Latency can be further fine-tuned dependent on colocation within availability zones. For more information, see [What are availability zones?](/azure/reliability/availability-zones-overview?tabs=azure-cli).
 
 ### Does Oracle Database@Azure support deploying Base Database (BD), or do I need to migrate to Autonomous Database service?
 
 No, Base Database isn't currently supported with Oracle Database@Azure. You can deploy single instance self-managed databases on Azure VMs or if you need Oracle managed databases with RAC, we recommend Autonomous Databases via Oracle Database@Azure. For more information, see [Autonomous Database | Oracle](https://www.oracle.com/cloud/azure/oracle-database-at-azure/) and [Provision Oracle Autonomous Databases | Microsoft Learn](/training/modules/migrate-oracle-workload-azure-odaa/).
 
-### For the Oracle Database@Azure service, will the automated DBCS DR use Azure backbone or the OCI backbone?
+### For the Oracle Database@Azure service, will the automated DR use Azure backbone or the OCI backbone?
 
 BCDR is enabled using the OCI managed offering (Backup and Data Guard) and will use the Azure-OCI backbone.
 
 ### How many database servers can be deployed in each rack of Oracle Database@Azure? Is there flexibility in terms of being able to scale up and down as needed from both the consumption and licensing perspective?
 
-Oracle Database@Azure currently runs on X9M hardware and provides a configuration of a minimum of two database servers and three Storage servers. This constitutes a quarter rack configuration. This configuration can be increased to a limit of 32 database servers and 64 Storage servers. You can scale up and down as needed within the Exadata system depending on your SKU. For more information about configurations, see [Oracle Exadata Database Service on Dedicated Infrastructure Description](https://docs.oracle.com/en-us/iaas/exadatacloud/exacs/exa-service-desc.html#ECSCM-GUID-EC1A62C6-DDA1-4F39-B28C-E5091A205DD3). For more specifics, see [Oracle Exadata Cloud Infrastructure X9M Data Sheet](https://www.oracle.com/a/ocom/docs/engineered-systems/exadata/exadata-cloud-infrastructure-x9m-ds.pdf).
+Oracle Database@Azure currently runs on X9M hardware and provides a configuration of a minimum of two database servers and three Storage servers. This constitutes a quarter rack configuration. This configuration can be increased to a limit of 32 database servers and 64 Storage servers. You can scale up and down as needed within the Exadata system depending on your SKU. For more information about configurations, see [Oracle Exadata Database Service on Dedicated Infrastructure Description](https://docs.oracle.com/iaas/exadatacloud/exacs/exa-service-desc.html#ECSCM-GUID-EC1A62C6-DDA1-4F39-B28C-E5091A205DD3). For more specifics, see [Oracle Exadata Cloud Infrastructure X9M Data Sheet](https://www.oracle.com/a/ocom/docs/engineered-systems/exadata/exadata-cloud-infrastructure-x9m-ds.pdf).
 
 ### What Oracle applications are supported to run on Azure?
 
 Various Oracle applications are authorized and supported to be run on Azure. For more information, see [Oracle programs are eligible for Authorized Cloud Environments](https://www.oracle.com/us/corporate/pricing/authorized-cloud-environments-3493562.pdf).
 
 ### What are the available Service Level Agreements (SLAs)?
 
-For detailed Service Level Agreements, refer to the Oracle PaaS and IaaS Public Cloud Services Pillar Document.
+For detailed Service Level Agreements, refer to the Oracle PaaS and IaaS Public Cloud Services [Pillar Document](https://www.oracle.com/contracts/docs/paas_iaas_pub_cld_srvs_pillar_4021422.pdf?download=false).
 
 ## Billing and Commerce
 In this section, we cover questions related to billing and commerce for Oracle Database@Azure.
 
 ### How much will Oracle Database@Azure cost?
 
-Oracle Database@Azure is at parity with the Exadata Cloud costs in OCI. For list prices, refer to OCI’s Cloud Cost Estimator (oracle.com). For your specific costs tailored to your needs, work with your Oracle sales team.
+Oracle Database@Azure is at parity with the Exadata Cloud costs in OCI. For list prices, refer to [OCI’s Cloud Cost Estimator](https://www.oracle.com/cloud/costestimator.html). For your specific costs tailored to your needs, work with your Oracle sales team.
 
 ### Is Oracle Database@Azure eligible for MACC (Microsoft Azure Commit to Consume)?
 
@@ -77,10 +77,6 @@ Yes, the Oracle Database@Azure offering is Azure benefits eligible and hence eli
 
 You can Bring Your Own License (BYOL) or provision License included Oracle databases with Oracle Database@Azure.
 
-### Can we utilize multi-tenancy billing ID across different regions?
-
-The billing account ID used to target the private offer to a specific customer doesn't constrain where the service can be deployed.
-
 ### Can I procure Oracle Database@Azure even if the service isn't available in my region?
 
 You can purchase the Oracle Database@Azure anytime as it's Generally Available in multiple regions. However, you can only deploy the service in the region of your choice once it's live.
@@ -97,15 +93,15 @@ Ingress and Egress for managed services is via Azure OCI backbone and doesn't in
 In this section, we'll cover questions related to onboarding, provisioning, and migration to Oracle Database@Azure.
 ### To set up Oracle Database@Azure, what would be the role assignments needed for the Azure user?
 
-You can find the list of role assignments here.
+See [Groups and roles for Oracle Database@Azure](/azure/oracle/oracle-db/oracle-database-groups-roles) for the list of role assignments. 
 
 ### Can you describe the authentication/authorization standards supported by Oracle Database@Azure?
 
 Oracle Database@Azure is based on SAML and OpenID standards. OCI Oracle Identity and Access Management (IAM) can be federated with Microsoft Entra ID, or other customer used identity providers for OCI Console access for Oracle Database Users.
 
 ### Where can I find best practices to plan and deploy Oracle Database@Azure?
 
-Refer to our landing zone architecture documentation to plan and deploy your oracle workloads with Oracle Database@Azure here.
+To plan and deploy your oracle workloads with Oracle Database@Azure, refer to the [landing zone architecture documentation](/azure/cloud-adoption-framework/scenarios/oracle-iaas/?wt.mc_id=knwlserapi_inproduct_azportal#landing-zone-architecture-for-oracle-databaseazure).
 
 ### Does Azure have any tools to assist with understanding Oracle database sizing, license usage and TCO for both Oracle Database@Azure and Oracle IaaS?
 
@@ -115,7 +111,7 @@ For Oracle Database on Azure VMs, we currently have the Oracle Migration Assista
 
 ### What tools can be used for database migration? Could you help share other details about licensing and charges for these tools?
 
-There are multiple tools available from Oracle: ZDM, Data Guard, Data pump, GoldenGate, and more. For more information, contact your Oracle representative for commercials.
+There are multiple tools available from Oracle: ZDM, Data Guard, Data pump, GoldenGate, and more. For more information, see[Migrate Oracle workloads to Azure](/azure/cloud-adoption-framework/scenarios/oracle-iaas/oracle-migration-planning?wt.mc_id=knwlserapi_inproduct_azportal#migrate-oracle-workloads-to-azure). Contact your Oracle representative for commercials.
 
 ### When using Oracle GoldenGate for migration, do I need to purchase a GoldenGate license?
 
@@ -149,7 +145,7 @@ Oracle will manage and host the data on Oracle Cloud Infrastructure hosted in Az
 
 In case you enable backup to Azure, that data reside in the respective Azure storage – Azure NetApp Files, Blob storage.
 
-We ensure compliance with both companies’ data privacy and compliance policies through physical isolation of systems within Azure datacenters and access enforced assignment policies. For more information on compliance, refer to [Overview - Oracle Database@Azure | Microsoft Learn](database-overview.md) or Oracle compliance website.
+We ensure compliance with both companies’ data privacy and compliance policies through physical isolation of systems within Azure datacenters and access enforced assignment policies. For more information on compliance, refer to [Overview - Oracle Database@Azure | Microsoft Learn](database-overview.md) or [Oracle compliance website](https://docs.oracle.com/iaas/Content/multicloud/compliance.htm).
 
 ### How is data security managed? Is the data encrypted in transit and at rest?
 
diff --git a/articles/postgresql/flexible-server/generative-ai-semantic-search.md b/articles/postgresql/flexible-server/generative-ai-semantic-search.md
@@ -17,7 +17,7 @@ ms.custom:
 
 [!INCLUDE [applies-to-postgresql-flexible-server](~/reusable-content/ce-skilling/azure/includes/postgresql/includes/applies-to-postgresql-flexible-server.md)]
 
-This hands-on tutorial shows you how to build a semantic search application using Azure Database for PostgreSQL flexible server and Azure OpenAI service. Semantic search does searches based on semantics; standard lexical search does searches based on keywords provided in a query. For example, your recipe dataset might not contain labels like gluten-free, vegan, dairy-free, fruit-free or dessert but these characteristics can be deduced from the ingredients. The idea is to issue such semantic queries and get relevant search results.
+This hands-on tutorial shows you how to build a semantic search application using Azure Database for PostgreSQL flexible server and Azure OpenAI Service. Semantic search does searches based on semantics; standard lexical search does searches based on keywords provided in a query. For example, your recipe dataset might not contain labels like gluten-free, vegan, dairy-free, fruit-free or dessert but these characteristics can be deduced from the ingredients. The idea is to issue such semantic queries and get relevant search results.
 
 Building semantic search capability on your data using GenAI and Flexible Server involves the following steps:
 >[!div class="checklist"]
@@ -35,7 +35,7 @@ Building semantic search capability on your data using GenAI and Flexible Server
 1. Grant access to Azure OpenAI in the desired subscription.
 1. Grant permissions to [create Azure OpenAI resources and to deploy models](../../ai-services/openai/how-to/role-based-access-control.md). 
 
-[Create and deploy an Azure OpenAI service resource and a model](../../ai-services/openai/how-to/create-resource.md), deploy the embeddings model [text-embedding-ada-002](../../ai-services/openai/concepts/models.md#embeddings-models). Copy the deployment name as it is needed to create embeddings.
+[Create and deploy an Azure OpenAI Service resource and a model](../../ai-services/openai/how-to/create-resource.md), deploy the embeddings model [text-embedding-ada-002](../../ai-services/openai/concepts/models.md#embeddings-models). Copy the deployment name as it is needed to create embeddings.
 
 ## Enable the `azure_ai` and `pgvector` extensions
 
diff --git a/articles/virtual-machines/workloads/oracle/oracle-migration.md b/articles/virtual-machines/workloads/oracle/oracle-migration.md
@@ -1,7 +1,7 @@
 ---
 title: Migrate Oracle workloads to Azure VMs
 description: Learn how to migrate Oracle workloads to Azure VMs.
-author: suzizuber
+author: suzuber
 ms.author: v-suzuber
 ms.service: oracle-on-azure
 ms.topic: article
@@ -16,7 +16,7 @@ This article shows how to move your Oracle workload from your on-premises enviro
 
 ## Discovery
 
-Migration begins with a detailed assessment of the Oracle product portfolio. The current infrastructure that supports Oracle database and apps, database versions, and types of applications that use Oracle database are: Oracle ([EBS](https://www.oracle.com/in/applications/ebusiness/), [Siebel](https://www.oracle.com/in/cx/siebel/), [People Soft](https://www.oracle.com/in/applications/peoplesoft/), [JDE](https://www.oracle.com/in/applications/jd-edwards-enterpriseone/), and others) and non-Microsoft partner offerings like [SAP](https://pages.community.sap.com/topics/oracle) or custom applications. The existing Oracle database can operate on servers, Oracle Real Application Clusters (RAC), or non-Microsoft partner RAC. For applications, we need to discover size of infrastructure that can be done easily by using Azure Migrate based discovery. For database, the approach is to get allowed with restrictions (AWR) reports on peak load to move on to design steps. 
+Migration begins with a detailed assessment of the Oracle product portfolio. The current infrastructure that supports Oracle database and apps, database versions, and types of applications that use Oracle database are: Oracle ([EBS](https://www.oracle.com/in/applications/ebusiness/), [Siebel](https://www.oracle.com/in/cx/siebel/), [People Soft](https://www.oracle.com/in/applications/peoplesoft/), [JDE](https://www.oracle.com/in/applications/jd-edwards-enterpriseone/), and others) and non-Microsoft partner offerings like [SAP](https://pages.community.sap.com/topics/oracle) or custom applications. The existing Oracle database can operate on servers, Oracle Real Application Clusters (RAC), or non-Microsoft partner RAC. For applications, we need to discover size of infrastructure that can be done easily by using Azure Migrate based discovery. For database, the approach is to get allowed with restrictions Automatic Workload repository (AWR) reports on peak load to move on to design steps. 
 
 ## Design 
 
