<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,6 +1,36 @@
 Deployment
 ==========
 
+Heroku
+------
+
+This is the easiest configuration + deployment option.  [Heroku] has full support for Sinatra applications.   Deploying to Heroku is simply a matter of pushing to a remote git repository.
+
+Steps to deploy to Heroku:
+
+* Create an [account](http://heroku.com/signup) if you don't have one
+* `sudo gem install heroku`
+* Make a config.ru in the root-directory
+* Create the app on heroku
+* Push to it
+
+1. An example config.ru file (Heroku sets `RACK_ENV` to production for you)
+
+       require &quot;myapp&quot;
+
+       run Sinatra::Application
+
+2. Create the app and push to it
+
+       From the root-directory of the application
+
+       $ heroku create &lt;app-name&gt;  # This will add heroku as a remote
+       $ git push heroku master
+
+For more details see [this](http://github.com/sinatra/heroku-sinatra-app)
+
+[Heroku]: http://www.heroku.com
+
 Lighttpd Proxied to Thin        {#deployment_lighttpd}
 ------------------------
 
@@ -22,13 +52,13 @@ proxy setup using Lighttpd and Thin.
        require 'rubygems'
        require 'sinatra'
        
-       set :env,       :production
-       set :port,      4567
+       set :environment, :production
+       set :port, 4567
        disable :run, :reload
        
        require 'app'
        
-       run Sinatra.application
+       run Sinatra::Application
 
 3. Setup a config.yml - change the /path/to/my/app path to reflect reality.
 
@@ -123,12 +153,12 @@ You can find additional documentation at the Passenger Github repository.
        require 'rubygems'
        require 'sinatra'
         
-       set :env,  :production
+       set :environment, :production
        disable :run
        
        require 'app'
        
-       run Sinatra.application
+       run Sinatra::Application
 
 
 4. A very simple Sinatra application
@@ -152,13 +182,10 @@ in your Rackup file.
 
 Additional note: some documentation sources will have a different format for passing options to Sinatra in the Rackup file, e.g.:
     
-    Sinatra::Application.default_options.merge!(
-      :run =&gt; false,
-      :env =&gt; :production,
-      :raise_errors =&gt; true
-    )
-    
-This is perfectly valid, however calling `set`, `disable` and `enable` is preferred.
+    set :environment, :production
+    disable :run
+
+    run Sinatra::Application
 
 FastCGI                         {#deployment_fastcgi}
 -------
@@ -238,36 +265,6 @@ Steps to deploy via FastCGI:
          end
        end
 
-Heroku
-------
-
-[Heroku] has added basic support for Sinatra applications. This is possibly the easiest deployment option as once correctly configured,  
-deploying to Heroku becomes simply a matter of pushing to git  
-
-Steps to deploy to Heroku:
-
-* make a config/rackup.ru
-* push to git
-
-1. An example rackup file
-        
-       set :app_file, File.expand_path(File.dirname(__FILE__) + '/../my_sinatra_app.rb')
-       set :public,   File.expand_path(File.dirname(__FILE__) + '/../public')
-       set :views,    File.expand_path(File.dirname(__FILE__) + '/../views')
-       set :env,      :production
-       disable :run, :reload
-       
-       require File.dirname(__FILE__) + &quot;/../my_sinatra_app&quot;
-       
-       run Sinatra.application
-
-2. push to git
-        
-       $ git remote add heroku git@heroku.com:my-sinatra-app.git
-       $ git push heroku master
-
-[Heroku]: http://www.heroku.com
-
 Fuzed and Amazon 
 ----------------
 // TODO: Talk with Blake about this.</diff>
      <filename>book/Deployment.markdown</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e850d0c404461d5ad49109400667f706ad03962e</id>
    </parent>
    <parent>
      <id>dae660237947f19edb7e36acfc2c0f384cb036f9</id>
    </parent>
  </parents>
  <author>
    <name>Scott Wisely</name>
    <email>syd@scrimfind.org</email>
  </author>
  <url>http://github.com/Syd/sinatra-book/commit/30ea50650f748ea28dd0932706d7850b543b3b24</url>
  <id>30ea50650f748ea28dd0932706d7850b543b3b24</id>
  <committed-date>2009-02-10T10:24:03-08:00</committed-date>
  <authored-date>2009-02-10T10:24:03-08:00</authored-date>
  <message>Merge branch 'master' of git://github.com/sinatra/sinatra-book</message>
  <tree>baa0bf9ff95f63ebb5a90437ccd5db72798cbc3f</tree>
  <committer>
    <name>Scott Wisely</name>
    <email>syd@scrimfind.org</email>
  </committer>
</commit>
