diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19d4367f3..7f9dc8638 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,6 +13,7 @@ By participating, you are expected to uphold this code. Please report unacceptab #### Table Of Contents * [Submitting Issues](#submitting-issues) +* [Your First Contribution](#your-first-contribution) * [Pull Requests](#pull-requests) * [Git Commit Messages](#git-commit-messages) * [CoffeeScript Styleguide](#coffeescript-styleguide) @@ -60,6 +61,13 @@ you're having an issue with Atom core, open an issue on this repository. For more information on how to work with Atom's official packages, see [Contributing to Atom Packages](https://github.com/atom/atom/blob/master/docs/contributing-to-packages.md) +## Your First Contribution + +Unsure where to begin contributing to Atom? You can start by looking through these `beginner` and `help-wanted` issues: + +* [Beginner issues][beginner] +* [Help wanted issues][help-wanted] + ## Pull Requests * Include screenshots and animated GIFs in your pull request whenever possible. @@ -352,3 +360,6 @@ Please open an issue on `atom/atom` if you have suggestions for new labels, and [search-atom-org-label-requires-changes]: https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Aatom+label%3Arequires-changes [search-atom-repo-label-needs-testing]: https://github.com/pulls?q=is%3Aopen+is%3Apr+repo%3Aatom%2Fatom+label%3Aneeds-testing [search-atom-org-label-needs-testing]: https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Aatom+label%3Aneeds-testing + +[beginner]:https://github.com/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3Abeginner+label%3Ahelp-wanted+user%3Aatom+sort%3Acomments-desc +[help-wanted]:https://github.com/issues?q=is%3Aopen+is%3Aissue+label%3Ahelp-wanted+user%3Aatom+sort%3Acomments-desc diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md index 2fc46c0b2..07150394b 100644 --- a/docs/build-instructions/linux.md +++ b/docs/build-instructions/linux.md @@ -7,8 +7,8 @@ Ubuntu LTS 12.04 64-bit is the recommended platform. * OS with 64-bit or 32-bit architecture * C++ toolchain * [Git](http://git-scm.com/) - * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x or 2.x) - * [npm](https://www.npmjs.com/) v1.4.x (bundled with Node.js) + * [Node.js](http://nodejs.org/download/) (0.10.x or above) + * [npm](https://www.npmjs.com/) v1.4.x or above (automatically bundled with Node.js) * `npm -v` to check the version. * `npm config set python /usr/bin/python2 -g` to ensure that gyp uses python2. * You might need to run this command as `sudo`, depending on how you have set up [npm](https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager#ubuntu-mint-elementary-os). @@ -17,7 +17,7 @@ Ubuntu LTS 12.04 64-bit is the recommended platform. ### Ubuntu / Debian * `sudo apt-get install build-essential git libgnome-keyring-dev fakeroot` -* Instructions for [Node.js](https://github.com/nodejs/node-v0.x-archive/wiki/Installing-Node.js-via-package-manager#debian-and-ubuntu-based-linux-distributions). +* Instructions for [Node.js](https://github.com/nodejs/node-v0.x-archive/wiki/Installing-Node.js-via-package-manager#debian-and-ubuntu-based-linux-distributions). * Make sure the command `node` is available after Node.js installation (some systems install it as `nodejs`). * Use `which node` to check if it is available. * Use `sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10` to update it. diff --git a/docs/build-instructions/os-x.md b/docs/build-instructions/os-x.md index 7273a29fd..76da080c9 100644 --- a/docs/build-instructions/os-x.md +++ b/docs/build-instructions/os-x.md @@ -3,7 +3,7 @@ ## Requirements * OS X 10.8 or later - * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x or 2.x) + * [Node.js](http://nodejs.org/download/) (0.10.x or above) * Command Line Tools for [Xcode](https://developer.apple.com/xcode/downloads/) (run `xcode-select --install` to install) ## Instructions diff --git a/docs/build-instructions/windows.md b/docs/build-instructions/windows.md index 600a7479d..74dddf8f8 100644 --- a/docs/build-instructions/windows.md +++ b/docs/build-instructions/windows.md @@ -5,7 +5,7 @@ ### On Windows 7 * [Visual C++ 2010 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4) * [Visual Studio 2010 Service Pack 1](http://www.microsoft.com/en-us/download/details.aspx?id=23691) - * [node.js](http://nodejs.org/download/) (0.10.x or 0.12.x) or [io.js](https://iojs.org) (1.x or 2.x) + * [Node.js](http://nodejs.org/download/) (0.10.x or above) * For 64-bit builds of node and native modules you **must** have the [Windows 7 64-bit SDK](http://www.microsoft.com/en-us/download/details.aspx?id=8279). You may also need the [compiler update for the Windows SDK 7.1](http://www.microsoft.com/en-us/download/details.aspx?id=4422) @@ -20,7 +20,7 @@ * [Visual Studio Express 2013 or 2015 for Windows Desktop](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_2) * For VS 2015, be sure to customize the installation to include Visual C++. It's not installed by default. * Some have experienced issues with Node locating C++ on VS 2015. If so, try VS 2013. - * [node.js](http://nodejs.org/download/) (0.10.x, 0.12.x or 4.x) or [io.js](https://iojs.org) (1.x or 2.x) + * [Node.js](http://nodejs.org/download/) (0.10.x or above) * [Python](https://www.python.org/downloads/) v2.7.x (required by [node-gyp](https://github.com/TooTallNate/node-gyp)) * [GitHub Desktop](http://desktop.github.com/) diff --git a/package.json b/package.json index 85f99309d..037121f42 100644 --- a/package.json +++ b/package.json @@ -103,8 +103,13 @@ "open-on-github": "0.38.0", "package-generator": "0.40.0", "release-notes": "0.53.0", +<<<<<<< HEAD "settings-view": "0.230.0", "snippets": "0.101.0", +======= + "settings-view": "0.230.1", + "snippets": "0.100.0", +>>>>>>> origin/master "spell-check": "0.61.0", "status-bar": "0.79.0", "styleguide": "0.44.0",