Merge branch 'master' into greenkeeper/lerna-2.0.0-rc.3

storybookjs · Apr 23, 2017 · 07be80d · 07be80d
2 parents 203e5ae + 7f31377
commit 07be80d
Show file tree

Hide file tree

Showing 133 changed files with 29 additions and 4,256 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -54,6 +54,12 @@ We welcome your contributions. There are many ways you can help us. This is few
 
 Before you submit a new PR, make you to run `npm test`. Do not submit a PR if tests are failing. If you need any help, create an issue and ask.
 
+### Reviewing PRs
+
+**As a PR submitter**, you should reference the issue if there is one, include a short description of what you contributed and, if it is a code change, instructions for how to manually test out the change. This is informally enforced by our [PR template](https://github.com/storybooks/storybook/blob/master/.github/PULL_REQUEST_TEMPLATE.md). If your PR is reviewed as only needing trivial changes (e.g. small typos etc), and you have commit access, then you can merge the PR after making those changes.
+
+**As a PR reviewer**, you should read through the changes and comment on any potential problems. If you see something cool, a kind word never hurts either! Additionally, you should follow the testing instructions and manually test the changes. If the instructions are missing, unclear, or overly complex, feel free to request better instructions from the submitter. Unless the PR is tagged with the `do not merge` label, if you approve the review and there is no other required discussion or changes, you should also go ahead and merge the PR.
+
 ## Issue Triage
 
 If you are looking for a way to help the project, triaging issues is a great place to start. Here's how you can help:
@@ -85,7 +91,7 @@ If an issue is a `bug`, and it doesn't have a clear reproduction that you have p
 
 ## Development Guide
 
-> If you want to work on a UI feature, refer to the [Storybook UI](https://github.com/storybooks/storybook/tree/master/storybook-ui) project.
+> If you want to work on a UI feature, refer to the [Storybook UI](https://github.com/storybooks/storybook/tree/master/packages/storybook-ui) project.
 
 This project written in ES2016+ syntax so, we need to transpile it before use.
 So run the following command:

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Storybook is a development environment for React UI components. It allows you to
 
 Storybook runs outside of your app. This allows you to develop UI components in isolation, which can improve component reuse, testability, and development speed. You can build quickly without having to worry about application-specific dependencies.
 
-Storybook comes with a lot of [addons](https://getstorybook.io/docs/addons/introduction) for component design, documentation, testing, interactivity, and so on. Storybook's easy-to-use API makes it easy to configure and extend in various ways. It has even been extended to support React Native development for mobile.
+Storybook comes with a lot of [addons](https://storybooks.js.org/docs/react-storybook/addons/introduction) for component design, documentation, testing, interactivity, and so on. Storybook's easy-to-use API makes it easy to configure and extend in various ways. It has even been extended to support React Native development for mobile.
 
 ## Getting Started
 
@@ -26,7 +26,7 @@ getstorybook
 
 Once it's installed, you can `npm run storybook` and it will run the development server on your local machine, and give you a URL to browse some sample stories.
 
-For full documentation on using Storybook visit: https://getstorybook.io
+For full documentation on using Storybook visit: https://storybooks.js.org
 
 ## Main Projects
 - [react-storybook](packages/react-storybook) - Storybook for React components

diff --git a/docs/.storybook/addons.js b/docs/.storybook/addons.js
diff --git a/docs/.storybook/config.js b/docs/.storybook/config.js
diff --git a/docs/.storybook/notes_addon.js b/docs/.storybook/notes_addon.js
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/app.json b/docs/app.json
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/package.json b/docs/package.json
diff --git a/docs/src/components/Docs/Container/index.js b/docs/src/components/Docs/Container/index.js