Update Contributing Docs

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Note that no matter how you contribute, your participation is governed by our
 ### Make changes to the Appium code or docs
 
 Fork the project, make a change, and send a pull request! Please have a look at
-our [Style Guide](/docs/en/contributing-to-appium/style-guide-2.0.md) before
+our [Style Guide](/docs/en/contributing-to-appium/style-guide.md) before
 getting to work.  Please make sure the unit and functional tests pass before
 sending a pull request; for more information on how to run tests, keep reading!
 

docs/cn/contributing-to-appium/appium-from-source.md

@@ -2,7 +2,7 @@
 
 你想从源码运行Appium并帮助修复BUG和添加功能吗？
 真棒！只需要fork工程，添加一个修改，然后发送pull请求即可！
-在开始之前请阅读我们的代码风格指南（[Style Guide](style-guide-2.0.md)。
+在开始之前请阅读我们的代码风格指南（[Style Guide](style-guide.md)。
 在发送pull请求前请确保通过单元和功能测试；关于如何运行测试等更多信息，请继续阅读！
 
 首先，确保你阅读README文件且按照设置说明走。

docs/cn/contributing-to-appium/developers-overview.md

@@ -63,7 +63,7 @@ node.js的原生支持，Appium代码是_被移植_到ES5（JS更为广泛支持
 ### 排查和代码风格
 
 对于所有Appium的JS而言，代码外观和使用感觉同样重要。这包括样式常规，编码模式以及我们解决各种问题时使用的
-库。你应该熟悉我们新的[ES2015 风格指南](/docs/cn/contributing-to-appium/style-guide-2.0.md)。
+库。你应该熟悉我们新的[ES2015 风格指南](/docs/cn/contributing-to-appium/style-guide.md)。
 当转化时，Appium包将自动运行JSHint或其他lint工具，并在代码不符合我们规范的时候提供警告或错误反馈。
 这些工具不一定能顾全我们关心的种种风格问题，所以我们在review代码的时候也应该注意代码规范问题。这不是
 吹毛求疵，而是为了有一个整洁，一致并且可读的代码库。

docs/en/contributing-to-appium/appium-from-source.md

@@ -2,11 +2,20 @@
 
 So you want to run Appium from source and help fix bugs and add features?
 Great! Just fork the project, make a change, and send a pull request! Please
-have a look at our [Style Guide](style-guide-2.0.md) before getting to work.
+have a look at our [Style Guide](style-guide.md) before getting to work.
 Please make sure the unit and functional tests pass before sending a pull
 request; for more information on how to run tests, keep reading!
 
