Fold install-extension content into extension-gallery and publish-extension

Author: Greg Van Liew

CONTRIBUTING.md

@@ -38,13 +38,14 @@ The content in this repository follows the organization of documentation at <htt
 
 This repository contains the following folders:
 
+* \setup
+* \introvideos
+* \getstarted
 * \editor
-* \customization
 * \languages
-* \runtimes
 * \extensions
 * \extensionAPI
-* \tools
+* \other
 * \supporting
 
 Within these folders you'll find the Markdown files used for the content. Each of these folders also contains an \images folder that references the images (such as screenshots) used in the topics.

blogs/2016/07/29/extensions-roundup-git.md

@@ -7,14 +7,13 @@ Date: 2016-08-02
 ShortDescription: Extensions to super power your Git workflow.  
 Author: Wade Anderson
 ---
-
 # Extensions Roundup - Fun with Git
 
 August 2, 2016 by Wade Anderson, [@waderyan_](https://twitter.com/waderyan_)
 
 The first extension I built for Visual Studio Code was called [Git Blame](https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame). It lets you quickly see which developer most recently modified the currently selected line ("blame"). It was simple and effective. Since the time when I built this extension, there have been many more awesome Git extensions added to the VS Code [Marketplace](https://marketplace.visualstudio.com/VSCode). Here are some of my favorite.
 
-> Tip: Install any of these extensions by clicking the Extensions View button, typing the name of the extension in the Search box, and clicking **Install**. See more instructions [here](https://code.visualstudio.com/docs/editor/extension-gallery#_browse-and-install-extensions-in-vs-code).
+> Tip: Install any of these extensions by clicking the Extensions View button, typing the name of the extension in the Search box, and clicking **Install**. See more instructions [here](https://code.visualstudio.com/docs/editor/extension-gallery.md#browse-and-install-extensions-in-vs-code).
 
 ## Annotator
 

docs/editor/extension-gallery.md

@@ -78,16 +78,6 @@ Alternatively, you can disable all extensions through the command line with the
 code --disable-extensions /path/to/workspace
 ```
 
-## Browse Extensions
-
-Additionally, you can browse and search for VS Code extensions through the [VS Code Marketplace](https://marketplace.visualstudio.com/VSCode) site. Below is a sampling of the most popular extensions.
-
-<div class="marketplace-extensions-top"></div>
-
-You can review our handy **Featured**, **Most Popular**, and **Recently Added** extension lists and filter by **Category** (Debuggers, Languages, Linters, etc).
-
-![marketplace-categories](images/extension-gallery/marketplace-categories.png)
-
 ## Command Line Extension Management
 
 To make it easier to automate and configure VS Code, it is possible to list, install, and uninstall extensions from the [command line](/docs/editor/command-line.md). When identifying an extension, provide the full name of the form `publisher.extension`, for example `donjayamanne.python`.
@@ -101,6 +91,20 @@ code --uninstall-extension ms-vscode.csharp
 code --disable-extensions
 ```
 
+## Install from a VSIX
+
+You can manually install a VS Code extension packaged in a `.vsix` file. Using the **Install from VSIX...** command in the Extensions View command drop-down, or the **Extensions: Install from VSIX...** command in the **Command Palette**, simply point to the `.vsix` file.
+
+You can also install using the VS Code `--install-extension` command line switch providing the path to the `.vsix` file.
+
+```
+code --install-extension myextension.vsix
+```
+
+You may provide the `--install-extension` multiple times on the command line to install multiple extensions at once.
+
+If you'd like to learn more about packaging and publishing extensions, see our [Publishing Extensions](/docs/extensions/publish-extension.md) topic in the Extension Authoring section.
+
 ## Workspace Recommended Extensions
 
 Often you have a set of extensions that makes working with a particular workspace or programming language more productive and you'd like to share this list with your team or colleagues. You can create a recommended list of extensions for a workspace with the **Extensions: Configure Workspace Recommended Extensions** command. This creates a `extensions.json` file located in the workspace `.vscode` folder where you can list extensions.
@@ -154,7 +158,15 @@ For example, the [ESLint extension](https://marketplace.visualstudio.com/items?i
 https://dbaeumer.gallery.vsassets.io/_apis/public/gallery/publisher/dbaeumer/extension/vscode-eslint/0.10.18/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage
 ```
 
-Once you've downloaded an extension, you can side load it by renaming the `.zip` filename extension to `.vsix` and then using the **Install from VSIX...** command in the Extensions View command dropdown. See [Installing Extensions](/docs/extensions/install-extension.md#install-a-packaged-extension-vsix) for more details.
+Once you've downloaded an extension, you can side load it by renaming the `.zip` filename extension to `.vsix` and then using the **Install from VSIX...** command in the Extensions View command drop-down.
+
+**Q: Where are extensions installed?**
+
+**A**: Extensions are installed in your extensions folders. Depending on your platform, the global location is in the following folders:
+
+* **Windows** `%USERPROFILE%\.vscode\extensions`
+* **Mac** `~/.vscode/extensions`
+* **Linux** `~/.vscode/extensions`
 
 **Q: Can VS Code read TextMate bundles directly?**
 

docs/editor/userdefinedsnippets.md

@@ -21,7 +21,7 @@ The snippet syntax follows the [TextMate snippet syntax](https://manual.macromat
 
 ## Add Snippets from the Marketplace
 
-Many [extensions](/docs/editor/extension-gallery.md) on the VS Code [Marketplace](https://marketplace.visualstudio.com/vscode) include snippets.  If you find one you want to use, simply install it and restart VS Code and the new snippet will be available (see [here](/docs/editor/extension-gallery#_browse-and-install-extensions-in-vs-code) for more instructions on installing an extension).
+Many [extensions](/docs/editor/extension-gallery.md) on the VS Code [Marketplace](https://marketplace.visualstudio.com/vscode) include snippets.  If you find one you want to use, simply install it and restart VS Code and the new snippet will be available (see [here](/docs/editor/extension-gallery.md#browse-and-install-extensions-in-vs-code) for more instructions on installing an extension).
 
 Below are some popular extensions which include snippets in their language support:
 

docs/extensions/example-word-count.md

@@ -273,7 +273,7 @@ Events are another example where `onDid*` event subscriber methods return a Disp
 
 ## Installing your Extension Locally
 
-So far, the extension you have written only runs in a special instance of VS Code, the Extension Development Host instance. To make your extension available to all VS Code instances, copy the extension folder contents to a new folder under [your `.vscode/extensions` folder](/docs/extensions/install-extension.md#your-extensions-folder).
+So far, the extension you have written only runs in a special instance of VS Code, the Extension Development Host instance. To make your extension available to all VS Code instances, copy the extension folder contents to a new folder under [your `.vscode/extensions` folder](/docs/extensions/yocode.md#your-extensions-folder).
 
 ## Publishing your Extension
 

docs/extensions/install-extension.md

@@ -64,18 +64,16 @@ You can have a great editing experience for your programming language with simpl
 
 ## Writing an Extension
 
-Extensions can be written in either TypeScript or JavaScript.  VS Code offers a first class extension development experience where you can [develop, build, run, test and debug](/docs/extensions/debugging-extensions.md) all from within VS Code itself.
-
-## Install and Share
+There is a Yeoman [extension generator](/docs/extensions/yocode.md) which makes it very easy to create simple extension projects. These are great for starting out  and you can also find existing extension [examples](/docs/extensions/samples.md).
 
-Once you have a working extension, you can [install it or share it with others](/docs/extensions/install-extension.md).   We support local installation, private sharing, or publishing to the public [Extension Marketplace](/docs/editor/extension-gallery.md).
+Extensions can be written in either TypeScript or JavaScript.  VS Code offers a first class extension development experience where you can [develop, build, run, test and debug](/docs/extensions/debugging-extensions.md) all from within VS Code itself.
 
 ## Testing Extensions
 
 We also have great support for [writing and running tests](/docs/extensions/testing-extensions.md) for your extension.  You can easily create integration tests which call the VS Code APIs and test your code in a running VS Code instance.
 
 ## Next Steps
 
-* [Your First Extension](/docs/extensions/example-hello-world.md) - Try creating a simple Hello World extension
-* [Extension API](/docs/extensionAPI/overview.md) - Learn about the VS Code extensibility APIs
-* [Samples](/docs/extensions/samples.md) - A list of extension samples you can review and build
+* [Your First Extension](/docs/extensions/example-hello-world.md) - Try creating a simple Hello World extension.
+* [Extension API](/docs/extensionAPI/overview.md) - Learn about the VS Code extensibility APIs.
+* [Extension Examples](/docs/extensions/samples.md) - A list of extension samples you can review and build.

docs/extensions/overview.md

@@ -113,7 +113,11 @@ You may want to simply package extensions without publishing them to the store.
 vsce package
 ```
 
-This will package your extension into a `.vsix` file and place it in the current directory. It's possible to install `.vsix` files into Visual Studio Code. See [Installing Extensions](/docs/extensions/install-extension.md) for more details.
+This will package your extension into a `.vsix` file and place it in the current directory. It's possible to install `.vsix` files into Visual Studio Code. See [Install from a VSIX](/docs/editor/extension-gallery.md#install-from-a-vsix) for more details.
+
+### Sharing Privately with Others
+
+If you want to share your extension with others privately, you can simply send them your packaged extension `.vsix` file.
 
 ## Visual Studio Code Compatiblity
 
@@ -192,7 +196,7 @@ This will always invoke the [TypeScript](http://www.typescriptlang.org/) compile
 ## Next Steps
 
 * [Extension Marketplace](/docs/editor/extension-gallery.md) - Learn more about VS Code's public extension Marketplace.
-* [Installing Extensions](/docs/extensions/install-extension.md) - Learn about other options for installing and sharing extensions.
+* [Testing Extensions](/docs/extensions/testing-extensions.md) - Add tests to your extension project to ensure high quality.
 
 ## Common Questions
 

docs/extensions/publish-extension.md

@@ -19,7 +19,7 @@ You can also add new TextMate theme files (.tmTheme) to your VS Code installatio
 
 ![yo code theme](images/themes/yocodetheme.png)
 
-Copy the generated theme folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/install-extension.md#your-extensions-folder) and restart VS Code.
+Copy the generated theme folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/yocode.md#your-extensions-folder) and restart VS Code.
 
 Open the Color Theme picker theme with **File** > **Preferences** > **Color Theme** and you can see your theme in the dropdown.  Arrow up and down to see a live preview of your theme.
 
@@ -213,7 +213,7 @@ The final generator output has two files: an extension manifest `package.json` w
 └── package.json                // extension's manifest
 ```
 
-Copy the generated snippets folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/install-extension.md#your-extensions-folder) and restart VS Code.
+Copy the generated snippets folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/yocode.md#your-extensions-folder) and restart VS Code.
 
 ## Sharing Your Snippets in the Marketplace
 
@@ -306,7 +306,7 @@ For more details check out the [languages contribution point documentation](/doc
 
 The generated `vsc-extension-quickstart.md` file also contains more information on how to run and debug your extension.
 
-To use your extension in your stable VS Code installation, copy the complete output folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/install-extension.md#your-extensions-folder) and restart VS Code.  When you restart VS Code, your new language will be visible in the language specifier drop-down and you'll get full colorization and bracket/tag matching for files matching the language's file extension.
+To use your extension in your stable VS Code installation, copy the complete output folder to a new folder under [your `.vscode/extensions` folder](/docs/extensions/yocode.md#your-extensions-folder) and restart VS Code.  When you restart VS Code, your new language will be visible in the language specifier drop-down and you'll get full colorization and bracket/tag matching for files matching the language's file extension.
 
 ![select ant language](images/themes-snippets-colorizers/antlanguage.png)
 

docs/extensions/themes-snippets-colorizers.md

@@ -82,14 +82,20 @@ Creates an extension that contributes new code snippets.
 
 Once created, open VS Code on the created folder and run the extension to test the snippets. Check out `vsc-extension-quickstart.md` for the next steps.
 
-## Loading an Extension
+## Your extensions folder
 
-To load an extension, you need to copy the files to your VS Code extensions folder. We cover this in detail here: [Installing Extensions](/docs/extensions/install-extension.md#your-extensions-folder).
+To load an extension, you need to copy the files to your VS Code extensions folder `.vscode/extensions`. Depending on your platform it is located in the following folders:
+
+* **Windows** `%USERPROFILE%\.vscode\extensions`
+* **Mac** `~/.vscode/extensions`
+* **Linux** `~/.vscode/extensions`
+
+If you want to load your extension each time VS Code runs, copy your project ('side loading') to a new folder under `.vscode/extensions`. For example: `~/.vscode/extensions/myextension`.
 
 ## Next Steps
 
-* [Publishing Tool](/docs/extensions/publish-extension.md) - Learn how to publish your extensions to the VS Code Marketplace
-* [Hello World](/docs/extensions/example-hello-world.md) - Try the 'Hello World' walkthrough to build your first extension 
+* [Publishing Tool](/docs/extensions/publish-extension.md) - Learn how to publish your extensions to the VS Code Marketplace.
+* [Hello World](/docs/extensions/example-hello-world.md) - Try the 'Hello World' walkthrough to build your first extension.
 
 ## Common Questions
 

docs/extensions/yocode.md

@@ -32,7 +32,6 @@ var areas = {
 	nodejs: new Area('Node.js / JavaScript', 'nodejs', true),
 	extensions: new Area('Extension Authoring', 'extensions', true),
 	extensionapi: new Area('Extensibility Reference', 'extensionAPI', true),
-	tools: new Area('Tools', 'tools', true),
 	supporting: new Area('Supporting', 'supporting', false),
 	other: new Area('Other', 'other', true)
 };