Skip to content

Commit 9a27434

Browse files
committed
Merge pull request react-bootstrap#1396 from taion/react-v0.13-docs
Update documentation with React v0.13 instructions
2 parents d9b9d6c + c6cc816 commit 9a27434

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# react-bootstrap
22

3-
[Bootstrap 3][bootstrap] components built with [React][react]
3+
[Bootstrap 3][bootstrap] components built with [React][react].
44

55
[![Travis Build Status][build-badge]][build]
66
[![Build status][appveyor-badge]][appveyor]
@@ -18,13 +18,9 @@
1818

1919
__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.
2020

21-
## React-0.14
21+
## React v0.13 support
2222

23-
If you want to try / play with `React-0.14` betas, we cut releases from the `react-14` branch.
24-
They're on the `react-pre` tag.
25-
```
26-
> npm install react-bootstrap@react-pre
27-
```
23+
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.
2824

2925
## Docs
3026

docs/src/HomePage.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,17 @@ export default class HomePage extends React.Component {
2323
<Grid>
2424
<Alert bsStyle="warning">
2525
<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>
26-
<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>
27-
<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>
28-
<p><Glyphicon glyph="ok" /> We are open to pull requests that address bugs, improve documentation, enhance accessibility,</p>
29-
<p>add test coverage, or bring us closer to feature parity with <a target="_blank" href="http://getbootstrap.com/">Bootstrap</a>.</p>
26+
<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>
27+
<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>
28+
<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>
3029
<p><Glyphicon glyph="user" /> We actively seek to invite frequent pull request authors to join the organization. <Glyphicon glyph="thumbs-up" /></p>
3130
</Alert>
3231
<Alert bsStyle="danger">
3332
<p><Glyphicon glyph="warning-sign" /> The project is under active development, and APIs will change. </p>
34-
<p><Glyphicon glyph="bullhorn" /> Prior to the 1.0.0 release, breaking changes should result in a Minor version bump.</p>
33+
<p><Glyphicon glyph="bullhorn" /> Prior to the 1.0.0 release, breaking changes should result in a minor version bump.</p>
3534
</Alert>
3635
<Alert bsStyle="info">
37-
<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>
38-
<p><kbd>$ npm install react-bootstrap@react-pre</kbd></p>
36+
<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>
3937
</Alert>
4038
</Grid>
4139

0 commit comments

Comments
 (0)