Merge remote-tracking branch 'upstream/release/3.3' into routed-link-to

# Conflicts:
#	addons/links/README.md

addons/links/README.md

@@ -15,16 +15,16 @@ This addon works with Storybook for:
 
 ## Getting Started
 
-Install:
+Install this addon by adding the `@storybook/addon-links` dependency:
 
 ```sh
-npm i -D @storybook/addon-actions
+yarn add @storybook/addon-links
 ```
 
-Then, add following content to `.storybook/addons.js`
+Then configure it as an addon by adding it to your addons.js file (located in the Storybook config directory).
 
 ```js
-import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
 ```
 
 ## LinkTo component

docs/pages/basics/introduction/index.md

@@ -1,17 +1,18 @@
----
-id: 'introduction'
-title: 'Introduction'
----
+* * *
 
-React Storybook is a UI development environment for your React components.
+id: 'introduction'
+
+## title: 'Introduction'
+
+Storybook is a UI development environment for your UI components.
 With it, you can visualize different states of your UI components and develop them interactively.
 
-React Storybook runs outside of your app.
+Storybook runs outside of your app.
 So you can develop UI components in isolation without worrying about app specific dependencies and requirements.
 
-![React Storybook](../static/screenshot.png)
+![Storybook](../static/screenshot.png)
 
-React Storybook also comes with a lot of [addons](/addons/introduction) and a great API to customize as you wish.
+Storybook also comes with a lot of [addons](/addons/introduction) and a great API to customize as you wish.
 You can also build a [static version](/basics/exporting-storybook) of your storybook and deploy it anywhere you want.
 
 Here are some featured storybooks that you can reference to see how Storybook works:

package.json

@@ -40,7 +40,7 @@
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^7.2.3",
+    "babel-eslint": "^8.0.0",
     "babel-plugin-transform-md-import-to-string": "^1.0.6",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.26.0",