From e3a31940c14c096e46549580f8137fa741ede369 Mon Sep 17 00:00:00 2001 From: slodki Date: Wed, 14 Jun 2017 18:36:04 +0200 Subject: [PATCH 1/3] Clarifying README Clarifying product name and its licensing. Related to #60, #1230, #2982, #3029, #5342, #17996. Based on @chrisdias [comment](https://github.com/Microsoft/vscode/pull/2983#issuecomment-183547642) and [comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) --- README.md | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3a10b46310106..2fed83ccb3537 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,23 @@ -# Visual Studio Code - Open Source +# Code - Open Source [![Build Status](https://travis-ci.org/Microsoft/vscode.svg?branch=master)](https://travis-ci.org/Microsoft/vscode) [![Build Status](https://ci.appveyor.com/api/projects/status/vuhlhg80tj3e2a0l/branch/master?svg=true)](https://ci.appveyor.com/project/VSCode/vscode) [![Coverage Status](https://img.shields.io/coveralls/Microsoft/vscode/master.svg)](https://coveralls.io/github/Microsoft/vscode?branch=master) [![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Microsoft/vscode) -[VS Code](https://code.visualstudio.com) is a new type of tool that combines the simplicity of +Code is a new type of tool that combines the simplicity of a code editor with what developers need for their core edit-build-debug cycle. Code provides comprehensive editing and debugging support, an extensibility model, and lightweight integration with existing tools. -VS Code is updated monthly with new features and bug fixes. You can download it for Windows, Mac and Linux on [VS Code's website](https://code.visualstudio.com/Download). To get the latest releases everyday, you can install the [Insiders version of VS Code](https://code.visualstudio.com/insiders). This builds from the master branch and is updated at least daily. -

VS Code in action

+Code is updated monthly with new features and bug fixes. +You can download sources of released versions from [GitHub Releases](https://github.com/Microsoft/vscode/releases). +Building binaries for Windows, OS X and Linux [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source) +are avaiable, but precompiled packages are not distributed here (see Related Products below). + The [`vscode`](https://github.com/microsoft/vscode) repository is where we do development and there are many ways you can participate in the project, for example: * [Submit bugs and feature requests](https://github.com/microsoft/vscode/issues) and help us verify as they are checked in @@ -41,6 +44,20 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope * File a bug in [GitHub Issues](https://github.com/Microsoft/vscode/issues). * [Tweet](https://twitter.com/code) us with other feedback. +## Related Products +Microsoft is distributing its own build as Microsoft Visual Studio Code. +You can download packages for Windows, Mac and Linux on [VS Code's website](https://code.visualstudio.com/Download). + +It's based on Code Open Source with some changes: +* Microsoft branding +* licensed under Microsoft [closed source custom product license](https://code.visualstudio.com/License) (EULA) +* Extension Marketplace supported +* crash reporting and telemetry enabled +* user configuration and extensions stored in different directory then Code - Open Source +* extension debugging supported + +To get the latest releases everyday, you can install the [Insiders version of VS Code](https://code.visualstudio.com/insiders). This builds from the master branch and is updated at least daily. + ## Related Projects Many of the core components and extensions to Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug). From ba9a2f0c3cbb51f6d7d1595890cc746aa3b9f2ee Mon Sep 17 00:00:00 2001 From: slodki Date: Fri, 16 Jun 2017 15:27:09 +0200 Subject: [PATCH 2/3] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fed83ccb3537..a23e6d6746b66 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ It's based on Code Open Source with some changes: * licensed under Microsoft [closed source custom product license](https://code.visualstudio.com/License) (EULA) * Extension Marketplace supported * crash reporting and telemetry enabled -* user configuration and extensions stored in different directory then Code - Open Source +* user configuration and extensions stored in different directory than Code - Open Source * extension debugging supported To get the latest releases everyday, you can install the [Insiders version of VS Code](https://code.visualstudio.com/insiders). This builds from the master branch and is updated at least daily. From 1cbf8473415e5b0d940ea2021fdd6e852905cacb Mon Sep 17 00:00:00 2001 From: slodki Date: Fri, 16 Jun 2017 20:17:16 +0200 Subject: [PATCH 3/3] Add links to VS Code features --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a23e6d6746b66..10b6b6514b843 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ You can download packages for Windows, Mac and Linux on [VS Code's website](http It's based on Code Open Source with some changes: * Microsoft branding * licensed under Microsoft [closed source custom product license](https://code.visualstudio.com/License) (EULA) -* Extension Marketplace supported -* crash reporting and telemetry enabled +* [Extension Marketplace](https://code.visualstudio.com/docs/editor/extension-gallery) supported +* [crash reporting](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-crash-reporting) and [telemetry](https://code.visualstudio.com/docs/supporting/faq#_how-to-disable-telemetry-reporting) enabled * user configuration and extensions stored in different directory than Code - Open Source * extension debugging supported