Merge pull request #25849 from MashaMSFT/fixes

fixing Git Issues

Author: v-dirichards

azure-sql/database/active-geo-replication-configure-portal.md

@@ -151,8 +151,6 @@ This operation permanently stops the replication to the secondary database, and
 1. In the [Azure portal](https://portal.azure.com), browse to the primary database in the geo-replication partnership.
 2. Select **Replicas**.
 3. In the **Geo replicas** list, select the database you want to remove from the geo-replication partnership, select the ellipsis, and then select **Stop replication**.
-
-    :::image type="content" source="./media/active-geo-replication-configure-portal/azure-portal-select-stop-replication.png" alt-text="Screenshot that shows selecting stop replication from the drop-down.":::
 5. A confirmation window opens. Click **Yes** to remove the database from the geo-replication partnership. (Set it to a read-write database not part of any replication.)
 
 # [Azure CLI](#tab/azure-cli)

azure-sql/database/elastic-jobs-overview.md

@@ -15,9 +15,9 @@ ms.custom:
 # Create, configure, and manage elastic jobs (preview)
 [!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
 
-In this article, you will learn how to create, configure, and manage elastic jobs.
+In this article, you'll learn how to create, configure, and manage elastic jobs.
 
-If you have not used Elastic jobs, [learn more about the job automation concepts in Azure SQL Database](job-automation-overview.md).
+If you haven't used Elastic jobs, [learn more about the job automation concepts in Azure SQL Database](job-automation-overview.md).
 
 ## Create and configure the agent
 
@@ -46,9 +46,10 @@ Setting up the proper credentials to run a job can be a little confusing, so kee
 
 - The database scoped credentials must be created in the *Job database*.
 - **All target databases must have a login with [sufficient permissions](/sql/relational-databases/security/permissions-database-engine) for the job to complete successfully** (`jobuser` in the diagram below).
+- Credentials created in target databases (LOGIN and PASSWORD for `masteruser` and `jobuser` in the subsequent diagram) should match the IDENTITY and SECRET in the credentials created in the Job database. 
 - Credentials can be reused across jobs, and the credential passwords are encrypted and secured from users who have read-only access to job objects.
 
-The following image is designed to assist in understanding and setting up the proper job credentials. **Remember to create the user in every database (all *target user dbs*) the job needs to run**.
+The following image is designed to help understand setting up the proper job credentials. **Remember to create the user in every database (all *target user dbs*) the job needs to run**.
 
 ![Elastic Jobs credentials](./media/elastic-jobs-overview/job-credentials.png)
 
@@ -58,7 +59,7 @@ A few best practice considerations for working with Elastic Jobs:
 
 - Limit usage of the APIs to trusted individuals.
 - Credentials should have the least privileges necessary to perform the job step. For more information, see [Authorization and Permissions](/dotnet/framework/data/adonet/sql/authorization-and-permissions-in-sql-server).
-- When using a server and/or pool target group member, it is highly suggested to create a separate credential with rights on the `master` database to view/list databases that is used to expand the database lists of the server(s) and/or pool(s) prior to the job execution.
+- When using a server and/or pool target group member, it's highly suggested to create a separate credential with rights on the `master` database to view/list databases that is used to expand the database lists of the server(s) and/or pool(s) prior to the job execution.
 
 ## Agent performance, capacity, and limitations
 
@@ -82,18 +83,18 @@ These are the current limitations to the Elastic Jobs service.  We're actively w
 | The Elastic Job agent needs to be recreated and started in the new region after a failover/move to a new Azure region. | The Elastic Jobs service stores all its job agent and job metadata in the jobs database. Any failover or move of Azure resources to a new Azure region will also move the jobs database, job agent and jobs metadata to the new Azure region. However, the Elastic Job agent is a compute only resource and needs to be explicitly re-created and started in the new region before jobs will start executing again in the new region. Once started, the Elastic Job agent will resume executing jobs in the new region as per the previously defined job schedule. |
 | Concurrent jobs limit. | Currently, the preview is limited to 100 concurrent jobs. |
 | Excessive Audit logs from Jobs database | The Elastic Job agent operates by constantly polling the Job database to check for the arrival of new jobs and other CRUD operations. If auditing is enabled on the server that houses a Jobs database, a large amount of audit logs may be generated by the Jobs database. This can be mitigated by filtering out these audit logs using the `Set-AzSqlServerAudit` command with a predicate expression.<BR/><BR/>For example:<BR/> `Set-AzSqlServerAudit -ResourceGroupName "ResourceGroup01" -ServerName "Server01" -BlobStorageTargetState Enabled -StorageAccountResourceId "/subscriptions/7fe3301d-31d3-4668-af5e-211a890ba6e3/resourceGroups/resourcegroup01/providers/Microsoft.Storage/storageAccounts/mystorage" -PredicateExpression "database_principal_name <> '##MS_JobAccount##'"`<BR/><BR/>This command will only filter out Job Agent to Jobs database audit logs, not Job Agent to any target databases audit logs.|
-| Private endpoints are not supported | Elastic Job Agents currently cannot connect to Databases and Elastic Pools which restrict connections to private endpoints.|
+| Private endpoints aren't supported | Elastic Job Agents currently can't connect to Databases and Elastic Pools which restrict connections to private endpoints.|
 | Use of a Hyperscale database as *Job database* | Using a Hyperscale database as a *Job database* isn't supported. However, elastic jobs can target Hyperscale databases in the same way as any other database in Azure SQL Database.|
-| Serverless DBs and auto-pausing with Elastic Jobs. | Auto-pause enabled serverless database is not supported as a *Job Database*. Serverless databases targeted by elastic jobs do support auto-pausing, and will be resumed by job connections. 
+| Serverless DBs and auto-pausing with Elastic Jobs. | Auto-pause enabled serverless database isn't supported as a *Job Database*. Serverless databases targeted by elastic jobs do support auto-pausing, and will be resumed by job connections. 
 
 ## Best practices for creating jobs
 
 Consider the following best practices when working with Elastic Database jobs:
 
 ### Idempotent scripts
-A job's T-SQL scripts must be [idempotent](https://en.wikipedia.org/wiki/Idempotence). **Idempotent** means that if the script succeeds, and it is run again, the same result occurs. A script may fail due to transient network issues. In that case, the job will automatically retry running the script a preset number of times before desisting. An idempotent script has the same result even if its been successfully run twice (or more).
+A job's T-SQL scripts must be [idempotent](https://en.wikipedia.org/wiki/Idempotence). **Idempotent** means that if the script succeeds, and it's run again, the same result occurs. A script may fail due to transient network issues. In that case, the job will automatically retry running the script a preset number of times before desisting. An idempotent script has the same result even if it's been successfully run twice (or more).
 
-A simple tactic is to test for the existence of an object before creating it. A hypothetical example is shown below:
+A simple tactic is to test for the existence of an object before creating it. The following is a hypothetical example:
 
 ```sql
 IF NOT EXISTS (SELECT * FROM sys.objects WHERE [name] = N'some_object')

azure-sql/database/elastic-pool-manage.md

@@ -51,6 +51,7 @@ To create and manage SQL Database elastic pools and pooled databases with Azure
 |[Set-AzSqlElasticPool](/powershell/module/az.sql/set-azsqlelasticpool)|Modifies properties of an elastic pool For example, use the **StorageMB** property to modify the max storage of an elastic pool.|
 |[Remove-AzSqlElasticPool](/powershell/module/az.sql/remove-azsqlelasticpool)|Deletes an elastic pool.|
 |[Get-AzSqlElasticPoolActivity](/powershell/module/az.sql/get-azsqlelasticpoolactivity)|Gets the status of operations on an elastic pool|
+|[Stop-AzSqlElasticPoolActivity](/powershell/module/az.sql/stop-azsqlelasticpoolactivity) | Cancels the asynchronous update operation on an elastic pool. | 
 |[New-AzSqlDatabase](/powershell/module/az.sql/new-azsqldatabase)|Creates a new database in an existing pool or as a single database. |
 |[Get-AzSqlDatabase](/powershell/module/az.sql/get-azsqldatabase)|Gets one or more databases.|
 |[Set-AzSqlDatabase](/powershell/module/az.sql/set-azsqldatabase)|Sets properties for a database, or moves an existing database into, out of, or between elastic pools.|

azure-sql/managed-instance/frequently-asked-questions-faq.yml

@@ -43,7 +43,7 @@ sections:
           
           ### What service tier am I eligible for?
           
-          Any customer is eligible for any service tier. However, if you want to exchange your existing licenses for discounted rates on Azure SQL Managed Instance by using [Azure Hybrid Benefit](https://azure.microsoft.com/pricing/hybrid-benefit/), bear in mind that SQL Server Enterprise Edition customers with Software Assurance are eligible for the [General Purpose](../database/service-tier-general-purpose.md) or [Business Critical](../database/service-tier-business-critical.md) performance tiers and SQL Server Standard Edition customers with Software Assurance are eligible for the General Purpose performance tier only. For more information, see [Specific rights of the AHB](../azure-hybrid-benefit.md?tabs=azure-powershell#what-are-the-specific-rights-of-the-azure-hybrid-benefit-for-sql-server).
+          Any customer is eligible for any service tier. Both Standard and Enterprise editions covered with Software Assurance can be exchanged by using the [Azure Hybrid Benefit](../azure-hybrid-benefit.md) for the General Purpose or Business Critical service tier using the following exchange ratios:  1 Standard edition = 1 General Purpose, 1 Enterprise edition = 1 Business Critical, 1 Enterprise edition = 4 General Purpose, and 4 General Purpose = 1 Enterprise Edition. For more information, see [Specific rights of the AHB](../azure-hybrid-benefit.md?tabs=azure-powershell#what-are-the-specific-rights-of-the-azure-hybrid-benefit-for-sql-server).
           
           ### What subscription types are supported for SQL Managed Instance?
           

azure-sql/managed-instance/recovery-using-backups.md

@@ -197,6 +197,15 @@ For business-critical applications that require large databases and must ensure
 
 For more information about business continuity choices, see [Overview of business continuity](../database/business-continuity-high-availability-disaster-recover-hadr-overview.md).
 
+## Limitations
+
+Consider the following limitations when working with backups and Azure SQL Managed Instance: 
+
+- Geo-restore of a database can only be performed to an instance in the same subscription as the source SQL managed instance. 
+- SQL Managed Instance databases can only be [restored to SQL Server 2022](restore-database-to-sql-server.md) (either on-premises, or on a virtual machine) if the source SQL Managed Instance has enrolled in the [November 2022 feature wave](november-2022-feature-wave-enroll.md).
+- SQL Managed Instance databases are encrypted with TDE by default. To restore your database to an instance other than the source SQL Managed Instance, the target instance must have access to the same key in Azure Key Vault used to encrypt the source database, or you must disable TDE encryption on the source database before taking the backup. 
+
+
 ## Next steps
 
 - [SQL Managed Instance automated backups](automated-backups-overview.md)

azure-sql/media/multi-model-features/image_1.png

@@ -66,7 +66,7 @@ If you have JSON text, you can extract data from JSON or verify that JSON is pro
 - [OPENJSON](/sql/t-sql/functions/openjson-transact-sql): Can transform an array of JSON objects into a set of rows, for more advanced querying and analysis. Any SQL query can be executed on the returned result set. 
 - [FOR JSON](/sql/relational-databases/json/format-query-results-as-json-with-for-json-sql-server): Lets you format data stored in your relational tables as JSON text.
 
-![Diagram that illustrates JSON functions.](./media/multi-model-features/image_1.png)
+![Diagram that illustrates JSON functions.](./media/multi-model-features/json-diagram.png)
 
 For more information, see [How to work with JSON data](database/json-features.md). 
 

azure-sql/media/multi-model-features/json-diagram.png

@@ -95,7 +95,7 @@ Update the following Transact-SQL script for your environment on all SQL Server
 ```SQL
 CREATE ENDPOINT [Hadr_endpoint]
     AS TCP (LISTENER_PORT = **<5022>**)
-    FOR DATA_MIRRORING (
+    FOR DATABASE_MIRRORING (
 	    ROLE = ALL,
 	    AUTHENTICATION = CERTIFICATE dbm_certificate,
 		ENCRYPTION = REQUIRED ALGORITHM AES