Merge pull request MicrosoftDocs#1 from MicrosoftDocs/master

Merging upstream to local fork
nschonni · Feb 11, 2020 · d9fd0e6 · d9fd0e6
2 parents 929e0b4 + f9d8e17
commit d9fd0e6
Show file tree

Hide file tree

Showing 3,820 changed files with 37,855 additions and 32,965 deletions.
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -0,0 +1,12 @@
+{
+    "default": true,
+    "MD002": false,
+    "DOCSMD006": false,
+    "MD013": false,
+    "MD024": { "siblings_only": true },
+    "MD025": { "front_matter_title": "" },
+    "MD026": false,
+    "MD028": false,
+    "MD038": false,
+    "MD033": { "allowed_elements": ["a", "br", "em", "strong", "sub", "sup"] }
+}
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -7,7 +7,10 @@
       "build_output_subfolder": "vcppdocs",
       "locale": "en-us",
       "monikers": [],
-      "moniker_ranges": [">= vs-2015"],
+      "moniker_ranges": [
+        ">= vs-2015"
+      ],
+      "xref_query_tags": ["/dotnet", "/uwp/api"],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
@@ -56,5 +59,8 @@
     }
   },
   "need_generate_pdf": false,
-  "need_generate_intellisense": false
-}
+  "need_generate_intellisense": false,
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
+}