Merge branch 'master' into ndelangen/add-dirname

addons/storyshots/README.md

@@ -119,7 +119,7 @@ Now run your Jest test command. (Usually, `npm test`.) Then you can see all of y
 ![Screenshot](docs/storyshots.png)
 
 
-## Configure Storyshots for image snapshots
+## Configure Storyshots for image snapshots ( alpha )
 
 /*\ **React-native** is **not supported** by this test function.
 
@@ -368,7 +368,7 @@ Take a snapshot of a shallow-rendered version of the component. Note that this o
 
 Utility function used in `multiSnapshotWithOptions`. This is made available for users who implement custom test functions that also want to take advantage of multi-file storyshots.
 
-### `imageSnapshot`
+### `imageSnapshot` ( alpha )
 
 Render the story and take Jest snapshots as images. see [Configure image snapshots](#configure-storyshots-for-image-snapshots)
 

docs/src/pages/addons/addon-gallery/index.md

@@ -49,7 +49,7 @@ You need to install these addons directly from NPM in order to use them.
 ### [Readme](https://github.com/tuchk4/storybook-readme)
 
 With this addon, you can add docs in markdown format for each story.
-It very useful because most projects and components already have README.md files.
+It's very useful because most projects and components already have README.md files.
 Now it is easy to add them into your Storybook.
 
 ### [Story-router](https://github.com/gvaldambrini/storybook-router)

docs/src/pages/basics/writing-stories/index.md

@@ -118,7 +118,7 @@ import MyComponent from './MyComponent';
 import someMarkdownText from './someMarkdownText.md';
 
 storiesOf('Component', module)
-  .add('With Markdown', withNotes(someMarkdownText)(() => <Component/>));
+  .add('With Markdown', withNotes(someMarkdownText)(() => <MyComponent/>));
 ```
 
 ## Nesting stories