Merge remote-tracking branch 'airbnb/master'

docs/api/ReactWrapper/mount.md

@@ -1,6 +1,6 @@
 # `.mount() => Self`
 
-A method that re-mounts the component. This can be used to simulate a component going through
+A method that re-mounts the component, if it is not currently mounted. This can be used to simulate a component going through
 an unmount/mount lifecycle.
 
 #### Returns

docs/guides/migration-from-2-to-3.md

@@ -437,8 +437,8 @@ return 3 and not 1 as in previous versions. A closer look using
 [`debug`](../api/ReactWrapper/debug.md) reveals:
 
 <!-- eslint react/prop-types: 0, react/prefer-stateless-function: 0 -->
-
-```
+<!-- eslint-skip -->
+```jsx
 // console.log(wrapper.find('[aria-expanded="true"]').debug());
 
 <HelpLinkContainer aria-expanded={true} text="foo">
@@ -465,9 +465,9 @@ To return only the html nodes use the
 
 `wrapper.find("[aria-expanded=true]").hostNodes().debug()` will now return:
 
-<!-- eslint react/prop-types: 0, react/prefer-stateless-function: 0 -->
+<!-- eslint react/prop-types: 0, react/prefer-stateless-function: 0, no-unused-expressions: 0, jsx-a11y/anchor-is-valid: 0 -->
 
-```
+```jsx
 <a aria-expanded="true">foo</a>;
 ```
 

package.json

@@ -77,7 +77,7 @@
     "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-markdown": "^1.0.0-beta.6",
+    "eslint-plugin-markdown": "^1.0.0-beta.7",
     "eslint-plugin-react": "^7.6.1",
     "gitbook-cli": "^1.0.1",
     "gitbook-plugin-anchors": "^0.7.1",

packages/enzyme/src/ReactWrapper.js

@@ -244,7 +244,8 @@ class ReactWrapper {
   }
 
   /**
-   * A method that re-mounts the component. This can be used to simulate a component going through
+   * A method that re-mounts the component, if it is not currently mounted.
+   * This can be used to simulate a component going through
    * an unmount/mount lifecycle.
    *
    * @returns {ReactWrapper}