README.md in spree-2.1.12 vs README.md in spree-2.2.0
- old
+ new
@@ -28,17 +28,21 @@
[![Code Climate](https://codeclimate.com/github/spree/spree.png)](https://codeclimate.com/github/spree/spree)
Installation
------------
+**THIS README IS FOR THE MASTER BRANCH OF SPREE AND REFLECTS THE WORK CURRENTLY
+EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF
+SPREE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
+
The fastest way to get started is by using the spree command line tool
available in the spree gem which will add Spree to an existing Rails application.
```shell
-gem install rails -v 4.0.12
+gem install rails -v 4.0.3
gem install spree
-rails _4.0.12_ new my_store
+rails _4.0.3_ new my_store
spree install my_store
```
This will add the Spree gem to your Gemfile, create initializers, copy migrations
and optionally generate sample products and orders.
@@ -59,15 +63,15 @@
Using stable builds and bleeding edge
-------------
To use a stable build of Spree, you can manually add Spree to your
-Rails 4.0.0 application. To use the 2-1-stable branch of Spree, add this line to
+Rails 4.0.x application. To use the 2-2-stable branch of Spree, add this line to
your Gemfile.
```ruby
-gem 'spree', github: 'spree/spree', branch: '2-1-stable'
+gem 'spree', github: 'spree/spree', branch: '2-2-stable'
```
Alternatively, if you want to use the bleeding edge version of Spree, use this
line:
@@ -81,11 +85,11 @@
If you wish to have authentication included also, you will need to add the
`spree_auth_devise` gem as well. Either this:
```ruby
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
```
Or this:
```ruby
@@ -243,11 +247,11 @@
[![Team City](http://www.jetbrains.com/img/logos/logo_teamcity_small.gif)](http://www.jetbrains.com/teamcity)
We use [TeamCity](http://www.jetbrains.com/teamcity/) to run the tests for Spree.
-You can see the build statuses at [http://ci.spreecommerce.com](http://ci.spreecommerce.com/guestLogin.html?guest=1).
+You can see the build statuses at [http://ci.spree.fm](http://ci.spree.fm/guestLogin.html?guest=1).
---
Each gem contains its own series of tests, and for each directory, you need to
do a quick one-time creation of a test application and then you can use it to run
@@ -291,10 +295,10 @@
bash build.sh
```
Further Documentation
------------
-Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com).
+Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com).
Contributing
------------
Spree is an open source project and we encourage contributions. Please see the