Skip to content

Commit ca98da2

Browse files
v-aljev-alje
committed
Resolving merge conflicts
2 parents 2a5eb36 + bbaa019 commit ca98da2

350 files changed

Lines changed: 867 additions & 762 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.publish.config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [
11+
"= sql-server-2014",
1112
"= azuresqldb-current || = azuresqldb-mi-current || = azure-sqldw-latest || >= aps-pdw-2016 || >= sql-analysis-services-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
1213
],
1314
"open_to_public_contributors": true,

‎docs/2014/breadcrumb/toc.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- name: Docs
2+
href: /
3+
homepage: /
4+
items:
5+
- name: SQL
6+
href: /sql/
7+
homepage: /sql/index
8+
items:
9+
- name: Relational databases
10+
href: /sql/relational-databases/
11+
homepage: /sql/relational-databases/sqltoolsvsnativehelpers-framewindowvisible

‎docs/2014/docs-sql-server-2014-from-msdn.md‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
title: SQL Server 2014 docs are moving | Microsoft Docs
3+
description: The Microsoft documentation for SQL Server 2014 will move before July 2018, from MSDN to here on docs.
4+
author: MightyPen
5+
manager: craigg
6+
ms.prod-service: sql-database
7+
ms.custom:
8+
ms.topic: article
9+
ms.workload: "On Demand"
10+
ms.date: 04/26/2018
11+
ms.author: genemi
12+
ms.reviewer: sudeepk
13+
---
14+
# Documentation for SQL Server 2014 is moving to Docs
15+
16+
This article describes the upcoming move of the Microsoft's SQL Server 2014 documentation articles. This article is being written in late April 2018, and the move will occur before July 2018.
17+
18+
## Links to SQL Server 2014 documentation on MSDN
19+
20+
The following links are to the SQL Server 2014 documentation that Microsoft has stored on its *MSDN* website. Before July 2018, Microsoft will move these documentation articles to its new *Docs* website:
21+
22+
- *SQL Server 2014*
23+
- [https://msdn.microsoft.com/library/dn197878(v=sql.10).aspx](https://msdn.microsoft.com/library/dn197878(v=sql.10).aspx)
24+
25+
- *Books Online for SQL Server 2014*
26+
- [https://msdn.microsoft.com/library/ms130214(v=sql.120).aspx](https://msdn.microsoft.com/library/ms130214(v=sql.120).aspx)
27+
28+
MSDN is an initialism for *Microsoft Developer Network*.
29+
30+
31+
## Redirectors
32+
33+
The obsolete MSDN HTTP addresses will continue to work for at least a couple years after the move. Redirectors will intercept the MSDN requests, and will forward them with their new corresponding address on Docs. However, after the move the following items will be true:
34+
35+
- It will be better to work with the new HTTP addresses that navigate directly to Docs.
36+
- The Bing and Google crawlers will start delist and bypass the old MSDN addresses.
37+
38+
39+
## After the move
40+
41+
After the move to *Docs*, the address of the root SQL Server 2014 documentation article will be:
42+
43+
- [https://docs.microsoft.com/sql/?view=sql-server-2014](https://docs.microsoft.com/sql/?view=sql-server-2014)
44+
45+
46+
## Related links
47+
48+
- [Root documentation article for SQL Server 2016 and later versions](https://docs.microsoft.com/sql/?view=sql-server-2016)
49+

‎docs/2014/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
redirect_url: /sql/docs-sql-server-2014-from-msdn?view=sql-server-2014
3+
---

‎docs/2014/relational-databases/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
redirect_url: /sql/relational-databases/sqltoolsvsnativehelpers-framewindowvisible?view=sql-server-2014
3+
---

‎docs/2014/relational-databases/sqltoolsvsnativehelpers-framewindowvisible.md‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: "FrameWindowVisible | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "06/13/2017"
@@ -17,32 +17,36 @@ ms.author: "jhubbard"
1717
manager: "jhubbard"
1818
---
1919
# FrameWindowVisible
20-
Property that specifies whether a given window frame is visible. The helper method is used from managed code.
21-
22-
## Syntax
23-
24-
```
25-
26-
BOOL WINAPI IsFrameWindowVisible(IVsWindowFrame* frame)
27-
{
28-
if (NULL == frame)
29-
{
30-
return FALSE;
31-
}
32-
33-
return S_OK == frame->IsVisible();
34-
}
35-
```
36-
37-
#### Parameters
38-
*frame*
39-
40-
IVsWindowFrame* pointer to a Visual Studio WindowFrame.
41-
42-
## Property Value/Return Value
43-
A Boolean value that specifies whether the window frame specified by *frame* is visible.
44-
45-
## See Also
46-
[SqlToolsVSNativeHelpers](sqltoolsvsnativehelpers.md)
47-
20+
Property that specifies whether a given window frame is visible. The helper method is used from managed code.
21+
22+
## Syntax
23+
24+
```
25+
26+
BOOL WINAPI IsFrameWindowVisible(IVsWindowFrame* frame)
27+
{
28+
if (NULL == frame)
29+
{
30+
return FALSE;
31+
}
32+
33+
return S_OK == frame->IsVisible();
34+
}
35+
```
36+
37+
#### Parameters
38+
*frame*
39+
40+
IVsWindowFrame* pointer to a Visual Studio WindowFrame.
41+
42+
## Property Value/Return Value
43+
A Boolean value that specifies whether the window frame specified by *frame* is visible.
44+
45+
46+
<!-- Necessary temporarily. GeneMi, 2018-05-01.
47+
But 'release-sql2014-migration' should win the Conflict Resolution later in May, because this will then be a good link!
48+
## See Also
49+
[SqlToolsVSNativeHelpers](sqltoolsvsnativehelpers.md)
50+
-->
51+
4852

‎docs/2014/relational-databases/wmi-provider-error-0x8007052f.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ ms.author: "jhubbard"
1919
manager: "jhubbard"
2020
---
2121
# WMI Error 0x8007052f
22-
23-
## Details
24-
25-
|||
26-
|-|-|
27-
|Product Name|SQL Server|
28-
|Event ID|0x8007052f|
29-
|Event Source|WMI Provider Error|
30-
|Component|SQL Server Configuration Manager|
31-
|Symbolic Name|NA|
32-
|Message Text|Logon failure: user account restriction. Possible reasons are blank passwords not allowed, login hour restrictions, or a policy restriction has been enforced.|
33-
34-
## Explanation
35-
This error can occur when using [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] Configuration Manager to switch to the built-in accounts (Network Service, Local Service, or Local System) when [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] is running on a Windows Server Cluster or Windows Server Domain Controller. Do not run services under built-in accounts on a Windows Server Cluster or Windows Server Domain Controller. For recommendations on service accounts, see the topic Setting Up Windows Service Accounts in [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] Books Online.
36-
37-
## User Action
38-
Configure [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] to use a domain account.
39-
22+
23+
## Details
24+
25+
|||
26+
|-|-|
27+
|Product Name|SQL Server|
28+
|Event ID|0x8007052f|
29+
|Event Source|WMI Provider Error|
30+
|Component|SQL Server Configuration Manager|
31+
|Symbolic Name|NA|
32+
|Message Text|Logon failure: user account restriction. Possible reasons are blank passwords not allowed, login hour restrictions, or a policy restriction has been enforced.|
33+
34+
## Explanation
35+
This error can occur when using [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] Configuration Manager to switch to the built-in accounts (Network Service, Local Service, or Local System) when [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] is running on a Windows Server Cluster or Windows Server Domain Controller. Do not run services under built-in accounts on a Windows Server Cluster or Windows Server Domain Controller. For recommendations on service accounts, see the topic Setting Up Windows Service Accounts in [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] Books Online.
36+
37+
## User Action
38+
Configure [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] to use a domain account.
39+
4040

‎docs/2014/toc.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# [Documentation for SQL Server 2014 is moving to Docs](docs-sql-server-2014-from-msdn.md)
2+
3+
## [FrameWindowVisible](relational-databases/sqltoolsvsnativehelpers-framewindowvisible.md)
4+
5+
# [Root documentation article for SQL Server 2016 and later versions +](https://docs.microsoft.com/sql/?view=sql-server-2016)
6+

‎docs/database-engine/configure-windows/polybase-connectivity-configuration-transact-sql.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ helpviewer_keywords:
1313
- "PolyBase"
1414
ms.assetid: 82252e4f-b1d0-49e5-aa0b-3624aade2add
1515
caps.latest.revision: 14
16-
author: "barbkess"
17-
ms.author: "barbkess"
16+
author: MashaMSFT
17+
ms.author: mathoma
1818
manager: craigg
1919
monikerRange: ">= aps-pdw-2016 || >= sql-server-2016 || = sqlallproducts-allversions"
2020
---

‎docs/docfx.json‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,27 @@
22
"build": {
33

44
"content": [
5+
{
6+
"group": "gr-sql-2014-b",
7+
"src": "./2014",
8+
"files": [
9+
"**/*.md",
10+
"**/*.yml",
11+
"breadcrumb/toc.yml"
12+
],
13+
"exclude": [
14+
"**/includes/**",
15+
"**/mref/**",
16+
"**/obj/**",
17+
"README.md",
18+
"LICENSE",
19+
"LICENSE-CODE"
20+
]
21+
},
522

623
{
724
"group": "gr-sql-2016-a",
25+
"src": "./",
826
"files": [
927
"**/*.md",
1028
"**/*.yml",
@@ -22,9 +40,22 @@
2240
],
2341

2442
"resource": [
43+
{
44+
"group": "gr-sql-2014-b",
45+
"src": "./2014",
46+
"files": [
47+
"**/*.png",
48+
"**/*.gif",
49+
"**/*.jpg"
50+
],
51+
"exclude": [
52+
"**/obj/**"
53+
]
54+
},
2555

2656
{
2757
"group": "gr-sql-2016-a",
58+
"src": "./",
2859
"files": [
2960
"**/*.png",
3061
"**/*.gif",
@@ -41,7 +72,6 @@
4172

4273
"globalMetadata": {
4374
"layout": "Conceptual",
44-
"breadcrumb_path": "~/breadcrumb/toc.yml",
4575
"contributors_to_exclude": ["hexiaokai", "openpublishingbuild","sudeepku","saldana","iRaindrop"],
4676
"searchScope": ["sql"],
4777
"_op_documentIdPathDepotMapping": {
@@ -54,6 +84,11 @@
5484

5585
"fileMetadata": {
5686

87+
"breadcrumb_path": {
88+
"**/*.md": "~/breadcrumb/toc.yml",
89+
"2014/**/*.md": "~/2014/breadcrumb/toc.yml"
90+
},
91+
5792
"monikerRange": {
5893

5994
"ado/**/*.md": ">= sql-server-2016 || >= sql-server-linux-2017 || = azuresqldb-current || = azuresqldb-mi-current || = azure-sqldw-latest || >= aps-pdw-2016 || = sqlallproducts-allversions",
@@ -92,8 +127,14 @@
92127

93128
"groups": {
94129

130+
"gr-sql-2014-b": {
131+
"moniker_range": "= sql-server-2014",
132+
"dest": "temp2014b"
133+
},
134+
95135
"gr-sql-2016-a": {
96-
"moniker_range": "= azuresqldb-current || = azuresqldb-mi-current || = azure-sqldw-latest || >= aps-pdw-2016 || >= sql-analysis-services-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
136+
"moniker_range": "= azuresqldb-current || = azuresqldb-mi-current || = azure-sqldw-latest || >= aps-pdw-2016 || >= sql-analysis-services-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || = sqlallproducts-allversions",
137+
"dest": "temp2016a"
97138
}
98139
},
99140

0 commit comments

Comments
 (0)