Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

Commit

Permalink
update README for Ruby2
Browse files Browse the repository at this point in the history
  • Loading branch information
dgoerger committed Jul 22, 2014
1 parent 83a2ba8 commit 246c2db
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Reservations makes it easy to manage the checking in and out of equipment, much
Getting Started
===============

There are two mains steps to setting up Reservations, setting up a deployment server, and installing the Reservations application.
There are two mains steps to setting up Reservations: setting up a deployment server, and installing the Reservations application.

### Prerequisites
You'll need the following to run Reservations:
* [Ruby 1.9](http://www.ruby-lang.org/) and [Rails 3.2](http://rubyonrails.org/)
* a database server ([Sqlite](http://www.sqlite.org/), [MySQL](http://www.mysql.com/) or any database supported by Rails)
* [Ruby 2.1](http://www.ruby-lang.org/) and [Rails 3.2](http://rubyonrails.org/)
* a database server ([MySQL](http://www.mysql.com/), or any database supported by Rails)
* [ImageMagick](http://www.imagemagick.org/script/index.php)
* a [CAS](http://www.jasig.org/cas) authentication system

Expand All @@ -44,7 +44,7 @@ Then, create the database and run migrations to build the structure:

```
rake db:create
rake db:migrate
rake db:schema:load
```

Finally, start the app locally:
Expand All @@ -57,7 +57,7 @@ Just point your browser to ```localhost:3000``` to use Reservations.

Reservations is built using [Ruby on Rails](http://rubyonrails.org/), and can be set up (deployed) like most Rails apps. You'll need a server running with the following software:

* [Ruby 1.9](http://www.ruby-lang.org/)
* [Ruby 2.1](http://www.ruby-lang.org/)
* database server ([MySQL](http://www.mysql.com/) is preferred, but any database supported by Rails should work, including PostgreSQL)
* web server ([apache](http://apache.org/) or [nginx](http://wiki.nginx.org/Main) both work well)
* Rails application server (usually [Passenger Phusion](http://www.modrails.com/) aka mod_rails)
Expand Down

0 comments on commit 246c2db

Please sign in to comment.