Skip to content

Commit 68d3f8c

Browse files
authored
Merge pull request #14863 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 4e75c50 + aa3f815 commit 68d3f8c

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

docs/database-engine/install-windows/install-sql-server-on-server-core.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,13 +281,9 @@ To enable remote connections, use SQLCMD.exe locally and execute the following s
281281
### Enable TCP/IP on the instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]
282282
The TCP/IP protocol can be enabled through Windows PowerShell for an instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] on Server Core. Follow these steps:
283283

284-
1. On the server, launch Task Manager.
284+
1. In PowerShell: Import-Module SQLPS.
285285

286-
2. On the **Applications** tab, click **New Task**.
287-
288-
3. In the **Create New Task** dialog box, type **sqlps.exe** in the **Open** field and then click **OK**. This opens the **[!INCLUDE[msCoName](../../includes/msconame-md.md)][!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Powershell** window.
289-
290-
4. In the **Microsoft [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Powershell** window, run the following script to enable the TCP/IP protocol:
286+
2. In the **Microsoft [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Powershell** window, run the following script to enable the TCP/IP protocol:
291287

292288
```powershell
293289
$smo = 'Microsoft.SqlServer.Management.Smo.'

docs/linux/quickstart-install-connect-docker.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,23 +94,26 @@ Before starting the following steps, make sure that you have selected your prefe
9494
```bash
9595
sudo docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=<YourStrong@Passw0rd>" \
9696
-p 1433:1433 --name sql1 \
97-
-d mcr.microsoft.com/mssql/server:2017-latest
97+
-d \
98+
mcr.microsoft.com/mssql/server:2017-latest
9899
```
99100
::: zone-end
100101

101102
::: zone pivot="cs1-powershell"
102103
```PowerShell
103104
docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=<YourStrong@Passw0rd>" `
104105
-p 1433:1433 --name sql1 `
105-
-d mcr.microsoft.com/mssql/server:2017-latest
106+
-d `
107+
mcr.microsoft.com/mssql/server:2017-latest
106108
```
107109
::: zone-end
108110

109111
::: zone pivot="cs1-cmd"
110112
```cmd
111113
docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=<YourStrong@Passw0rd>" `
112114
-p 1433:1433 --name sql1 `
113-
-d mcr.microsoft.com/mssql/server:2017-latest
115+
-d `
116+
mcr.microsoft.com/mssql/server:2017-latest
114117
```
115118
::: zone-end
116119

@@ -128,7 +131,8 @@ Before starting the following steps, make sure that you have selected your prefe
128131
| **-e "SA_PASSWORD=\<YourStrong@Passw0rd\>"** | Specify your own strong password that is at least 8 characters and meets the [SQL Server password requirements](../relational-databases/security/password-policy.md). Required setting for the SQL Server image. |
129132
| **-p 1433:1433** | Map a TCP port on the host environment (first value) with a TCP port in the container (second value). In this example, SQL Server is listening on TCP 1433 in the container and this is exposed to the port, 1433, on the host. |
130133
| **--name sql1** | Specify a custom name for the container rather than a randomly generated one. If you run more than one container, you cannot reuse this same name. |
131-
| **-d mcr.microsoft.com/mssql/server:2017-latest** | The SQL Server 2017 Linux container image. |
134+
| **-d** | Run the container in the background (daemon) |
135+
| ** mcr.microsoft.com/mssql/server:2017-latest** | The SQL Server 2017 Linux container image. |
132136

133137
3. To view your Docker containers, use the `docker ps` command.
134138

docs/relational-databases/system-dynamic-management-views/change-data-capture-sys-dm-cdc-log-scan-sessions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ ms.author: carlrab
6161
```
6262
USE AdventureWorks2012;
6363
GO
64-
SELECT session_id, start_time, end_time, duration, scan_phase
65-
error_count, start_lsn, current_lsn, end_lsn, tran_count
66-
last_commit_lsn, last_commit_time, log_record_count, schema_change_count
64+
SELECT session_id, start_time, end_time, duration, scan_phase,
65+
error_count, start_lsn, current_lsn, end_lsn, tran_count,
66+
last_commit_lsn, last_commit_time, log_record_count, schema_change_count,
6767
command_count, first_begin_cdc_lsn, last_commit_cdc_lsn,
6868
last_commit_cdc_time, latency, empty_scan_count, failed_sessions_count
6969
FROM sys.dm_cdc_log_scan_sessions

docs/sql-server/stretch-database/select-rows-to-migrate-by-using-a-filter-function-stretch-database.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ SELECT * FROM stretch_table_name CROSS APPLY fn_stretchpredicate(column1, column
493493
ALTER TABLE stretch_table_name SET ( REMOTE_DATA_ARCHIVE = ON (
494494
FILTER_PREDICATE = dbo.fn_stretchpredicate2(column1, column2),
495495
MIGRATION_STATE = <desired_migration_state>
496+
) )
496497
497498
```
498499

0 commit comments

Comments
 (0)