diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7e2b82410f..618f824c6e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,9 +101,9 @@ To add a page such as a new guide or API documentation:
 
 - Add the new page to the relevant directory under [`source`](/source).
 - Link to your new page in the [`sidebar.yml`](/source/_data/sidebar.yml).
-- Add translations for the sidebar link (for English, this is located in [`en.yml`](/themes/cypress/languages/en.yml)).
+- Add translations for the sidebar link for each supported language (for English, this is located in [`en.yml`](/themes/cypress/languages/en.yml)).
 - Build the documentation site locally so that you can visually inspect your new page and the links to it.
-- Copy over the new page to other language translations - Japanese docs in [`source/ja`](/source/ja), Chinese docs in [`source/zh-cn`](/source/zh-cn).
+- Commit the new file using git - we auto-generate the doc to display within each supported language, this auto-generation depends on the file existing in git.
 - Submit a [pull request](#Pull-Requests) for your change.
 
 #### A Worked Example
@@ -167,6 +167,8 @@ Our currently supported languages can be found at [`/source/_data/languages.yml`
 
 Translate existing documentation then submit a [pull request](#Pull-Requests) for your change.
 
+**Note:** When adding a new doc file to the English source, the English file will need to be commited to git before the translated file is auto-generated.
+
 If a page does not have a translation, then a pre-start step copies the English file to the language folder. These copies should NOT be committed into the source code. Only when the file has been translated you can add it to the source code with `git add --force source/<language>/.../file.md` and this file will not be overwritten by the English file.
 
 ## Committing Code
diff --git a/source/_changelogs/3.5.0.md b/source/_changelogs/3.5.0.md
new file mode 100644
index 0000000000..ebedfad10c
--- /dev/null
+++ b/source/_changelogs/3.5.0.md
@@ -0,0 +1,104 @@
+# 3.5.0
+
+*Released 10/2/2019*
+
+**Features:**
+
+- We now record video during `cypress run` in Chrome, Chromium, and Canary browsers. This requires passing the name or path of the Chrome browser to the {% url "`--browser` flag" command-line#cypress-run-browser-lt-browser-name-or-path-gt %}. Addresses {% issue 4608 %}.
+- There is a new {% url "`.rightclick()`" rightclick %} command to right click on DOM elements. Addresses {% issue 53 %}.
+- Cypress now accepts a {% url "`--config-file` argument" command-line#cypress-run-config-file-lt-config-file-gt %} to specify a different file to be used for Cypress configuration. You can also pass `false` to the `--config-file` to not use any configuration file. Addresses {% issue 1369 %}.
+- You can now use your system's Node version by setting the {% url "`nodeVersion`" configuration#Node-version %} to `system` in your configuration. This Node version will be used to build files in your {% url "`integrationFolder`" configuration#Folders-Files %} and {% url "`supportFile`"  configuration#Folders-Files %} and also be used to execute code in your {% url "`pluginsFile`"  configuration#Folders-Files %}. If not set, Cypress will continue to use the Node version bundled with Cypress. Addresses {% issue 4432 %}.
+- {% url "`.dblclick()` dblclick %} now accepts `position`, `x`, and `y` arguments. Addresses {% issue 116 %}.
+- {% url "`.dblclick()` dblclick %} now accepts `force` and `multiple` in its `options`. Addresses {% issue 116 %}.
+- {% url "`.screenshot()`" screenshot %} now accepts a `padding` argument when screenshotting elements that will alter the dimensions of the screenshot of the element. Addresses {% issue 4440 %}.
+- {% url "`cy.visit()`" visit %} now accepts a `qs` option representing an object of query paramaters to be used in the URL. Addresses {% issue 5034 %}.
+- {% url "`cy.viewport()`" viewport %} now allows for viewport sizes up to 4,000 pixels. Addresses {% issue 5181 %}.
+- {% url "`cy.viewport()`" viewport %} accepts new size presets for `iphone-xr`, `iphone-x`, `samsung-s10` and `samsung-note9`. Addresses {% issue 4967 %}.
+- Passing a `~` to `CYPRESS_CACHE_FOLDER` will automatically resolve to the user's home directory. Addresses {% issue 5386 %}.
+
+**Bugfixes:**
+
+- {% url "`.dblclick()` dblclick %} and {% url "`.click()`" click %} now fire all appropriate mouse events including `mouseover`, `mousemove`, `mouseout`, `pointerdown`, `pointerup`, and `pointermove`. Fixes {% issue 1016 %}, {% issue 1847 %}, {% issue 2045 %}, {% issue 2521 %}, {% issue 2768 %}, {% issue 2928 %}, {% issue 2957 %}, and {% issue 3224 %}.
+- We updated {% url "`.dblclick()` dblclick %} to follow the same actionability checks as {% url "`.click()`" click %}. Fixes {% issue 3798 %}.
+- Coordinates clicked during {% url "`.click()`" click %} are now correct if the element being clicked is within an iframe. Fixes {% issue 4347 %}.
+- We now allow {% url "`.type()`" type %} to be used on any DOM element. The element will receive all of the type events. Fixes {% issue 2166 %} and {% issue 3661 %}.
+- If a typeable element gains focus during {% url "`.type()`" type %}, Cypress now continues typing into the newly focused element. Fixes {% issue 2240 %}.
+- We now correctly borrow the property getter for `maxLength` when using {% url `.type()` type %} on an input. Fixes {% issue 4587 %}.
+- We fixed an issue where `datetime-local` inputs would not have their `value` updated during {% url "`.type()`" type %}. Fixes {% issue 2613 %}.
+- {% url "`.type()`" type %} now allows you to type `-` into number inputs with text selection. Fixes {% issue 4767 %}.
+- We now fire an `input` event when using {% url "`.type()`" type %} typing `{enter}` inserts a newline. Fixes {% issue 4870 %}.
+- We no longer input text when non-`{shift}` modifier keys are typed in {% url "`.type()`" type %}. Fixes {% issue 5424 %}.
+- We now properly send the `code` property during keyboard events triggered during {% url "`.type()`" type %}. Fixes {% issue 3722 %}
+- Cypress now sends `screenX` and `screenY` properties to events triggered using {% url "`.trigger()`" trigger %}. Fixes {% issue 3187 %}.
+- We fixed a bug where Cypress could not intercept traffic sent through {% url "`cy.visit()`" visit %} to IP addresses over HTTPS, leading to `ERR_SSL_VERSION_OR_CIPHER_MISMATCH` errors. Fixes {% issue 771 %}.
+- We fixed a bug introduced in {% url "3.3.0" changelog#3-3-0 %} where some HTTPS sites failed to load during {% url "`cy.visit()`" visit %} and {% url "`cy.request()`" request %} with a "handshake failed" error. Fixes {% issue 4394 %}.
+- We fixed a bug where ECC SSL Certificates were not supported during {% url "`cy.visit()`" visit %} that was introduced in {% url "3.3.0" changelog#3-3-0 %}. Fixes {% issue 4368 %}.
+- We fixed an issue introduced in {% url "3.4.0" changelog#3-4-0 %} that would cause the Selector Playground to not properly highlight the currently hovered element. Fixes {% issue 4872 %}.
+- {% url "`Cypress.env()`" env %} now escapes `<script>` tags in the configuration file. Fixes {% issue 4952 %}.
+- Cypress now properly handles converting responses of `content-type` `application/vnd.api+json` to JSON. Fixes {% issue 5165 %}.
+- XHR responses in {% url "`cy.route()`" route %} that exceed 80kb in size no longer fail with an `ERR_EMPTY_RESPONSE` error. Fixes {% issue 76 %}.
+- Cypress no longer crashes with `dest.end` errors on Windows machines. Fixes {% issue 2181 %}.
+- The `onFocus` event no longer incorrectly fires on hidden elements. This fixes an issue introduced in {% url "3.3.2" changelog#3-3-2 %}. Fixes {% issue 4898 %}.
+- You can now call {% url "`.click()`" click %} on inputs or textareas that are `readonly`. This fixes an issue introduced in {% url "3.4.1" changelog#3-4-1 %}. Fixes {% issue 4874 %}.
+- Cypress no longer crashes with a `"port" option should be a number or string` error when receiving an erroneous HTTP CONNECT. Fixes {% issue 3250 %}.
+- Cypress tests now timeout if there are no Cypress commands enqueue and the `done()` callback is not called within the `commandTimeout`. Fixes {% issue 1075 %}, {% issue 2478 %}, {% issue 3349 %}, and {% issue 4790 %}.
+- We fixed a bug where Cypress would exit with an `ENOTCONN` error at the end of a test run when using Node >12.11.0 on Windows OS. Fixes {% issue 5241 %}.
+- We fixed a bug where the Chrome policy warnings introduced in {% url "3.4.0" changelog#3-4-0 %} would not appear. Fixes {% issue 4986 %}.
+- We improved the way that cookies are handled for Chrome browsers. This fixes an issue when parsing cookies that were set with a domain beginning with a `.` in Chrome 77. Fixes {% issue 5142 %} and {% issue 5206 %}.
+- We fixed a bug when visiting an application that does an HTTP request to a `.js` file containing Unicode transferred using `Content-Encoding: gzip` that could cause the JavaScript file to become corrupted. Fixes {% issue 1746 %}.
+- We now normalize the Cypress cache folder to resolve in the current folder and not with respect to the `node_modules/cypress` folder. Fixes {% issue 2364 %}.
+
+**Misc:**
+
+- Cypress now displays a more precise error message when checking an element's visibility if an element is detached from the DOM. Addresses {% issue 4946 %}.
+- We increased the timeout to wait for Xvfb to start from 5 seconds to 30 seconds. This should resolve some issues where the error `Could not start Xvfb` was being thrown because Xvfb could not start within the allowed time. Addresses {% issue 5110 %}.
+- We now warn when using `cypress run` from the binary directly (not from an npm module) since this is not its intended use. Addresses {% issue 1573 %}.
+- We now warn on {% url "`cy.visit('file://...)`" visit %} to explain that this url format is not supported and suggest visiting a relative HTML file. Addresses {% issue 4452 %}.
+- Setting the reserved `CYPRESS_ENV` environment variable will now throw an error. Addresses {% issue 1621 %}.
+- We now throw a better error when passing in an Object to the {% url "`browser`" browser-launch-api %} argument of the Browser Launch API explaining that a String is expected instead. Addresses {% issue 4966 %}.
+- An error will now be thrown if an invalid `name` or `value` is supplied to {% url "`cy.setCookie()`" setcookie %}, matching the RFC 6265 compliant validation of cookie names and values. Addresses {% issue 5206 %}.
+- Passing an invalid type to the 2nd argument of {% url "`cy.get()`" get %} now throws an error explaining that an `options` Object is expected. Addresses {% issue 2953 %}.
+- We now throw a more helpful error message during {% url "`cy.screenshot()`" screenshot %} that would result in a screenshot with 0 width or height. Addresses {% issue 5149 %}.
+- Stdout printed during `cypress run` no longer truncates text such a filenames and instead wraps the text to fit within the width of the terminal. Addresses {% issue 4977 %}.
+- We now display up to 2,000 characters of HTTP property values within error messages during {% url "`cy.request()`" request %} errors. Addresses {% issue 3145 %}.
+- Cypress now always considers `localhost` to be in `NO_PROXY`. To make Cypress send traffic for `localhost` through the proxy, you will now have to pass `<-loopback>` in `NO_PROXY`. Addresses {% issue 4780 %}.
+- We changed the way cookies are set in {% url "`cy.visit()`" visit %} to more closely match the browser's  behavior when setting cookies, particularly when using `fetch` with cookies. Addresses {% issue 4433 %}.
+- We've added more flags to send to Chrome upon launch that should help with issues encountered during browser automation including `--disable-backgrounding-occluded-window`, `--disable-breakpad`, `--disable-ipc-flooding-protection`, `--password-store=basic`, and `--use-mock-keychain`. Addresses {% issue 5132 %} and {% issue 3633 %}.
+- Scrolling the specs list now only scrolls the list of spec files and no longer scrolls the search and filter bar. Addresses {% issue 4904 %}.
+- We fixed some layout issues within the Test Runner that were introduced in {% url "3.4.1" changelog#3-4-1 %}. Addresses {% issue 4888 %}, {% issue 4912 %}, and {% issue 4959 %}.
+- The counter badge for spies and stubs no longer appears visually cut off. Fixes {% issue 4822 %}.
+- TypeScript 3.6.2 no longer errors due to outdated jQuery types. Addresses {% issue 5065 %}.
+- We updated types for {% url "`Cypress.Commands.overwrite()`" custom-commands %} to not allow an `options` object as an argument. Addresses {% issue 5341 %}.
+- We added `failures` and `message` types when a run fails using the {% url "Module API" module-api %}. Addresses {% issue 5335 %}.
+- We're continuing to make process in converting our codebase from CoffeeScript to JavaScript. Addresses {% issue 2690 %} in {% PR 4869%}, {% PR 4906 %}, {% PR 5096 %},  {% PR 5107 %}, {% PR 5156 %}, {% PR 5173 %}, and {% PR 5352 %}.
+
+**Documentation Changes:**
+
+- Added a {% url "`.rightclick()`" rightclick %} doc.
+- Added a {% url "Webinars" webinars-media %} doc containing videos of all of the official Cypress webcasts.
+- Updated the {% url "`.dblclick()`" dblclick %} doc to include new `position`, `x`, and `y` arguments plus `force` and `multiple` options.
+- Added the `--config-file` argument to {% url "Command Line" command-line %} and {% url "Module API" module-api %} doc.
+- Added the `nodeVersion` argument to {% url "Configuration" configuration %} doc and mentioned its uses in the {% url "Plugins Guide" plugins-guide %} and {% url "Writing a Plugin" writing-a-plugin %} doc.
+- Updated all docs to mention 'configuration file' instead of static `cypress.json` file since this is not configurable via a `--config-file` argument.
+- Added `qs` option to {% url "`cy.visit()`" visit#Arguments %} with examples.
+- Added `padding` option to {% url "`cy.screenshot()`" screenshot %} with examples.
+- Updated the {% url "`cy.viewport()`" viewport %} doc to have a max viewport size of `4000`.
+- Added newly supported viewport sizes to the {% url "`cy.viewport()`" viewport %} doc.
+- Documented new keyboard shortcuts in the {% url 'Test Runner' test-runner %} doc.
+- Added a new section on troubleshooting problems with Xvfb to the {% url "Continuous Integration" continuous-integration#Xvfb %} doc.
+- Added a section to our {% url "Debugging" debugging#Cypress-fiddle %} doc about our `cypress-fiddle` plugin used for playing around with small test cases.
+- Added a section to our {% url "Debugging" debugging#Patch-Cypress %} doc explaining how to patch an installed version of Cypress.
+- Mention not needing to decode portions of the `url` in the {% url "`cy.route()`" route %} doc.
+- Mention that the `file://` prefix is not supported in the {% url "`cy.visit()`" visit %} doc.
+- Add a note about when passing `<-loopback>` in `NO_PROXY` is necessary in the Proxy Configuration doc.
+- Updated our Dashboard docs to include screenshots containing our new Dashboard navigation design.
+- We have some newly translated documentation in Portuguese. If you'd like to help in translating more, please open a pull request in our {% url "documentation repo" https://github.com/cypress-io/cypress-documentation %}.
+
+**Dependency Updates**
+
+- Upgraded Chrome browser version used during `cypress run` and when selecting Electron browser in `cypress open` from `61` to `73`. Addressed in {% PR 4720 %}.
+- Upgraded `electron` from `2.0.18` to `5.0.10`. Addressed in {% PR 4720 %}.
+- Upgraded `node` from `8.9.3` to `12.0.0`. Addressed in {% PR 4720 %}.
+- Upgaded `jquery` from `2.2.4` to `3.1.1`. Addressed in {% PR 1229 %}.
+- Upgraded `sanitize-filename` from `1.6.1` to `1.6.3`. Addressed in {% PR 5216 %}.
+- Upgraded `@cypress/get-windows-proxy` from `1.5.4` to `1.6.0`. Addressed in {% PR 5108 %}.
\ No newline at end of file
diff --git a/source/_data/sidebar.yml b/source/_data/sidebar.yml
index 359e534ae0..21aa6765b1 100644
--- a/source/_data/sidebar.yml
+++ b/source/_data/sidebar.yml
@@ -111,6 +111,7 @@ api:
     readfile: readfile.html
     reload: reload.html
     request: request.html
+    rightclick: rightclick.html
     root: root.html
     route: route.html
     screenshot: screenshot.html
diff --git a/source/api/commands/click.md b/source/api/commands/click.md
index 28b1f882f5..61cdc43c26 100644
--- a/source/api/commands/click.md
+++ b/source/api/commands/click.md
@@ -140,10 +140,10 @@ Sequence | Notes
 
 ```js
 // execute a SHIFT + click on the first <li>
-// {release: false} is necessary so that
+// { release: false } is necessary so that
 // SHIFT will not be released after the type command
 cy.get('body').type('{shift}', { release: false })
-  .get('li:first').click()
+cy.get('li:first').click()
 ```
 
 # Notes
@@ -154,24 +154,6 @@ cy.get('body').type('{shift}', { release: false })
 
 `.click()` is an "action command" that follows all the rules {% url 'defined here' interacting-with-elements %}.
 
-## Events
-
-### Events that are fired:
-
-```javascript
-cy.get('button').click()
-// mousedown
-// focus
-// mouseup
-// click
-```
-
-The events are fired to spec, including the coordinates of where the event took place.
-
-At the moment, `mouseover` and `mouseout` events are *not* fired. {% open_an_issue %} if you need this to be fixed.
-
-Additionally if the `mousedown` event causes the element to be removed from the DOM, the remaining events should continue to be fired, but to the resulting element left below the removed element. This has also not been implemented. {% open_an_issue %} if you need this to be fixed.
-
 ## Focus
 
 ### Focus is given to the first focusable element
@@ -186,14 +168,6 @@ However, Cypress additionally handles situations where a child descendent is cli
 
 If the mousedown event has its default action prevented (`e.preventDefault()`) then the element will not receive focus as per the spec.
 
-### Element removal during `mousedown` or `mouseup`
-
-The spec states what should happen if the element clicked is removed from the DOM during `mousedown` or `mouseup`, but Cypress is not currently factoring this in. {% open_an_issue %} if you need this to be fixed.
-
-### pointer-events: none
-
-Cypress does not currently factor in `pointer-events: none` in its clicking algorithm. {% open_an_issue %} if you need this to be fixed.
-
 # Rules
 
 ## Requirements {% helper_icon requirements %}
@@ -210,10 +184,10 @@ Cypress does not currently factor in `pointer-events: none` in its clicking algo
 
 # Command Log
 
-***Click the button in the form that has text "Create User"***
+***Click the button***
 
 ```javascript
-cy.get('form').find('button').contains('Create User').click()
+cy.get('.action-btn').click()
 ```
 
 The commands above will display in the Command Log as:
@@ -224,10 +198,15 @@ When clicking on `click` within the command log, the console outputs the followi
 
 {% imgTag /img/api/click/click-coords-and-events-in-console.png "console.log for click" %}
 
+{% history %}
+{% url "3.5.0" changelog#3-5-0 %} | Added sending `mouseover`, `mousemove`, `mouseout`, `pointerdown`, `pointerup`, and `pointermove` during `.click()`
+{% endhistory %}
+
 # See also
 
 - {% url `.check()` check %}
 - {% url `.dblclick()` dblclick %}
+- {% url `.rightclick()` rightclick %}
 - {% url `.select()` select %}
 - {% url `.submit()` submit %}
 - {% url `.type()` type %}
diff --git a/source/api/commands/dblclick.md b/source/api/commands/dblclick.md
index 7b0d3dd386..f91299f1ad 100644
--- a/source/api/commands/dblclick.md
+++ b/source/api/commands/dblclick.md
@@ -9,6 +9,10 @@ Double-click a DOM element.
 ```javascript
 .dblclick()
 .dblclick(options)
+.dblclick(position)
+.dblclick(position, options)
+.dblclick(x, y)
+.dblclick(x, y, options)
 ```
 
 ## Usage
@@ -30,6 +34,20 @@ cy.window().dblclick()         // Errors, 'window' does not yield DOM element
 
 ## Arguments
 
+**{% fa fa-angle-right %} position** ***(String)***
+
+The position where the double click should be issued. The `center` position is the default position. Valid positions are `topLeft`, `top`, `topRight`, `left`, `center`, `right`, `bottomLeft`, `bottom`, and `bottomRight`.
+
+{% imgTag "/img/api/coordinates-diagram.jpg" "cypress-command-positions-diagram" %}
+
+**{% fa fa-angle-right %} x** ***(Number)***
+
+The distance in pixels from the element's left to issue the double click.
+
+**{% fa fa-angle-right %} y** ***(Number)***
+
+The distance in pixels from the element's top to issue the double click.
+
 **{% fa fa-angle-right %} options** ***(Object)***
 
 Pass in an options object to change the default behavior of `.dblclick()`.
@@ -37,6 +55,8 @@ Pass in an options object to change the default behavior of `.dblclick()`.
 Option | Default | Description
 --- | --- | ---
 `log` | `true` | {% usage_options log %}
+`force` | `false` | {% usage_options force dblclick %}
+`multiple` | `true` | {% usage_options multiple dblclick %}
 `timeout` | {% url `defaultCommandTimeout` configuration#Timeouts %} | {% usage_options timeout .dblclick %}
 
 ## Yields {% helper_icon yields %}
@@ -53,6 +73,81 @@ Option | Default | Description
 cy.get('a#nav1').dblclick() // yields the <a>
 ```
 
+## Position
+
+### Specify a position of the element to double click
+
+Click the bottom center of the button.
+
+```javascript
+cy.get('button').dblclick('bottom')
+```
+
+## Coordinates
+
+### Specify coordinates relative to the top left corner
+
+The double click below will be issued inside of the element (30px from the left and 10px from the top).
+
+```javascript
+cy.get('button').dblclick(30, 10)
+```
+
+## Options
+
+### Force a double click regardless of its actionable state
+
+Forcing a double click overrides the {% url 'actionable checks' interacting-with-elements#Forcing %} Cypress applies and will automatically fire the events.
+
+```javascript
+cy.get('button').dblclick({ force: true })
+```
+
+### Force a double click with position argument
+
+```javascript
+cy.get('button').dblclick('topRight', { force: true })
+```
+
+### Force a double click with relative coordinates
+
+```javascript
+cy.get('button').dblclick(60, 60, { force: true })
+```
+
+### Double click all buttons found on the page
+
+By default, Cypress will iteratively apply the double click to each element and will also log to the {% url 'Command Log' test-runner#Command-Log %} multiple times.
+
+You can turn this off by passing `multiple: false` to `.dblclick()`.
+
+```javascript
+cy.get('button').dblclick({ multiple: false })
+```
+
+## Double click with key combinations
+
+The `.dblclick()` command may also be fired with key modifiers in combination with the {% url "`.type()`" type %} command in order to simulate character sequences while double clicking, such as `SHIFT + double click`. In order to keep the modifier key active, `{release: false}` should be passed to the options of the {% url "`.type()`" type %} command.
+
+The following modifiers can be combined with `.dblclick()`.
+
+Sequence | Notes
+--- | ---
+`{alt}` | Activates the `altKey` modifier. Aliases: `{option}`
+`{ctrl}` | Activates the `ctrlKey` modifier. Aliases: `{control}`
+`{meta}` | Activates the `metaKey` modifier. Aliases: `{command}`, `{cmd}`
+`{shift}` | Activates the `shiftKey` modifier.
+
+### Alt click
+
+```js
+// execute a ALT + dblclick on the first <li>
+// { release: false } is necessary so that
+// ALT will not be released after the type command
+cy.get('body').type('{alt}', { release: false })
+cy.get('li:first').dblclick()
+```
+
 # Notes
 
 ## Actionability
@@ -77,10 +172,10 @@ cy.get('a#nav1').dblclick() // yields the <a>
 
 # Command Log
 
-***Double click on a calendar schedule***
+***Double click on a div***
 
 ```javascript
-cy.get('[data-schedule-id="4529114"]:first').dblclick()
+cy.get('.action-div').dblclick()
 ```
 
 The commands above will display in the Command Log as:
@@ -91,6 +186,13 @@ When clicking on `dblclick` within the command log, the console outputs the foll
 
 {% imgTag /img/api/dblclick/element-double-clicked-on.png "console.log dblclick" %}
 
+{% history %}
+{% url "3.5.0" changelog#3-5-0 %} | Added support for options `force` and `multiple`.
+{% url "3.5.0" changelog#3-5-0 %} | Added support for `position`, `x`, and `y` arguments.
+{% url "3.5.0" changelog#3-5-0 %} | Added sending `mouseover`, `mousemove`, `mouseout`, `pointerdown`, `pointerup`, and `pointermove` during `.dblclick()`.
+{% endhistory %}
+
 # See also
 
 - {% url `.click()` click %}
+- {% url `.rightclick()` rightclick %}
diff --git a/source/api/commands/exec.md b/source/api/commands/exec.md
index 6120d6d7db..1a8a25bfec 100644
--- a/source/api/commands/exec.md
+++ b/source/api/commands/exec.md
@@ -29,7 +29,7 @@ cy.exec('npm run build')
 
 **{% fa fa-angle-right %} command** ***(String)***
 
-The system command to be executed from the project root (the directory that contains `cypress.json`).
+The system command to be executed from the project root (the directory that contains the default `cypress.json` configuration file).
 
 **{% fa fa-angle-right %} options** ***(Object)***
 
@@ -156,7 +156,7 @@ A command must exit within the `execTimeout` or Cypress will kill the command's
 
 # Command Log
 
-***List the contents of cypress.json***
+***List the contents of the default `cypress.json` configuration file***
 
 ```javascript
 if (Cypress.platform === 'win32') {
diff --git a/source/api/commands/readfile.md b/source/api/commands/readfile.md
index 390740cf4f..78cffa2830 100644
--- a/source/api/commands/readfile.md
+++ b/source/api/commands/readfile.md
@@ -25,7 +25,7 @@ cy.readFile('menu.json')
 
 **{% fa fa-angle-right %} filePath** ***(String)***
 
-A path to a file within the project root (the directory that contains `cypress.json`).
+A path to a file within the project root (the directory that contains the default `cypress.json` configuration file).
 
 **{% fa fa-angle-right %} encoding**  ***(String)***
 
@@ -192,7 +192,7 @@ cy.readFile('some/nested/path/story.txt').should('eq', 'Once upon a time...')
 
 # Command Log
 
-***List the contents of cypress.json***
+***List the contents of the default `cypress.json` configuration file***
 
 ```javascript
 cy.readFile('cypress.json')
diff --git a/source/api/commands/request.md b/source/api/commands/request.md
index 8bbaa7f09c..b064c6b2a7 100644
--- a/source/api/commands/request.md
+++ b/source/api/commands/request.md
@@ -37,11 +37,10 @@ cy.visit('http://localhost:8080/app')
 cy.request('users/1.json') //  url is  http://localhost:8080/users/1.json
   ```
 
-2. If you make a `cy.request()` prior to visiting a page, Cypress uses the host configured as the `baseUrl` property inside of `cypress.json`.
+2. If you make a `cy.request()` prior to visiting a page, Cypress uses the host configured as the `baseUrl` property inside of of your {% url "configuration file" configuration %}.
 
   ```json
   // cypress.json
-
   {
     "baseUrl": "http://localhost:1234"
   }
diff --git a/source/api/commands/rightclick.md b/source/api/commands/rightclick.md
new file mode 100644
index 0000000000..b0b5d58455
--- /dev/null
+++ b/source/api/commands/rightclick.md
@@ -0,0 +1,199 @@
+---
+title: rightclick
+---
+
+Right click a DOM element.
+
+{% note warning %}
+`.rightclick()` will not open context menus native to the browser. `.rightclick()` should be used to test your app's handling of right click related events such as `contextmenu`.
+{% endnote %}
+
+# Syntax
+
+```javascript
+.rightclick()
+.rightclick(options)
+.rightclick(position)
+.rightclick(position, options)
+.rightclick(x, y)
+.rightclick(x, y, options)
+```
+
+## Usage
+
+**{% fa fa-check-circle green %} Correct Usage**
+
+```javascript
+cy.get('.menu').rightclick()       // Right click on .menu
+cy.focused().rightclick()          // Right click on el with focus
+cy.contains('Today').rightclick()  // Right click on first el containing 'Today'
+```
+
+**{% fa fa-exclamation-triangle red %} Incorrect Usage**
+
+```javascript
+cy.rightclick('button')    // Errors, cannot be chained off 'cy'
+cy.window().rightclick()   // Errors, 'window' does not yield DOM element
+```
+
+## Arguments
+
+**{% fa fa-angle-right %} position** ***(String)***
+
+The position where the right click should be issued. The `center` position is the default position. Valid positions are `topLeft`, `top`, `topRight`, `left`, `center`, `right`, `bottomLeft`, `bottom`, and `bottomRight`.
+
+{% imgTag "/img/api/coordinates-diagram.jpg" "cypress-command-positions-diagram" %}
+
+**{% fa fa-angle-right %} x** ***(Number)***
+
+The distance in pixels from the element's left to issue the right click.
+
+**{% fa fa-angle-right %} y** ***(Number)***
+
+The distance in pixels from the element's top to issue the right click.
+
+**{% fa fa-angle-right %} options** ***(Object)***
+
+Pass in an options object to change the default behavior of `.rightclick()`.
+
+Option | Default | Description
+--- | --- | ---
+`log` | `true` | {% usage_options log %}
+`force` | `false` | {% usage_options force rightclick %}
+`multiple` | `false` | {% usage_options multiple rightclick %}
+`timeout` | {% url `defaultCommandTimeout` configuration#Timeouts %} | {% usage_options timeout .rightclick %}
+
+## Yields {% helper_icon yields %}
+
+{% yields same_subject .rightclick %}
+
+# Examples
+
+## No Args
+
+### Right click the menu
+
+```javascript
+cy.get('#open-menu').rightclick()
+```
+
+## Position
+
+### Specify a corner of the element to right click
+
+Right click the top right corner of the DOM element.
+
+```javascript
+cy.get('#open-menu').rightclick('topRight')
+```
+
+## Coordinates
+
+### Specify explicit coordinates relative to the top left corner
+
+The right click below will be issued inside of the element (15px from the left and 40px from the top).
+
+```javascript
+cy.get('#open-menu').rightclick(15, 40)
+```
+
+## Options
+
+### Force a right click regardless of its actionable state
+
+Forcing a right click overrides the {% url 'actionable checks' interacting-with-elements#Forcing %} Cypress applies and will automatically fire the events.
+
+```javascript
+cy.get('#open-menu').rightclick({ force: true })
+```
+
+### Force a right click with position argument
+
+```javascript
+cy.get('#open-menu').rightclick('bottomLeft', { force: true })
+```
+
+### Force a right click with relative coordinates
+
+```javascript
+cy.get('#open-menu').rightclick(5, 60, { force: true })
+```
+
+### Right click all buttons found on the page
+
+By default, Cypress will error if you're trying to right click multiple elements. By passing `{ multiple: true }` Cypress will iteratively apply the right click to each element and will also log to the {% url 'Command Log' test-runner#Command-Log %} multiple times.
+
+```javascript
+cy.get('.open-menu').rightclick({ multiple: true })
+```
+
+## Right click with key combinations
+
+The `.rightclick()` command may also be fired with key modifiers in combination with the {% url "`.type()`" type %} command in order to simulate character sequences while right clicking, such as `ALT + rightclick`. In order to keep the modifier key active, `{release: false}` should be passed to the options of the {% url "`.type()`" type %} command.
+
+The following modifiers can be combined with `.rightclick()`.
+
+Sequence | Notes
+--- | ---
+`{alt}` | Activates the `altKey` modifier. Aliases: `{option}`
+`{ctrl}` | Activates the `ctrlKey` modifier. Aliases: `{control}`
+`{meta}` | Activates the `metaKey` modifier. Aliases: `{command}`, `{cmd}`
+`{shift}` | Activates the `shiftKey` modifier.
+
+### Command right click
+
+```js
+// execute a CMD + right click on the .menu-item
+// { release: false } is necessary so that
+// CMD will not be released after the type command
+cy.get('body').type('{cmd}', { release: false })
+cy.get('.menu-item').rightclick()
+```
+
+# Notes
+
+## Actionability
+
+### The element must first reach actionability
+
+`.rightclick()` is an "action command" that follows all the rules {% url 'defined here' interacting-with-elements %}.
+
+# Rules
+
+## Requirements {% helper_icon requirements %}
+
+{% requirements dom .rightclick %}
+
+## Assertions {% helper_icon assertions %}
+
+{% assertions actions .rightclick %}
+
+## Timeouts {% helper_icon timeout %}
+
+{% timeouts actions .rightclick %}
+
+# Command Log
+
+***Right click the DOM element***
+
+```javascript
+cy.get('.rightclick-action-div').rightclick()
+```
+
+The commands above will display in the Command Log as:
+
+{% imgTag /img/api/rightclick/rightclick-dom-element-in-command-log.png "Command log for right click" %}
+
+When clicking on `rightclick` within the command log, the console outputs the following:
+
+{% imgTag /img/api/rightclick/rightclick-console-log-with-mouse-events.png "console.log for right click" %}
+
+{% history %}
+{% url "3.5.0" changelog#3-5-0 %} | `.rightclick()` command added
+{% endhistory %}
+
+# See also
+
+- {% url `.click()` click %}
+- {% url `.dblclick()` dblclick %}
+- {% url `.trigger()` trigger %}
diff --git a/source/api/commands/route.md b/source/api/commands/route.md
index ef5a9f1641..e4c67d40c4 100644
--- a/source/api/commands/route.md
+++ b/source/api/commands/route.md
@@ -33,7 +33,7 @@ cy.route('/users/**')
 
 **{% fa fa-angle-right %} url** ***(String, Glob, RegExp)***
 
-Set a route matching the specific URL.
+Listen for a route matching the specific URL.
 
 **{% fa fa-angle-right %} response** ***(String, Object, Array)***
 
@@ -49,7 +49,7 @@ If no method is defined Cypress will match `GET` requests by default.
 
 **{% fa fa-angle-right %} callbackFn** ***(Function)***
 
-Set a route by returning an object literal from a callback function. Functions that return a `Promise` will automatically be awaited.
+Listen for a route matching a returned object literal from a callback function. Functions that return a `Promise` will automatically be awaited.
 
 **{% fa fa-angle-right %} options** ***(Object)***
 
@@ -153,11 +153,16 @@ If you pass a `response` to `cy.route()`, Cypress will stub the response in the
 
 ### `url` as a string
 
-When passing a `string` as the `url`, the XHR's URL must match *exactly* what you've written.
+When passing a `string` as the `url`, the XHR's URL must match *exactly* what you've written. You'll want to use the decoded string and not include any hash encoding (ie. use `@` instead of `%40`).
 
 ```javascript
 cy.server()
-cy.route('https://localhost:7777/users', [{ id: 1, name: 'Pat' }])
+cy.route('https://localhost:7777/surveys/customer?email=john@doe.com', [
+  {
+    id: 1,
+    name: 'john'
+  }
+])
 ```
 
 ### `url` as a RegExp
diff --git a/source/api/commands/screenshot.md b/source/api/commands/screenshot.md
index fb85a7325c..44c582130f 100644
--- a/source/api/commands/screenshot.md
+++ b/source/api/commands/screenshot.md
@@ -46,6 +46,7 @@ Option |Default | Description
 `capture` | `'fullPage'` | Which parts of the Test Runner to capture. This value is ignored for element screenshot captures. Valid values are `viewport`, `fullPage`, or `runner`. When `viewport`, the application under test is captured in the current viewport. When `fullPage`, the application under test is captured in its entirety from top to bottom. When `runner`, the entire browser viewport, including the Cypress Command Log, is captured.  For screenshots automatically taken on test failure, capture is always coerced to `runner`.
 `clip` | `null` | Position and dimensions (in pixels) used to crop the final screenshot image. Should have the following shape: `{ x: 0, y: 0, width: 100, height: 100 }`
 `disableTimersAndAnimations` | `true`| When true, prevents JavaScript timers (`setTimeout`, `setInterval`, etc) and CSS animations from running while the screenshot is taken.
+`padding` | `null` | Padding used to alter the dimensions of a screenshot of an element. It can either be a number, or an array of up to four numbers [using CSS shorthand notation](https://developer.mozilla.org/en-US/docs/Web/CSS/Shorthand_properties). This property is only applied for element screenshots and is ignored for all other types.
 `scale` | `false` | Whether to scale the app to fit into the browser viewport. This is always coerced to `true` when `capture` is `runner`.
 `timeout` | {% url `responseTimeout` configuration#Timeouts %} | {% usage_options timeout .screenshot %}
 `onBeforeScreenshot` | `null` | A callback before a non-failure screenshot is taken. When capturing screenshots of an element, the argument is the element being captured. For other screenshots, the argument is the `document`.
@@ -113,6 +114,12 @@ cy.screenshot({ x: 20, y: 20, width: 400, height: 300 })
 cy.get('.post').first().screenshot()
 ```
 
+### Take a screenshot of the first `.post` element with 10px of padding around it
+
+```javascript
+cy.get('.post').first().screenshot({ padding: 10 })
+```
+
 ### Chain off the screenshot to click the element captured
 
 ```javascript
@@ -243,6 +250,10 @@ When clicking on `screenshot` within the command log, the console outputs the fo
 
 {% imgTag /img/api/screenshot/console-logs-exactly-where-screenshot-was-saved-in-file-system.png "Console Log screenshot" %}
 
+{% history %}
+{% url "3.5.0" changelog#3-5-0 %} | Added support for option `padding`.
+{% endhistory %}
+
 # See also
 
 - {% url 'After Screenshot API' after-screenshot-api %}
diff --git a/source/api/commands/task.md b/source/api/commands/task.md
index 9d9198ceee..8ff91973e4 100644
--- a/source/api/commands/task.md
+++ b/source/api/commands/task.md
@@ -249,7 +249,7 @@ If multiple task objects use the same key, the later registration will overwrite
 
 # Command Log
 
-***List the contents of `cypress.json`***
+### List the contents of the default `cypress.json` configuration file
 
 ```javascript
 cy.task('readJson', 'cypress.json')
diff --git a/source/api/commands/trigger.md b/source/api/commands/trigger.md
index b49a75d27d..08e7952f8a 100644
--- a/source/api/commands/trigger.md
+++ b/source/api/commands/trigger.md
@@ -88,9 +88,9 @@ cy.wait(1000)
 cy.get('.target').trigger('mouseleave')
 ```
 
-### jQuery UI Sortable 
+### jQuery UI Sortable
 
-To simulate drag and drop using jQuery UI sortable requires `pageX` and `pageY` properties along with `which:1`.     
+To simulate drag and drop using jQuery UI sortable requires `pageX` and `pageY` properties along with `which:1`.
 
 ```javascript
 cy.get('[data-cy=draggable]')
@@ -137,7 +137,7 @@ cy.get('button').trigger('mousedown', 'topRight')
 ### Specify explicit coordinates relative to the top left corner
 
 ```javascript
-cy.get('button').trigger('contextmenu', 15, 40)
+cy.get('button').trigger('mouseup', 15, 40)
 ```
 
 ## Options
@@ -227,6 +227,7 @@ When clicking on `trigger` within the command log, the console outputs the follo
 {% imgTag /img/api/trigger/console-log-trigger.png "console log trigger" %}
 
 {% history %}
+{% url "3.5.0" changelog#3-5-0 %} | Added `screenX` and `screenY` properties to events
 {% url "0.20.0" changelog#0-20-0 %} | `.trigger()` command added
 {% endhistory %}
 
@@ -236,6 +237,7 @@ When clicking on `trigger` within the command log, the console outputs the follo
 - {% url `.check()` check %}
 - {% url `.click()` click %}
 - {% url `.focus()` focus %}
+- {% url `.rightclick()` rightclick %}
 - {% url `.select()` select %}
 - {% url `.submit()` submit %}
 - {% url `.type()` type %}
diff --git a/source/api/commands/type.md b/source/api/commands/type.md
index cbb249f67d..2b444db3ed 100644
--- a/source/api/commands/type.md
+++ b/source/api/commands/type.md
@@ -307,8 +307,6 @@ cy.get('input[type=text]').type('Test all the things', { force: true })
 
 If the element is currently not in focus, before issuing any keystrokes Cypress will first issue a {% url `.click()` click %} to the element to bring it into focus.
 
-All of {% url 'the normal events' click#Events %} documented on {% url `.click()` click %} will fire.
-
 ### Events that fire
 
 Once the element is in focus, Cypress will begin firing keyboard events.
diff --git a/source/api/commands/viewport.md b/source/api/commands/viewport.md
index 91851aa45f..2c571607bb 100644
--- a/source/api/commands/viewport.md
+++ b/source/api/commands/viewport.md
@@ -30,11 +30,11 @@ cy.viewport('iphone-6')  // Set viewport to 375px x 667px
 
 **{% fa fa-angle-right %} width** ***(Number)***
 
-Width of viewport in pixels (must be between 20 and 3000).
+Width of viewport in pixels (must be between 20 and 4000).
 
 **{% fa fa-angle-right %} height** ***(Number)***
 
-Height of viewport in pixels (must be between 20 and 3000).
+Height of viewport in pixels (must be between 20 and 4000).
 
 **{% fa fa-angle-right %} preset** ***(String)***
 
@@ -42,16 +42,20 @@ A preset dimension to set the viewport. Preset supports the following options:
 
 | Preset | width | height |
 | ----------- | ----- | ------ |
-| `macbook-15`  | 1440  | 900    |
-| `macbook-13`  | 1280  | 800    |
-| `macbook-11`  | 1366  | 768    |
 | `ipad-2`      | 768   | 1024    |
 | `ipad-mini`   | 768   | 1024    |
-| `iphone-6+`   | 414   | 736    |
-| `iphone-6`    | 375   | 667    |
-| `iphone-5`    | 320   | 568    |
-| `iphone-4`    | 320   | 480    |
 | `iphone-3`    | 320   | 480    |
+| `iphone-4`    | 320   | 480    |
+| `iphone-5`    | 320   | 568    |
+| `iphone-6`    | 375   | 667    |
+| `iphone-6+`   | 414   | 736    |
+| `iphone-x`    | 375   | 812    |
+| `iphone-xr`   | 414   | 896    |
+| `macbook-11`  | 1366  | 768    |
+| `macbook-13`  | 1280  | 800    |
+| `macbook-15`  | 1440  | 900    |
+| `samsung-note9` | 414 | 846    |
+| `samsung-s10` | 360   | 760    |
 
 **{% fa fa-angle-right %} orientation** ***(String)***
 
@@ -177,7 +181,7 @@ When hovering over each command, Cypress will automatically display the snapshot
 
 By default, until you issue a `cy.viewport()` command, Cypress sets the width to `1000px` and the height to `660px` by default.
 
-You can {% url 'change these default dimensions' configuration#Viewport %} by adding the following to your `cypress.json`:
+You can {% url 'change these default dimensions' configuration#Viewport %} by adding the following to your configuration file (`cypress.json` by default):
 
 ```json
 {
@@ -236,6 +240,7 @@ When clicking on `viewport` within the command log, the console outputs the foll
 {% imgTag /img/api/viewport/console-log-shows-width-and-height-of-tested-viewport.png "Console Log viewport" %}
 
 {% history %}
+{% url "3.5.0" changelog#0-9-0 %} | Added support for presets `iphone-xr`, `iphone-x`, `samsung-s10`, and `samsung-note9`
 {% url "0.9.0" changelog#0-9-0 %} | `cy.viewport()` command added
 {% endhistory %}
 
diff --git a/source/api/commands/visit.md b/source/api/commands/visit.md
index 4cff1b5260..9e6d44628f 100644
--- a/source/api/commands/visit.md
+++ b/source/api/commands/visit.md
@@ -24,6 +24,7 @@ cy.visit(options)
 
 ```javascript
 cy.visit('http://localhost:3000')    // Yields the window of the remote page
+cy.visit('./pages/hello.html')
 ```
 
 ## Arguments
@@ -34,6 +35,9 @@ The URL to visit.
 
 Cypress will prefix the URL with the `baseUrl` configured in your {% url 'network options' configuration#Global %} if you've set one.
 
+You may also specify the relative path of an html file.  The path is relative to the root
+directory of the Cypress installation. Note that the `file://` prefix is not needed.
+
 **{% fa fa-angle-right %} options** ***(Object)***
 
 Pass in an options object to control the behavior of `cy.visit()`.
@@ -44,6 +48,7 @@ Option | Default | Description
 `method` | `GET` | The HTTP method to use in the visit. Can be `GET` or `POST`.
 `body` | `null` | An optional body to send along with a `POST` request. If it is a string, it will be passed along unmodified. If it is an object, it will be URL encoded to a string and sent with a `Content-Type: application/x-www-urlencoded` header.
 `headers` | `{}` | An object that maps HTTP header names to values to be sent along with the request. *Note:* `headers` will only be sent for the initial `cy.visit()` request, not for any subsequent requests.
+`qs` | `null` | Query parameters to append to the `url` of the request
 `log` | `true` | {% usage_options log %}
 `auth` | `null` | Adds Basic Authorization headers
 `failOnStatusCode` | `true` | Whether to fail on response codes other than `2xx` and `3xx`
@@ -140,6 +145,29 @@ cy.visit('http://localhost:3000/#/users', {
 })
 ```
 
+### Add query paramaters
+
+You can provide query parameters as an object to `cy.visit()` by passing `qs` to `options`.
+
+```js
+// visits http://localhost:3500/users?page=1&role=admin
+cy.visit('http://localhost:3500/users', {
+  qs: {
+    page: '1',
+    role: 'admin'
+  }
+})
+```
+
+The parameters passed to `qs` will be merged into existing query parameters on the `url`.
+
+```js
+// visits http://example.com/users?page=1&admin=true
+cy.visit('http://example.com/users?page=1', {
+  qs: { admin: true }
+})
+```
+
 ### Submit a form
 
 To send a request that looks like a user submitting an HTML form, use a `POST` method with a `body` containing the form values:
@@ -184,7 +212,7 @@ cy.visit('127.0.0.1:3000') // Visits http://127.0.0.1:3000
 
 ### Cypress can optionally act as your web server
 
-Cypress will automatically attempt to serve your files if you don't provide a host. The path should be relative to your project's root folder (where `cypress.json` is located).
+Cypress will automatically attempt to serve your files if you don't provide a host. The path should be relative to your project's root folder (where the `cypress.json` file is generated by default).
 
 Having Cypress serve your files is useful in smaller projects and example apps, but isn't recommended for production apps.  It is always better to run your own server and provide the url to Cypress.
 
@@ -194,9 +222,9 @@ cy.visit('app/index.html')
 
 ## Prefixes
 
-### Visit is automatically prefixed with `baseUrl`.
+### Visit is automatically prefixed with `baseUrl`
 
-Configure `baseUrl` in the `cypress.json` file to prevent repeating yourself in every single `cy.visit()` command. Read more about {% url 'configuration' configuration %}.
+Configure `baseUrl` in the your {% url 'configuration' configuration %} file (`cypress.json` by default) to prevent repeating yourself in every `cy.visit()` command.
 
 ```json
 {
diff --git a/source/api/commands/writefile.md b/source/api/commands/writefile.md
index f305646db6..e2a818a7d4 100644
--- a/source/api/commands/writefile.md
+++ b/source/api/commands/writefile.md
@@ -24,7 +24,7 @@ cy.writeFile('menu.json')
 
 **{% fa fa-angle-right %} filePath** ***(String)***
 
-A path to a file within the project root (the directory that contains `cypress.json`).
+A path to a file within the project root (the directory that contains the default `cypress.json`).
 
 **{% fa fa-angle-right %} contents** ***(String, Array, or Object)***
 
diff --git a/source/api/cypress-api/config.md b/source/api/cypress-api/config.md
index f411de7755..3ebc285660 100644
--- a/source/api/cypress-api/config.md
+++ b/source/api/cypress-api/config.md
@@ -45,7 +45,7 @@ Set multiple configuration options with an object literal.
 
 ## No Arguments
 
-### Get all configuration options
+### Get all configuration options from {% url 'configuration' configuration %} file (`cypress.json` by default)
 
 ```json
 {
@@ -62,7 +62,7 @@ Cypress.config() // => {defaultCommandTimeout: 10000, pageLoadTimeout: 30000, ..
 
 ## Name
 
-### Return a single configuration option value
+### Return a single configuration option from {% url 'configuration' configuration %} file (`cypress.json` by default)
 
 ```json
 {
@@ -76,7 +76,7 @@ Cypress.config('pageLoadTimeout') // => 60000
 
 ## Name and Value
 
-### Change the values of your configuration options from within tests
+### Change the values of configuration options from configuration file (`cypress.json` by default) from within your tests
 
 {% note warning Scope %}
 Remember, any changes that you make to configuration using this API will only be in effect for the remainder of the tests _in the same spec file._
@@ -97,7 +97,7 @@ Cypress.config('viewportWidth') // => 800
 
 ## Object
 
-### Set multiple values by passing an object literal
+### Override multiple options from configuration file (`cypress.json` by default) by passing an object literal
 
 ```json
 {
diff --git a/source/api/cypress-api/custom-commands.md b/source/api/cypress-api/custom-commands.md
index dc2af3b7bb..30d8d6f57a 100644
--- a/source/api/cypress-api/custom-commands.md
+++ b/source/api/cypress-api/custom-commands.md
@@ -265,7 +265,7 @@ Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
 {% note info %}
 We see many of our users creating their own `visitApp` command. We commonly see that all you're doing is swapping out base urls for `development` vs `production` environments.
 
-This is usually unnecessary because Cypress is already configured to swap out baseUrl's that both `cy.visit()` and `cy.request()` use. Set the `baseUrl` config property in `cypress.json` and override it with environment variable `CYPRESS_BASE_URL`.
+This is usually unnecessary because Cypress is already configured to swap out a `baseUrl` that both `cy.visit()` and `cy.request()` use. Set the `baseUrl` configuration property in your {% url "configuration" configuration %} file (`cypress.json` by default) and override it with the `CYPRESS_BASE_URL` environment variable.
 
 For more complex use cases feel free to overwrite existing commands.
 {% endnote %}
diff --git a/source/api/cypress-api/env.md b/source/api/cypress-api/env.md
index dd105c1cc1..9439077d9a 100644
--- a/source/api/cypress-api/env.md
+++ b/source/api/cypress-api/env.md
@@ -41,10 +41,9 @@ Set multiple environment variables with an object literal.
 
 ## No Arguments
 
-**Get all environment variables.**
+### Get all environment variables from configuration file (`cypress.json` by default)
 
-```javascript
-// cypress.json
+```json
 {
   "env": {
     "foo": "bar",
@@ -59,7 +58,7 @@ Cypress.env() // => {foo: "bar", baz: "quux"}
 
 ## Name
 
-**Return a single environment variable value.**
+### Return a single environment variable from configuration file (`cypress.json` by default)
 
 {% note warning Boolean %}
 We automatically normalize both the key and the value when passed via the command line. Cypress will automatically convert values into Number or Boolean.
@@ -77,14 +76,13 @@ Cypress.env('MY_ID') // => 123
 
 ## Name and Value
 
-**Cypress allows you to change the values of your environment variables from within your tests.**
+### Change environment variables from configuration file (`cypress.json` by default) from within your tests
 
 {% note warning Scope %}
 Remember, any changes that you make to environment variables using this API will only be in effect for the remainder of the tests _in the same spec file._
 {% endnote %}
 
-```javascript
-// cypress.json
+```json
 {
   "env": {
     "foo": "bar",
@@ -101,7 +99,7 @@ Cypress.env('host') // => http://server.dev.local
 
 ## Object
 
-**You can set multiple values by passing an object literal.**
+### Override multiple values from configuration file (`cypress.json` by default) by passing an object literal.
 
 ```javascript
 // cypress.json
@@ -139,6 +137,7 @@ module.exports = (on, config) => {
   return config
 }
 ```
+
 ```js
 // cypress/integration/secrets_spec.js
 describe('Environment variable set in plugin', () => {
@@ -157,17 +156,17 @@ describe('Environment variable set in plugin', () => {
 
 # Notes
 
-**Why would I ever need to use environment variables?**
+## Why would I ever need to use environment variables?
 
 The {% url 'Environment Variables' environment-variables %} guide explains common use cases.
 
-**Can I pass in environment variables from the command line?**
+## Can I pass in environment variables from the command line?
 
 Yes. You can do that and much more.
 
 The {% url 'Environment Variables' environment-variables %} guide explains the other ways you can set environment variables for your tests.
 
-**Why is it `Cypress.env` and not `cy.env`?**
+## Why is it `Cypress.env` and not `cy.env`?
 
 As a rule of thumb anything you call from `Cypress` affects global state. Anything you call from `cy` affects local state.
 
diff --git a/source/api/plugins/writing-a-plugin.md b/source/api/plugins/writing-a-plugin.md
index e894788e04..4d17a1301b 100644
--- a/source/api/plugins/writing-a-plugin.md
+++ b/source/api/plugins/writing-a-plugin.md
@@ -67,7 +67,7 @@ You can programmatically modify these values and Cypress will then respect these
 
 ## List of events
 
-***The following events are available:***
+### The following events are available:
 
 Event | Description
 --- | ---
@@ -90,16 +90,14 @@ Cypress does this by spawning an independent `child_process` which then `require
 
 You will need to keep in mind it is **Cypress who is requiring your file** - not your local project, not your local Node version, and not anything else under your control.
 
-Because of this, this global context and the version of Node is controlled by Cypress.
+Because of this, this global context and the version of Node is controlled under Cypress.
 
 {% note warning "Node version" %}
+Keep in mind - code executed in plugins **may** be executed by the Node version that comes bundled in Cypress itself.
 
-Keep in mind - code executed in plugins is executed **by the Node version** that comes bundled in Cypress itself.
-
-This version of Node has **nothing to do** with your locally installed versions. Therefore you have to write Node code which is compatible with this version.
-
-You can find the current Node version we use {% url 'here' https://github.com/cypress-io/cypress/blob/master/.node-version %}.
+This version of Node has **nothing to do** with your locally installed versions. Therefore you may want to write Node code which is compatible with this version or document that the user of your plugin will need to set a specific {% url "`nodeVersion`" configuration#Node-version %} in their configuration.
 
+You can find the current Node version we use when the `nodeVersion` is set to the default `bundled` {% url 'here' https://github.com/cypress-io/cypress/blob/master/.node-version %}.
 {% endnote %}
 
 ## npm modules
@@ -139,9 +137,9 @@ console.log(process.cwd()) // /Users/janelane/Dev/my-project
 
 # Error handling
 
-Cypress spawns your `pluginsFile` in its own child process so it is isolated away from the context that Cypress itself runs in. That means you cannot accidentally modify or change Cypress' own execution in any way.
+Cypress spawns your `pluginsFile` in its own child process so it is isolated away from the context that Cypress itself runs in. That means you cannot accidentally modify or change Cypress's own execution in any way.
 
-If your `pluginsFile` has an uncaught exception, an unhandled rejection from a promise, a syntax error, or anything else - we will automatically catch those and display them to you inside of the console and even in the Test Runner itself.
+If your `pluginsFile` has an uncaught exception, an unhandled rejection from a promise, or a syntax error - we will automatically catch those and display them to you inside of the console and even in the Test Runner itself.
 
 Errors from your plugins *will not crash* Cypress.
 
diff --git a/source/examples/examples/recipes.md b/source/examples/examples/recipes.md
index b6d264eccd..ea360bc3a3 100644
--- a/source/examples/examples/recipes.md
+++ b/source/examples/examples/recipes.md
@@ -88,4 +88,4 @@ Recipe | Description
 {% url 'Visual Regression Testing' https://github.com/mjhea0/cypress-visual-regression %} | Adding visual regression testing to Cypress
 {% url 'Code coverage' https://github.com/paulfalgout/cypress-coverage-example %} | Cypress with Coverage reports
 {% url 'Cucumber' https://github.com/TheBrainFamily/cypress-cucumber-example %} | Example usage of Cypress with Cucumber
-{% url 'Jest' https://github.com/TheBrainFamily/jest-runner-cypress-example %} | Example for the jest-runner-cypress
\ No newline at end of file
+{% url 'Jest' https://github.com/TheBrainFamily/jest-runner-cypress-example %} | Example for the jest-runner-cypress
diff --git a/source/faq/questions/using-cypress-faq.md b/source/faq/questions/using-cypress-faq.md
index e398f6d8c6..0f204c1d71 100644
--- a/source/faq/questions/using-cypress-faq.md
+++ b/source/faq/questions/using-cypress-faq.md
@@ -143,7 +143,6 @@ We have seen many different iterations of this question. The answers can be vari
 
 When you load your application using `cy.visit()`, Cypress will wait for the `load` event to fire. The {% url '`cy.visit()`' visit#Usage %} command loads a remote page and does not resolve until all of the external resources complete their loading phase. Because we expect your applications to observe differing load times, this command's default timeout is set to 60000ms. If you visit an invalid url or a {% url 'second unique domain' web-security#One-Superdomain-per-Test %}, Cypress will log a verbose yet friendly error message.
 
-
 **_In CI, how do I make sure my server has started?_**
 
 We recommend these great modules for this use case:
@@ -274,11 +273,11 @@ Yes, you can pass configuration to Cypress via environment variables, CLI argume
 
 ## {% fa fa-angle-right %} Can I override or change the default user agent the browser uses?
 
-Yes. {% url "You can override this with `userAgent` in `cypress.json`." configuration#Browser %}
+Yes. {% url "You can override this with `userAgent` in your configuration file (`cypress.json` by default)." configuration#Browser %}
 
 ## {% fa fa-angle-right %} Can I block traffic going to specific domains? I want to block Google Analytics or other providers.
 
-Yes. {% url "You can set this with `blacklistHosts` in `cypress.json`." configuration#Browser %}
+Yes. {% url "You can set this with `blacklistHosts` in your configuration file (`cypress.json` by default)." configuration#Browser %}
 
 Also, check out our {% url 'Stubbing Google Analytics Recipe' recipes#Stubbing-and-spying %}.
 
@@ -336,7 +335,7 @@ It is possible to upload files in your application but it's different based on h
 
 ## {% fa fa-angle-right %} What is the projectId for?
 
-The `projectId` is a 6 character string that helps identify your project once you've {% url "set up your tests to record" runs %}. It's generated by Cypress and typically is found in your {% url `cypress.json` configuration %} file.
+The `projectId` is a 6 character string that helps identify your project once you've {% url "set up your tests to record" runs %}. It's generated by Cypress and typically is found in your {% url "configuration file (`cypress.json` by default)" configuration %} file.
 
 ```json
 {
@@ -466,7 +465,7 @@ The code you write in Cypress is executed in the browser, so you can import or r
 
 You can `require` or `import` them as you're accustomed to. We preprocess your spec files with `babel` and `browserify`.
 
-Cypress does not have direct access to Node or your file system. We recommend utilizing one of the following to execute code outside of the browser:
+We recommend utilizing one of the following to execute code outside of the browser. Furthermore, you can use your own Node version during code excecution by setting the {% url "`nodeVersion`" configuration#Node-version %} in your configuration.
 
 - {% url `cy.task()` task %} to run code in Node via the {% url "`pluginsFile`" configuration#Folders-Files %}
 - {% url `cy.exec()` exec %} to execute a shell command
diff --git a/source/guides/core-concepts/interacting-with-elements.md b/source/guides/core-concepts/interacting-with-elements.md
index 69d2880d69..30376caa6b 100644
--- a/source/guides/core-concepts/interacting-with-elements.md
+++ b/source/guides/core-concepts/interacting-with-elements.md
@@ -17,6 +17,7 @@ Some commands in Cypress are for interacting with the DOM such as:
 
 - {% url `.click()` click %}
 - {% url `.dblclick()` dblclick %}
+- {% url `.rightclick()` rightclick %}
 - {% url `.type()` type %}
 - {% url `.clear()` clear %}
 - {% url `.check()` check %}
@@ -35,6 +36,7 @@ Cypress will wait for the element to pass all of these checks for the duration o
 - {% urlHash 'Scroll the element into view.' Scrolling %}
 - {% urlHash 'Ensure the element is not hidden.' Visibility %}
 - {% urlHash 'Ensure the element is not disabled.' Disability %}
+- {% urlHash 'Ensure the element is not detached.' Detached %}
 - {% urlHash 'Ensure the element is not readonly.' Readonly %}
 - {% urlHash 'Ensure the element is not animating.' Animations %}
 - {% urlHash 'Ensure the element is not covered.' Covering %}
@@ -74,6 +76,12 @@ The following calculations factor in CSS translations and transforms.
 
 Cypress checks whether an element's `disabled` property is `true`.
 
+## Detached
+
+When many applications rerender the DOM, they actually remove the DOM element and insert a new DOM element in its place with the newly change attributes.
+
+Cypress checks whether an element you are making assertions is detached from the DOM. This checks that the element is still within the `document` of the application under test.
+
 ## Readonly
 
 Cypress checks whether an element's `readonly` property is set during {% url "`.type()`" type %}.
@@ -163,7 +171,7 @@ We recommend placing `debugger` or using the {% url `.debug()` debug %} command
 
 Make sure your Developer Tools are open and you can get pretty close to "seeing" the calculations Cypress is performing.
 
-As of `0.20.0`, you can also {% url 'bind to Events' catalog-of-events %} that Cypress fires as it's working with your element. Using a debugger with these events will give you a much lower level view into how Cypress works.
+You can also {% url 'bind to Events' catalog-of-events %} that Cypress fires as it's working with your element. Using a debugger with these events will give you a much lower level view into how Cypress works.
 
 ```js
 // break on a debugger before the action command
@@ -201,6 +209,7 @@ We will NOT perform these:
 - Scroll the element into view
 - Ensure it is visible
 - Ensure it is not disabled
+- Ensure it is not detached
 - Ensure it is not readonly
 - Ensure it is not animating
 - Ensure it is not covered
diff --git a/source/guides/core-concepts/introduction-to-cypress.md b/source/guides/core-concepts/introduction-to-cypress.md
index c128b2c56a..7885bdddc4 100644
--- a/source/guides/core-concepts/introduction-to-cypress.md
+++ b/source/guides/core-concepts/introduction-to-cypress.md
@@ -237,6 +237,7 @@ Here are even more action commands Cypress provides to interact with your app:
 - {% url `.uncheck()` uncheck %} - Uncheck checkbox(es).
 - {% url `.select()` select %} - Select an `<option>` within a `<select>`.
 - {% url `.dblclick()` dblclick %} - Double-click a DOM element.
+- {% url `.rightclick()` rightclick %} - Right-click a DOM element.
 
 These commands ensure {% url "some guarantees" interacting-with-elements %} about what the state of the elements should be prior to performing their actions.
 
diff --git a/source/guides/core-concepts/test-runner.md b/source/guides/core-concepts/test-runner.md
index 8f98ef21b5..847f232fd8 100644
--- a/source/guides/core-concepts/test-runner.md
+++ b/source/guides/core-concepts/test-runner.md
@@ -154,3 +154,20 @@ Type in text to see which element it matches. Note that {% url `cy.contains()` c
 If you would like to interact with your app while the Selector Playground is open, the element highlighting might get in the way. Toggling the highlighting off will allow you to interact with your app more easily.
 
 {% imgTag /img/guides/test-runner/turn-off-highlight-in-selector-playground.gif "Turn off highlighting" %}
+
+# Keyboard Shortcuts
+
+There are keyboard shortcuts to quickly perform common actions from within the Test Runner.
+
+| Key      | Action |
+| ----------- | ----------- |
+| `r`      | Rerun tests       |
+| `s`      | Stop tests        |
+| `f`      | Bring focus to 'specs' window  |
+
+{% imgTag /img/guides/test-runner/keyboard-shortcuts.png "Tooltips show keyboard shortcuts" %}
+
+{% history %}
+{% url "3.5.0" changelog#3-5-0 %} | Added keyboard shortcuts to Test Runner
+{% url "1.3.0" changelog#1-3-0 %} | Added Selector Playground
+{% endhistory %}
diff --git a/source/guides/core-concepts/writing-and-organizing-tests.md b/source/guides/core-concepts/writing-and-organizing-tests.md
index dcecd42672..3e9ecf1f0b 100644
--- a/source/guides/core-concepts/writing-and-organizing-tests.md
+++ b/source/guides/core-concepts/writing-and-organizing-tests.md
@@ -56,14 +56,14 @@ After adding a new project, Cypress will automatically scaffold out a suggested
     - index.js
 ```
 
-***Configuring Folder Structure***
+## Configuring Folder Structure
 
 While Cypress allows to configure where your tests, fixtures, and support files are located, if you're starting your first project, we recommend you use the above structure.
 
-You can modify the folder configuration in your `cypress.json`. See {% url 'configuration' configuration#Folders-Files %} for more detail.
+You can modify the folder configuration in your configuration file. See {% url 'configuration' configuration#Folders-Files %} for more detail.
 
 {% note info "What files should I add to my '.gitignore file' ?" %}
-Cypress will create a {% url `screenshotsFolder` configuration#Screenshots %} and a {% url `videosFolder` configuration#Videos %} to store the screenshots and videos taken during the testing of your application. Many users will opt to add these folders to their `.gitignore` file. Additionally, if you are storing sensitive environment variables in your `cypress.json` or {% url `cypress.env.json` environment-variables#Option-2-cypress-env-json %}, these should also be ignored when you check into source control.
+Cypress will create a {% url `screenshotsFolder` configuration#Screenshots %} and a {% url `videosFolder` configuration#Videos %} to store the screenshots and videos taken during the testing of your application. Many users will opt to add these folders to their `.gitignore` file. Additionally, if you are storing sensitive environment variables in your configuration file (`cypress.json` by default) or {% url `cypress.env.json` environment-variables#Option-2-cypress-env-json %}, these should also be ignored when you check into source control.
 {% endnote %}
 
 ## Fixture Files
@@ -335,14 +335,14 @@ Remember to use {% url `.only` writing-and-organizing-tests#Excluding-and-Includ
 
 ### Files
 
-- {% url `cypress.json` configuration %}
-- {% url `cypress.env.json` environment-variables %}
+- {% url "Configuration file (`cypress.json`) by default" configuration %}
+- {% url "`cypress.env.json`" environment-variables %}
 
 ### Folders
 
-- `cypress/integration/`
-- `cypress/support/`
-- `cypress/plugins/`
+- Integration directory (`cypress/integration/` by default)
+- Support directory (`cypress/support/` by default)
+- Plugins directory (`cypress/plugins/` by default)
 
 The folder, the files within the folder, and all child folders and their files (recursively) are watched.
 
diff --git a/source/guides/getting-started/installing-cypress.md b/source/guides/getting-started/installing-cypress.md
index 8d79cf6edd..ddc6764e4b 100644
--- a/source/guides/getting-started/installing-cypress.md
+++ b/source/guides/getting-started/installing-cypress.md
@@ -216,6 +216,13 @@ CYPRESS_CACHE_FOLDER=~/Desktop/cypress_cache npm install
 CYPRESS_CACHE_FOLDER=~/Desktop/cypress_cache npm run test
 ```
 
+Cypress will automatically replace the `~` with the user's home directory. So you can pass `CYPRESS_CACHE_FOLDER` as a string from CI configuration files, for example:
+
+```yml
+environment:
+  CYPRESS_CACHE_FOLDER: '~/.cache/Cypress'
+```
+
 See also {% url 'Continuous Integration - Caching' continuous-integration#Caching %} section in the documentation.
 
 {% note warning %}
diff --git a/source/guides/getting-started/testing-your-app.md b/source/guides/getting-started/testing-your-app.md
index b3232d9802..0a44d09bbb 100644
--- a/source/guides/getting-started/testing-your-app.md
+++ b/source/guides/getting-started/testing-your-app.md
@@ -96,7 +96,7 @@ If you've started your server, then you should see your application loaded and w
 
 If you think ahead, you'll quickly realize that you're going to be typing this URL a lot, since every test is going to need to visit some page of your application. Luckily, Cypress provides a {% url "configuration option" configuration %} for this. Let's leverage that now.
 
-Open up `cypress.json`, which you will find in your project root (where you installed Cypress.) It starts out empty:
+Open up your {% url "configuration file" configuration %} (`cypress.json` in your project directory, by default) It starts out empty:
 
 ```json
 {}
@@ -113,7 +113,7 @@ Let's add the `baseUrl` option.
 This will automatically **prefix** {% url `cy.visit()` visit %} and {% url `cy.request()` request %} commands with this baseUrl.
 
 {% note info %}
-Whenever you modify `cypress.json`, Cypress will automatically reboot itself and kill any open browsers. This is normal. Click on the spec file again to relaunch the browser.
+Whenever you modify your configuration file, Cypress will automatically reboot itself and kill any open browsers. This is normal. Click on the spec file again to relaunch the browser.
 {% endnote %}
 
 We can now visit a relative path and omit the hostname and port.
diff --git a/source/guides/guides/command-line.md b/source/guides/guides/command-line.md
index 8083f0c817..94953958bf 100644
--- a/source/guides/guides/command-line.md
+++ b/source/guides/guides/command-line.md
@@ -82,6 +82,7 @@ Option | Description
 `--browser`, `-b`  | {% urlHash "Run Cypress in the browser with the given name. If a filesystem path is supplied, Cypress will attempt to use the browser at that path." cypress-run-browser-lt-browser-name-or-path-gt %}
 `--ci-build-id` | {% urlHash "Specify a unique identifier for a run to enable grouping or parallelization." cypress-run-ci-build-id-lt-id-gt %}
 `--config`, `-c`  | {% urlHash "Specify configuration" cypress-run-config-lt-config-gt %}
+`--config-file`, `-C`  | {% urlHash "Specify configuration file" cypress-run-config-file-lt-config-file-gt %}
 `--env`, `-e`  | {% urlHash "Specify environment variables" cypress-run-env-lt-env-gt %}
 `--group`  | {% urlHash "Group recorded tests together under a single run" cypress-run-group-lt-name-gt %}
 `--headed`  | {% urlHash "Display the Electron browser instead of running headlessly" cypress-run-headed %}
@@ -128,15 +129,29 @@ Only valid when providing a `--group` or `--parallel` flag. Read our {% url "par
 
 ### `cypress run --config <config>`
 
-Read more about {% url 'environment variables' environment-variables %} and {% url 'configuration' configuration %}.
+Set {% url 'configuration' configuration %} values. Separate multiple values with a comma. The values set here override any values set in your configuration file.
 
 ```shell
 cypress run --config pageLoadTimeout=100000,watchForFileChanges=false
 ```
 
+### `cypress run --config-file <config-file>`
+
+You can specify a path to a JSON file where {% url 'configuration' configuration %} values are set. This defaults to `cypress.json`.
+
+```shell
+cypress run --config-file tests/cypress-config.json
+```
+
+You can pass `false` to disable the use of a configuration file entirely.
+
+```shell
+cypress run --config-file false
+```
+
 ### `cypress run --env <env>`
 
-Pass a single string variable.
+Set Cypress {% url 'environment variables' environment-variables %}.
 
 ```shell
 cypress run --env host=api.dev.local
@@ -220,10 +235,6 @@ cypress run --port 8080
 
 ### `cypress run --project <project-path>`
 
-By default, Cypress expects your `cypress.json` to be found where your `package.json` is. However, you can point Cypress to run in a different location.
-
-This enables you to install Cypress in a top level `node_modules` folder but run Cypress in a nested folder. This is also helpful when you have multiple Cypress projects in your repo.
-
 To see this in action we've set up an {% url 'example repo to demonstrate this here' https://github.com/cypress-io/cypress-test-nested-projects %}.
 
 ```shell
@@ -298,12 +309,13 @@ cypress open [options]
 
 ### Options:
 
-Options passed to `cypress open` will automatically be applied to the project you open. These persist on all projects until you quit the Cypress Test Runner. These options will also override values in `cypress.json`.
+Options passed to `cypress open` will automatically be applied to the project you open. These persist on all projects until you quit the Cypress Test Runner. These options will also override values in your configuration file (`cypress.json` by default).
 
 Option | Description
 ------ | ---------
 `--browser`, `-b`  | {% urlHash "Path to a custom browser to be added to the list of available browsers in Cypress" cypress-open-browser-lt-browser-path-gt %}
 `--config`, `-c`  | {% urlHash "Specify configuration" cypress-open-config-lt-config-gt %}
+`--config-file`, `-C`  | {% urlHash "Specify configuration file" cypress-open-config-file-lt-config-file-gt %}
 `--detached`, `-d` | Open Cypress in detached mode
 `--env`, `-e`  | {% urlHash "Specify environment variables" cypress-open-env-lt-env-gt %}
 `--global` | {% urlHash "Run in global mode" cypress-open-global %}
@@ -329,16 +341,46 @@ Currently, only browsers in the Chrome family are supported.
 
 ### `cypress open --config <config>`
 
+Set {% url 'configuration' configuration %} values. Separate multiple values with a comma. The values set here override any values set in your configuration file.
+
+```shell
+cypress run --config pageLoadTimeout=100000,watchForFileChanges=false
+```
+
+### `cypress open --config-file <config-file>`
+
+You can specify a path to a JSON file where {% url 'configuration' configuration %} values are set. This defaults to `cypress.json`. 
+
 ```shell
-cypress open --config pageLoadTimeout=100000,watchForFileChanges=false
+cypress open --config-file tests/cypress-config.json
+```
+
+You can pass `false` to disable the use of a configuration file entirely.
+
+```shell
+cypress open --config-file false
 ```
 
 ### `cypress open --env <env>`
 
+Set Cypress {% url 'environment variables' environment-variables %}.
+
 ```shell
 cypress open --env host=api.dev.local
 ```
 
+Pass several variables using commas and no spaces. Numbers are automatically converted from strings.
+
+```shell
+cypress open --env host=api.dev.local,port=4222
+```
+
+Pass an object as a JSON in a string.
+
+```shell
+cypress open --env flags='{"feature-a":true,"feature-b":false}'
+```
+
 ### `cypress open --global`
 
 Opening Cypress in global mode is useful if you have multiple nested projects but want to share a single global installation of Cypress. In this case you can add each nested project to the Cypress in global mode, thus giving you a nice UI to switch between them.
@@ -355,10 +397,6 @@ cypress open --port 8080
 
 ### `cypress open --project <project-path>`
 
-By default, Cypress expects your `cypress.json` to be found where your `package.json` is. However, you can point Cypress to run in a different location.
-
-This enables you to install Cypress in a top level `node_modules` folder but run Cypress in a nested folder. This is also helpful when you have multiple Cypress projects in your repo.
-
 To see this in action we've set up an {% url 'example repo to demonstrate this here' https://github.com/cypress-io/cypress-test-nested-projects %}.
 
 ```shell
diff --git a/source/guides/guides/continuous-integration.md b/source/guides/guides/continuous-integration.md
index eb74805e4c..0d2ab85b63 100644
--- a/source/guides/guides/continuous-integration.md
+++ b/source/guides/guides/continuous-integration.md
@@ -466,7 +466,7 @@ You can set various environment variables to modify how Cypress runs.
 
 ### Configuration Values
 
-You can set any configuration value as an environment variable. This overrides values in your `cypress.json`.
+You can set any configuration value as an environment variable. This overrides values in your configuration file (`cypress.json` by default).
 
 ***Typical use cases would be modifying things like:***
 
diff --git a/source/guides/guides/environment-variables.md b/source/guides/guides/environment-variables.md
index 94163df6ef..ea61ff3d63 100644
--- a/source/guides/guides/environment-variables.md
+++ b/source/guides/guides/environment-variables.md
@@ -16,7 +16,7 @@ Environment variables can be changed easily - especially when running in CI.
 cy.request('https://api.acme.corp') // this will break on other environments
 ```
 
-### We can move this into an environment variable.
+### We can move this into a Cypress environment variable:
 
 ```javascript
 cy.request(Cypress.env('EXTERNAL_API')) // points to a dynamic env var
@@ -29,11 +29,12 @@ However, you **do not** need to use environment variables to point to the origin
 
 {% url `cy.visit()` visit %} and {% url `cy.request()` request %} are automatically prefixed with this value - avoiding the need to specify them.
 
-`baseUrl` can be set in your `cypress.json` - and then you can use an environment variable to override it.
+`baseUrl` can be set in your configuration file (`cypress.json` by default) - and then you can use an environment variable to override it.
 
 ```shell
 CYPRESS_baseUrl=https://staging.app.com cypress run
 ```
+
 {% endnote %}
 
 # Setting
@@ -42,7 +43,7 @@ There are 5 different ways to set environment variables. Each has a slightly dif
 
 ***To summarize you can:***
 
-- {% urlHash "Set in `cypress.json`" Option-1-cypress-json %}
+- {% urlHash "Set in your configuration file" Option-1-configuration-file %}
 - {% urlHash "Create a `cypress.env.json`" Option-2-cypress-env-json %}
 - {% urlHash "Export as `CYPRESS_*`" Option-3-CYPRESS %}
 - {% urlHash "Pass in the CLI as `--env`" Option-4-env %}
@@ -52,12 +53,11 @@ Don't feel obligated to pick just one method. It is common to use one strategy f
 
 When your tests are running, you can use the {% url `Cypress.env` env %} function to access the values of your environment variables.
 
-## Option #1: `cypress.json`
+## Option #1: configuration file
 
-Any key/value you set in your {% url 'configuration' configuration %} under the `env` key will become an environment variable.
+Any key/value you set in your {% url "configuration file (`cypress.json` by default)" configuration %} under the `env` key will become an environment variable.
 
-```javascript
-// cypress.json
+```json
 {
   "projectId": "128076ed-9868-4e98-9cef-98dd8b705d75",
   "env": {
@@ -87,12 +87,11 @@ Cypress.env('some') // 'value'
 
 ## Option #2: `cypress.env.json`
 
-You can create your own `cypress.env.json` file that Cypress will automatically check. Values in here will overwrite conflicting environment variables in `cypress.json`.
+You can create your own `cypress.env.json` file that Cypress will automatically check. Values in here will overwrite conflicting environment variables in your {% url "configuration file (`cypress.json` by default)" configuration %}.
 
 This strategy is useful because if you add `cypress.env.json` to your `.gitignore` file, the values in here can be different for each developer machine.
 
-```javascript
-// cypress.env.json
+```json
 {
   "host": "veronica.dev.local",
   "api_server": "http://localhost:8888/api/v1/"
@@ -124,7 +123,7 @@ Cypress.env('api_server') // 'http://localhost:8888/api/v1/'
 
 Any environment variable on your machine that starts with either `CYPRESS_` or `cypress_` will automatically be added and made available to you.
 
-Conflicting values will override values from `cypress.json` and `cypress.env.json` files.
+Conflicting values will override values from your configuration file (`cypress.json` by default) and `cypress.env.json` files.
 
 Cypress will *strip off* the `CYPRESS_` when adding your environment variables.
 
diff --git a/source/guides/guides/module-api.md b/source/guides/guides/module-api.md
index c01ad340b9..018d99d1ef 100644
--- a/source/guides/guides/module-api.md
+++ b/source/guides/guides/module-api.md
@@ -18,21 +18,22 @@ Just like the {% url "Command Line options" command-line %} for `cypress run`, y
 
 Option | Type | Description
 ------ | ---- | ---------
-`browser` | *String* | Specify different browser to run tests in, either by name or by filesystem path
-`ciBuildId` | *String* | Specify a unique identifier for a run to enable {% url "grouping" parallelization#Grouping-test-runs %} or {% url "parallelization" parallelization %}
-`config` | *Object* | Specify {% url "configuration" configuration %}
-`env` | *Object* | Specify {% url "environment variables" environment-variables %}
-`group` | *String* | {% url "Group" parallelization#Grouping-test-runs %} recorded tests together under a single run
-`headed` | *Boolean* | Display the Electron browser instead of running headlessly
-`key` | *String* | Specify your secret record key
-`exit` | *Boolean* | Whether to close Cypress after all tests run
-`parallel` | *Boolean* | Run recorded specs in {% url "parallel" parallelization %} across multiple machines
-`port` | *Number* | Override default port
-`project` | *String* | Path to a specific project
-`record` | *Boolean* | Whether to record the test run
-`reporter` | *String* | Specify a {% url "Mocha reporter" reporters %}
-`reporterOptions` | *Object* | Specify {% url "Mocha reporter" reporters %} options
-`spec` | *String* | Specify the specs to run
+`browser` | *string* | Specify different browser to run tests in, either by name or by filesystem path
+`ciBuildId` | *string* | Specify a unique identifier for a run to enable {% url "grouping" parallelization#Grouping-test-runs %} or {% url "parallelization" parallelization %}
+`config` | *object* | Specify {% url "configuration" configuration %}
+`configFile` | *string | boolean* | Path to the config file to be used. If `false` is passed, no config file will be used.
+`env` | *object* | Specify {% url "environment variables" environment-variables %}
+`group` | *string* | {% url "Group" parallelization#Grouping-test-runs %} recorded tests together under a single run
+`headed` | *boolean* | Display the Electron browser instead of running headlessly
+`key` | *string* | Specify your secret record key
+`exit` | *boolean* | Whether to close Cypress after all tests run
+`parallel` | *boolean* | Run recorded specs in {% url "parallel" parallelization %} across multiple machines
+`port` | *number* | Override default port
+`project` | *string* | Path to a specific project
+`record` | *boolean* | Whether to record the test run
+`reporter` | *string* | Specify a {% url "Mocha reporter" reporters %}
+`reporterOptions` | *object* | Specify {% url "Mocha reporter" reporters %} options
+`spec` | *string* | Specify the specs to run
 
 ```javascript
 const cypress = require('cypress')
@@ -118,13 +119,14 @@ Just like the {% url "Command Line options" command-line %}, you can pass option
 
 Option |  Type | Description
 ------ | ---- | ---------
-`browser` | *String* | Specify a filesystem path to a custom browser
-`config` | *Options* | Specify {% url "configuration" configuration %}
-`detached` | *Boolean* | Open Cypress in detached mode
-`env` | *Object* | Specify {% url "environment variables" environment-variables %}
-`global` | *Boolean* | Run in global mode
-`port` | *Number* | Override default port
-`project` | *String* | Path to a specific project
+`browser` | *string* | Specify a filesystem path to a custom browser
+`config` | *object* | Specify {% url "configuration" configuration %}
+`configFile` | *string | boolean* | Path to the config file to be used. If `false` is passed, no config file will be used.
+`detached` | *boolean* | Open Cypress in detached mode
+`env` | *object* | Specify {% url "environment variables" environment-variables %}
+`global` | *boolean* | Run in global mode
+`port` | *number* | Override default port
+`project` | *string* | Path to a specific project
 
 ### Example
 
diff --git a/source/guides/guides/screenshots-and-videos.md b/source/guides/guides/screenshots-and-videos.md
index 4b684718c4..b380faf4d6 100644
--- a/source/guides/guides/screenshots-and-videos.md
+++ b/source/guides/guides/screenshots-and-videos.md
@@ -29,10 +29,6 @@ Cypress clears any existing screenshots before `cypress run`. If you do not want
 
 Cypress also records videos when running tests.
 
-{% note warning %}
-Video recording is currently only supported when running Cypress from the Electron browser. {% issue 1767 "See this issue" %} for more information.
-{% endnote %}
-
 Video recording can be turned off entirely by setting {% url `video` configuration#Videos %} to `false` from within your configuration.
 
 Videos are stored in the {% url `videosFolder` configuration#Videos %} which is set to `cypress/videos` by default.
@@ -45,7 +41,7 @@ Cypress clears any existing videos before a `cypress run`. If you do not want to
 
 ## Video encoding
 
-If your spec files have a long run duration, you might notice a time gap between a finished spec and a new spec starting during `cypress run`. During this time, Cypress is encoding the captured video and possibly uploading it to the Dashboard. 
+If your spec files have a long run duration, you might notice a time gap between a finished spec and a new spec starting during `cypress run`. During this time, Cypress is encoding the captured video and possibly uploading it to the Dashboard.
 
 If the machine is encoding the video slowly (which is often the case for virtual machines that use a single core), the encoding might take a long time. In this case, you can modify the {% url `videoCompression` configuration#Videos %} configuration to make the encoding a little bit faster. Here are some common scenarios:
 
diff --git a/source/guides/guides/web-security.md b/source/guides/guides/web-security.md
index dc9832379e..031e18f073 100644
--- a/source/guides/guides/web-security.md
+++ b/source/guides/guides/web-security.md
@@ -241,7 +241,7 @@ One last thing to consider here is that every once in a while we discover bugs i
 
 To start, you will need to understand that *not all browsers expose a way to turn off web security*. Some do, some don't. If you rely on disabling web security, you will not be able to run tests on browsers that do not support this feature.
 
-**Setting `chromeWebSecurity` to `false` allows you to do the following:**
+## Setting `chromeWebSecurity` to `false` allows you to do the following:
 
 - Display insecure content
 - Navigate to any superdomain without cross-origin errors
@@ -251,7 +251,7 @@ One thing you may notice though is that Cypress still enforces visiting a single
 
 Still here? That's cool, let's disable web security!
 
-***Set `chromeWebSecurity` to `false` in `cypress.json` and we'll take care of the rest.***
+### Set `chromeWebSecurity` to `false` in your {% url "configuration file (`cypress.json` by default)" configuration %}` and we'll take care of the rest
 
 ```json
 {
diff --git a/source/guides/references/best-practices.md b/source/guides/references/best-practices.md
index 075c34c14d..d18dd30f81 100644
--- a/source/guides/references/best-practices.md
+++ b/source/guides/references/best-practices.md
@@ -577,7 +577,7 @@ We have {% url 'examples showing you how to start and stop your web server' cont
 {% endnote %}
 
 {% note success %}
-{% fa fa-check-circle green %} **Best Practice:** Set a `baseUrl` in your `cypress.json` file.
+{% fa fa-check-circle green %} **Best Practice:** Set a `baseUrl` in your {% url "configuration file (`cypress.json` by default)" configuration %}.
 {% endnote %}
 
 Adding a {% url "`baseUrl`" configuration#Global %} in your configuration allows you to omit passing the `baseUrl` to commands like {% url "`cy.visit()`" visit %} and {% url "`cy.request()`" request %}. Cypress assumes this is the url you want to use.
@@ -594,7 +594,7 @@ As soon as it encounters a {% url "`cy.visit()`" visit %}, Cypress then switches
 
 By setting the `baseUrl`, you can avoid this reload altogether. Cypress will load the main window in the `baseUrl` you specified as soon as your tests start.
 
-### cypress.json
+### Configuration file (`cypress.json` by default)
 
 ```json
 {
diff --git a/source/guides/references/configuration.md b/source/guides/references/configuration.md
index 163602a4ca..979cdbd60e 100644
--- a/source/guides/references/configuration.md
+++ b/source/guides/references/configuration.md
@@ -4,11 +4,9 @@ title: Configuration
 
 When a project is added to Cypress, a `cypress.json` file is created in the project. This file is used to store the `projectId` ({% url 'after configuring your tests to record' projects#Setup %}) and any configuration values you supply.
 
-```json
-{
-  "projectId": "jd90q7"
-}
-```
+{% note warning Change Configuration File %}
+You can change the configuration file or turn off the use of a configuration file by using the {% url "`--config-file` flag" command-line#cypress-open-config-file-lt-config-file-gt %}.
+{% endnote %}
 
 # Options
 
@@ -97,6 +95,12 @@ Option | Default | Description
 `animationDistanceThreshold` | `5` | The distance in pixels an element must exceed over time to be considered animating
 `waitForAnimations` | `true` | Whether to wait for elements to finish animating before executing commands
 
+## Node version
+
+Option | Default | Description
+----- | ---- | ----
+`nodeVersion` | `bundled` | If set to `system`, Cypress will try to find a Node executable on your path to use when executing your {% url plugins plugins-guide %}. Otherwise, Cypress will use the Node version bundled with Cypress.
+
 # Overriding Options
 
 Cypress gives you the option to dynamically alter configuration values. This is helpful when running Cypress in multiple environments and on multiple developer machines.
@@ -133,7 +137,7 @@ While this may take a bit more work than other options - it yields you the most
 
 You can also use {% url 'environment variables' environment-variables %} to override configuration values. This is especially useful in {% url 'Continuous Integration' continuous-integration %} or when working locally. This gives you the ability to change configuration options without modifying any code or build scripts.
 
-By default, any environment variable that matches a corresponding configuration key will override the `cypress.json` value.
+By default, any environment variable that matches a corresponding configuration key will override the configuration file (`cypress.json` by default) value.
 
 ```shell
 export CYPRESS_VIEWPORT_WIDTH=800
@@ -250,4 +254,8 @@ You can turn this option off if the application or site you're testing **does no
 
 ## Intelligent Code Completion
 
-IntelliSense is available for Cypress while editing your `cypress.json` file. {% url "Learn how to set up Intelligent Code Completion." intelligent-code-completion %}
+IntelliSense is available for Cypress while editing your configuration file. {% url "Learn how to set up Intelligent Code Completion." intelligent-code-completion %}
+
+{% history %}
+{% url "3.5.0" changelog %} | Added support for option `nodeVersion`
+{% endhistory %}
diff --git a/source/guides/references/error-messages.md b/source/guides/references/error-messages.md
index 8622038e87..b70e317183 100644
--- a/source/guides/references/error-messages.md
+++ b/source/guides/references/error-messages.md
@@ -190,9 +190,9 @@ Cypress will continuously attempt to interact with the element until it eventual
 cy.get('#modal button').click({ waitForAnimations: false })
 ```
 
-You can globally disable animation error checking, or increase the threshold by modifying the {% url 'configuration' configuration %} in your {% url 'configuration' configuration %}.
+You can globally disable animation error checking, or increase the threshold by modifying the {% url 'configuration' configuration %}.
 
-### cypress.json
+### Configuration file (`cypress.json` by default)
 
 ```json
 {
@@ -505,11 +505,9 @@ When your application navigates to a superdomain outside of the current origin-p
 
 2. You are testing a page that uses Single sign-on (SSO). In this case your web server is likely redirecting you between superdomains, so you receive this error message. You can likely get around this redirect problem by using {% url `cy.request()` request %} to manually handle the session yourself.
 
-If you find yourself stuck and can't work around these issues you can set this in your `cypress.json` file. But before doing so you should really understand and {% url 'read about the reasoning here' web-security %}.
-
-```javascript
-// cypress.json
+If you find yourself stuck and can't work around these issues you can set this in your {% url "configuration file (`cypress.json` by default)" configuration %}. But before doing so you should really understand and {% url 'read about the reasoning here' web-security %}.
 
+```json
 {
   "chromeWebSecurity": false
 }
diff --git a/source/guides/references/proxy-configuration.md b/source/guides/references/proxy-configuration.md
index a70798ed63..99b6a3b590 100644
--- a/source/guides/references/proxy-configuration.md
+++ b/source/guides/references/proxy-configuration.md
@@ -69,7 +69,7 @@ This section refers to your operating system's environment variables, *not* {% u
 
 Cypress automatically reads from your system's `HTTP_PROXY` environment variable and uses that proxy for all HTTP and HTTPS traffic. If an `HTTPS_PROXY` environment variable is set, HTTPS traffic will use that proxy instead.
 
-To bypass the proxy for certain domains, a `NO_PROXY` environment variable can be set to a comma-separated list of domain names to not proxy traffic for. By default, traffic to `localhost` will not be proxied.
+To bypass the proxy for certain domains, a `NO_PROXY` environment variable can be set to a comma-separated list of domain names to not proxy traffic for. By default, traffic to `localhost` will not be proxied. To make Cypress send traffic for `localhost` through the proxy, pass `<-loopback>` in `NO_PROXY`.
 
 If an uppercase and a lowercase version of the proxy settings are supplied (for example, `HTTP_PROXY` and `http_proxy` are both set), the lowercase variable will be preferred.
 
diff --git a/source/guides/references/roadmap.md b/source/guides/references/roadmap.md
index 3eca7fdba8..ab9356033a 100644
--- a/source/guides/references/roadmap.md
+++ b/source/guides/references/roadmap.md
@@ -10,15 +10,15 @@ Our team is always planning and working on really "big" upcoming features. Prior
 
 Status               | Feature                            |  Issue            | PR
 ---------------------| -----------------------------------|-------------------|---
-*Needs review*       | **Test retries**                   |  {% issue 1313 %} | {% PR 3968 %}
+*Work in progress*   | **Firefox support**                |  {% issue 1096 %} | {% PR 1359 %}
+*Work in progress*   | **Full network layer stubbing**    |  {% issue 687 %}  | {% PR 4176 %}
 *Work in progress*   | **Improve Test Runner errors**     |  {% issue 3762 %} | {% PR 3930 %}
-*Work in progress*   | **Electron upgrade**               |  {% issue 3568 %} | {% PR 3569 %}
-*Work in progress*   | **Mocha, Chai, Sinon upgrade**     |  {% issue 2840 %} | {% PR 2880 %}
-*Work in progress*   | **Expose more events**             |  {% issue 2840 %} | {% PR 2880 %}
+*Work in progress*   | **Testing Electron Apps**          |  {% issue 2072 %} |
+*Work in progress*   | **Test retries**                   |  {% issue 1313 %} | {% PR 3968 %}
+*Work in progress*   | **Mocha, Chai, Sinon upgrade**     |  {% issue 2840 %} | {% PR 4225 %}
+*Work in progress*   | **Expose more events**             |  {% issue 2840 %} | {% PR 4225 %}
 *Work in progress*   | **Native events**                  |  {% issue 311 %}  |
 *Work in progress*   | **Cross browser support**          |  {% issue 310 %}  |
-*Work in progress*   | **Full network layer stubbing**    |  {% issue 687 %}  |
-*Proposal complete*  | **Lifecycle events**               |  {% issue 686 %}  |
 
 ## Dashboard Service
 
diff --git a/source/guides/tooling/intelligent-code-completion.md b/source/guides/tooling/intelligent-code-completion.md
index 35db64ab3c..1bb29f29d7 100644
--- a/source/guides/tooling/intelligent-code-completion.md
+++ b/source/guides/tooling/intelligent-code-completion.md
@@ -88,7 +88,7 @@ Adding a {% url "`tsconfig.json`" http://www.typescriptlang.org/docs/handbook/ts
 
 ## Features:
 
-When editing the {% url "`cypress.json`" configuration %} file, you can use our {% url "json schema file" https://on.cypress.io/cypress.schema.json %} to get intelligent tooltips in your IDE for each configuration property.
+When editing the {% url "configuration file (`cypress.json` by default)" configuration %}, you can use our {% url "json schema file" https://on.cypress.io/cypress.schema.json %} to get intelligent tooltips in your IDE for each configuration property.
 
 ### Property help when writing and hovering on configuration keys
 
@@ -102,7 +102,7 @@ When editing the {% url "`cypress.json`" configuration %} file, you can use our
 
 Intelligent code completion using JSON schemas is supported by default in {% url "Visual Studio Code" https://code.visualstudio.com/ %} and {% url "Visual Studio" https://www.visualstudio.com/ %}. All other editors will require extra configuration or plugins for JSON schema support.
 
-To set up in {% url "Visual Studio Code" https://code.visualstudio.com/ %} you can open `Preferences / Settings / User Settings` and add the `json.schemas` property.
+To set up in {% url "Visual Studio Code" https://code.visualstudio.com/ %} you can open `Preferences / Settings / User Settings` and add the `json.schemas` property. Make sure to replace `cypress.json` with your configuration file if not the default.
 
 ```json
 {
diff --git a/source/guides/tooling/plugins-guide.md b/source/guides/tooling/plugins-guide.md
index 201934341d..f6b531e0b2 100644
--- a/source/guides/tooling/plugins-guide.md
+++ b/source/guides/tooling/plugins-guide.md
@@ -6,9 +6,9 @@ Plugins enable you to tap into, modify, or extend the internal behavior of Cypre
 
 Normally, as a user, all of your test code, your application, and Cypress commands are executed in the browser. But Cypress is also a Node process that plugins can use.
 
-> Plugins enable you to tap into the `node` process running outside of the browser.
+> Plugins enable you to tap into the Node process running outside of the browser.
 
-Plugins are a "seam" for you to write your own custom code that executes during particular stages of the Cypress lifecycle.
+Plugins are a "seam" for you to write your own custom code that executes during particular stages of the Cypress lifecycle. It also allows you to execute code within your own Node version when the {% url "`nodeVersion`" configuration#Node-version %} is set in your configuration.
 
 {% note info "This is a brief overview" %}
 If you want more details about how to write a plugin, we've written API docs that show you how to work with each plugin event.
@@ -20,7 +20,7 @@ You can {% url "check out the API docs here" writing-a-plugin %}.
 
 ## Configuration
 
-With plugins, you can programmatically alter the resolved configuration and environment variables that come from `cypress.json`, {% url `cypress.env.json` environment-variables#Option-2-cypress-env-json %}, the CLI, or system environment variables.
+With plugins, you can programmatically alter the resolved configuration and environment variables that come from {% url "your configuration file (`cypress.json` by default)" configuration %}, {% url `cypress.env.json` environment-variables#Option-2-cypress-env-json %}, the {% url "command line" command-line %}, or system environment variables.
 
 This enables you to do things like:
 
@@ -52,7 +52,6 @@ The event `before:browser:launch` can be used to modify the launch arguments for
 You can use the `before:browser:launch` event to do things like:
 
 - Load a Chrome extension
-- Change print media
 - Enable or disable experimental chrome features
 - Control which Chrome components are loaded
 
@@ -72,7 +71,7 @@ Check out our {% url 'After Screenshot API docs' after-screenshot-api %} which d
 
 ## cy.task
 
-The event `task` is used in conjunction with the {% url `cy.task()` task %} command. It allows you to write arbitrary code in Node to accomplish tasks that aren't possible in the browser.
+The event `task` is used in conjunction with the {% url `cy.task()` task %} command. It allows you to write arbitrary code in Node to accomplish tasks that aren't possible in the browser. It also allows you to execute code within your own Node version when the {% url "`nodeVersion`" configuration#Node-version %} is set in your configuration.
 
 You can use the `task` event to do things like:
 
diff --git a/source/guides/tooling/reporters.md b/source/guides/tooling/reporters.md
index da549fe5bf..fe44f76a35 100644
--- a/source/guides/tooling/reporters.md
+++ b/source/guides/tooling/reporters.md
@@ -25,9 +25,31 @@ Once you've read through the documentation below, we invite you to experience th
 
 # Reporter Options
 
-Some reporters accept options that customize their behavior. These can be specified in your `cypress.json` or via the command line:
+### Command line
+
+```shell
+cypress run --reporter reporters/custom.js
+```
+
+We also support passing an absolute path to the reporter.
+
+## npm Reporters
+
+### Specify package name in configuration file (`cypress.json` by default) when installing a custom reporter through npm
+
+```json
+{
+  "reporter": "mochawesome"
+}
+```
+
+### Command line
+
+
+
+# Reporter Options
 
-***cypress.json***
+Some reporters accept options that customize their behavior. These can be specified in your configuration file (`cypress.json` by default) or via {% url "command line" command-line %} options:
 
 ```json
 {
@@ -131,7 +153,7 @@ We need to install several dependencies.
 npm install --save-dev mocha mochawesome mochawesome-merge mochawesome-report-generator
 ```
 
-We need to configure the reporter in `cypress.json` to skip the HTML report generation and save each individual JSON file in the `cypress/results` folder.
+We need to configure the reporter in your {% url "configuration file (`cypress.json` by default)" configuration %} to skip the HTML report generation and save each individual JSON file in the `cypress/results` folder.
 
 ```json
 {
diff --git a/source/zh-cn/guides/references/configuration.md b/source/zh-cn/guides/references/configuration.md
index 1006250ef2..ef0116635f 100644
--- a/source/zh-cn/guides/references/configuration.md
+++ b/source/zh-cn/guides/references/configuration.md
@@ -97,6 +97,12 @@ Cypress的默认行为可以通过提供以下任何配置选项来修改。下
 `animationDistanceThreshold` | `5` | 元素的距离（以像素为单位）必须超过一定的时间才能被认为是动画
 `waitForAnimations` | `true` | 是否在执行命令之前等待元素结束动画
 
+## Node 版
+
+选项 | 默认值 | 描述
+----- | ---- | ----
+`nodeVersion` | `bundled` | 如果设置为`system`，赛普拉斯将尝试在您的路径上找到 Node 可执行文件，以便在执行{％ url plugins plugins-guide ％}时使用。 否则，赛普拉斯将使用与赛普拉斯捆绑的Node版本。
+
 # 重写选项
 
 Cypress提供了动态更改配置值的选项。这对于在多个环境和多个开发人员机器上运行Cypress非常有用。
diff --git a/source/zh-cn/guides/tooling/plugins-guide.md b/source/zh-cn/guides/tooling/plugins-guide.md
index 63fb506aa7..24008c84ae 100644
--- a/source/zh-cn/guides/tooling/plugins-guide.md
+++ b/source/zh-cn/guides/tooling/plugins-guide.md
@@ -8,7 +8,7 @@ title: 插件
 
 > 插件能够使你在浏览器外部运行`node`进程。
 
-插件是一个"接缝"你可以编写自己的自定义代码，该代码在Cypress生命周期的特定阶段执行。
+插件是一个"接缝"你可以编写自己的自定义代码，该代码在Cypress生命周期的特定阶段执行。 It also allows you to execute code within your own Node version when the {% url "`nodeVersion`" configuration#Node-version %} is set in your configuration.
 
 {% note info "这是一个简短的概述" %}
 如果你想了解更多一些关于如何编写插件，我们已经编写了API文档，向你展示如何处理每个插件事件。
@@ -72,7 +72,8 @@ title: 插件
 
 ## cy.task
 
-事件`task`是与{% url `cy.task()` task %}命令一起使用。 它允许你在node中编写任意代码，以完成浏览器中不可能完成的任务。
+事件`task`是与{% url `cy.task()` task %}命令一起使用。 它允许你在node中编写任意代码，以完成浏览器中不可能完成的任务。 It also allows you to execute code within your own Node version when the {% url "`nodeVersion`" configuration#Node-version %} is set in your configuration.
+
 
 你可以使用`task`事件执行以下操作：
 
diff --git a/themes/cypress/languages/en.yml b/themes/cypress/languages/en.yml
index 22035d7d82..da56784472 100644
--- a/themes/cypress/languages/en.yml
+++ b/themes/cypress/languages/en.yml
@@ -126,6 +126,7 @@ sidebar:
     readfile: readFile
     reload: reload
     request: request
+    rightclick: rightclick
     root: root
     route: route
     screenshot: screenshot
diff --git a/themes/cypress/languages/ja.yml b/themes/cypress/languages/ja.yml
index 23a421c0d8..65020e5cf9 100644
--- a/themes/cypress/languages/ja.yml
+++ b/themes/cypress/languages/ja.yml
@@ -126,6 +126,7 @@ sidebar:
     readfile: readFile
     reload: reload
     request: request
+    rightclick: rightclick
     root: root
     route: route
     screenshot: screenshot
diff --git a/themes/cypress/languages/pt-br.yml b/themes/cypress/languages/pt-br.yml
index e7c502b245..aabcef98ce 100644
--- a/themes/cypress/languages/pt-br.yml
+++ b/themes/cypress/languages/pt-br.yml
@@ -126,6 +126,7 @@ sidebar:
     readfile: readFile
     reload: reload
     request: request
+    rightclick: rightclick
     root: root
     route: route
     screenshot: screenshot
diff --git a/themes/cypress/languages/zh-cn.yml b/themes/cypress/languages/zh-cn.yml
index af330fd30a..206b369e58 100644
--- a/themes/cypress/languages/zh-cn.yml
+++ b/themes/cypress/languages/zh-cn.yml
@@ -128,6 +128,7 @@ sidebar:
     readfile: readFile
     reload: reload
     request: request
+    rightclick: rightclick
     root: root
     route: route
     screenshot: screenshot
diff --git a/themes/cypress/source/img/api/click/click-button-in-form-during-test.png b/themes/cypress/source/img/api/click/click-button-in-form-during-test.png
index fc67e3cc71..dc95b74a1a 100644
Binary files a/themes/cypress/source/img/api/click/click-button-in-form-during-test.png and b/themes/cypress/source/img/api/click/click-button-in-form-during-test.png differ
diff --git a/themes/cypress/source/img/api/click/click-coords-and-events-in-console.png b/themes/cypress/source/img/api/click/click-coords-and-events-in-console.png
index 72d6bcd057..bd5ffd2530 100644
Binary files a/themes/cypress/source/img/api/click/click-coords-and-events-in-console.png and b/themes/cypress/source/img/api/click/click-coords-and-events-in-console.png differ
diff --git a/themes/cypress/source/img/api/dblclick/double-click-in-testing.png b/themes/cypress/source/img/api/dblclick/double-click-in-testing.png
index 037a370c75..1057b17ea1 100644
Binary files a/themes/cypress/source/img/api/dblclick/double-click-in-testing.png and b/themes/cypress/source/img/api/dblclick/double-click-in-testing.png differ
diff --git a/themes/cypress/source/img/api/dblclick/element-double-clicked-on.png b/themes/cypress/source/img/api/dblclick/element-double-clicked-on.png
index 28968e9522..028275ed7f 100644
Binary files a/themes/cypress/source/img/api/dblclick/element-double-clicked-on.png and b/themes/cypress/source/img/api/dblclick/element-double-clicked-on.png differ
diff --git a/themes/cypress/source/img/api/rightclick/rightclick-console-log-with-mouse-events.png b/themes/cypress/source/img/api/rightclick/rightclick-console-log-with-mouse-events.png
new file mode 100644
index 0000000000..a0c2a37912
Binary files /dev/null and b/themes/cypress/source/img/api/rightclick/rightclick-console-log-with-mouse-events.png differ
diff --git a/themes/cypress/source/img/api/rightclick/rightclick-dom-element-in-command-log.png b/themes/cypress/source/img/api/rightclick/rightclick-dom-element-in-command-log.png
new file mode 100644
index 0000000000..0abe155102
Binary files /dev/null and b/themes/cypress/source/img/api/rightclick/rightclick-dom-element-in-command-log.png differ
diff --git a/themes/cypress/source/img/guides/test-runner/keyboard-shortcuts.png b/themes/cypress/source/img/guides/test-runner/keyboard-shortcuts.png
new file mode 100644
index 0000000000..cb47ed5414
Binary files /dev/null and b/themes/cypress/source/img/guides/test-runner/keyboard-shortcuts.png differ