Skip to content

Commit

Permalink
Merge pull request react-bootstrap#1396 from taion/react-v0.13-docs
Browse files Browse the repository at this point in the history
Update documentation with React v0.13 instructions
  • Loading branch information
jquense committed Oct 8, 2015
2 parents d9b9d6c + c6cc816 commit 9a27434
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# react-bootstrap

[Bootstrap 3][bootstrap] components built with [React][react]
[Bootstrap 3][bootstrap] components built with [React][react].

[![Travis Build Status][build-badge]][build]
[![Build status][appveyor-badge]][appveyor]
Expand All @@ -18,13 +18,9 @@

__Under active development - APIs will change.__ Check out the [1.0.0 Roadmap](https://github.com/react-bootstrap/react-bootstrap/wiki#100-roadmap) and [Contributing Guidelines][contributing] to see where you can help out. Prior to the 1.0.0 release, deprecations or breaking changes should result in a Minor version bump.

## React-0.14
## React v0.13 support

If you want to try / play with `React-0.14` betas, we cut releases from the `react-14` branch.
They're on the `react-pre` tag.
```
> npm install react-bootstrap@react-pre
```
Releases from v0.27.0 onward only support React v0.14. The latest releases compatible with React v0.13 are the v0.26.x releases.

## Docs

Expand Down
12 changes: 5 additions & 7 deletions docs/src/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,17 @@ export default class HomePage extends React.Component {
<Grid>
<Alert bsStyle="warning">
<p><Glyphicon glyph="bullhorn" /> We are actively working to reach a 1.0.0 release, and we would love your help to get there.</p>
<p><Glyphicon glyph="check" /> Check out the <a href="https://github.com/react-bootstrap/react-bootstrap/wiki#100-roadmap">1.0.0 Roadmap</a> and <a href="https://github.com/react-bootstrap/react-bootstrap/blob/master/CONTRIBUTING.md">Contributing Guidelines</a> to see where you can help out.</p>
<p><Glyphicon glyph="sunglasses" /> A great place to start is any <a target="_blank" href="https://github.com/react-bootstrap/react-bootstrap/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22">issues</a> with a <Label bsStyle="success">help-wanted</Label> label.</p>
<p><Glyphicon glyph="ok" /> We are open to pull requests that address bugs, improve documentation, enhance accessibility,</p>
<p>add test coverage, or bring us closer to feature parity with <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>.</p>
<p><Glyphicon glyph="check" /> Check out the <a href="https://github.com/react-bootstrap/react-bootstrap/wiki#100-roadmap">1.0.0 roadmap</a> and <a href="https://github.com/react-bootstrap/react-bootstrap/blob/master/CONTRIBUTING.md">contributing guidelines</a> to see where you can help out.</p>
<p><Glyphicon glyph="sunglasses" /> A great place to start is any <a target="_blank" href="https://github.com/react-bootstrap/react-bootstrap/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22">issue</a> with a <Label bsStyle="success">help-wanted</Label> label.</p>
<p><Glyphicon glyph="ok" /> We are open to pull requests that address bugs, improve documentation, enhance accessibility, add test coverage, or bring us closer to feature parity with <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>.</p>
<p><Glyphicon glyph="user" /> We actively seek to invite frequent pull request authors to join the organization. <Glyphicon glyph="thumbs-up" /></p>
</Alert>
<Alert bsStyle="danger">
<p><Glyphicon glyph="warning-sign" /> The project is under active development, and APIs will change. </p>
<p><Glyphicon glyph="bullhorn" /> Prior to the 1.0.0 release, breaking changes should result in a Minor version bump.</p>
<p><Glyphicon glyph="bullhorn" /> Prior to the 1.0.0 release, breaking changes should result in a minor version bump.</p>
</Alert>
<Alert bsStyle="info">
<p><Glyphicon glyph="bullhorn" /> If you want to try / play with <b>React-0.14</b> betas, we cut releases from the <b>react-14</b> branch. They're on the <b>react-pre</b> tag.</p>
<p><kbd>$ npm install react-bootstrap@react-pre</kbd></p>
<p><Glyphicon glyph="bullhorn" /> <b>React v0.13 support:</b> Releases from v0.27.0 onward only support React v0.14. The latest releases compatible with React v0.13 are the v0.26.x releases.</p>
</Alert>
</Grid>

Expand Down

0 comments on commit 9a27434

Please sign in to comment.