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
+}

api/extension-guides/scm-provider.md

@@ -139,7 +139,7 @@ Finally, the `scm/change/title` menu is related to the Quick Diff experience, sh
 
 ### SCM Input Box
 
-The Source Control Input Box, located atop of each Source Control view, allows the user to input a message. You can get (and set) this message in order to perform operations. In Git, for example, this is used as the commit box, in which users type in commit messages and `git ecommit` commands pick them up.
+The Source Control Input Box, located atop of each Source Control view, allows the user to input a message. You can get (and set) this message in order to perform operations. In Git, for example, this is used as the commit box, in which users type in commit messages and `git commit` commands pick them up.
 
 ```ts
 export interface SourceControlInputBox {

docs/editor/versioncontrol.md

@@ -180,7 +180,7 @@ This leverages the `--diff` option you can pass to VS Code to compare 2 files si
 To summarize, here are some examples of where you can use VS Code as the editor:
 
 * `git rebase HEAD~3 -i` do interactive rebase using VS Code
-* `git ecommit` use VS Code for the commit message
+* `git commit` use VS Code for the commit message
 * `git add -p` followed by `kbstyle(e)` for interactive add
 * `git difftool <commit>^ <commit>` use VS Code as the diff editor for changes
 

package.json

@@ -1,6 +1,15 @@
 {
-	"name": "vscode-docs",
-	"devDependencies": {
-		"shelljs": "0.7.8"
-	}
+  "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"
+  }
 }

release-notes/v1_10.md

@@ -584,7 +584,7 @@ Contributions to `vscode`:
   *  Include newline when expanding line selection [PR #15564](https://github.com/Microsoft/vscode/pull/15564)
   *  Enable "Find in selection" within single lines [PR #15566](https://github.com/Microsoft/vscode/pull/15566)
 * [katainaka (@katainaka0503)](https://github.com/katainaka0503):  Fix colorization of nested list. [PR #19596](https://github.com/Microsoft/vscode/pull/19596)
-* [Krzysztof Cieślak (@Krzysztof-Cieslak)](https://github.com/Krzysztof-Cieslak):  Fix #15343 - Add `git ecommit --amend` [PR #17755](https://github.com/Microsoft/vscode/pull/17755)
+* [Krzysztof Cieślak (@Krzysztof-Cieslak)](https://github.com/Krzysztof-Cieslak):  Fix #15343 - Add `git commit --amend` [PR #17755](https://github.com/Microsoft/vscode/pull/17755)
 * [Matheus Cruz Rocha (@matheusrocha89)](https://github.com/matheusrocha89):  Terminal encoding problem related to issue #14586 [PR #20932](https://github.com/Microsoft/vscode/pull/20932)
 * [Marek Lewandowski (@mlewand)](https://github.com/mlewand):  Hotkey for Windows shell context menu [PR #17710](https://github.com/Microsoft/vscode/pull/17710)
 * [Marcel Miranda Ackerman (@reaktivo)](https://github.com/reaktivo):  Resizes the tab size when dirty file state changes, fixes #15364 [PR #19976](https://github.com/Microsoft/vscode/pull/19976)

release-notes/v1_25.md

@@ -879,7 +879,7 @@ Contributions to `vscode`:
 * [EbXpJ6bp (@EbXpJ6bp)](https://github.com/EbXpJ6bp): Improve Dependencies and Contributions UI in the Extension editor [PR #52126](https://github.com/Microsoft/vscode/pull/52126)
 * [Schuyler Cebulskie (@Gawdl3y)](https://github.com/Gawdl3y): Add V8 version to about dialog and prettify it [PR #51511](https://github.com/Microsoft/vscode/pull/51511)
 * [Deleted user (@ghost)](https://github.com/ghost): [Fix] Add a missing return type for _hue2rgb  [PR #51285](https://github.com/Microsoft/vscode/pull/51285)
-* [Jing Zhou (@gnijuohz)](https://github.com/gnijuohz): Show warning when git ecommit input box only contains whitespaces [PR #45254](https://github.com/Microsoft/vscode/pull/45254)
+* [Jing Zhou (@gnijuohz)](https://github.com/gnijuohz): Show warning when git commit input box only contains whitespaces [PR #45254](https://github.com/Microsoft/vscode/pull/45254)
 * [Christoph Seitz (@go2sh)](https://github.com/go2sh): Add transformations for placeholders [PR #51621](https://github.com/Microsoft/vscode/pull/51621)
 * [Jan Pilzer (@Hirse)](https://github.com/Hirse): Add gitignore language [PR #51026](https://github.com/Microsoft/vscode/pull/51026)
 * [Ian Sanders (@iansan5653)](https://github.com/iansan5653): Limit highlighting on drag over open editors by checking if dragged item can be dropped [PR #52623](https://github.com/Microsoft/vscode/pull/52623)

release-notes/v1_28.md

@@ -587,7 +587,7 @@ Contributions to `vscode`:
   * Try to checkout a new local branch when checking out a remote branch [PR #54897](https://github.com/Microsoft/vscode/pull/54897)
   * Add URL handler support for Linux desktops [PR #56727](https://github.com/Microsoft/vscode/pull/56727)
 * [@sucicf1](https://github.com/sucicf1): Fix#35905 [PR #58380](https://github.com/Microsoft/vscode/pull/58380)
-* [Thomas Basche (@tombasche)](https://github.com/tombasche): Allow empty git ecommit [PR #56048](https://github.com/Microsoft/vscode/pull/56048)
+* [Thomas Basche (@tombasche)](https://github.com/tombasche): Allow empty git commit [PR #56048](https://github.com/Microsoft/vscode/pull/56048)
 * [tsangint (@tsangint)](https://github.com/tsangint): Fix typo [PR #57192](https://github.com/Microsoft/vscode/pull/57192)
 * [Alexander (@usernamehw)](https://github.com/usernamehw): Fix tab focus related issues [PR #57821](https://github.com/Microsoft/vscode/pull/57821)
 * [Winner Crespo (@wistcc)](https://github.com/wistcc)

release-notes/vMarch.md

@@ -389,7 +389,7 @@ This leverages the new `--diff` option you can pass to VS Code to compare two fi
 To summarize, here are some examples of where you can use Git with VS Code:
 
 * `git rebase HEAD~3 -i` allows to interactive rebase using VS Code
-* `git ecommit` allows to use VS Code for the commit message
+* `git commit` allows to use VS Code for the commit message
 * `git add -p` followed by `kbstyle(e)` for interactive add
 * `git difftool <commit>^ <commit>` allows to use VS Code as diff editor for changes
 

tutorials/nodejs-deployment/deploy-website.md

@@ -19,7 +19,7 @@ Initialize a local Git repository and make an initial commit. Git will respect t
 ```bash
 $ git init
 $ git add -A
-$ git ecommit -m "Initial Commit"
+$ git commit -m "Initial Commit"
 ```
 
 ## Set up a Remote