Skip to content

Commit 2fd733e

Browse files
HJToland3HJToland3
committed
conflict resolution
2 parents 546abe1 + 5b54706 commit 2fd733e

22 files changed

Lines changed: 556 additions & 663 deletions

‎.openpublishing.redirection.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3019,6 +3019,18 @@
30193019
"source_path": "docs/release-notes/sql-server-release-notes.md",
30203020
"redirect_url": "/sql/sql-server/sql-server-release-notes",
30213021
"redirect_document_id": false
3022-
}
3022+
},
3023+
{
3024+
"source_path": "docs/release-notes/index.md",
3025+
"redirect_url": "/sql/sql-server/index",
3026+
"redirect_document_id": false
3027+
},
3028+
{
3029+
"source_path": "docs/sql-server/sql-server-release-notes.md",
3030+
"redirect_url": "/sql/sql-server/sql-server-2017-release-notes",
3031+
"redirect_document_id": false
3032+
}
3033+
3034+
30233035
]
30243036
}

‎docs/advanced-analytics/common-issues-external-script-execution.md‎

Lines changed: 123 additions & 129 deletions
Large diffs are not rendered by default.

‎docs/database-engine/install-windows/TOC.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
## [Check Parameters for the System Configuration Checker](check-parameters-for-the-system-configuration-checker.md)
2727
## [Configure SQL Server on a Server Core Installation](configure-sql-server-on-a-server-core-installation.md)
2828
## [Install SQL Server on Server Core](install-sql-server-on-server-core.md)
29-
## [Install SQL Server from the Installation Wizard (Setup)](install-sql-server-from-the-installation-wizard-setup.md)
29+
## [Install SQL Server from the Installation Wizard (Setup)](install-sql-server-from-the-installation-wizard-setup.md)
3030
## [Install SQL Server from the Command Prompt](install-sql-server-2016-from-the-command-prompt.md)
3131
## [Install SQL Server Using a Configuration File](install-sql-server-2016-using-a-configuration-file.md)
3232
## [Install SQL Server Using SysPrep](install-sql-server-using-sysprep.md)

‎docs/database-engine/install-windows/check-parameters-for-the-system-configuration-checker.md‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
---
22
title: "Check Parameters for the System Configuration Checker | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "03/14/2017"
5-
ms.prod: "sql-server-2016"
4+
ms.date: "09/05/2017"
5+
ms.prod:
6+
- "sql-server-2016"
7+
- "sql-server-2017"
68
ms.reviewer: ""
79
ms.suite: ""
810
ms.technology:
@@ -27,14 +29,15 @@ author: "MikeRayMSFT"
2729
ms.author: "mikeray"
2830
manager: "jhubbard"
2931
---
30-
# Check Parameters for the System Configuration Checker
31-
During [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Setup, the System Configuration Checker (SCC) scans the computer where [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] will be installed. The SCC checks for conditions that prevent a successful [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] installation. Before Setup starts the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Installation Wizard, the SCC retrieves the status of each item. It then compares the result with required conditions and provides guidance for removal of blocking issues.
32+
# Check parameters for the System Configuration Checker
33+
During [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Setup, the System Configuration Checker (SCC) scans the computer where [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] will be installed. The SCC checks for conditions that prevent a successful [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] installation. Before Setup starts the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Installation Wizard, the SCC retrieves the status of each item. It then compares the result with required conditions and provides guidance for removal of blocking issues.
3234

33-
The system configuration checker generates a report which contains a short description for each executed rule, and the execution status. The system configuration check report is located at %programfiles%\\[!INCLUDE[msCoName](../../includes/msconame-md.md)][!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]\130\Setup Bootstrap\Log\\<YYYYMMDD_HHMM>\\.
35+
The system configuration checker generates a report which contains a short description for each executed rule, and the execution status. The system configuration check report is located at %programfiles%\Microsoft SQL Server\140\Setup Bootstrap\Log\\\<YYYYMMDD_HHMM>\\\.
3436

35-
## See Also
36-
[Hardware and Software Requirements for Installing SQL Server 2016](../../sql-server/install/hardware-and-software-requirements-for-installing-sql-server.md)
37-
[Security Considerations for a SQL Server Installation](../../sql-server/install/security-considerations-for-a-sql-server-installation.md)
38-
[Supported Version and Edition Upgrades](../../database-engine/install-windows/supported-version-and-edition-upgrades.md)
37+
See the following links for more information:
38+
39+
- [Hardware and Software Requirements for Installing SQL Server](../../sql-server/install/hardware-and-software-requirements-for-installing-sql-server.md)
40+
- [Security Considerations for a SQL Server Installation](../../sql-server/install/security-considerations-for-a-sql-server-installation.md)
41+
- [Supported Version and Edition Upgrades](../../database-engine/install-windows/supported-version-and-edition-upgrades.md)
3942

4043

0 commit comments

Comments
 (0)