diff --git a/packages/driver/src/cy/actionability.js b/packages/driver/src/cy/actionability.js
index 6aa9dc3096dc..3689cc1e7525 100644
--- a/packages/driver/src/cy/actionability.js
+++ b/packages/driver/src/cy/actionability.js
@@ -251,7 +251,7 @@ const ensureNotAnimating = function (cy, $el, coordsHistory, animationDistanceTh
   // if we dont have at least 2 points
   // then automatically retry
   if (coordsHistory.length < 2) {
-    throw $errUtils.cypressErr('coordsHistory must be at least 2 sets of coords')
+    $errUtils.throwErrByPath('dom.animation_coords_history_invalid')
   }
 
   // verify that our element is not currently animating
diff --git a/packages/driver/src/cy/chai.js b/packages/driver/src/cy/chai.js
index cbed329059c4..9857e7078351 100644
--- a/packages/driver/src/cy/chai.js
+++ b/packages/driver/src/cy/chai.js
@@ -49,16 +49,12 @@ chai.use((chai, u) => {
 
   $chaiJquery(chai, chaiUtils, {
     onInvalid (method, obj) {
-      const err = $errUtils.cypressErr(
-        $errUtils.errMsgByPath(
-          'chai.invalid_jquery_obj', {
-            assertion: method,
-            subject: $utils.stringifyActual(obj),
-          },
-        ),
-      )
-
-      throw err
+      $errUtils.throwErrByPath('chai.invalid_jquery_obj', {
+        args: {
+          assertion: method,
+          subject: $utils.stringifyActual(obj),
+        },
+      })
     },
 
     onError (err, method, obj, negated) {
@@ -253,7 +249,7 @@ chai.use((chai, u) => {
           return _super.apply(this, arguments)
         }
 
-        const err = $errUtils.cypressErr($errUtils.errMsgByPath('chai.match_invalid_argument', { regExp }))
+        const err = $errUtils.cypressErrByPath('chai.match_invalid_argument', { args: { regExp } })
 
         err.retry = false
         throw err
@@ -340,11 +336,11 @@ chai.use((chai, u) => {
                 return `Not enough elements found. Found '${len1}', expected '${len2}'.`
               }
 
-              e1.displayMessage = getLongLengthMessage(obj.length, length)
+              e1.message = getLongLengthMessage(obj.length, length)
               throw e1
             }
 
-            const e2 = $errUtils.cypressErr($errUtils.errMsgByPath('chai.length_invalid_argument', { length }))
+            const e2 = $errUtils.cypressErrByPath('chai.length_invalid_argument', { args: { length } })
 
             e2.retry = false
             throw e2
@@ -397,10 +393,10 @@ chai.use((chai, u) => {
                 return `Expected ${node} not to exist in the DOM, but it was continuously found.`
               }
 
-              return `Expected to find element: '${obj.selector}', but never found it.`
+              return `Expected to find element: \`${obj.selector}\`, but never found it.`
             }
 
-            e1.displayMessage = getLongExistsMessage(obj)
+            e1.message = getLongExistsMessage(obj)
             throw e1
           }
         }
diff --git a/packages/driver/src/cy/commands/actions/check.coffee b/packages/driver/src/cy/commands/actions/check.coffee
index d28856463cdb..6509e804a654 100644
--- a/packages/driver/src/cy/commands/actions/check.coffee
+++ b/packages/driver/src/cy/commands/actions/check.coffee
@@ -58,7 +58,7 @@ checkOrUncheck = (type, subject, values = [], options = {}) ->
     if not isAcceptableElement($el)
       node   = $dom.stringify($el)
       word   = $utils.plural(options.$el, "contains", "is")
-      phrase = if type is "check" then " and :radio" else ""
+      phrase = if type is "check" then " and `:radio`" else ""
       $errUtils.throwErrByPath("check_uncheck.invalid_element", {
         onFail: options._log
         args: { node, word, phrase, cmd: type }
diff --git a/packages/driver/src/cy/commands/actions/scroll.coffee b/packages/driver/src/cy/commands/actions/scroll.coffee
index 49895948ba0c..915b2e178b96 100644
--- a/packages/driver/src/cy/commands/actions/scroll.coffee
+++ b/packages/driver/src/cy/commands/actions/scroll.coffee
@@ -32,7 +32,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
       ## ensure the subject is not window itself
       ## cause how are you gonna scroll the window into view...
       if subject is state("window")
-        $utils.throwErrByPath("scrollIntoView.subject_is_window")
+        $errUtils.throwErrByPath("scrollIntoView.subject_is_window")
 
       ## throw if we're trying to scroll to multiple elements
       if subject.length > 1
diff --git a/packages/driver/src/cy/commands/angular.coffee b/packages/driver/src/cy/commands/angular.coffee
index c5a1e0dc7337..27d2723eaf8f 100644
--- a/packages/driver/src/cy/commands/angular.coffee
+++ b/packages/driver/src/cy/commands/angular.coffee
@@ -35,7 +35,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
         cy.verifyUpcomingAssertions(getEl($elements), options, {
           onRetry: resolveElements
           onFail: (err) ->
-            err.displayMessage = "Could not find element for binding: '#{binding}'."
+            err.message = "Could not find element for binding: '#{binding}'."
         })
 
   findByNgAttr = (name, attr, el, options) ->
diff --git a/packages/driver/src/cy/commands/asserting.coffee b/packages/driver/src/cy/commands/asserting.coffee
index 35ea2110a285..d55aac333f75 100644
--- a/packages/driver/src/cy/commands/asserting.coffee
+++ b/packages/driver/src/cy/commands/asserting.coffee
@@ -84,7 +84,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
     options = {}
 
     if reEventually.test(chainers)
-      err = $errUtils.cypressErr("The 'eventually' assertion chainer has been deprecated. This is now the default behavior so you can safely remove this word and everything should work as before.")
+      err = $errUtils.cypressErrByPath('should.eventually_deprecated')
       err.retry = false
       throwAndLogErr(err)
 
@@ -123,7 +123,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
 
       newExp = _.reduce chainers, (memo, value) =>
         if value not of memo
-          err = $errUtils.cypressErr("The chainer: '#{value}' was not found. Could not build assertion.")
+          err = $errUtils.cypressErrByPath('should.chainer_not_found', { args: { chainer: value } })
           err.retry = false
           throwAndLogErr(err)
 
diff --git a/packages/driver/src/cy/commands/commands.coffee b/packages/driver/src/cy/commands/commands.coffee
index 80233288ed44..e0ed6dd2bad1 100644
--- a/packages/driver/src/cy/commands/commands.coffee
+++ b/packages/driver/src/cy/commands/commands.coffee
@@ -5,12 +5,12 @@ $errUtils = require("../../cypress/error_utils")
 
 command = (ctx, name, args...) ->
   if not ctx[name]
-    cmds = _.keys($Chainer.prototype).join(", ")
+    cmds = "\`#{_.keys($Chainer.prototype).join("`, `")}\`"
     $errUtils.throwErrByPath("miscellaneous.invalid_command", {
       args: { name, cmds }
     })
 
-  ctx[name].apply(window, args)
+  ctx[name].apply(ctx, args)
 
 module.exports = (Commands, Cypress, cy, state, config) ->
   Commands.addChainer({
diff --git a/packages/driver/src/cy/commands/connectors.coffee b/packages/driver/src/cy/commands/connectors.coffee
index 82e5e87e7f9d..e431f379d4e0 100644
--- a/packages/driver/src/cy/commands/connectors.coffee
+++ b/packages/driver/src/cy/commands/connectors.coffee
@@ -211,47 +211,45 @@ module.exports = (Commands, Cypress, cy, state, config) ->
         args: { cmd: name }
       })
 
-    ## TODO: use the new error utils that are part of
-    ## the error message enhancements PR
     propertyNotOnSubjectErr = (prop) ->
-      $errUtils.cypressErr(
-        $errUtils.errMsgByPath("invoke_its.nonexistent_prop", {
+      $errUtils.cypressErrByPath("invoke_its.nonexistent_prop", {
+        args: {
           prop,
           cmd: name
-        })
-      )
+        }
+      })
 
     propertyValueNullOrUndefinedErr = (prop, value) ->
       errMessagePath = if isCmdIts then "its" else "invoke"
 
-      $errUtils.cypressErr(
-        $errUtils.errMsgByPath("#{errMessagePath}.null_or_undefined_prop_value", {
+      $errUtils.cypressErrByPath("#{errMessagePath}.null_or_undefined_prop_value", {
+        args: {
           prop,
           value,
-          cmd: name
-        })
-      )
+        }
+        cmd: name
+      })
 
     subjectNullOrUndefinedErr = (prop, value) ->
       errMessagePath = if isCmdIts then "its" else "invoke"
 
-      $errUtils.cypressErr(
-        $errUtils.errMsgByPath("#{errMessagePath}.subject_null_or_undefined", {
+      $errUtils.cypressErrByPath("#{errMessagePath}.subject_null_or_undefined", {
+        args: {
           prop,
-          value,
           cmd: name
-        })
-      )
+          value,
+        }
+      })
 
     propertyNotOnPreviousNullOrUndefinedValueErr = (prop, value, previousProp) ->
-      $errUtils.cypressErr(
-        $errUtils.errMsgByPath("invoke_its.previous_prop_null_or_undefined", {
+      $errUtils.cypressErrByPath("invoke_its.previous_prop_null_or_undefined", {
+        args: {
           prop,
           value,
           previousProp,
           cmd: name
-        })
-      )
+        }
+      })
 
     traverseObjectAtPath = (acc, pathsArray, index = 0) ->
       ## traverse at this depth
diff --git a/packages/driver/src/cy/commands/cookies.js b/packages/driver/src/cy/commands/cookies.js
index 79330c44758d..4d6bee8eb130 100644
--- a/packages/driver/src/cy/commands/cookies.js
+++ b/packages/driver/src/cy/commands/cookies.js
@@ -92,7 +92,7 @@ module.exports = function (Commands, Cypress, cy, state, config) {
       $errUtils.throwErrByPath('cookies.backend_error', {
         args: {
           action,
-          command,
+          cmd: command,
           browserDisplayName: Cypress.browser.displayName,
           errMessage: err.message,
           errStack: err.stack,
diff --git a/packages/driver/src/cy/commands/files.coffee b/packages/driver/src/cy/commands/files.coffee
index bb325526849e..5f1a8bb648ff 100644
--- a/packages/driver/src/cy/commands/files.coffee
+++ b/packages/driver/src/cy/commands/files.coffee
@@ -2,6 +2,7 @@ _ = require("lodash")
 Promise = require("bluebird")
 
 $errUtils = require("../../cypress/error_utils")
+$errMessages = require("../../cypress/error_messages")
 
 module.exports = (Commands, Cypress, cy, state, config) ->
   Commands.addAll({
@@ -50,16 +51,20 @@ module.exports = (Commands, Cypress, cy, state, config) ->
             onFail: (err) ->
               return unless err.type is "existence"
 
-              if contents?
+              { message, docsUrl } = if contents?
                 ## file exists but it shouldn't
-                err.displayMessage = $errUtils.errMsgByPath("files.existent", {
+                $errUtils.errObjByPath($errMessages, "files.existent", {
                   file, filePath
                 })
               else
                 ## file doesn't exist but it should
-                err.displayMessage = $errUtils.errMsgByPath("files.nonexistent", {
+                $errUtils.errObjByPath($errMessages, "files.nonexistent", {
                   file, filePath
                 })
+
+              err.message = message
+              err.docsUrl = docsUrl
+
             onRetry: verifyAssertions
           })
 
diff --git a/packages/driver/src/cy/commands/querying.js b/packages/driver/src/cy/commands/querying.js
index 18124f7013c7..50f9977b86fb 100644
--- a/packages/driver/src/cy/commands/querying.js
+++ b/packages/driver/src/cy/commands/querying.js
@@ -68,7 +68,7 @@ module.exports = (Commands, Cypress, cy) => {
     get (selector, options = {}) {
       const ctx = this
 
-      if ((options === null) || Array.isArray(options) || (typeof options !== 'object')) {
+      if ((options === null) || _.isArray(options) || !_.isPlainObject(options)) {
         return $errUtils.throwErrByPath('get.invalid_options', {
           args: { options },
         })
@@ -497,7 +497,7 @@ module.exports = (Commands, Cypress, cy) => {
 
                   break
                 case 'existence':
-                  return err.displayMessage = getErr(err)
+                  return err.message = getErr(err)
                 default:
                   break
               }
diff --git a/packages/driver/src/cy/commands/screenshot.coffee b/packages/driver/src/cy/commands/screenshot.coffee
index 73ca3a12665d..ea9e54ce11ef 100644
--- a/packages/driver/src/cy/commands/screenshot.coffee
+++ b/packages/driver/src/cy/commands/screenshot.coffee
@@ -352,7 +352,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
       isWin = $dom.isWindow(subject)
 
       screenshotConfig = _.pick(options, "capture", "scale", "disableTimersAndAnimations", "blackout", "waitForCommandSynchronization", "padding", "clip", "onBeforeScreenshot", "onAfterScreenshot")
-      screenshotConfig = $Screenshot.validate(screenshotConfig, "cy.screenshot", options._log)
+      screenshotConfig = $Screenshot.validate(screenshotConfig, "screenshot", options._log)
       screenshotConfig = _.extend($Screenshot.getConfig(), screenshotConfig)
 
       ## set this regardless of options.log b/c its used by the
diff --git a/packages/driver/src/cy/commands/traversals.coffee b/packages/driver/src/cy/commands/traversals.coffee
index f5a9a81df5a5..e1226797ec84 100644
--- a/packages/driver/src/cy/commands/traversals.coffee
+++ b/packages/driver/src/cy/commands/traversals.coffee
@@ -59,5 +59,5 @@ module.exports = (Commands, Cypress, cy, state, config) ->
           onFail: (err) ->
             if err.type is "existence"
               node = $dom.stringify(subject, "short")
-              err.displayMessage += " Queried from element: #{node}"
-        })
+              err.message += " Queried from element: #{node}"
+            })
diff --git a/packages/driver/src/cy/commands/window.coffee b/packages/driver/src/cy/commands/window.coffee
index 4f3a7415491d..d5a62a70bf7c 100644
--- a/packages/driver/src/cy/commands/window.coffee
+++ b/packages/driver/src/cy/commands/window.coffee
@@ -178,7 +178,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
 
           orientationIsValidAndLandscape = (orientation) =>
             if orientation not in validOrientations
-              all = validOrientations.join("' or '")
+              all = validOrientations.join("` or `")
               $errUtils.throwErrByPath "viewport.invalid_orientation", {
                 onFail: options._log
                 args: { all, orientation }
diff --git a/packages/driver/src/cy/commands/xhr.coffee b/packages/driver/src/cy/commands/xhr.coffee
index 37b1eb451d2c..f7b1a5a4c032 100644
--- a/packages/driver/src/cy/commands/xhr.coffee
+++ b/packages/driver/src/cy/commands/xhr.coffee
@@ -168,7 +168,7 @@ startXhrServer = (cy, state, config) ->
         log.snapshot("response").end()
 
     onNetworkError: (xhr) ->
-      err = $errUtils.cypressErr($errUtils.errMsgByPath("xhr.network_error"))
+      err = $errUtils.cypressErrByPath("xhr.network_error")
 
       if log = logs[xhr.id]
         log.snapshot("failed").error(err)
diff --git a/packages/driver/src/cy/ensures.coffee b/packages/driver/src/cy/ensures.coffee
index 091eff0ea1dc..53850c58a37a 100644
--- a/packages/driver/src/cy/ensures.coffee
+++ b/packages/driver/src/cy/ensures.coffee
@@ -71,7 +71,9 @@ create = (state, expect) ->
 
       if types.length > 1
         ## append a nice error message telling the user this
-        err = $errUtils.appendErrMsg(err, "All #{types.length} subject validations failed on this subject.")
+        errProps = $errUtils.appendErrMsg(err, "All #{types.length} subject validations failed on this subject.")
+
+        $errUtils.mergeErrProps(err, errProps)
 
       throw err
 
@@ -223,7 +225,7 @@ create = (state, expect) ->
     ## TODO: REFACTOR THIS TO CALL THE CHAI-OVERRIDES DIRECTLY
     ## OR GO THROUGH I18N
 
-    cy.ensureExistence($el)
+    ensureExistence($el)
 
   ensureElDoesNotHaveCSS = ($el, cssProperty, cssValue, onFail) ->
     cmd = state("current").get("name")
diff --git a/packages/driver/src/cy/errors.coffee b/packages/driver/src/cy/errors.coffee
index 812ae4f95854..cf80ad288e9b 100644
--- a/packages/driver/src/cy/errors.coffee
+++ b/packages/driver/src/cy/errors.coffee
@@ -1,5 +1,7 @@
+_ = require("lodash")
 $dom = require("../dom")
 $errUtils = require("../cypress/error_utils")
+$errorMessages = require('../cypress/error_messages')
 
 crossOriginScriptRe = /^script error/i
 
@@ -37,28 +39,37 @@ create = (state, config, log) ->
       msg = $errUtils.errMsgByPath("uncaught.cross_origin_script")
 
     createErrFromMsg = ->
-      new Error $errUtils.errMsgByPath("uncaught.error", { msg, source, lineno })
+      new Error($errUtils.errMsgByPath("uncaught.error", {
+        msg, source, lineno
+      }))
 
     ## if we have the 5th argument it means we're in a super
     ## modern browser making this super simple to work with.
     err ?= createErrFromMsg()
 
-    err.name = "Uncaught " + err.name
-
-    suffixMsg = switch type
+    uncaughtErrLookup = switch type
       when "app" then "uncaught.fromApp"
       when "spec" then "uncaught.fromSpec"
 
-    err = $errUtils.appendErrMsg(err, $errUtils.errMsgByPath(suffixMsg))
+    uncaughtErrObj = $errUtils.errObjByPath($errorMessages, uncaughtErrLookup)
+
+    err.name = "Uncaught " + err.name
+
+    uncaughtErrProps = $errUtils.modifyErrMsg(err, uncaughtErrObj.message, (msg1, msg2) ->
+      return "#{msg1}\n\n#{msg2}"
+    )
+    _.defaults(uncaughtErrProps, uncaughtErrObj)
+
+    uncaughtErr = $errUtils.mergeErrProps(err, uncaughtErrProps)
 
-    err.onFail = ->
+    uncaughtErr.onFail = ->
       if l = current and current.getLastLog()
-        l.error(err)
+        l.error(uncaughtErr)
 
     ## normalize error message for firefox
-    $errUtils.normalizeErrorStack(err)
+    $errUtils.normalizeErrorStack(uncaughtErr)
 
-    return err
+    return uncaughtErr
 
   commandRunningFailed = (err) ->
     ## allow for our own custom onFail function
diff --git a/packages/driver/src/cy/retries.coffee b/packages/driver/src/cy/retries.coffee
index 0f672586dda6..8e13f595a81e 100644
--- a/packages/driver/src/cy/retries.coffee
+++ b/packages/driver/src/cy/retries.coffee
@@ -1,6 +1,7 @@
 _ = require("lodash")
 Promise = require("bluebird")
 debug = require('debug')('cypress:driver:retries')
+
 $utils = require("../cypress/utils")
 $errUtils = require("../cypress/error_utils")
 
@@ -58,15 +59,19 @@ create = (Cypress, state, timeout, clearTimeout, whenStable, finishAssertions) -
         if assertions = options.assertions
           finishAssertions(assertions)
 
-        getErrMessage = (err) ->
-          _.get(err, 'displayMessage') or
-            _.get(err, 'message') or
-              err
+        { error, onFail } = options
+
+        prependMsg = $errUtils.errMsgByPath("miscellaneous.retry_timed_out")
+
+        retryErrProps = $errUtils.modifyErrMsg(error, prependMsg, (msg1, msg2) ->
+          return "#{msg2}#{msg1}"
+        )
+
+        retryErr = $errUtils.mergeErrProps(error, retryErrProps)
 
-        $errUtils.throwErrByPath "miscellaneous.retry_timed_out", {
-          onFail: (options.onFail or log)
-          args: { error: getErrMessage(options.error) }
-        }
+        $errUtils.throwErr(retryErr, {
+          onFail: onFail or log
+        })
 
       runnableHasChanged = ->
         ## if we've changed runnables don't retry!
diff --git a/packages/driver/src/cypress.js b/packages/driver/src/cypress.js
index 0e00357f9d07..ad0c2161f026 100644
--- a/packages/driver/src/cypress.js
+++ b/packages/driver/src/cypress.js
@@ -54,7 +54,7 @@ $Log.command = () => {
   return $errUtils.throwErrByPath('miscellaneous.command_log_renamed')
 }
 
-const throwDeprecatedCommandInterface = (key, method) => {
+const throwDeprecatedCommandInterface = (key = 'commandName', method) => {
   let signature = ''
 
   switch (method) {
@@ -326,9 +326,12 @@ class $Cypress {
 
       case 'runner:fail': {
         // mocha runner calculated a failure
-
         const err = args[0].err
 
+        if (err.type === 'existence' || $dom.isDom(err.actual) || $dom.isDom(err.expected)) {
+          err.showDiff = false
+        }
+
         if (err.actual) {
           err.actual = chai.util.inspect(err.actual)
         }
@@ -504,7 +507,7 @@ class $Cypress {
           // attaching long stace traces
           // which otherwise make this err
           // unusably long
-          const err = $errUtils.cloneErr(e)
+          const err = $errUtils.makeErrFromObj(e)
 
           err.__stackCleaned__ = true
           err.backend = true
@@ -526,7 +529,7 @@ class $Cypress {
         const e = reply.error
 
         if (e) {
-          const err = $errUtils.cloneErr(e)
+          const err = $errUtils.makeErrFromObj(e)
 
           err.automation = true
 
diff --git a/packages/driver/src/cypress/cy.js b/packages/driver/src/cypress/cy.js
index 840c64e57146..453f62b9fb3b 100644
--- a/packages/driver/src/cypress/cy.js
+++ b/packages/driver/src/cypress/cy.js
@@ -105,9 +105,9 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
   const warnMixingPromisesAndCommands = function () {
     const title = state('runnable').fullTitle()
 
-    const msg = $errUtils.errMsgByPath('miscellaneous.mixing_promises_and_commands', title)
-
-    return $utils.warning(msg)
+    $errUtils.warnByPath('miscellaneous.mixing_promises_and_commands', {
+      args: { title },
+    })
   }
 
   const $$ = function (selector, context) {
@@ -678,7 +678,9 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
 
     stopped = true
 
-    $errUtils.normalizeErrorStack(err)
+    err = $errUtils.normalizeErrorStack(err)
+
+    err = $errUtils.processErr(err, config)
 
     // store the error on state now
     state('error', err)
@@ -718,12 +720,13 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
       rets = Cypress.action('cy:fail', err, state('runnable'))
     } catch (err2) {
       $errUtils.normalizeErrorStack(err2)
+
       // and if any of these throw synchronously immediately error
-      finish(err2)
+      return finish(err2)
     }
 
     // bail if we had callbacks attached
-    if (rets.length) {
+    if (rets && rets.length) {
       return
     }
 
@@ -1269,7 +1272,7 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
               $utils.stringify(ret)
 
             $errUtils.throwErrByPath('miscellaneous.returned_value_and_commands', {
-              args: ret,
+              args: { returned: ret },
             })
           }
 
diff --git a/packages/driver/src/cypress/error_messages.coffee b/packages/driver/src/cypress/error_messages.coffee
index ede78696fff0..9663e68c460c 100644
--- a/packages/driver/src/cypress/error_messages.coffee
+++ b/packages/driver/src/cypress/error_messages.coffee
@@ -14,9 +14,9 @@ format = (data) ->
 
 formatConfigFile = (configFile) ->
   if configFile == false
-    return "'cypress.json' (currently disabled by --config-file=false)"
+    return "`cypress.json` (currently disabled by --config-file=false)"
 
-  return "'#{format(configFile)}'"
+  return "`#{format(configFile)}`"
 
 formatRedirect = (redirect) -> "  - #{redirect}"
 
@@ -31,7 +31,12 @@ formatProp = (memo, field) ->
   memo
 
 cmd = (command, args = "") ->
-  "cy.#{command}(#{args})"
+  prefix = if command.startsWith("Cypress") then "" else "cy."
+
+  "`#{prefix}#{command}(#{args})`"
+
+getScreenshotDocsPath = (cmd) ->
+  if cmd is "Cypress.Screenshot.defaults" then "screenshot-api" else "screenshot"
 
 getRedirects = (obj, phrase) ->
   redirects = obj.redirects ? []
@@ -57,34 +62,58 @@ getHttpProps = (fields = []) ->
 
 module.exports = {
   add:
-    type_missing: "Cypress.add(key, fn, type) must include a type!"
+    type_missing: "`Cypress.add(key, fn, type)` must include a type!"
 
   agents:
-    deprecated_warning: "cy.agents() is deprecated. Use cy.stub() and cy.spy() instead."
+    deprecated_warning: "#{cmd('agents')} is deprecated. Use #{cmd('stub')} and #{cmd('spy')} instead."
 
   alias:
-    invalid: "Invalid alias: '{{name}}'.\nYou forgot the '@'. It should be written as: '@{{displayName}}'."
-    not_registered_with_available: "#{cmd('{{cmd}}')} could not find a registered alias for: '@{{displayName}}'.\nAvailable aliases are: '{{availableAliases}}'."
-    not_registered_without_available: "#{cmd('{{cmd}}')} could not find a registered alias for: '@{{displayName}}'.\nYou have not aliased anything yet."
+    invalid: "Invalid alias: `{{name}}`.\nYou forgot the `@`. It should be written as: `@{{displayName}}`."
+    not_registered_with_available: "#{cmd('{{cmd}}')} could not find a registered alias for: `@{{displayName}}`.\nAvailable aliases are: `{{availableAliases}}`."
+    not_registered_without_available: "#{cmd('{{cmd}}')} could not find a registered alias for: `@{{displayName}}`.\nYou have not aliased anything yet."
 
   as:
-    empty_string: "#{cmd('as')} cannot be passed an empty string."
-    invalid_type: "#{cmd('as')} can only accept a string."
-    invalid_first_token: "'{{alias}}' cannot be named starting with the '@' symbol. Try renaming the alias to '{{suggestedName}}', or something else that does not start with the '@' symbol."
-    reserved_word: "#{cmd('as')} cannot be aliased as: '{{alias}}'. This word is reserved."
+    empty_string: {
+      message: "#{cmd('as')} cannot be passed an empty string."
+      docsUrl: "https://on.cypress.io/as"
+    }
+    invalid_type: {
+      message: "#{cmd('as')} can only accept a string."
+      docsUrl: "https://on.cypress.io/as"
+    }
+    invalid_first_token: {
+      message: "`{{alias}}` cannot be named starting with the `@` symbol. Try renaming the alias to `{{suggestedName}}`, or something else that does not start with the `@` symbol."
+      docsUrl: "https://on.cypress.io/as"
+    }
+    reserved_word: {
+      message: "#{cmd('as')} cannot be aliased as: `{{alias}}`. This word is reserved."
+      docsUrl: "https://on.cypress.io/as"
+    }
 
   blur:
-    multiple_elements: "#{cmd('blur')} can only be called on a single element. Your subject contained {{num}} elements."
-    no_focused_element: "#{cmd('blur')} can only be called when there is a currently focused element."
-    timed_out:  "#{cmd('blur')} timed out because your browser did not receive any blur events. This is a known bug in Chrome when it is not the currently focused window."
-    wrong_focused_element: "#{cmd('blur')} can only be called on the focused element. Currently the focused element is a: {{node}}"
+    multiple_elements: {
+      message: "#{cmd('blur')} can only be called on a single element. Your subject contained {{num}} elements."
+      docsUrl: "https://on.cypress.io/blur"
+    }
+    no_focused_element: {
+      message: "#{cmd('blur')} can only be called when there is a currently focused element."
+      docsUrl: "https://on.cypress.io/blur"
+    }
+    timed_out: {
+      message: "#{cmd('blur')} timed out because your browser did not receive any `blur` events. This is a known bug in Chrome when it is not the currently focused window."
+      docsUrl: "https://on.cypress.io/blur"
+    }
+    wrong_focused_element: {
+      message: "#{cmd('blur')} can only be called on the focused element. Currently the focused element is a: `{{node}}`"
+      docsUrl: "https://on.cypress.io/blur"
+    }
 
   browser:
-    invalid_arg: "Cypress.{{method}}() must be passed the name of a browser or an object to filter with. You passed: {{obj}}"
+    invalid_arg: "`Cypress.{{method}}()` must be passed the name of a browser or an object to filter with. You passed: `{{obj}}`"
 
   chai:
-    length_invalid_argument: "You must provide a valid number to a length assertion. You passed: '{{length}}'"
-    match_invalid_argument: "'match' requires its argument be a 'RegExp'. You passed: '{{regExp}}'"
+    length_invalid_argument: "You must provide a valid number to a `length` assertion. You passed: `{{length}}`"
+    match_invalid_argument: "`match` requires its argument be a `RegExp`. You passed: `{{regExp}}`"
     invalid_jquery_obj: (obj) ->
       """
         You attempted to make a chai-jQuery assertion on an object that is neither a DOM object or a jQuery object.
@@ -102,366 +131,510 @@ module.exports = {
         This can sometimes happen if a previous assertion changed the subject.
       """
 
-  chain:
-    removed: """
-      #{cmd('chain')} was an undocumented command that has now been removed.
-
-      You can safely remove this from your code and it should work without it.
-    """
-
   check_uncheck:
-    invalid_element: "#{cmd('{{cmd}}')} can only be called on :checkbox{{phrase}}. Your subject {{word}} a: {{node}}"
+    invalid_element: {
+      message: "#{cmd('{{cmd}}')} can only be called on `:checkbox`{{phrase}}. Your subject {{word}} a: `{{node}}`"
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
 
   clear:
-    invalid_element: """
-      #{cmd('clear')} failed because it requires a valid clearable element.
-
-      The element cleared was:
-
-        > {{node}}
-
-      A clearable element matches one of the following selectors:
-        'a[href]'
-        'area[href]'
-        'input'
-        'select'
-        'textarea'
-        'button'
-        'iframe'
-        '[tabindex]'
-        '[contenteditable]'
-    """
+    invalid_element: {
+      message: """
+        #{cmd('clear')} failed because it requires a valid clearable element.
+
+        The element cleared was:
+
+          > `{{node}}`
+
+        A clearable element matches one of the following selectors:
+          'a[href]'
+          'area[href]'
+          'input'
+          'select'
+          'textarea'
+          'button'
+          'iframe'
+          '[tabindex]'
+          '[contenteditable]'
+      """
+      docsUrl: "https://on.cypress.io/clear"
+    }
 
   clearCookie:
-    invalid_argument: "#{cmd('clearCookie')} must be passed a string argument for name."
+    invalid_argument: {
+      message: "#{cmd('clearCookie')} must be passed a string argument for name."
+      docsUrl: "https://on.cypress.io/clearcookie"
+    }
 
   clearLocalStorage:
-    invalid_argument: "#{cmd('clearLocalStorage')} must be called with either a string or regular expression."
+    invalid_argument: {
+      message: "#{cmd('clearLocalStorage')} must be called with either a string or regular expression."
+      docsUrl: "https://on.cypress.io/clearlocalstorage"
+    }
 
   click:
-    multiple_elements: "#{cmd('{{cmd}}')} can only be called on a single element. Your subject contained {{num}} elements. Pass { multiple: true } if you want to serially click each element."
-    on_select_element: "#{cmd('{{cmd}}')} cannot be called on a <select> element. Use #{cmd('select')} command instead to change the value."
+    multiple_elements: {
+      message: "#{cmd('{{cmd}}')} can only be called on a single element. Your subject contained {{num}} elements. Pass `{ multiple: true }` if you want to serially click each element."
+      docsUrl: "https://on.cypress.io/click"
+    }
+    on_select_element: {
+      message: "#{cmd('{{cmd}}')} cannot be called on a `<select>` element. Use #{cmd('select')} command instead to change the value."
+      docsUrl: "https://on.cypress.io/select"
+    }
 
   clock:
-    already_created: "#{cmd('clock')} can only be called once per test. Use the clock returned from the previous call."
-    invalid_1st_arg: "#{cmd('clock')} only accepts a number or an options object for its first argument. You passed: {{arg}}"
-    invalid_2nd_arg: "#{cmd('clock')} only accepts an array of function names or an options object for its second argument. You passed: {{arg}}"
+    invalid_1st_arg: {
+      message: "#{cmd('clock')} only accepts a number or an `options` object for its first argument. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/clock"
+    }
+    invalid_2nd_arg: {
+      message: "#{cmd('clock')} only accepts an array of function names or an `options` object for its second argument. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/clock"
+    }
 
   contains:
-    empty_string: "#{cmd('contains')} cannot be passed an empty string."
-    invalid_argument: "#{cmd('contains')} can only accept a string, number or regular expression."
-    length_option: "#{cmd('contains')} cannot be passed a length option because it will only ever return 1 element."
-    regex_conflict: "You passed a regular expression with the case-insensitive (i) flag and { matchCase: true } to #{cmd('contains')}. Those options conflict with each other, so please choose one or the other."
+    empty_string: {
+      message: "#{cmd('contains')} cannot be passed an empty string."
+      docsUrl: "https://on.cypress.io/contains"
+    }
+    invalid_argument: {
+      message: "#{cmd('contains')} can only accept a string, number or regular expression."
+      docsUrl: "https://on.cypress.io/contains"
+    }
+    length_option: {
+      message: "#{cmd('contains')} cannot be passed a `length` option because it will only ever return 1 element."
+      docsUrl: "https://on.cypress.io/contains"
+    }
+    regex_conflict: {
+      message: "You passed a regular expression with the case-insensitive (_i_) flag and `{ matchCase: true }` to #{cmd('contains')}. Those options conflict with each other, so please choose one or the other."
+      docsUrl: "https://on.cypress.io/contains"
+    }
 
   cookies:
-    backend_error: """
-    #{cmd('{{command}}')} had an unexpected error {{action}} {{browserDisplayName}}.
-
-    {{errMessage}}
-    {{errStack}}
-    """
-    removed_method: """
-      The Cypress.Cookies.{{method}}() method has been removed.
+    backend_error: (obj) -> {
+      message: """
+      #{cmd('{{cmd}}')} had an unexpected error {{action}} {{browserDisplayName}}.
+      {{errMessage}}
+      {{errStack}}
+      """
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
+
+    invalid_name: (obj) -> {
+      message: "#{cmd('{{cmd}}')} must be passed an RFC-6265-compliant cookie name. You passed:\n\n`{{name}}`"
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
+    timed_out: (obj) -> {
+      message: "#{cmd('{{cmd}}')} timed out waiting `{{timeout}}ms` to complete."
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
+    removed_method: {
+      message: """
+      The `Cypress.Cookies.{{method}}()` method has been removed.
 
       Setting, getting, and clearing cookies is now an asynchronous operation.
 
       Replace this call with the appropriate command such as:
-        - cy.getCookie()
-        - cy.getCookies()
-        - cy.setCookie()
-        - cy.clearCookie()
-        - cy.clearCookies()
-    """
-    timed_out: "#{cmd('{{cmd}}')} timed out waiting '{{timeout}}ms' to complete."
+        - `cy.getCookie()`
+        - `cy.getCookies()`
+        - `cy.setCookie()`
+        - `cy.clearCookie()`
+        - `cy.clearCookies()`
+      """
+    }
 
   dom:
-    animating: """
-      #{cmd('{{cmd}}')} could not be issued because this element is currently animating:
+    animating: {
+      message: """
+        #{cmd('{{cmd}}')} could not be issued because this element is currently animating:
 
-      {{node}}
+        `{{node}}`
 
-      You can fix this problem by:
-        - Passing {force: true} which disables all error checking
-        - Passing {waitForAnimations: false} which disables waiting on animations
-        - Passing {animationDistanceThreshold: 20} which decreases the sensitivity
-
-      https://on.cypress.io/element-is-animating
-    """
+        You can fix this problem by:
+          - Passing `{force: true}` which disables all error checking
+          - Passing `{waitForAnimations: false}` which disables waiting on animations
+          - Passing `{animationDistanceThreshold: 20}` which decreases the sensitivity
+      """
+      docsUrl: "https://on.cypress.io/element-is-animating"
+    }
+    animation_coords_history_invalid: "coordsHistory must be at least 2 sets of coords"
     animation_check_failed: "Not enough coord points provided to calculate distance."
-    center_hidden: """
-      #{cmd('{{cmd}}')} failed because the center of this element is hidden from view:
+    center_hidden: {
+      message: """
+        #{cmd('{{cmd}}')} failed because the center of this element is hidden from view:
 
-      {{node}}
+        `{{node}}`
 
-      Fix this problem, or use {force: true} to disable error checking.
-
-      https://on.cypress.io/element-cannot-be-interacted-with
-    """
-    covered: (obj) ->
+        Fix this problem, or use `{force: true}` to disable error checking.
       """
-      #{cmd(obj.cmd)} failed because this element:
-
-      #{obj.element1}
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
+    covered: {
+      message: """
+        #{cmd('{{cmd}}')} failed because this element:
 
-      is being covered by another element:
+        `{{element1}}`
 
-      #{obj.element2}
+        is being covered by another element:
 
-      Fix this problem, or use {force: true} to disable error checking.
+        `{{element2}}`
 
-      https://on.cypress.io/element-cannot-be-interacted-with
+        Fix this problem, or use {force: true} to disable error checking.
       """
-    pointer_events_none: (obj) ->
-      """
-      #{cmd(obj.cmd)} failed because this element:
-
-      #{obj.element}
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
+    pointer_events_none: (obj) -> {
+      message: """
+        #{cmd(obj.cmd)} failed because this element:
 
-      has CSS 'pointer-events: none'#{if obj.elementInherited then ", inherited from this element:\n\n#{obj.elementInherited}\n" else ""}
+        `#{obj.element}`
 
-      'pointer-events: none' prevents user mouse interaction.
+        has CSS `pointer-events: none`#{if obj.elementInherited then ", inherited from this element:\n\n`#{obj.elementInherited}`\n" else ""}
 
-      Fix this problem, or use {force: true} to disable error checking.
+        `pointer-events: none` prevents user mouse interaction.
 
-      https://on.cypress.io/element-cannot-be-interacted-with
+        Fix this problem, or use {force: true} to disable error checking.
       """
-    disabled: """
-      #{cmd('{{cmd}}')} failed because this element is disabled:
-
-      {{node}}
-
-      Fix this problem, or use {force: true} to disable error checking.
-
-      https://on.cypress.io/element-cannot-be-interacted-with
-    """
-    readonly: """
-      #{cmd('{{cmd}}')} failed because this element is readonly:
-
-      {{node}}
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
+    disabled: {
+      message: """
+        #{cmd('{{cmd}}')} failed because this element is `disabled`:
 
-      Fix this problem, or use {force: true} to disable error checking.
+        `{{node}}`
 
-      https://on.cypress.io/element-cannot-be-interacted-with
-    """
-    invalid_position_argument: "Invalid position argument: '{{position}}'. Position may only be {{validPositions}}."
+        Fix this problem, or use `{force: true}` to disable error checking.
+      """
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
+    invalid_position_argument: {
+      message: "Invalid position argument: `{{position}}`. Position may only be {{validPositions}}."
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
     not_scrollable: """
       #{cmd('{{cmd}}')} failed because this element is not scrollable:\n
-      {{node}}\n
+      `{{node}}`\n
     """
-    not_visible: """
-      #{cmd('{{cmd}}')} failed because this element is not visible:
-
-      {{node}}
-
-      {{reason}}
+    not_visible: {
+      message: """
+        #{cmd('{{cmd}}')} failed because this element is not visible:
 
-      Fix this problem, or use {force: true} to disable error checking.
+        `{{node}}`
 
-      https://on.cypress.io/element-cannot-be-interacted-with
-    """
-    readonly: """
-      #{cmd('{{cmd}}')} failed because this element is readonly:
+        {{reason}}
 
-      {{node}}
+        Fix this problem, or use `{force: true}` to disable error checking.
+      """
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
+    readonly: {
+      message: """
+        #{cmd('{{cmd}}')} failed because this element is readonly:
 
-      Fix this problem, or use {force: true} to disable error checking.
+        `{{node}}`
 
-      https://on.cypress.io/element-cannot-be-interacted-with
-    """
+        Fix this problem, or use `{force: true}` to disable error checking.
+      """
+      docsUrl: "https://on.cypress.io/element-cannot-be-interacted-with"
+    }
 
   each:
-    invalid_argument: "#{cmd('each')} must be passed a callback function."
-    non_array: "#{cmd('each')} can only operate on an array like subject. Your subject was: '{{subject}}'"
+    invalid_argument: {
+      message: "#{cmd('each')} must be passed a callback function."
+      docsUrl: "https://on.cypress.io/each"
+    }
+    non_array: {
+      message: "#{cmd('each')} can only operate on an array like subject. Your subject was: `{{subject}}`"
+      docsUrl: "https://on.cypress.io/each"
+    }
 
   exec:
-    failed: """#{cmd('exec', '\'{{cmd}}\'')} failed with the following error:
+    failed: {
+      message: """#{cmd('exec', '\'{{cmd}}\'')} failed with the following error:
 
-        > "{{error}}"
-    """
-    invalid_argument: "#{cmd('exec')} must be passed a non-empty string as its 1st argument. You passed: '{{cmd}}'."
-    non_zero_exit: """
-      #{cmd('exec', '\'{{cmd}}\'')} failed because the command exited with a non-zero code.
-
-      Pass {failOnNonZeroExit: false} to ignore exit code failures.
-
-      Information about the failure:
-      Code: {{code}}
-      {{output}}
-    """
-    timed_out: "#{cmd('exec', '\'{{cmd}}\'')} timed out after waiting {{timeout}}ms."
+          > "{{error}}"
+      """
+      docsUrl: "https://on.cypress.io/exec"
+    }
+    invalid_argument: {
+      message: "#{cmd('exec')} must be passed a non-empty string as its 1st argument. You passed: '{{cmd}}'."
+      docsUrl: "https://on.cypress.io/exec"
+    }
+    non_zero_exit: {
+      message: """
+        #{cmd('exec', '\'{{cmd}}\'')} failed because the command exited with a non-zero code.
+
+        Pass `{failOnNonZeroExit: false}` to ignore exit code failures.
+
+        Information about the failure:
+        Code: {{code}}
+        {{output}}
+      """
+      docsUrl: "https://on.cypress.io/exec"
+    }
+    timed_out: {
+      message: "#{cmd('exec', '\'{{cmd}}\'')} timed out after waiting `{{timeout}}ms`."
+      docsUrl: "https://on.cypress.io/exec"
+    }
 
   files:
-    unexpected_error:  """#{cmd('{{cmd}}', '"{{file}}"')} failed while trying to {{action}} the file at the following path:
+    unexpected_error: (obj) -> {
+      message: """#{cmd('{{cmd}}', '"{{file}}"')} failed while trying to {{action}} the file at the following path:
 
-      {{filePath}}
+        `{{filePath}}`
 
-    The following error occurred:
+      The following error occurred:
 
-      > "{{error}}"
-    """
-    existent: """#{cmd('readFile', '"{{file}}"')} failed because the file exists when expected not to exist at the following path:
-
-      {{filePath}}
-    """
-    invalid_argument: "#{cmd('{{cmd}}')} must be passed a non-empty string as its 1st argument. You passed: '{{file}}'."
-    invalid_contents: "#{cmd('writeFile')} must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: '{{contents}}'."
-    nonexistent: """#{cmd('readFile', '"{{file}}"')} failed because the file does not exist at the following path:
-
-      {{filePath}}
-    """
-    timed_out: "#{cmd('{{cmd}}', '"{{file}}"')} timed out after waiting {{timeout}}ms."
+        > "{{error}}"
+      """
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
+    existent: {
+      message: """#{cmd('readFile', '"{{file}}"')} failed because the file exists when expected not to exist at the following path:
 
-  fill:
-    invalid_1st_arg: "#{cmd('fill')} must be passed an object literal as its 1st argument"
+        `{{filePath}}`
+      """
+      docsUrl: "https://on.cypress.io/readfile"
+    }
+    invalid_argument: (obj) -> {
+      message: "#{cmd('{{cmd}}')} must be passed a non-empty string as its 1st argument. You passed: `{{file}}`."
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
+    invalid_contents: {
+      message: "#{cmd('writeFile')} must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: `{{contents}}`."
+      docsUrl: "https://on.cypress.io/writefile"
+    }
+    nonexistent: {
+      message: """#{cmd('readFile', '"{{file}}"')} failed because the file does not exist at the following path:
+
+        `{{filePath}}`
+      """
+      docsUrl: "https://on.cypress.io/readfile"
+    }
+    timed_out: (obj) -> {
+      message: "#{cmd('{{cmd}}', '"{{file}}"')} timed out after waiting `{{timeout}}ms`."
+      docsUrl: "https://on.cypress.io/#{_.toLower(obj.cmd)}"
+    }
 
   fixture:
-    set_to_false: "#{cmd('fixture')} is not valid because you have configured 'fixturesFolder' to false."
-    timed_out: "#{cmd('fixture')} timed out waiting '{{timeout}}ms' to receive a fixture. No fixture was ever sent by the server."
+    set_to_false: {
+      message: "#{cmd('fixture')} is not valid because you have configured `fixturesFolder` to `false`."
+      docsUrl: "https://on.cypress.io/fixture"
+    }
+    timed_out: {
+      message: "#{cmd('fixture')} timed out waiting `{{timeout}}ms` to receive a fixture. No fixture was ever sent by the server."
+      docsUrl: "https://on.cypress.io/fixture"
+    }
 
   focus:
-    invalid_element: "#{cmd('focus')} can only be called on a valid focusable element. Your subject is a: {{node}}"
-    multiple_elements: "#{cmd('focus')} can only be called on a single element. Your subject contained {{num}} elements."
-    timed_out: "#{cmd('focus')} timed out because your browser did not receive any focus events. This is a known bug in Chrome when it is not the currently focused window."
+    invalid_element: {
+      message: "#{cmd('focus')} can only be called on a valid focusable element. Your subject is a: `{{node}}`"
+      docsUrl: "https://on.cypress.io/focus"
+    }
+    multiple_elements: {
+      message: "#{cmd('focus')} can only be called on a single element. Your subject contained {{num}} elements."
+      docsUrl: "https://on.cypress.io/focus"
+    }
+    timed_out: {
+      message: "#{cmd('focus')} timed out because your browser did not receive any `focus` events. This is a known bug in Chrome when it is not the currently focused window."
+      docsUrl: "https://on.cypress.io/focus"
+    }
 
   get:
-    alias_invalid: "'{{prop}}' is not a valid alias property. Only 'numbers' or 'all' is permitted."
-    alias_zero: "'0' is not a valid alias property. Are you trying to ask for the first response? If so write @{{alias}}.1"
-    invalid_options: "#{cmd('get')} only accepts an options object for its second argument. You passed {{options}}"
+    alias_invalid: {
+      message: "`{{prop}}` is not a valid alias property. Only `numbers` or `all` is permitted."
+      docsUrl: "https://on.cypress.io/get"
+    }
+    alias_zero: {
+      message: "`0` is not a valid alias property. Are you trying to ask for the first response? If so write `@{{alias}}.1`"
+      docsUrl: "https://on.cypress.io/get"
+    }
+    invalid_options: {
+      message: "#{cmd('get')} only accepts an options object for its second argument. You passed {{options}}"
+      docsUrl: "https://on.cypress.io/get"
+    }
 
   getCookie:
-    invalid_argument: "#{cmd('getCookie')} must be passed a string argument for name."
+    invalid_argument: {
+      message: "#{cmd('getCookie')} must be passed a string argument for name."
+      docsUrl: "https://on.cypress.io/getcookie"
+    }
 
   go:
-    invalid_argument: "#{cmd('go')} accepts only a string or number argument"
-    invalid_direction: "#{cmd('go')} accepts either 'forward' or 'back'. You passed: '{{str}}'"
-    invalid_number: "#{cmd('go')} cannot accept '0'. The number must be greater or less than '0'."
+    invalid_argument: {
+      message: "#{cmd('go')} accepts only a string or number argument"
+      docsUrl: "https://on.cypress.io/go"
+    }
+    invalid_direction: {
+      message: "#{cmd('go')} accepts either `forward` or `back`. You passed: `{{str}}`"
+      docsUrl: "https://on.cypress.io/go"
+    }
+    invalid_number: {
+      message: "#{cmd('go')} cannot accept `0`. The number must be greater or less than `0`."
+      docsUrl: "https://on.cypress.io/go"
+    }
 
   hover:
-    not_implemented: """
-      #{cmd('hover')} is not currently implemented.
-
-      However it is usually easy to workaround.
-
-      Read the following document for a detailed explanation.
-
-      https://on.cypress.io/hover
-    """
-
-  invoke:
-    prop_not_a_function:
+    not_implemented: {
+      message: """
+        #{cmd('hover')} is not currently implemented.\n
+        However it is usually easy to workaround.\n
+        Read the following document for a detailed explanation.\n
       """
-      #{cmd('invoke')} errored because the property: '{{prop}}' returned a '{{type}}' value instead of a function. #{cmd('invoke')} can only be used on properties that return callable functions.
+      docsUrl: "https://on.cypress.io/hover"
+    }
+  invoke:
+    prop_not_a_function: {
+      message: """
+        #{cmd('invoke')} errored because the property: `{{prop}}` returned a `{{type}}` value instead of a function. #{cmd('invoke')} can only be used on properties that return callable functions.
 
-      #{cmd('invoke')} waited for the specified property '{{prop}}' to return a function, but it never did.
+        #{cmd('invoke')} waited for the specified property `{{prop}}` to return a function, but it never did.
 
-      If you want to assert on the property's value, then switch to use #{cmd('its')} and add an assertion such as:
+        If you want to assert on the property's value, then switch to use #{cmd('its')} and add an assertion such as:
 
-      cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')
-      """
-    subject_null_or_undefined:
-      """
-      #{cmd('invoke')} errored because your subject is: '{{value}}'. You cannot invoke any functions such as '{{prop}}' on a '{{value}}' value.
+        `cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')`
+        """
+      docsUrl: "https://on.cypress.io/invoke"
+    }
+    subject_null_or_undefined: {
+      message: """
+        #{cmd('invoke')} errored because your subject is: `{{value}}`. You cannot invoke any functions such as `{{prop}}` on a `{{value}}` value.
 
-      If you expect your subject to be '{{value}}', then add an assertion such as:
+        If you expect your subject to be `{{value}}`, then add an assertion such as:
 
-      cy.wrap({{value}}).should('be.{{value}}')
-      """
-    null_or_undefined_prop_value:
-      """
-      #{cmd('invoke')} errored because the property: '{{prop}}' is not a function, and instead returned a '{{value}}' value.
+        `cy.wrap({{value}}).should('be.{{value}}')`
+        """
+      docsUrl: "https://on.cypress.io/invoke"
+    }
+    null_or_undefined_prop_value: {
+      message: """
+        #{cmd('invoke')} errored because the property: `{{prop}}` is not a function, and instead returned a `{{value}}` value.
 
-      #{cmd('invoke')} waited for the specified property '{{prop}}' to become a callable function, but it never did.
+        #{cmd('invoke')} waited for the specified property `{{prop}}` to become a callable function, but it never did.
 
-      If you expect the property '{{prop}}' to be '{{value}}', then switch to use #{cmd('its')} and add an assertion such as:
+        If you expect the property `{{prop}}` to be `{{value}}`, then switch to use #{cmd('its')} and add an assertion such as:
 
-      cy.wrap({ foo: {{value}} }).its('foo').should('be.{{value}}')
-      """
+        `cy.wrap({ foo: {{value}} }).its('foo').should('be.{{value}}')`
+        """
+      docsUrl: "https://on.cypress.io/invoke"
+    }
 
   its:
-    subject_null_or_undefined:
-      """
-      #{cmd('its')} errored because your subject is: '{{value}}'. You cannot access any properties such as '{{prop}}' on a '{{value}}' value.
+    subject_null_or_undefined: {
+      message: """
+        #{cmd('its')} errored because your subject is: `{{value}}`. You cannot access any properties such as `{{prop}}` on a `{{value}}` value.
 
-      If you expect your subject to be '{{value}}', then add an assertion such as:
+        If you expect your subject to be `{{value}}`, then add an assertion such as:
 
-      cy.wrap({{value}}).should('be.{{value}}')
-      """
-    null_or_undefined_prop_value:
-      """
-      #{cmd('its')} errored because the property: '{{prop}}' returned a '{{value}}' value.
+        `cy.wrap({{value}}).should('be.{{value}}')`
+        """
+      docsUrl: "https://on.cypress.io/its"
+    }
+    null_or_undefined_prop_value: {
+      message: """
+        #{cmd('its')} errored because the property: `{{prop}}` returned a `{{value}}` value.
 
-      #{cmd('its')} waited for the specified property '{{prop}}' to become accessible, but it never did.
+        #{cmd('its')} waited for the specified property `{{prop}}` to become accessible, but it never did.
 
-      If you expect the property '{{prop}}' to be '{{value}}', then add an assertion such as:
+        If you expect the property `{{prop}}` to be `{{value}}`, then add an assertion such as:
 
-      cy.wrap({ foo: {{value}} }).its('foo').should('be.{{value}}')
-      """
+        `cy.wrap({ foo: {{value}} }).its('foo').should('be.{{value}}')`
+        """
+      docsUrl: "https://on.cypress.io/its"
+    }
 
   invoke_its:
-    nonexistent_prop:
-      """
-      #{cmd('{{cmd}}')} errored because the property: '{{prop}}' does not exist on your subject.
-
-      #{cmd('{{cmd}}')} waited for the specified property '{{prop}}' to exist, but it never did.
-
-      If you do not expect the property '{{prop}}' to exist, then add an assertion such as:
-
-      cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')
-      """
-    previous_prop_null_or_undefined:
-      """
-      #{cmd('{{cmd}}')} errored because the property: '{{previousProp}}' returned a '{{value}}' value. The property: '{{prop}}' does not exist on a '{{value}}' value.
-
-      #{cmd('{{cmd}}')} waited for the specified property '{{prop}}' to become accessible, but it never did.
-
-      If you do not expect the property '{{prop}}' to exist, then add an assertion such as:
-
-      cy.wrap({ foo: {{value}} }).its('foo.baz').should('not.exist')
-      """
-    invalid_prop_name_arg: "#{cmd('{{cmd}}')} only accepts a string or a number as the {{identifier}}Name argument."
-    null_or_undefined_property_name: "#{cmd('{{cmd}}')} expects the {{identifier}}Name argument to have a value."
-    invalid_options_arg: "#{cmd('{{cmd}}')} only accepts an object as the options argument."
-    invalid_num_of_args:
-      """
+    nonexistent_prop: {
+      message: """
+        #{cmd('{{cmd}}')} errored because the property: `{{prop}}` does not exist on your subject.
+
+        #{cmd('{{cmd}}')} waited for the specified property `{{prop}}` to exist, but it never did.
+
+        If you do not expect the property `{{prop}}` to exist, then add an assertion such as:
+
+        `cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')`
+        """
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    previous_prop_null_or_undefined: {
+      message: """
+        #{cmd('{{cmd}}')} errored because the property: `{{previousProp}}` returned a `{{value}}` value. The property: `{{prop}}` does not exist on a `{{value}}` value.
+
+        #{cmd('{{cmd}}')} waited for the specified property `{{prop}}` to become accessible, but it never did.
+
+        If you do not expect the property `{{prop}}` to exist, then add an assertion such as:
+
+        `cy.wrap({ foo: {{value}} }).its('foo.baz').should('not.exist')`
+        """
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    invalid_1st_arg: {
+      message: "#{cmd('{{cmd}}')} only accepts a string as the first argument."
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    invalid_num_of_args: {
+      message: """
       #{cmd('{{cmd}}')} does not accept additional arguments.
-      If you want to invoke a function with arguments, use cy.invoke().
+
+      If you want to invoke a function with arguments, use `.invoke()`.
       """
-    timed_out:
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    invalid_options_arg: {
+      message: "#{cmd('{{cmd}}')} only accepts an object as the options argument."
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    invalid_prop_name_arg: {
+      message: "#{cmd('{{cmd}}')} only accepts a string or a number as the {{identifier}}Name argument."
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    null_or_undefined_property_name: {
+      message: "#{cmd('{{cmd}}')} expects the {{identifier}}Name argument to have a value."
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
+    timed_out: {
+      message: """
+        #{cmd('{{cmd}}')} timed out after waiting `{{timeout}}ms`.
+
+        Your callback function returned a promise which never resolved.
+
+        The callback function was:
+
+        {{func}}
       """
-      #{cmd('{{cmd}}')} timed out after waiting '{{timeout}}ms'.
-
-      Your callback function returned a promise which never resolved.
-
-      The callback function was:
-
-      {{func}}
-    """
-
+      docsUrl: "https://on.cypress.io/{{cmd}}"
+    }
   location:
-    invalid_key: "Location object does not have key: {{key}}"
+    invalid_key: {
+      message: "Location object does not have key: `{{key}}`"
+      docsUrl: "https://on.cypress.io/location"
+    }
 
   log:
-    invalid_argument: "Cypress.log() can only be called with an options object. Your argument was: '{{arg}}'"
+    invalid_argument: {
+      message: "`Cypress.log()` can only be called with an options object. Your argument was: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/cypress-log"
+    }
 
   miscellaneous:
-    custom_command_interface_changed: (obj) ->
-      """
-      Cypress.#{obj.method}(...) has been removed and replaced by:
-
-      Cypress.Commands.add(...)
+    custom_command_interface_changed: (obj) -> {
+      message: """
+        Cypress.#{obj.method}(...) has been removed and replaced by:
 
-      Instead of indicating 'parent', 'child', or 'dual' commands, you pass an options object
-      to describe the requirements around the previous subject. You can also enforce specific
-      subject types such as requiring the subject to be a DOM element.
+        `Cypress.Commands.add(...)`
 
-      To rewrite this custom command you'd likely write:
+        Instead of indicating `parent`, `child`, or `dual` commands, you pass an `options` object
+        to describe the requirements around the previous subject. You can also enforce specific
+        subject types such as requiring the subject to be a DOM element.
 
-      Cypress.Commands.add(#{obj.signature})
+        To rewrite this custom command you'd likely write:
 
-      https://on.cypress.io/custom-command-interface-changed
-      """
-    returned_value_and_commands_from_custom_command: (obj) ->
-      """
+        `Cypress.Commands.add(#{obj.signature})`
+        """
+      docsUrl: "https://on.cypress.io/custom-command-interface-changed"
+    }
+    returned_value_and_commands_from_custom_command: (obj) -> {
+      message: """
         Cypress detected that you invoked one or more cy commands in a custom command but returned a different value.
 
         The custom command was:
@@ -474,30 +647,30 @@ module.exports = {
 
         Because cy commands are asynchronous and are queued to be run later, it doesn't make sense to return anything else.
 
-        For convenience, you can also simply omit any return value or return 'undefined' and Cypress will not error.
+        For convenience, you can also simply omit any return value or return `undefined` and Cypress will not error.
 
         In previous versions of Cypress we automatically detected this and forced the cy commands to be returned. To make things less magical and clearer, we are now throwing an error.
-
-        https://on.cypress.io/returning-value-and-commands-in-custom-command
-      """
-    returned_value_and_commands: (ret) ->
       """
+      docsUrl: "https://on.cypress.io/returning-value-and-commands-in-custom-command"
+    }
+    returned_value_and_commands: (obj) -> {
+      message: """
         Cypress detected that you invoked one or more cy commands but returned a different value.
 
         The return value was:
 
-          > #{ret}
+          > #{obj.returned}
 
         Because cy commands are asynchronous and are queued to be run later, it doesn't make sense to return anything else.
 
-        For convenience, you can also simply omit any return value or return 'undefined' and Cypress will not error.
+        For convenience, you can also simply omit any return value or return `undefined` and Cypress will not error.
 
         In previous versions of Cypress we automatically detected this and forced the cy commands to be returned. To make things less magical and clearer, we are now throwing an error.
-
-        https://on.cypress.io/returning-value-and-commands-in-test
-      """
-    command_returned_promise_and_commands: (obj) ->
       """
+      docsUrl: "https://on.cypress.io/returning-value-and-commands-in-test"
+    }
+    command_returned_promise_and_commands: (obj) -> {
+      message: """
         Cypress detected that you returned a promise from a command while also invoking one or more cy commands in that promise.
 
         The command that returned the promise was:
@@ -513,337 +686,516 @@ module.exports = {
         Cypress will resolve your command with whatever the final Cypress command yields.
 
         The reason this is an error instead of a warning is because Cypress internally queues commands serially whereas Promises execute as soon as they are invoked. Attempting to reconcile this would prevent Cypress from ever resolving.
-
-        https://on.cypress.io/returning-promise-and-commands-in-another-command
-      """
-    mixing_promises_and_commands: (title) ->
       """
+      docsUrl: "https://on.cypress.io/returning-promise-and-commands-in-another-command"
+    }
+    mixing_promises_and_commands: (obj) -> {
+      message: """
         Cypress detected that you returned a promise in a test, but also invoked one or more cy commands inside of that promise.
 
         The test title was:
 
-          > #{title}
+          > #{obj.title}
 
         While this works in practice, it's often indicative of an anti-pattern. You almost never need to return both a promise and also invoke cy commands.
 
         Cy commands themselves are already promise like, and you can likely avoid the use of the separate Promise.
-
-        https://on.cypress.io/returning-promise-and-commands-in-test
       """
+      docsUrl: "https://on.cypress.io/returning-promise-and-commands-in-test"
+    }
     command_log_renamed: """
-      Cypress.Log.command() has been renamed to Cypress.log()
+      `Cypress.Log.command()` has been renamed to `Cypress.log()`
 
       Please update your code. You should be able to safely do a find/replace.
     """
+    dangling_commands: {
+      message: """
+        Oops, Cypress detected something wrong with your test code.
 
-    dangling_commands: """
-      Oops, Cypress detected something wrong with your test code.
-
-      The test has finished but Cypress still has commands in its queue.
-      The {{numCommands}} queued commands that have not yet run are:
+        The test has finished but Cypress still has commands in its queue.
+        The {{numCommands}} queued commands that have not yet run are:
 
-      {{commands}}
+        {{commands}}
 
-      In every situation we've seen, this has been caused by programmer error.
-      Most often this indicates a race condition due to a forgotten 'return' or from commands in a previously run test bleeding into the current test.
+        In every situation we've seen, this has been caused by programmer error.
 
-      For a much more thorough explanation including examples please review this error here:
+        Most often this indicates a race condition due to a forgotten 'return' or from commands in a previously run test bleeding into the current test.
 
-      https://on.cypress.io/command-queue-ended-early
-    """
-    invalid_command: "Could not find a command for: '{{name}}'.\n\nAvailable commands are: {{cmds}}.\n"
-    invalid_overwrite: "Cannot overwite command for: '{{name}}'. An existing command does not exist by that name."
+        For a much more thorough explanation including examples please review this error here:
+      """
+      docsUrl: "https://on.cypress.io/command-queue-ended-early"
+    }
+    invalid_command: {
+      message: "Could not find a command for: `{{name}}`.\n\nAvailable commands are: {{cmds}}.\n"
+      docsUrl: "https://on.cypress.io/api"
+    }
+    invalid_overwrite: {
+      message: "Cannot overwite command for: `{{name}}`. An existing command does not exist by that name."
+      docsUrl: "https://on.cypress.io/api"
+    }
     invoking_child_without_parent: (obj) ->
       """
       Oops, it looks like you are trying to call a child command before running a parent command.
 
       You wrote code that looks like this:
 
-      #{cmd(obj.cmd, obj.args)}
+      `#{cmd(obj.cmd, obj.args)}`
 
       A child command must be chained after a parent because it operates on a previous subject.
 
-      For example - if we were issuing the child command 'click'...
+      For example - if we were issuing the child command `click`...
 
       cy
         .get('button') // parent command must come first
         .click()       // then child command comes second
-
       """
-    no_cy: "Cypress.cy is undefined. You may be trying to query outside of a running test. Cannot call Cypress.$()"
-    no_runner: "Cannot call Cypress#run without a runner instance."
-    outside_test: """
-      Cypress cannot execute commands outside a running test.
+    no_cy: "`Cypress.cy` is `undefined`. You may be trying to query outside of a running test. Cannot call `Cypress.$()`"
+    no_runner: "Cannot call `Cypress#run` without a runner instance."
+    outside_test: {
+      message: """
+        Cypress cannot execute commands outside a running test.
 
-      This usually happens when you accidentally write commands outside an 'it(...)' test.
+        This usually happens when you accidentally write commands outside an `it(...)` test.
 
-      If that is the case, just move these commands inside an it(...) test.
+        If that is the case, just move these commands inside an `it(...)` test.
 
-      Check your test file for errors.
-
-      https://on.cypress.io/cannot-execute-commands-outside-test
-    """
-    outside_test_with_cmd: """
-      Cannot call "#{cmd('{{cmd}}')}" outside a running test.
-
-      This usually happens when you accidentally write commands outside an it(...) test.
+        Check your test file for errors.
+      """
+      docsUrl: "https://on.cypress.io/cannot-execute-commands-outside-test"
+    }
+    outside_test_with_cmd: {
+      message: """
+        Cannot call #{cmd('{{cmd}}')} outside a running test.
 
-      If that is the case, just move these commands inside an it(...) test.
+        This usually happens when you accidentally write commands outside an `it(...)` test.
 
-      Check your test file for errors.
+        If that is the case, just move these commands inside an `it(...)` test.
 
-      https://on.cypress.io/cannot-execute-commands-outside-test
-    """
-    private_custom_command_interface: "You cannot use the undocumented private command interface: {{method}}"
+        Check your test file for errors.
+      """
+      docsUrl: "https://on.cypress.io/cannot-execute-commands-outside-test"
+    }
+    private_custom_command_interface: "You cannot use the undocumented private command interface: `{{method}}`"
     private_property:
       """
-      You are accessing a private property directly on 'cy' which has been renamed.
+      You are accessing a private property directly on `cy` which has been renamed.
 
       This was never documented nor supported.
 
       Please go through the public function: #{cmd('state', "...")}
       """
-    retry_timed_out: "Timed out retrying: {{error}}"
+    retry_timed_out: "Timed out retrying: "
 
   mocha:
-    async_timed_out: "Timed out after '{{ms}}ms'. The done() callback was never invoked!"
-    invalid_interface: "Invalid mocha interface '{{name}}'"
-    timed_out: "Cypress command timeout of '{{ms}}ms' exceeded."
-    overspecified: """
-    Cypress detected that you returned a promise in a test, but also invoked a done callback. Return a promise -or- invoke a done callback, not both.
+    async_timed_out: "Timed out after `{{ms}}ms`. The `done()` callback was never invoked!"
+    invalid_interface: "Invalid mocha interface `{{name}}`"
+    timed_out: "Cypress command timeout of `{{ms}}ms` exceeded."
+    overspecified: {
+      message: """
+      Cypress detected that you returned a promise in a test, but also invoked a done callback. Return a promise -or- invoke a done callback, not both.
 
-    Read  more here: https://on.cypress.io/returning-promise-and-invoking-done-callback
+      Original mocha error:
 
-    #{divider(60, '-')}
-
-    Original mocha error:
-
-    {{error}}
-    """
+      {{error}}
+      """
+      docsUrl: "https://on.cypress.io/returning-promise-and-invoking-done-callback"
+    }
 
   navigation:
-    cross_origin: ({ message, originPolicy, configFile }) -> """
-      Cypress detected a cross origin error happened on page load:
-
-        > #{message}
-
-      Before the page load, you were bound to the origin policy:
+    cross_origin: ({ message, originPolicy, configFile }) -> {
+      message: """
+        Cypress detected a cross origin error happened on page load:
 
-        > #{originPolicy}
+          > #{message}
 
-      A cross origin error happens when your application navigates to a new URL which does not match the origin policy above.
+        Before the page load, you were bound to the origin policy:
 
-      A new URL does not match the origin policy if the 'protocol', 'port' (if specified), and/or 'host' (unless of the same superdomain) are different.
+          > #{originPolicy}
 
-      Cypress does not allow you to navigate to a different origin URL within a single test.
+        A cross origin error happens when your application navigates to a new URL which does not match the origin policy above.
 
-      You may need to restructure some of your test code to avoid this problem.
+        A new URL does not match the origin policy if the 'protocol', 'port' (if specified), and/or 'host' (unless of the same superdomain) are different.
 
-      Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in #{formatConfigFile(configFile)}.
+        Cypress does not allow you to navigate to a different origin URL within a single test.
 
-      https://on.cypress.io/cross-origin-violation
+        You may need to restructure some of your test code to avoid this problem.
 
-    """
+        Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in #{formatConfigFile(configFile)}.
+      """
+      docsUrl: "https://on.cypress.io/cross-origin-violation"
+    }
     timed_out: ({ ms, configFile }) -> """
-      Timed out after waiting '#{ms}ms' for your remote page to load.
+      Timed out after waiting `#{ms}ms` for your remote page to load.
 
-      Your page did not fire its 'load' event within '#{ms}ms'.
+      Your page did not fire its `load` event within `#{ms}ms`.
 
-      You can try increasing the 'pageLoadTimeout' value in #{formatConfigFile(configFile)} to wait longer.
+      You can try increasing the `pageLoadTimeout` value in #{formatConfigFile(configFile)} to wait longer.
 
-      Browsers will not fire the 'load' event until all stylesheets and scripts are done downloading.
+      Browsers will not fire the `load` event until all stylesheets and scripts are done downloading.
 
-      When this 'load' event occurs, Cypress will continue running commands.
+      When this `load` event occurs, Cypress will continue running commands.
     """
 
   ng:
-    no_global: "Angular global (window.angular) was not found in your window. You cannot use #{cmd('ng')} methods without angular."
+    no_global: "Angular global (`window.angular`) was not found in your window. You cannot use #{cmd('ng')} methods without angular."
 
   reload:
-    invalid_arguments: "#{cmd('reload')} can only accept a boolean or options as its arguments."
+    invalid_arguments: {
+      message: "#{cmd('reload')} can only accept a boolean or `options` as its arguments."
+      docsUrl: "https://on.cypress.io/reload"
+    }
 
   request:
-    body_circular: ({ path }) -> """
-      The `body` parameter supplied to #{cmd('request')} contained a circular reference at the path "#{path.join(".")}".
-
-      `body` can only be a string or an object with no circular references.
-    """
-    status_code_flags_invalid: """
-    #{cmd('request')} was invoked with { failOnStatusCode: false, retryOnStatusCodeFailure: true }.
+    body_circular: ({ path }) -> {
+      message: """
+        The `body` parameter supplied to #{cmd('request')} contained a circular reference at the path "#{path.join(".")}".
 
-    These options are incompatible with each other.
-
-     - To retry on non-2xx status codes, pass { failOnStatusCode: true, retryOnStatusCodeFailure: true }.
-     - To not retry on non-2xx status codes, pass { failOnStatusCode: true, retryOnStatusCodeFailure: true }.
-     - To fail on non-2xx status codes without retrying (the default behavior), pass { failOnStatusCode: true, retryOnStatusCodeFailure: false }
-    """
-    auth_invalid: "#{cmd('request')} must be passed an object literal for the 'auth' option."
-    gzip_invalid: "#{cmd('request')} requires the 'gzip' option to be a boolean."
-    headers_invalid: "#{cmd('request')} requires the 'headers' option to be an object literal."
-    invalid_method: "#{cmd('request')} was called with an invalid method: '{{method}}'. Method can be: GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, or any other method supported by Node's HTTP parser."
-    failonstatus_deprecated_warning: "The cy.request() 'failOnStatus' option has been renamed to 'failOnStatusCode'. Please update your code. This option will be removed at a later time."
-    form_invalid: """
-    #{cmd('request')} requires the 'form' option to be a boolean.
-
-    If you're trying to send a x-www-form-urlencoded request then pass either a string or object literal to the 'body' property.
-    """
-    loading_failed: (obj) ->
+        `body` can only be a string or an object with no circular references.
       """
-      #{cmd('request')} failed trying to load:
-
-      #{obj.url}
-
-      We attempted to make an http request to this URL but the request failed without a response.
-
-      We received this error at the network level:
-
-        > #{obj.error}
-
-      #{divider(60, '-')}
-
-      The request we sent was:
-
-      #{getHttpProps([
-        {key: 'method',    value: obj.method},
-        {key: 'URL',       value: obj.url},
-      ])}
-
-      #{divider(60, '-')}
-
-      Common situations why this would fail:
-        - you don't have internet access
-        - you forgot to run / boot your web server
-        - your web server isn't accessible
-        - you have weird network configuration settings on your computer
+      docsUrl: "https://on.cypress.io/request"
+    }
+    status_code_flags_invalid: {
+      message: """
+        #{cmd('request')} was invoked with `{ failOnStatusCode: false, retryOnStatusCodeFailure: true }`.
 
-      The stack trace for this error is:
-
-      #{obj.stack}
-      """
+        These options are incompatible with each other.
 
-    status_invalid: (obj) ->
+        - To retry on non-2xx status codes, pass `{ failOnStatusCode: true, retryOnStatusCodeFailure: true }`.
+        - To not retry on non-2xx status codes, pass `{ failOnStatusCode: true, retryOnStatusCodeFailure: true }`.
+        - To fail on non-2xx status codes without retrying (the default behavior), pass `{ failOnStatusCode: true, retryOnStatusCodeFailure: false }`
       """
-      #{cmd('request')} failed on:
+      docsUrl: "https://on.cypress.io/request"
+    }
+    auth_invalid: {
+      message: "#{cmd('request')} must be passed an object literal for the `auth` option."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    gzip_invalid: {
+      message: "#{cmd('request')} requires the `gzip` option to be a boolean."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    headers_invalid: {
+      message: "#{cmd('request')} requires the `headers` option to be an object literal."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    invalid_method: {
+      message: "#{cmd('request')} was called with an invalid method: `{{method}}`. Method can be: `GET`, `POST`, `PUT`, `DELETE`, `PATCH`, `HEAD`, `OPTIONS`, or any other method supported by Node's HTTP parser."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    failonstatus_deprecated_warning: {
+      message: "The #{cmd('request')} `failOnStatus` option has been renamed to `failOnStatusCode`. Please update your code. This option will be removed at a later time."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    form_invalid: {
+      message: """
+        #{cmd('request')} requires the `form` option to be a boolean.
+
+        If you're trying to send a `x-www-form-urlencoded` request then pass either a string or object literal to the `body` property.
+        """
+      docsUrl: "https://on.cypress.io/request"
+    }
+    loading_failed: (obj) -> {
+      message: """
+        #{cmd('request')} failed trying to load:
 
-      #{obj.url}
+        #{obj.url}
 
-      The response we received from your web server was:
+        We attempted to make an http request to this URL but the request failed without a response.
 
-        > #{obj.status}: #{obj.statusText}
+        We received this error at the network level:
 
-      This was considered a failure because the status code was not '2xx' or '3xx'.
+          > #{obj.error}
 
-      If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+        #{divider(60, '-')}
 
-      #{divider(60, '-')}
+        The request we sent was:
 
-      The request we sent was:
+        #{getHttpProps([
+          {key: 'method',    value: obj.method},
+          {key: 'URL',       value: obj.url},
+        ])}
 
-      #{getHttpProps([
-        {key: 'method',    value: obj.method},
-        {key: 'URL',       value: obj.url},
-        {key: 'headers',   value: obj.requestHeaders},
-        {key: 'body',      value: obj.requestBody}
-        {key: 'redirects', value: obj.redirects}
-      ])}
+        #{divider(60, '-')}
 
-      #{divider(60, '-')}
+        Common situations why this would fail:
+          - you don't have internet access
+          - you forgot to run / boot your web server
+          - your web server isn't accessible
+          - you have weird network configuration settings on your computer
 
-      The response we got was:
+        The stack trace for this error is:
 
-      #{getHttpProps([
-        {key: 'status',  value: obj.status + ' - ' + obj.statusText},
-        {key: 'headers', value: obj.responseHeaders},
-        {key: 'body',    value: obj.responseBody}
-      ])}
+        #{obj.stack}
+        """
+      docsUrl: "https://on.cypress.io/request"
+    }
+    status_invalid: (obj) -> {
+      message: """
+        #{cmd('request')} failed on:
 
-      """
-    timed_out: (obj) ->
-      """
-      #{cmd('request')} timed out waiting #{obj.timeout}ms for a response from your server.
+        #{obj.url}
 
-      The request we sent was:
+        The response we received from your web server was:
 
-      #{getHttpProps([
-        {key: 'method',    value: obj.method},
-        {key: 'URL',       value: obj.url},
-      ])}
+          > #{obj.status}: #{obj.statusText}
 
-      No response was received within the timeout.
-      """
-    url_missing: "#{cmd('request')} requires a url. You did not provide a url."
-    url_invalid: ({configFile}) ->
-      "#{cmd('request')} must be provided a fully qualified url - one that begins with 'http'. By default #{cmd('request')} will use either the current window's origin or the 'baseUrl' in #{formatConfigFile(configFile)}. Neither of those values were present."
-    url_wrong_type: "#{cmd('request')} requires the url to be a string."
+        This was considered a failure because the status code was not `2xx` or `3xx`.
+
+        If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
+
+        #{divider(60, '-')}
+
+        The request we sent was:
+
+        #{getHttpProps([
+          {key: 'method',    value: obj.method},
+          {key: 'URL',       value: obj.url},
+          {key: 'headers',   value: obj.requestHeaders},
+          {key: 'body',      value: obj.requestBody}
+          {key: 'redirects', value: obj.redirects}
+        ])}
+
+        #{divider(60, '-')}
+
+        The response we got was:
+
+        #{getHttpProps([
+          {key: 'status',  value: obj.status + ' - ' + obj.statusText},
+          {key: 'headers', value: obj.responseHeaders},
+          {key: 'body',    value: obj.responseBody}
+        ])}
+
+        """
+      docsUrl: "https://on.cypress.io/request"
+    }
+    timed_out: (obj) -> {
+      message: """
+        #{cmd('request')} timed out waiting `#{obj.timeout}ms` for a response from your server.
+
+        The request we sent was:
+
+        #{getHttpProps([
+          {key: 'method',    value: obj.method},
+          {key: 'URL',       value: obj.url},
+        ])}
+
+        No response was received within the timeout.
+        """
+      docsUrl: "https://on.cypress.io/request"
+    }
+    url_missing: {
+      message: "#{cmd('request')} requires a `url`. You did not provide a `url`."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    url_invalid: ({ configFile }) -> {
+      message: "#{cmd('request')} must be provided a fully qualified `url` - one that begins with `http`. By default #{cmd('request')} will use either the current window's origin or the `baseUrl` in #{formatConfigFile(configFile)}. Neither of those values were present."
+      docsUrl: "https://on.cypress.io/request"
+    }
+    url_wrong_type: {
+      message: "#{cmd('request')} requires the `url` to be a string."
+      docsUrl: "https://on.cypress.io/request"
+    }
 
   route:
-    failed_prerequisites: "#{cmd('route')} cannot be invoked before starting the #{cmd('server')}"
-    invalid_arguments: "#{cmd('route')} was not provided any arguments. You must provide valid arguments."
-    method_invalid: "#{cmd('route')} was called with an invalid method: '{{method}}'. Method can be: GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, or any other method supported by Node's HTTP parser."
-    response_invalid: "#{cmd('route')} cannot accept an undefined or null response. It must be set to something, even an empty string will work."
-    url_invalid: "#{cmd('route')} was called with an invalid url. Url must be either a string or regular expression."
-    url_missing: "#{cmd('route')} must be called with a url. It can be a string or regular expression."
-    url_percentencoding_warning: ({ decodedUrl }) -> """
-    A URL with percent-encoded characters was passed to cy.route(), but cy.route() expects a decoded URL.
-
-    Did you mean to pass "#{decodedUrl}"?
-    """
+    failed_prerequisites: {
+      message: "#{cmd('route')} cannot be invoked before starting the #{cmd('server')}"
+      docsUrl: "https://on.cypress.io/server"
+    }
+    invalid_arguments: {
+      message: "#{cmd('route')} was not provided any arguments. You must provide valid arguments."
+      docsUrl: "https://on.cypress.io/route"
+    }
+    method_invalid: {
+      message: "#{cmd('route')} was called with an invalid method: `{{method}}`. Method can be: `GET`, `POST`, `PUT`, `DELETE`, `PATCH`, `HEAD`, `OPTIONS`, or any other method supported by Node's HTTP parser."
+      docsUrl: "https://on.cypress.io/route"
+    }
+    response_invalid: {
+      message: "#{cmd('route')} cannot accept an `undefined` or `null` response. It must be set to something, even an empty string will work."
+      docsUrl: "https://on.cypress.io/route"
+    }
+    url_invalid: {
+      message: "#{cmd('route')} was called with an invalid `url`. `url` must be either a string or regular expression."
+      docsUrl: "https://on.cypress.io/route"
+    }
+    url_missing: {
+      message: "#{cmd('route')} must be called with a `url`. It can be a string or regular expression."
+      docsUrl: "https://on.cypress.io/route"
+    }
+    url_percentencoding_warning: ({ decodedUrl }) -> {
+      message: """
+        A `url` with percent-encoded characters was passed to #{cmd('route')}, but #{cmd('route')} expects a decoded `url`.
+
+        Did you mean to pass "#{decodedUrl}"?
+        """
+      docsUrl: "https://on.cypress.io/route"
+    }
 
   scrollIntoView:
-    invalid_argument: "#{cmd('scrollIntoView')} can only be called with an options object. Your argument was: {{arg}}"
-    subject_is_window: "Cannot call #{cmd('scrollIntoView')} on Window subject."
-    multiple_elements: "#{cmd('scrollIntoView')} can only be used to scroll to 1 element, you tried to scroll to {{num}} elements.\n\n"
-    invalid_easing: "#{cmd('scrollIntoView')} must be called with a valid easing. Your easing was: {{easing}}"
-    invalid_duration: "#{cmd('scrollIntoView')} must be called with a valid duration. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: {{duration}}"
+    invalid_argument: {
+      message: "#{cmd('scrollIntoView')} can only be called with an `options` object. Your argument was: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/scrollintoview"
+    }
+    multiple_elements: {
+      message: "#{cmd('scrollIntoView')} can only be used to scroll to 1 element, you tried to scroll to {{num}} elements.\n\n"
+      docsUrl: "https://on.cypress.io/scrollintoview"
+    }
+    invalid_easing: {
+      message: "#{cmd('scrollIntoView')} must be called with a valid `easing`. Your easing was: `{{easing}}`"
+      docsUrl: "https://on.cypress.io/scrollintoview"
+    }
+    invalid_duration: {
+      message: "#{cmd('scrollIntoView')} must be called with a valid `duration`. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: `{{duration}}`"
+      docsUrl: "https://on.cypress.io/scrollintoview"
+    }
 
   scrollTo:
-    invalid_target: "#{cmd('scrollTo')} must be called with a valid position. It can be a string, number or object. Your position was: {{x}}, {{y}}"
-    multiple_containers: "#{cmd('scrollTo')} can only be used to scroll one element, you tried to scroll {{num}} elements.\n\n"
-    invalid_easing: "#{cmd('scrollTo')} must be called with a valid easing. Your easing was: {{easing}}"
-    invalid_duration: "#{cmd('scrollTo')} must be called with a valid duration. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: {{duration}}"
-    animation_failed: "#{cmd('scrollTo')} failed."
+    animation_failed: {
+      message: "#{cmd('scrollTo')} failed to scroll."
+      docsUrl: "https://on.cypress.io/scrollto"
+    }
+    invalid_easing: {
+      message: "#{cmd('scrollTo')} must be called with a valid `easing`. Your easing was: `{{easing}}`"
+      docsUrl: "https://on.cypress.io/scrollto"
+    }
+    invalid_duration: {
+      message: "#{cmd('scrollTo')} must be called with a valid `duration`. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: `{{duration}}`"
+      docsUrl: "https://on.cypress.io/scrollto"
+    }
+    invalid_target: {
+      message: "#{cmd('scrollTo')} must be called with a valid `position`. It can be a string, number or object. Your position was: `{{x}}, {{y}}`"
+      docsUrl: "https://on.cypress.io/scrollto"
+    }
+    multiple_containers: {
+      message: "#{cmd('scrollTo')} can only be used to scroll 1 element, you tried to scroll {{num}} elements.\n\n"
+      docsUrl: "https://on.cypress.io/scrollto"
+    }
 
   screenshot:
-    invalid_arg: "{{cmd}}() must be called with an object. You passed: {{arg}}"
-    invalid_capture: "{{cmd}}() 'capture' option must be one of the following: 'fullPage', 'viewport', or 'runner'. You passed: {{arg}}"
-    invalid_boolean: "{{cmd}}() '{{option}}' option must be a boolean. You passed: {{arg}}"
-    invalid_blackout: "{{cmd}}() 'blackout' option must be an array of strings. You passed: {{arg}}"
-    invalid_clip: "{{cmd}}() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: {{arg}}"
-    invalid_height: "#{cmd('screenshot')} only works with a screenshot area with a height greater than zero."
-    invalid_padding: "{{cmd}}() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: {{arg}}"
-    invalid_callback: "{{cmd}}() '{{callback}}' option must be a function. You passed: {{arg}}"
-    multiple_elements: "#{cmd('screenshot')} only works for a single element. You attempted to screenshot {{numElements}} elements."
-    timed_out: "#{cmd('screenshot')} timed out waiting '{{timeout}}ms' to complete."
+    invalid_arg: (obj) -> {
+      message: "#{cmd(obj.cmd)} must be called with an object. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_capture: (obj) -> {
+      message: "#{cmd(obj.cmd)} `capture` option must be one of the following: `fullPage`, `viewport`, or `runner`. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_boolean: (obj) -> {
+      message: "#{cmd(obj.cmd)} `{{option}}` option must be a boolean. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_blackout: (obj) -> {
+      message: "#{cmd(obj.cmd)} `blackout` option must be an array of strings. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_callback: (obj) -> {
+      message: "#{cmd(obj.cmd)} `{{callback}}` option must be a function. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_clip: (obj) -> {
+      message: "#{cmd(obj.cmd)} `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    invalid_height: (obj) -> {
+      message: "#{cmd('screenshot')} only works with a screenshot area with a height greater than zero."
+      docsUrl: "https://on.cypress.io/screenshot"
+    }
+    invalid_padding: (obj) -> {
+      message: "#{cmd(obj.cmd)} `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/#{getScreenshotDocsPath(obj.cmd)}"
+    }
+    multiple_elements: {
+      message: "#{cmd('screenshot')} only works for a single element. You attempted to screenshot {{numElements}} elements."
+      docsUrl: "https://on.cypress.io/screenshot"
+    }
+    timed_out: {
+      message: "#{cmd('screenshot')} timed out waiting `{{timeout}}ms` to complete."
+      docsUrl: "https://on.cypress.io/screenshot"
+    }
 
   select:
-    disabled: "#{cmd('select')} failed because this element is currently disabled:\n\n{{node}}"
-    invalid_element: "#{cmd('select')} can only be called on a <select>. Your subject is a: {{node}}"
-    invalid_multiple: "#{cmd('select')} was called with an array of arguments but does not have a 'multiple' attribute set."
-    multiple_elements: "#{cmd('select')} can only be called on a single <select>. Your subject contained {{num}} elements."
-    multiple_matches: "#{cmd('select')} matched more than one option by value or text: {{value}}"
-    no_matches: "#{cmd('select')} failed because it could not find a single <option> with value or text matching: '{{value}}'"
-    option_disabled: "#{cmd('select')} failed because this <option> you are trying to select is currently disabled:\n\n{{node}}"
+    disabled: {
+      message: "#{cmd('select')} failed because this element is currently disabled:\n\n`{{node}}`"
+      docsUrl: "https://on.cypress.io/select"
+    }
+    invalid_element: {
+      message: "#{cmd('select')} can only be called on a `<select>`. Your subject is a: `{{node}}`"
+      docsUrl: "https://on.cypress.io/select"
+    }
+    invalid_multiple: {
+      message: "#{cmd('select')} was called with an array of arguments but does not have a `multiple` attribute set."
+      docsUrl: "https://on.cypress.io/select"
+    }
+    multiple_elements: {
+      message: "#{cmd('select')} can only be called on a single `<select>`. Your subject contained {{num}} elements."
+      docsUrl: "https://on.cypress.io/select"
+    }
+    multiple_matches: {
+      message: "#{cmd('select')} matched more than one `option` by value or text: `{{value}}`"
+      docsUrl: "https://on.cypress.io/select"
+    }
+    no_matches: {
+      message: "#{cmd('select')} failed because it could not find a single `<option>` with value or text matching: `{{value}}`"
+      docsUrl: "https://on.cypress.io/select"
+    }
+    option_disabled: {
+      message: "#{cmd('select')} failed because this `<option>` you are trying to select is currently disabled:\n\n`{{node}}`"
+      docsUrl: "https://on.cypress.io/select"
+    }
 
   selector_playground:
-    defaults_invalid_arg: "Cypress.SelectorPlayground.defaults() must be called with an object. You passed: {{arg}}"
-    defaults_invalid_priority: "Cypress.SelectorPlayground.defaults() called with invalid 'selectorPriority' property. It must be an array. You passed: {{arg}}"
-    defaults_invalid_on_element: "Cypress.SelectorPlayground.defaults() called with invalid 'onElement' property. It must be a function. You passed: {{arg}}"
+    defaults_invalid_arg: {
+      message: "`Cypress.SelectorPlayground.defaults()` must be called with an object. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/selector-playground-api"
+    }
+    defaults_invalid_priority: {
+      message: "`Cypress.SelectorPlayground.defaults()` called with invalid `selectorPriority` property. It must be an array. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/selector-playground-api"
+    }
+    defaults_invalid_on_element: {
+      message: "`Cypress.SelectorPlayground.defaults()` called with invalid `onElement` property. It must be a function. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/selector-playground-api"
+    }
 
   server:
-    force404_deprecated: "Passing cy.server({force404: false}) is now the default behavior of cy.server(). You can safely remove this option."
-    invalid_argument: "#{cmd('server')} accepts only an object literal as its argument."
-    stub_deprecated: ({ type }) -> """
-      Passing #{cmd(type)}({stub: false}) is now deprecated. You can safely remove: {stub: false}.\n
-      https://on.cypress.io/deprecated-stub-false-on-#{type}
-    """
-    xhrurl_not_set: "'Server.options.xhrUrl' has not been set"
+    force404_deprecated: "Passing `cy.server({force404: false})` is now the default behavior of `cy.server()`. You can safely remove this option."
+    invalid_argument: {
+      message: "#{cmd('server')} accepts only an object literal as its argument."
+      docsUrl: "https://on.cypress.io/server"
+    }
+    stub_deprecated: {
+      message: "Passing `cy.server({stub: false})` is now deprecated. You can safely remove: `{stub: false}`."
+      docsUrl: "https://on.cypress.io/deprecated-stub-false-on-{{type}}"
+    }
+    xhrurl_not_set: "`Server.options.xhrUrl` has not been set"
     unavailable: "The XHR server is unavailable or missing. This should never happen and likely is a bug. Open an issue if you see this message."
 
   setCookie:
-    invalid_arguments: "#{cmd('setCookie')} must be passed two string arguments for name and value."
+    backend_error: {
+      message: """
+        #{cmd('setCookie')} had an unexpected error setting the requested cookie in {{browserDisplayName}}.
+
+        {{errStack}}
+      """
+      docsUrl: "https://on.cypress.io/setcookie"
+    }
+    invalid_arguments: {
+      message: "#{cmd('setCookie')} must be passed two string arguments for `name` and `value`."
+      docsUrl: "https://on.cypress.io/setcookie"
+    }
+    invalid_value: {
+      message: "#{cmd('setCookie')} must be passed an RFC-6265-compliant cookie value. You passed:\n\n`{{value}}`"
+      docsUrl: "https://on.cypress.io/setcookie"
+    }
+
+  should:
+    chainer_not_found: "The chainer `{{chainer}}` was not found. Could not build assertion."
+    eventually_deprecated: "The `eventually` assertion chainer has been deprecated. This is now the default behavior so you can safely remove this word and everything should work as before."
 
   spread:
-    invalid_type: "#{cmd('spread')} requires the existing subject be array-like."
+    invalid_type: {
+      message: "#{cmd('spread')} requires the existing subject be array-like."
+      docsUrl: "https://on.cypress.io/spread"
+    }
 
   subject:
     not_dom: (obj) ->
@@ -852,43 +1204,43 @@ module.exports = {
 
       The subject received was:
 
-        > #{obj.subject}
+        > `#{obj.subject}`
 
       The previous command that ran was:
 
         > #{cmd(obj.previous)}
 
-      Cypress only considers the 'window', 'document', or any 'element' to be valid DOM objects.
-      """
-    not_attached: (obj) ->
+      Cypress only considers the `window`, `document`, or any `element` to be valid DOM objects.
       """
-      #{cmd(obj.cmd)} failed because this element is detached from the DOM.
+    not_attached: (obj) -> {
+      message: """
+        #{cmd(obj.cmd)} failed because this element is detached from the DOM.
 
-      #{obj.node}
+        `#{obj.node}`
 
-      Cypress requires elements be attached in the DOM to interact with them.
+        Cypress requires elements be attached in the DOM to interact with them.
 
-      The previous command that ran was:
-
-        > #{cmd(obj.prev)}
+        The previous command that ran was:
 
-      This DOM element likely became detached somewhere between the previous and current command.
+          > #{cmd(obj.prev)}
 
-      Common situations why this happens:
-        - Your JS framework re-rendered asynchronously
-        - Your app code reacted to an event firing and removed the element
+        This DOM element likely became detached somewhere between the previous and current command.
 
-      You typically need to re-query for the element or add 'guards' which delay Cypress from running new commands.
+        Common situations why this happens:
+          - Your JS framework re-rendered asynchronously
+          - Your app code reacted to an event firing and removed the element
 
-      https://on.cypress.io/element-has-detached-from-dom
-      """
+        You typically need to re-query for the element or add 'guards' which delay Cypress from running new commands.
+        """
+      docsUrl: "https://on.cypress.io/element-has-detached-from-dom"
+    }
     not_window_or_document: (obj) ->
       """
-      #{cmd(obj.name)} failed because it requires the subject be a global '#{obj.type}' object.
+      #{cmd(obj.name)} failed because it requires the subject be a global `#{obj.type}` object.
 
       The subject received was:
 
-        > #{obj.subject}
+        > `#{obj.subject}`
 
       The previous command that ran was:
 
@@ -900,7 +1252,7 @@ module.exports = {
 
       The subject received was:
 
-        > #{obj.subject}
+        > `#{obj.subject}`
 
       The previous command that ran was:
 
@@ -908,8 +1260,14 @@ module.exports = {
       """
 
   submit:
-    multiple_forms: "#{cmd('submit')} can only be called on a single form. Your subject contained {{num}} form elements."
-    not_on_form: "#{cmd('submit')} can only be called on a <form>. Your subject {{word}} a: {{node}}"
+    multiple_forms: {
+      message: "#{cmd('submit')} can only be called on a single `form`. Your subject contained {{num}} `form` elements."
+      docsUrl: "https://on.cypress.io/submit"
+    }
+    not_on_form: {
+      message: "#{cmd('submit')} can only be called on a `<form>`. Your subject {{word}} a: `{{node}}`"
+      docsUrl: "https://on.cypress.io/submit"
+    }
 
   task:
     known_error: """#{cmd('task', '\'{{task}}\'')} failed with the following error:
@@ -920,16 +1278,31 @@ module.exports = {
 
         > {{error}}
     """
-    invalid_argument: "#{cmd('task')} must be passed a non-empty string as its 1st argument. You passed: '{{task}}'."
-    timed_out: "#{cmd('task', '\'{{task}}\'')} timed out after waiting {{timeout}}ms."
-    server_timed_out: """#{cmd('task', '\'{{task}}\'')} timed out after waiting {{timeout}}ms.
-
-        {{error}}
-    """
+    invalid_argument: {
+      message: "#{cmd('task')} must be passed a non-empty string as its 1st argument. You passed: `{{task}}`."
+      docsUrl: "https://on.cypress.io/task"
+    }
+    timed_out: {
+      message: "#{cmd('task', '\'{{task}}\'')} timed out after waiting `{{timeout}}ms`."
+      docsUrl: "https://on.cypress.io/task"
+    }
+    server_timed_out: {
+      message: """#{cmd('task', '\'{{task}}\'')} timed out after waiting `{{timeout}}ms`.
+
+          {{error}}
+      """
+      docsUrl: "https://on.cypress.io/task"
+    }
 
   tick:
-    invalid_argument: "clock.tick()/#{cmd('tick')} only accept a number as their argument. You passed: {{arg}}"
-    no_clock: "#{cmd('tick')} cannot be called without first calling #{cmd('clock')}"
+    invalid_argument: {
+      message: "`clock.tick()`/#{cmd('tick')} only accepts a number as their argument. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/tick"
+    }
+    no_clock: {
+      message: "#{cmd('tick')} cannot be called without first calling #{cmd('clock')}"
+      docsUrl: "https://on.cypress.io/tick"
+    }
 
   then:
     callback_mixes_sync_and_async: """
@@ -939,60 +1312,103 @@ module.exports = {
 
       Cypress commands are asynchronous and it doesn't make sense to queue cy commands and yet return a synchronous value.
 
-      You likely forgot to properly chain the cy commands using another cy.then().
+      You likely forgot to properly chain the cy commands using another `cy.then()`.
 
-      The value you synchronously returned was: '{{value}}'
+      The value you synchronously returned was: `{{value}}`
     """
 
   trigger:
-    invalid_argument: "#{cmd('trigger')} must be passed a non-empty string as its 1st argument. You passed: '{{cmd}}'."
-    multiple_elements: "#{cmd('trigger')} can only be called on a single element. Your subject contained {{num}} elements."
+    invalid_argument: {
+      message: "#{cmd('trigger')} must be passed a non-empty string as its 1st argument. You passed: `{{cmd}}`."
+      docsUrl: "https://on.cypress.io/trigger"
+    }
+    multiple_elements: {
+      message: "#{cmd('trigger')} can only be called on a single element. Your subject contained {{num}} elements."
+      docsUrl: "https://on.cypress.io/trigger"
+    }
 
   type:
-    empty_string: "#{cmd('type')} cannot accept an empty String. You need to actually type something."
-    readonly: "#{cmd('type')} cannot type into an element with a 'readonly' attribute. The element typed into was: {{node}}"
-    invalid: """
-      Special character sequence: '{{chars}}' is not recognized. Available sequences are: {{allChars}}
-
-      If you want to skip parsing special character sequences and type the text exactly as written, pass the option: {parseSpecialCharSequences: false}
-
-      https://on.cypress.io/type
-    """
-    invalid_date: "Typing into a date input with #{cmd('type')} requires a valid date with the format 'yyyy-MM-dd'. You passed: {{chars}}"
-    invalid_month: "Typing into a month input with #{cmd('type')} requires a valid month with the format 'yyyy-MM'. You passed: {{chars}}"
-    invalid_week: "Typing into a week input with #{cmd('type')} requires a valid week with the format 'yyyy-Www', where W is the literal character 'W' and ww is the week number (00-53). You passed: {{chars}}"
-    invalid_time: "Typing into a time input with #{cmd('type')} requires a valid time with the format 'HH:mm', 'HH:mm:ss' or 'HH:mm:ss.SSS', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: {{chars}}"
-    invalid_datetime: "Typing into a datetime input with #{cmd('type')} requires a valid datetime with the format 'yyyy-MM-ddThh:mm', for example '2017-06-01T08:30'. You passed: {{chars}}"
-    multiple_elements: "#{cmd('type')} can only be called on a single element. Your subject contained {{num}} elements."
-    not_on_typeable_element: """
-      #{cmd('type')} failed because it requires a valid typeable element.
-
-      The element typed into was:
-
-        > {{node}}
-
-      A typeable element matches one of the following selectors:
-        'a[href]'
-        'area[href]'
-        'input'
-        'select'
-        'textarea'
-        'button'
-        'iframe'
-        '[tabindex]'
-        '[contenteditable]'
-    """
-    not_actionable_textlike: """
-      #{cmd('type')} failed because it targeted a disabled element.
-
-      The element typed into was:
-
-        > {{node}}
-
-      You should ensure the element does not have an attribute named 'disabled' before typing into it.
-    """
-    tab: "{tab} isn't a supported character sequence. You'll want to use the command #{cmd('tab')}, which is not ready yet, but when it is done that's what you'll use."
-    wrong_type: "#{cmd('type')} can only accept a String or Number. You passed in: '{{chars}}'"
+    empty_string: {
+      message: "#{cmd('type')} cannot accept an empty string. You need to actually type something."
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid: {
+      message: """
+      Special character sequence: `{{chars}}` is not recognized. Available sequences are: `{{allChars}}`
+
+      If you want to skip parsing special character sequences and type the text exactly as written, pass the option: `{ parseSpecialCharSequences: false }`
+      """
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid_date: {
+      message: "Typing into a `date` input with #{cmd('type')} requires a valid date with the format `yyyy-MM-dd`. You passed: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid_datetime: {
+      message: "Typing into a datetime input with #{cmd('type')} requires a valid datetime with the format `yyyy-MM-ddThh:mm`, for example `2017-06-01T08:30`. You passed: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid_month: {
+      message: "Typing into a `month` input with #{cmd('type')} requires a valid month with the format `yyyy-MM`. You passed: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid_time: {
+      message: "Typing into a `time` input with #{cmd('type')} requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    invalid_week: {
+      message: "Typing into a `week` input with #{cmd('type')} requires a valid week with the format `yyyy-Www`, where `W` is the literal character `W` and `ww` is the week number (00-53). You passed: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    multiple_elements: {
+      message: "#{cmd('type')} can only be called on a single element. Your subject contained {{num}} elements."
+      docsUrl: "https://on.cypress.io/type"
+    }
+    not_actionable_textlike: {
+      message: """
+        #{cmd('type')} failed because it targeted a disabled element.
+
+        The element typed into was:
+
+          > {{node}}
+
+        Ensure the element does not have an attribute named `disabled` before typing into it.
+      """
+      docsUrl: "https://on.cypress.io/type"
+    }
+    not_on_typeable_element: {
+      message: """
+        #{cmd('type')} failed because it requires a valid typeable element.
+
+        The element typed into was:
+
+          > `{{node}}`
+
+          A typeable element matches one of the following selectors:
+          `a[href]`
+          `area[href]`
+          `input`
+          `select`
+          `textarea`
+          `button`
+          `iframe`
+          `[tabindex]`
+          `[contenteditable]`
+      """
+      docsUrl: "https://on.cypress.io/type"
+    }
+    readonly: {
+      message: "#{cmd('type')} cannot type into an element with a `readonly` attribute. The element typed into was: `{{node}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
+    tab: {
+      message: "`{tab}` isn't a supported character sequence."
+      docsUrl: "https://on.cypress.io/type"
+    }
+    wrong_type: {
+      message: "#{cmd('type')} can only accept a string or number. You passed in: `{{chars}}`"
+      docsUrl: "https://on.cypress.io/type"
+    }
 
   uncaught:
     cross_origin_script: """
@@ -1004,15 +1420,15 @@ module.exports = {
 
       Check your Developer Tools Console for the actual error - it should be printed there.
 
-      It's possible to enable debugging these scripts by adding the 'crossorigin' attribute and setting a CORS header.
+      It's possible to enable debugging these scripts by adding the `crossorigin` attribute and setting a CORS header.
 
       https://on.cypress.io/cross-origin-script-error
     """
     error_in_hook: (obj) ->
-      msg = "Because this error occurred during a '#{obj.hookName}' hook we are skipping "
+      msg = "Because this error occurred during a `#{obj.hookName}` hook we are skipping "
 
       if t = obj.parentTitle
-        msg += "the remaining tests in the current suite: '#{_.truncate(t, 20)}'"
+        msg += "the remaining tests in the current suite: `#{_.truncate(t, 20)}`"
       else
         msg += "all of the remaining tests."
 
@@ -1023,37 +1439,55 @@ module.exports = {
 
       msg + if source and lineno then " (#{source}:#{lineno})" else ""
 
-    fromApp: """
-      This error originated from your application code, not from Cypress.
-
-      When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
+    fromApp: {
+      message: """
+        This error originated from your application code, not from Cypress.
 
-      This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+        When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-      https://on.cypress.io/uncaught-exception-from-application
-    """
-
-    fromSpec: """
-      This error originated from your test code, not from Cypress.
+        This behavior is configurable, and you can choose to turn this off by listening to the `uncaught:exception` event.
+      """
+      docsUrl: "https://on.cypress.io/uncaught-exception-from-application"
+    }
+    fromSpec:
+      message: """
+        This error originated from your test code, not from Cypress.
 
-      When Cypress detects uncaught errors originating from your test code it will automatically fail the current test.
-    """
+        When Cypress detects uncaught errors originating from your test code it will automatically fail the current test.
+      """
 
   viewport:
-    bad_args:  "#{cmd('viewport')} can only accept a string preset or a width and height as numbers."
-    dimensions_out_of_range: "#{cmd('viewport')} width and height must be at least 0px."
-    empty_string: "#{cmd('viewport')} cannot be passed an empty string."
-    invalid_orientation: "#{cmd('viewport')} can only accept '{{all}}' as valid orientations. Your orientation was: '{{orientation}}'"
-    missing_preset: "#{cmd('viewport')} could not find a preset for: '{{preset}}'. Available presets are: {{presets}}"
+    bad_args: {
+      message: "#{cmd('viewport')} can only accept a string preset or a `width` and `height` as numbers."
+      docsUrl: "https://on.cypress.io/viewport"
+    }
+    dimensions_out_of_range: {
+      message: "#{cmd('viewport')} `width` and `height` must be at least 0px."
+      docsUrl: "https://on.cypress.io/viewport"
+    }
+    empty_string: {
+      message: "#{cmd('viewport')} cannot be passed an empty string."
+      docsUrl: "https://on.cypress.io/viewport"
+    }
+    invalid_orientation: {
+      message: "#{cmd('viewport')} can only accept `{{all}}` as valid orientations. Your orientation was: `{{orientation}}`"
+      docsUrl: "https://on.cypress.io/viewport"
+    }
+    missing_preset: {
+      message: "#{cmd('viewport')} could not find a preset for: `{{preset}}`. Available presets are: {{presets}}"
+      docsUrl: "https://on.cypress.io/viewport"
+    }
 
   visit:
-    body_circular: ({ path }) -> """
-      The `body` parameter supplied to #{cmd('visit')} contained a circular reference at the path "#{path.join(".")}".
+    body_circular: ({ path }) -> {
+      message: """
+        The `body` parameter supplied to #{cmd('visit')} contained a circular reference at the path "#{path.join(".")}".
 
-      `body` can only be a string or an object with no circular references.
-    """
+        `body` can only be a string or an object with no circular references.
+      """
+      docsUrl: "https://on.cypress.io/visit"
+    }
     status_code_flags_invalid: """
-    #{cmd('visit')} was invoked with { failOnStatusCode: false, retryOnStatusCodeFailure: true }.
 
     These options are incompatible with each other.
 
@@ -1061,37 +1495,52 @@ module.exports = {
      - To not retry on non-2xx status codes, pass { failOnStatusCode: true, retryOnStatusCodeFailure: true }.
      - To fail on non-2xx status codes without retrying (the default behavior), pass { failOnStatusCode: true, retryOnStatusCodeFailure: false }
     """
-    invalid_1st_arg: "#{cmd('visit')} must be called with a URL or an options object containing a URL as its 1st argument"
-    invalid_method: "#{cmd('visit')} was called with an invalid method: '{{method}}'. Method can only be GET or POST."
-    invalid_headers: "#{cmd('visit')} requires the 'headers' option to be an object."
-    invalid_qs: "#{cmd('visit')} requires the 'qs' option to be an object, but received: '{{qs}}'"
-    no_duplicate_url: """
-      #{cmd('visit')} must be called with only one URL. You specified two URLs:
-
-      URL from the `options` object: {{optionsUrl}}
-      URL from the `url` parameter: {{url}}
-    """
-    cannot_visit_different_origin: """
-      #{cmd('visit')} failed because you are attempting to visit a URL that is of a different origin.
+    invalid_1st_arg: {
+      message: "#{cmd('visit')} must be called with a `url` or an `options` object containing a `url` as its 1st argument"
+      docsUrl: "https://on.cypress.io/visit"
+    }
+    invalid_method: {
+      message: "#{cmd('visit')} was called with an invalid method: `{{method}}`. Method can only be `GET` or `POST`."
+      docsUrl: "https://on.cypress.io/visit"
+    }
+    invalid_headers: {
+      message: "#{cmd('visit')} requires the `headers` option to be an object."
+      docsUrl: "https://on.cypress.io/visit"
+    }
+    invalid_qs: {
+      message: "#{cmd('visit')} requires the `qs` option to be an object, but received: `{{qs}}`"
+      docsUrl: "https://on.cypress.io/visit"
+    }
+    no_duplicate_url: {
+      message: """
+        #{cmd('visit')} must be called with only one `url`. You specified two urls:
+        `url` from the `options` object: {{optionsUrl}}
+        `url` from the `url` parameter: {{url}}
+      """
+      docsUrl: "https://on.cypress.io/visit"
+    }
+    cannot_visit_different_origin: {
+      message: """
+        #{cmd('visit')} failed because you are attempting to visit a URL that is of a different origin.
 
-      The new URL is considered a different origin because the following parts of the URL are different:
+        The new URL is considered a different origin because the following parts of the URL are different:
 
-        > {{differences}}
+          > {{differences}}
 
-      You may only #{cmd('visit')} same-origin URLs within a single test.
+        You may only #{cmd('visit')} same-origin URLs within a single test.
 
-      The previous URL you visited was: 
-      
-        > '{{previousUrl}}'
+        The previous URL you visited was:
 
-      You're attempting to visit this URL: 
-      
-        > '{{attemptedUrl}}'
+          > '{{previousUrl}}'
 
-      You may need to restructure some of your test code to avoid this problem.
+        You're attempting to visit this URL:
 
-      https://on.cypress.io/cannot-visit-different-origin-domain
-    """
+          > '{{attemptedUrl}}'
+
+        You may need to restructure some of your test code to avoid this problem.
+      """
+      docsUrl: "https://on.cypress.io/cannot-visit-different-origin-domain"
+    }
     loading_network_failed: """
       #{cmd('visit')} failed trying to load:
 
@@ -1139,11 +1588,11 @@ module.exports = {
 
           > #{obj.status}: #{obj.statusText}
 
-        This was considered a failure because the status code was not '2xx'.
+        This was considered a failure because the status code was not `2xx`.
 
         #{getRedirects(obj, "This http request was redirected")}
 
-        If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+        If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
       """
     loading_invalid_content_type: (obj) ->
       phrase = if obj.path then "this local file" else "your web server"
@@ -1153,11 +1602,11 @@ module.exports = {
 
         #{obj.url}
 
-        The content-type of the response we received from #{phrase} was:
+        The `content-type` of the response we received from #{phrase} was:
 
-          > #{obj.contentType}
+          > `#{obj.contentType}`
 
-        This was considered a failure because responses must have content-type: 'text/html'
+        This was considered a failure because responses must have `content-type: 'text/html'`
 
         However, you can likely use #{cmd('request')} instead of #{cmd('visit')}.
 
@@ -1175,24 +1624,45 @@ module.exports = {
       """
 
   wait:
-    alias_invalid: "'{{prop}}' is not a valid alias property. Are you trying to ask for the first request? If so write @{{str}}.request"
-    fn_deprecated: "#{cmd('wait', 'fn')} has been deprecated. Instead just change this command to be #{cmd('should', 'fn')}."
-    invalid_1st_arg: "#{cmd('wait')} only accepts a number, an alias of a route, or an array of aliases of routes. You passed: {{arg}}"
-    invalid_alias: "#{cmd('wait')} only accepts aliases for routes.\nThe alias: '{{alias}}' did not match a route."
-    invalid_arguments: "#{cmd('wait')} was passed invalid arguments. You cannot pass multiple strings. If you're trying to wait for multiple routes, use an array."
-    timed_out: "#{cmd('wait')} timed out waiting {{timeout}}ms for the {{num}} {{type}} to the route: '{{alias}}'. No {{type}} ever occurred."
+    alias_invalid: {
+      message: "`{{prop}}` is not a valid alias property. Are you trying to ask for the first request? If so write `@{{str}}.request`"
+      docsUrl: "https://on.cypress.io/wait"
+    }
+    fn_deprecated: {
+      message: "#{cmd('wait', 'fn')} has been deprecated. Change this command to be #{cmd('should', 'fn')}."
+      docsUrl: "https://on.cypress.io/wait"
+    }
+    invalid_1st_arg: {
+      message: "#{cmd('wait')} only accepts a number, an alias of a route, or an array of aliases of routes. You passed: `{{arg}}`"
+      docsUrl: "https://on.cypress.io/wait"
+    }
+    invalid_alias: {
+      message: "#{cmd('wait')} only accepts aliases for routes.\nThe alias: `{{alias}}` did not match a route."
+      docsUrl: "https://on.cypress.io/wait"
+    }
+    invalid_arguments: {
+      message: "#{cmd('wait')} was passed invalid arguments. You cannot pass multiple strings. If you're trying to wait for multiple routes, use an array."
+      docsUrl: "https://on.cypress.io/wait"
+    }
+    timed_out: {
+      message: "#{cmd('wait')} timed out waiting `{{timeout}}ms` for the {{num}} {{type}} to the route: `{{alias}}`. No {{type}} ever occurred."
+      docsUrl: "https://on.cypress.io/wait"
+    }
 
   window:
-    iframe_doc_undefined: "The remote iframe's document is undefined"
-    iframe_undefined: "The remote iframe is undefined"
+    iframe_doc_undefined: "The remote iframe's document is `undefined`"
+    iframe_undefined: "The remote iframe is `undefined`"
 
   within:
-    invalid_argument: "#{cmd('within')} must be called with a function."
+    invalid_argument: {
+      message: "#{cmd('within')} must be called with a function."
+      docsUrl: "https://on.cypress.io/within"
+    }
 
   xhr:
     aborted: "This XHR was aborted by your code -- check this stack trace below."
-    missing: "XMLHttpRequest#xhr is missing."
+    missing: "`XMLHttpRequest#xhr` is missing."
     network_error: "The network request for this XHR could not be made. Check your console for the reason."
-    requestjson_deprecated: "requestJSON is now deprecated and will be removed in the next version. Update this to 'requestBody' or 'request.body'."
-    responsejson_deprecated: "responseJSON is now deprecated and will be removed in the next version. Update this to 'responseBody' or 'response.body'."
+    requestjson_deprecated: "`requestJSON` is now deprecated and will be removed in the next version. Update this to `requestBody` or `request.body`."
+    responsejson_deprecated: "`responseJSON` is now deprecated and will be removed in the next version. Update this to `responseBody` or `response.body`."
 }
diff --git a/packages/driver/src/cypress/error_utils.js b/packages/driver/src/cypress/error_utils.js
index cba429480f77..6593235623d7 100644
--- a/packages/driver/src/cypress/error_utils.js
+++ b/packages/driver/src/cypress/error_utils.js
@@ -3,91 +3,97 @@ const _ = require('lodash')
 const $errorMessages = require('./error_messages')
 const $utils = require('./utils')
 
-const ERROR_PROPS = 'message type name stack fileName lineNumber columnNumber host uncaught actual expected showDiff isPending'.split(' ')
+const ERROR_PROPS = 'message type name stack sourceMappedStack parsedStack fileName lineNumber columnNumber host uncaught actual expected showDiff isPending docsUrl'.split(' ')
+
 const CypressErrorRe = /(AssertionError|CypressError)/
 const twoOrMoreNewLinesRe = /\n{2,}/
 
-const appendErrMsg = (err, message) => {
-  //# preserve stack
-  //# this is the critical part
-  //# because the browser has a cached
-  //# dynamic stack getter that will
-  //# not be evaluated later
-  const stack = err.stack || ''
+const wrapErr = (err) => {
+  if (!err) return
+
+  return $utils.reduceProps(err, ERROR_PROPS)
+}
+
+const mergeErrProps = (origErr, ...newProps) => {
+  return _.extend(origErr, ...newProps)
+}
+
+const replaceMsgInStack = (err, newMsg) => {
+  const { message, name, stack } = err
+
+  if (!stack) return stack
 
-  //# preserve message
-  //# and toString
-  let msg = err.message
-  const str = err.toString()
+  if (message) {
+    // reset stack by replacing the original message with the new one
+    return stack.replace(message, newMsg)
+  }
 
-  //# append message
-  msg += `\n\n${message}`
+  // if message is undefined or an empty string, the error (in Chrome at least)
+  // is 'Error\n\n<stack>' and it results in wrongly prepending the
+  // new message, looking like '<newMsg>Error\n\n<stack>'
+  return stack.replace(name, `${name}: ${newMsg}`)
+}
 
-  //# set message
-  err.message = msg
+const modifyErrMsg = (err, newErrMsg, cb) => {
+  err = normalizeErrorStack(err)
 
-  //# reset stack by replacing the original first line
-  //# with the new one
-  err.stack = stack.replace(str, err.toString())
+  const newMsg = cb(err.message, newErrMsg)
+  const newStack = replaceMsgInStack(err, newMsg)
 
-  module.exports.normalizeErrorStack(err)
+  err.message = newMsg
+  err.stack = newStack
 
   return err
 }
 
-const normalizeErrorStack = (e) => {
-  //# normalize error message + stack for firefox
-  const errString = e.toString()
-  const errStack = e.stack || ''
+const appendErrMsg = (err, messageOrObj) => {
+  return modifyErrMsg(err, messageOrObj, (msg1, msg2) => {
+    // we don't want to just throw in extra
+    // new lines if there isn't even a msg
+    if (!msg1) return msg2
 
-  if (!errStack.slice(0, errStack.indexOf('\n')).includes(errString.slice(0, errString.indexOf('\n')))) {
-    e.stack = `${errString}\n${errStack}`
-  }
+    if (!msg2) return msg1
 
-  return e
+    return `${msg1}\n\n${msg2}`
+  })
 }
 
-const cloneErr = (obj) => {
+const makeErrFromObj = (obj) => {
   const err2 = new Error(obj.message)
 
   err2.name = obj.name
   err2.stack = obj.stack
 
-  for (let prop of Object.keys(obj || {})) {
-    const val = obj[prop]
-
+  _.each(obj, (val, prop) => {
     if (!err2[prop]) {
       err2[prop] = val
     }
-  }
+  })
 
   return err2
 }
 
-const throwErr = (err, options) => {
-  if (options == null) {
-    options = {}
-  }
-
+const throwErr = (err, options = {}) => {
   if (_.isString(err)) {
-    err = cypressErr(err)
+    err = cypressErr({ message: err })
+  }
 
-    if (options.noStackTrace) {
-      err.stack = ''
-    }
+  if (options.noStackTrace) {
+    err.stack = ''
   }
 
-  let { onFail } = options
-  const { errProps } = options
+  let { onFail, errProps } = options
 
-  //# assume onFail is a command if
+  // assume onFail is a command if
   //# onFail is present and isnt a function
   if (onFail && !_.isFunction(onFail)) {
     const command = onFail
 
     //# redefine onFail and automatically
     //# hook this into our command
-    onFail = (err) => command.error(err)
+    onFail = (err) => {
+      return command.error(err)
+    }
   }
 
   if (onFail) {
@@ -101,44 +107,141 @@ const throwErr = (err, options) => {
   throw err
 }
 
-const throwErrByPath = (errPath, options) => {
+const throwErrByPath = (errPath, options = {}) => {
   let err
 
-  if (options == null) {
-    options = {}
+  try {
+    err = cypressErrByPath(errPath, options)
+  } catch (internalError) {
+    err = internalErr(internalError)
   }
 
-  err = (() => {
-    try {
-      return errMsgByPath(errPath, options.args)
-    } catch (e) {
-      return internalErr(e)
-    }
-  })()
+  return throwErr(err, options)
+}
+
+const warnByPath = (errPath, options = {}) => {
+  const errObj = errObjByPath($errorMessages, errPath, options.args)
+  let err = errObj.message
+
+  if (errObj.docsUrl) {
+    err += `\n\n${errObj.docsUrl}`
+  }
+
+  $utils.warning(err)
+}
 
-  throwErr(err, options)
+const internalErr = (err) => {
+  const newErr = new Error(err)
+
+  return mergeErrProps(newErr, err, { name: 'InternalError' })
+}
+
+const cypressErr = (err) => {
+  const newErr = new Error(err.message)
+
+  return mergeErrProps(newErr, err, { name: 'CypressError' })
+}
+
+const cypressErrByPath = (errPath, options = {}) => {
+  const errObj = errObjByPath($errorMessages, errPath, options.args)
+
+  return cypressErr(errObj)
 }
 
-const warnByPath = (errPath, options) => {
-  if (options == null) {
-    options = {}
+const normalizeMsgNewLines = (message) => {
+  //# normalize more than 2 new lines
+  //# into only exactly 2 new lines
+  return _
+  .chain(message)
+  .split(twoOrMoreNewLinesRe)
+  .compact()
+  .join('\n\n')
+  .value()
+}
+
+const replaceErrMsgTokens = (errMessage, args) => {
+  if (!errMessage) return errMessage
+
+  const getMsg = function (args = {}) {
+    return _.reduce(args, (message, argValue, argKey) => {
+      return message.replace(new RegExp(`\{\{${argKey}\}\}`, 'g'), argValue)
+    }, errMessage)
+  }
+
+  return normalizeMsgNewLines(getMsg(args))
+}
+
+const errObjByPath = (errLookupObj, errPath, args) => {
+  let errObjStrOrFn = getObjValueByPath(errLookupObj, errPath)
+
+  if (!errObjStrOrFn) {
+    throw new Error(`Error message path '${errPath}' does not exist`)
+  }
+
+  let errObj = errObjStrOrFn
+
+  if (_.isFunction(errObjStrOrFn)) {
+    errObj = errObjStrOrFn(args)
+  }
+
+  if (_.isString(errObj)) {
+    // normalize into object if given string
+    errObj = {
+      message: errObj,
+    }
   }
 
-  const err = errMsgByPath(errPath, options.args)
+  let extendErrObj = {
+    message: replaceErrMsgTokens(errObj.message, args),
+  }
 
-  return $utils.warning(err)
+  if (errObj.docsUrl) {
+    extendErrObj.docsUrl = replaceErrMsgTokens(errObj.docsUrl, args)
+  }
+
+  return _.extend({}, errObj, extendErrObj)
 }
 
-const internalErr = (err) => {
-  err = new Error(err)
-  err.name = 'InternalError'
+const errMsgByPath = (errPath, args) => {
+  return getErrMsgWithObjByPath($errorMessages, errPath, args)
+}
+
+const getErrMsgWithObjByPath = (errLookupObj, errPath, args) => {
+  const errObj = errObjByPath(errLookupObj, errPath, args)
+
+  return errObj.message
+}
+
+const getErrMessage = (err) => {
+  if (err && err.displayMessage) {
+    return err.displayMessage
+  }
+
+  if (err && err.message) {
+    return err.message
+  }
 
   return err
 }
 
-const cypressErr = (err) => {
-  err = new Error(err)
-  err.name = 'CypressError'
+const getErrStack = (err) => {
+  // if cypress or assertion error
+  // don't return the stack
+  if (CypressErrorRe.test(err.name)) {
+    return err.toString()
+  }
+
+  return err.stack
+}
+
+const normalizeErrorStack = (err) => {
+  // normalize error message + stack for firefox
+  const errString = err.toString()
+  const errStack = err.stack || ''
+
+  if (!errStack.slice(0, errStack.indexOf('\n')).includes(errString.slice(0, errString.indexOf('\n')))) {
+    err.stack = `${errString}\n${errStack}`
+  }
 
   return err
 }
@@ -165,60 +268,37 @@ const getObjValueByPath = (obj, keyPath) => {
   return val
 }
 
-const errMsgByPath = (errPath, args) => {
-  let errMessage
-
-  if (!(errMessage = getObjValueByPath($errorMessages, errPath))) {
-    throw new Error(`Error message path '${errPath}' does not exist`)
-  }
-
-  const getMsg = function () {
-    if (_.isFunction(errMessage)) {
-      return errMessage(args)
-    }
-
-    return _.reduce(args, (message, argValue, argKey) => message.replace(new RegExp(`\{\{${argKey}\}\}`, 'g'), argValue)
-      , errMessage)
+//// all errors flow through this function before they're finally thrown
+//// or used to reject promises
+const processErr = (errObj = {}, config) => {
+  if (config('isInteractive') || !errObj.docsUrl) {
+    return errObj
   }
 
-  //# normalize two or more new lines
-  //# into only exactly two new lines
-  return _
-  .chain(getMsg())
-  .split(twoOrMoreNewLinesRe)
-  .compact()
-  .join('\n\n')
-  .value()
-}
-
-const serializeError = (err) => {
-  if (!err) return null
-
-  return _.reduce(ERROR_PROPS, (memo, prop) => {
-    if (_.has(err, prop) || err[prop]) {
-      memo[prop] = err[prop]
-    }
-
-    return memo
-  }, {})
-}
-
-const wrapErr = (err) => {
-  return $utils.reduceProps(err, ERROR_PROPS)
+  // append the docs url when not interactive so it appears in the stdout
+  return appendErrMsg(errObj, errObj.docsUrl)
 }
 
 module.exports = {
-  CypressErrorRe,
   appendErrMsg,
+  cypressErr,
+  cypressErrByPath,
+  CypressErrorRe,
+  errMsgByPath,
+  errObjByPath,
+  getErrMessage,
+  getErrMsgWithObjByPath,
+  getErrStack,
+  getObjValueByPath,
+  internalErr,
+  makeErrFromObj,
+  mergeErrProps,
+  modifyErrMsg,
   normalizeErrorStack,
-  cloneErr,
+  normalizeMsgNewLines,
+  processErr,
   throwErr,
   throwErrByPath,
   warnByPath,
-  internalErr,
-  cypressErr,
-  errMsgByPath,
-  serializeError,
   wrapErr,
-  getObjValueByPath,
 }
diff --git a/packages/driver/src/cypress/log.js b/packages/driver/src/cypress/log.js
index 697cd2a9b462..3e6669f027b0 100644
--- a/packages/driver/src/cypress/log.js
+++ b/packages/driver/src/cypress/log.js
@@ -229,7 +229,7 @@ const Log = function (cy, state, config, obj) {
       .omit('error')
       .omitBy(_.isFunction)
       .extend({
-        err: $errUtils.serializeError(this.get('error')),
+        err: $errUtils.wrapErr(this.get('error')),
         consoleProps: this.invoke('consoleProps'),
         renderProps: this.invoke('renderProps'),
       })
diff --git a/packages/driver/src/dom/visibility.js b/packages/driver/src/dom/visibility.js
index b63bd711215f..1c4d4881a590 100644
--- a/packages/driver/src/dom/visibility.js
+++ b/packages/driver/src/dom/visibility.js
@@ -19,7 +19,7 @@ const isVisible = (el) => {
 // because of circular references
 const isHidden = (el, name = 'isHidden()') => {
   if (!$elements.isElement(el)) {
-    throw new Error(`Cypress.dom.${name} failed because it requires a DOM element. The subject received was: '${el}'`)
+    throw new Error(`\`Cypress.dom.${name}\` failed because it requires a DOM element. The subject received was: \`${el}\``)
   }
 
   const $el = $jquery.wrap(el)
@@ -379,51 +379,51 @@ const getReasonIsHidden = function ($el) {
 
   // returns the reason in human terms why an element is considered not visible
   if (elHasDisplayNone($el)) {
-    return `This element '${node}' is not visible because it has CSS property: 'display: none'`
+    return `This element \`${node}\` is not visible because it has CSS property: \`display: none\``
   }
 
   if ($parent = parentHasDisplayNone($el.parent())) {
     parentNode = $elements.stringify($parent, 'short')
 
-    return `This element '${node}' is not visible because its parent '${parentNode}' has CSS property: 'display: none'`
+    return `This element \`${node}\` is not visible because its parent \`${parentNode}\` has CSS property: \`display: none\``
   }
 
   if ($parent = parentHasVisibilityHidden($el.parent())) {
     parentNode = $elements.stringify($parent, 'short')
 
-    return `This element '${node}' is not visible because its parent '${parentNode}' has CSS property: 'visibility: hidden'`
+    return `This element \`${node}\` is not visible because its parent \`${parentNode}\` has CSS property: \`visibility: hidden\``
   }
 
   if ($parent = parentHasVisibilityCollapse($el.parent())) {
     parentNode = $elements.stringify($parent, 'short')
 
-    return `This element '${node}' is not visible because its parent '${parentNode}' has CSS property: 'visibility: collapse'`
+    return `This element \`${node}\` is not visible because its parent \`${parentNode}\` has CSS property: \`visibility: collapse\``
   }
 
   if ($elements.isDetached($el)) {
-    return `This element '${node}' is not visible because it is detached from the DOM`
+    return `This element \`${node}\` is not visible because it is detached from the DOM`
   }
 
   if (elHasVisibilityHidden($el)) {
-    return `This element '${node}' is not visible because it has CSS property: 'visibility: hidden'`
+    return `This element \`${node}\` is not visible because it has CSS property: \`visibility: hidden\``
   }
 
   if (elHasVisibilityCollapse($el)) {
-    return `This element '${node}' is not visible because it has CSS property: 'visibility: collapse'`
+    return `This element \`${node}\` is not visible because it has CSS property: \`visibility: collapse\``
   }
 
   if (elHasNoOffsetWidthOrHeight($el)) {
-    return `This element '${node}' is not visible because it has an effective width and height of: '${width} x ${height}' pixels.`
+    return `This element \`${node}\` is not visible because it has an effective width and height of: \`${width} x ${height}\` pixels.`
   }
 
   const transformResult = $transform.detectVisibility($el)
 
   if (transformResult === 'transformed') {
-    return `This element '${node}' is not visible because it is hidden by transform.`
+    return `This element \`${node}\` is not visible because it is hidden by transform.`
   }
 
   if (transformResult === 'backface') {
-    return `This element '${node}' is not visible because it is rotated and its backface is hidden.`
+    return `This element \`${node}\` is not visible because it is rotated and its backface is hidden.`
   }
 
   if ($parent = parentHasNoOffsetWidthOrHeightAndOverflowHidden($el.parent())) {
@@ -431,7 +431,7 @@ const getReasonIsHidden = function ($el) {
     width = elOffsetWidth($parent)
     height = elOffsetHeight($parent)
 
-    return `This element '${node}' is not visible because its parent '${parentNode}' has CSS property: 'overflow: hidden' and an effective width and height of: '${width} x ${height}' pixels.`
+    return `This element \`${node}\` is not visible because its parent \`${parentNode}\` has CSS property: \`overflow: hidden\` and an effective width and height of: \`${width} x ${height}\` pixels.`
   }
 
   // nested else --___________--
@@ -441,22 +441,18 @@ const getReasonIsHidden = function ($el) {
       const covered = $elements.stringify(elAtCenterPoint($el))
 
       if (covered) {
-        return `\
-This element '${node}' is not visible because it has CSS property: 'position: fixed' and its being covered by another element:
-
-${covered}\
-`
+        return `This element \`${node}\` is not visible because it has CSS property: \`position: fixed\` and it's being covered by another element:\n\n\`${covered}\``
       }
 
-      return `This element '${node}' is not visible because its ancestor has 'position: fixed' CSS property and it is overflowed by other elements. How about scrolling to the element with cy.scrollIntoView()?`
+      return `This element \`${node}\` is not visible because its ancestor has \`position: fixed\` CSS property and it is overflowed by other elements. How about scrolling to the element with \`cy.scrollIntoView()\`?`
     }
   } else {
     if (elIsOutOfBoundsOfAncestorsOverflow($el)) {
-      return `This element '${node}' is not visible because its content is being clipped by one of its parent elements, which has a CSS property of overflow: 'hidden', 'scroll' or 'auto'`
+      return `This element \`${node}\` is not visible because its content is being clipped by one of its parent elements, which has a CSS property of overflow: \`hidden\`, \`scroll\` or \`auto\``
     }
   }
 
-  return `This element '${node}' is not visible.`
+  return `This element \`${node}\` is not visible.`
 }
 /* eslint-enable no-cond-assign */
 
diff --git a/packages/driver/test/cypress/fixtures/dom.html b/packages/driver/test/cypress/fixtures/dom.html
index 533cf1a78192..772c58e13eb0 100644
--- a/packages/driver/test/cypress/fixtures/dom.html
+++ b/packages/driver/test/cypress/fixtures/dom.html
@@ -31,7 +31,7 @@
           padding: 1px 6px;
 
         }
-      
+
 
         button,
         select { /* 1 */
@@ -51,7 +51,7 @@
           padding: 0;
           margin: 8px;
         }
-        
+
         :focus {
           background-color: red;
         }
@@ -101,12 +101,17 @@
           display: block
         }
 
+        #contenteditable {
+          min-height: 20px;
+          min-width: 200px;
+        }
+
         .content-box {
-          box-sizing: content-box
+          box-sizing: content-box;
         }
-        
+
         #button {
-          width: 60px
+          width: 60px;
         }
 
       </style>
@@ -583,7 +588,7 @@
 
         this is some text that will <span class="wrapped" style="color:rgb(0, 0, 192)">wrap to a newline</span>
         and cause the click to miss
-        
+
       </p>
       </div>
 
diff --git a/packages/driver/test/cypress/integration/commands/actions/check_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/check_spec.coffee
index e0f5ed522588..291a69f41072 100644
--- a/packages/driver/test/cypress/integration/commands/actions/check_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/check_spec.coffee
@@ -75,7 +75,7 @@ describe "src/cy/commands/actions/check", ->
         done("should not fire change event")
 
       cy.get(checkbox).check()
-    
+
     ## readonly should only be limited to inputs, not checkboxes
     it "can check readonly checkboxes", ->
       cy.get('#readonly-checkbox').check().then ($checkbox) ->
@@ -234,14 +234,15 @@ describe "src/cy/commands/actions/check", ->
 
         cy.on "fail", (err) ->
           expect(checked).to.eq 1
-          expect(err.message).to.include "cy.check() failed because this element"
+          expect(err.message).to.include "`cy.check()` failed because this element"
           done()
 
         cy.get(":checkbox:first").check().check()
 
       it "throws when subject isnt a checkbox or radio", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.check() can only be called on :checkbox and :radio. Your subject contains a: <form id=\"by-id\">...</form>"
+          expect(err.message).to.include "`cy.check()` can only be called on `:checkbox` and `:radio`. Your subject contains a: `<form id=\"by-id\">...</form>`"
+          expect(err.docsUrl).to.include("https://on.cypress.io/check")
           done()
 
         ## this will find multiple forms
@@ -249,7 +250,8 @@ describe "src/cy/commands/actions/check", ->
 
       it "throws when any member of the subject isnt a checkbox or radio", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.check() can only be called on :checkbox and :radio. Your subject contains a: <textarea id=\"comments\"></textarea>"
+          expect(err.message).to.include "`cy.check()` can only be called on `:checkbox` and `:radio`. Your subject contains a: `<textarea id=\"comments\"></textarea>`"
+          expect(err.docsUrl).to.include("https://on.cypress.io/check")
           done()
 
         ## find a textare which should blow up
@@ -264,7 +266,7 @@ describe "src/cy/commands/actions/check", ->
 
           expect(@logs.length).to.eq(chk.length + 1)
           expect(lastLog.get("error")).to.eq(err)
-          expect(err.message).to.include "cy.check() failed because this element is not visible"
+          expect(err.message).to.include "`cy.check()` failed because this element is not visible"
           done()
 
         cy.get(":checkbox:first").check()
@@ -275,7 +277,7 @@ describe "src/cy/commands/actions/check", ->
         cy.on "fail", (err) =>
           ## get + type logs
           expect(@logs.length).eq(2)
-          expect(err.message).to.include("cy.check() failed because this element is disabled:\n")
+          expect(err.message).to.include("`cy.check()` failed because this element is `disabled`:\n")
           done()
 
         cy.get(":checkbox:first").check()
@@ -289,7 +291,7 @@ describe "src/cy/commands/actions/check", ->
 
           expect(@logs.length).to.eq(chk.length + 1)
           expect(lastLog.get("error")).to.eq(err)
-          expect(err.message).to.include "cy.check() failed because this element is not visible"
+          expect(err.message).to.include "`cy.check()` failed because this element is not visible"
           done()
 
         cy.get(":checkbox").check()
@@ -302,7 +304,7 @@ describe "src/cy/commands/actions/check", ->
           expect(lastLog.get("error")).to.eq(err)
           done()
 
-        cy.check()
+        `cy.check()`
 
       it "throws when input cannot be clicked", (done) ->
         checkbox  = $("<input type='checkbox' />").attr("id", "checkbox-covered-in-span").prependTo($("body"))
@@ -310,7 +312,7 @@ describe "src/cy/commands/actions/check", ->
 
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(2)
-          expect(err.message).to.include "cy.check() failed because this element"
+          expect(err.message).to.include "`cy.check()` failed because this element"
           expect(err.message).to.include "is being covered by another element"
           done()
 
@@ -652,7 +654,8 @@ describe "src/cy/commands/actions/check", ->
         cy.get(":radio").uncheck()
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.uncheck() can only be called on :checkbox."
+          expect(err.message).to.include "`cy.uncheck()` can only be called on `:checkbox`."
+          expect(err.docsUrl).to.include("https://on.cypress.io/uncheck")
           done()
 
       it "throws if not a checkbox", (done) ->
@@ -670,7 +673,7 @@ describe "src/cy/commands/actions/check", ->
           len  = (chk.length * 2) + 6
           expect(@logs.length).to.eq(len)
           expect(lastLog.get("error")).to.eq(err)
-          expect(err.message).to.include "cy.uncheck() failed because this element is not visible"
+          expect(err.message).to.include "`cy.uncheck()` failed because this element is not visible"
           done()
 
         cy
@@ -685,7 +688,7 @@ describe "src/cy/commands/actions/check", ->
           expect(lastLog.get("error")).to.eq(err)
           done()
 
-        cy.uncheck()
+        `cy.uncheck()`
 
       it "throws when subject is not in the document", (done) ->
         unchecked = 0
@@ -698,7 +701,7 @@ describe "src/cy/commands/actions/check", ->
 
         cy.on "fail", (err) ->
           expect(unchecked).to.eq 1
-          expect(err.message).to.include "cy.uncheck() failed because this element"
+          expect(err.message).to.include "`cy.uncheck()` failed because this element"
           done()
 
         cy.get(":checkbox:first").uncheck().uncheck()
@@ -709,7 +712,7 @@ describe "src/cy/commands/actions/check", ->
 
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(2)
-          expect(err.message).to.include "cy.uncheck() failed because this element"
+          expect(err.message).to.include "`cy.uncheck()` failed because this element"
           expect(err.message).to.include "is being covered by another element"
           done()
 
@@ -721,7 +724,7 @@ describe "src/cy/commands/actions/check", ->
         cy.on "fail", (err) =>
           ## get + type logs
           expect(@logs.length).eq(2)
-          expect(err.message).to.include("cy.uncheck() failed because this element is disabled:\n")
+          expect(err.message).to.include("`cy.uncheck()` failed because this element is `disabled`:\n")
           done()
 
         cy.get(":checkbox:first").uncheck()
diff --git a/packages/driver/test/cypress/integration/commands/actions/clear_spec.js b/packages/driver/test/cypress/integration/commands/actions/clear_spec.js
index 74141880c528..684d6aceefa0 100644
--- a/packages/driver/test/cypress/integration/commands/actions/clear_spec.js
+++ b/packages/driver/test/cypress/integration/commands/actions/clear_spec.js
@@ -156,8 +156,6 @@ describe('src/cy/commands/actions/type - #clear', () => {
           this.lastLog = log
         }
       })
-
-      null
     })
 
     it('eventually passes the assertion', () => {
@@ -201,8 +199,6 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
         this.logs.push(log)
       })
-
-      null
     })
 
     it('throws when not a dom subject', (done) => {
@@ -224,7 +220,7 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
       cy.on('fail', (err) => {
         expect(cleared).to.be.calledOnce
-        expect(err.message).to.include('cy.clear() failed because this element')
+        expect(err.message).to.include('`cy.clear()` failed because this element')
 
         done()
       })
@@ -238,10 +234,11 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
         expect(this.logs.length).to.eq(3)
         expect(lastLog.get('error')).to.eq(err)
-        expect(err.message).to.include('cy.clear() failed because it requires a valid clearable element.')
+        expect(err.message).to.include('`cy.clear()` failed because it requires a valid clearable element.')
         expect(err.message).to.include('The element cleared was:')
-        expect(err.message).to.include('<form id="checkboxes">...</form>')
+        expect(err.message).to.include('`<form id="checkboxes">...</form>`')
         expect(err.message).to.include(`A clearable element matches one of the following selectors:`)
+        expect(err.docsUrl).to.equal('https://on.cypress.io/clear')
 
         done()
       })
@@ -251,10 +248,11 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
     it('throws if any subject isnt a :text', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('cy.clear() failed because it requires a valid clearable element.')
+        expect(err.message).to.include('`cy.clear()` failed because it requires a valid clearable element.')
         expect(err.message).to.include('The element cleared was:')
-        expect(err.message).to.include('<div id="dom">...</div>')
+        expect(err.message).to.include('`<div id="dom">...</div>`')
         expect(err.message).to.include(`A clearable element matches one of the following selectors:`)
+        expect(err.docsUrl).to.equal('https://on.cypress.io/clear')
 
         done()
       })
@@ -264,10 +262,11 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
     it('throws on an input radio', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('cy.clear() failed because it requires a valid clearable element.')
+        expect(err.message).to.include('`cy.clear()` failed because it requires a valid clearable element.')
         expect(err.message).to.include('The element cleared was:')
-        expect(err.message).to.include('<input type="radio" name="gender" value="male">')
+        expect(err.message).to.include('`<input type="radio" name="gender" value="male">`')
         expect(err.message).to.include(`A clearable element matches one of the following selectors:`)
+        expect(err.docsUrl).to.equal('https://on.cypress.io/clear')
         done()
       })
 
@@ -276,10 +275,11 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
     it('throws on an input checkbox', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('cy.clear() failed because it requires a valid clearable element.')
+        expect(err.message).to.include('`cy.clear()` failed because it requires a valid clearable element.')
         expect(err.message).to.include('The element cleared was:')
-        expect(err.message).to.include('<input type="checkbox" name="colors" value="blue">')
+        expect(err.message).to.include('`<input type="checkbox" name="colors" value="blue">`')
         expect(err.message).to.include(`A clearable element matches one of the following selectors:`)
+        expect(err.docsUrl).to.equal('https://on.cypress.io/clear')
 
         done()
       })
@@ -291,7 +291,7 @@ describe('src/cy/commands/actions/type - #clear', () => {
       cy.$$('input:text:first').show().hide()
 
       cy.on('fail', (err) => {
-        expect(err.message).to.include('cy.clear() failed because this element is not visible')
+        expect(err.message).to.include('`cy.clear()` failed because this element is not visible')
 
         done()
       })
@@ -305,7 +305,7 @@ describe('src/cy/commands/actions/type - #clear', () => {
       cy.on('fail', (err) => {
         // get + type logs
         expect(this.logs.length).eq(2)
-        expect(err.message).to.include('cy.clear() failed because this element is disabled:\n')
+        expect(err.message).to.include('`cy.clear()` failed because this element is `disabled`:\n')
 
         done()
       })
@@ -345,7 +345,7 @@ describe('src/cy/commands/actions/type - #clear', () => {
 
       cy.on('fail', (err) => {
         expect(this.logs.length).to.eq(2)
-        expect(err.message).to.include('cy.clear() failed because this element')
+        expect(err.message).to.include('`cy.clear()` failed because this element')
         expect(err.message).to.include('is being covered by another element')
 
         done()
diff --git a/packages/driver/test/cypress/integration/commands/actions/click_spec.js b/packages/driver/test/cypress/integration/commands/actions/click_spec.js
index bd90398306ed..4bf49661ada4 100644
--- a/packages/driver/test/cypress/integration/commands/actions/click_spec.js
+++ b/packages/driver/test/cypress/integration/commands/actions/click_spec.js
@@ -873,7 +873,7 @@ describe('src/cy/commands/actions/click', () => {
         const onError = cy.stub().callsFake((err) => {
           const { lastLog } = this
 
-          expect(err.message).to.contain(`has CSS 'pointer-events: none'`)
+          expect(err.message).to.contain('has CSS `pointer-events: none`')
           expect(err.message).to.not.contain('inherited from')
           const consoleProps = lastLog.invoke('consoleProps')
 
@@ -899,7 +899,7 @@ describe('src/cy/commands/actions/click', () => {
         const onError = cy.stub().callsFake((err) => {
           const { lastLog } = this
 
-          expect(err.message).to.contain(`has CSS 'pointer-events: none', inherited from this element:`)
+          expect(err.message).to.contain('has CSS `pointer-events: none`, inherited from this element:')
           expect(err.message).to.contain('<div id="ptrNone"')
           const consoleProps = lastLog.invoke('consoleProps')
 
@@ -951,7 +951,7 @@ describe('src/cy/commands/actions/click', () => {
         const onError = cy.stub().callsFake((err) => {
           const { lastLog } = this
 
-          expect(err.message).to.contain('has CSS \'pointer-events: none\'')
+          expect(err.message).to.contain('has CSS `pointer-events: none`')
           expect(err.message).to.not.contain('inherited from')
           const consoleProps = lastLog.invoke('consoleProps')
 
@@ -977,7 +977,7 @@ describe('src/cy/commands/actions/click', () => {
         const onError = cy.stub().callsFake((err) => {
           const { lastLog } = this
 
-          expect(err.message).to.contain('has CSS \'pointer-events: none\', inherited from this element:')
+          expect(err.message).to.contain('has CSS `pointer-events: none`, inherited from this element:')
           expect(err.message).to.contain('<div id="ptrNone"')
           const consoleProps = lastLog.invoke('consoleProps')
 
@@ -1884,8 +1884,8 @@ describe('src/cy/commands/actions/click', () => {
 
       it('throws when attempting to click multiple elements', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('cy.click() can only be called on a single element. Your subject contained 4 elements. Pass { multiple: true } if you want to serially click each element.')
-
+          expect(err.message).to.eq(`\`cy.click()\` can only be called on a single element. Your subject contained 4 elements. Pass \`{ multiple: true }\` if you want to serially click each element.`)
+          expect(err.docsUrl).to.eq('https://on.cypress.io/click')
           done()
         })
 
@@ -1904,7 +1904,7 @@ describe('src/cy/commands/actions/click', () => {
 
         cy.on('fail', (err) => {
           expect(clicked).to.eq(1)
-          expect(err.message).to.include('cy.click() failed because this element is detached from the DOM')
+          expect(err.message).to.include('`cy.click()` failed because this element is detached from the DOM')
 
           done()
         })
@@ -1914,7 +1914,7 @@ describe('src/cy/commands/actions/click', () => {
 
       it('throws when subject is detached during actionability', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('cy.click() failed because this element is detached from the DOM')
+          expect(err.message).to.include('`cy.click()` failed because this element is detached from the DOM')
 
           done()
         })
@@ -1958,7 +1958,7 @@ describe('src/cy/commands/actions/click', () => {
 
           expect(logsArr).to.have.length(4)
           expect(lastLog.get('error')).to.eq(err)
-          expect(err.message).to.include('cy.click() failed because this element is not visible')
+          expect(err.message).to.include('`cy.click()` failed because this element is not visible')
 
           done()
         })
@@ -1972,7 +1972,7 @@ describe('src/cy/commands/actions/click', () => {
         cy.on('fail', (err) => {
           // get + click logs
           expect(this.logs.length).eq(2)
-          expect(err.message).to.include('cy.click() failed because this element is disabled:\n')
+          expect(err.message).to.include('`cy.click()` failed because this element is `disabled`:\n')
 
           done()
         })
@@ -1997,8 +1997,9 @@ describe('src/cy/commands/actions/click', () => {
           expect(lastLog.get('snapshots')[0].name).to.eq('before')
           expect(lastLog.get('snapshots')[1]).to.be.an('object')
           expect(lastLog.get('snapshots')[1].name).to.eq('after')
-          expect(err.message).to.include('cy.click() failed because this element')
+          expect(err.message).to.include('`cy.click()` failed because this element')
           expect(err.message).to.include('is being covered by another element')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-cannot-be-interacted-with')
 
           const clickLog = this.logs[1]
 
@@ -2032,8 +2033,9 @@ describe('src/cy/commands/actions/click', () => {
           expect(lastLog.get('snapshots')[0].name).to.eq('before')
           expect(lastLog.get('snapshots')[1]).to.be.an('object')
           expect(lastLog.get('snapshots')[1].name).to.eq('after')
-          expect(err.message).to.include('cy.click() failed because this element')
+          expect(err.message).to.include('`cy.click()` failed because this element')
           expect(err.message).to.include('is being covered by another element')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-cannot-be-interacted-with')
 
           const console = lastLog.invoke('consoleProps')
 
@@ -2069,10 +2071,11 @@ describe('src/cy/commands/actions/click', () => {
           expect(lastLog.get('snapshots')[0].name).to.eq('before')
           expect(lastLog.get('snapshots')[1]).to.be.an('object')
           expect(lastLog.get('snapshots')[1].name).to.eq('after')
-          expect(err.message).to.include('cy.click() failed because this element is not visible:')
+          expect(err.message).to.include('`cy.click()` failed because this element is not visible:')
           expect(err.message).to.include('>button ...</button>')
-          expect(err.message).to.include(`'<button#button-covered-in-span>' is not visible because it has CSS property: 'position: fixed' and its being covered`)
+          expect(err.message).to.include('`<button#button-covered-in-span>` is not visible because it has CSS property: `position: fixed` and it\'s being covered')
           expect(err.message).to.include('>span on...</span>')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-cannot-be-interacted-with')
 
           const console = lastLog.invoke('consoleProps')
 
@@ -2093,8 +2096,9 @@ describe('src/cy/commands/actions/click', () => {
         cy.stub(Cypress.dom, 'getElementAtPointFromViewport').returns(null)
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('cy.click() failed because the center of this element is hidden from view:')
+          expect(err.message).to.include('`cy.click()` failed because the center of this element is hidden from view:')
           expect(err.message).to.include('<li>quux</li>')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-cannot-be-interacted-with')
 
           done()
         })
@@ -2105,7 +2109,8 @@ describe('src/cy/commands/actions/click', () => {
       it('throws when attempting to click a <select> element', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('cy.click() cannot be called on a <select> element. Use cy.select() command instead to change the value.')
+          expect(err.message).to.eq('`cy.click()` cannot be called on a `<select>` element. Use `cy.select()` command instead to change the value.')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/select')
 
           done()
         })
@@ -2116,7 +2121,7 @@ describe('src/cy/commands/actions/click', () => {
       it('throws when provided invalid position', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq(`Invalid position argument: 'foo'. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight.`)
+          expect(err.message).to.eq('Invalid position argument: `foo`. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight.')
 
           done()
         })
@@ -2136,7 +2141,8 @@ describe('src/cy/commands/actions/click', () => {
 
         cy.on('fail', (err) => {
           expect(clicks).to.eq(0)
-          expect(err.message).to.include('cy.click() could not be issued because this element is currently animating:\n')
+          expect(err.message).to.include('`cy.click()` could not be issued because this element is currently animating:\n')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-is-animating')
 
           done()
         })
@@ -3027,7 +3033,7 @@ describe('src/cy/commands/actions/click', () => {
 
         cy.on('fail', (err) => {
           expect(dblclicked).to.eq(1)
-          expect(err.message).to.include('cy.dblclick() failed because this element')
+          expect(err.message).to.include('`cy.dblclick()` failed because this element')
 
           done()
         })
@@ -3059,7 +3065,7 @@ describe('src/cy/commands/actions/click', () => {
 
           expect(logs).to.have.length(4)
           expect(lastLog.get('error')).to.eq(err)
-          expect(err.message).to.include('cy.dblclick() failed because this element is not visible')
+          expect(err.message).to.include('`cy.dblclick()` failed because this element is not visible')
 
           done()
         })
@@ -3465,7 +3471,7 @@ describe('src/cy/commands/actions/click', () => {
 
         cy.on('fail', (err) => {
           expect(rightclicked).to.eq(1)
-          expect(err.message).to.include('cy.rightclick() failed because this element')
+          expect(err.message).to.include('`cy.rightclick()` failed because this element')
 
           done()
         })
@@ -3495,7 +3501,7 @@ describe('src/cy/commands/actions/click', () => {
 
           expect(this.logs.length).to.eq(4)
           expect(lastLog.get('error')).to.eq(err)
-          expect(err.message).to.include('cy.rightclick() failed because this element is not visible')
+          expect(err.message).to.include('`cy.rightclick()` failed because this element is not visible')
 
           done()
         })
@@ -3763,7 +3769,6 @@ describe('mouse state', () => {
             bubbles: true,
             button: 0,
             buttons: 0,
-            cancelBubble: false,
             cancelable: true,
             composed: true,
             ctrlKey: false,
@@ -3788,6 +3793,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('mouseout', mouseout)
         }).as('mouseout')
         const mouseleave = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3821,6 +3828,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('mouseleave', mouseleave)
         }).as('mouseleave')
         const pointerout = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3854,6 +3863,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('pointerout', pointerout)
         }).as('pointerout')
         const pointerleave = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3887,6 +3898,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('pointerleave', pointerleave)
         }).as('pointerleave')
         const mouseover = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3920,6 +3933,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('mouseover', mouseover)
         }).as('mouseover')
         const mouseenter = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3953,6 +3968,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('mouseenter', mouseenter)
         }).as('mouseenter')
         const pointerover = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -3986,6 +4003,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('pointerover', pointerover)
         }).as('pointerover')
         const pointerenter = cy.stub().callsFake((e) => {
           expect(_.toPlainObject(e)).to.containSubset({
@@ -4019,6 +4038,8 @@ describe('mouse state', () => {
             view: cy.state('window'),
             // which: 0,
           })
+
+          e.target.removeEventListener('pointerenter', pointerenter)
         }).as('pointerenter')
 
         cy.get('div.item').eq(0)
diff --git a/packages/driver/test/cypress/integration/commands/actions/focus_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/focus_spec.coffee
index dcf6c0b1490b..a610803a3efd 100644
--- a/packages/driver/test/cypress/integration/commands/actions/focus_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/focus_spec.coffee
@@ -265,14 +265,15 @@ describe "src/cy/commands/actions/focus", ->
 
         cy.on "fail", (err) ->
           expect(focused).to.eq 1
-          expect(err.message).to.include "cy.focus() failed because this element"
+          expect(err.message).to.include "`cy.focus()` failed because this element"
           done()
 
         cy.get("input:first").focus().focus()
 
       it "throws when not a[href],link[href],button,input,select,textarea,[tabindex]", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.focus() can only be called on a valid focusable element. Your subject is a: <form id=\"by-id\">...</form>"
+          expect(err.message).to.include "`cy.focus()` can only be called on a valid focusable element. Your subject is a: `<form id=\"by-id\">...</form>`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/focus")
           done()
 
         cy.get("form").focus()
@@ -285,7 +286,8 @@ describe "src/cy/commands/actions/focus", ->
           .focus()
 
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.focus() can only be called on a single element. Your subject contained #{@num} elements."
+          expect(err.message).to.include "`cy.focus()` can only be called on a single element. Your subject contained #{@num} elements."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/focus")
           done()
 
       it "logs once when not dom subject", (done) ->
@@ -327,7 +329,7 @@ describe "src/cy/commands/actions/focus", ->
           $(@).remove()
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.blur() failed because this element"
+          expect(err.message).to.include "`cy.blur()` failed because this element"
           done()
 
         ## we remove the first element and then
@@ -604,7 +606,9 @@ describe "src/cy/commands/actions/focus", ->
         return null
 
       it "throws when not a dom subject", (done) ->
-        cy.on "fail", -> done()
+        cy.on "fail", (err) ->
+          expect(err.message).to.include "`cy.blur()` failed because it requires a DOM element"
+          done()
 
         cy.noop({}).blur()
 
@@ -620,7 +624,8 @@ describe "src/cy/commands/actions/focus", ->
 
         cy.on "fail", (err) ->
           expect(blurred).to.eq 1
-          expect(err.message).to.include "cy.blur() failed because this element"
+          expect(err.message).to.include "`cy.blur()` failed because this element"
+          expect(err.docsUrl).to.include "https://on.cypress.io/element-has-detached-from-dom"
           done()
 
         cy.get("input:first").focus().blur().focus().blur()
@@ -629,27 +634,28 @@ describe "src/cy/commands/actions/focus", ->
         num = cy.$$("textarea,:text").length
 
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.blur() can only be called on a single element. Your subject contained #{num} elements."
+          expect(err.message).to.include("`cy.blur()` can only be called on a single element. Your subject contained #{num} elements.")
+          expect(err.docsUrl).to.include("https://on.cypress.io/blur")
           done()
 
-        cy
-          .get("textarea,:text").blur()
+        cy.get("textarea,:text").blur()
 
       it "throws when there isnt an activeElement", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.blur() can only be called when there is a currently focused element."
+          expect(err.message).to.include "`cy.blur()` can only be called when there is a currently focused element."
+          expect(err.docsUrl).to.include("https://on.cypress.io/blur")
           done()
 
         cy.get("form:first").blur()
 
       it "throws when blur is called on a non-active element", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.blur() can only be called on the focused element. Currently the focused element is a: <input id=\"input\">"
+          expect(err.message).to.include "`cy.blur()` can only be called on the focused element. Currently the focused element is a: `<input id=\"input\">`"
+          expect(err.docsUrl).to.include("https://on.cypress.io/blur")
           done()
 
-        cy
-          .get("input:first").focus()
-          .get("#button").blur()
+        cy.get("input:first").focus()
+        cy.get("#button").blur()
 
       it "logs delta options on error", (done) ->
         cy.$$("button:first").click ->
diff --git a/packages/driver/test/cypress/integration/commands/actions/hover_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/hover_spec.coffee
index 2f4b06694f31..8347c33c2282 100644
--- a/packages/driver/test/cypress/integration/commands/actions/hover_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/hover_spec.coffee
@@ -16,8 +16,8 @@ describe "src/cy/commands/actions/hover", ->
   context "#hover", ->
     it "throws when invoking", (done) ->
       cy.on "fail", (err) ->
-        expect(err.message).to.include "cy.hover() is not currently implemented."
-        expect(err.message).to.include "https://on.cypress.io/hover"
+        expect(err.message).to.include "`cy.hover()` is not currently implemented."
+        expect(err.docsUrl).to.eq "https://on.cypress.io/hover"
         done()
 
       cy.get("button").hover()
diff --git a/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee
index a2048585eac4..8f845eba2078 100644
--- a/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/scroll_spec.coffee
@@ -330,7 +330,7 @@ describe "src/cy/commands/actions/scroll", ->
 
       it "throws when subject isn't scrollable", (done) ->
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.scrollTo() failed because this element is not scrollable:"
+          expect(err.message).to.include "`cy.scrollTo()` failed because this element is not scrollable:"
           done()
 
         cy.get("button:first").scrollTo("bottom")
@@ -338,16 +338,17 @@ describe "src/cy/commands/actions/scroll", ->
       context "subject errors", ->
         it "throws when not passed DOM element as subject", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() failed because it requires a DOM element."
+            expect(err.message).to.include "`cy.scrollTo()` failed because it requires a DOM element."
             expect(err.message).to.include "{foo: bar}"
-            expect(err.message).to.include "> cy.noop()"
+            expect(err.message).to.include "> `cy.noop()`"
             done()
 
           cy.noop({foo: "bar"}).scrollTo("250px")
 
         it "throws if scrollable container is multiple elements", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() can only be used to scroll one element, you tried to scroll 2 elements."
+            expect(err.message).to.include "`cy.scrollTo()` can only be used to scroll 1 element, you tried to scroll 2 elements."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.get("button").scrollTo("500px")
@@ -355,28 +356,31 @@ describe "src/cy/commands/actions/scroll", ->
       context "argument errors", ->
         it "throws if no args passed", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() must be called with a valid position. It can be a string, number or object."
+            expect(err.message).to.include "`cy.scrollTo()` must be called with a valid `position`. It can be a string, number or object."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.scrollTo()
 
         it "throws if NaN", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() must be called with a valid position. It can be a string, number or object. Your position was: 25, NaN"
+            expect(err.message).to.include "`cy.scrollTo()` must be called with a valid `position`. It can be a string, number or object. Your position was: `25, NaN`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.get("#scroll-to-both").scrollTo(25, 0/0)
 
         it "throws if Infinity", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() must be called with a valid position. It can be a string, number or object. Your position was: 25, Infinity"
+            expect(err.message).to.include "`cy.scrollTo()` must be called with a valid `position`. It can be a string, number or object. Your position was: `25, Infinity`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.get("#scroll-to-both").scrollTo(25, 10/0)
 
         it "throws if unrecognized position", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "Invalid position argument: \'botom\'. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight."
+            expect(err.message).to.include "Invalid position argument: `botom`. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight."
             done()
 
           cy.get("#scroll-to-both").scrollTo("botom")
@@ -384,14 +388,16 @@ describe "src/cy/commands/actions/scroll", ->
       context "option errors", ->
         it "throws if duration is not a number or valid string", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() must be called with a valid duration. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: foo"
+            expect(err.message).to.include "`cy.scrollTo()` must be called with a valid `duration`. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: `foo`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.get("#scroll-to-both").scrollTo("25px", { duration: "foo" })
 
         it "throws if unrecognized easing", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollTo() must be called with a valid easing. Your easing was: flower"
+            expect(err.message).to.include "`cy.scrollTo()` must be called with a valid `easing`. Your easing was: `flower`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollto")
             done()
 
           cy.get("#scroll-to-both").scrollTo("25px", { easing: "flower" })
@@ -630,34 +636,35 @@ describe "src/cy/commands/actions/scroll", ->
       context "subject errors", ->
         it "throws when not passed DOM element as subject", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() failed because it requires a DOM element."
+            expect(err.message).to.include "`cy.scrollIntoView()` failed because it requires a DOM element."
             expect(err.message).to.include "{foo: bar}"
-            expect(err.message).to.include "> cy.noop()"
+            expect(err.message).to.include "> `cy.noop()`"
             done()
 
           cy.noop({foo: "bar"}).scrollIntoView()
 
         it "throws when passed window object as subject", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() failed because it requires a DOM element."
+            expect(err.message).to.include "`cy.scrollIntoView()` failed because it requires a DOM element."
             expect(err.message).to.include "<window>"
-            expect(err.message).to.include "> cy.window()"
+            expect(err.message).to.include "> `cy.window()`"
             done()
 
           cy.window().scrollIntoView()
 
         it "throws when passed document object as subject", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() failed because it requires a DOM element."
+            expect(err.message).to.include "`cy.scrollIntoView()` failed because it requires a DOM element."
             expect(err.message).to.include "<document>"
-            expect(err.message).to.include "> cy.document()"
+            expect(err.message).to.include "> `cy.document()`"
             done()
 
           cy.document().scrollIntoView()
 
         it "throws if scrollable container is multiple elements", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() can only be used to scroll to 1 element, you tried to scroll to 2 elements."
+            expect(err.message).to.include "`cy.scrollIntoView()` can only be used to scroll to 1 element, you tried to scroll to 2 elements."
+            expect(err.docsUrl).to.include("https://on.cypress.io/scrollintoview")
             done()
 
           cy.get("button").scrollIntoView()
@@ -665,7 +672,8 @@ describe "src/cy/commands/actions/scroll", ->
       context "argument errors", ->
         it "throws if arg passed as non-object", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() can only be called with an options object. Your argument was: foo"
+            expect(err.message).to.include "`cy.scrollIntoView()` can only be called with an `options` object. Your argument was: `foo`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/scrollintoview")
             done()
 
           cy.get("#scroll-into-view-both h5").scrollIntoView("foo")
@@ -673,14 +681,16 @@ describe "src/cy/commands/actions/scroll", ->
       context "option errors", ->
         it "throws if duration is not a number or valid string", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() must be called with a valid duration. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: foo"
+            expect(err.message).to.include "`cy.scrollIntoView()` must be called with a valid `duration`. Duration may be either a number (ms) or a string representing a number (ms). Your duration was: `foo`"
+            expect(err.docsUrl).to.include("https://on.cypress.io/scrollintoview")
             done()
 
           cy.get("#scroll-into-view-both h5").scrollIntoView({ duration: "foo" })
 
         it "throws if unrecognized easing", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.include "cy.scrollIntoView() must be called with a valid easing. Your easing was: flower"
+            expect(err.message).to.include "`cy.scrollIntoView()` must be called with a valid `easing`. Your easing was: `flower`"
+            expect(err.docsUrl).to.include("https://on.cypress.io/scrollintoview")
             done()
 
           cy.get("#scroll-into-view-both h5").scrollIntoView({ easing: "flower" })
diff --git a/packages/driver/test/cypress/integration/commands/actions/select_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/select_spec.coffee
index dbfcadd7cae1..adf631e369ac 100644
--- a/packages/driver/test/cypress/integration/commands/actions/select_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/select_spec.coffee
@@ -220,7 +220,7 @@ describe "src/cy/commands/actions/select", ->
 
         cy.on "fail", (err) ->
           expect(selected).to.eq 1
-          expect(err.message).to.include "cy.select() failed because this element"
+          expect(err.message).to.include "`cy.select()` failed because this element"
           done()
 
         cy.get("#select-maps").select("de_dust2").select("de_aztec")
@@ -229,30 +229,32 @@ describe "src/cy/commands/actions/select", ->
         num = cy.$$("select").length
 
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.select() can only be called on a single <select>. Your subject contained #{num} elements."
+          expect(err.message).to.include "`cy.select()` can only be called on a single `<select>`. Your subject contained #{num} elements."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
-        cy
-          .get("select")
-          .select("foo")
+        cy.get("select").select("foo")
 
       it "throws on anything other than a select", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.select() can only be called on a <select>. Your subject is a: <input id=\"input\">"
+          expect(err.message).to.include "`cy.select()` can only be called on a `<select>`. Your subject is a: `<input id=\"input\">`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("input:first").select("foo")
 
       it "throws when finding duplicate values", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.select() matched more than one option by value or text: bm"
+          expect(err.message).to.include "`cy.select()` matched more than one `option` by value or text: `bm`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("select[name=names]").select("bm")
 
       it "throws when passing an array to a non multiple select", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.select() was called with an array of arguments but does not have a 'multiple' attribute set."
+          expect(err.message).to.include "`cy.select()` was called with an array of arguments but does not have a `multiple` attribute set."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("select[name=names]").select(["bm", "ss"])
@@ -261,28 +263,31 @@ describe "src/cy/commands/actions/select", ->
         select = cy.$$("#select-maps").show().hide()
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.select() failed because this element is not visible"
+          expect(err.message).to.include "`cy.select()` failed because this element is not visible"
           done()
 
         cy.get("#select-maps").select("de_dust2")
 
       it "throws when value or text does not exist", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.select() failed because it could not find a single <option> with value or text matching: 'foo'")
+          expect(err.message).to.include("`cy.select()` failed because it could not find a single `<option>` with value or text matching: `foo`")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("select[name=foods]").select("foo")
 
       it "throws when the <select> itself is disabled", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.select() failed because this element is currently disabled:")
+          expect(err.message).to.include("`cy.select()` failed because this element is currently disabled:")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("select[name=disabled]").select("foo")
 
       it "throws when options are disabled", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.select() failed because this <option> you are trying to select is currently disabled:")
+          expect(err.message).to.include("`cy.select()` failed because this `<option>` you are trying to select is currently disabled:")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/select")
           done()
 
         cy.get("select[name=opt-disabled]").select("bar")
diff --git a/packages/driver/test/cypress/integration/commands/actions/submit_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/submit_spec.coffee
index 88631428d514..dae8cd00a64c 100644
--- a/packages/driver/test/cypress/integration/commands/actions/submit_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/submit_spec.coffee
@@ -189,7 +189,8 @@ describe "src/cy/commands/actions/submit", ->
 
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
-          expect(err.message).to.include "cy.submit() can only be called on a <form>. Your subject contains a: <input id=\"input\">"
+          expect(err.message).to.include "`cy.submit()` can only be called on a `<form>`. Your subject contains a: `<input id=\"input\">`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/submit")
           done()
 
         cy.get("input").submit()
@@ -204,7 +205,7 @@ describe "src/cy/commands/actions/submit", ->
 
         cy.on "fail", (err) ->
           expect(submitted).to.eq 1
-          expect(err.message).to.include "cy.submit() failed because this element"
+          expect(err.message).to.include "`cy.submit()` failed because this element"
           done()
 
         cy.get("form:first").submit().submit()
@@ -216,7 +217,8 @@ describe "src/cy/commands/actions/submit", ->
         expect(forms.length).to.be.gt(1)
 
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.submit() can only be called on a single form. Your subject contained #{forms.length} form elements."
+          expect(err.message).to.include "`cy.submit()` can only be called on a single `form`. Your subject contained #{forms.length} `form` elements."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/submit")
           done()
 
         cy.get("form").submit()
diff --git a/packages/driver/test/cypress/integration/commands/actions/trigger_spec.coffee b/packages/driver/test/cypress/integration/commands/actions/trigger_spec.coffee
index 0de9f53474a3..be7b76932c5c 100644
--- a/packages/driver/test/cypress/integration/commands/actions/trigger_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/actions/trigger_spec.coffee
@@ -113,7 +113,7 @@ describe "src/cy/commands/actions/trigger", ->
       cy.get("#scrolledBtn").trigger("mouseover")
 
     ## NOTE: flaky about 50% of the time in Firefox...
-    ## temporarily skipping for now, but this needs 
+    ## temporarily skipping for now, but this needs
     ## to be reenabled after launch once we have time
     ## to look at the underlying failure cause
     it.skip "records correct pageX and pageY el scrolled", (done) ->
@@ -629,10 +629,11 @@ describe "src/cy/commands/actions/trigger", ->
 
       it "throws when eventName is not a string", ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "cy.trigger() can only be called on a single element. Your subject contained 15 elements."
+          expect(err.message).to.eq "`cy.trigger()` can only be called on a single element. Your subject contained 15 elements."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/trigger")
           done()
 
-        cy.get("button:first").trigger("cy.trigger() must be passed a non-empty string as its 1st argument. You passed: 'undefined'.")
+        cy.get("button:first").trigger("`cy.trigger()` must be passed a non-empty string as its 1st argument. You passed: 'undefined'.")
 
       it "throws when not a dom subject", (done) ->
         cy.on "fail", -> done()
@@ -643,7 +644,8 @@ describe "src/cy/commands/actions/trigger", ->
         num = cy.$$("button").length
 
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "cy.trigger() can only be called on a single element. Your subject contained #{num} elements."
+          expect(err.message).to.eq "`cy.trigger()` can only be called on a single element. Your subject contained #{num} elements."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/trigger")
           done()
 
         cy.get("button").trigger("mouseover")
@@ -658,7 +660,7 @@ describe "src/cy/commands/actions/trigger", ->
 
         cy.on "fail", (err) ->
           expect(mouseover).to.eq 1
-          expect(err.message).to.include "cy.trigger() failed because this element"
+          expect(err.message).to.include "`cy.trigger()` failed because this element"
           done()
 
         cy.get(":checkbox:first").trigger("mouseover").trigger("mouseover")
@@ -681,7 +683,7 @@ describe "src/cy/commands/actions/trigger", ->
 
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
-          expect(err.message).to.include "cy.trigger() failed because this element is not visible"
+          expect(err.message).to.include "`cy.trigger()` failed because this element is not visible"
           done()
 
         cy.get("button:first").trigger("mouseover")
@@ -692,7 +694,7 @@ describe "src/cy/commands/actions/trigger", ->
         cy.on "fail", (err) =>
           ## get + click logs
           expect(@logs.length).eq(2)
-          expect(err.message).to.include("cy.trigger() failed because this element is disabled:\n")
+          expect(err.message).to.include("`cy.trigger()` failed because this element is `disabled`:\n")
           done()
 
         cy.get("#button").trigger("mouseover")
@@ -700,7 +702,7 @@ describe "src/cy/commands/actions/trigger", ->
       it "throws when provided invalid position", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(2)
-          expect(err.message).to.eq "Invalid position argument: 'foo'. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight."
+          expect(err.message).to.eq "Invalid position argument: `foo`. Position may only be topLeft, top, topRight, left, center, right, bottomLeft, bottom, bottomRight."
           done()
 
         cy.get("button:first").trigger("mouseover", "foo")
@@ -716,7 +718,8 @@ describe "src/cy/commands/actions/trigger", ->
 
         cy.on "fail", (err) ->
           expect(clicks).to.eq(0)
-          expect(err.message).to.include("cy.trigger() could not be issued because this element is currently animating:\n")
+          expect(err.message).to.include("`cy.trigger()` could not be issued because this element is currently animating:\n")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/element-is-animating")
           done()
 
         cy.get("button:first").trigger("tap")
diff --git a/packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js b/packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js
index 0b8d2c38003d..32309f0dbf3a 100644
--- a/packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js
+++ b/packages/driver/test/cypress/integration/commands/actions/type_errors_spec.js
@@ -40,7 +40,7 @@ describe('src/cy/commands/actions/type - #type errors', () => {
 
       cy.on('fail', (err) => {
         expect(typed).to.be.calledOnce
-        expect(err.message).to.include('cy.type() failed because this element')
+        expect(err.message).to.include('`cy.type()` failed because this element')
 
         done()
       })
@@ -58,10 +58,10 @@ describe('src/cy/commands/actions/type - #type errors', () => {
         cy.get(`#${attrs.id}`).type('foo')
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('cy.type() failed because this element is readonly:')
-          expect(err.message).to.include(`<input id="${attrs.id}" readonly="${attrs.val}">`)
-          expect(err.message).to.include('Fix this problem, or use {force: true} to disable error checking.')
-
+          expect(err.message).to.include('`cy.type()` failed because this element is readonly:')
+          expect(err.message).to.include(`\`<input id="${attrs.id}" readonly="${attrs.val}">\``)
+          expect(err.message).to.include('Fix this problem, or use `{force: true}` to disable error checking.')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/element-cannot-be-interacted-with')
           done()
         })
       })
@@ -72,10 +72,11 @@ describe('src/cy/commands/actions/type - #type errors', () => {
       cy.get('div#nested-find').type('foo')
 
       cy.on('fail', (err) => {
-        expect(err.message).to.include('cy.type() failed because it requires a valid typeable element.')
+        expect(err.message).to.include('`cy.type()` failed because it requires a valid typeable element.')
         expect(err.message).to.include('The element typed into was:')
         expect(err.message).to.include('<div id="nested-find">Nested ...</div>')
         expect(err.message).to.include(`A typeable element matches one of the following selectors:`)
+        expect(err.docsUrl).to.eq('https://on.cypress.io/type')
         done()
       })
     })
@@ -88,8 +89,8 @@ describe('src/cy/commands/actions/type - #type errors', () => {
       }).type('foo')
 
       cy.on('fail', (err) => {
-        expect(err.message).to.include(`cy.type() can only be called on a single element. Your subject contained ${this.num} elements.`)
-
+        expect(err.message).to.include(`\`cy.type()\` can only be called on a single element. Your subject contained ${this.num} elements.`)
+        expect(err.docsUrl).to.include('https://on.cypress.io/type')
         done()
       })
     })
@@ -102,7 +103,7 @@ describe('src/cy/commands/actions/type - #type errors', () => {
 
         expect(this.logs.length).to.eq(2)
         expect(lastLog.get('error')).to.eq(err)
-        expect(err.message).to.include('cy.type() failed because this element is not visible')
+        expect(err.message).to.include('`cy.type()` failed because this element is not visible')
 
         done()
       })
@@ -116,7 +117,7 @@ describe('src/cy/commands/actions/type - #type errors', () => {
       cy.on('fail', (err) => {
         // get + type logs
         expect(this.logs.length).eq(2)
-        expect(err.message).to.include('cy.type() failed because this element is disabled:\n')
+        expect(err.message).to.include('`cy.type()` failed because this element is `disabled`:\n')
 
         done()
       })
@@ -157,7 +158,7 @@ describe('src/cy/commands/actions/type - #type errors', () => {
 
       cy.on('fail', (err) => {
         expect(this.logs.length).to.eq(2)
-        expect(err.message).to.include('cy.type() failed because this element')
+        expect(err.message).to.include('`cy.type()` failed because this element')
         expect(err.message).to.include('is being covered by another element')
 
         done()
@@ -172,11 +173,11 @@ describe('src/cy/commands/actions/type - #type errors', () => {
 
         const allChars = _.keys(Cypress.Keyboard.getKeymap()).join(', ')
 
-        expect(err.message).to.eq(`Special character sequence: '{bar}' is not recognized. Available sequences are: ${allChars}
+        expect(err.message).to.eq(`Special character sequence: \`{bar}\` is not recognized. Available sequences are: \`${allChars}\`
 
-If you want to skip parsing special character sequences and type the text exactly as written, pass the option: {parseSpecialCharSequences: false}
+If you want to skip parsing special character sequences and type the text exactly as written, pass the option: \`{ parseSpecialCharSequences: false }\``)
 
-https://on.cypress.io/type`)
+        expect(err.docsUrl).to.eq('https://on.cypress.io/type')
 
         done()
       })
@@ -184,10 +185,11 @@ https://on.cypress.io/type`)
       cy.get(':text:first').type('foo{bar}')
     })
 
-    it('throws when attemping to type tab', function (done) {
+    it('throws when attempting to type tab', function (done) {
       cy.on('fail', (err) => {
         expect(this.logs.length).to.eq(2)
-        expect(err.message).to.eq('{tab} isn\'t a supported character sequence. You\'ll want to use the command cy.tab(), which is not ready yet, but when it is done that\'s what you\'ll use.')
+        expect(err.message).to.eq('`{tab}` isn\'t a supported character sequence.')
+
         done()
       })
 
@@ -197,7 +199,8 @@ https://on.cypress.io/type`)
     it('throws on an empty string', function (done) {
       cy.on('fail', (err) => {
         expect(this.logs.length).to.eq(2)
-        expect(err.message).to.eq('cy.type() cannot accept an empty String. You need to actually type something.')
+        expect(err.message).to.eq('`cy.type()` cannot accept an empty string. You need to actually type something.')
+        expect(err.docsUrl).to.eq('https://on.cypress.io/type')
         done()
       })
 
@@ -261,7 +264,8 @@ https://on.cypress.io/type`)
 
           cy.on('fail', (err) => {
             expect(this.logs.length).to.eq(2)
-            expect(err.message).to.eq(`cy.type() can only accept a String or Number. You passed in: '${val}'`)
+            expect(err.message).to.eq(`\`cy.type()\` can only accept a string or number. You passed in: \`${val}\``)
+            expect(err.docsUrl).to.eq('https://on.cypress.io/type')
             done()
           })
 
@@ -282,7 +286,8 @@ https://on.cypress.io/type`)
 
       cy.on('fail', (err) => {
         expect(keydown).not.to.be.called
-        expect(err.message).to.include('cy.type() could not be issued because this element is currently animating:\n')
+        expect(err.message).to.include('`cy.type()` could not be issued because this element is currently animating:\n')
+        expect(err.docsUrl).to.eq('https://on.cypress.io/element-is-animating')
 
         done()
       })
@@ -320,8 +325,8 @@ https://on.cypress.io/type`)
       it('throws when chars is not a string', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a date input with cy.type() requires a valid date with the format \'yyyy-MM-dd\'. You passed: 1989')
-
+          expect(err.message).to.eq('Typing into a `date` input with `cy.type()` requires a valid date with the format `yyyy-MM-dd`. You passed: `1989`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -331,8 +336,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a date input with cy.type() requires a valid date with the format \'yyyy-MM-dd\'. You passed: 01-01-1989')
-
+          expect(err.message).to.eq('Typing into a `date` input with `cy.type()` requires a valid date with the format `yyyy-MM-dd`. You passed: `01-01-1989`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -342,8 +347,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid date', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a date input with cy.type() requires a valid date with the format \'yyyy-MM-dd\'. You passed: 1989-04-31')
-
+          expect(err.message).to.eq('Typing into a `date` input with `cy.type()` requires a valid date with the format `yyyy-MM-dd`. You passed: `1989-04-31`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -355,8 +360,8 @@ https://on.cypress.io/type`)
       it('throws when chars is not a string', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a month input with cy.type() requires a valid month with the format \'yyyy-MM\'. You passed: 6')
-
+          expect(err.message).to.eq('Typing into a `month` input with `cy.type()` requires a valid month with the format `yyyy-MM`. You passed: `6`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -366,8 +371,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a month input with cy.type() requires a valid month with the format \'yyyy-MM\'. You passed: 01/2000')
-
+          expect(err.message).to.eq('Typing into a `month` input with `cy.type()` requires a valid month with the format `yyyy-MM`. You passed: `01/2000`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -377,8 +382,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid month', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a month input with cy.type() requires a valid month with the format \'yyyy-MM\'. You passed: 1989-13')
-
+          expect(err.message).to.eq('Typing into a `month` input with `cy.type()` requires a valid month with the format `yyyy-MM`. You passed: `1989-13`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -404,8 +409,8 @@ https://on.cypress.io/type`)
       it('throws when chars is not a string', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a week input with cy.type() requires a valid week with the format \'yyyy-Www\', where W is the literal character \'W\' and ww is the week number (00-53). You passed: 23')
-
+          expect(err.message).to.eq('Typing into a `week` input with `cy.type()` requires a valid week with the format `yyyy-Www`, where `W` is the literal character `W` and `ww` is the week number (00-53). You passed: `23`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -415,8 +420,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a week input with cy.type() requires a valid week with the format \'yyyy-Www\', where W is the literal character \'W\' and ww is the week number (00-53). You passed: 2005/W18')
-
+          expect(err.message).to.eq('Typing into a `week` input with `cy.type()` requires a valid week with the format `yyyy-Www`, where `W` is the literal character `W` and `ww` is the week number (00-53). You passed: `2005/W18`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -426,8 +431,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid week', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('Typing into a week input with cy.type() requires a valid week with the format \'yyyy-Www\', where W is the literal character \'W\' and ww is the week number (00-53). You passed: 1995-W60')
-
+          expect(err.message).to.eq('Typing into a `week` input with `cy.type()` requires a valid week with the format `yyyy-Www`, where `W` is the literal character `W` and `ww` is the week number (00-53). You passed: `1995-W60`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -439,8 +444,8 @@ https://on.cypress.io/type`)
       it('throws when chars is not a string', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.equal(2)
-          expect(err.message).to.equal('Typing into a time input with cy.type() requires a valid time with the format \'HH:mm\', \'HH:mm:ss\' or \'HH:mm:ss.SSS\', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: 9999')
-
+          expect(err.message).to.equal('Typing into a `time` input with `cy.type()` requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `9999`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -450,8 +455,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format (1:30)', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.equal(2)
-          expect(err.message).to.equal('Typing into a time input with cy.type() requires a valid time with the format \'HH:mm\', \'HH:mm:ss\' or \'HH:mm:ss.SSS\', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: 1:30')
-
+          expect(err.message).to.equal('Typing into a `time` input with `cy.type()` requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `1:30`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -461,8 +466,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format (01:30pm)', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.equal(2)
-          expect(err.message).to.equal('Typing into a time input with cy.type() requires a valid time with the format \'HH:mm\', \'HH:mm:ss\' or \'HH:mm:ss.SSS\', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: 01:30pm')
-
+          expect(err.message).to.equal('Typing into a `time` input with `cy.type()` requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `01:30pm`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -472,8 +477,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid format (01:30:30.3333)', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.equal(2)
-          expect(err.message).to.equal('Typing into a time input with cy.type() requires a valid time with the format \'HH:mm\', \'HH:mm:ss\' or \'HH:mm:ss.SSS\', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: 01:30:30.3333')
-
+          expect(err.message).to.equal('Typing into a `time` input with `cy.type()` requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `01:30:30.3333`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
@@ -483,8 +488,8 @@ https://on.cypress.io/type`)
       it('throws when chars is invalid time', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.equal(2)
-          expect(err.message).to.equal('Typing into a time input with cy.type() requires a valid time with the format \'HH:mm\', \'HH:mm:ss\' or \'HH:mm:ss.SSS\', where HH is 00-23, mm is 00-59, ss is 00-59, and SSS is 000-999. You passed: 01:60')
-
+          expect(err.message).to.equal('Typing into a `time` input with `cy.type()` requires a valid time with the format `HH:mm`, `HH:mm:ss` or `HH:mm:ss.SSS`, where `HH` is 00-23, `mm` is 00-59, `ss` is 00-59, and `SSS` is 000-999. You passed: `01:60`')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/type')
           done()
         })
 
diff --git a/packages/driver/test/cypress/integration/commands/agents_spec.coffee b/packages/driver/test/cypress/integration/commands/agents_spec.coffee
index c1f3a0c102fa..e489cac422dd 100644
--- a/packages/driver/test/cypress/integration/commands/agents_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/agents_spec.coffee
@@ -252,14 +252,14 @@ describe "src/cy/commands/agents", ->
         describe "errors", ->
           _.each [null, undefined, {}, [], 123], (value) =>
             it "throws when passed: #{value}", ->
-              expect(=> cy.stub().as(value)).to.throw("cy.as() can only accept a string.")
+              expect(=> cy.stub().as(value)).to.throw("`cy.as()` can only accept a string.")
 
           it "throws on blank string", ->
-            expect(=> cy.stub().as("")).to.throw("cy.as() cannot be passed an empty string.")
+            expect(=> cy.stub().as("")).to.throw("`cy.as()` cannot be passed an empty string.")
 
           _.each ["test", "runnable", "timeout", "slow", "skip", "inspect"], (blacklist) ->
             it "throws on a blacklisted word: #{blacklist}", ->
-              expect(=> cy.stub().as(blacklist)).to.throw("cy.as() cannot be aliased as: '#{blacklist}'. This word is reserved.")
+              expect(=> cy.stub().as(blacklist)).to.throw("`cy.as()` cannot be aliased as: `#{blacklist}`. This word is reserved.")
 
       context "with dots", ->
         beforeEach ->
@@ -307,14 +307,14 @@ describe "src/cy/commands/agents", ->
         describe "errors", ->
           _.each [null, undefined, {}, [], 123], (value) =>
             it "throws when passed: #{value}", ->
-              expect(=> cy.stub().as(value)).to.throw("cy.as() can only accept a string.")
+              expect(=> cy.stub().as(value)).to.throw("`cy.as()` can only accept a string.")
 
           it "throws on blank string", ->
-            expect(=> cy.stub().as("")).to.throw("cy.as() cannot be passed an empty string.")
+            expect(=> cy.stub().as("")).to.throw("`cy.as()` cannot be passed an empty string.")
 
           _.each ["test", "runnable", "timeout", "slow", "skip", "inspect"], (blacklist) ->
             it "throws on a blacklisted word: #{blacklist}", ->
-              expect(=> cy.stub().as(blacklist)).to.throw("cy.as() cannot be aliased as: '#{blacklist}'. This word is reserved.")
+              expect(=> cy.stub().as(blacklist)).to.throw("`cy.as()` cannot be aliased as: `#{blacklist}`. This word is reserved.")
 
     describe "logging", ->
       beforeEach ->
@@ -528,7 +528,7 @@ describe "src/cy/commands/agents", ->
       @agents = cy.agents()
 
     it "logs deprecation warning", ->
-      expect(top.console.warn).to.be.calledWith("Cypress Warning: cy.agents() is deprecated. Use cy.stub() and cy.spy() instead.")
+      expect(top.console.warn).to.be.calledWith("Cypress Warning: `cy.agents()` is deprecated. Use `cy.stub()` and `cy.spy()` instead.")
 
     it "synchronously returns #spy and #stub methods", ->
       expect(@agents.spy).to.be.a("function")
diff --git a/packages/driver/test/cypress/integration/commands/aliasing_spec.coffee b/packages/driver/test/cypress/integration/commands/aliasing_spec.coffee
index 024dab7490d9..765142086909 100644
--- a/packages/driver/test/cypress/integration/commands/aliasing_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/aliasing_spec.coffee
@@ -123,7 +123,7 @@ describe "src/cy/commands/aliasing", ->
       it "throws as a parent command", (done) ->
         cy.on "fail", (err) ->
           expect(err.message).to.include("before running a parent command")
-          expect(err.message).to.include("cy.as(\"foo\")")
+          expect(err.message).to.include("`cy.as(\"foo\")`")
           done()
 
         cy.as("foo")
@@ -131,28 +131,32 @@ describe "src/cy/commands/aliasing", ->
       _.each [null, undefined, {}, [], 123], (value) =>
         it "throws if when passed: #{value}", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "cy.as() can only accept a string."
+            expect(err.message).to.eq "`cy.as()` can only accept a string."
+            expect(err.docsUrl).to.eq "https://on.cypress.io/as"
             done()
 
           cy.get("div:first").as(value)
 
       it "throws on blank string", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "cy.as() cannot be passed an empty string."
+          expect(err.message).to.eq "`cy.as()` cannot be passed an empty string."
+          expect(err.docsUrl).to.eq "https://on.cypress.io/as"
           done()
 
         cy.get("div:first").as("")
 
       it "throws on alias starting with @ char", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "'@myAlias' cannot be named starting with the '@' symbol. Try renaming the alias to 'myAlias', or something else that does not start with the '@' symbol."
+          expect(err.message).to.eq "`@myAlias` cannot be named starting with the `@` symbol. Try renaming the alias to `myAlias`, or something else that does not start with the `@` symbol."
+          expect(err.docsUrl).to.eq "https://on.cypress.io/as"
           done()
 
         cy.get("div:first").as("@myAlias")
 
       it "throws on alias starting with @ char and dots", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "'@my.alias' cannot be named starting with the '@' symbol. Try renaming the alias to 'my.alias', or something else that does not start with the '@' symbol."
+          expect(err.message).to.eq "`@my.alias` cannot be named starting with the `@` symbol. Try renaming the alias to `my.alias`, or something else that does not start with the `@` symbol."
+          expect(err.docsUrl).to.eq "https://on.cypress.io/as"
           done()
 
         cy.get("div:first").as("@my.alias")
@@ -164,7 +168,8 @@ describe "src/cy/commands/aliasing", ->
       _.each ["test", "runnable", "timeout", "slow", "skip", "inspect"], (blacklist) ->
         it "throws on a blacklisted word: #{blacklist}", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "cy.as() cannot be aliased as: '#{blacklist}'. This word is reserved."
+            expect(err.message).to.eq "`cy.as()` cannot be aliased as: `#{blacklist}`. This word is reserved."
+            expect(err.docsUrl).to.eq "https://on.cypress.io/as"
             done()
 
           cy.get("div:first").as(blacklist)
@@ -363,7 +368,7 @@ describe "src/cy/commands/aliasing", ->
     describe "errors", ->
       it "throws when an alias cannot be found", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.get() could not find a registered alias for: '@lastDiv'.\nAvailable aliases are: 'b, firstInput'."
+          expect(err.message).to.include "`cy.get()` could not find a registered alias for: `@lastDiv`.\nAvailable aliases are: `b, firstInput`."
           done()
 
         cy
@@ -373,7 +378,7 @@ describe "src/cy/commands/aliasing", ->
 
       it "throws when alias is missing '@' but matches an available alias", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "Invalid alias: 'getAny'.\nYou forgot the '@'. It should be written as: '@getAny'."
+          expect(err.message).to.eq "Invalid alias: `getAny`.\nYou forgot the `@`. It should be written as: `@getAny`."
           done()
 
         cy
diff --git a/packages/driver/test/cypress/integration/commands/angular_spec.coffee b/packages/driver/test/cypress/integration/commands/angular_spec.coffee
index badcada1b88d..a5572910fe4c 100644
--- a/packages/driver/test/cypress/integration/commands/angular_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/angular_spec.coffee
@@ -28,7 +28,7 @@ describe "src/cy/commands/angular", ->
           delete cy.state("window").angular
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "Angular global (window.angular) was not found in your window. You cannot use cy.ng() methods without angular."
+            expect(err.message).to.include "Angular global (`window.angular`) was not found in your window. You cannot use `cy.ng()` methods without angular."
             done()
 
           cy.ng("binding", "phone")
@@ -134,7 +134,7 @@ describe "src/cy/commands/angular", ->
           delete cy.state("window").angular
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "Angular global (window.angular) was not found in your window. You cannot use cy.ng() methods without angular."
+            expect(err.message).to.include "Angular global (`window.angular`) was not found in your window. You cannot use `cy.ng()` methods without angular."
             done()
 
           cy.ng("repeater", "phone in phones")
@@ -248,7 +248,7 @@ describe "src/cy/commands/angular", ->
           delete cy.state("window").angular
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "Angular global (window.angular) was not found in your window. You cannot use cy.ng() methods without angular."
+            expect(err.message).to.include "Angular global (`window.angular`) was not found in your window. You cannot use `cy.ng()` methods without angular."
             done()
 
           cy.ng("model", "query")
diff --git a/packages/driver/test/cypress/integration/commands/assertions_spec.js b/packages/driver/test/cypress/integration/commands/assertions_spec.js
index 0cd8d4621ea3..1b6ab8437844 100644
--- a/packages/driver/test/cypress/integration/commands/assertions_spec.js
+++ b/packages/driver/test/cypress/integration/commands/assertions_spec.js
@@ -310,7 +310,7 @@ describe('src/cy/commands/assertions', () => {
 
       it('throws when should(\'have.length\') isnt a number', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('You must provide a valid number to a length assertion. You passed: \'asdf\'')
+          expect(err.message).to.eq('You must provide a valid number to a `length` assertion. You passed: `asdf`')
 
           done()
         })
@@ -425,7 +425,7 @@ describe('src/cy/commands/assertions', () => {
 
       it('throws err when not available chainable', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('The chainer: \'dee\' was not found. Could not build assertion.')
+          expect(err.message).to.eq('The chainer `dee` was not found. Could not build assertion.')
 
           done()
         })
@@ -435,7 +435,7 @@ describe('src/cy/commands/assertions', () => {
 
       it('throws err when ends with a non available chainable', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('The chainer: \'eq2\' was not found. Could not build assertion.')
+          expect(err.message).to.eq('The chainer `eq2` was not found. Could not build assertion.')
 
           done()
         })
@@ -483,7 +483,7 @@ describe('src/cy/commands/assertions', () => {
           // when we check for the element to be detached
           // it never actually runs the assertion
           expect(names).to.deep.eq(['get', 'click'])
-          expect(err.message).to.include('cy.should() failed because this element is detached')
+          expect(err.message).to.include('`cy.should()` failed because this element is detached')
 
           done()
         })
@@ -507,7 +507,7 @@ describe('src/cy/commands/assertions', () => {
 
           // should is present here due to the retry
           expect(names).to.deep.eq(['get', 'click', 'assert'])
-          expect(err.message).to.include('cy.should() failed because this element is detached')
+          expect(err.message).to.include('`cy.should()` failed because this element is detached')
 
           done()
         })
@@ -524,7 +524,7 @@ describe('src/cy/commands/assertions', () => {
           const { lastLog } = this
 
           expect(this.logs.length).to.eq(3)
-          expect(err.message).to.eq('You must provide a valid number to a length assertion. You passed: \'foo\'')
+          expect(err.message).to.eq('You must provide a valid number to a `length` assertion. You passed: `foo`')
           expect(lastLog.get('name')).to.eq('should')
           expect(lastLog.get('error')).to.eq(err)
           expect(lastLog.get('state')).to.eq('failed')
@@ -543,7 +543,7 @@ describe('src/cy/commands/assertions', () => {
           const { lastLog } = this
 
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('The \'eventually\' assertion chainer has been deprecated. This is now the default behavior so you can safely remove this word and everything should work as before.')
+          expect(err.message).to.eq('The `eventually` assertion chainer has been deprecated. This is now the default behavior so you can safely remove this word and everything should work as before.')
           expect(lastLog.get('name')).to.eq('should')
           expect(lastLog.get('error')).to.eq(err)
           expect(lastLog.get('state')).to.eq('failed')
@@ -580,7 +580,7 @@ describe('src/cy/commands/assertions', () => {
           const { lastLog } = this
 
           expect(this.logs.length).to.eq(2)
-          expect(err.message).to.eq('\'match\' requires its argument be a \'RegExp\'. You passed: \'foo\'')
+          expect(err.message).to.eq('`match` requires its argument be a `RegExp`. You passed: `foo`')
           expect(lastLog.get('name')).to.eq('should')
           expect(lastLog.get('error')).to.eq(err)
           expect(lastLog.get('state')).to.eq('failed')
@@ -752,7 +752,7 @@ describe('src/cy/commands/assertions', () => {
       })
     })
 
-    it('does not replaces instances of word: \'but\' with \'and\' for failing assertion', (done) => {
+    it('does not replaces instances of word \'but\' with \'and\' for failing assertion', (done) => {
       cy.on('log:added', (attrs, log) => {
         if (attrs.name === 'assert') {
           cy.removeAllListeners('log:added')
@@ -1171,12 +1171,12 @@ describe('src/cy/commands/assertions', () => {
           expect('foo').to.match('foo')
         }
 
-        expect(fn).to.throw('\'match\' requires its argument be a \'RegExp\'. You passed: \'foo\'')
+        expect(fn).to.throw('`match` requires its argument be a `RegExp`. You passed: `foo`')
       })
 
       it('throws with cy.should', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('\'match\' requires its argument be a \'RegExp\'. You passed: \'bar\'')
+          expect(err.message).to.eq('`match` requires its argument be a `RegExp`. You passed: `bar`')
 
           done()
         })
@@ -1790,13 +1790,8 @@ describe('src/cy/commands/assertions', () => {
           const l6 = this.logs[5]
 
           // the error on this log should have this message appended to it
-          expect(l6.get('error').message).to.eq(
-            `\
-expected '<div>' to be 'visible'
-
-This element '<div>' is not visible because it has CSS property: 'display: none'\
-`,
-          )
+          expect(l6.get('error').message).to.include(`expected '<div>' to be 'visible'`)
+          expect(l6.get('error').message).to.include(`This element \`<div>\` is not visible because it has CSS property: \`display: none\``)
         }
       })
 
diff --git a/packages/driver/test/cypress/integration/commands/clock_spec.coffee b/packages/driver/test/cypress/integration/commands/clock_spec.coffee
index a63db1ab77f6..7d8330d89ee2 100644
--- a/packages/driver/test/cypress/integration/commands/clock_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/clock_spec.coffee
@@ -84,21 +84,24 @@ describe "src/cy/commands/clock", ->
     context "errors", ->
       it "throws if now is not a number (or options object)", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.equal("cy.clock() only accepts a number or an options object for its first argument. You passed: \"250\"")
+          expect(err.message).to.equal("`cy.clock()` only accepts a number or an `options` object for its first argument. You passed: `\"250\"`")
+          expect(err.docsUrl).to.equal("https://on.cypress.io/clock")
           done()
 
         cy.clock("250")
 
       it "throws if methods is not an array (or options object)", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.equal("cy.clock() only accepts an array of function names or an options object for its second argument. You passed: \"setTimeout\"")
+          expect(err.message).to.equal("`cy.clock()` only accepts an array of function names or an `options` object for its second argument. You passed: `\"setTimeout\"`")
+          expect(err.docsUrl).to.equal("https://on.cypress.io/clock")
           done()
 
         cy.clock(0, "setTimeout")
 
       it "throws if methods is not an array of strings (or options object)", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.equal("cy.clock() only accepts an array of function names or an options object for its second argument. You passed: [42]")
+          expect(err.message).to.equal("`cy.clock()` only accepts an array of function names or an `options` object for its second argument. You passed: `[42]`")
+          expect(err.docsUrl).to.equal("https://on.cypress.io/clock")
           done()
 
         cy.clock(0, [42])
@@ -274,8 +277,7 @@ describe "src/cy/commands/clock", ->
           expect(clock).to.equal(@clock)
 
     it "defaults to 0ms", ->
-      cy
-        .clock()
+      cy.clock()
         .tick().then (clock) ->
           consoleProps = @logs[0].invoke("consoleProps")
           expect(consoleProps["Ticked"]).to.equal("0 milliseconds")
@@ -283,14 +285,16 @@ describe "src/cy/commands/clock", ->
     context "errors", ->
       it "throws if there is not a clock", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.equal("cy.tick() cannot be called without first calling cy.clock()")
+          expect(err.message).to.equal("`cy.tick()` cannot be called without first calling `cy.clock()`")
+          expect(err.docsUrl).to.equal('https://on.cypress.io/tick')
           done()
 
         cy.tick()
 
       it "throws if ms is not undefined or a number", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.equal("clock.tick()/cy.tick() only accept a number as their argument. You passed: \"100\"")
+          expect(err.message).to.equal("`clock.tick()`/`cy.tick()` only accepts a number as their argument. You passed: `\"100\"`")
+          expect(err.docsUrl).to.equal('https://on.cypress.io/tick')
           done()
 
         cy.clock().tick("100")
diff --git a/packages/driver/test/cypress/integration/commands/commands_spec.coffee b/packages/driver/test/cypress/integration/commands/commands_spec.coffee
index 704a2bd5f2e5..89feda2325a9 100644
--- a/packages/driver/test/cypress/integration/commands/commands_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/commands_spec.coffee
@@ -69,8 +69,8 @@ describe "src/cy/commands/commands", ->
       cy.on "fail", (err) ->
         cmds = _.keys(Cypress.Chainer.prototype)
         expect(cmds.length).to.be.gt(1)
-        expect(err.message).to.eq("Could not find a command for: 'fooDoesNotExist'.\n\nAvailable commands are: #{cmds.join(", ")}.\n")
-
+        expect(err.message).to.eq("Could not find a command for: `fooDoesNotExist`.\n\nAvailable commands are: \`#{cmds.join("`, `")}\`.\n")
+        expect(err.docsUrl).to.eq("https://on.cypress.io/api")
         done()
 
       cy.get("body").command("fooDoesNotExist", "bar", "baz")
diff --git a/packages/driver/test/cypress/integration/commands/connectors_spec.coffee b/packages/driver/test/cypress/integration/commands/connectors_spec.coffee
index 8f6c059de564..58119cba44d0 100644
--- a/packages/driver/test/cypress/integration/commands/connectors_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/connectors_spec.coffee
@@ -41,7 +41,8 @@ describe "src/cy/commands/connectors", ->
 
         it "throws when subject isn't array-like", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.spread() requires the existing subject be array-like."
+            expect(err.message).to.eq "`cy.spread()` requires the existing subject be array-like."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/spread")
             done()
 
           cy.noop({}).spread ->
@@ -55,7 +56,7 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             expect(logs.length).to.eq(1)
             expect(logs[0].get("error")).to.eq(err)
-            expect(err.message).to.include "cy.spread() timed out after waiting '20ms'."
+            expect(err.message).to.include "`cy.spread()` timed out after waiting `20ms`."
             done()
 
           cy.noop([1,2,3]).spread {timeout: 20}, ->
@@ -184,7 +185,7 @@ describe "src/cy/commands/connectors", ->
 
             expect(@logs.length).to.eq(1)
             expect(lastLog.get("error")).to.eq(err)
-            expect(err.message).to.include "cy.then() timed out after waiting '150ms'."
+            expect(err.message).to.include "`cy.then()` timed out after waiting `150ms`."
             done()
 
           cy.then {timeout: 150}, ->
@@ -196,7 +197,7 @@ describe "src/cy/commands/connectors", ->
 
             expect(@logs.length).to.eq(1)
             expect(lastLog.get("error")).to.eq(err)
-            expect(err.message).to.include "cy.then() failed because you are mixing up async and sync code."
+            expect(err.message).to.include "`cy.then()` failed because you are mixing up async and sync code."
             done()
 
           cy.then ->
@@ -451,13 +452,11 @@ describe "src/cy/commands/connectors", ->
             }
 
             cy.on "fail", (err) ->
-              expect(err.message).to.include("Timed out retrying: cy.invoke() errored because the property: 'foo' returned a 'regexp' value instead of a function. cy.invoke() can only be used on properties that return callable functions.")
-
-              expect(err.message).to.include("cy.invoke() waited for the specified property 'foo' to return a function, but it never did.")
-
-              expect(err.message).to.include("If you want to assert on the property's value, then switch to use cy.its() and add an assertion such as:")
-
-              expect(err.message).to.include("cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')")
+              expect(err.message).to.include("Timed out retrying: `cy.invoke()` errored because the property: `foo` returned a `regexp` value instead of a function. `cy.invoke()` can only be used on properties that return callable functions.")
+              expect(err.message).to.include("`cy.invoke()` waited for the specified property `foo` to return a function, but it never did.")
+              expect(err.message).to.include("If you want to assert on the property's value, then switch to use `cy.its()` and add an assertion such as:")
+              expect(err.message).to.include("`cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')`")
+              expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
 
               done()
 
@@ -471,13 +470,11 @@ describe "src/cy/commands/connectors", ->
             }
 
             cy.on "fail", (err) ->
-              expect(err.message).to.include("Timed out retrying: cy.invoke() errored because the property: 'bar' returned a 'string' value instead of a function. cy.invoke() can only be used on properties that return callable functions.")
-
-              expect(err.message).to.include("cy.invoke() waited for the specified property 'bar' to return a function, but it never did.")
-
-              expect(err.message).to.include("If you want to assert on the property's value, then switch to use cy.its() and add an assertion such as:")
-
-              expect(err.message).to.include("cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')")
+              expect(err.message).to.include("Timed out retrying: `cy.invoke()` errored because the property: `bar` returned a `string` value instead of a function. `cy.invoke()` can only be used on properties that return callable functions.")
+              expect(err.message).to.include("`cy.invoke()` waited for the specified property `bar` to return a function, but it never did.")
+              expect(err.message).to.include("If you want to assert on the property's value, then switch to use `cy.its()` and add an assertion such as:")
+              expect(err.message).to.include("`cy.wrap({ foo: 'bar' }).its('foo').should('eq', 'bar')`")
+              expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
 
               done()
 
@@ -516,37 +513,37 @@ describe "src/cy/commands/connectors", ->
           it "throws when function name is missing", (done) ->
             cy.on "fail", (err) =>
                 lastLog = @lastLog
-                expect(err.message).to.include "cy.invoke() expects the functionName argument to have a value"
+                expect(err.message).to.include "`cy.invoke()` expects the functionName argument to have a value"
                 expect(lastLog.get("error").message).to.include(err.message)
                 done()
-              
+
             cy.wrap({ foo: -> "foo"}).invoke({})
 
           it "throws when function name is not of type string but of type boolean", (done) ->
             cy.on "fail", (err) =>
                 lastLog = @lastLog
-                expect(err.message).to.include "cy.invoke() only accepts a string or a number as the functionName argument."
+                expect(err.message).to.include "`cy.invoke()` only accepts a string or a number as the functionName argument."
                 expect(lastLog.get("error").message).to.include(err.message)
                 done()
-              
+
             cy.wrap({ foo: -> "foo"}).invoke({}, true)
 
           it "throws when function name is not of type string but of type function", (done) ->
             cy.on "fail", (err) =>
                 lastLog = @lastLog
-                expect(err.message).to.include "cy.invoke() only accepts a string or a number as the functionName argument."
+                expect(err.message).to.include "`cy.invoke()` only accepts a string or a number as the functionName argument."
                 expect(lastLog.get("error").message).to.include(err.message)
                 done()
-              
+
             cy.wrap({ foo: -> "foo"}).invoke(() -> {})
 
           it "throws when first parameter is neither of type object nor of type string nor of type number", (done) ->
             cy.on "fail", (err) =>
                 lastLog = @lastLog
-                expect(err.message).to.include "cy.invoke() only accepts a string or a number as the functionName argument."
+                expect(err.message).to.include "`cy.invoke()` only accepts a string or a number as the functionName argument."
                 expect(lastLog.get("error").message).to.include(err.message)
                 done()
-              
+
             cy.wrap({ foo: -> "foo"}).invoke(true, "show")
 
         describe ".log", ->
@@ -596,7 +593,7 @@ describe "src/cy/commands/connectors", ->
 
             cy.noop(@obj).invoke({ log: false }, "sum", 1, 2).then ->
               expect(@lastLog).to.be.undefined
-        
+
       describe ".log", ->
         beforeEach ->
           @obj = {
@@ -613,7 +610,7 @@ describe "src/cy/commands/connectors", ->
               , 0
             math: {
               sum: (args...) =>
-                @obj.sum.apply(@obj, args)
+                @obj.sum(args...)
             }
           }
 
@@ -714,15 +711,12 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.invoke() errored because the property: 'foo' does not exist on your subject."
-
-            expect(err.message).to.include "cy.invoke() waited for the specified property 'foo' to exist, but it never did."
-
-            expect(err.message).to.include "If you do not expect the property 'foo' to exist, then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.invoke()` errored because the property: `foo` does not exist on your subject."
+            expect(err.message).to.include "`cy.invoke()` waited for the specified property `foo` to exist, but it never did."
+            expect(err.message).to.include "If you do not expect the property `foo` to exist, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')`"
             expect(lastLog.get("error").message).to.include(err.message)
+            expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
 
             done()
 
@@ -756,7 +750,7 @@ describe "src/cy/commands/connectors", ->
 
             expect(err.message).to.eq("Timed out retrying: expected 'foo' to equal 'bar'")
 
-            expect(lastLog.get("error").message).to.eq("expected 'foo' to equal 'bar'")
+            expect(lastLog.get("error").message).to.eq("Timed out retrying: expected 'foo' to equal 'bar'")
 
             done()
 
@@ -766,12 +760,10 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include("Timed out retrying: cy.invoke() errored because your subject is: 'undefined'. You cannot invoke any functions such as 'foo' on a 'undefined' value.")
-
-            expect(err.message).to.include("If you expect your subject to be 'undefined', then add an assertion such as:")
-
-            expect(err.message).to.include("cy.wrap(undefined).should('be.undefined')")
-
+            expect(err.message).to.include("Timed out retrying: `cy.invoke()` errored because your subject is: `undefined`. You cannot invoke any functions such as `foo` on a `undefined` value.")
+            expect(err.message).to.include("If you expect your subject to be `undefined`, then add an assertion such as:")
+            expect(err.message).to.include("`cy.wrap(undefined).should('be.undefined')`")
+            expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
             expect(lastLog.get("error").message).to.include(err.message)
 
             done()
@@ -782,15 +774,12 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.invoke() errored because the property: 'foo' is not a function, and instead returned a 'undefined' value."
-
-            expect(err.message).to.include "cy.invoke() waited for the specified property 'foo' to become a callable function, but it never did."
-
-            expect(err.message).to.include "If you expect the property 'foo' to be 'undefined', then switch to use cy.its() and add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: undefined }).its('foo').should('be.undefined')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.invoke()` errored because the property: `foo` is not a function, and instead returned a `undefined` value."
+            expect(err.message).to.include "`cy.invoke()` waited for the specified property `foo` to become a callable function, but it never did."
+            expect(err.message).to.include "If you expect the property `foo` to be `undefined`, then switch to use `cy.its()` and add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: undefined }).its('foo').should('be.undefined')`"
             expect(lastLog.get("error").message).to.include(err.message)
+            expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
 
             done()
 
@@ -800,8 +789,9 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include("Timed out retrying: cy.invoke() errored because the property: 'baz' does not exist on your subject.")
+            expect(err.message).to.include("Timed out retrying: `cy.invoke()` errored because the property: `baz` does not exist on your subject.")
             expect(lastLog.get("error").message).to.include(err.message)
+            expect(err.docsUrl).to.eq("https://on.cypress.io/invoke")
             done()
 
           obj = {
@@ -1004,7 +994,7 @@ describe "src/cy/commands/connectors", ->
         it "works with numerical indexes", ->
           cy.wrap(['foo', 'bar']).its(1, {}).should('eq', 'bar')
 
-        describe ".log", -> 
+        describe ".log", ->
           beforeEach ->
             @obj = {
               foo: "foo bar baz"
@@ -1113,7 +1103,7 @@ describe "src/cy/commands/connectors", ->
           cy.noop(@obj).its("num", { log: true }).then ->
             expect(@lastLog.invoke("consoleProps")).to.have.property("Property", ".num")
             @lastLog = undefined
-          
+
           cy.noop(@obj).its("num", { log: false }).then ->
             expect(@lastLog).to.be.undefined
 
@@ -1143,14 +1133,11 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.its() errored because the property: 'foo' does not exist on your subject."
-
-            expect(err.message).to.include "cy.its() waited for the specified property 'foo' to exist, but it never did."
-
-            expect(err.message).to.include "If you do not expect the property 'foo' to exist, then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.its()` errored because the property: `foo` does not exist on your subject."
+            expect(err.message).to.include "`cy.its()` waited for the specified property `foo` to exist, but it never did."
+            expect(err.message).to.include "If you do not expect the property `foo` to exist, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
 
             done()
@@ -1161,14 +1148,11 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.its() errored because the property: 'foo' returned a 'undefined' value."
-
-            expect(err.message).to.include "cy.its() waited for the specified property 'foo' to become accessible, but it never did."
-
-            expect(err.message).to.include "If you expect the property 'foo' to be 'undefined', then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: undefined }).its('foo').should('be.undefined')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.its()` errored because the property: `foo` returned a `undefined` value."
+            expect(err.message).to.include "`cy.its()` waited for the specified property `foo` to become accessible, but it never did."
+            expect(err.message).to.include "If you expect the property `foo` to be `undefined`, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: undefined }).its('foo').should('be.undefined')`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
 
             done()
@@ -1179,14 +1163,11 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.its() errored because the property: 'foo' returned a 'null' value."
-
-            expect(err.message).to.include "cy.its() waited for the specified property 'foo' to become accessible, but it never did."
-
-            expect(err.message).to.include "If you expect the property 'foo' to be 'null', then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: null }).its('foo').should('be.null')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.its()` errored because the property: `foo` returned a `null` value."
+            expect(err.message).to.include "`cy.its()` waited for the specified property `foo` to become accessible, but it never did."
+            expect(err.message).to.include "If you expect the property `foo` to be `null`, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: null }).its('foo').should('be.null')`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
 
             done()
@@ -1197,13 +1178,10 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.its() errored because the property: 'b' does not exist on your subject."
-
-            expect(err.message).to.include "cy.its() waited for the specified property 'b' to exist, but it never did."
-
-            expect(err.message).to.include "If you do not expect the property 'b' to exist, then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')"
+            expect(err.message).to.include "Timed out retrying: `cy.its()` errored because the property: `b` does not exist on your subject."
+            expect(err.message).to.include "`cy.its()` waited for the specified property `b` to exist, but it never did."
+            expect(err.message).to.include "If you do not expect the property `b` to exist, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')`"
 
             expect(lastLog.get("error").message).to.include(err.message)
 
@@ -1215,14 +1193,11 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "Timed out retrying: cy.its() errored because the property: 'a' returned a 'undefined' value."
-
-            expect(err.message).to.include "cy.its() waited for the specified property 'a' to become accessible, but it never did."
-
-            expect(err.message).to.include "If you expect the property 'a' to be 'undefined', then add an assertion such as:"
-
-            expect(err.message).to.include "cy.wrap({ foo: undefined }).its('foo').should('be.undefined')"
-
+            expect(err.message).to.include "Timed out retrying: `cy.its()` errored because the property: `a` returned a `undefined` value."
+            expect(err.message).to.include "`cy.its()` waited for the specified property `a` to become accessible, but it never did."
+            expect(err.message).to.include "If you expect the property `a` to be `undefined`, then add an assertion such as:"
+            expect(err.message).to.include "`cy.wrap({ foo: undefined }).its('foo').should('be.undefined')`"
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
 
             done()
@@ -1267,7 +1242,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include("Timed out retrying: cy.its() errored because the property: 'baz' does not exist on your subject.")
+            expect(err.message).to.include("Timed out retrying: `cy.its()` errored because the property: `baz` does not exist on your subject.")
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
             expect(lastLog.get("error").message).to.include(err.message)
             done()
@@ -1283,26 +1259,21 @@ describe "src/cy/commands/connectors", ->
         [null, undefined].forEach (val) ->
           it "throws on traversed '#{val}' subject", (done) ->
             cy.on "fail", (err) ->
-              expect(err.message).to.include("Timed out retrying: cy.its() errored because the property: 'a' returned a '#{val}' value. The property: 'b' does not exist on a '#{val}' value.")
-
-              expect(err.message).to.include("cy.its() waited for the specified property 'b' to become accessible, but it never did.")
-
-              expect(err.message).to.include("If you do not expect the property 'b' to exist, then add an assertion such as:")
-
-              expect(err.message).to.include("cy.wrap({ foo: #{val} }).its('foo.baz').should('not.exist')")
-
+              expect(err.message).to.include("Timed out retrying: `cy.its()` errored because the property: `a` returned a `#{val}` value. The property: `b` does not exist on a `#{val}` value.")
+              expect(err.message).to.include("`cy.its()` waited for the specified property `b` to become accessible, but it never did.")
+              expect(err.message).to.include("If you do not expect the property `b` to exist, then add an assertion such as:")
+              expect(err.message).to.include("`cy.wrap({ foo: #{val} }).its('foo.baz').should('not.exist')`")
+              expect(err.docsUrl).to.eq("https://on.cypress.io/its")
               done()
 
             cy.wrap({ a: val }).its("a.b.c")
 
           it "throws on initial '#{val}' subject", (done) ->
             cy.on "fail", (err) ->
-              expect(err.message).to.include("Timed out retrying: cy.its() errored because your subject is: '#{val}'. You cannot access any properties such as 'foo' on a '#{val}' value.")
-
-              expect(err.message).to.include("If you expect your subject to be '#{val}', then add an assertion such as:")
-
-              expect(err.message).to.include("cy.wrap(#{val}).should('be.#{val}')")
-
+              expect(err.message).to.include("Timed out retrying: `cy.its()` errored because your subject is: `#{val}`. You cannot access any properties such as `foo` on a `#{val}` value.")
+              expect(err.message).to.include("If you expect your subject to be `#{val}`, then add an assertion such as:")
+              expect(err.message).to.include("`cy.wrap(#{val}).should('be.#{val}')`")
+              expect(err.docsUrl).to.eq("https://on.cypress.io/its")
               done()
 
             cy.wrap(val).its("foo")
@@ -1311,7 +1282,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             lastLog = @lastLog
 
-            expect(err.message).to.include "cy.its() does not accept additional arguments."
+            expect(err.message).to.include("`cy.its()` does not accept additional arguments.")
+            expect(err.docsUrl).to.eq("https://on.cypress.io/its")
             expect(lastLog.get("error").message).to.include(err.message)
             done()
 
@@ -1324,16 +1296,16 @@ describe "src/cy/commands/connectors", ->
         it "throws when options argument is not an object", (done) ->
           cy.on "fail", (err) =>
               lastLog = @lastLog
-              expect(err.message).to.include "cy.its() only accepts an object as the options argument."
+              expect(err.message).to.include "`cy.its()` only accepts an object as the options argument."
               expect(lastLog.get("error").message).to.include(err.message)
               done()
-            
+
           cy.wrap({ foo: "string" }).its("foo", "bar")
 
         it "throws when property name is missing", (done) ->
           cy.on "fail", (err) =>
               lastLog = @lastLog
-              expect(err.message).to.include "cy.its() expects the propertyName argument to have a value"
+              expect(err.message).to.include "`cy.its()` expects the propertyName argument to have a value"
               expect(lastLog.get("error").message).to.include(err.message)
               done()
 
@@ -1342,10 +1314,10 @@ describe "src/cy/commands/connectors", ->
         it "throws when property name is not of type string", (done) ->
           cy.on "fail", (err) =>
               lastLog = @lastLog
-              expect(err.message).to.include "cy.its() only accepts a string or a number as the propertyName argument."
+              expect(err.message).to.include "`cy.its()` only accepts a string or a number as the propertyName argument."
               expect(lastLog.get("error").message).to.include(err.message)
               done()
-            
+
           cy.wrap({ foo: "foo"}).its(true)
 
         it "resets traversalErr and throws the right assertion", (done) ->
@@ -1373,13 +1345,13 @@ describe "src/cy/commands/connectors", ->
               Command: "its"
               Property: ".fizz.buzz"
               Error: """
-              CypressError: Timed out retrying: cy.its() errored because the property: 'fizz' does not exist on your subject.
+              CypressError: Timed out retrying: `cy.its()` errored because the property: `fizz` does not exist on your subject.
 
-              cy.its() waited for the specified property 'fizz' to exist, but it never did.
+              `cy.its()` waited for the specified property `fizz` to exist, but it never did.
 
-              If you do not expect the property 'fizz' to exist, then add an assertion such as:
+              If you do not expect the property `fizz` to exist, then add an assertion such as:
 
-              cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')
+              `cy.wrap({ foo: 'bar' }).its('quux').should('not.exist')`
               """
               Subject: {foo: "bar"}
               Yielded: undefined
@@ -1511,7 +1483,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             ## get + each
             expect(@logs.length).to.eq(2)
-            expect(err.message).to.include("cy.each() timed out after waiting '50ms'.\n\nYour callback function returned a promise which never resolved.")
+            expect(err.message).to.include("`cy.each()` timed out after waiting `50ms`.\n\nYour callback function returned a promise which never resolved.")
+            expect(err.docsUrl).to.include("https://on.cypress.io/each")
             done()
 
           cy.get("ul").each ($ul) ->
@@ -1526,7 +1499,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             ## get + each
             expect(@logs.length).to.eq(2)
-            expect(err.message).to.include("cy.each() must be passed a callback function.")
+            expect(err.message).to.include("`cy.each()` must be passed a callback function.")
+            expect(err.docsUrl).to.eq('https://on.cypress.io/each')
             done()
 
           cy.get("ul").each({})
@@ -1535,7 +1509,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             ## get + each
             expect(@logs.length).to.eq(2)
-            expect(err.message).to.include("cy.each() can only operate on an array like subject. Your subject was: '100'")
+            expect(err.message).to.include("`cy.each()` can only operate on an array like subject. Your subject was: `100`")
+            expect(err.docsUrl).to.eq('https://on.cypress.io/each')
             done()
 
           cy.wrap(100).each ->
@@ -1544,7 +1519,8 @@ describe "src/cy/commands/connectors", ->
           cy.on "fail", (err) =>
             ## get + each
             expect(@logs.length).to.eq(2)
-            expect(err.message).to.include("cy.each() can only operate on an array like subject. Your subject was: '{}'")
+            expect(err.message).to.include("`cy.each()` can only operate on an array like subject. Your subject was: `{}`")
+            expect(err.docsUrl).to.eq('https://on.cypress.io/each')
             done()
 
           cy.wrap({}).each ->
diff --git a/packages/driver/test/cypress/integration/commands/cookies_spec.coffee b/packages/driver/test/cypress/integration/commands/cookies_spec.coffee
index 89d6fa7bac1b..fefe834a95e4 100644
--- a/packages/driver/test/cypress/integration/commands/cookies_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/cookies_spec.coffee
@@ -121,7 +121,7 @@ describe "src/cy/commands/cookies", ->
 
           expect(@logs.length).to.eq(1)
 
-          expect(lastLog.get("error").message).to.contain "cy.getCookies() had an unexpected error reading cookies from #{Cypress.browser.displayName}."
+          expect(lastLog.get("error").message).to.contain "`cy.getCookies()` had an unexpected error reading cookies from #{Cypress.browser.displayName}."
           expect(lastLog.get("error").message).to.contain "some err message"
           expect(lastLog.get("error").message).to.contain error.stack
           done()
@@ -139,7 +139,8 @@ describe "src/cy/commands/cookies", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("getCookies")
           expect(lastLog.get("message")).to.eq("")
-          expect(err.message).to.eq("cy.getCookies() timed out waiting '50ms' to complete.")
+          expect(err.message).to.eq("`cy.getCookies()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/getcookies")
           done()
 
         cy.getCookies({timeout: 50})
@@ -263,7 +264,7 @@ describe "src/cy/commands/cookies", ->
 
           expect(@logs.length).to.eq(1)
 
-          expect(lastLog.get("error").message).to.contain "cy.getCookie() had an unexpected error reading the requested cookie from #{Cypress.browser.displayName}."
+          expect(lastLog.get("error").message).to.contain "`cy.getCookie()` had an unexpected error reading the requested cookie from #{Cypress.browser.displayName}."
           expect(lastLog.get("error").message).to.contain "some err message"
           expect(lastLog.get("error").message).to.contain error.stack
           done()
@@ -281,7 +282,8 @@ describe "src/cy/commands/cookies", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("getCookie")
           expect(lastLog.get("message")).to.eq("foo")
-          expect(err.message).to.eq("cy.getCookie() timed out waiting '50ms' to complete.")
+          expect(err.message).to.eq("`cy.getCookie()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/getcookie")
           done()
 
         cy.getCookie("foo", {timeout: 50})
@@ -291,7 +293,8 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.eq "cy.getCookie() must be passed a string argument for name."
+          expect(lastLog.get("error").message).to.eq "`cy.getCookie()` must be passed a string argument for name."
+          expect(lastLog.get("error").docsUrl).to.eq("https://on.cypress.io/getcookie")
           expect(lastLog.get("error")).to.eq(err)
           done()
 
@@ -464,7 +467,8 @@ describe "src/cy/commands/cookies", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("setCookie")
           expect(lastLog.get("message")).to.eq("foo, bar")
-          expect(err.message).to.include("cy.setCookie() timed out waiting '50ms' to complete.")
+          expect(err.message).to.include("`cy.setCookie()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/setcookie")
           done()
 
         cy.setCookie("foo", "bar", {timeout: 50})
@@ -474,7 +478,8 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.eq "cy.setCookie() must be passed two string arguments for name and value."
+          expect(lastLog.get("error").message).to.eq "`cy.setCookie()` must be passed two string arguments for `name` and `value`."
+          expect(lastLog.get("error").docsUrl).to.eq "https://on.cypress.io/setcookie"
           expect(lastLog.get("error")).to.eq(err)
           done()
 
@@ -485,7 +490,8 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.eq "cy.setCookie() must be passed two string arguments for name and value."
+          expect(lastLog.get("error").message).to.eq "`cy.setCookie()` must be passed two string arguments for `name` and `value`."
+          expect(lastLog.get("error").docsUrl).to.eq "https://on.cypress.io/setcookie"
           expect(lastLog.get("error")).to.eq(err)
           done()
 
@@ -493,9 +499,14 @@ describe "src/cy/commands/cookies", ->
 
       context "when setting an invalid cookie", ->
         it "throws an error if the backend responds with an error", (done) ->
+          err = new Error("backend could not set cookie")
+
+          Cypress.automation.withArgs("set:cookie").rejects(err)
+
           cy.on "fail", (err) =>
             expect(Cypress.automation.withArgs("set:cookie")).to.be.calledOnce
             expect(err.message).to.contain('unexpected error setting the requested cookie')
+            expect(err.message).to.contain(err.message)
             done()
 
           ## browser backend should yell since this is invalid
@@ -611,7 +622,7 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.contain "cy.clearCookie() had an unexpected error clearing the requested cookie in #{Cypress.browser.displayName}."
+          expect(lastLog.get("error").message).to.contain "`cy.clearCookie()` had an unexpected error clearing the requested cookie in #{Cypress.browser.displayName}."
           expect(lastLog.get("error").message).to.contain "some err message"
           expect(lastLog.get("error").message).to.contain error.stack
           done()
@@ -629,7 +640,8 @@ describe "src/cy/commands/cookies", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("clearCookie")
           expect(lastLog.get("message")).to.eq("foo")
-          expect(err.message).to.eq("cy.clearCookie() timed out waiting '50ms' to complete.")
+          expect(err.message).to.eq("`cy.clearCookie()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/clearcookie")
           done()
 
         cy.clearCookie("foo", {timeout: 50})
@@ -639,7 +651,8 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.eq "cy.clearCookie() must be passed a string argument for name."
+          expect(lastLog.get("error").message).to.eq "`cy.clearCookie()` must be passed a string argument for name."
+          expect(lastLog.get("error").docsUrl).to.eq "https://on.cypress.io/clearcookie"
           expect(lastLog.get("error")).to.eq(err)
           done()
 
@@ -837,7 +850,7 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.contain "cy.clearCookies() had an unexpected error clearing cookies in #{Cypress.browser.displayName}."
+          expect(lastLog.get("error").message).to.contain "`cy.clearCookies()` had an unexpected error clearing cookies in #{Cypress.browser.displayName}."
           expect(lastLog.get("error").message).to.contain "some err message"
           expect(lastLog.get("error").message).to.contain error.stack
           expect(lastLog.get("error")).to.eq(err)
@@ -846,7 +859,8 @@ describe "src/cy/commands/cookies", ->
         cy.clearCookies()
 
       it "throws after timing out", (done) ->
-        Cypress.automation.resolves(Promise.delay(1000))
+        Cypress.automation.resolves([{ name: "foo" }])
+        Cypress.automation.withArgs("clear:cookies").resolves(Promise.delay(1000))
 
         cy.on "fail", (err) =>
           lastLog = @lastLog
@@ -856,7 +870,8 @@ describe "src/cy/commands/cookies", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("clearCookies")
           expect(lastLog.get("message")).to.eq("")
-          expect(err.message).to.eq("cy.clearCookies() timed out waiting '50ms' to complete.")
+          expect(err.message).to.eq("`cy.clearCookies()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/clearcookies")
           done()
 
         cy.clearCookies({timeout: 50})
@@ -876,7 +891,7 @@ describe "src/cy/commands/cookies", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.contain "cy.clearCookies() had an unexpected error clearing cookies in #{Cypress.browser.displayName}."
+          expect(lastLog.get("error").message).to.contain "`cy.clearCookies()` had an unexpected error clearing cookies in #{Cypress.browser.displayName}."
           expect(lastLog.get("error").message).to.contain "some err message"
           expect(lastLog.get("error").message).to.contain error.stack
           expect(lastLog.get("error")).to.eq(err)
diff --git a/packages/driver/test/cypress/integration/commands/exec_spec.coffee b/packages/driver/test/cypress/integration/commands/exec_spec.coffee
index 308c89338f99..a4dd388028b1 100644
--- a/packages/driver/test/cypress/integration/commands/exec_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/exec_spec.coffee
@@ -117,10 +117,11 @@ describe "src/cy/commands/exec", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.exec() must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.message).to.eq("`cy.exec()` must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
-        cy.exec()
+        `cy.exec()`
 
       it "throws when cmd isn't a string", (done) ->
         cy.on "fail", (err) =>
@@ -129,7 +130,8 @@ describe "src/cy/commands/exec", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.exec() must be passed a non-empty string as its 1st argument. You passed: '3'.")
+          expect(err.message).to.eq("`cy.exec()` must be passed a non-empty string as its 1st argument. You passed: '3'.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec(3)
@@ -141,7 +143,8 @@ describe "src/cy/commands/exec", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.exec() must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.message).to.eq("`cy.exec()` must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec('')
@@ -156,7 +159,8 @@ describe "src/cy/commands/exec", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
 
-          expect(err.message).to.eq("cy.exec('ls') failed with the following error:\n\n> \"Error: exec failed\"")
+          expect(err.message).to.eq("`cy.exec('ls')` failed with the following error:\n\n> \"Error: exec failed\"")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec("ls")
@@ -170,7 +174,8 @@ describe "src/cy/commands/exec", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.exec('ls') timed out after waiting 50ms.")
+          expect(err.message).to.eq("`cy.exec('ls')` timed out after waiting `50ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec("ls", { timeout: 50 })
@@ -195,7 +200,8 @@ describe "src/cy/commands/exec", ->
         Cypress.backend.rejects(err)
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.exec('sleep 2') timed out after waiting 100ms.")
+          expect(err.message).to.include("`cy.exec('sleep 2')` timed out after waiting `100ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec("sleep 2", {
@@ -204,7 +210,8 @@ describe "src/cy/commands/exec", ->
 
       it "can really time out", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.exec('sleep 2') timed out after waiting 100ms.")
+          expect(err.message).to.include("`cy.exec('sleep 2')` timed out after waiting `100ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/exec")
           done()
 
         cy.exec("sleep 2", {
@@ -216,8 +223,9 @@ describe "src/cy/commands/exec", ->
           Cypress.backend.resolves({ code: 1 })
 
           cy.on "fail", (err) ->
-            expect(err.message).to.contain("cy.exec('ls') failed because the command exited with a non-zero code.\n\nPass {failOnNonZeroExit: false} to ignore exit code failures.")
+            expect(err.message).to.contain("`cy.exec('ls')` failed because the command exited with a non-zero code.\n\nPass `{failOnNonZeroExit: false}` to ignore exit code failures.")
             expect(err.message).to.contain("Code: 1")
+            expect(err.docsUrl).to.contain("https://on.cypress.io/exec")
             done()
 
           cy.exec("ls")
diff --git a/packages/driver/test/cypress/integration/commands/files_spec.coffee b/packages/driver/test/cypress/integration/commands/files_spec.coffee
index b23d0bf22d54..54f5deab9708 100644
--- a/packages/driver/test/cypress/integration/commands/files_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/files_spec.coffee
@@ -130,10 +130,11 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.readFile() must be passed a non-empty string as its 1st argument. You passed: 'undefined'.")
+          expect(err.message).to.eq("`cy.readFile()` must be passed a non-empty string as its 1st argument. You passed: `undefined`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
           done()
 
-        cy.readFile()
+        `cy.readFile()`
 
       it "throws when file argument is not a string", (done) ->
         cy.on "fail", (err) =>
@@ -142,7 +143,8 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.readFile() must be passed a non-empty string as its 1st argument. You passed: '2'.")
+          expect(err.message).to.eq("`cy.readFile()` must be passed a non-empty string as its 1st argument. You passed: `2`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
           done()
 
         cy.readFile(2)
@@ -154,7 +156,8 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.readFile() must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.message).to.eq("`cy.readFile()` must be passed a non-empty string as its 1st argument. You passed: ``.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
           done()
 
         cy.readFile("")
@@ -174,14 +177,16 @@ describe "src/cy/commands/files", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
           expect(err.message).to.eq """
-          cy.readFile(\"foo\") failed while trying to read the file at the following path:
+          `cy.readFile(\"foo\")` failed while trying to read the file at the following path:
 
-            /path/to/foo
+            `/path/to/foo`
 
           The following error occurred:
 
             > "EISDIR: illegal operation on a directory, read"
           """
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
+
           done()
 
         cy.readFile("foo")
@@ -201,10 +206,11 @@ describe "src/cy/commands/files", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
 
-          expect(err.message).to.eq("""Timed out retrying: cy.readFile(\"foo.json\") failed because the file does not exist at the following path:
+          expect(err.message).to.eq("""Timed out retrying: `cy.readFile(\"foo.json\")` failed because the file does not exist at the following path:
 
-            /path/to/foo.json
+            `/path/to/foo.json`
           """)
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
           done()
 
         cy.readFile("foo.json")
@@ -219,10 +225,11 @@ describe "src/cy/commands/files", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
           expect(err.message).to.eq("""
-          Timed out retrying: cy.readFile(\"foo.json\") failed because the file exists when expected not to exist at the following path:
+          Timed out retrying: `cy.readFile(\"foo.json\")` failed because the file exists when expected not to exist at the following path:
 
-          /path/to/foo.json
+          `/path/to/foo.json`
           """)
+          expect(err.docsUrl).to.eq("https://on.cypress.io/readfile")
           done()
 
         cy.readFile("foo.json").should("not.exist")
@@ -385,10 +392,11 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.writeFile() must be passed a non-empty string as its 1st argument. You passed: 'undefined'.")
+          expect(err.message).to.eq("`cy.writeFile()` must be passed a non-empty string as its 1st argument. You passed: `undefined`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/writefile")
           done()
 
-        cy.writeFile()
+        `cy.writeFile()`
 
       it "throws when file name argument is not a string", (done) ->
         cy.on "fail", (err) =>
@@ -397,7 +405,8 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.writeFile() must be passed a non-empty string as its 1st argument. You passed: '2'.")
+          expect(err.message).to.eq("`cy.writeFile()` must be passed a non-empty string as its 1st argument. You passed: `2`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/writefile")
           done()
 
         cy.writeFile(2)
@@ -409,7 +418,7 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.writeFile() must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: 'undefined'.")
+          expect(err.message).to.eq("`cy.writeFile()` must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: `undefined`.")
           done()
 
         cy.writeFile("foo.txt")
@@ -421,7 +430,7 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.writeFile() must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: '2'.")
+          expect(err.message).to.eq("`cy.writeFile()` must be passed a non-empty string, an object, or an array as its 2nd argument. You passed: `2`.")
           done()
 
         cy.writeFile("foo.txt", 2)
@@ -440,14 +449,15 @@ describe "src/cy/commands/files", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq """cy.writeFile(\"foo.txt\") failed while trying to write the file at the following path:
+          expect(err.message).to.eq """`cy.writeFile(\"foo.txt\")` failed while trying to write the file at the following path:
 
-            /path/to/foo.txt
+            `/path/to/foo.txt`
 
           The following error occurred:
 
             > "WHOKNOWS: unable to write file"
           """
+          expect(err.docsUrl).to.eq("https://on.cypress.io/writefile")
 
           done()
 
diff --git a/packages/driver/test/cypress/integration/commands/fixtures_spec.coffee b/packages/driver/test/cypress/integration/commands/fixtures_spec.coffee
index 21fc29dabdd5..9a2e7e373586 100644
--- a/packages/driver/test/cypress/integration/commands/fixtures_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/fixtures_spec.coffee
@@ -83,7 +83,8 @@ describe "src/cy/commands/fixtures", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(lastLog.get("error").message).to.eq("cy.fixture() is not valid because you have configured 'fixturesFolder' to false.")
+          expect(lastLog.get("error").message).to.eq("`cy.fixture()` is not valid because you have configured `fixturesFolder` to `false`.")
+          expect(lastLog.get("error").docsUrl).to.eq("https://on.cypress.io/fixture")
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq "fixture"
           done()
@@ -133,7 +134,8 @@ describe "src/cy/commands/fixtures", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq "fixture"
           expect(lastLog.get("message")).to.eq "foo, {timeout: 50}"
-          expect(err.message).to.eq("cy.fixture() timed out waiting '50ms' to receive a fixture. No fixture was ever sent by the server.")
+          expect(err.message).to.eq("`cy.fixture()` timed out waiting `50ms` to receive a fixture. No fixture was ever sent by the server.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/fixture")
           done()
 
         cy.fixture("foo", {timeout: 50})
diff --git a/packages/driver/test/cypress/integration/commands/local_storage_spec.coffee b/packages/driver/test/cypress/integration/commands/local_storage_spec.coffee
index 162cbdebb119..391e908eeff8 100644
--- a/packages/driver/test/cypress/integration/commands/local_storage_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/local_storage_spec.coffee
@@ -38,7 +38,8 @@ describe "src/cy/commands/local_storage", ->
     describe "errors", ->
       it "throws when being passed a non string or regexp", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.clearLocalStorage() must be called with either a string or regular expression."
+          expect(err.message).to.include "`cy.clearLocalStorage()` must be called with either a string or regular expression."
+          expect(err.docsUrl).to.include("https://on.cypress.io/clearlocalstorage")
           done()
         # A number is used as an object will be considered as `options`
         cy.clearLocalStorage(1)
diff --git a/packages/driver/test/cypress/integration/commands/location_spec.coffee b/packages/driver/test/cypress/integration/commands/location_spec.coffee
index a278b9a29f07..cb04a7a8613a 100644
--- a/packages/driver/test/cypress/integration/commands/location_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/location_spec.coffee
@@ -291,6 +291,20 @@ describe "src/cy/commands/location", ->
 
         return null
 
+      it "throws when passed a non-existent key", (done) ->
+        cy.on "fail", (err) =>
+          lastLog = @lastLog
+
+          expect(err.message).to.include(lastLog.get("error").message)
+          expect(err.message).to.include("Location object does not have key: `ladida`")
+          expect(err.docsUrl).to.include("https://on.cypress.io/location")
+          expect(lastLog.get("name")).to.eq("location")
+          expect(lastLog.get("state")).to.eq("failed")
+
+          done()
+
+        cy.location('ladida')
+
       it "eventually fails the assertion", (done) ->
         cy.on "fail", (err) =>
           lastLog = @lastLog
diff --git a/packages/driver/test/cypress/integration/commands/misc_spec.coffee b/packages/driver/test/cypress/integration/commands/misc_spec.coffee
index 4b1e65864369..cd0cd5df36ad 100644
--- a/packages/driver/test/cypress/integration/commands/misc_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/misc_spec.coffee
@@ -150,7 +150,7 @@ describe "src/cy/commands/misc", ->
     describe "errors", ->
       it "throws when wrapping an array of windows", (done) ->
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.scrollTo() failed because it requires a DOM element."
+          expect(err.message).to.include "`cy.scrollTo()` failed because it requires a DOM element."
           expect(err.message).to.include "[<window>]"
           expect(err.message).to.include "All 2 subject validations failed on this subject."
           done()
@@ -160,7 +160,7 @@ describe "src/cy/commands/misc", ->
 
       it "throws when wrapping an array of documents", (done) ->
         cy.on "fail", (err) =>
-          expect(err.message).to.include "cy.screenshot() failed because it requires a DOM element."
+          expect(err.message).to.include "`cy.screenshot()` failed because it requires a DOM element."
           expect(err.message).to.include "[<document>]"
           expect(err.message).to.include "All 3 subject validations failed on this subject."
           done()
diff --git a/packages/driver/test/cypress/integration/commands/navigation_spec.coffee b/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
index c7691ccdc958..6e52c4266542 100644
--- a/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/navigation_spec.coffee
@@ -120,21 +120,24 @@ describe "src/cy/commands/navigation", ->
 
       it "throws passing more than 2 args", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.reload() can only accept a boolean or options as its arguments.")
+          expect(err.message).to.eq("`cy.reload()` can only accept a boolean or `options` as its arguments.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/reload")
           done()
 
         cy.reload(1, 2, 3)
 
       it "throws passing 2 invalid arguments", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.reload() can only accept a boolean or options as its arguments.")
+          expect(err.message).to.eq("`cy.reload()` can only accept a boolean or `options` as its arguments.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/reload")
           done()
 
         cy.reload(true, 1)
 
       it "throws passing 1 invalid argument", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.reload() can only accept a boolean or options as its arguments.")
+          expect(err.message).to.eq("`cy.reload()` can only accept a boolean or `options` as its arguments.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/reload")
           done()
 
         cy.reload(1)
@@ -167,7 +170,7 @@ describe "src/cy/commands/navigation", ->
             cy.on "fail", (err) ->
               expected = true
 
-              expect(err.message).to.include "Your page did not fire its 'load' event within '1ms'."
+              expect(err.message).to.include "Your page did not fire its `load` event within `1ms`."
 
           .reload({timeout: 1})
 
@@ -306,21 +309,26 @@ describe "src/cy/commands/navigation", ->
       _.each [null, undefined, NaN, Infinity, {}, [], ->{}], (val) =>
         it "throws on: '#{val}'", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq("cy.go() accepts only a string or number argument")
+            expect(err.message).to.eq("`cy.go()` accepts only a string or number argument")
+            expect(err.docsUrl).to.eq("https://on.cypress.io/go")
             done()
 
           cy.go(val)
 
       it "throws on invalid string", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.go() accepts either 'forward' or 'back'. You passed: 'foo'")
+          expect(err.message).to.eq("`cy.go()` accepts either `forward` or `back`. You passed: `foo`")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/go")
+
           done()
 
         cy.go("foo")
 
       it "throws on zero", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.go() cannot accept '0'. The number must be greater or less than '0'.")
+          expect(err.message).to.eq("`cy.go()` cannot accept `0`. The number must be greater or less than `0`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/go")
+
           done()
 
         cy.go(0)
@@ -345,7 +353,7 @@ describe "src/cy/commands/navigation", ->
             cy.on "fail", (err) ->
               expected = true
 
-              expect(err.message).to.include "Your page did not fire its 'load' event within '1ms'."
+              expect(err.message).to.include "Your page did not fire its `load` event within `1ms`."
 
             cy.go("back", {timeout: 1})
 
@@ -543,7 +551,7 @@ describe "src/cy/commands/navigation", ->
       Cypress.config("baseUrl", "")
 
       cy.on "fail", (err) ->
-        expect(err.message).to.contain("cy.visit() failed because the 'file://...' protocol is not supported by Cypress.")
+        expect(err.message).to.contain("`cy.visit()` failed because the 'file://...' protocol is not supported by Cypress.")
         done()
 
       cy.visit("file:///cypress/fixtures/generic.html")
@@ -1007,7 +1015,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.include "Your page did not fire its 'load' event within '20ms'."
+          expect(err.message).to.include "Your page did not fire its `load` event within `20ms`."
           expect(lastLog.get("error")).to.eq(err)
           done()
 
@@ -1033,14 +1041,16 @@ describe "src/cy/commands/navigation", ->
 
       it "throws when url isnt a string", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq "cy.visit() must be called with a URL or an options object containing a URL as its 1st argument"
+          expect(err.message).to.eq "`cy.visit()` must be called with a `url` or an `options` object containing a `url` as its 1st argument"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/visit")
           done()
 
         cy.visit()
 
       it "throws when url is specified twice", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.visit() must be called with only one URL. You specified two URLs"
+          expect(err.message).to.contain "`cy.visit()` must be called with only one `url`. You specified two urls"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/visit")
           done()
 
         cy.visit("http://foobarbaz", {
@@ -1049,7 +1059,8 @@ describe "src/cy/commands/navigation", ->
 
       it "throws when method is unsupported", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.visit() was called with an invalid method: 'FOO'"
+          expect(err.message).to.contain "`cy.visit()` was called with an invalid method: `FOO`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/visit")
           done()
 
         cy.visit({
@@ -1059,7 +1070,8 @@ describe "src/cy/commands/navigation", ->
 
       it "throws when headers is not an object", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.visit() requires the 'headers' option to be an object"
+          expect(err.message).to.contain "`cy.visit()` requires the `headers` option to be an object"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/visit")
           done()
 
         cy.visit({
@@ -1076,7 +1088,7 @@ describe "src/cy/commands/navigation", ->
 
         it "throws when qs is #{str}", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.contain "cy.visit() requires the 'qs' option to be an object, but received: '#{str}'"
+            expect(err.message).to.contain "`cy.visit()` requires the `qs` option to be an object, but received: `#{str}`"
             done()
 
           cy.visit({
@@ -1086,7 +1098,7 @@ describe "src/cy/commands/navigation", ->
 
       it "throws when failOnStatusCode is false and retryOnStatusCodeFailure is true", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.visit() was invoked with { failOnStatusCode: false, retryOnStatusCodeFailure: true }."
+          expect(err.message).to.contain "These options are incompatible with each other."
           done()
 
         cy.visit({
@@ -1099,9 +1111,10 @@ describe "src/cy/commands/navigation", ->
         cy.on "fail", (err) =>
           lastLog = @lastLog
 
-          expect(err.message).to.include("cy.visit() failed because you are attempting to visit a URL that is of a different origin.")
+          expect(err.message).to.include("`cy.visit()` failed because you are attempting to visit a URL that is of a different origin.")
           expect(err.message).to.include("The new URL is considered a different origin because the following parts of the URL are different:")
           expect(err.message).to.include("> port")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/cannot-visit-different-origin-domain")
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
           done()
@@ -1113,9 +1126,10 @@ describe "src/cy/commands/navigation", ->
         cy.on "fail", (err) =>
           lastLog = @lastLog
 
-          expect(err.message).to.include("cy.visit() failed because you are attempting to visit a URL that is of a different origin.")
+          expect(err.message).to.include("`cy.visit()` failed because you are attempting to visit a URL that is of a different origin.")
           expect(err.message).to.include("The new URL is considered a different origin because the following parts of the URL are different:")
           expect(err.message).to.include("> protocol")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/cannot-visit-different-origin-domain")
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
           done()
@@ -1127,9 +1141,10 @@ describe "src/cy/commands/navigation", ->
         cy.on "fail", (err) =>
           lastLog = @lastLog
 
-          expect(err.message).to.include("cy.visit() failed because you are attempting to visit a URL that is of a different origin.")
+          expect(err.message).to.include("`cy.visit()` failed because you are attempting to visit a URL that is of a different origin.")
           expect(err.message).to.include("The new URL is considered a different origin because the following parts of the URL are different:")
           expect(err.message).to.include("> superdomain")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/cannot-visit-different-origin-domain")
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
           done()
@@ -1163,7 +1178,8 @@ describe "src/cy/commands/navigation", ->
         cy.on "fail", (err) =>
           lastLog = @lastLog
 
-          expect(err.message).to.include("cy.visit() failed because you are attempting to visit a URL that is of a different origin.")
+          expect(err.message).to.include("`cy.visit()` failed because you are attempting to visit a URL that is of a different origin.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/cannot-visit-different-origin-domain")
           expect(@logs.length).to.eq(2)
           expect(lastLog.get("error")).to.eq(err)
           done()
@@ -1198,7 +1214,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             http://localhost:3500/foo.html
 
@@ -1250,7 +1266,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             /foo.html
 
@@ -1297,7 +1313,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             /bar
 
@@ -1345,7 +1361,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             https://google.com/foo
 
@@ -1353,9 +1369,9 @@ describe "src/cy/commands/navigation", ->
 
               > 500: Server Error
 
-            This was considered a failure because the status code was not '2xx'.
+            This was considered a failure because the status code was not `2xx`.
 
-            If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+            If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
           """)
           expect(emit).to.be.calledWithMatch("visit:failed", obj)
           expect(@logs.length).to.eq(1)
@@ -1392,7 +1408,7 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             https://google.com/foo
 
@@ -1400,14 +1416,14 @@ describe "src/cy/commands/navigation", ->
 
               > 401: Unauthorized
 
-            This was considered a failure because the status code was not '2xx'.
+            This was considered a failure because the status code was not `2xx`.
 
             This http request was redirected '2' times to:
 
               - 302: https://google.com/bar/
               - 301: https://gmail.com/
 
-            If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+            If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
           """)
           expect(emit).to.be.calledWithMatch("visit:failed", obj)
           expect(@logs.length).to.eq(1)
@@ -1430,19 +1446,19 @@ describe "src/cy/commands/navigation", ->
             lastLog = @lastLog
 
             expect(err.message).to.include("""
-              cy.visit() failed trying to load:
+              `cy.visit()` failed trying to load:
 
               http://localhost:3500/#{pathName}
 
-              The content-type of the response we received from your web server was:
+              The `content-type` of the response we received from your web server was:
 
-                > #{contentType}
+                > `#{contentType}`
 
-              This was considered a failure because responses must have content-type: 'text/html'
+              This was considered a failure because responses must have `content-type: 'text/html'`
 
-              However, you can likely use cy.request() instead of cy.visit().
+              However, you can likely use `cy.request()` instead of `cy.visit()`.
 
-              cy.request() will automatically get and set cookies and enable you to parse responses.
+              `cy.request()` will automatically get and set cookies and enable you to parse responses.
             """)
             expect(@logs.length).to.eq(1)
             expect(lastLog.get("error")).to.eq(err)
@@ -1475,19 +1491,19 @@ describe "src/cy/commands/navigation", ->
           lastLog = @lastLog
 
           expect(err.message).to.include("""
-            cy.visit() failed trying to load:
+            `cy.visit()` failed trying to load:
 
             https://google.com/foo
 
-            The content-type of the response we received from this local file was:
+            The `content-type` of the response we received from this local file was:
 
-              > application/json
+              > `application/json`
 
-            This was considered a failure because responses must have content-type: 'text/html'
+            This was considered a failure because responses must have `content-type: 'text/html'`
 
-            However, you can likely use cy.request() instead of cy.visit().
+            However, you can likely use `cy.request()` instead of `cy.visit()`.
 
-            cy.request() will automatically get and set cookies and enable you to parse responses.
+            `cy.request()` will automatically get and set cookies and enable you to parse responses.
           """)
           expect(emit).to.be.calledWithMatch("visit:failed", obj)
           expect(@logs.length).to.eq(1)
@@ -1517,10 +1533,11 @@ describe "src/cy/commands/navigation", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
           expect(err.message).to.eq """
-          The `body` parameter supplied to cy.visit() contained a circular reference at the path "bar.baz.quux".
+          The `body` parameter supplied to `cy.visit()` contained a circular reference at the path "bar.baz.quux".
 
           `body` can only be a string or an object with no circular references.
           """
+          expect(err.docsUrl).to.eq("https://on.cypress.io/visit")
 
           done()
 
@@ -1626,7 +1643,7 @@ describe "src/cy/commands/navigation", ->
 
           ## visit, window, page loading
           expect(@logs.length).to.eq(3)
-          expect(err.message).to.include "Your page did not fire its 'load' event within '50ms'."
+          expect(err.message).to.include "Your page did not fire its `load` event within `50ms`."
           expect(lastLog.get("name")).to.eq("page load")
           expect(lastLog.get("error")).to.eq(err)
 
@@ -1716,6 +1733,7 @@ describe "src/cy/commands/navigation", ->
 
           expect(@logs.length).to.eq(2)
           expect(err.message).to.include("Cypress detected a cross origin error happened on page load")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/cross-origin-violation")
           expect(lastLog.get("name")).to.eq("page load")
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("error")).to.eq(err)
diff --git a/packages/driver/test/cypress/integration/commands/querying_spec.js b/packages/driver/test/cypress/integration/commands/querying_spec.js
index adaf0a927060..e85482b6add5 100644
--- a/packages/driver/test/cypress/integration/commands/querying_spec.js
+++ b/packages/driver/test/cypress/integration/commands/querying_spec.js
@@ -175,7 +175,7 @@ describe('src/cy/commands/querying', () => {
         button.get(0).blur()
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('Expected to find element: \'focused\', but never found it.')
+          expect(err.message).to.include('Expected to find element: `focused`, but never found it.')
 
           done()
         })
@@ -444,7 +444,8 @@ describe('src/cy/commands/querying', () => {
       _.each(['', [], {}, 1, null, undefined], (value) => {
         it(`throws if passed anything other than a function, such as: ${value}`, (done) => {
           cy.on('fail', (err) => {
-            expect(err.message).to.include('cy.within() must be called with a function.')
+            expect(err.message).to.include('`cy.within()` must be called with a function.')
+            expect(err.docsUrl).to.eq('https://on.cypress.io/within')
 
             done()
           })
@@ -459,7 +460,7 @@ describe('src/cy/commands/querying', () => {
         })
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('cy.within() failed because this element')
+          expect(err.message).to.include('`cy.within()` failed because this element')
 
           done()
         })
@@ -1362,7 +1363,7 @@ describe('src/cy/commands/querying', () => {
 
       it('throws after timing out not finding element', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('Expected to find element: \'#missing-el\', but never found it.')
+          expect(err.message).to.include('Expected to find element: `#missing-el`, but never found it.')
 
           done()
         })
@@ -1372,7 +1373,7 @@ describe('src/cy/commands/querying', () => {
 
       it('throws after timing out not finding element when should exist', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('Expected to find element: \'#missing-el\', but never found it.')
+          expect(err.message).to.include('Expected to find element: `#missing-el`, but never found it.')
 
           done()
         })
@@ -1382,7 +1383,7 @@ describe('src/cy/commands/querying', () => {
 
       it('throws existence error without running assertions', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('Expected to find element: \'#missing-el\', but never found it.')
+          expect(err.message).to.include('Expected to find element: `#missing-el`, but never found it.')
 
           done()
         })
@@ -1394,7 +1395,7 @@ describe('src/cy/commands/querying', () => {
 
       it('throws after timing out after a .wait() alias reference', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('Expected to find element: \'getJsonButton\', but never found it.')
+          expect(err.message).to.include('Expected to find element: `getJsonButton`, but never found it.')
 
           done()
         })
@@ -1451,7 +1452,7 @@ describe('src/cy/commands/querying', () => {
         cy.$$('#button').hide()
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('expected \'<button#button>\' to be \'visible\'')
+          expect(err.message).to.include('This element `<button#button>` is not visible because it has CSS property: `display: none`')
 
           done()
         })
@@ -1463,7 +1464,7 @@ describe('src/cy/commands/querying', () => {
         cy.$$('#button').hide()
 
         cy.on('fail', (err) => {
-          expect(err.message).to.include('element \'<button#button>\' is not visible because')
+          expect(err.message).to.include('element `<button#button>` is not visible because')
 
           done()
         })
@@ -1484,9 +1485,9 @@ describe('src/cy/commands/querying', () => {
         cy.get('foobar')
       })
 
-      it('throws when alias property is \'0\'', (done) => {
+      it('throws when alias property is `0`', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('\'0\' is not a valid alias property. Are you trying to ask for the first response? If so write @getUsers.1')
+          expect(err.message).to.include('`0` is not a valid alias property. Are you trying to ask for the first response? If so write `@getUsers.1`')
 
           done()
         })
@@ -1499,7 +1500,7 @@ describe('src/cy/commands/querying', () => {
 
       it('throws when alias property isnt just a digit', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('\'1b\' is not a valid alias property. Only \'numbers\' or \'all\' is permitted.')
+          expect(err.message).to.include('`1b` is not a valid alias property. Only `numbers` or `all` is permitted.')
 
           done()
         })
@@ -1510,9 +1511,9 @@ describe('src/cy/commands/querying', () => {
         .get('@getUsers.1b')
       })
 
-      it('throws when alias property isnt a digit or \'all\'', (done) => {
+      it('throws when alias property isnt a digit or `all`', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('\'all \' is not a valid alias property. Only \'numbers\' or \'all\' is permitted.')
+          expect(err.message).to.include('`all ` is not a valid alias property. Only `numbers` or `all` is permitted.')
 
           done()
         })
@@ -1835,7 +1836,7 @@ space
       it('finds el with new lines + spaces', () => {
         const btn = $(`\
 <button id="whitespace2">
-White       
+White
 space
 </button>\
 `).appendTo(cy.$$('body'))
@@ -1927,7 +1928,7 @@ space
 
       it('throws when content has "i" flag while matchCase: true', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('You passed a regular expression with the case-insensitive (i) flag and { matchCase: true } to cy.contains(). Those options conflict with each other, so please choose one or the other.')
+          expect(err.message).to.eq('You passed a regular expression with the case-insensitive (_i_) flag and `{ matchCase: true }` to `cy.contains()`. Those options conflict with each other, so please choose one or the other.')
 
           done()
         })
@@ -2170,7 +2171,8 @@ space
       _.each([undefined, null], (val) => {
         it(`throws when text is ${val}`, (done) => {
           cy.on('fail', (err) => {
-            expect(err.message).to.eq('cy.contains() can only accept a string, number or regular expression.')
+            expect(err.message).to.eq('`cy.contains()` can only accept a string, number or regular expression.')
+            expect(err.docsUrl).to.eq('https://on.cypress.io/contains')
 
             done()
           })
@@ -2181,7 +2183,8 @@ space
 
       it('throws on a blank string', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.eq('cy.contains() cannot be passed an empty string.')
+          expect(err.message).to.eq('`cy.contains()` cannot be passed an empty string.')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/contains')
 
           done()
         })
@@ -2278,7 +2281,8 @@ space
       it('throws when assertion is have.length > 1', function (done) {
         cy.on('fail', (err) => {
           expect(this.logs.length).to.eq(1)
-          expect(err.message).to.eq('cy.contains() cannot be passed a length option because it will only ever return 1 element.')
+          expect(err.message).to.eq('`cy.contains()` cannot be passed a `length` option because it will only ever return 1 element.')
+          expect(err.docsUrl).to.eq('https://on.cypress.io/contains')
 
           done()
         })
diff --git a/packages/driver/test/cypress/integration/commands/request_spec.coffee b/packages/driver/test/cypress/integration/commands/request_spec.coffee
index 8fd7b2158f3f..b828270f711a 100644
--- a/packages/driver/test/cypress/integration/commands/request_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/request_spec.coffee
@@ -333,8 +333,7 @@ describe "src/cy/commands/request", ->
         .then (resp) ->
           ## make sure it really was 500!
           expect(resp.status).to.eq(500)
-
-          expect(warning).to.be.calledWith("The cy.request() 'failOnStatus' option has been renamed to 'failOnStatusCode'. Please update your code. This option will be removed at a later time.")
+          expect(warning.lastCall.args[0]).to.include("The `cy.request()` `failOnStatus` option has been renamed to `failOnStatusCode`. Please update your code. This option will be removed at a later time.")
 
     describe "failOnStatusCode", ->
       it "does not fail on status 401", ->
@@ -607,7 +606,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() requires a url. You did not provide a url.")
+          expect(err.message).to.eq("`cy.request()` requires a `url`. You did not provide a `url`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request()
@@ -622,7 +622,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() must be provided a fully qualified url - one that begins with 'http'. By default cy.request() will use either the current window's origin or the 'baseUrl' in 'cypress.json'. Neither of those values were present.")
+          expect(err.message).to.eq("`cy.request()` must be provided a fully qualified `url` - one that begins with `http`. By default `cy.request()` will use either the current window's origin or the `baseUrl` in `cypress.json`. Neither of those values were present.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request("/foo/bar")
@@ -638,7 +639,7 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() must be provided a fully qualified url - one that begins with 'http'. By default cy.request() will use either the current window's origin or the 'baseUrl' in 'cypress.json' (currently disabled by --config-file=false). Neither of those values were present.")
+          expect(err.message).to.eq("`cy.request()` must be provided a fully qualified `url` - one that begins with `http`. By default `cy.request()` will use either the current window's origin or the `baseUrl` in `cypress.json` (currently disabled by --config-file=false). Neither of those values were present.")
           done()
 
         cy.request("/foo/bar")
@@ -654,7 +655,7 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() must be provided a fully qualified url - one that begins with 'http'. By default cy.request() will use either the current window's origin or the 'baseUrl' in 'foo.json'. Neither of those values were present.")
+          expect(err.message).to.eq("`cy.request()` must be provided a fully qualified `url` - one that begins with `http`. By default `cy.request()` will use either the current window's origin or the `baseUrl` in `foo.json`. Neither of those values were present.")
           done()
 
         cy.request("/foo/bar")
@@ -666,7 +667,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() requires the url to be a string.")
+          expect(err.message).to.eq("`cy.request()` requires the `url` to be a string.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -680,7 +682,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() must be passed an object literal for the 'auth' option.")
+          expect(err.message).to.eq("`cy.request()` must be passed an object literal for the `auth` option.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -695,7 +698,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() requires the 'headers' option to be an object literal.")
+          expect(err.message).to.eq("`cy.request()` requires the `headers` option to be an object literal.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -710,7 +714,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() was called with an invalid method: 'FOO'. Method can be: GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS, or any other method supported by Node's HTTP parser.")
+          expect(err.message).to.eq("`cy.request()` was called with an invalid method: `FOO`. Method can be: `GET`, `POST`, `PUT`, `DELETE`, `PATCH`, `HEAD`, `OPTIONS`, or any other method supported by Node's HTTP parser.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -725,7 +730,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() requires the 'gzip' option to be a boolean.")
+          expect(err.message).to.eq("`cy.request()` requires the `gzip` option to be a boolean.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -740,7 +746,8 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.request() requires the 'form' option to be a boolean.\n\nIf you're trying to send a x-www-form-urlencoded request then pass either a string or object literal to the 'body' property.")
+          expect(err.message).to.eq("`cy.request()` requires the `form` option to be a boolean.\n\nIf you're trying to send a `x-www-form-urlencoded` request then pass either a string or object literal to the `body` property.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -750,7 +757,8 @@ describe "src/cy/commands/request", ->
 
       it "throws when failOnStatusCode is false and retryOnStatusCodeFailure is true", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() was invoked with { failOnStatusCode: false, retryOnStatusCodeFailure: true }."
+          expect(err.message).to.contain "`cy.request()` was invoked with `{ failOnStatusCode: false, retryOnStatusCodeFailure: true }`."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           done()
 
         cy.request({
@@ -785,8 +793,9 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           expect(err.message).to.include("""
-            cy.request() failed on:
+            `cy.request()` failed on:
 
             http://localhost:1234/foo
 
@@ -794,9 +803,9 @@ describe "src/cy/commands/request", ->
 
               > 500: Server Error
 
-            This was considered a failure because the status code was not '2xx' or '3xx'.
+            This was considered a failure because the status code was not `2xx` or `3xx`.
 
-            If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+            If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
 
             -----------------------------------------------------------
 
@@ -839,7 +848,7 @@ describe "src/cy/commands/request", ->
           cy.request("http://0.0.0.0:12345")
 
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.include "`cy.request()` failed trying to load:"
           done()
 
       it "displays body_circular when body is circular", (done) ->
@@ -863,10 +872,11 @@ describe "src/cy/commands/request", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
           expect(err.message).to.eq """
-          The `body` parameter supplied to cy.request() contained a circular reference at the path "bar.baz.quux".
+          The `body` parameter supplied to `cy.request()` contained a circular reference at the path "bar.baz.quux".
 
           `body` can only be a string or an object with no circular references.
           """
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
 
           done()
 
@@ -893,8 +903,9 @@ describe "src/cy/commands/request", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/request")
           expect(err.message).to.include("""
-            cy.request() failed on:
+            `cy.request()` failed on:
 
             http://localhost:1234/foo
 
@@ -902,9 +913,9 @@ describe "src/cy/commands/request", ->
 
               > 500: Server Error
 
-            This was considered a failure because the status code was not '2xx' or '3xx'.
+            This was considered a failure because the status code was not `2xx` or `3xx`.
 
-            If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+            If you do not want status codes to cause failures pass the option: `failOnStatusCode: false`
 
             -----------------------------------------------------------
 
@@ -958,7 +969,7 @@ describe "src/cy/commands/request", ->
       ## https://github.com/cypress-io/cypress/issues/5274
       it "dont throw UNESCAPED_CHARACTERS error for url with ’ character in pathname", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.contain "`cy.request()` failed trying to load:"
           expect(err.message).to.not.contain "ERR_UNESCAPED_CHARACTERS"
           done()
 
@@ -966,7 +977,7 @@ describe "src/cy/commands/request", ->
 
       it "dont throw UNESCAPED_CHARACTERS error for url with % character in pathname", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.contain "`cy.request()` failed trying to load:"
           expect(err.message).to.not.contain "ERR_UNESCAPED_CHARACTERS"
           done()
 
@@ -974,7 +985,7 @@ describe "src/cy/commands/request", ->
 
       it "dont throw UNESCAPED_CHARACTERS error for url with ’ escaped in pathname", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.contain "`cy.request()` failed trying to load:"
           expect(err.message).to.not.contain "ERR_UNESCAPED_CHARACTERS"
           done()
 
@@ -982,7 +993,7 @@ describe "src/cy/commands/request", ->
 
       it "dont throw UNESCAPED_CHARACTERS error for url with Unicode in pathname from BMP to Astral Plane", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.contain "`cy.request()` failed trying to load:"
           expect(err.message).to.not.contain "ERR_UNESCAPED_CHARACTERS"
           done()
 
@@ -990,7 +1001,7 @@ describe "src/cy/commands/request", ->
 
       it "dont throw UNESCAPED_CHARACTERS error for url with any Unicode escaped character in pathname", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.contain "cy.request() failed trying to load:"
+          expect(err.message).to.contain "`cy.request()` failed trying to load:"
           expect(err.message).to.not.contain "ERR_UNESCAPED_CHARACTERS"
           done()
 
@@ -1007,7 +1018,7 @@ describe "src/cy/commands/request", ->
 
           cy.on "fail", (err) =>
             expect(err.message).to.include("""
-            cy.request() failed trying to load:
+            `cy.request()` failed trying to load:
 
             http://localhost:1234/foo
 
@@ -1034,7 +1045,7 @@ describe "src/cy/commands/request", ->
 
             The stack trace for this error is:
             """)
-
+            expect(err.docsUrl).to.eq("https://on.cypress.io/request")
             done()
 
           cy.request("http://localhost:1234/foo")
@@ -1050,8 +1061,9 @@ describe "src/cy/commands/request", ->
             expect(@logs.length).to.eq(1)
             expect(lastLog.get("error")).to.eq(err)
             expect(lastLog.get("state")).to.eq("failed")
+            expect(err.docsUrl).to.eq("https://on.cypress.io/request")
             expect(err.message).to.eq("""
-              cy.request() timed out waiting 50ms for a response from your server.
+              `cy.request()` timed out waiting `50ms` for a response from your server.
 
               The request we sent was:
 
diff --git a/packages/driver/test/cypress/integration/commands/screenshot_spec.coffee b/packages/driver/test/cypress/integration/commands/screenshot_spec.coffee
index c09a34304561..1752a30a6112 100644
--- a/packages/driver/test/cypress/integration/commands/screenshot_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/screenshot_spec.coffee
@@ -36,7 +36,7 @@ describe "src/cy/commands/screenshot", ->
       ## backup this property so we set it back to whatever
       ## is correct based on what mode we're currently in
       isTextTerminal = Cypress.config("isTextTerminal")
-    
+
       Cypress.config("isTextTerminal", false)
 
       cy.spy(Cypress, "action").log(false)
@@ -676,77 +676,117 @@ describe "src/cy/commands/screenshot", ->
             @lastLog = log
             @logs.push(log)
 
-        @assertErrorMessage = (message, done) =>
+        @assertErrorMessage = (message, done) ->
           cy.on "fail", (err) =>
-            expect(@lastLog.get("error").message).to.eq(message)
+            lastErr = @lastLog.get("error")
+            expect(lastErr.message).to.eq(message)
             done()
 
         return null
 
       it "throws if capture is not a string", (done) ->
-        @assertErrorMessage("cy.screenshot() 'capture' option must be one of the following: 'fullPage', 'viewport', or 'runner'. You passed: true", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `capture` option must be one of the following: `fullPage`, `viewport`, or `runner`. You passed: `true`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+
+          done()
+
         cy.screenshot({ capture: true })
 
       it "throws if capture is not a valid option", (done) ->
-        @assertErrorMessage("cy.screenshot() 'capture' option must be one of the following: 'fullPage', 'viewport', or 'runner'. You passed: foo", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `capture` option must be one of the following: `fullPage`, `viewport`, or `runner`. You passed: `foo`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+
+          done()
+
         cy.screenshot({ capture: "foo" })
 
       it "throws if scale is not a boolean", (done) ->
-        @assertErrorMessage("cy.screenshot() 'scale' option must be a boolean. You passed: foo", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `scale` option must be a boolean. You passed: `foo`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+
+          done()
+
         cy.screenshot({ scale: "foo" })
 
       it "throws if disableTimersAndAnimations is not a boolean", (done) ->
-        @assertErrorMessage("cy.screenshot() 'disableTimersAndAnimations' option must be a boolean. You passed: foo", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `disableTimersAndAnimations` option must be a boolean. You passed: `foo`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+
+          done()
+
         cy.screenshot({ disableTimersAndAnimations: "foo" })
 
       it "throws if blackout is not an array", (done) ->
-        @assertErrorMessage("cy.screenshot() 'blackout' option must be an array of strings. You passed: foo", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `blackout` option must be an array of strings. You passed: `foo`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+          done()
+
         cy.screenshot({ blackout: "foo" })
 
       it "throws if blackout is not an array of strings", (done) ->
-        @assertErrorMessage("cy.screenshot() 'blackout' option must be an array of strings. You passed: true", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` `blackout` option must be an array of strings. You passed: `true`")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+          done()
+
         cy.screenshot({ blackout: [true] })
 
       it "throws if there is a 0px tall element height", (done) ->
-        @assertErrorMessage("cy.screenshot() only works with a screenshot area with a height greater than zero.", done)
+        @assertErrorMessage("`cy.screenshot()` only works with a screenshot area with a height greater than zero.", done)
         cy.visit("/fixtures/screenshots.html")
         cy.get('.empty-element').screenshot()
 
       it "throws if padding is not a number", (done) ->
-        @assertErrorMessage("cy.screenshot() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: 50px", done)
+        @assertErrorMessage("`cy.screenshot()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `50px`", done)
         cy.screenshot({ padding: '50px' })
 
       it "throws if padding is not an array of numbers", (done) ->
-        @assertErrorMessage("cy.screenshot() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: bad, bad, bad, bad", done)
+        @assertErrorMessage("`cy.screenshot()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `bad, bad, bad, bad`", done)
         cy.screenshot({ padding: ['bad', 'bad', 'bad', 'bad'] })
 
       it "throws if padding is not an array with a length between 1 and 4", (done) ->
-        @assertErrorMessage("cy.screenshot() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: 20, 10, 20, 10, 50", done)
+        @assertErrorMessage("`cy.screenshot()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `20, 10, 20, 10, 50`", done)
         cy.screenshot({ padding: [20, 10, 20, 10, 50] })
 
       it "throws if padding is a large negative number that causes a 0px tall element height", (done) ->
-        @assertErrorMessage("cy.screenshot() only works with a screenshot area with a height greater than zero.", done)
+        @assertErrorMessage("`cy.screenshot()` only works with a screenshot area with a height greater than zero.", done)
         cy.visit("/fixtures/screenshots.html")
         cy.get('.tall-element').screenshot({ padding: -161 })
 
       it "throws if clip is not an object", (done) ->
-        @assertErrorMessage("cy.screenshot() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: true", done)
+        @assertErrorMessage("`cy.screenshot()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `true`", done)
         cy.screenshot({ clip: true })
 
       it "throws if clip is lacking proper keys", (done) ->
-        @assertErrorMessage("cy.screenshot() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: {x: 5}", done)
+        @assertErrorMessage("`cy.screenshot()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `{x: 5}`", done)
         cy.screenshot({ clip: { x: 5 } })
 
       it "throws if clip has extraneous keys", (done) ->
-        @assertErrorMessage("cy.screenshot() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: Object{5}", done)
+        @assertErrorMessage("`cy.screenshot()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `Object{5}`", done)
         cy.screenshot({ clip: { width: 100, height: 100, x: 5, y: 5, foo: 10 } })
 
       it "throws if clip has non-number values", (done) ->
-        @assertErrorMessage("cy.screenshot() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: Object{4}", done)
+        @assertErrorMessage("`cy.screenshot()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `Object{4}`", done)
         cy.screenshot({ clip: { width: 100, height: 100, x: 5, y: "5" } })
 
       it "throws if element capture with multiple elements", (done) ->
-        @assertErrorMessage("cy.screenshot() only works for a single element. You attempted to screenshot 4 elements.", done)
+        cy.on "fail", (err) =>
+          lastErr = @lastLog.get("error")
+          expect(lastErr.message).to.eq("`cy.screenshot()` only works for a single element. You attempted to screenshot 4 elements.")
+          expect(lastErr.docsUrl).to.eq("https://on.cypress.io/screenshot")
+          done()
+
         cy.visit("/fixtures/screenshots.html")
         cy.get(".multiple").screenshot()
 
@@ -780,7 +820,8 @@ describe "src/cy/commands/screenshot", ->
           expect(lastLog.get("state")).to.eq("failed")
           expect(lastLog.get("name")).to.eq("screenshot")
           expect(lastLog.get("message")).to.eq("foo")
-          expect(err.message).to.eq("cy.screenshot() timed out waiting '50ms' to complete.")
+          expect(err.message).to.eq("`cy.screenshot()` timed out waiting `50ms` to complete.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/screenshot")
           done()
 
         cy.screenshot("foo", {timeout: 50})
diff --git a/packages/driver/test/cypress/integration/commands/task_spec.coffee b/packages/driver/test/cypress/integration/commands/task_spec.coffee
index b69c9a1748ac..4ae08cf5430e 100644
--- a/packages/driver/test/cypress/integration/commands/task_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/task_spec.coffee
@@ -108,7 +108,8 @@ describe "src/cy/commands/task", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.task() must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.message).to.eq("`cy.task()` must be passed a non-empty string as its 1st argument. You passed: ``.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task()
@@ -120,7 +121,8 @@ describe "src/cy/commands/task", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.task() must be passed a non-empty string as its 1st argument. You passed: '3'.")
+          expect(err.message).to.eq("`cy.task()` must be passed a non-empty string as its 1st argument. You passed: `3`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task(3)
@@ -132,7 +134,8 @@ describe "src/cy/commands/task", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.task() must be passed a non-empty string as its 1st argument. You passed: ''.")
+          expect(err.message).to.eq("`cy.task()` must be passed a non-empty string as its 1st argument. You passed: ``.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task('')
@@ -147,7 +150,7 @@ describe "src/cy/commands/task", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
 
-          expect(err.message).to.include("cy.task('foo') failed with the following error:")
+          expect(err.message).to.include("`cy.task('foo')` failed with the following error:")
           expect(err.message).to.include("Error: task failed")
           done()
 
@@ -161,7 +164,7 @@ describe "src/cy/commands/task", ->
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
 
-          expect(err.message).to.eq("cy.task('bar') failed with the following error:\n\nThe task 'bar' was not handled in the plugins file. The following tasks are registered: return:arg, wait, create:long:file\n\nFix this in your plugins file here:\n#{Cypress.config('pluginsFile')}\n\nhttps://on.cypress.io/api/task")
+          expect(err.message).to.eq("`cy.task('bar')` failed with the following error:\n\nThe task 'bar' was not handled in the plugins file. The following tasks are registered: return:arg, wait, create:long:file\n\nFix this in your plugins file here:\n#{Cypress.config('pluginsFile')}\n\nhttps://on.cypress.io/api/task")
           done()
 
         cy.task("bar")
@@ -175,7 +178,8 @@ describe "src/cy/commands/task", ->
           expect(@logs.length).to.eq(1)
           expect(lastLog.get("error")).to.eq(err)
           expect(lastLog.get("state")).to.eq("failed")
-          expect(err.message).to.eq("cy.task('foo') timed out after waiting 50ms.")
+          expect(err.message).to.eq("`cy.task('foo')` timed out after waiting `50ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task("foo", null, { timeout: 50 })
@@ -200,14 +204,16 @@ describe "src/cy/commands/task", ->
         Cypress.backend.rejects(err)
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.task('wait') timed out after waiting 100ms.")
+          expect(err.message).to.include("`cy.task('wait')` timed out after waiting `100ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task("wait", null, { timeout: 100 })
 
       it "can really time out", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.task('wait') timed out after waiting 100ms.")
+          expect(err.message).to.include("`cy.task('wait')` timed out after waiting `100ms`.")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/task")
           done()
 
         cy.task("wait", null, { timeout: 100 })
diff --git a/packages/driver/test/cypress/integration/commands/traversals_spec.coffee b/packages/driver/test/cypress/integration/commands/traversals_spec.coffee
index b71259cc86d1..ae121808fe1a 100644
--- a/packages/driver/test/cypress/integration/commands/traversals_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/traversals_spec.coffee
@@ -38,7 +38,7 @@ describe "src/cy/commands/traversals", ->
 
         it "throws when options.length isnt a number", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.include "You must provide a valid number to a length assertion. You passed: 'asdf'"
+            expect(err.message).to.include "You must provide a valid number to a `length` assertion. You passed: `asdf`"
             done()
 
           cy.get("#list")[name](arg).should("have.length", "asdf")
@@ -74,7 +74,7 @@ describe "src/cy/commands/traversals", ->
             cy.$$("#list").remove()
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.#{name}() failed because this element"
+            expect(err.message).to.include "`cy.#{name}()` failed because this element"
             done()
 
           cy.get("#list")[name](arg)
@@ -84,7 +84,7 @@ describe "src/cy/commands/traversals", ->
             node = dom.stringify cy.$$(node), "short"
 
             cy.on "fail", (err) ->
-              expect(err.message).to.include "Expected to find element: '#{el}', but never found it. Queried from element: #{node}"
+              expect(err.message).to.include "Expected to find element: `#{el}`, but never found it. Queried from element: #{node}"
               done()
 
           switch name
@@ -239,7 +239,7 @@ describe "src/cy/commands/traversals", ->
 
     it "errors after timing out not finding element", (done) ->
       cy.on "fail", (err) ->
-        expect(err.message).to.include "Expected to find element: 'span', but never found it. Queried from element: <li.item>"
+        expect(err.message).to.include "Expected to find element: `span`, but never found it. Queried from element: <li.item>"
         done()
 
       cy.get("#list li:last").find("span")
diff --git a/packages/driver/test/cypress/integration/commands/waiting_spec.coffee b/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
index 22be0c5a0c18..c5a6bf30eab1 100644
--- a/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
@@ -35,7 +35,7 @@ describe "src/cy/commands/waiting", ->
       describe "errors thrown", ->
         it "is deprecated", (done) ->
           cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait(fn) has been deprecated. Instead just change this command to be cy.should(fn)."
+            expect(err.message).to.eq "`cy.wait(fn)` has been deprecated. Change this command to be `cy.should(fn)`."
             done()
 
           cy.get("body").wait ($body) ->
@@ -189,7 +189,8 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when alias doesnt match a route", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() only accepts aliases for routes.\nThe alias: 'b' did not match a route."
+            expect(err.message).to.include "`cy.wait()` only accepts aliases for routes.\nThe alias: `b` did not match a route."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/wait")
             done()
 
           cy.get("body").as("b").wait("@b")
@@ -198,19 +199,18 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st request to the route: 'fetch'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st request to the route: `fetch`. No request ever occurred."
             done()
 
-          cy
-            .server()
-            .route("GET", /.*/, {}).as("fetch")
-            .wait("@fetch")
+          cy.server()
+          cy.route("GET", /.*/, {}).as("fetch")
+          cy.wait("@fetch")
 
         it "throws when alias is never requested", (done) ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st request to the route: 'foo'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st request to the route: `foo`. No request ever occurred."
             done()
 
           cy
@@ -220,7 +220,7 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when alias is missing '@' but matches an available alias", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "Invalid alias: 'getAny'.\nYou forgot the '@'. It should be written as: '@getAny'."
+            expect(err.message).to.eq "Invalid alias: `getAny`.\nYou forgot the `@`. It should be written as: `@getAny`."
             done()
 
           cy
@@ -230,7 +230,7 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when 2nd alias doesnt match any registered alias", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "cy.wait() could not find a registered alias for: '@bar'.\nAvailable aliases are: 'foo'."
+            expect(err.message).to.eq "`cy.wait()` could not find a registered alias for: `@bar`.\nAvailable aliases are: `foo`."
             done()
 
           cy
@@ -243,7 +243,7 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when 2nd alias is missing '@' but matches an available alias", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "Invalid alias: 'bar'.\nYou forgot the '@'. It should be written as: '@bar'."
+            expect(err.message).to.eq "Invalid alias: `bar`.\nYou forgot the `@`. It should be written as: `@bar`."
             done()
 
           cy
@@ -257,7 +257,8 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when 2nd alias isnt a route alias", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() only accepts aliases for routes.\nThe alias: 'bar' did not match a route."
+            expect(err.message).to.include "`cy.wait()` only accepts aliases for routes.\nThe alias: `bar` did not match a route."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/wait")
             done()
 
           cy
@@ -273,7 +274,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 1000)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 1000ms for the 1st request to the route: 'foo'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `1000ms` for the 1st request to the route: `foo`. No request ever occurred."
             done()
 
           cy.on "command:retry", (options) ->
@@ -291,7 +292,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st request to the route: 'bar'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st request to the route: `bar`. No request ever occurred."
             done()
 
           cy.on "command:retry", _.once =>
@@ -309,7 +310,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st request to the route: 'foo'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st request to the route: `foo`. No request ever occurred."
             done()
 
           cy.on "command:retry", _.once =>
@@ -329,7 +330,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "Invalid alias: 'bar'.\nYou forgot the '@'. It should be written as: '@bar'."
+            expect(err.message).to.eq "Invalid alias: `bar`.\nYou forgot the `@`. It should be written as: `@bar`."
             done()
 
           cy
@@ -344,7 +345,8 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "cy.wait() only accepts aliases for routes.\nThe alias: 'bar' did not match a route."
+            expect(err.message).to.eq "`cy.wait()` only accepts aliases for routes.\nThe alias: `bar` did not match a route."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/wait")
             done()
 
           cy
@@ -379,7 +381,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 200)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 3rd request to the route: 'get.users'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 3rd request to the route: `get.users`. No request ever occurred."
             done()
 
           cy.on "command:retry", =>
@@ -401,7 +403,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 200)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 2nd request to the route: 'getUsers'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 2nd request to the route: `getUsers`. No request ever occurred."
             done()
 
           ## dont send the 2nd response
@@ -423,7 +425,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("requestTimeout", 200)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 2nd request to the route: 'getUsers'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 2nd request to the route: `getUsers`. No request ever occurred."
             done()
 
           ## dont send the 2nd request
@@ -442,7 +444,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("responseTimeout", 100)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st response to the route: 'response'. No response ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st response to the route: `response`. No response ever occurred."
             done()
 
           cy
@@ -457,7 +459,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("responseTimeout", 200)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 2nd response to the route: 'response'. No response ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 2nd response to the route: `response`. No response ever occurred."
             done()
 
           cy
@@ -473,7 +475,7 @@ describe "src/cy/commands/waiting", ->
           Cypress.config("responseTimeout", 200)
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 1st response to the route: 'bar'. No response ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 1st response to the route: `bar`. No response ever occurred."
             done()
 
           cy
@@ -495,7 +497,7 @@ describe "src/cy/commands/waiting", ->
             null
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 200ms for the 2nd request to the route: 'getUsers'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `200ms` for the 2nd request to the route: `getUsers`. No request ever occurred."
             done()
 
           cy
@@ -516,7 +518,7 @@ describe "src/cy/commands/waiting", ->
             _.defer => win.$.get("/timeout?ms=2002")
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 500ms for the 1st request to the route: 'get.three'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `500ms` for the 1st request to the route: `get.three`. No request ever occurred."
             done()
 
           cy.server()
@@ -537,7 +539,7 @@ describe "src/cy/commands/waiting", ->
               options._runnableTimeout = 0
 
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.wait() timed out waiting 1000ms for the 1st response to the route: 'getThree'. No response ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `1000ms` for the 1st response to the route: `getThree`. No response ever occurred."
             done()
 
           cy
@@ -555,7 +557,8 @@ describe "src/cy/commands/waiting", ->
 
         it "throws when passed multiple string arguments", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.eq "cy.wait() was passed invalid arguments. You cannot pass multiple strings. If you're trying to wait for multiple routes, use an array."
+            expect(err.message).to.eq "`cy.wait()` was passed invalid arguments. You cannot pass multiple strings. If you're trying to wait for multiple routes, use an array."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/wait")
             done()
 
           cy.wait("@foo", "@bar")
@@ -607,8 +610,7 @@ describe "src/cy/commands/waiting", ->
             expect(xhr.url).to.include "/users?num=3"
             expect(xhr.responseBody).to.deep.eq resp
 
-      ## TODO: fixme failing in CI sometimes
-      ## https://circleci.com/gh/cypress-io/cypress/5655
+      ## FIXME: failing in CI sometimes https://circleci.com/gh/cypress-io/cypress/5655
       it.skip "waits for the 4th request before resolving", ->
         resp = {foo: "foo"}
         response = 0
@@ -639,53 +641,22 @@ describe "src/cy/commands/waiting", ->
         beforeEach ->
           Cypress.config("defaultCommandTimeout", 50)
 
-        it "is NaN", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: NaN"
-            done()
-          cy.get("body").wait(0/0)
-
-        it "Infinity", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: Infinity"
-            done()
-          cy.get("body").wait(Infinity)
-
-        it "is empty array", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: []"
-            done()
-          cy.get("body").wait([])
-
-        it "is null", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: null"
-            done()
-          cy.get("body").wait(null)
-
-        it "is undefined", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: undefined"
-            done()
-          cy.get("body").wait(undefined)
-
-        it "is bool", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: true"
-            done()
-          cy.get("body").wait(true)
-
-        it "is Object", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: {}"
-            done()
-          cy.get("body").wait({})
-
-        it "is Symbol", (done) ->
-          cy.on "fail", (err) =>
-            expect(err.message).to.eq "cy.wait() only accepts a number, an alias of a route, or an array of aliases of routes. You passed: #{Symbol.iterator.toString()}"
-            done()
-          cy.get("body").wait(Symbol.iterator)
+        _.each [
+            { type: 'NaN', val: 0/0, errVal: 'NaN' },
+            { type: 'Infinity', val: Infinity, errVal: 'Infinity' },
+            { type: 'Array', val: [] },
+            { type: 'null', val: null },
+            { type: 'undefined', val: undefined },
+            { type: 'Boolean', val: true },
+            { type: 'Object', val: {} },
+            { type: 'Symbol', val: Symbol.iterator, errVal: "Symbol(Symbol.iterator)" }
+          ], (attrs) =>
+          it "throws when 1st arg is #{attrs.type}", (done) =>
+            cy.on "fail", (err) =>
+              expect(err.message).to.eq "`cy.wait()` only accepts a number, an alias of a route, or an array of aliases of routes. You passed: `#{attrs.errVal || JSON.stringify(attrs.val)}`"
+              expect(err.docsUrl).to.eq("https://on.cypress.io/wait")
+              done()
+            cy.get("body").wait(attrs.val)
 
     describe ".log", ->
       beforeEach ->
@@ -787,15 +758,14 @@ describe "src/cy/commands/waiting", ->
           cy.on "command:retry", ->
             numRetries += 1
 
-          cy
-            .server()
-            .route(/foo/, {}).as("getFoo")
-            .noop({}).wait("@getFoo")
+          cy.server()
+          cy.route(/foo/, {}).as("getFoo")
+          cy.noop({}).wait("@getFoo")
 
         it "only logs once", (done) ->
           cy.on "fail", (err) =>
             expect(@logs.length).to.eq(1)
-            expect(err.message).to.eq("cy.wait() could not find a registered alias for: \'@foo\'.\nYou have not aliased anything yet.")
+            expect(err.message).to.eq("`cy.wait()` could not find a registered alias for: `@foo`.\nYou have not aliased anything yet.")
             done()
 
           cy.wait("@foo")
@@ -807,7 +777,7 @@ describe "src/cy/commands/waiting", ->
             lastLog = @lastLog
 
             expect(lastLog.get("error")).to.eq err
-            expect(err.message).to.include "cy.wait() timed out waiting 100ms for the 1st request to the route: 'getBar'. No request ever occurred."
+            expect(err.message).to.include "`cy.wait()` timed out waiting `100ms` for the 1st request to the route: `getBar`. No request ever occurred."
             done()
 
           cy
diff --git a/packages/driver/test/cypress/integration/commands/window_spec.coffee b/packages/driver/test/cypress/integration/commands/window_spec.coffee
index 6c5ca200446b..49114b64e7be 100644
--- a/packages/driver/test/cypress/integration/commands/window_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/window_spec.coffee
@@ -396,7 +396,7 @@ describe "src/cy/commands/window", ->
           @lastLog = log
 
           if log.get("name") is "get"
-            throw new Error("cy.get() should not have logged out.")
+            throw new Error("`cy.get()` should not have logged out.")
 
         return null
 
@@ -621,10 +621,11 @@ describe "src/cy/commands/window", ->
 
         return null
 
-      it "throws with passed invalid preset", (done) ->
+      it "throws when passed invalid preset", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.match /^cy.viewport\(\) could not find a preset for: 'foo'. Available presets are: /
+          expect(err.message).to.match /^`cy.viewport\(\)` could not find a preset for: `foo`. Available presets are: /
+          expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
           done()
 
         cy.viewport("foo")
@@ -632,7 +633,8 @@ describe "src/cy/commands/window", ->
       it "throws when passed a string as height", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.eq "cy.viewport() can only accept a string preset or a width and height as numbers."
+          expect(err.message).to.eq "`cy.viewport()` can only accept a string preset or a `width` and `height` as numbers."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
           done()
 
         cy.viewport(800, "600")
@@ -640,7 +642,8 @@ describe "src/cy/commands/window", ->
       it "throws when passed negative numbers", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.eq "cy.viewport() width and height must be at least 0px."
+          expect(err.message).to.eq "`cy.viewport()` `width` and `height` must be at least 0px."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
           done()
 
         cy.viewport(800, -600)
@@ -654,7 +657,8 @@ describe "src/cy/commands/window", ->
       it "throws when passed an empty string as width", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.eq "cy.viewport() cannot be passed an empty string."
+          expect(err.message).to.eq "`cy.viewport()` cannot be passed an empty string."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
           done()
 
         cy.viewport("")
@@ -662,7 +666,8 @@ describe "src/cy/commands/window", ->
       it "throws when passed an invalid orientation on a preset", (done) ->
         cy.on "fail", (err) =>
           expect(@logs.length).to.eq(1)
-          expect(err.message).to.eq "cy.viewport() can only accept 'landscape' or 'portrait' as valid orientations. Your orientation was: 'foobar'"
+          expect(err.message).to.eq "`cy.viewport()` can only accept `landscape` or `portrait` as valid orientations. Your orientation was: `foobar`"
+          expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
           done()
 
         cy.viewport("iphone-4", "foobar")
@@ -676,7 +681,8 @@ describe "src/cy/commands/window", ->
 
           cy.on "fail", (err) =>
             expect(@logs.length).to.eq(1)
-            expect(err.message).to.eq "cy.viewport() can only accept a string preset or a width and height as numbers."
+            expect(err.message).to.eq "`cy.viewport()` can only accept a string preset or a `width` and `height` as numbers."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/viewport")
             done()
 
           cy.viewport(val)
diff --git a/packages/driver/test/cypress/integration/commands/xhr_spec.coffee b/packages/driver/test/cypress/integration/commands/xhr_spec.coffee
index 5021bdf8d86d..d52140bec190 100644
--- a/packages/driver/test/cypress/integration/commands/xhr_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/xhr_spec.coffee
@@ -70,7 +70,7 @@ describe "src/cy/commands/xhr", ->
           expect(xhr.status).to.eq(404)
 
     ## NOTE: flaky about 50% of the time in Firefox...
-    ## temporarily skipping for now, but this needs 
+    ## temporarily skipping for now, but this needs
     ## to be reenabled after launch once we have time
     ## to look at the underlying failure cause
     it.skip "allows multiple readystatechange calls", ->
@@ -227,6 +227,7 @@ describe "src/cy/commands/xhr", ->
             expect(onreadystatechanged).to.be.true
             expect(xhr.status).to.eq(200)
 
+    ## FIXME: I have no idea why this is skipped, this test is rly old
     describe.skip "filtering requests", ->
       beforeEach ->
         cy.server()
@@ -380,16 +381,15 @@ describe "src/cy/commands/xhr", ->
             expect(@open).to.be.calledWith("GET", "/__cypress/xhrs/http://localhost:3500/fixtures/phones/phones.json")
 
       it "does not rewrite CORS", ->
-        cy
-          .window().then (win) ->
-            @open = cy.spy(cy.state("server").options, "onOpen")
-            new Promise (resolve) ->
-              win.$.get("http://www.google.com/phones/phones.json").fail ->
-                resolve()
-          .then ->
-            xhr = cy.state("requests")[0].xhr
-            expect(xhr.url).to.eq("http://www.google.com/phones/phones.json")
-            expect(@open).to.be.calledWith("GET", "http://www.google.com/phones/phones.json")
+        cy.window().then (win) ->
+          @open = cy.spy(cy.state("server").options, "onOpen")
+          new Promise (resolve) ->
+            win.$.get("http://www.google.com/phones/phones.json").fail ->
+              resolve()
+        .then ->
+          xhr = cy.state("requests")[0].xhr
+          expect(xhr.url).to.eq("http://www.google.com/phones/phones.json")
+          expect(@open).to.be.calledWith("GET", "http://www.google.com/phones/phones.json")
 
       it "can stub real CORS requests too", ->
         cy
@@ -818,12 +818,11 @@ describe "src/cy/commands/xhr", ->
           expect(uncaughtException).calledOnce
           done()
 
-        cy
-          .window().then (win) ->
-            new Promise (resolve) ->
-              win.$.get("http://www.google.com/foo.json")
-              .fail ->
-                foo.bar()
+        cy.window().then (win) ->
+          new Promise (resolve) ->
+            win.$.get("http://www.google.com/foo.json")
+            .fail ->
+              foo.bar()
 
       it "causes errors caused by onreadystatechange callback function", (done) ->
         e = new Error("onreadystatechange caused this error")
@@ -906,21 +905,22 @@ describe "src/cy/commands/xhr", ->
         _.each ["asdf", 123, null, undefined], (arg) ->
           it "throws on bad argument: #{arg}", (done) ->
             cy.on "fail", (err) ->
-              expect(err.message).to.include "cy.server() accepts only an object literal as its argument"
+              expect(err.message).to.include "`cy.server()` accepts only an object literal as its argument"
+              expect(err.docsUrl).to.eq("https://on.cypress.io/server")
               done()
 
             cy.server(arg)
 
       it "after turning off server it throws attempting to route", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.eq("cy.route() cannot be invoked before starting the cy.server()")
+          expect(err.message).to.eq("`cy.route()` cannot be invoked before starting the `cy.server()`")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/server")
           done()
 
-        cy
-          .server()
-          .route(/app/, {})
-          .server({enable: false})
-          .route(/app/, {})
+        cy.server()
+        cy.route(/app/, {})
+        cy.server({enable: false})
+        cy.route(/app/, {})
 
       describe ".log", ->
         beforeEach ->
@@ -960,7 +960,7 @@ describe "src/cy/commands/xhr", ->
             .window().then (win) ->
               win.$.get("/foo").done ->
                 throw new Error("specific ajax error")
-
+  ## FIXME: I have no idea why this is skipped, this test is rly old
   context.skip "#server", ->
     beforeEach ->
       defaults = {
@@ -1233,7 +1233,7 @@ describe "src/cy/commands/xhr", ->
           response: {}
         })
 
-    ## FIXME
+    ## FIXME: I have no idea why this is skipped, this test is rly old
     it.skip "can explicitly done() in onRequest function from options", (done) ->
       cy
         .server()
@@ -1328,6 +1328,7 @@ describe "src/cy/commands/xhr", ->
 
       cy.route(getUsers)
 
+    ## FIXME: I have no idea why this is skipped, this test is rly old
     it.skip "adds multiple routes to the responses array", ->
       cy
         .route("foo", {})
@@ -1363,9 +1364,11 @@ describe "src/cy/commands/xhr", ->
       cy.route("GET", "/foo%25bar")
       .then ->
         expect(Cypress.utils.warning).to.be.calledWith """
-        A URL with percent-encoded characters was passed to cy.route(), but cy.route() expects a decoded URL.
+        A `url` with percent-encoded characters was passed to `cy.route()`, but `cy.route()` expects a decoded `url`.
 
         Did you mean to pass "/foo%bar"?
+
+        https://on.cypress.io/route
         """
 
     it "does not warn if an invalid percent-encoded URL is used", ->
@@ -1375,6 +1378,7 @@ describe "src/cy/commands/xhr", ->
       .then ->
         expect(Cypress.utils.warning).to.not.be.called
 
+    ## FIXME: I have no idea why this is skipped, this test is rly old
     it.skip "does not error when response is null but respond is false", ->
       cy.route
         url: /foo/
@@ -1385,17 +1389,20 @@ describe "src/cy/commands/xhr", ->
         @warn = cy.spy(window.top.console, "warn")
 
       it "logs on {force404: false}", ->
-        cy
-          .server({force404: false})
+        cy.server({force404: false})
           .then ->
-            expect(@warn).to.be.calledWith("Cypress Warning: Passing cy.server({force404: false}) is now the default behavior of cy.server(). You can safely remove this option.")
+            expect(@warn).to.be.calledWith("Cypress Warning: Passing `cy.server({force404: false})` is now the default behavior of `cy.server()`. You can safely remove this option.")
 
       it "does not log on {force404: true}", ->
-        cy
-          .server({force404: true})
+        cy.server({force404: true})
           .then ->
             expect(@warn).not.to.be.called
 
+      it "logs on {stub: false}", ->
+        cy.server({stub: false})
+          .then ->
+            expect(@warn).to.be.calledWithMatch("Cypress Warning: Passing `cy.server({stub: false})` is now deprecated. You can safely remove: `{stub: false}`.\n\nhttps://on.cypress.io/deprecated-stub-false-on-server")
+
     describe "request response alias", ->
       it "matches xhrs with lowercase methods", ->
         cy
@@ -1497,14 +1504,15 @@ describe "src/cy/commands/xhr", ->
         cy.state("serverIsStubbed", false)
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() cannot be invoked before starting the cy.server()"
+          expect(err.message).to.include "`cy.route()` cannot be invoked before starting the `cy.server()`"
           done()
 
         cy.route()
 
       it "url must be a string or regexp", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() was called with an invalid url. Url must be either a string or regular expression."
+          expect(err.message).to.include "`cy.route()` was called with an invalid `url`. `url` must be either a string or regular expression."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/route")
           done()
 
         cy.route({
@@ -1513,7 +1521,8 @@ describe "src/cy/commands/xhr", ->
 
       it "url must be a string or regexp when a function", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() was called with an invalid url. Url must be either a string or regular expression."
+          expect(err.message).to.include "`cy.route()` was called with an invalid `url`. `url` must be either a string or regular expression."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/route")
           done()
 
         getUrl = ->
@@ -1535,14 +1544,16 @@ describe "src/cy/commands/xhr", ->
 
       it "fails when method is invalid", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() was called with an invalid method: 'POSTS'."
+          expect(err.message).to.include "`cy.route()` was called with an invalid method: `POSTS`."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/route")
+
           done()
 
         cy.route("posts", "/foo", {})
 
       it "requires a url when given a response", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() must be called with a url. It can be a string or regular expression."
+          expect(err.message).to.include "`cy.route()` must be called with a `url`. It can be a string or regular expression."
           done()
 
         cy.route({})
@@ -1550,21 +1561,23 @@ describe "src/cy/commands/xhr", ->
       _.each [null, undefined], (val) ->
         it "throws if response options was explicitly set to #{val}", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.route() cannot accept an undefined or null response. It must be set to something, even an empty string will work."
+            expect(err.message).to.include "`cy.route()` cannot accept an `undefined` or `null` response. It must be set to something, even an empty string will work."
+            expect(err.docsUrl).to.eq("https://on.cypress.io/route")
             done()
 
           cy.route({url: /foo/, response: val})
 
         it "throws if response argument was explicitly set to #{val}", (done) ->
           cy.on "fail", (err) ->
-            expect(err.message).to.include "cy.route() cannot accept an undefined or null response. It must be set to something, even an empty string will work."
+            expect(err.message).to.include "`cy.route()` cannot accept an `undefined` or `null` response. It must be set to something, even an empty string will work."
             done()
 
           cy.route(/foo/, val)
 
       it "requires arguments", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include "cy.route() was not provided any arguments. You must provide valid arguments."
+          expect(err.message).to.include "`cy.route()` was not provided any arguments. You must provide valid arguments."
+          expect(err.docsUrl).to.eq("https://on.cypress.io/route")
           done()
 
         cy.route()
@@ -1586,7 +1599,7 @@ describe "src/cy/commands/xhr", ->
           .window().then (win) ->
             win.$.get("foo_bar").done ->
               foo.bar()
-
+      ## FIXME: I have no idea why this is skipped, this test is rly old
       it.skip "explodes if response fixture signature errors", (done) ->
         @trigger = cy.stub(@Cypress, "trigger").withArgs("fixture").callsArgWithAsync(2, {__error: "some error"})
 
@@ -1647,7 +1660,7 @@ describe "src/cy/commands/xhr", ->
           lastLog = @lastLog
 
           expect(@logs.length).to.eq(2)
-          expect(err.message).to.eq "cy.route() could not find a registered alias for: '@bar'.\nAvailable aliases are: 'foo'."
+          expect(err.message).to.eq "`cy.route()` could not find a registered alias for: `@bar`.\nAvailable aliases are: `foo`."
           expect(lastLog.get("name")).to.eq "route"
           expect(lastLog.get("error")).to.eq err
           expect(lastLog.get("message")).to.eq "/foo/, @bar"
@@ -2092,6 +2105,7 @@ describe "src/cy/commands/xhr", ->
             xhr.onload = resolve
         .wait("@getFoo").its("url").should("include", "/foo")
 
+  ## FIXME: I have no idea why this is skipped, this test is rly old
   context.skip "#cancel", ->
     it "calls server#cancel", (done) ->
       cancel = null
@@ -2104,6 +2118,7 @@ describe "src/cy/commands/xhr", ->
         cancel = cy.spy cy.state("server"), "cancel"
         @Cypress.trigger "abort"
 
+  ## FIXME: I have no idea why this is skipped, this test is rly old
   context.skip "#respond", ->
     it "calls server#respond", ->
       respond = null
@@ -2123,7 +2138,7 @@ describe "src/cy/commands/xhr", ->
 
       it "errors without a server", (done) ->
         cy.on "fail", (err) =>
-          expect(err.message).to.eq "cy.respond() cannot be invoked before starting the cy.server()"
+          expect(err.message).to.eq "cy.respond() cannot be invoked before starting the `cy.server()`"
           done()
 
         cy.respond()
diff --git a/packages/driver/test/cypress/integration/cy/timeouts_spec.js b/packages/driver/test/cypress/integration/cy/timeouts_spec.js
new file mode 100644
index 000000000000..d406274cc97d
--- /dev/null
+++ b/packages/driver/test/cypress/integration/cy/timeouts_spec.js
@@ -0,0 +1,45 @@
+import Timeouts from '../../../../src/cy/timeouts.coffee'
+
+describe('driver/src/cy/timeouts', () => {
+  beforeEach(() => {
+    cy.visit('/fixtures/generic.html')
+  })
+
+  it('creates timeout and clearTimeout props', () => {
+    const state = cy.state('window')
+    const timeouts = Timeouts.create(state)
+
+    expect(timeouts).to.have.property('timeout')
+    expect(timeouts).to.have.property('clearTimeout')
+  })
+
+  context('timeout', () => {
+    it('throws when no runnable', () => {
+      const state = () => { }
+      const timeouts = Timeouts.create(state)
+
+      const fn = () => {
+        return timeouts.timeout(0)
+      }
+
+      expect(fn)
+      .to.throw('Cypress cannot execute commands outside a running test.')
+      .with.property('docsUrl', 'https://on.cypress.io/cannot-execute-commands-outside-test')
+    })
+  })
+
+  context('clearTimeout', () => {
+    it('throws when no runnable', () => {
+      const state = () => { }
+      const timeouts = Timeouts.create(state)
+
+      const fn = () => {
+        return timeouts.clearTimeout()
+      }
+
+      expect(fn)
+      .to.throw('Cypress cannot execute commands outside a running test.')
+      .with.property('docsUrl', 'https://on.cypress.io/cannot-execute-commands-outside-test')
+    })
+  })
+})
diff --git a/packages/driver/test/cypress/integration/cypress/browser_spec.coffee b/packages/driver/test/cypress/integration/cypress/browser_spec.coffee
index cbae7d41ea08..6470bc12ffd3 100644
--- a/packages/driver/test/cypress/integration/cypress/browser_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/browser_spec.coffee
@@ -25,7 +25,7 @@ describe "src/cypress/browser", ->
     it "throws if arg is not a string or object", ->
       expect =>
         @commands().isBrowser(true)
-      .to.throw("Cypress.isBrowser() must be passed the name of a browser or an object to filter with. You passed: true")
+      .to.throw("`Cypress.isBrowser()` must be passed the name of a browser or an object to filter with. You passed: `true`")
 
     it "returns true if it's a match or a 'parent' browser", ->
       expect(@commands().isBrowser("chrome")).to.be.true
diff --git a/packages/driver/test/cypress/integration/cypress/cy_spec.coffee b/packages/driver/test/cypress/integration/cypress/cy_spec.coffee
index 65e2990415d9..a2e28d990aeb 100644
--- a/packages/driver/test/cypress/integration/cypress/cy_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/cy_spec.coffee
@@ -19,14 +19,14 @@ describe "driver/src/cypress/cy", ->
         cy.props.foo
 
       expect(fn).to.throw('You are accessing a private property')
-      expect(fn).to.throw('function: cy.state\(\.\.\.\)')
+      expect(fn).to.throw('function: `cy.state\(\.\.\.\)`')
 
     it "throws on accessing privates", ->
       fn = ->
         cy.privates.foo
 
       expect(fn).to.throw('You are accessing a private property')
-      expect(fn).to.throw('function: cy.state\(\.\.\.\)')
+      expect(fn).to.throw('function: `cy.state\(\.\.\.\)`')
 
   context "internals of custom commands", ->
     beforeEach ->
@@ -210,27 +210,28 @@ describe "driver/src/cypress/cy", ->
           $(@).remove()
 
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.parent() failed because this element is detached from the DOM.")
+          expect(err.message).to.include("`cy.parent()` failed because this element is detached from the DOM.")
           expect(err.message).to.include('<button id="button">button</button>')
-          expect(err.message).to.include("> cy.click()")
+          expect(err.message).to.include("> `cy.click()`")
+          expect(err.docsUrl).to.eq("https://on.cypress.io/element-has-detached-from-dom")
           done()
 
         cy.get("#button").click().parent()
 
       it "fails when previous subject isnt window", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.winOnly() failed because it requires the subject be a global 'window' object.")
+          expect(err.message).to.include("`cy.winOnly()` failed because it requires the subject be a global `window` object.")
           expect(err.message).to.include("{foo: bar}")
-          expect(err.message).to.include("> cy.wrap()")
+          expect(err.message).to.include("> `cy.wrap()`")
           done()
 
         cy.wrap({foo: 'bar'}).winOnly()
 
       it "fails when previous subject isnt document", (done) ->
         cy.on "fail", (err) ->
-          expect(err.message).to.include("cy.docOnly() failed because it requires the subject be a global 'document' object.")
+          expect(err.message).to.include("`cy.docOnly()` failed because it requires the subject be a global `document` object.")
           expect(err.message).to.include("[1, 2, 3]")
-          expect(err.message).to.include("> cy.wrap()")
+          expect(err.message).to.include("> `cy.wrap()`")
           done()
 
         cy.wrap([1,2,3]).docOnly()
@@ -240,9 +241,9 @@ describe "driver/src/cypress/cy", ->
 
         cy.on "fail", (err) ->
           expect(firstPassed).to.be.true
-          expect(err.message).to.include("cy.elWinOnly() failed because it requires a DOM element.")
+          expect(err.message).to.include("`cy.elWinOnly()` failed because it requires a DOM element.")
           expect(err.message).to.include("string")
-          expect(err.message).to.include("> cy.wrap()")
+          expect(err.message).to.include("> `cy.wrap()`")
           expect(err.message).to.include("All 2 subject validations failed")
           done()
 
@@ -327,7 +328,10 @@ describe "driver/src/cypress/cy", ->
       fn = ->
         Cypress.Commands.overwrite "foo", ->
 
-      expect(fn).to.throw("Cannot overwite command for: 'foo'. An existing command does not exist by that name.")
+      expect(fn).to.throw().with.property("message")
+        .and.include("Cannot overwite command for: `foo`. An existing command does not exist by that name.")
+      expect(fn).to.throw().with.property("docsUrl")
+        .and.include("https://on.cypress.io/api")
 
     it "updates state('current') with modified args", ->
       cy.get("form").eq(0).submit().then =>
diff --git a/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee b/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee
index 71253b9b99e9..980ed0a37970 100644
--- a/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/cypress_spec.coffee
@@ -74,14 +74,16 @@ describe "driver/src/cypress/index", ->
       fn = ->
         Cypress.Log.command({})
 
-      expect(fn).to.throw('has been renamed to Cypress.log')
+      expect(fn).to.throw('has been renamed to `Cypress.log()`')
 
     it "throws when passing non-object to Cypress.log()", ->
       fn = ->
         Cypress.log('My Log')
 
-      expect(fn).to.throw('Cypress.log() can only be called with an options object. Your argument was')
-      expect(fn).to.throw('My Log')
+      expect(fn).to.throw().with.property("message")
+        .and.include("`Cypress.log()` can only be called with an options object. Your argument was: `My Log`")
+      expect(fn).to.throw().with.property("docsUrl")
+        .and.eq("https://on.cypress.io/cypress-log")
 
     it "does not throw when Cypress.log() called outside of command", ->
       fn = ->
diff --git a/packages/driver/test/cypress/integration/cypress/error_utils_spec.coffee b/packages/driver/test/cypress/integration/cypress/error_utils_spec.coffee
index 8a020d0ae2a4..eb848db34162 100644
--- a/packages/driver/test/cypress/integration/cypress/error_utils_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/error_utils_spec.coffee
@@ -3,12 +3,36 @@ $errorMessages = require("../../../../src/cypress/error_messages")
 
 describe "driver/src/cypress/error_utils", ->
   context ".throwErr", ->
-    it "throws the error as sent", ->
-      try
-        $errUtils.throwErr("Something unexpected")
-      catch e
-        expect(e.message).to.include "Something unexpected"
-        expect(e.name).to.eq "CypressError"
+    it "throws error as a cypress error when it is a message string", ->
+      fn = -> $errUtils.throwErr("Something unexpected")
+
+      expect(fn).to.throw().and.satisfy (err) ->
+        expect(err.message).to.include "Something unexpected"
+        expect(err.name).to.eq "CypressError"
+
+    it "throws error when it is an object", ->
+      fn = -> $errUtils.throwErr({ name: "SomeError", message: "Something unexpected", extraProp: "extra prop" })
+
+      expect(fn).to.throw().and.satisfy (err) ->
+        expect(err.message).to.include("Something unexpected")
+        expect(err.name).to.eq("SomeError")
+        expect(err.extraProp).to.eq("extra prop")
+
+    it "throws error when it is an error", ->
+      err = new Error("Something unexpected")
+      err.extraProp = "extra prop"
+      fn = -> $errUtils.throwErr(err)
+
+      expect(fn).to.throw().and.satisfy (err) ->
+        expect(err.message).to.include("Something unexpected")
+        expect(err.name).to.eq("Error")
+        expect(err.extraProp).to.eq("extra prop")
+
+    it "removes stack if noStackTrace: true", ->
+      fn = -> $errUtils.throwErr("Something unexpected", { noStackTrace: true })
+
+      expect(fn).to.throw().and.satisfy (err) ->
+        expect(err.stack).to.equal("")
 
   context ".throwErrByPath", ->
     beforeEach ->
@@ -231,3 +255,19 @@ describe "driver/src/cypress/error_utils", ->
     it "returns undefined for non-existent deeper path", ->
       objVal = $errUtils.getObjValueByPath @obj, "bar.baz.nope"
       expect(objVal).to.be.undefined
+
+  context ".appendErrMsg", ->
+    it "replaces old stack message with new one", ->
+      err = new Error("old message")
+      newErr = $errUtils.appendErrMsg(err, "new message")
+
+      expect(newErr.message).to.equal("old message\n\nnew message")
+      expect(newErr.stack).to.include("Error: old message\n\nnew message\n")
+
+    it "properly replaces stack message when error has no message", ->
+      err = new Error()
+      newErr = $errUtils.appendErrMsg(err, "new message")
+
+      expect(newErr.message).to.equal("new message")
+      expect(newErr.stack).to.include("Error: new message\n")
+      expect(newErr.stack).not.to.include("\nError")
diff --git a/packages/driver/test/cypress/integration/cypress/screenshot_spec.coffee b/packages/driver/test/cypress/integration/cypress/screenshot_spec.coffee
index 5723acd6392c..296afff0f82b 100644
--- a/packages/driver/test/cypress/integration/cypress/screenshot_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/screenshot_spec.coffee
@@ -99,77 +99,148 @@ describe "src/cypress/screenshot", ->
 
     describe "errors", ->
       it "throws if not passed an object", ->
-        expect =>
-          Screenshot.defaults()
-        .to.throw("Cypress.Screenshot.defaults() must be called with an object. You passed: ")
+        fn = () =>
+          return Screenshot.defaults()
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` must be called with an object. You passed: ``")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
 
       it "throws if capture is not a string", ->
-        expect =>
-          Screenshot.defaults({ capture: true })
-        .to.throw("Cypress.Screenshot.defaults() 'capture' option must be one of the following: 'fullPage', 'viewport', or 'runner'. You passed: true")
+        fn = () =>
+          return Screenshot.defaults({ capture: true })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `capture` option must be one of the following: `fullPage`, `viewport`, or `runner`. You passed: `true`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.eq("https://on.cypress.io/screenshot-api")
 
       it "throws if capture is not a valid option", ->
-        expect =>
-          Screenshot.defaults({ capture: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'capture' option must be one of the following: 'fullPage', 'viewport', or 'runner'. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ capture: "foo" })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `capture` option must be one of the following: `fullPage`, `viewport`, or `runner`. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.eq("https://on.cypress.io/screenshot-api")
 
       it "throws if scale is not a boolean", ->
-        expect =>
-          Screenshot.defaults({ scale: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'scale' option must be a boolean. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ scale: "foo" })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `scale` option must be a boolean. You passed: `foo`")
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.eq("https://on.cypress.io/screenshot-api")
 
       it "throws if disableTimersAndAnimations is not a boolean", ->
-        expect =>
-          Screenshot.defaults({ disableTimersAndAnimations: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'disableTimersAndAnimations' option must be a boolean. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ disableTimersAndAnimations: "foo" })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `disableTimersAndAnimations` option must be a boolean. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.eq("https://on.cypress.io/screenshot-api")
 
       it "throws if screenshotOnRunFailure is not a boolean", ->
-        expect =>
-          Screenshot.defaults({ screenshotOnRunFailure: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'screenshotOnRunFailure' option must be a boolean. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ screenshotOnRunFailure: "foo" })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `screenshotOnRunFailure` option must be a boolean. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
 
       it "throws if blackout is not an array", ->
-        expect =>
-          Screenshot.defaults({ blackout: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'blackout' option must be an array of strings. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ blackout: "foo" })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `blackout` option must be an array of strings. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
 
       it "throws if blackout is not an array of strings", ->
-        expect =>
-          Screenshot.defaults({ blackout: [true] })
-        .to.throw("Cypress.Screenshot.defaults() 'blackout' option must be an array of strings. You passed: true")
+        fn = () =>
+          return Screenshot.defaults({ blackout: [true] })
+
+        expect(fn).to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `blackout` option must be an array of strings. You passed: `true`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
 
       it "throws if padding is not a number or an array of numbers with a length between 1 and 4", ->
         expect =>
           Screenshot.defaults({ padding: '50px' })
-        .to.throw("Cypress.Screenshot.defaults() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: 50px")
+        .to.throw("`Cypress.Screenshot.defaults()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `50px`")
         expect =>
           Screenshot.defaults({ padding: ['bad', 'bad', 'bad', 'bad'] })
-        .to.throw("Cypress.Screenshot.defaults() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: bad, bad, bad, bad")
+        .to.throw("`Cypress.Screenshot.defaults()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `bad, bad, bad, bad`")
         expect =>
           Screenshot.defaults({ padding: [20, 10, 20, 10, 50] })
-        .to.throw("Cypress.Screenshot.defaults() 'padding' option must be either a number or an array of numbers with a maximum length of 4. You passed: 20, 10, 20, 10, 50")
+        .to.throw("`Cypress.Screenshot.defaults()` `padding` option must be either a number or an array of numbers with a maximum length of 4. You passed: `20, 10, 20, 10, 50`")
 
       it "throws if clip is lacking proper keys", ->
         expect =>
           Screenshot.defaults({ clip: { x: 5 } })
-        .to.throw("Cypress.Screenshot.defaults() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: {x: 5}")
+        .to.throw("`Cypress.Screenshot.defaults()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `{x: 5}`")
 
       it "throws if clip has extraneous keys", ->
         expect =>
           Screenshot.defaults({ clip: { width: 100, height: 100, x: 5, y: 5, foo: 10 } })
-        .to.throw("Cypress.Screenshot.defaults() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: Object{5}")
+        .to.throw("`Cypress.Screenshot.defaults()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `Object{5}`")
 
       it "throws if clip has non-number values", ->
         expect =>
           Screenshot.defaults({ clip: { width: 100, height: 100, x: 5, y: "5" } })
-        .to.throw("Cypress.Screenshot.defaults() 'clip' option must be an object with the keys { width, height, x, y } and number values. You passed: Object{4}")
+        .to.throw("`Cypress.Screenshot.defaults()` `clip` option must be an object with the keys `{ width, height, x, y }` and number values. You passed: `Object{4}`")
 
       it "throws if onBeforeScreenshot is not a function", ->
-        expect =>
-          Screenshot.defaults({ onBeforeScreenshot: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'onBeforeScreenshot' option must be a function. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ onBeforeScreenshot: "foo" })
+
+        expect(fn)
+        .to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `onBeforeScreenshot` option must be a function. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
 
       it "throws if onAfterScreenshot is not a function", ->
-        expect =>
-          Screenshot.defaults({ onAfterScreenshot: "foo" })
-        .to.throw("Cypress.Screenshot.defaults() 'onAfterScreenshot' option must be a function. You passed: foo")
+        fn = () =>
+          return Screenshot.defaults({ onAfterScreenshot: "foo" })
+
+        expect(fn)
+        .to.throw()
+        .with.property("message")
+        .and.include("`Cypress.Screenshot.defaults()` `onAfterScreenshot` option must be a function. You passed: `foo`")
+
+        expect(fn).to.throw()
+        .with.property("docsUrl")
+        .and.include("https://on.cypress.io/screenshot-api")
diff --git a/packages/driver/test/cypress/integration/cypress/selector_playground_spec.coffee b/packages/driver/test/cypress/integration/cypress/selector_playground_spec.coffee
index d76d22cc79cb..ec0706e58012 100644
--- a/packages/driver/test/cypress/integration/cypress/selector_playground_spec.coffee
+++ b/packages/driver/test/cypress/integration/cypress/selector_playground_spec.coffee
@@ -31,19 +31,40 @@ describe "src/cypress/selector_playground", ->
       expect(SelectorPlayground.getOnElement()).to.equal(onElement)
 
     it "throws if not passed an object", ->
-      expect =>
+      fn = () =>
         SelectorPlayground.defaults()
-      .to.throw("Cypress.SelectorPlayground.defaults() must be called with an object. You passed: ")
+
+      expect(fn).to.throw()
+      .with.property("message")
+      .and.include("`Cypress.SelectorPlayground.defaults()` must be called with an object. You passed: ")
+
+      expect(fn).to.throw()
+      .with.property("docsUrl")
+      .and.include("https://on.cypress.io/selector-playground-api")
 
     it "throws if selectorPriority is not an array", ->
-      expect =>
+      fn = () =>
         SelectorPlayground.defaults({ selectorPriority: "foo" })
-      .to.throw("Cypress.SelectorPlayground.defaults() called with invalid 'selectorPriority' property. It must be an array. You passed: foo")
+
+      expect(fn).to.throw()
+      .with.property("message")
+      .and.include("`Cypress.SelectorPlayground.defaults()` called with invalid `selectorPriority` property. It must be an array. You passed: `foo`")
+
+      expect(fn).to.throw()
+      .with.property("docsUrl")
+      .and.include("https://on.cypress.io/selector-playground-api")
 
     it "throws if onElement is not a function", ->
-      expect =>
+      fn = () =>
         SelectorPlayground.defaults({ onElement: "foo" })
-      .to.throw("Cypress.SelectorPlayground.defaults() called with invalid 'onElement' property. It must be a function. You passed: foo")
+
+      expect(fn).to.throw()
+      .with.property("message")
+      .and.include("`Cypress.SelectorPlayground.defaults()` called with invalid `onElement` property. It must be a function. You passed: `foo`")
+
+      expect(fn).to.throw()
+      .with.property("docsUrl")
+      .and.include("https://on.cypress.io/selector-playground-api")
 
   context ".getSelector", ->
     it "uses defaults.selectorPriority", ->
diff --git a/packages/driver/test/cypress/integration/dom/visibility_spec.ts b/packages/driver/test/cypress/integration/dom/visibility_spec.ts
index 71f6ce9fd6c4..5bbce909e94a 100644
--- a/packages/driver/test/cypress/integration/dom/visibility_spec.ts
+++ b/packages/driver/test/cypress/integration/dom/visibility_spec.ts
@@ -17,7 +17,7 @@ describe('src/cypress/dom/visibility', () => {
         $dom.isHidden(null!)
       }
 
-      expect(fn).to.throw('Cypress.dom.isHidden() failed because it requires a DOM element. The subject received was: \'null\'')
+      expect(fn).to.throw('`Cypress.dom.isHidden()` failed because it requires a DOM element. The subject received was: `null`')
     })
   })
 
@@ -32,7 +32,7 @@ describe('src/cypress/dom/visibility', () => {
         $dom.isVisible('form')
       }
 
-      expect(fn).to.throw('Cypress.dom.isVisible() failed because it requires a DOM element. The subject received was: \'form\'')
+      expect(fn).to.throw('`Cypress.dom.isVisible()` failed because it requires a DOM element. The subject received was: `form`')
     })
   })
 
@@ -44,7 +44,7 @@ describe('src/cypress/dom/visibility', () => {
     })
 
     it('returns true if window and body > window height', function () {
-      this.add('<div style=\'height: 1000px;\' />')
+      this.add('<div style="height: 1000px; width: 10px;" />')
       const win = cy.state('window')
 
       const fn = () => {
@@ -146,15 +146,15 @@ describe('src/cypress/dom/visibility', () => {
       }
 
       // ensure all tests run against a scrollable window
-      const scrollThisIntoView = add('<div style=\'height: 1000px;\' /><div>Should be in view</div>')
-
-      this.$visHidden = add('<ul style=\'visibility: hidden;\'></ul>')
-      this.$parentVisHidden = add('<div class=\'invis\' style=\'visibility: hidden;\'><button>parent visibility: hidden</button></div>')
-      this.$displayNone = add('<button style=\'display: none\'>display: none</button>')
-      this.$inputHidden = add('<input type=\'hidden\' value=\'abcdef\'>')
-      this.$btnOpacity = add('<button style=\'opacity: 0;\'>opacity: 0</button>')
-      this.$divNoWidth = add('<div style=\'width: 0; height: 100px;\'>width: 0</div>')
-      this.$divNoHeight = add('<div style=\'width: 50px; height: 0px;\'>height: 0</div>')
+      const scrollThisIntoView = add('<div style=`height: 1000px;` /><div>Should be in view</div>')
+
+      this.$visHidden = add('<ul style="visibility: hidden;"></ul>')
+      this.$parentVisHidden = add('<div class="invis" style="visibility: hidden;"><button>parent visibility: hidden</button></div>')
+      this.$displayNone = add('<button style="display: none">display: none</button>')
+      this.$inputHidden = add('<input type="hidden" value="abcdef">')
+      this.$btnOpacity = add('<button style="opacity: 0;">opacity: 0</button>')
+      this.$divNoWidth = add('<div style="width: 0; height: 100px;">width: 0</div>')
+      this.$divNoHeight = add('<div style="width: 50px; height: 0px;">height: 0</div>')
       this.$divDetached = $('<div>foo</div>')
 
       this.$optionInSelect = add(`\
@@ -986,68 +986,67 @@ describe('src/cypress/dom/visibility', () => {
         }
       })
 
-      it('has \'display: none\'', function () {
-        this.reasonIs(this.$displayNone, 'This element \'<button>\' is not visible because it has CSS property: \'display: none\'')
+      it('has `display: none`', function () {
+        this.reasonIs(this.$displayNone, 'This element `<button>` is not visible because it has CSS property: `display: none`')
       })
 
-      it('has a parent with \'display: none\'', function () {
-        this.reasonIs(this.$parentDisplayNone.find('span'), 'This element \'<span>\' is not visible because its parent \'<div#none>\' has CSS property: \'display: none\'')
+      it('has a parent with `display: none`', function () {
+        this.reasonIs(this.$parentDisplayNone.find('span'), 'This element `<span>` is not visible because its parent `<div#none>` has CSS property: `display: none`')
       })
 
-      it('has \'visibility: hidden\'', function () {
-        this.reasonIs(this.$visHidden, 'This element \'<ul>\' is not visible because it has CSS property: \'visibility: hidden\'')
+      it('has `visibility: hidden`', function () {
+        this.reasonIs(this.$visHidden, 'This element `<ul>` is not visible because it has CSS property: `visibility: hidden`')
       })
 
-      it('has parent with \'visibility: hidden\'', function () {
-        this.reasonIs(this.$parentVisHidden.find('button'), 'This element \'<button>\' is not visible because its parent \'<div.invis>\' has CSS property: \'visibility: hidden\'')
+      it('has parent with `visibility: hidden`', function () {
+        this.reasonIs(this.$parentVisHidden.find('button'), 'This element `<button>` is not visible because its parent `<div.invis>` has CSS property: `visibility: hidden`')
       })
 
-      it('has \'visibility: collapse\'', function () {
-        this.reasonIs(this.$tableVisCollapse.find('td.collapse'), 'This element \'<td.collapse>\' is not visible because it has CSS property: \'visibility: collapse\'')
+      it('has `visibility: collapse`', function () {
+        this.reasonIs(this.$tableVisCollapse.find('td.collapse'), 'This element `<td.collapse>` is not visible because it has CSS property: `visibility: collapse`')
       })
 
-      it('has parent with \'visibility: collapse\'', function () {
-        this.reasonIs(this.$tableVisCollapse.find('tr.collapse td:first'), 'This element \'<td>\' is not visible because its parent \'<tr.collapse>\' has CSS property: \'visibility: collapse\'')
+      it('has parent with `visibility: collapse`', function () {
+        this.reasonIs(this.$tableVisCollapse.find('tr.collapse td:first'), 'This element `<td>` is not visible because its parent `<tr.collapse>` has CSS property: `visibility: collapse`')
       })
 
       it('is detached from the DOM', function () {
-        this.reasonIs(this.$divDetached, 'This element \'<div>\' is not visible because it is detached from the DOM')
+        this.reasonIs(this.$divDetached, 'This element `<div>` is not visible because it is detached from the DOM')
       })
 
       it('has effective zero width', function () {
-        this.reasonIs(this.$divNoWidth, 'This element \'<div>\' is not visible because it has an effective width and height of: \'0 x 100\' pixels.')
+        this.reasonIs(this.$divNoWidth, 'This element `<div>` is not visible because it has an effective width and height of: `0 x 100` pixels.')
       })
 
       it('has effective zero height', function () {
-        this.reasonIs(this.$divNoHeight, 'This element \'<div>\' is not visible because it has an effective width and height of: \'50 x 0\' pixels.')
+        this.reasonIs(this.$divNoHeight, 'This element `<div>` is not visible because it has an effective width and height of: `50 x 0` pixels.')
       })
 
       it('has a parent with an effective zero width and overflow: hidden', function () {
-        this.reasonIs(this.$parentNoHeight.find('span'), 'This element \'<span>\' is not visible because its parent \'<div>\' has CSS property: \'overflow: hidden\' and an effective width and height of: \'100 x 0\' pixels.')
+        this.reasonIs(this.$parentNoHeight.find('span'), 'This element `<span>` is not visible because its parent `<div>` has CSS property: `overflow: hidden` and an effective width and height of: `100 x 0` pixels.')
       })
 
       it('element sits outside boundaries of parent with overflow clipping', function () {
-        this.reasonIs(this.$elOutOfParentBoundsToRight.find('span'), 'This element \'<span>\' is not visible because its content is being clipped by one of its parent elements, which has a CSS property of overflow: \'hidden\', \'scroll\' or \'auto\'')
+        this.reasonIs(this.$elOutOfParentBoundsToRight.find('span'), 'This element `<span>` is not visible because its content is being clipped by one of its parent elements, which has a CSS property of overflow: `hidden`, `scroll` or `auto`')
       })
 
       it('is hidden because it is backface', function () {
         const el = cy.$$('body').append(`<div id="backface-invisible" style="backface-visibility:hidden; transform: rotateX(180deg)">Hello world</div>`)
 
-        this.reasonIs(el.find('#backface-invisible'), `This element \'<div#backface-invisible>\' is not visible because it is rotated and its backface is hidden.`)
+        this.reasonIs(el.find('#backface-invisible'), `This element \`<div#backface-invisible>\` is not visible because it is rotated and its backface is hidden.`)
       })
 
       it('is hidden by transform', function () {
         const el = cy.$$('body').append(`<div id="invisible-transform" style="transform: scaleX(0)">Hello world</div>`)
 
-        this.reasonIs(el.find('#invisible-transform'), `This element \'<div#invisible-transform>\' is not visible because it is hidden by transform.`)
+        this.reasonIs(el.find('#invisible-transform'), `This element \`<div#invisible-transform>\` is not visible because it is hidden by transform.`)
       })
 
       it('element is fixed and being covered', function () {
         this.reasonIs(this.$coveredUpPosFixed.find('#coveredUpPosFixed'), `\
-This element '<div#coveredUpPosFixed>' is not visible because it has CSS property: 'position: fixed' and its being covered by another element:
+This element \`<div#coveredUpPosFixed>\` is not visible because it has CSS property: \`position: fixed\` and it's being covered by another element:
 
-<div style="position: fixed; bottom: 0; left: 0">on top</div>\
-`)
+\`<div style="position: fixed; bottom: 0; left: 0">on top</div>\``)
       })
 
       it('needs scroll', function () {
@@ -1058,11 +1057,11 @@ This element '<div#coveredUpPosFixed>' is not visible because it has CSS propert
           </div>
         `)
 
-        this.reasonIs(el.find('#needsScroll'), `This element \'<button#needsScroll>\' is not visible because its ancestor has 'position: fixed' CSS property and it is overflowed by other elements. How about scrolling to the element with cy.scrollIntoView()?`)
+        this.reasonIs(el.find('#needsScroll'), `This element \`<button#needsScroll>\` is not visible because its ancestor has \`position: fixed\` CSS property and it is overflowed by other elements. How about scrolling to the element with \`cy.scrollIntoView()\`?`)
       })
 
       it('cannot determine why element is not visible', function () {
-        this.reasonIs(this.$btnOpacity, 'This element \'<button>\' is not visible.')
+        this.reasonIs(this.$btnOpacity, 'This element `<button>` is not visible.')
       })
     })
   })
diff --git a/packages/driver/test/cypress/integration/e2e/promises_spec.coffee b/packages/driver/test/cypress/integration/e2e/promises_spec.coffee
index cbfcd7f286c9..923f36b4c8bc 100644
--- a/packages/driver/test/cypress/integration/e2e/promises_spec.coffee
+++ b/packages/driver/test/cypress/integration/e2e/promises_spec.coffee
@@ -19,8 +19,8 @@ describe "promises", ->
         msg = top.console.warn.firstCall.args[0]
 
         expect(msg).to.include("Cypress detected that you returned a promise in a test, but also invoked one or more cy commands inside of that promise.")
-
         expect(msg).to.include(title)
+        expect(msg).to.include("https://on.cypress.io/returning-promise-and-commands-in-test")
 
         expect(top.console.warn).to.be.calledOnce
 
@@ -38,8 +38,8 @@ describe "promises", ->
       msg = top.console.warn.firstCall.args[0]
 
       expect(msg).to.include("Cypress detected that you returned a promise in a test, but also invoked one or more cy commands inside of that promise.")
-
       expect(msg).to.include(title)
+      expect(msg).to.include("https://on.cypress.io/returning-promise-and-commands-in-test")
 
       expect(top.console.warn).to.be.calledOnce
 
@@ -59,8 +59,9 @@ describe "promises", ->
       expect(lastLog.get("error")).to.eq(err)
 
       expect(err.message).to.include("Cypress detected that you returned a promise from a command while also invoking one or more cy commands in that promise.")
-      expect(err.message).to.include("> cy.foo()")
-      expect(err.message).to.include("> cy.wrap()")
+      expect(err.message).to.include("> `cy.foo()`")
+      expect(err.message).to.include("> `cy.wrap()`")
+      expect(err.docsUrl).to.eq("https://on.cypress.io/returning-promise-and-commands-in-another-command")
 
       done()
 
@@ -88,8 +89,8 @@ describe "promises", ->
       expect(lastLog.get("error")).to.eq(err)
 
       expect(err.message).to.include("Cypress detected that you returned a promise from a command while also invoking one or more cy commands in that promise.")
-      expect(err.message).to.include("> cy.foo()")
-      expect(err.message).to.include("> cy.wrap()")
+      expect(err.message).to.include("> `cy.foo()`")
+      expect(err.message).to.include("> `cy.wrap()`")
 
       done()
 
diff --git a/packages/driver/test/cypress/integration/e2e/return_value_spec.coffee b/packages/driver/test/cypress/integration/e2e/return_value_spec.coffee
index 8ef43f5ea33f..f680a8b038ac 100644
--- a/packages/driver/test/cypress/integration/e2e/return_value_spec.coffee
+++ b/packages/driver/test/cypress/integration/e2e/return_value_spec.coffee
@@ -24,6 +24,7 @@ describe "return values", ->
     cy.on "fail", (err) ->
       expect(err.message).to.include("> foo")
       expect(err.message).to.include("Cypress detected that you invoked one or more cy commands but returned a different value.")
+      expect(err.docsUrl).to.eq("https://on.cypress.io/returning-value-and-commands-in-test")
 
       done()
 
@@ -36,6 +37,7 @@ describe "return values", ->
       expect(err.message).to.include("> function")
       expect(err.message).to.include("return \"foo\";")
       expect(err.message).to.include("Cypress detected that you invoked one or more cy commands but returned a different value.")
+      expect(err.docsUrl).to.eq("https://on.cypress.io/returning-value-and-commands-in-test")
 
       done()
 
@@ -61,9 +63,10 @@ describe "return values", ->
       expect(@logs.length).to.eq(1)
       expect(lastLog.get("name")).to.eq("foo")
       expect(lastLog.get("error")).to.eq(err)
-      expect(err.message).to.include("> cy.foo()")
+      expect(err.message).to.include("> `cy.foo()`")
       expect(err.message).to.include("> bar")
       expect(err.message).to.include("Cypress detected that you invoked one or more cy commands in a custom command but returned a different value.")
+      expect(err.docsUrl).to.eq("https://on.cypress.io/returning-value-and-commands-in-custom-command")
 
       done()
 
@@ -81,8 +84,8 @@ describe "return values", ->
       expect(@logs.length).to.eq(1)
       expect(lastLog.get("name")).to.eq("foo")
       expect(lastLog.get("error")).to.eq(err)
-      expect(err.message).to.include("> cy.foo()")
-      expect(err.message).to.include("> function")
+      expect(err.message).to.include("> `cy.foo()`")
+      expect(err.message).to.include("> function() {")
       expect(err.message).to.include("return \"bar\";")
       expect(err.message).to.include("Cypress detected that you invoked one or more cy commands in a custom command but returned a different value.")
 
diff --git a/packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.coffee b/packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.coffee
index 8ec459f75f71..8763657308b7 100644
--- a/packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.coffee
+++ b/packages/driver/test/cypress/integration/e2e/uncaught_errors_spec.coffee
@@ -35,13 +35,16 @@ describe "uncaught errors", ->
     r = cy.state("runnable")
 
     cy.on "uncaught:exception", (err, runnable) ->
-      expect(err.name).to.eq("Uncaught ReferenceError")
-      expect(err.message).to.include("foo is not defined")
-      expect(err.message).to.include("This error originated from your application code, not from Cypress.")
-      expect(err.message).to.include("https://on.cypress.io/uncaught-exception-from-application")
-      expect(runnable is r).to.be.true
-
-      return false
+      try
+        expect(err.name).to.eq("Uncaught ReferenceError")
+        expect(err.message).to.include("foo is not defined")
+        expect(err.message).to.include("This error originated from your application code, not from Cypress.")
+        expect(err.message).to.not.include("https://on.cypress.io/uncaught-exception-from-application")
+        expect(err.docsUrl).to.eq("https://on.cypress.io/uncaught-exception-from-application")
+        expect(runnable is r).to.be.true
+        return false
+      catch err2
+        return true
 
     cy.visit("/fixtures/visit_error.html")
 
diff --git a/packages/reporter/cypress/integration/errors_spec.js b/packages/reporter/cypress/integration/errors_spec.js
deleted file mode 100644
index 522fe29e77e5..000000000000
--- a/packages/reporter/cypress/integration/errors_spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const { EventEmitter } = require('events')
-
-describe('test errors', function () {
-  beforeEach(function () {
-    cy.fixture('errors_runnables').as('runnablesErr')
-
-    // SET ERROR INFO
-    this.setError = function (err) {
-      this.runnablesErr.suites[0].tests[0].err = err
-
-      cy.get('.reporter').then(() => {
-        this.runner.emit('runnables:ready', this.runnablesErr)
-
-        this.runner.emit('reporter:start', {})
-      })
-    }
-
-    this.runner = new EventEmitter()
-
-    cy.visit('/dist').then((win) => {
-      win.render({
-        runner: this.runner,
-        specPath: '/foo/bar',
-      })
-    })
-  })
-
-  describe('command error', function () {
-    beforeEach(function () {
-      this.commandErr = {
-        name: 'CypressError',
-        message: 'cy.click() failed because this element:\n\n<button id="covered-button"></button>\n\nis being covered by another element:\n\n<span id="button-cover"></span>\n\nFix this problem, or use {force: true} to disable error checking.\n\nhttps://on.cypress.io/element-cannot-be-interacted-with',
-      }
-
-      this.setError(this.commandErr)
-    })
-
-    it('renders message and escapes html', () => {
-      cy.get('.test-error')
-      .should('contain', 'cy.click()')
-      .and('contain', '<button id="covered-button"></button>')
-      .and('contain', '<span id="button-cover"></span>')
-      .and('contain', 'https://on.cypress.io/element-cannot-be-interacted-with')
-    })
-  })
-})
diff --git a/packages/reporter/cypress/integration/test_errors_spec.js b/packages/reporter/cypress/integration/test_errors_spec.js
new file mode 100644
index 000000000000..562e61c67fbb
--- /dev/null
+++ b/packages/reporter/cypress/integration/test_errors_spec.js
@@ -0,0 +1,173 @@
+const { EventEmitter } = require('events')
+
+describe('test errors', function () {
+  beforeEach(function () {
+    cy.fixture('errors_runnables').as('runnablesErr')
+
+    this.commandErr = {
+      name: 'CommandError',
+      message: '`foo` \\`bar\\` **baz** *fizz* ** buzz **',
+      mdMessage: '`cy.check()` can only be called on `:checkbox` and `:radio`. Your subject contains a: `<form id=\"by-id\">...</form>`',
+      stack: `Some Error
+        at foo.bar (my/app.js:2:7)
+          at baz.qux (cypress/integration/foo_spec.js:5:2)
+      From previous event:
+        at bar.baz (my/app.js:8:11)
+      `,
+      parsedStack: [{
+        message: 'Some Error',
+      }, {
+        relativeFile: 'my/app.js',
+        absoluteFile: '/me/dev/my/app.js',
+        function: 'foo.bar',
+        line: 2,
+        column: 7,
+        whitespace: '  ',
+      }, {
+        relativeFile: 'cypress/integration/foo_spec.js',
+        absoluteFile: '/me/dev/cypress/integration/foo_spec.js',
+        function: 'baz.qux',
+        line: 5,
+        column: 2,
+        whitespace: '    ',
+      }, {
+        message: 'At previous event:',
+        whitespace: '  ',
+      }, {
+        relativeFile: 'my/app.js',
+        absoluteFile: '/me/dev/my/app.js',
+        function: 'bar.baz',
+        line: 8,
+        column: 11,
+        whitespace: '    ',
+      }],
+      docsUrl: 'https://on.cypress.io/type',
+      codeFrame: {
+        relativeFile: 'my/app.js',
+        absoluteFile: '/me/dev/my/app.js',
+        line: 2,
+        column: 7,
+        language: 'javascript',
+        frame: 'cy.get(\'.as - table\')\n.find(\'tbody>tr\').eq(12)\n.find(\'td\').first()\n.find(\'button\').as(\'firstBtn\')\n.then(() => { })',
+      },
+    }
+
+    this.setError = function (err) {
+      this.runnablesErr.suites[0].tests[0].err = err
+
+      cy.get('.reporter').then(() => {
+        this.runner.emit('runnables:ready', this.runnablesErr)
+
+        this.runner.emit('reporter:start', {})
+      })
+    }
+
+    this.runner = new EventEmitter()
+
+    cy.visit('cypress/support/index.html').then((win) => {
+      win.render({
+        runner: this.runner,
+        specPath: '/foo/bar',
+        config: {
+          projectRoot: '/root',
+        },
+      })
+    })
+  })
+
+  describe('print to console', function () {
+    beforeEach(function () {
+      this.setError(this.commandErr)
+    })
+
+    it('hovering shows tooltip', function () {
+      cy.get('.runnable-err-print').trigger('mouseover')
+      cy.get('.tooltip').should('have.text', 'Print error to console')
+    })
+
+    it('clicking prints to console', function () {
+      cy.spy(this.runner, 'emit')
+      cy.get('.runnable-err-print').click().should(() => {
+        expect(this.runner.emit).to.be.calledWith('runner:console:error')
+
+        const err = this.runner.emit.withArgs('runner:console:error').lastCall.args[1].err
+
+        expect(err.message).to.equal(this.commandErr.message)
+        expect(err.stack).to.equal(this.commandErr.stack)
+      })
+    })
+
+    it('does not collapse test when clicking', () => {
+      cy.get('.runnable-err-print').click()
+      cy.get('.command-wrapper').should('be.visible')
+    })
+  })
+
+  describe('stack trace', function () {
+    beforeEach(function () {
+      this.setError(this.commandErr)
+    })
+
+    it('hides stack trace by default', function () {
+      cy.get('.runnable-err-stack-trace').should('not.be.visible')
+    })
+
+    it('opens stack trace on click', function () {
+      cy.contains('View stack trace').click()
+      cy.get('.runnable-err-stack-trace').should('be.visible')
+    })
+
+    it('does not collapse test when clicking', () => {
+      cy.contains('View stack trace').click()
+      cy.get('.command-wrapper').should('be.visible')
+    })
+  })
+
+  describe('command error', function () {
+    it('shows error name', function () {
+      this.setError(this.commandErr)
+
+      cy.get('.runnable-err-name').should('contain', this.commandErr.name)
+    })
+
+    it('renders and escapes markdown', function () {
+      this.setError(this.commandErr)
+
+      cy.get('.runnable-err-message')
+
+      // renders `foo` as <code>foo</code>
+      .contains('code', 'foo')
+      .then((content) => {
+        expect(content).not.to.contain('`foo`')
+      })
+
+      // renders /`bar/` as `bar`
+      cy.get('.runnable-err-message')
+      .should('contain', '`bar`')
+
+      // renders **baz** as <strong>baz</strong>
+      cy.get('.runnable-err-message')
+      .contains('strong', 'baz')
+      .then((content) => {
+        expect(content).not.to.contain('**baz**')
+      })
+
+      // renders *fizz* as <em>fizz</em>
+      cy.get('.runnable-err-message')
+      .contains('em', 'fizz')
+      .then((content) => {
+        expect(content).not.to.contain('*fizz*')
+      })
+    })
+
+    // NOTE: still needs to be implemented
+    it.skip('renders and escapes markdown with leading/trailing whitespace', () => {
+      cy.get('.runnable-err-message')
+
+      // https://github.com/cypress-io/cypress/issues/1360
+      // renders ** buzz ** as <strong> buzz </strong>
+      .contains('code', 'foo')
+      .and('not.contain', '`foo`')
+    })
+  })
+})
diff --git a/packages/reporter/package.json b/packages/reporter/package.json
index 3114e7ff358f..81aa3cea8f89 100644
--- a/packages/reporter/package.json
+++ b/packages/reporter/package.json
@@ -29,7 +29,7 @@
     "enzyme-adapter-react-16": "1.15.2",
     "jsdom": "14.1.0",
     "lodash": "4.17.15",
-    "markdown-it": "6.1.1",
+    "markdown-it": "8.4.2",
     "mobx": "5.15.4",
     "mobx-react": "6.1.8",
     "mocha": "6.2.2",
diff --git a/packages/reporter/src/collapsible/collapsible.spec.tsx b/packages/reporter/src/collapsible/collapsible.spec.tsx
index bad82dd95e6d..05841a862380 100644
--- a/packages/reporter/src/collapsible/collapsible.spec.tsx
+++ b/packages/reporter/src/collapsible/collapsible.spec.tsx
@@ -49,15 +49,15 @@ describe('<Collapsible />', () => {
   it('opens when clicking header', () => {
     const component = shallow(<Collapsible />)
 
-    component.find('.collapsible-header').simulate('click')
+    component.find('.collapsible-header').simulate('click', { stopPropagation () {} })
     expect(component).to.have.className('is-open')
   })
 
   it('closes when clicking header twice', () => {
     const component = shallow(<Collapsible />)
 
-    component.find('.collapsible-header').simulate('click')
-    component.find('.collapsible-header').simulate('click')
+    component.find('.collapsible-header').simulate('click', { stopPropagation () {} })
+    component.find('.collapsible-header').simulate('click', { stopPropagation () {} })
     expect(component).not.to.have.className('is-open')
   })
 })
diff --git a/packages/reporter/src/collapsible/collapsible.tsx b/packages/reporter/src/collapsible/collapsible.tsx
index 58e1a210412e..0fea764f51ca 100644
--- a/packages/reporter/src/collapsible/collapsible.tsx
+++ b/packages/reporter/src/collapsible/collapsible.tsx
@@ -1,5 +1,5 @@
 import cs from 'classnames'
-import React, { Component, CSSProperties, ReactNode } from 'react'
+import React, { Component, CSSProperties, MouseEvent, ReactNode } from 'react'
 
 import { onEnterOrSpace } from '../lib/util'
 
@@ -41,14 +41,16 @@ class Collapsible extends Component<Props, State> {
         <div
           aria-expanded={this.state.isOpen}
           className={cs('collapsible-header', this.props.headerClass)}
-          onClick={this._toggleOpen}
-          onKeyPress={onEnterOrSpace(this._toggleOpen)}
+          onClick={this._onClick}
+          onKeyPress={onEnterOrSpace(this._onKeyPress)}
           role='button'
           style={this.props.headerStyle}
           tabIndex={0}
         >
           <i className='collapsible-indicator fa-fw fas'></i>
-          {this.props.header}
+          <span className='collapsible-header-text'>
+            {this.props.header}
+          </span>
           <i className='collapsible-more fas fa-ellipsis-h'></i>
         </div>
         <div className={cs('collapsible-content', this.props.contentClass)}>
@@ -61,6 +63,15 @@ class Collapsible extends Component<Props, State> {
   _toggleOpen = () => {
     this.setState({ isOpen: !this.state.isOpen })
   }
+
+  _onClick = (e: MouseEvent) => {
+    e.stopPropagation()
+    this._toggleOpen()
+  }
+
+  _onKeyPress = () => {
+    this._toggleOpen()
+  }
 }
 
 export default Collapsible
diff --git a/packages/reporter/src/commands/command-model.ts b/packages/reporter/src/commands/command-model.ts
index a5573a1e2879..97523136412a 100644
--- a/packages/reporter/src/commands/command-model.ts
+++ b/packages/reporter/src/commands/command-model.ts
@@ -1,6 +1,6 @@
 import { action, computed, observable } from 'mobx'
 
-import Err from '../lib/err-model'
+import Err from '../errors/err-model'
 import Instrument, { InstrumentProps } from '../instruments/instrument-model'
 import { TimeoutID } from '../lib/types'
 
diff --git a/packages/reporter/src/commands/commands.scss b/packages/reporter/src/commands/commands.scss
index 31ebc17369fd..1b5acb589031 100644
--- a/packages/reporter/src/commands/commands.scss
+++ b/packages/reporter/src/commands/commands.scss
@@ -110,7 +110,6 @@
 
     &:hover {
       background-color: #E0E5E7;
-      box-shadow: 0 1px 2px #ccc inset;
     }
 
     .command-alias {
@@ -192,8 +191,12 @@
   }
 
   .command-state-pending .command-number {
-    i { display: inline-block;; }
-    span { display: none; }
+    i {
+      display: inline-block;
+    }
+    span {
+      display: none;
+    }
   }
 
   .command-method {
@@ -223,7 +226,8 @@
 
     .command-number,
     .command-method,
-    .command-message {
+    .command-message,
+    .command-pin {
       color: lighten($pending, 15%);
     }
   }
@@ -231,16 +235,17 @@
   .command-state-failed > span > .command-wrapper {
     padding-left: 3px;
     border-left: 2px solid $fail;
-    background-color: lighten($fail, 30%);
+    background-color: $err-header-background;
 
     &:hover {
-      background: lighten($fail, 26%);
+      background: darken($err-header-background, 2%);
     }
 
     .command-number,
     .command-method,
-    .command-message {
-      color: $fail;
+    .command-message,
+    .command-pin {
+      color: $err-header-text;
     }
   }
 
diff --git a/packages/reporter/src/lib/err-model.spec.ts b/packages/reporter/src/errors/err-model.spec.ts
similarity index 85%
rename from packages/reporter/src/lib/err-model.spec.ts
rename to packages/reporter/src/errors/err-model.spec.ts
index 4cd3b1812d22..33a93238e07d 100644
--- a/packages/reporter/src/lib/err-model.spec.ts
+++ b/packages/reporter/src/errors/err-model.spec.ts
@@ -2,7 +2,13 @@ import Err from './err-model'
 
 describe('Err model', () => {
   context('.displayMessage', () => {
-    it('returns combo of name and message', () => {
+    it('returns combo of name and mdMessage', () => {
+      const err = new Err({ name: 'BadError', mdMessage: 'Something went poorly', message: 'Something went wrong' })
+
+      expect(err.displayMessage).to.equal('BadError: Something went poorly')
+    })
+
+    it('returns combo of name and message if no mdMessage', () => {
       const err = new Err({ name: 'BadError', message: 'Something went wrong' })
 
       expect(err.displayMessage).to.equal('BadError: Something went wrong')
diff --git a/packages/reporter/src/errors/err-model.ts b/packages/reporter/src/errors/err-model.ts
new file mode 100644
index 000000000000..7767b53f673c
--- /dev/null
+++ b/packages/reporter/src/errors/err-model.ts
@@ -0,0 +1,46 @@
+import { computed, observable } from 'mobx'
+
+export interface ErrProps {
+  name?: string
+  message?: string
+  mdMessage?: string
+  stack?: string
+  docsUrl?: string
+}
+
+export default class Err {
+  @observable name = ''
+  @observable message = ''
+  @observable stack = ''
+  @observable mdMessage = ''
+  @observable docsUrl = ''
+
+  constructor (props?: ErrProps) {
+    this.update(props)
+  }
+
+  @computed get displayMessage () {
+    if (!this.name && !this.mdMessage) return ''
+
+    return `${this.name}: ${this.mdMessage}`
+  }
+
+  @computed get isCommandErr () {
+    return /(AssertionError|CypressError)/.test(this.name)
+  }
+
+  update (props?: ErrProps) {
+    if (!props) return
+
+    if (props.name) this.name = props.name
+
+    if (props.message) this.message = props.message
+
+    // @ts-ignore
+    if (props.mdMessage || props.message) this.mdMessage = props.mdMessage || props.message
+
+    if (props.stack) this.stack = props.stack
+
+    if (props.docsUrl) this.docsUrl = props.docsUrl
+  }
+}
diff --git a/packages/reporter/src/errors/errors.scss b/packages/reporter/src/errors/errors.scss
index 22963539640b..3042af564dcc 100644
--- a/packages/reporter/src/errors/errors.scss
+++ b/packages/reporter/src/errors/errors.scss
@@ -51,4 +51,133 @@
       list-style: decimal;
     }
   }
+
+  .runnable-err-wrapper {
+    cursor: default;
+    margin: 5px 0 5px 5px;
+    padding-left: 10px;
+    border-left: 1px dotted #DDD;
+  }
+
+  .runnable-err {
+    border-left: 2px solid $fail;
+    background-color: $err-background;
+    clear: both;
+    color: $err-text;
+    margin-bottom: 0;
+    margin-top: 5px;
+    white-space: pre-wrap;
+    word-break: break-word;
+    user-select: initial;
+    overflow: auto;
+  }
+
+  .runnable-err-header {
+    display: flex;
+    justify-content: space-between;
+    background-color: $err-header-background;
+    padding: 5px 10px;
+    font-weight: bold;
+
+    .runnable-err-name {
+      flex-grow: 2;
+      font-size: 13px;
+      line-height: 22px;;
+
+      i {
+        font-size: 10px;
+        margin-right: 10px;
+      }
+    }
+  }
+
+  .runnable-err-print {
+    background: none;
+    border: solid 2px $err-text;
+    border-radius: 3px;
+    color: $err-text;
+    font-size: 8px;
+    padding: 0.4em;
+
+    &:hover,
+    &:focus {
+      background: rgba(255, 255, 255, 0.6);
+      outline: none;
+    }
+  }
+
+  .runnable-err-docs-url {
+    margin-left: 0.5em;
+    cursor: pointer;
+    color: $err-text;
+    text-decoration: underline;
+
+    i {
+      position: relative;
+      top: 1px;
+      font-size: 10px;
+      margin-left: 5px;
+      display: inline;
+    }
+
+    &:hover,
+    &:focus {
+      cursor: pointer;
+      color: lighten($err-text, 10%);
+    }
+  }
+
+  .runnable-err-message {
+    padding: 10px;
+    font-family: $monospace;
+    color: $err-text;
+    font-size: 1em;
+
+    code {
+      background-color: $err-code-background;
+      border-radius: 5px;
+      padding: 2px 5px;
+    }
+
+    strong {
+      color: $err-text;
+      font-weight: bold;
+    }
+  }
+
+  .runnable-err-stack-expander {
+    cursor: pointer;
+    outline: none;
+    padding: 0 10px 2px 5px;
+
+    &:hover,
+    &:focus {
+      color: lighten($err-text, 10%);
+    }
+
+    .collapsible-header-text {
+      text-decoration: underline;
+      font-size: 13px;
+    }
+
+    .collapsible-indicator {
+      line-height: 18px;
+      color: #eb535e !important;
+    }
+
+    .collapsible-more {
+      display: none;
+    }
+  }
+
+  .runnable-err-stack-trace {
+    overflow: auto;
+    padding: 10px;
+    font-family: $monospace;
+    margin-left: 15px;
+
+    .err-stack-line {
+      white-space: pre;
+    }
+  }
 }
diff --git a/packages/reporter/src/errors/test-error.spec.tsx b/packages/reporter/src/errors/test-error.spec.tsx
deleted file mode 100644
index 4a61c8d59bed..000000000000
--- a/packages/reporter/src/errors/test-error.spec.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import _ from 'lodash'
-import React from 'react'
-import { shallow } from 'enzyme'
-import sinon, { SinonSpy } from 'sinon'
-
-import TestModel from '../test/test-model'
-import { Events } from '../lib/events'
-
-import TestError from './test-error'
-import ErrModel from '../lib/err-model'
-
-type EventsStub = Events & {
-  emit: SinonSpy
-}
-
-const eventsStub = () => ({
-  emit: sinon.spy(),
-} as EventsStub)
-
-const model = (props: Partial<TestModel>) => {
-  return _.extend<TestModel>({
-    commands: [],
-    err: {},
-    id: 't1',
-    isActive: true,
-    level: 1,
-    state: 'passed',
-    type: 'test',
-    shouldRender: true,
-    title: 'some title',
-  }, props)
-}
-
-describe('<TestError />', () => {
-  context('errors', () => {
-    it('emits show:error event and stops propagation when error is clicked', () => {
-      const events = eventsStub()
-      const component = shallow(<TestError model={model({ err: { displayMessage: 'some error' } as ErrModel })} events={events} />)
-      const e = {
-        stopPropagation: sinon.spy(),
-      }
-
-      component.find('FlashOnClick').simulate('click', e)
-      expect(events.emit).to.have.been.calledWith('show:error', 't1')
-      expect(e.stopPropagation).to.have.been.called
-    })
-  })
-})
diff --git a/packages/reporter/src/errors/test-error.tsx b/packages/reporter/src/errors/test-error.tsx
index ede31ad3ed94..f4cc6fdcbcd1 100644
--- a/packages/reporter/src/errors/test-error.tsx
+++ b/packages/reporter/src/errors/test-error.tsx
@@ -1,30 +1,75 @@
+import _ from 'lodash'
 import React, { MouseEvent } from 'react'
-import FlashOnClick from '../lib/flash-on-click'
-import { Events } from '../lib/events'
+import { observer } from 'mobx-react'
+import Markdown from 'markdown-it'
+// @ts-ignore
+import Tooltip from '@cypress/react-tooltip'
+
+import Collapsible from '../collapsible/collapsible'
+
+import events from '../lib/events'
 import TestModel from '../test/test-model'
 
 interface Props {
-  events: Events
   model: TestModel
 }
 
-function TestError (props: Props) {
-  function _onErrorClick (e: MouseEvent) {
+const TestError = observer((props: Props) => {
+  const md = new Markdown('zero')
+
+  md.enable(['backticks', 'emphasis', 'escape'])
+
+  const onPrint = (e: MouseEvent) => {
     e.stopPropagation()
 
-    props.events.emit('show:error', props.model.id)
+    events.emit('show:error', props.model.id)
+  }
+
+  const formattedMessage = (message?: string) => {
+    return message ? md.renderInline(message) : ''
   }
 
-  const { displayMessage } = props.model.err
+  const { err } = props.model
+
+  if (!err.displayMessage) return null
 
   return (
-    <FlashOnClick
-      message='Printed output to your console'
-      onClick={_onErrorClick}
-    >
-      <pre className='test-error'>{displayMessage}</pre>
-    </FlashOnClick>
+    <div className='runnable-err-wrapper'>
+      <div className='runnable-err'>
+        <div className='runnable-err-header'>
+          <div className='runnable-err-name'>
+            <i className='fas fa-exclamation-circle'></i>
+            {err.name}
+          </div>
+
+          <Tooltip title='Print error to console'>
+            <button className='runnable-err-print' onClick={onPrint}>
+              <i className='fas fa-terminal'></i>
+            </button>
+          </Tooltip>
+        </div>
+        <div className='runnable-err-message'>
+          <span dangerouslySetInnerHTML={{ __html: formattedMessage(err.message) }}></span>
+          {err.docsUrl &&
+            <a className='runnable-err-docs-url' href={err.docsUrl} target='_blank'>
+              Learn more
+              <i className='fas fa-external-link-alt'></i>
+            </a>
+          }
+        </div>
+
+        {err.stack &&
+          <Collapsible
+            header='View stack trace'
+            headerClass='runnable-err-stack-expander'
+            contentClass='runnable-err-stack-trace'
+          >
+            {err.stack}
+          </Collapsible>
+        }
+      </div>
+    </div>
   )
-}
+})
 
 export default TestError
diff --git a/packages/reporter/src/hooks/hook-model.spec.ts b/packages/reporter/src/hooks/hook-model.spec.ts
index 7d9ebb070427..21f33f42968e 100644
--- a/packages/reporter/src/hooks/hook-model.spec.ts
+++ b/packages/reporter/src/hooks/hook-model.spec.ts
@@ -3,7 +3,7 @@ import sinon from 'sinon'
 import Hook from './hook-model'
 
 import CommandModel from '../commands/command-model'
-import ErrModel from '../lib/err-model'
+import ErrModel from '../errors/err-model'
 
 describe('Hook model', () => {
   let hook: Hook
@@ -88,7 +88,8 @@ describe('Hook model', () => {
   context('#commandMatchingErr', () => {
     it('returns last command to match the error', () => {
       const matchesButIsntLast: Partial<CommandModel> = {
-        err: { displayMessage: 'matching error message' } as ErrModel,
+        // @ts-ignore
+        err: { message: 'matching error message' } as ErrModel,
         isMatchingEvent: () => {
           return false
         },
@@ -97,7 +98,8 @@ describe('Hook model', () => {
       hook.addCommand(matchesButIsntLast as CommandModel)
 
       const doesntMatch: Partial<CommandModel> = {
-        err: { displayMessage: 'other error message' } as ErrModel,
+        // @ts-ignore
+        err: { message: 'other error message' } as ErrModel,
         isMatchingEvent: () => {
           return false
         },
@@ -106,17 +108,18 @@ describe('Hook model', () => {
       hook.addCommand(doesntMatch as CommandModel)
 
       const matches: Partial<CommandModel> = {
-        err: { displayMessage: 'matching error message' } as ErrModel,
+        err: { message: 'matching error message' } as ErrModel,
       }
 
       hook.addCommand(matches as CommandModel)
 
-      expect(hook.commandMatchingErr({ displayMessage: 'matching error message' } as ErrModel)).to.eql(matches)
+      expect(hook.commandMatchingErr({ message: 'matching error message' } as ErrModel)).to.eql(matches)
     })
 
     it('returns undefined when no match', () => {
       const noMatch1: Partial<CommandModel> = {
-        err: { displayMessage: 'some error message' } as ErrModel,
+        // @ts-ignore
+        err: { message: 'some error message' } as ErrModel,
         isMatchingEvent: () => {
           return false
         },
@@ -125,12 +128,13 @@ describe('Hook model', () => {
       hook.addCommand(noMatch1 as CommandModel)
 
       const noMatch2: Partial<CommandModel> = {
-        err: { displayMessage: 'other error message' } as ErrModel,
+        // @ts-ignore
+        err: { message: 'other error message' } as ErrModel,
       }
 
       hook.addCommand(noMatch2 as CommandModel)
 
-      expect(hook.commandMatchingErr({ displayMessage: 'matching error message' } as ErrModel)).to.be.undefined
+      expect(hook.commandMatchingErr({ message: 'matching error message' } as ErrModel)).to.be.undefined
     })
   })
 
diff --git a/packages/reporter/src/hooks/hook-model.ts b/packages/reporter/src/hooks/hook-model.ts
index fbd28abbc48a..ee454dd3e0d2 100644
--- a/packages/reporter/src/hooks/hook-model.ts
+++ b/packages/reporter/src/hooks/hook-model.ts
@@ -2,7 +2,7 @@ import _ from 'lodash'
 import { observable, computed } from 'mobx'
 
 import { Alias } from '../instruments/instrument-model'
-import Err from '../lib/err-model'
+import Err from '../errors/err-model'
 import CommandModel from '../commands/command-model'
 
 export default class Hook {
@@ -73,7 +73,7 @@ export default class Hook {
   commandMatchingErr (errToMatch: Err) {
     return _(this.commands)
     .filter(({ err }) => {
-      return err && err.displayMessage === errToMatch.displayMessage
+      return err && err.message === errToMatch.message && err.message !== undefined
     })
     .last()
   }
diff --git a/packages/reporter/src/lib/base.scss b/packages/reporter/src/lib/base.scss
index aaa0949bcd58..c5faa2e2242c 100644
--- a/packages/reporter/src/lib/base.scss
+++ b/packages/reporter/src/lib/base.scss
@@ -156,3 +156,15 @@ body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input
     display: none;
   }
 }
+
+/* Used to provide additional context for screen readers */
+.visually-hidden {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
diff --git a/packages/reporter/src/lib/err-model.ts b/packages/reporter/src/lib/err-model.ts
deleted file mode 100644
index 6d847e9f06a9..000000000000
--- a/packages/reporter/src/lib/err-model.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { computed, observable } from 'mobx'
-
-export interface ErrProps {
-  name?: string
-  message?: string
-  stack?: string
-}
-
-export default class Err {
-  @observable name: string = ''
-  @observable message: string = ''
-  @observable stack: string = ''
-
-  constructor (props?: ErrProps) {
-    this.update(props)
-  }
-
-  @computed get displayMessage () {
-    if (!this.name && !this.message) return ''
-
-    return `${this.name}: ${this.message}`
-  }
-
-  @computed get isCommandErr () {
-    return /(AssertionError|CypressError)/.test(this.name)
-  }
-
-  update (props?: ErrProps | null) {
-    if (!props) return
-
-    this.name = props.name || ''
-    this.message = props.message || ''
-    this.stack = props.stack || ''
-  }
-}
diff --git a/packages/reporter/src/lib/events.spec.ts b/packages/reporter/src/lib/events.spec.ts
index 2dd2ef196649..c5d6d1b70962 100644
--- a/packages/reporter/src/lib/events.spec.ts
+++ b/packages/reporter/src/lib/events.spec.ts
@@ -302,30 +302,41 @@ describe('events', () => {
       expect(runner.emit).to.have.been.calledWith('runner:console:log', 'command id')
     })
 
-    it('emits runner:console:log on show:error when it is a command error and there is a matching command', () => {
+    it('emits runner:console:error with test id on show:error', () => {
+      const err = { isCommandErr: false }
+
+      runnablesStore.testById.returns({ err })
+      events.emit('show:error', 'test id')
+      expect(runner.emit).to.have.been.calledWith('runner:console:error', {
+        err,
+        commandId: undefined,
+      })
+    })
+
+    it('emits runner:console:error with test id and command id on show:error when it is a command error and there is a matching command', () => {
       const test = { err: { isCommandErr: true }, commandMatchingErr: () => {
         return { id: 'matching command id' }
       } }
 
       runnablesStore.testById.returns(test)
       events.emit('show:error', 'test id')
-      expect(runner.emit).to.have.been.calledWith('runner:console:log', 'matching command id')
+      expect(runner.emit).to.have.been.calledWith('runner:console:error', {
+        err: test.err,
+        commandId: 'matching command id',
+      })
     })
 
-    it('does not emit anything on show:error it is a command error but there not a matching command', () => {
+    it('emits runner:console:error with test id on show:error when it is a command error but there not a matching command', () => {
       const test = { err: { isCommandErr: true }, commandMatchingErr: () => {
         return null
       } }
 
       runnablesStore.testById.returns(test)
       events.emit('show:error', 'test id')
-      expect(runner.emit).not.to.have.been.called
-    })
-
-    it('emits runner:console:error on show:error when it is not a command error', () => {
-      runnablesStore.testById.returns({ err: { isCommandErr: false } })
-      events.emit('show:error', 'test id')
-      expect(runner.emit).to.have.been.calledWith('runner:console:error', 'test id')
+      expect(runner.emit).to.have.been.calledWith('runner:console:error', {
+        err: test.err,
+        commandId: undefined,
+      })
     })
 
     it('emits runner:show:snapshot on show:snapshot', () => {
diff --git a/packages/reporter/src/lib/events.ts b/packages/reporter/src/lib/events.ts
index e8a0709bbf51..bd0a3fbd2d1e 100644
--- a/packages/reporter/src/lib/events.ts
+++ b/packages/reporter/src/lib/events.ts
@@ -162,16 +162,12 @@ const events: Events = {
 
     localBus.on('show:error', (testId: number) => {
       const test = runnablesStore.testById(testId)
+      const command = test.err.isCommandErr && test.commandMatchingErr()
 
-      if (test.err.isCommandErr) {
-        const command = test.commandMatchingErr()
-
-        if (!command) return
-
-        runner.emit('runner:console:log', command.id)
-      } else {
-        runner.emit('runner:console:error', testId)
-      }
+      runner.emit('runner:console:error', {
+        err: test.err,
+        commandId: command ? command.id : undefined,
+      })
     })
 
     localBus.on('show:snapshot', (commandId) => {
diff --git a/packages/reporter/src/lib/variables.scss b/packages/reporter/src/lib/variables.scss
index c9e72deeb18a..40357fc625b3 100644
--- a/packages/reporter/src/lib/variables.scss
+++ b/packages/reporter/src/lib/variables.scss
@@ -6,6 +6,14 @@ $yellow-dark: #FFB61C;
 $yellow-medium: lighten($yellow-dark, 25%);
 $yellow-lightest: #ffffee;
 
+$link-text: #3380FF;
+
+$err-background: #fff3f4;
+$err-code-background: #fee4e7;
+$err-text: #cd0a17;
+$err-header-background: #fee0e3;
+$err-header-text: #cc3943;
+
 $header-height: 46px;
 $reporter-contents-min-width: 170px;
 
diff --git a/packages/reporter/src/runnables/runnables.scss b/packages/reporter/src/runnables/runnables.scss
index fb86bba69461..613cea4f4f9c 100644
--- a/packages/reporter/src/runnables/runnables.scss
+++ b/packages/reporter/src/runnables/runnables.scss
@@ -28,34 +28,6 @@
     line-height: 18px;
     padding-left: 0;
 
-    pre {
-      background-color: darken($yellow-lightest, 5%);
-      border-left: 5px solid $fail;
-      clear: both;
-      color: $fail;
-      margin-bottom: 0;
-      margin-top: 2px;
-      padding-bottom: 2px;
-      padding-left: 10px;
-      padding-top: 2px;
-      white-space: pre-wrap;
-      word-break: break-word;
-      user-select: initial;
-
-      a {
-        text-decoration: underline;
-      }
-
-      &:empty {
-        display: none;
-      }
-
-      &:hover {
-        cursor: pointer;
-        background-color: darken($yellow-lightest, 15%);
-      }
-    }
-
     &.hover {
       background-color: #f7f8f9;
       cursor: pointer;
@@ -215,6 +187,7 @@
     overflow: auto;
     position: relative;
     display: inline-flex;
+    width: 100%;
 
     &:focus {
       outline: 1px dotted #6c6c6c;
diff --git a/packages/reporter/src/test/test-model.spec.ts b/packages/reporter/src/test/test-model.spec.ts
index a89baebba939..89588b14a207 100644
--- a/packages/reporter/src/test/test-model.spec.ts
+++ b/packages/reporter/src/test/test-model.spec.ts
@@ -1,7 +1,7 @@
 import Command, { CommandProps } from '../commands/command-model'
 import Agent from '../agents/agent-model'
 import Route from '../routes/route-model'
-import Err from '../lib/err-model'
+import Err from '../errors/err-model'
 
 import TestModel, { TestProps } from './test-model'
 
@@ -159,18 +159,18 @@ describe('Test model', () => {
 
   context('#commandMatchingErr', () => {
     it('returns last command matching the error', () => {
-      const test = new TestModel({ err: { name: 'SomeError' } as Err } as TestProps, 0)
+      const test = new TestModel({ err: { message: 'SomeError' } as Err } as TestProps, 0)
 
-      test.addCommand(new Command({ err: { name: 'SomeError' } as Err } as CommandProps), 'some hook')
+      test.addCommand(new Command({ err: { message: 'SomeError' } as Err } as CommandProps), 'some hook')
       test.addCommand(new Command({ err: {} as Err } as CommandProps), 'some hook')
-      test.addCommand(new Command({ err: { name: 'SomeError' } as Err } as CommandProps), 'some hook')
+      test.addCommand(new Command({ err: { message: 'SomeError' } as Err } as CommandProps), 'some hook')
       test.addCommand(new Command({ err: {} as Err } as CommandProps), 'another hook')
-      test.addCommand(new Command({ name: 'The One', err: { name: 'SomeError' } as Err } as CommandProps), 'another hook')
+      test.addCommand(new Command({ name: 'The One', err: { message: 'SomeError' } as Err } as CommandProps), 'another hook')
       expect(test.commandMatchingErr()!.name).to.equal('The One')
     })
 
     it('returns undefined if there are no commands with errors', () => {
-      const test = new TestModel({ err: { name: 'SomeError' } as Err } as TestProps, 0)
+      const test = new TestModel({ err: { message: 'SomeError' } as Err } as TestProps, 0)
 
       test.addCommand(new Command({} as CommandProps), 'some hook')
       test.addCommand(new Command({} as CommandProps), 'some hook')
diff --git a/packages/reporter/src/test/test-model.ts b/packages/reporter/src/test/test-model.ts
index c15e78d6f63a..6baf62b82bd9 100644
--- a/packages/reporter/src/test/test-model.ts
+++ b/packages/reporter/src/test/test-model.ts
@@ -1,7 +1,7 @@
 import _ from 'lodash'
 import { action, autorun, computed, observable, observe } from 'mobx'
 
-import Err from '../lib/err-model'
+import Err from '../errors/err-model'
 import Hook from '../hooks/hook-model'
 import Runnable, { RunnableProps } from '../runnables/runnable-model'
 import Command, { CommandProps } from '../commands/command-model'
diff --git a/packages/reporter/src/test/test.tsx b/packages/reporter/src/test/test.tsx
index 19fcccc0751b..7b8d9f6a3500 100644
--- a/packages/reporter/src/test/test.tsx
+++ b/packages/reporter/src/test/test.tsx
@@ -6,7 +6,6 @@ import React, { Component } from 'react'
 import Tooltip from '@cypress/react-tooltip'
 
 import appState, { AppState } from '../lib/app-state'
-import events, { Events } from '../lib/events'
 import { indent, onEnterOrSpace } from '../lib/util'
 import runnablesStore, { RunnablesStore } from '../runnables/runnables-store'
 import scroller, { Scroller } from '../lib/scroller'
@@ -28,7 +27,6 @@ const NoCommands = observer(() => (
 
 interface Props {
   appState: AppState
-  events: Events
   runnablesStore: RunnablesStore
   scroller: Scroller
   model: TestModel
@@ -38,7 +36,6 @@ interface Props {
 class Test extends Component<Props> {
   static defaultProps = {
     appState,
-    events,
     runnablesStore,
     scroller,
   }
@@ -69,7 +66,7 @@ class Test extends Component<Props> {
   }
 
   render () {
-    const { events, model } = this.props
+    const { model } = this.props
 
     if (!model.shouldRender) return null
 
@@ -99,7 +96,7 @@ class Test extends Component<Props> {
           </div>
         </div>
         {this._contents()}
-        <TestError events={events} model={model} />
+        <TestError model={model} />
       </div>
     )
   }
diff --git a/packages/runner/src/lib/event-manager.js b/packages/runner/src/lib/event-manager.js
index c1034b32658e..ac86f839aa44 100644
--- a/packages/runner/src/lib/event-manager.js
+++ b/packages/runner/src/lib/event-manager.js
@@ -71,26 +71,27 @@ const eventManager = {
       ws.on(event, rerun)
     })
 
-    reporterBus.on('runner:console:error', (testId) => {
+    const logCommand = (logId) => {
+      const consoleProps = Cypress.getConsolePropsForLogById(logId)
+
+      logger.logFormatted(consoleProps)
+    }
+
+    reporterBus.on('runner:console:error', ({ err, commandId }) => {
       if (!Cypress) return
 
-      const err = Cypress.getErrorByTestId(testId)
+      if (commandId || err) logger.clearLog()
 
-      if (err) {
-        logger.clearLog()
-        logger.logError(err.stack)
-      } else {
-        logger.logError('No error found for test id', testId)
-      }
+      if (commandId) logCommand(commandId)
+
+      if (err) logger.logError(err.stack)
     })
 
     reporterBus.on('runner:console:log', (logId) => {
       if (!Cypress) return
 
-      const consoleProps = Cypress.getConsolePropsForLogById(logId)
-
       logger.clearLog()
-      logger.logFormatted(consoleProps)
+      logCommand(logId)
     })
 
     reporterBus.on('focus:tests', this.focusTests)
diff --git a/packages/server/__snapshots__/1_async_timeouts_spec.coffee.js b/packages/server/__snapshots__/1_async_timeouts_spec.coffee.js
index 0528beb8db4a..a9fe8cd51f44 100644
--- a/packages/server/__snapshots__/1_async_timeouts_spec.coffee.js
+++ b/packages/server/__snapshots__/1_async_timeouts_spec.coffee.js
@@ -26,11 +26,11 @@ exports['e2e async timeouts failing1 1'] = `
   2 failing
 
   1) async bar fails:
-     Error: Timed out after '100ms'. The done() callback was never invoked!
+     Error: Timed out after \`100ms\`. The \`done()\` callback was never invoked!
       [stack trace lines]
 
   2) async fails async after cypress command:
-     Error: Timed out after '100ms'. The done() callback was never invoked!
+     Error: Timed out after \`100ms\`. The \`done()\` callback was never invoked!
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.coffee.js b/packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.coffee.js
index 165c27fac202..7de58ee381d9 100644
--- a/packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.coffee.js
+++ b/packages/server/__snapshots__/1_caught_uncaught_hook_errors_spec.coffee.js
@@ -40,21 +40,21 @@ exports['e2e caught and uncaught hooks errors failing1 1'] = `
   3 failing
 
   1) s1a "before each" hook for "t2a":
-     CypressError: Timed out retrying: Expected to find element: '.does-not-exist', but never found it.
+     AssertionError: Timed out retrying: Expected to find element: \`.does-not-exist\`, but never found it.
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 's1a'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`s1a\`
       [stack trace lines]
 
   2) s3a "before all" hook for "t8a":
      Error: s3a before hook failed
 
-Because this error occurred during a 'before all' hook we are skipping the remaining tests in the current suite: 's3a'
+Because this error occurred during a \`before all\` hook we are skipping the remaining tests in the current suite: \`s3a\`
       [stack trace lines]
 
   3) s4a "before all" hook for "t10a":
      Error: s4a before hook failed
 
-Because this error occurred during a 'before all' hook we are skipping the remaining tests in the current suite: 's4a'
+Because this error occurred during a \`before all\` hook we are skipping the remaining tests in the current suite: \`s4a\`
       [stack trace lines]
 
 
@@ -146,11 +146,11 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 's1b'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`s1b\`
       [stack trace lines]
 
 
@@ -230,11 +230,11 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
 
-Because this error occurred during a 'before each' hook we are skipping all of the remaining tests.
+Because this error occurred during a \`before each\` hook we are skipping all of the remaining tests.
       [stack trace lines]
 
 
@@ -320,11 +320,11 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 's1'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`s1\`
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/1_commands_outside_of_test_spec.coffee.js b/packages/server/__snapshots__/1_commands_outside_of_test_spec.coffee.js
index 6c07d950529f..703884f68326 100644
--- a/packages/server/__snapshots__/1_commands_outside_of_test_spec.coffee.js
+++ b/packages/server/__snapshots__/1_commands_outside_of_test_spec.coffee.js
@@ -164,16 +164,14 @@ exports['e2e commands outside of test / fails on cy commands'] = `
   1 failing
 
   1)  An uncaught error was detected outside of a test:
-     Uncaught CypressError: Cannot call "cy.viewport()" outside a running test.
+     Uncaught CypressError: Cannot call \`cy.viewport()\` outside a running test.
 
-This usually happens when you accidentally write commands outside an it(...) test.
+This usually happens when you accidentally write commands outside an \`it(...)\` test.
 
-If that is the case, just move these commands inside an it(...) test.
+If that is the case, just move these commands inside an \`it(...)\` test.
 
 Check your test file for errors.
 
-https://on.cypress.io/cannot-execute-commands-outside-test
-
 This error originated from your test code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your test code it will automatically fail the current test.
@@ -181,6 +179,8 @@ When Cypress detects uncaught errors originating from your test code it will aut
 Cypress could not associate this error to any specific test.
 
 We dynamically generated a new test to display this failure.
+
+https://on.cypress.io/cannot-execute-commands-outside-test
   
 
 
diff --git a/packages/server/__snapshots__/3_config_spec.coffee.js b/packages/server/__snapshots__/3_config_spec.coffee.js
index 5cf74ef9a6f4..68a2099f70ee 100644
--- a/packages/server/__snapshots__/3_config_spec.coffee.js
+++ b/packages/server/__snapshots__/3_config_spec.coffee.js
@@ -92,7 +92,7 @@ exports['e2e config fails 1'] = `
   1 failing
 
   1) config times out looking for a missing element:
-     CypressError: Timed out retrying: Expected to find element: '#bar', but never found it.
+     AssertionError: Timed out retrying: Expected to find element: \`#bar\`, but never found it.
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/3_issue_1669_spec.coffee.js b/packages/server/__snapshots__/3_issue_1669_spec.coffee.js
index 7fefc672eefb..cb894670ba57 100644
--- a/packages/server/__snapshots__/3_issue_1669_spec.coffee.js
+++ b/packages/server/__snapshots__/3_issue_1669_spec.coffee.js
@@ -27,7 +27,7 @@ exports['e2e issue 1669 passes 1'] = `
   1) issue-1669 undefined err.stack in beforeEach hook "before each" hook for "cy.setCookie should fail with correct error":
      Error: some error, without stack
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'issue-1669 undefined err.st...'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`issue-1669 undefined err.st...\`
   
 
 
diff --git a/packages/server/__snapshots__/3_issue_173_spec.coffee.js b/packages/server/__snapshots__/3_issue_173_spec.coffee.js
index 3c7ddbb40b22..40594a274e01 100644
--- a/packages/server/__snapshots__/3_issue_173_spec.coffee.js
+++ b/packages/server/__snapshots__/3_issue_173_spec.coffee.js
@@ -24,7 +24,7 @@ exports['e2e issue 173 / failing'] = `
   1 failing
 
   1)  fails:
-     CypressError: Timed out retrying: Expected to find element: 'element_does_not_exist', but never found it.
+     AssertionError: Timed out retrying: Expected to find element: \`element_does_not_exist\`, but never found it.
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/3_issue_674_spec.coffee.js b/packages/server/__snapshots__/3_issue_674_spec.coffee.js
index f1148cb78033..c87913060983 100644
--- a/packages/server/__snapshots__/3_issue_674_spec.coffee.js
+++ b/packages/server/__snapshots__/3_issue_674_spec.coffee.js
@@ -26,15 +26,11 @@ exports['e2e issue 674 / fails'] = `
   2 failing
 
   1) issue 674 "before each" hook for "doesn't hang when both beforeEach and afterEach fail":
-     Error: 
-
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'issue 674'
+     Error: Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`issue 674\`
       [stack trace lines]
 
   2) issue 674 "after each" hook for "doesn't hang when both beforeEach and afterEach fail":
-     Error: 
-
-Because this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'issue 674'
+     Error: Because this error occurred during a \`after each\` hook we are skipping the remaining tests in the current suite: \`issue 674\`
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/3_js_error_handling_spec.coffee.js b/packages/server/__snapshots__/3_js_error_handling_spec.coffee.js
index 1a2b38441bab..3b1b6a976c4b 100644
--- a/packages/server/__snapshots__/3_js_error_handling_spec.coffee.js
+++ b/packages/server/__snapshots__/3_js_error_handling_spec.coffee.js
@@ -42,7 +42,7 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
       [stack trace lines]
@@ -54,7 +54,7 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
       [stack trace lines]
@@ -66,7 +66,7 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
       [stack trace lines]
@@ -84,7 +84,7 @@ We cannot provide you the stack trace, line number, or file where this error occ
 
 Check your Developer Tools Console for the actual error - it should be printed there.
 
-It's possible to enable debugging these scripts by adding the 'crossorigin' attribute and setting a CORS header.
+It's possible to enable debugging these scripts by adding the \`crossorigin\` attribute and setting a CORS header.
 
 https://on.cypress.io/cross-origin-script-error
 
@@ -92,7 +92,7 @@ This error originated from your application code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your application it will automatically fail the current test.
 
-This behavior is configurable, and you can choose to turn this off by listening to the 'uncaught:exception' event.
+This behavior is configurable, and you can choose to turn this off by listening to the \`uncaught:exception\` event.
 
 https://on.cypress.io/uncaught-exception-from-application
       [stack trace lines]
diff --git a/packages/server/__snapshots__/4_form_submissions_spec.coffee.js b/packages/server/__snapshots__/4_form_submissions_spec.coffee.js
index a665014aed05..de3264db9352 100644
--- a/packages/server/__snapshots__/4_form_submissions_spec.coffee.js
+++ b/packages/server/__snapshots__/4_form_submissions_spec.coffee.js
@@ -165,12 +165,7 @@ exports['e2e forms / submissions with jquery XHR POST / failing'] = `
   1 failing
 
   1) form submission fails fails without an explicit wait when an element is immediately found:
-
-      AssertionError: expected '<form>' to contain 'form success!'
-      + expected - actual
-
-      +'form success!'
-      
+     AssertionError: expected '<form>' to contain 'form success!'
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/4_request_spec.coffee.js b/packages/server/__snapshots__/4_request_spec.coffee.js
index 6ec308b9bc25..214049239087 100644
--- a/packages/server/__snapshots__/4_request_spec.coffee.js
+++ b/packages/server/__snapshots__/4_request_spec.coffee.js
@@ -98,7 +98,7 @@ exports['e2e requests fails when network immediately fails 1'] = `
   1 failing
 
   1) when network connection cannot be established fails:
-     CypressError: cy.request() failed trying to load:
+     CypressError: \`cy.request()\` failed trying to load:
 
 http://localhost:16795/
 
@@ -128,6 +128,8 @@ The stack trace for this error is:
 RequestError: Error: connect ECONNREFUSED 127.0.0.1:16795
     [stack trace lines]
 
+
+https://on.cypress.io/request
   
 
 
@@ -203,7 +205,7 @@ exports['e2e requests fails on status code 1'] = `
   1 failing
 
   1) when status code isnt 2xx or 3xx fails:
-     CypressError: cy.request() failed on:
+     CypressError: \`cy.request()\` failed on:
 
 http://localhost:2294/statusCode?code=503
 
@@ -211,9 +213,9 @@ The response we received from your web server was:
 
   > 503: Service Unavailable
 
-This was considered a failure because the status code was not '2xx' or '3xx'.
+This was considered a failure because the status code was not \`2xx\` or \`3xx\`.
 
-If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+If you do not want status codes to cause failures pass the option: \`failOnStatusCode: false\`
 
 -----------------------------------------------------------
 
@@ -243,6 +245,8 @@ Headers: {
 }
 Body: Service Unavailable
 
+
+https://on.cypress.io/request
       [stack trace lines]
 
 
@@ -318,7 +322,7 @@ exports['e2e requests prints long http props on fail 1'] = `
   1 failing
 
   1) when status code isnt 2xx or 3xx fails:
-     CypressError: cy.request() failed on:
+     CypressError: \`cy.request()\` failed on:
 
 http://localhost:2294/myreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylong
 
@@ -326,9 +330,9 @@ The response we received from your web server was:
 
   > 404: Not Found
 
-This was considered a failure because the status code was not '2xx' or '3xx'.
+This was considered a failure because the status code was not \`2xx\` or \`3xx\`.
 
-If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+If you do not want status codes to cause failures pass the option: \`failOnStatusCode: false\`
 
 -----------------------------------------------------------
 
@@ -367,6 +371,8 @@ Body: <!DOCTYPE html>
 <pre>Cannot GET /myreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylong</pre>
 </body>
 </html>
+
+https://on.cypress.io/request
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/4_return_value_spec.coffee.js b/packages/server/__snapshots__/4_return_value_spec.coffee.js
index ad574b34a1c5..01076c574ce8 100644
--- a/packages/server/__snapshots__/4_return_value_spec.coffee.js
+++ b/packages/server/__snapshots__/4_return_value_spec.coffee.js
@@ -33,7 +33,7 @@ The return value was:
 
 Because cy commands are asynchronous and are queued to be run later, it doesn't make sense to return anything else.
 
-For convenience, you can also simply omit any return value or return 'undefined' and Cypress will not error.
+For convenience, you can also simply omit any return value or return \`undefined\` and Cypress will not error.
 
 In previous versions of Cypress we automatically detected this and forced the cy commands to be returned. To make things less magical and clearer, we are now throwing an error.
 
@@ -45,7 +45,7 @@ https://on.cypress.io/returning-value-and-commands-in-test
 
 The custom command was:
 
-  > cy.foo()
+  > \`cy.foo()\`
 
 The return value was:
 
@@ -53,7 +53,7 @@ The return value was:
 
 Because cy commands are asynchronous and are queued to be run later, it doesn't make sense to return anything else.
 
-For convenience, you can also simply omit any return value or return 'undefined' and Cypress will not error.
+For convenience, you can also simply omit any return value or return \`undefined\` and Cypress will not error.
 
 In previous versions of Cypress we automatically detected this and forced the cy commands to be returned. To make things less magical and clearer, we are now throwing an error.
 
@@ -63,10 +63,6 @@ https://on.cypress.io/returning-value-and-commands-in-custom-command
   3)  errors when not invoking commands, invoking done callback, and returning a promise:
      Error: Cypress detected that you returned a promise in a test, but also invoked a done callback. Return a promise -or- invoke a done callback, not both.
 
-Read  more here: https://on.cypress.io/returning-promise-and-invoking-done-callback
-
------------------------------------------------------------
-
 Original mocha error:
 
 Error: Resolution method is overspecified. Specify a callback *or* return a Promise; not both.
diff --git a/packages/server/__snapshots__/5_screenshots_spec.coffee.js b/packages/server/__snapshots__/5_screenshots_spec.coffee.js
index 1ed964d456cf..2e3c7a85f66b 100644
--- a/packages/server/__snapshots__/5_screenshots_spec.coffee.js
+++ b/packages/server/__snapshots__/5_screenshots_spec.coffee.js
@@ -65,19 +65,19 @@ exports['e2e screenshots / passes'] = `
   3) taking screenshots before hooks "before all" hook for "empty test 1":
      Error: before hook failing
 
-Because this error occurred during a 'before all' hook we are skipping the remaining tests in the current suite: 'before hooks'
+Because this error occurred during a \`before all\` hook we are skipping the remaining tests in the current suite: \`before hooks\`
       [stack trace lines]
 
   4) taking screenshots each hooks "before each" hook for "empty test 2":
      Error: before each hook failed
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'each hooks'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`each hooks\`
       [stack trace lines]
 
   5) taking screenshots each hooks "after each" hook for "empty test 2":
      Error: after each hook failed
 
-Because this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'each hooks'
+Because this error occurred during a \`after each\` hook we are skipping the remaining tests in the current suite: \`each hooks\`
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/5_spec_isolation_spec.coffee.js b/packages/server/__snapshots__/5_spec_isolation_spec.coffee.js
index 786ac5fc12bf..ae0e4ba17d65 100644
--- a/packages/server/__snapshots__/5_spec_isolation_spec.coffee.js
+++ b/packages/server/__snapshots__/5_spec_isolation_spec.coffee.js
@@ -76,8 +76,8 @@ exports['e2e spec isolation fails'] = {
           ],
           "state": "failed",
           "body": "function() {}",
-          "stack": "Error: fail1\n\nBecause this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'beforeEach hooks'\n    [stack trace lines]",
-          "error": "fail1\n\nBecause this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'beforeEach hooks'",
+          "stack": "Error: fail1\n\nBecause this error occurred during a `before each` hook we are skipping the remaining tests in the current suite: `beforeEach hooks`\n    [stack trace lines]",
+          "error": "fail1\n\nBecause this error occurred during a `before each` hook we are skipping the remaining tests in the current suite: `beforeEach hooks`",
           "timings": {
             "lifecycle": 100,
             "before all": [
@@ -126,8 +126,8 @@ exports['e2e spec isolation fails'] = {
           ],
           "state": "failed",
           "body": "function() {}",
-          "stack": "Error: fail2\n\nBecause this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'afterEach hooks'\n    [stack trace lines]",
-          "error": "fail2\n\nBecause this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'afterEach hooks'",
+          "stack": "Error: fail2\n\nBecause this error occurred during a `after each` hook we are skipping the remaining tests in the current suite: `afterEach hooks`\n    [stack trace lines]",
+          "error": "fail2\n\nBecause this error occurred during a `after each` hook we are skipping the remaining tests in the current suite: `afterEach hooks`",
           "timings": {
             "lifecycle": 100,
             "test": {
@@ -196,8 +196,8 @@ exports['e2e spec isolation fails'] = {
           ],
           "state": "failed",
           "body": "function() {}",
-          "stack": "Error: fail3\n\nBecause this error occurred during a 'after all' hook we are skipping the remaining tests in the current suite: 'after hooks'\n    [stack trace lines]",
-          "error": "fail3\n\nBecause this error occurred during a 'after all' hook we are skipping the remaining tests in the current suite: 'after hooks'",
+          "stack": "Error: fail3\n\nBecause this error occurred during a `after all` hook we are skipping the remaining tests in the current suite: `after hooks`\n    [stack trace lines]",
+          "error": "fail3\n\nBecause this error occurred during a `after all` hook we are skipping the remaining tests in the current suite: `after hooks`",
           "timings": {
             "lifecycle": 100,
             "test": {
@@ -298,7 +298,7 @@ exports['e2e spec isolation fails'] = {
           ],
           "state": "failed",
           "body": "function() {\n    return cy.wrap(true, {\n      timeout: 100\n    }).should(\"be.false\");\n  }",
-          "stack": "CypressError: Timed out retrying: expected true to be false\n    [stack trace lines]",
+          "stack": "AssertionError: Timed out retrying: expected true to be false\n    [stack trace lines]",
           "error": "Timed out retrying: expected true to be false",
           "timings": {
             "lifecycle": 100,
diff --git a/packages/server/__snapshots__/5_stdout_spec.coffee.js b/packages/server/__snapshots__/5_stdout_spec.coffee.js
index d36241670499..5bd519a55367 100644
--- a/packages/server/__snapshots__/5_stdout_spec.coffee.js
+++ b/packages/server/__snapshots__/5_stdout_spec.coffee.js
@@ -35,7 +35,7 @@ exports['e2e stdout displays errors from failures 1'] = `
       [stack trace lines]
 
   2) stdout_failing_spec failing hook "before each" hook for "is failing":
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 /does-not-exist.html
 
@@ -47,11 +47,11 @@ The internal Cypress web server responded with:
 
   > 404: Not Found
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'failing hook'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`failing hook\`
       [stack trace lines]
 
   3) stdout_failing_spec passing hook is failing:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 /does-not-exist.html
 
@@ -407,3 +407,111 @@ exports['e2e stdout displays fullname of nested specfile 1'] = `
 
 
 `
+
+exports['e2e stdout / displays assertion errors'] = `
+
+====================================================================================================
+
+  (Run Starting)
+
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ Cypress:    1.2.3                                                                              │
+  │ Browser:    FooBrowser 88                                                                      │
+  │ Specs:      1 found (stdout_assertion_errors_spec.js)                                          │
+  │ Searched:   cypress/integration/stdout_assertion_errors_spec.js                                │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+
+────────────────────────────────────────────────────────────────────────────────────────────────────
+                                                                                                    
+  Running:  stdout_assertion_errors_spec.js                                                 (1 of 1)
+
+
+  assertion errors
+    1) fails with assertion diff, no retries
+    2) fails with assertion diff, with retries
+    3) fails with dom assertion without diff, with retries
+    4) fails with dom assertion without diff, with retries
+
+
+  0 passing
+  4 failing
+
+  1) assertion errors fails with assertion diff, no retries:
+
+      AssertionError: expected [] to deeply equal [ 1, 2, 3 ]
+      + expected - actual
+
+      -[]
+      +[ 1, 2, 3 ]
+      
+      [stack trace lines]
+
+  2) assertion errors fails with assertion diff, with retries:
+
+      AssertionError: Timed out retrying: expected [] to deeply equal [ 1, 2, 3 ]
+      + expected - actual
+
+      -[]
+      +[ 1, 2, 3 ]
+      
+      [stack trace lines]
+
+  3) assertion errors fails with dom assertion without diff, with retries:
+     AssertionError: expected '<body>' to have class 'foo'
+      [stack trace lines]
+
+  4) assertion errors fails with dom assertion without diff, with retries:
+     AssertionError: Timed out retrying: expected '<body>' to have class 'foo'
+      [stack trace lines]
+
+
+
+
+  (Results)
+
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ Tests:        4                                                                                │
+  │ Passing:      0                                                                                │
+  │ Failing:      4                                                                                │
+  │ Pending:      0                                                                                │
+  │ Skipped:      0                                                                                │
+  │ Screenshots:  4                                                                                │
+  │ Video:        true                                                                             │
+  │ Duration:     X seconds                                                                        │
+  │ Spec Ran:     stdout_assertion_errors_spec.js                                                  │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+
+  (Screenshots)
+
+  -  /XXX/XXX/XXX/cypress/screenshots/stdout_assertion_errors_spec.js/assertion error     (1280x720)
+     s -- fails with assertion diff, no retries (failed).png                                        
+  -  /XXX/XXX/XXX/cypress/screenshots/stdout_assertion_errors_spec.js/assertion error     (1280x720)
+     s -- fails with assertion diff, with retries (failed).png                                      
+  -  /XXX/XXX/XXX/cypress/screenshots/stdout_assertion_errors_spec.js/assertion error     (1280x720)
+     s -- fails with dom assertion without diff, with retries (failed).png                          
+  -  /XXX/XXX/XXX/cypress/screenshots/stdout_assertion_errors_spec.js/assertion error     (1280x720)
+     s -- fails with dom assertion without diff, with retries (failed) (1).png                      
+
+
+  (Video)
+
+  -  Started processing:  Compressing to 32 CRF                                                     
+  -  Finished processing: /XXX/XXX/XXX/cypress/videos/stdout_assertion_errors_spec.js     (X second)
+                          .mp4                                                                      
+
+
+====================================================================================================
+
+  (Run Finished)
+
+
+       Spec                                              Tests  Passing  Failing  Pending  Skipped  
+  ┌────────────────────────────────────────────────────────────────────────────────────────────────┐
+  │ ✖  stdout_assertion_errors_spec.js          XX:XX        4        -        4        -        - │
+  └────────────────────────────────────────────────────────────────────────────────────────────────┘
+    ✖  1 of 1 failed (100%)                     XX:XX        4        -        4        -        -  
+
+
+`
diff --git a/packages/server/__snapshots__/5_task_not_registered_spec.coffee.js b/packages/server/__snapshots__/5_task_not_registered_spec.coffee.js
index ae6fa27a716c..c97a4f651ad3 100644
--- a/packages/server/__snapshots__/5_task_not_registered_spec.coffee.js
+++ b/packages/server/__snapshots__/5_task_not_registered_spec.coffee.js
@@ -23,7 +23,7 @@ exports['e2e task fails 1'] = `
   1 failing
 
   1)  fails because the 'task' event is not registered in plugins file:
-     CypressError: cy.task('some:task') failed with the following error:
+     CypressError: \`cy.task('some:task')\` failed with the following error:
 
 The 'task' event has not been registered in the plugins file. You must register it before using cy.task()
 
diff --git a/packages/server/__snapshots__/6_task_spec.coffee.js b/packages/server/__snapshots__/6_task_spec.coffee.js
index 7bc2540e3315..f05bb5a1d84e 100644
--- a/packages/server/__snapshots__/6_task_spec.coffee.js
+++ b/packages/server/__snapshots__/6_task_spec.coffee.js
@@ -86,7 +86,7 @@ exports['e2e task handles undefined return and includes stack trace in error 1']
   2 failing
 
   1)  throws when task returns undefined:
-     CypressError: cy.task('returns:undefined') failed with the following error:
+     CypressError: \`cy.task('returns:undefined')\` failed with the following error:
 
 The task 'returns:undefined' returned undefined. You must return a promise, a value, or null to indicate that the task was handled.
 
@@ -101,7 +101,7 @@ https://on.cypress.io/api/task
       [stack trace lines]
 
   2)  includes stack trace in error:
-     CypressError: cy.task('errors') failed with the following error:
+     CypressError: \`cy.task('errors')\` failed with the following error:
 
 > Error: Error thrown in task handler
     [stack trace lines]
diff --git a/packages/server/__snapshots__/6_uncaught_spec_errors_spec.coffee.js b/packages/server/__snapshots__/6_uncaught_spec_errors_spec.coffee.js
index f0f194a9ca63..66bf6ec588de 100644
--- a/packages/server/__snapshots__/6_uncaught_spec_errors_spec.coffee.js
+++ b/packages/server/__snapshots__/6_uncaught_spec_errors_spec.coffee.js
@@ -277,7 +277,7 @@ This error originated from your test code, not from Cypress.
 
 When Cypress detects uncaught errors originating from your test code it will automatically fail the current test.
 
-Because this error occurred during a 'before all' hook we are skipping the remaining tests in the current suite: 'foo'
+Because this error occurred during a \`before all\` hook we are skipping the remaining tests in the current suite: \`foo\`
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/6_visit_spec.coffee.js b/packages/server/__snapshots__/6_visit_spec.coffee.js
index 35748719cac0..51d31b9fa35a 100644
--- a/packages/server/__snapshots__/6_visit_spec.coffee.js
+++ b/packages/server/__snapshots__/6_visit_spec.coffee.js
@@ -101,7 +101,7 @@ exports['e2e visit / low response timeout / fails when network connection immedi
   1 failing
 
   1) when network connection cannot be established fails:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 http://localhost:16795/
 
@@ -197,7 +197,7 @@ exports['e2e visit / low response timeout / fails when server responds with 500'
   1 failing
 
   1) when server response is 500 fails:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 http://localhost:3434/fail
 
@@ -205,9 +205,9 @@ The response we received from your web server was:
 
   > 500: Server Error
 
-This was considered a failure because the status code was not '2xx'.
+This was considered a failure because the status code was not \`2xx\`.
 
-If you do not want status codes to cause failures pass the option: 'failOnStatusCode: false'
+If you do not want status codes to cause failures pass the option: \`failOnStatusCode: false\`
       [stack trace lines]
 
 
@@ -283,7 +283,7 @@ exports['e2e visit / low response timeout / fails when file server responds with
   1 failing
 
   1) when file server response is 404 fails:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 /static/does-not-exist.html
 
@@ -369,19 +369,19 @@ exports['e2e visit / low response timeout / fails when content type isnt html']
   1 failing
 
   1) when content type is plain/text fails:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 /static/hello.txt
 
-The content-type of the response we received from this local file was:
+The \`content-type\` of the response we received from this local file was:
 
-  > text/plain
+  > \`text/plain\`
 
-This was considered a failure because responses must have content-type: 'text/html'
+This was considered a failure because responses must have \`content-type: 'text/html'\`
 
-However, you can likely use cy.request() instead of cy.visit().
+However, you can likely use \`cy.request()\` instead of \`cy.visit()\`.
 
-cy.request() will automatically get and set cookies and enable you to parse responses.
+\`cy.request()\` will automatically get and set cookies and enable you to parse responses.
       [stack trace lines]
 
 
@@ -458,27 +458,27 @@ exports['e2e visit / normal response timeouts / fails when visit times out'] = `
   2 failing
 
   1) when visit times out fails timeout exceeds pageLoadTimeout:
-     CypressError: Timed out after waiting '1000ms' for your remote page to load.
+     CypressError: Timed out after waiting \`1000ms\` for your remote page to load.
 
-Your page did not fire its 'load' event within '1000ms'.
+Your page did not fire its \`load\` event within \`1000ms\`.
 
-You can try increasing the 'pageLoadTimeout' value in 'cypress.json' to wait longer.
+You can try increasing the \`pageLoadTimeout\` value in \`cypress.json\` to wait longer.
 
-Browsers will not fire the 'load' event until all stylesheets and scripts are done downloading.
+Browsers will not fire the \`load\` event until all stylesheets and scripts are done downloading.
 
-When this 'load' event occurs, Cypress will continue running commands.
+When this \`load\` event occurs, Cypress will continue running commands.
       [stack trace lines]
 
   2) when visit times out fails timeout exceeds timeout option:
-     CypressError: Timed out after waiting '500ms' for your remote page to load.
+     CypressError: Timed out after waiting \`500ms\` for your remote page to load.
 
-Your page did not fire its 'load' event within '500ms'.
+Your page did not fire its \`load\` event within \`500ms\`.
 
-You can try increasing the 'pageLoadTimeout' value in 'cypress.json' to wait longer.
+You can try increasing the \`pageLoadTimeout\` value in \`cypress.json\` to wait longer.
 
-Browsers will not fire the 'load' event until all stylesheets and scripts are done downloading.
+Browsers will not fire the \`load\` event until all stylesheets and scripts are done downloading.
 
-When this 'load' event occurs, Cypress will continue running commands.
+When this \`load\` event occurs, Cypress will continue running commands.
       [stack trace lines]
 
 
@@ -558,7 +558,7 @@ exports['e2e visit / low responseTimeout, normal pageLoadTimeout / fails when re
   3 failing
 
   1) response timeouts result in an error handles no response errors on the initial visit:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 http://localhost:3434/response_never_finishes
 
@@ -582,7 +582,7 @@ Error: ESOCKETTIMEDOUT
   
 
   2) response timeouts result in an error handles no response errors when not initially visiting:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 http://localhost:3434/response_never_finishes
 
@@ -606,7 +606,7 @@ Error: ESOCKETTIMEDOUT
   
 
   3) response timeouts result in an error fails after reducing the responseTimeout option:
-     CypressError: cy.visit() failed trying to load:
+     CypressError: \`cy.visit()\` failed trying to load:
 
 http://localhost:3434/timeout?ms=1000
 
diff --git a/packages/server/__snapshots__/6_web_security_spec.coffee.js b/packages/server/__snapshots__/6_web_security_spec.coffee.js
index 2236a2afae89..9bcdd628de5c 100644
--- a/packages/server/__snapshots__/6_web_security_spec.coffee.js
+++ b/packages/server/__snapshots__/6_web_security_spec.coffee.js
@@ -43,10 +43,9 @@ Cypress does not allow you to navigate to a different origin URL within a single
 
 You may need to restructure some of your test code to avoid this problem.
 
-Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in 'cypress.json'.
+Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in \`cypress.json\`.
 
 https://on.cypress.io/cross-origin-violation
-
       [stack trace lines]
 
   2) web security fails when submitted a form and being redirected to another origin:
@@ -66,10 +65,9 @@ Cypress does not allow you to navigate to a different origin URL within a single
 
 You may need to restructure some of your test code to avoid this problem.
 
-Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in 'cypress.json'.
+Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in \`cypress.json\`.
 
 https://on.cypress.io/cross-origin-violation
-
       [stack trace lines]
 
   3) web security fails when using a javascript redirect to another origin:
@@ -89,10 +87,9 @@ Cypress does not allow you to navigate to a different origin URL within a single
 
 You may need to restructure some of your test code to avoid this problem.
 
-Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in 'cypress.json'.
+Alternatively you can also disable Chrome Web Security in Chromium-based browsers which will turn off this restriction by setting { chromeWebSecurity: false } in \`cypress.json\`.
 
 https://on.cypress.io/cross-origin-violation
-
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/7_record_spec.coffee.js b/packages/server/__snapshots__/7_record_spec.coffee.js
index 027daf1cdaa1..46e3c80dfa71 100644
--- a/packages/server/__snapshots__/7_record_spec.coffee.js
+++ b/packages/server/__snapshots__/7_record_spec.coffee.js
@@ -77,7 +77,7 @@ Fix the error in your code and re-run your tests.
   1) record fails "before each" hook for "fails 1":
      Error: foo
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'record fails'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`record fails\`
       [stack trace lines]
 
 
@@ -1001,7 +1001,7 @@ Fix the error in your code and re-run your tests.
   1) record fails "before each" hook for "fails 1":
      Error: foo
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'record fails'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`record fails\`
       [stack trace lines]
 
 
diff --git a/packages/server/__snapshots__/8_reporters_spec.coffee.js b/packages/server/__snapshots__/8_reporters_spec.coffee.js
index e2b8791e9a6f..c772ed0fc252 100644
--- a/packages/server/__snapshots__/8_reporters_spec.coffee.js
+++ b/packages/server/__snapshots__/8_reporters_spec.coffee.js
@@ -241,7 +241,7 @@ exports['e2e reporters mochawesome fails with mochawesome@1.5.2 npm custom repor
          "before each" hook for "never gets here":
      Error: fail1
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'beforeEach hooks'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`beforeEach hooks\`
       [stack trace lines]
 
   2) simple failing hook spec
@@ -249,7 +249,7 @@ Because this error occurred during a 'before each' hook we are skipping the rema
          "after each" hook for "runs this":
      Error: fail2
 
-Because this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'afterEach hooks'
+Because this error occurred during a \`after each\` hook we are skipping the remaining tests in the current suite: \`afterEach hooks\`
       [stack trace lines]
 
   3) simple failing hook spec
@@ -257,7 +257,7 @@ Because this error occurred during a 'after each' hook we are skipping the remai
          "after all" hook for "fails on this":
      Error: fail3
 
-Because this error occurred during a 'after all' hook we are skipping the remaining tests in the current suite: 'after hooks'
+Because this error occurred during a \`after all\` hook we are skipping the remaining tests in the current suite: \`after hooks\`
       [stack trace lines]
 
 
@@ -421,7 +421,7 @@ exports['e2e reporters mochawesome fails with mochawesome@2.3.1 npm custom repor
          "before each" hook for "never gets here":
      Error: fail1
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'beforeEach hooks'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`beforeEach hooks\`
       [stack trace lines]
 
   2) simple failing hook spec
@@ -429,7 +429,7 @@ Because this error occurred during a 'before each' hook we are skipping the rema
          "after each" hook for "runs this":
      Error: fail2
 
-Because this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'afterEach hooks'
+Because this error occurred during a \`after each\` hook we are skipping the remaining tests in the current suite: \`afterEach hooks\`
       [stack trace lines]
 
   3) simple failing hook spec
@@ -437,7 +437,7 @@ Because this error occurred during a 'after each' hook we are skipping the remai
          "after all" hook for "fails on this":
      Error: fail3
 
-Because this error occurred during a 'after all' hook we are skipping the remaining tests in the current suite: 'after hooks'
+Because this error occurred during a \`after all\` hook we are skipping the remaining tests in the current suite: \`after hooks\`
       [stack trace lines]
 
 
@@ -601,7 +601,7 @@ exports['e2e reporters mochawesome fails with mochawesome@3.0.1 npm custom repor
          "before each" hook for "never gets here":
      Error: fail1
 
-Because this error occurred during a 'before each' hook we are skipping the remaining tests in the current suite: 'beforeEach hooks'
+Because this error occurred during a \`before each\` hook we are skipping the remaining tests in the current suite: \`beforeEach hooks\`
       [stack trace lines]
 
   2) simple failing hook spec
@@ -609,7 +609,7 @@ Because this error occurred during a 'before each' hook we are skipping the rema
          "after each" hook for "runs this":
      Error: fail2
 
-Because this error occurred during a 'after each' hook we are skipping the remaining tests in the current suite: 'afterEach hooks'
+Because this error occurred during a \`after each\` hook we are skipping the remaining tests in the current suite: \`afterEach hooks\`
       [stack trace lines]
 
   3) simple failing hook spec
@@ -617,7 +617,7 @@ Because this error occurred during a 'after each' hook we are skipping the remai
          "after all" hook for "fails on this":
      Error: fail3
 
-Because this error occurred during a 'after all' hook we are skipping the remaining tests in the current suite: 'after hooks'
+Because this error occurred during a \`after all\` hook we are skipping the remaining tests in the current suite: \`after hooks\`
       [stack trace lines]
 
 
diff --git a/packages/server/lib/reporter.coffee b/packages/server/lib/reporter.coffee
index 9d78790a4b00..75c65986fca4 100644
--- a/packages/server/lib/reporter.coffee
+++ b/packages/server/lib/reporter.coffee
@@ -6,6 +6,8 @@ Promise = require("bluebird")
 
 mochaReporters = require("mocha/lib/reporters")
 
+mochaErrMsgExtractionRe = /^([^:]+): expected/
+
 STATS = "suites tests passes pending failures start end duration".split(" ")
 
 if Mocha.Suite.prototype.titlePath
@@ -98,6 +100,24 @@ mergeErr = (runnable, runnables, stats) ->
   ## event for reporters
   test = _.extend({}, test, { title: runnable.title })
 
+  ## mocha tries to extract the error name using a regular expression
+  ## but when the error message includes a colon (:) like
+  ## "Timed out retrying: expected...", it thinks the error name is
+  ## "Timed out retrying" and replaces the entire message with only that
+  ##
+  ## Here's the code we're patching in the mocha version currently being used (2.4.5):
+  ## https://github.com/mochajs/mocha/blob/2a8594424c73ffeca41ef1668446372160528b4a/lib/reporters/base.js#L208
+  if test.err and test.err.message
+    message = new String(test.err.message)
+    originalMatch = message.match
+    message.match = (re) ->
+      if _.isEqual(re, mochaErrMsgExtractionRe)
+        return null
+
+      originalMatch.apply(@, arguments)
+
+    test.err.message = message
+
   [test, test.err]
 
 setDate = (obj, runnables, stats) ->
diff --git a/packages/server/test/e2e/5_stdout_spec.coffee b/packages/server/test/e2e/5_stdout_spec.coffee
index 82455c409fb3..65c5fd9e7268 100644
--- a/packages/server/test/e2e/5_stdout_spec.coffee
+++ b/packages/server/test/e2e/5_stdout_spec.coffee
@@ -32,3 +32,9 @@ describe "e2e stdout", ->
       snapshot: true
       spec: "nested-1/nested-2/nested-3/*"
     })
+
+  e2e.it("displays assertion errors", {
+    spec: "stdout_assertion_errors_spec.js"
+    snapshot: true
+    expectedExitCode: 4
+  })
diff --git a/packages/server/test/e2e/8_network_error_handling_spec.coffee b/packages/server/test/e2e/8_network_error_handling_spec.coffee
index 9612c3259a5c..598b6856306c 100644
--- a/packages/server/test/e2e/8_network_error_handling_spec.coffee
+++ b/packages/server/test/e2e/8_network_error_handling_spec.coffee
@@ -315,7 +315,7 @@ describe "e2e network error handling", ->
         expectedExitCode: 2
       }).then ({ stdout }) ->
         expect(stdout).to.contain('1) network error handling cy.visit() retries fails after retrying 5x:')
-        expect(stdout).to.contain('CypressError: cy.visit() failed trying to load:')
+        expect(stdout).to.contain('CypressError: `cy.visit()` failed trying to load:')
         expect(stdout).to.contain('http://localhost:13370/immediate-reset?visit')
         expect(stdout).to.contain('We attempted to make an http request to this URL but the request failed without a response.')
         expect(stdout).to.contain('We received this error at the network level:')
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_assertion_errors_spec.js b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_assertion_errors_spec.js
new file mode 100644
index 000000000000..8f56deb800a7
--- /dev/null
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_assertion_errors_spec.js
@@ -0,0 +1,19 @@
+describe('assertion errors', () => {
+  it('fails with assertion diff, no retries', () => {
+    expect([]).to.eql([1, 2, 3])
+  })
+
+  it('fails with assertion diff, with retries', () => {
+    cy.wrap([]).should('eql', [1, 2, 3])
+  })
+
+  it('fails with dom assertion without diff, with retries', () => {
+    cy.get('body').then(($el) => {
+      expect($el).to.have.class('foo')
+    })
+  })
+
+  it('fails with dom assertion without diff, with retries', () => {
+    cy.get('body').should('have.class', 'foo')
+  })
+})
diff --git a/packages/server/test/support/fixtures/server/expected_stdout_failures.txt b/packages/server/test/support/fixtures/server/expected_stdout_failures.txt
index da25cbe97e42..6514ee85354f 100644
--- a/packages/server/test/support/fixtures/server/expected_stdout_failures.txt
+++ b/packages/server/test/support/fixtures/server/expected_stdout_failures.txt
@@ -21,7 +21,7 @@
       at Context.<anonymous> (http://localhost:2020/__cypress/tests?p=cypress/integration/stdout_failing_spec.coffee-456:6:13)
 
   2) stdout_failing_spec failing hook "before each" hook for "is failing":
-     CypressError: cy.visit() failed trying to load:
+     CypressError: `cy.visit()` failed trying to load:
 
 /does-not-exist.html
 
diff --git a/packages/server/test/support/helpers/e2e.js b/packages/server/test/support/helpers/e2e.js
index 7af129d8bb01..175ed93203e0 100644
--- a/packages/server/test/support/helpers/e2e.js
+++ b/packages/server/test/support/helpers/e2e.js
@@ -468,7 +468,7 @@ const e2e = {
     _.defaults(options, {
       browser: 'electron',
       project: e2ePath,
-      timeout: 120000,
+      timeout: options.exit === false ? 3000000 : 120000,
       originalTitle: null,
       expectedExitCode: 0,
       sanitizeScreenshotDimensions: false,
@@ -563,8 +563,6 @@ const e2e = {
     }
 
     if (options.exit === false) {
-      // prevent timeout in --no-exit mode (for debugging)
-      options.timeout = 3000000
       args.push('--exit', options.exit)
     }
 
diff --git a/yarn.lock b/yarn.lock
index 14ebb1ee76b6..89727f9b3ce1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8905,7 +8905,7 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+debug@3.2.6, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -8919,7 +8919,7 @@ debug@4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -9309,7 +9309,7 @@ detect-indent@^6.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
   integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
 
-detect-libc@^1.0.2, detect-libc@^1.0.3:
+detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -13220,7 +13220,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -13348,7 +13348,7 @@ import-local@2.0.0, import-local@^2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -15398,13 +15398,6 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-it@~1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
-  integrity sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=
-  dependencies:
-    uc.micro "^1.0.1"
-
 lint-staged@9.4.1:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.1.tgz#60c0f85745bd398e6460aa7f5adb3cad3a2b862c"
@@ -15616,11 +15609,6 @@ lodash._basecreate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
   integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._basetostring@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
@@ -15639,29 +15627,12 @@ lodash._basevalues@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
   integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
+lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
   integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
@@ -15826,7 +15797,7 @@ lodash.reduce@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
   integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
 
-lodash.restparam@*, lodash.restparam@^3.0.0:
+lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
   integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
@@ -16176,17 +16147,6 @@ marionette-client@cypress-io/marionette-client#2cddf7d791cca7be5191d7fe103d58be7
     promise "7.0.4"
     socket-retry-connect "0.0.1"
 
-markdown-it@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-6.1.1.tgz#ced037f4473ee9f5153ac414f77dc83c91ba927c"
-  integrity sha1-ztA39Ec+6fUVOsQU933IPJG6knw=
-  dependencies:
-    argparse "^1.0.7"
-    entities "~1.1.1"
-    linkify-it "~1.2.2"
-    mdurl "~1.0.1"
-    uc.micro "^1.0.1"
-
 markdown-it@8.4.2:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
@@ -16238,7 +16198,7 @@ md5@2.2.1, md5@^2.1.0:
     crypt "~0.0.1"
     is-buffer "~1.1.1"
 
-mdurl@^1.0.1, mdurl@~1.0.1:
+mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
@@ -17131,15 +17091,6 @@ nearley@^2.7.10:
     randexp "0.4.6"
     semver "^5.4.1"
 
-needle@^2.2.1:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
-  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -17405,22 +17356,6 @@ node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.50:
   version "1.1.52"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
@@ -17662,7 +17597,7 @@ npm-package-arg@^4.1.1, npm-package-arg@~4.2.1:
     hosted-git-info "^2.1.5"
     semver "^5.1.0"
 
-npm-packlist@^1.1.6, npm-packlist@^1.4.4:
+npm-packlist@^1.4.4:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
   integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@@ -17825,7 +17760,7 @@ npm@^4.0.3:
     wrappy "~1.0.2"
     write-file-atomic "~1.3.3"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -20078,7 +20013,7 @@ readable-stream@~2.2.9:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -22804,7 +22739,7 @@ tar@^2.0.0, tar@~2.2.1:
     fstream "^1.0.12"
     inherits "2"
 
-tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8:
+tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -23974,7 +23909,7 @@ v8flags@^3.0.1:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-validate-npm-package-license@*, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==