Merge remote-tracking branch 'refs/remotes/origin/master' into vs-9329193

.openpublishing.publish.config.json

@@ -93,6 +93,20 @@
       "type_mapping": {
         "Conceptual": "Content"
       }
+    },
+    {
+      "docset_name": "smb",
+      "build_source_folder": "smb",
+      "build_output_subfolder": "smb",
+      "locale": "en-us",
+      "version": 0,
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "op"
     }
   ],
   "notification_subscribers": [

browsers/edge/Index.md

@@ -58,6 +58,7 @@ You'll need to keep running them using IE11. If you don't have IE11 installed an
 
 ## Related topics
 
+- [Total Economic Impact of Microsoft Edge: Infographic](https://www.microsoft.com/en-us/download/details.aspx?id=53892)
 - [Download Internet Explorer 11](https://go.microsoft.com/fwlink/p/?linkid=290956)
 - [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760644)
 - [Internet Explorer 11 - FAQ for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760645)

smb/TOC.md

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

smb/docfx.json

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

smb/index.md

@@ -0,0 +1,4 @@
+---
+title: SMB placeholder
+description: SMB placeholder
+---

windows/whats-new/contribute-to-a-topic.md

@@ -1,6 +1,6 @@
 ---
 title: Edit an existing topic using the Contribute link
-description: Instructions about how to edit an existing topic by using the Contribute link.
+description: Instructions about how to edit an existing topic by using the Contribute link on TechNet.
 keywords: contribute, edit a topic
 ms.prod: w10
 ms.mktglfcycl: explore