-Make sure you read and follow the setup instructions in the README first.
+### Node.js
+
+Appium is written in JavaScript, and run with the [Node.js](https://nodejs.org/en/) engine. Currently
+version 6+ is supported. While Node.js can be installed globally on the system,
+a version manager is _highly_ recommended.
+* NVM - [https://github.com/creationix/nvm](https://github.com/creationix/nvm)
+* N - [https://github.com/tj/n](https://github.com/tj/n)
+
+Your Node.js installation will include the [NPM](https://www.npmjs.com/) package manager, which Appium
+will need in order to manage dependencies. Appiums supports NPM version 3+.
 
 ### Setting up Appium from Source
 
@@ -17,57 +26,43 @@ instance of an Appium server, and then run your test.
 
 The quick way to get started:
 
-```center
+```
 git clone https://github.com/appium/appium.git
 cd appium
 npm install
-gulp transpile # requires gulp, see below
-npm install -g authorize-ios # for ios only
-authorize-ios                # for ios only
+npm run build
 node .
 ```
 
 ### Hacking on Appium
 
-Make sure you have `ant`, `maven`, `adb` installed and added to system `PATH`, also you
-would need the android-16 sdk (for Selendroid) and android-19 sdk installed.
-From your local repo's command prompt, install the following packages using the
-following commands (if you didn't install `node` using Homebrew, you might have
-to run `npm` with sudo privileges):
-
-```center
-npm install -g mocha
-npm install -g gulp
-npm install -g gulp-cli
-npm install -g appium-doctor && appium-doctor --dev
+Install the [appium-doctor](https://github.com/appium/appium-doctor) tool, and run it to verify all of the
+dependencies are set up correctly (since dependencies for building Appium
+are different from those for simply running it):
+```
+npm install -g appium-doctor
+appium-doctor --dev
+```
+Install the Node.js dependencies:
+```
 npm install
-gulp transpile
 ```
 
-The first two commands install test and build tools (`sudo` may not be
-necessary if you installed node.js via Homebrew). The third command verifies
-that all of the dependencies are set up correctly (since dependencies for
-building Appium are different from those for simply running Appium) and fourth
-command installs all app dependencies and builds supporting binaries and test
-apps. The final command transpiles all the code so that `node` can run it.
-
 When pulling new code from GitHub, if there are changes to `package.json` it
 is necessary to remove the old dependencies and re-run `npm install`:
 
-```center
-rm -rf node_modules
-npm install
-gulp transpile
+```
+rm -rf node_modules && npm install
 ```
 
 At this point, you will be able to start the Appium server:
 
-```center
+```
 node .
 ```
 
 See [the server documentation](/docs/en/writing-running-appium/server-args.md)
-for a full list of arguments.
+for a full list of command line arguments that can be used.
 
 #### Hacking with Appium for iOS
 
@@ -80,36 +75,37 @@ have to modify your `/etc/authorization` file in one of two ways:
 2. Run the following command which automatically modifies your
    `/etc/authorization` file for you:
 
-    ```center
+    ```
     npm install -g authorize-ios
     sudo authorize-ios
 	```
 
 At this point, run:
 
-```center
-rm -rf node-modules
-npm install
-gulp transpile
+```
+rm -rf node-modules && npm install
 ```
 
 Now your Appium instance is ready to go. Run `node .` to kick up the Appium server.
 
 #### Hacking with Appium for Android
 
+To work on Android, make sure you have `ant`, `maven`, and `adb` installed 
+and added to system `PATH` environment variable. Also you would need the 
+android-16 sdk (for `Selendroid`) and android-19+ sdk installed.
+From your local repo's command prompt, install/run the following:
+
 Set up Appium by running:
 
-```center
-rm -rf node-modules
-npm install
-gulp transpile
+```
+rm -rf node_modules && npm install
 ```
 
 Make sure you have one and only one Android emulator or device running, e.g.,
 by running this command in another process (assuming the `emulator` command is
 on your path):
 
-```center
+```
 emulator -avd <MyAvdName>
 ```
 
@@ -123,12 +119,44 @@ update everything necessary. You will also need to do this when Appium bumps
 its version up. Prior to running `npm install` it is recommended to remove
 all the old dependencies in the `node_modules` directory:
 
-```center
-rm -rf node-modules
-npm install
-gulp transpile
+```
+rm -rf node_modules && npm install
 ```
 
+### Different packages
+
+Appium is made up of a number of different packages. While it is often possible
+to work in a single package, it is also often the case that work, whether fixing
+a bug or adding a new feature, requires working on multiple packages simultaneously.
+
+Unfortunately the dependencies installed when running `npm install` are those that
+have already been published, so some work is needed to link together local development
+versions of the packages that are being worked on.
+
+In the case where one package, `A`, depends on another package, `B`, the following steps 
+are necessary to link the two:
+1. In one terminal, enter into package `B`
+    ```
+    cd B
+    ```
+2. Use [NPM link](https://docs.npmjs.com/cli/link) to create symbolic link to this package
+    ```
+    npm link
+    ```
+3. In another terminal, enter into package `A`
+    ```
+    cd A
+    ```
+4. Use [NPM link](https://docs.npmjs.com/cli/link) to link the dependent package `B` to the development version
+    ```
+    npm link B
+    ```
+
+Now the version of `B` that `A` uses will be your local version. Remember, however, that
+changes made to the JavaScript will only be available when they have been transpiled, so
+when you are going to test from package `A`, run `npm run build` in the directory for 
+package `B`.
+
 ### Running Tests
 
 First, check out our documentation on [running tests in
@@ -138,16 +166,23 @@ system is set up properly for the platforms you desire to test on.
 Once your system is set up and your code is up to date, you can run unit tests
 with:
 
-```center
-gulp once
+```
+npm run test
 ```
 
 You can run functional tests for all supported platforms (after ensuring that
 Appium is running in another window with `node .`) with:
 
-```center
-gulp e2e-test
 ```
+npm run e2e-test
+```
+
+### Committing code
+
+Each Appium package installs a pre-commit hook which will run the [linter](https://eslint.org/) and
+the unit tests before the commit is made. Any error in either of these will stop
+the commit from occurring.
 
-Before committing code, please run `gulp once` to execute some basic tests and
-check your changes against code quality standards.
+Once code is committed and a [pull request](https://help.github.com/articles/about-pull-requests/) 
+is made to the correct Appium respository on [GitHub](https://github.com/), Appium build system 
+will run all of the functional tests.

docs/en/contributing-to-appium/dev-tools.md

@@ -0,0 +1,16 @@
+## Appium development commands
+
+Each Appium package has a number of NPM scripts that are used to automate
+development tasks:
+
+| Task             | Description                                            |
+|------------------|--------------------------------------------------------|
+| npm run build    | Transpile code into the `build` directory              |
+| npm run lint     | Runs ESLint                                            |
+| npm run test     | Cleans, lints, transpiles, and runs unit tests         |
+| npm run e2e-test | Tranpiles and runs functional tests                    |
+| npm run watch    | Automatically runs `test` command when code is changed |
+| npm run mocha    | Gives access to `mocha` test runner                    |
+
+In addition, the main Appium package has a task `npm generate-docs` which generates
+the command documentation.

docs/en/contributing-to-appium/developers-overview.md

@@ -93,7 +93,7 @@ Most Appium packages have this as the default behavior when running `gulp`.
 It's important for all of Appium's JS to look and feel the same. This includes
 style conventions as well as coding patterns and which libraries we use to
 solve various problems. You should get familiar with our new [ES2015 Style
-Guide](/docs/en/contributing-to-appium/style-guide-2.0.md). When transpiling,
+Guide](/docs/en/contributing-to-appium/style-guide.md). When transpiling,
 Appium packages will automatically run ESLint or other lint tools and provide
 warning or error feedback if the code doesn't conform to our style. These tools
 are not necessarily exhaustive of the kinds of style issues we care about, so
@@ -147,12 +147,12 @@ package if you want to publish it. Ownership is managed by the Appium
 committers; talk to @jlipps or @imurchie if you believe you should be an owner
 and are not):
 
-0. `rm -rf node_modules && npm install` and run tests to make sure a clean install works.
-0. Determine whether we have a patch (bugfix), minor (feature), or major (breaking) release according to the principles of [SemVer](http://semver.org/) (see also this explanation of [how SemVer works with NPM](https://docs.npmjs.com/getting-started/semantic-versioning)).
-0. Update the `CHANGELOG` and/or `README` with any appropriate changes and commit. Most subpackages don't have a `CHANGELOG`.
-0. Run `npm version <version-type>` with the appropriate version type.
-0. Push the appropriate branch to GitHub, and don't forget to include the `--tags` flag to include the tag just created by `npm version`.
-0. Run `npm publish` (with `--tag beta` if this isn't an official release).
+1. `rm -rf node_modules && npm install` and run tests to make sure a clean install works.
+1. Determine whether we have a patch (bugfix), minor (feature), or major (breaking) release according to the principles of [SemVer](http://semver.org/) (see also this explanation of [how SemVer works with NPM](https://docs.npmjs.com/getting-started/semantic-versioning)).
+1. Update the `CHANGELOG` and/or `README` with any appropriate changes and commit. Most subpackages don't have a `CHANGELOG`.
+1. Run `npm version <version-type>` with the appropriate version type.
+1. Push the appropriate branch to GitHub, and don't forget to include the `--tags` flag to include the tag just created by `npm version`.
+1. Run `npm publish` (with `--tag beta` if this isn't an official release).
 
 For the main Appium packages, all the above steps must be taken, but with
 several changes. One reason is that for the main package we use NPM shrinkwrap
@@ -175,20 +175,20 @@ checked in to GitHub along with changes to `package.json`. With npm 5+ there is
 also a `package-lock.json` file produced. During the shrinkwrap process this is
 converted into the `npm-shrinkwrap.json` file.
 
-0. Remove the NPM shrinkwrap and package-lock JSON files if they exists.
-0. `rm -rf node_modules && npm install` and run tests to make sure a clean install works.
-0. Determine whether we have a `patch` (bugfix), `minor` (feature), or `major` (breaking) release according to the principles of SemVer.
-0. Update `package.json` with the appropriate new version.
-0. Update the CHANGELOG/README with appropriate changes and submit for review as a PR, along with shrinkwrap and `package.json` changes. Wait for it to be merged, then pull it into the release branch.
-0. `rm -rf node_modules && npm install --production` to get just the production dependencies.
-0. `npm shrinkwrap` to write the new NPM shrinkwrap JSON file, and commit this file.
-0. Create a tag of the form `v<version>` on the release branch (usually a minor branch like `1.5` or `1.4`), with: `git tag -a v<version>`, e.g., `git tag -a v1.5.0`. This is not necessary for beta versions.
-0. Push the tag to upstream: `git push --tags <remote> <branch>`
-0. Install dev dependencies (or at least `gulp` and `appium-gulp-plugins`), and undo the changes to the NPM shrinkwrap JSON file (e.g., `git checkout -- npm-shrinkwrap.json`).
-0. Run `npm publish` (with `--tag beta` if this isn't an official release).
-0. Remove the NPM shrinkwrap JSON file from Git and push the changes
-0. Update the docs at appium.io. Check out the appium.io repo from github, check out the `gh-pages` branch and pull latest. Run `rake publish`.
-0. Create a new release on GitHub: go to `https://github.com/appium/appium/releases/tag/v<VERSION>` and hit "Edit Tag". Make the release name `<VERSION>` (e.g., `2.0.5`), then paste in the changelog (but not the changelog header for this version). If it's a beta release, mark as pre-release.
-0. Create a new post on discuss.appium.io announcing the release. Post it in the "News" category. Paste in the changelog and any choice comments. Pin it and unpin the previous release post.
-0. Begin process of releasing `appium-desktop`.
-0. Notify @jlipps to so he can tweet a link to the discuss post.
+1. Remove the NPM shrinkwrap and package-lock JSON files if they exists.
+1. `rm -rf node_modules && npm install` and run tests to make sure a clean install works.
+1. Determine whether we have a `patch` (bugfix), `minor` (feature), or `major` (breaking) release according to the principles of SemVer.
+1. Update `package.json` with the appropriate new version.
+1. Update the CHANGELOG/README with appropriate changes and submit for review as a PR, along with shrinkwrap and `package.json` changes. Wait for it to be merged, then pull it into the release branch.
+1. `rm -rf node_modules && npm install --production` to get just the production dependencies.
+1. `npm shrinkwrap` to write the new NPM shrinkwrap JSON file, and commit this file.
+1. Create a tag of the form `v<version>` on the release branch (usually a minor branch like `1.5` or `1.4`), with: `git tag -a v<version>`, e.g., `git tag -a v1.5.0`. This is not necessary for beta versions.
+1. Push the tag to upstream: `git push --tags <remote> <branch>`
+1. Install dev dependencies (or at least `gulp` and `appium-gulp-plugins`), and undo the changes to the NPM shrinkwrap JSON file (e.g., `git checkout -- npm-shrinkwrap.json`).
+1. Run `npm publish` (with `--tag beta` if this isn't an official release).
+1. Remove the NPM shrinkwrap JSON file from Git and push the changes
+1. Update the docs at appium.io. Check out the appium.io repo from github, check out the `gh-pages` branch and pull latest. Run `rake publish`.
+1. Create a new release on GitHub: go to `https://github.com/appium/appium/releases/tag/v<VERSION>` and hit "Edit Tag". Make the release name `<VERSION>` (e.g., `2.0.5`), then paste in the changelog (but not the changelog header for this version). If it's a beta release, mark as pre-release.
+1. Create a new post on discuss.appium.io announcing the release. Post it in the "News" category. Paste in the changelog and any choice comments. Pin it and unpin the previous release post.
+1. Begin process of releasing `appium-desktop`.
+1. Notify @jlipps to so he can tweet a link to the discuss post.

docs/en/contributing-to-appium/how-to-write-docs.md

@@ -44,10 +44,10 @@ files in `docs/en/commands` and then they need to be committed and pushed.
 
 ### Adding Documents to Appium.io
 
-Markdown files in `docs/` aren't automatically added to the site. To add a document to https://appium.io
+Markdown files in `docs/` aren't automatically added to the site. To add a document to [appium.io](https://appium.io)
 you need to add it as an entry in the appropriate location in the table of
 contents, [toc.js](https://github.com/appium/appium/blob/master/docs/toc.js)
 
 #### Publishing
 
-To publish documentation on appium.io see [appium.io](https://github.com/appium/appium.io).
+To publish documentation on [appium.io](https://appium.io) see [appium.io (Github)](https://github.com/appium/appium.io).