Skip to content

Commit

Permalink
Merge branch 'master' into matth/storybook-top-level
Browse files Browse the repository at this point in the history
  • Loading branch information
apaleslimghost authored Apr 29, 2019
2 parents 3301459 + 0c22477 commit 8a46c7d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contribution.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Please do! All of the code in `x-dash` is peer-reviewed by members of The App an
If you're thinking of opening a pull request that adds a feature, you'll save yourself some time and effort if you [discuss it in a feature request first](#requesting-features). The review is guaranteed to go more smoothly if we've chatted about it beforehand.

- ### Check the workflow and release guidelines
The project follows a scheduled release workflow so we encourage the separation of stable, development, and experimental code. See the [Git workflow](#git-workflow) and the [release guidelines](release-guidelines.md) for more information.
The project follows a scheduled release workflow so we encourage the separation of stable, development, and experimental code. See the [Git workflow](#git-workflow) and the [release guidelines](docs/components/release-guidelines.md) for more information.

- ### Update the documentation
The user documentation should be kept up to date with any changes made. Use inline code comments as developer documentation, focusing more on _why_ your code does something than _what_ it's doing.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ In addition it is encouraged to write unit tests for interactive or complex comp
All x-dash components and packages will be published on the [npm registry] under the `@financial-times` organisation. Components in the `master` or current `development` branches of x-dash will all be published concurrently with the same version number. Experimental components may be published with an unstable version number using a [prerelease tag].

[npm registry]: https://www.npmjs.com/
[prerelease tag]: https://github.com/Financial-Times/x-dash/blob/master/release-guidelines.md
[prerelease tag]: ./release-guidelines.md
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/get-started/what-is-x-dash.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ With x-dash we have introduced a [monorepo] project structure, new [contribution

[monorepo]: https://en.wikipedia.org/wiki/Monorepo
[contribution guidelines]: https://github.com/Financial-Times/x-dash/blob/master/contribution.md
[release process]: https://github.com/Financial-Times/x-dash/blob/master/release-guidelines.md
[release process]: ../components/release-guidelines.md


## Does x-dash mean we can use React?
Expand Down

0 comments on commit 8a46c7d

Please sign in to comment.