summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2010-10-01 22:11:12 -0700
committerAndre Arko <andre@arko.net>2010-10-01 22:37:50 -0700
commit4125a427477bb7889fedcd66022f90efdd09c57e (patch)
treeba15abc02573a9f5bca51ae64915beba5c5e0790 /README.md
parent7ec0fc6a70b93c92348638c13e9e9bd1ed261616 (diff)
downloadbundler-4125a427477bb7889fedcd66022f90efdd09c57e.tar.gz
Document the `1-0-stable` branch in the readme, remove outdated roadmap
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index 1bb9b91b3e..0cd4dd1518 100644
--- a/README.md
+++ b/README.md
@@ -6,22 +6,24 @@ and all child dependencies specified in this manifest. It can manage any update
to the gem manifest file and update the bundle's gems accordingly. It also lets
you run any ruby code in context of the bundle's gem environment.
-## Installation and usage
+### Installation and usage
See [gembundler.com](http://gembundler.com) for up-to-date installation and usage instructions.
-## Troubleshooting
+### Troubleshooting
For help with common problems, see [ISSUES](http://github.com/carlhuda/bundler/blob/master/ISSUES.md).
### Development
-To see what has changed in each version of bundler, starting with 0.9.5, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md). For information about changes that will happen in the future, see the [ROADMAP](http://github.com/carlhuda/bundler/blob/master/ROADMAP.md).
+To see what has changed in recent versions of bundler, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
-## Upgrading from Bundler 0.8 to 0.9 and above
+The `master` branch contains our current progress towards version 1.1. Because of that, please submit bugfix pull requests against the `1-0-stable` branch.
+
+### Upgrading from Bundler 0.8 to 0.9 and above
See [UPGRADING](http://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
-## Other questions
+### Other questions
Feel free to chat with the Bundler core team (and many other users) on IRC in the [#bundler](irc://irc.freenode.net/bundler) channel on Freenode, or via email on the [Bundler mailing list](http://groups.google.com/group/ruby-bundler).