Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
  • Loading branch information...
2 parents 0d87097 + 6e8e6d5 commit 1a63cf82635889744a6e5f546159bcfba9cbbcad @treeder treeder committed Jul 25, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 README.md
View
4 README.md
@@ -11,7 +11,7 @@ To start using delayed_job_ironmq, you need to sign up for Iron.io and setup you
1. Go to http://iron.io/ and sign up.
2. Get an Oauth Token at http://hud.iron.io/tokens
-3. Add an iron.json file or setup environment variables. See http://dev.iron.io/articles/configuration/ for details.
+3. Add an iron.json file or setup environment variables for authentication. See http://dev.iron.io/articles/configuration/ for details.
## Installation
@@ -64,7 +64,7 @@ That will start pulling jobs off the queue and processing them.
# Demo Rails Application
-Here's a demo rails app you can check out to see it in action: https://github.com/treeder/delayed_job_with_iron_mq
+Here's a demo rails app you can clone and try it out: https://github.com/treeder/delayed_job_with_iron_mq
# Using with Heroku

0 comments on commit 1a63cf8

Please sign in to comment.
Something went wrong with that request. Please try again.