fixing conflict

adoc/SLES-SQL-server-linux-docinfo.xml

@@ -88,7 +88,7 @@
 
 <revhistory xml:id="rh-art-sles15-sql-server">
     <revision>
-        <date>2024-11-16</date>
+        <date>2025-02-16</date>
         <revdescription>
             <para> </para>
         </revdescription>

adoc/SLES-SQL-server-linux.adoc

@@ -57,7 +57,7 @@ include::SLES-SQL-support.adoc[tags=mvs-general;mvs-sql]
 
 At first the manual installation for a standalone {sqls} is described by starting at <<man_inst>>.
 
-// The automated installation based on Ansible is decribed in<<ansi_inst>>.
+// The automated installation based on Ansible is described in<<ansi_inst>>.
 
 [id="man_inst"]
 === System requirements
@@ -333,7 +333,7 @@ ATTR{queue/rotational}!="0", TEST!="%S%p/mq/1", ATTR{queue/scheduler}="bfq", GOT
 # ATTR{queue/scheduler}="mq-deadline"
 ----
 
-The example above shows option 1 uncommented. Depending on the disk type choose between option 1 to 5 or add a personal one.
+The example above shows option 1 uncommented. Depending on the disk type, choose between option 1 to 5 or add a personal one.
 The old default must be deactivated by comment the line with a `#`.
 
 New setting:
@@ -580,8 +580,8 @@ Use storage subsystem with appropriate IOPS, throughput, and redundancy. Based o
 * transaction log (mount point /log)
 * tempdb (mount point /tempdb)
 
-The default filesystem for OS will be btrfs all others will have xfs. Based on the database sizing the required disk must be provided. The example will decribe a Linux Software RAID based setup.
-The disk `sdb - sdi` are the partitions from the NVME storage underneath. The command `lsblk` helps to find the right partition name to build a reasonable RAID setup later and avoid having all partitions 
+The default filesystem for OS will be btrfs all others will have xfs. Based on the database sizing the required disk must be provided. The example will describe a Linux Software RAID based setup.
+The disks `sdb - sdi` are the partitions from the NVME storage underneath. The command `lsblk` helps to find the right partition name to build a reasonable RAID setup later and avoid having all partitions 
 from only one NVME in the same RAID configuration.
 
 .Example for `lsblk`
@@ -774,10 +774,10 @@ or disable the history prior to configuring SQL Server with `set +o history`, an
 :hash: #
 :hash5: #####
 
-If specifying a `product key`, it must be in the form of `{hash5}`-`{hash5}`-`{hash5}`-`{hash5}`-`{hash5}`, where `{hash}` is a number or a letter in summary 25.
+If you specify a `product key`, it must be in the format of `{hash5}`-`{hash5}`-`{hash5}`-`{hash5}`-`{hash5}`, where `{hash}` is a number or a letter in summary 25.
 
 - {sqls} should be started at this point. You can verify this with `systemctl status mssql-server.service`. 
-- {sqls} listens for connections on port `1433` by default, that is a second option to verify the {sqls} is up and running.
+- By default, {sqls} listens for connections on port `1433`, providing a second method to verify the {sqls} is up and running.
 - {sqls} should be accessible with `sqlcmd`. 
 
 *systemd* check:
@@ -832,11 +832,11 @@ Microsoft SQL Server 2022 (RTM-CU15-GDR) (KB5046059) - 16.0.4150.1 (X64)
 [discrete]
 ==== Moving `tempdb` files to a dedicate storage area
 
-By default, a new installation of SQL Server on Linux creates multiple tempdb data files, based on the number of logical cores (with up to eight data files).
-One of our preparation steps for the storage part was having a dedicated RAID set for the tempdb files. This setting can only be modified from inside the {sqls}.
-The following example moves `tempdb` from its current default location on the disk to another disk location. Because tempdb is re-created each time the 
+By default, a new installation of SQL Server on Linux creates multiple `tempdb` data files, based on the number of logical cores (with up to eight data files).
+One of our preparation steps for the storage component involved setting up a dedicated RAID array for the `tempdb` files. This setting can only be modified from inside the {sqls}.
+The following example moves `tempdb` from its current default location on the disk to another disk location. Because `tempdb` is re-created each time the 
 MSSQLSERVER service is started, you do not need to physically move the data and log files. The files are created when the service is restarted. 
-Until the service is restarted, tempdb continues to function in its existing location. Determine the logical file names of the tempdb database and their current location on disk.
+Until the service is restarted, `tempdb` continues to function in its existing location. Determine the logical file names of the `tempdb` database and their current location on the disk.
 
 .Check the current location with `sqlcmd -S <hostname> -U SA -P <password>`
 
@@ -1243,10 +1243,10 @@ To stay up to date on the latest SQL Server on Linux features, bookmark https://
 [id="password_requirements"]
 === SQL Server password requirements
 
-Password complexity policies are designed to deter brute force attacks by increasing the number of possible passwords. 
-When password complexity policy is enforced, new passwords must meet the following guidelines:
+Password complexity policies are designed to thwart brute-force attacks by expanding the range of potential password combinations.
+When the password complexity policy is enforced, new passwords must adhere to the following guidelines:
 
-* The password doesn't contain the account name of the user.
+* The password does not contain the account name of the user.
 * The password is at least eight characters long.
 * The password contains characters from three of the following four categories:
 ** Latin uppercase letters (A through Z)
@@ -1260,19 +1260,19 @@ Passwords can be up to 128 characters long. Use passwords that are as long and c
 
 SQL Server on Linux currently has the following limitations:
 
-* A standard password policy is provided. `MUST_CHANGE` is the only option you might configure. The `CHECK_POLICY` option isn't supported.
-* Extensible Key Management isn't supported.
-* SQL Server authentication mode can't be disabled.
+* A standard password policy is provided. `MUST_CHANGE` is the only option you might configure. The `CHECK_POLICY` option is not supported.
+* Extensible Key Management is not supported.
+* SQL Server authentication mode cannot be disabled.
 * Password expiration is hard-coded to 90 days if you use SQL Server authentication.
 * Using keys stored in the Azure Key Vault is not supported.
-* SQL Server generates its own self-signed certificate for encrypting connections. SQL Server can be configured to use a user provided certificate for TLS.
+* SQL Server generates its own self-signed certificate for encrypting connections. SQL Server can be configured to use a user-provided certificate for TLS.
 
 Find more detailed information at https://learn.microsoft.com/en-us/sql/linux/sql-server-linux-security-overview?view=sql-server-ver16
 and at https://learn.microsoft.com/en-us/sql/t-sql/statements/alter-login-transact-sql?view=sql-server-ver16.
 
-=== Disabling the sa account as a best practice
+=== Disabling the `sa account` as a best practice
 
-Follow the instruction from Microsoft:
+Follow the instructions from Microsoft:
 https://learn.microsoft.com/en-us/sql/linux/quickstart-install-connect-suse?view=sql-server-linux-ver16#disable-the-sa-account-as-a-best-practice[Disable SA user]
 
 === Virtual machines and dynamic memory