fix merge conflicts

Author: barbkess

.openpublishing.publish.config.json

@@ -32,6 +32,20 @@
       },
       "build_entry_point": "docs",
       "template_folder": "_themes.MSDN.Modern"
+    },
+    {
+      "docset_name": "linux",
+      "build_source_folder": "docs/linux",
+      "build_output_subfolder": "sql/linux",
+      "locale": "en-us",
+      "version": 0,
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "template_folder": "_themes"
     }
   ],
   "notification_subscribers": [],
@@ -44,6 +58,12 @@
       "url": "https://github.com/Microsoft/templates.msdn.msft",
       "branch": "master",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "master",
+      "branch_mapping": {}
     }
   ]
 }

aps/TOC.md

@@ -0,0 +1 @@
+# [Index](index.md)

aps/docfx.json

@@ -0,0 +1,35 @@
+{
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.md"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "sql/aps/**",
+          "**/includes/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "**/*.png",
+          "**/*.jpg"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "sql/aps/**",
+          "**/includes/**"
+        ]
+      }
+    ],
+    "overwrite": [],
+    "externalReference": [],
+    "globalMetadata": {},
+    "fileMetadata": {},
+    "template": [],
+    "dest": "sql/aps"
+  }
+}

aps/index.md

@@ -0,0 +1 @@
+# Index test file for Open Publishing

docs/analytics-platform-system/1linefile.txt

@@ -31,4 +31,4 @@
 ## [Provision a certificate](provision-certificate.md)
 
 # Reference
-## [Prepared statements](prepared-statements.md)
+## [Prepared statements](prepared-statements.md)

docs/analytics-platform-system/TOC.md

@@ -2,19 +2,13 @@
 
 title: "Acquire and Configure a Backup Server for Analytics Platform System and Parallel Data warehouse"
 description: "Configure a non-appliance Windows system as a backup server for use with the backup and restore features in Analytics Platform System (APS) and SQL Server Parallel Data Warehouse (PDW)."
-keywords: ""
-ROBOTS: ""
-audience: ""
-caps.latest.revision: 20
-author: barbkess
 
-ms.author: barbkess
-ms.custom: na
-ms.date: 10/04/2016
-ms.reviewer: na
-ms.suite: na
-ms.tgt_pltfrm: na
-ms.topic: article
+author: "barbkess" 
+ms.author: "barbkess"
+ms.date: "10/20/2016"
+ms.topic: "article"
+
+caps.latest.revision: 20
 ms.assetid: f8b769fe-c864-4d65-abcb-a9a287061702
 
 ---

docs/analytics-platform-system/acquire-and-configure-backup-server.md

@@ -1,12 +1,15 @@
 ---
+
 title: "Acquire and Configure a Loading Server (SQL Server PDW)"
 description: "Acquire and configure a loading server as a non-appliance Windows system for submitting data loads to SQL Server Parallel Data Warehouse."
-author: "barbkess" # GitHub ID
-ms.author: "barbkess" # Microsoft ID
-ms.date: 10/20/2016
-ms.topic: article
+
+author: "barbkess" 
+ms.author: "barbkess"
+ms.date: "10/20/2016"
+ms.topic: "article"
 ms.assetid: a434b174-a818-4f73-b218-264619bab664
 caps.latest.revision: 19
+
 ---
 
 # Acquire and configure a loading server

docs/analytics-platform-system/acquire-and-configure-loading-server.md

@@ -1,5 +1,8 @@
 ---
 title: "Backup and loading hardware overview for Analytics Platform System (APS) and SQL Server Parallel Data Warehouse (PDW)"
+ms.author: BarbKess
+manager: jhubbard
+ms.prod: analytics-platform-system
 ms.custom: na
 ms.date: 10/05/2016
 ms.reviewer: na

docs/analytics-platform-system/backup-and-loading-hardware.md

@@ -1,5 +1,8 @@
 ---
 title: "Backup and restore"
+ms.author: BarbKess
+manager: jhubbard
+ms.prod: analytics-platform-system
 ms.custom: na
 ms.date: 10/05/2016
 ms.reviewer: na