Permalink
Browse files

Update documentation for Rails 3.

  • Loading branch information...
1 parent 8207c44 commit f5034a13319c3bef4999901b3c6888cab788c8b6 @igal igal committed Oct 14, 2011
Showing with 4 additions and 4 deletions.
  1. +3 −3 INSTALL.md
  2. +1 −1 VAGRANT.md
View
6 INSTALL.md
@@ -26,10 +26,10 @@ To run Calagator in `development` mode, which automatically reloads code as you
* Follow the **Setup** instructions above.
* Initialize your database, run `bundle exec rake db:migrate db:test:prepare`
- * Start the *Ruby on Rails* web application by running `./script/server` (UNIX) or `ruby script/server` (Windows).
+ * Start the *Ruby on Rails* web application by running `rails server` (UNIX) or `ruby script/rails /server` (Windows).
* Open a web browser to <http://localhost:3000/> to use the development server
* Read the [Rails Guides](http://guides.rubyonrails.org/) to learn how to develop a Ruby on Rails application.
- * When done, stop the *Ruby on Rails* server `script/server` by pressing `CTRL-C`.
+ * When done, stop the *Ruby on Rails* server (e.g. `rails server`) by pressing `CTRL-C`.
Production
@@ -41,7 +41,7 @@ To run Calagator in `production` mode, which runs more quickly, but doesn't relo
* Setup a firewall to protect ports used by your search engine, see the **Search engine** section for details.
* Initialize your database, run `bundle exec rake RAILS_ENV=production db:migrate`
* Run `bundle exec rake clear` to clear your cache after updating your application's code.
- * Setup a production web server using [Phusion Passenger](http://www.modrails.com/), [Thin](http://code.macournoyer.com/thin/), [Rainbows](http://rainbows.rubyforge.org/), etc. These will be able to serve more users more quickly than `script/server`.
+ * Setup a production web server using [Phusion Passenger](http://www.modrails.com/), [Thin](http://code.macournoyer.com/thin/), [Unicorn](http://unicorn.bogomips.org/), [Rainbows](http://rainbows.rubyforge.org/), etc. These will be able to serve more users more quickly than using the built-in server (e.g. `rails server`).
The Calagator.org site runs on [Ubuntu Linux](http://ubuntu.com/), [Phusion REE (Ruby Enterprise Edition)](http://rubyenterpriseedition.com/) and [Phusion Passenger](http://www.modrails.com/).
View
2 VAGRANT.md
@@ -37,7 +37,7 @@ Use Vagrant by issuing the commands below. The `local%` and `virtual%` in the co
**Run** the application on the virtual machine, it will be accessible on [http://localhost:8000/](http://localhost:8000/):
local% vagrant ssh
- virtual% ./script/server
+ virtual% rails server
**Test** the application within the virtual machine:

0 comments on commit f5034a1

Please sign in to comment.