Merge remote-tracking branch 'Parent/master' into Current

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true

.vscode/settings.json

@@ -0,0 +1,9 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+ "editor.wordWrap": "on",
+ "files.eol": "\n",
+ "files.trimTrailingWhitespace": true,
+ "files.associations": {
+ "**/toc.json": "jsonc"
+ }
+}

.vscode/spell.json

@@ -0,0 +1,110 @@
+{ 
+ "version": "0.1.0", 
+ "language": "en", 
+ "ignoreWordsList": [ 
+ "breakpoint",
+ "breakpoints",
+ "Breakpoint",
+ "Breakpoints",
+ "commonjs",
+ "CommonJS",
+ "colorizer",
+ "colorizers",
+ "Colorizers",
+ "DateApproved",
+ "devDependency",
+ "Docker",
+ "Dockerfile",
+ "Dockerfiles",
+ "dropdown",
+ "ES3",
+ "ES5",
+ "ES6",
+ "ESLint",
+ "extensionAPI",
+ "gif",
+ "github",
+ "GitHub",
+ "gitignore",
+ "http",
+ "https",
+ "inlined",
+ "Inlined",
+ "IntelliSense",
+ "jsconfig",
+ "JSDoc",
+ "JSHint",
+ "json",
+ "jsx",
+ "JSX",
+ "kbstyle",
+ "linting",
+ "Linting",
+ "linter",
+ "linters",
+ "Linter",
+ "Linters",
+ "nolazy",
+ "npm",
+ "Markdown",
+ "MetaDescription",
+ "MonoDevelop",
+ "microsoft",
+ "MSBuild",
+ "Octicons",
+ "OmniSharp",
+ "OSX",
+ "PageTitle",
+ "png",
+ "refactor",
+ "refactored",
+ "src",
+ "stdio",
+ "stdin",
+ "stdout",
+ "TextMate",
+ "TOCTitle",
+ "tokenizer",
+ "tokenizers",
+ "transpile",
+ "transpiling",
+ "transpiler",
+ "transpilers",
+ "tsc",
+ "tsconfig",
+ "typings",
+ "Typings",
+ "versioned",
+ "visualstudio",
+ "vsce",
+ "vscecli",
+ "vscode",
+ "walkthrough"
+ ], 
+ "mistakeTypeToStatus": { 
+ "Spelling": "Error", 
+ "Complex Expression": "Warning", 
+ "Hidden Verbs": "Information", 
+ "Hyphen Required": "Error", 
+ "Redundant Expression": "Information", 
+ "Did you mean...": "Information", 
+ "Repeated Word": "Error", 
+ "Missing apostrophe": "Error", 
+ "Cliches": "Warning", 
+ "Missing Word": "Warning", 
+ "Make I uppercase": "Error" 
+ }, 
+ "languageIDs" : [ 
+ "markdown", 
+ "latex", 
+ "plaintext" 
+ ],
+ "ignoreRegExp": [
+ "/`(kb.*?)`/g",
+ "/\\\\(.*\\\\.(jpg|jpeg|png|md|gif|JPG|JPEG|PNG|MD|GIF)\\\\)/g", 
+ "/((http|https|ftp|git)\\\\S*)/g",
+ "/\\\\`(emmet|extensions|files|workbench|editor|search|terminal)(\\\\..+?)+?`/gm",
+ "/^((`{3}\\\\s*)(\\\\w+)?(\\\\s*([\\\\w\\\\W]+?)\\\\n*)\\\\2)\\\\n*(?:[^\\\\S\\\\w\\\\s]|$)/gm",
+ "/\\\\(@.+?\\\\)/g"
+ ]
+} 

LICENSE.md

@@ -0,0 +1,6 @@
+Copyright (c) Microsoft Corporation. All rights reserved. Distributed under the following terms:
+
+1. Documentation is licensed under the [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/legalcode). Code is licensed under the [MIT License](https://opensource.org/licenses/MIT).
+
+2. This license does not grant you rights to use any trademarks or logos of Microsoft. For Microsoft’s general trademark guidelines, go to https://go.microsoft.com/fwlink/?LinkID=254653.
+

api/.prettierrc.json

@@ -0,0 +1,5 @@
+{
+ "printWidth": 92,
+ "tabWidth": 2,
+ "singleQuote": true
+}

package.json

@@ -1,6 +1,15 @@
 {
- "devDependencies": {
- "shelljs": "^0.7.8"
- },
- "name": "vscode-docs"
+ "name": "vscode-docs",
+ "version": "0.10.3",
+ "author": {
+ "name": "Microsoft Corporation"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/Microsoft/vscode-docs.git"
+ },
+ "devDependencies": {
+ "gulp": "^3.9.1",
+ "shelljs": "^0.7.8"
+ }
 }