<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -223,53 +223,6 @@ To share views, just create templates and partials in the plugin's &lt;tt&gt;app/views
 
 == Customize / extend behavior in each installation
 
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:README.rdoc
-=======
-This line connects your routes to the app.  The only difference between your plugin's 
-routes file and the standard config/routes.rb file is that you don't need to write &quot;map&quot; - it's implicit.
-
-So what would be
-
-  map.resources :posts
-  
-in config/routes.rb becomes just
-
-  resources :posts
-  
-in my_app/config/routes.rb.  All standard routing methods are available, such as:
-
-  namespace :admin do |admin|
-    admin.resources :posts
-  end
-
-== Running migrations
-
-Desert uses a separate table to manage migration version to maintain backwards compatibility with Rails 1.x.
-Your plugin app's migration live in your_plugin/db/migrate.  To run migrations, follow these steps:
-
-* Create a new migration in your main app
-
-    script/generate migration migrate_my_plugin_to_045
-  
-* Add the custom `migrate_plugin` method
-
-    class MigrateMyPluginTo045 &lt; ActiveRecord::Migration
-      def self.up
-        migrate_plugin(:my_plugin, 20080530223548)
-      end
-
-      def self.down
-        migrate_plugin(:my_plugin, 0)
-      end
-    end
-
-* Run your migrations normally
-
-    rake db:migrate
-
-== Example
-
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; Merge branch 'master' of git://github.com/zilkey/desert:README.rdoc
 Say you want to create a plugin named acts_as_spiffy.
 Desert allows Spiffy to have a set of features that can be reused and extended in several projects.
 
@@ -319,7 +272,6 @@ test/specs for all installed plugins, which may not be what you want.
 == Running Desert Specs
 
 To run specs, you need to:
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:README.rdoc
 
 * Make sure you have the necessary gems installed (rr, rspec)
 * Install git http://git.or.cz/
@@ -327,34 +279,17 @@ To run specs, you need to:
 * Update the database.yml file in &lt;tt&gt;spec/rails_root/config/database.yml&lt;/tt&gt;
 * Install the dependencies
 * Run the specs
-=======
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; Merge branch 'master' of git://github.com/zilkey/desert:README.rdoc
 
-* Make sure you have the necessary gems installed (rr, rspec)
-* Install git http://git.or.cz/
-* Create a database named desert_test
-* Update the database.yml file in `spec/rails_root/config/database.yml`
-* Install the dependencies
-* Run the specs
-  
 Desert is a library that heavily monkey patches Rails. To ensure that Desert works with
 multiple versions of Rails, its tests are run against the supported versions of Rails.
 
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:README.rdoc
 To set up the different supported versions of Rails, run
-=======
-To set up the different supported versions of Rails, run 
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; Merge branch 'master' of git://github.com/zilkey/desert:README.rdoc
 
   rake install_dependencies
 
 This will clone the Rails git repo and export the supported versions of rails into the
 respective directories.
 
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:README.rdoc
   rake update_dependencies
-=======
-  rake update_dependencies 
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; Merge branch 'master' of git://github.com/zilkey/desert:README.rdoc
 
 will update the clones repo on your machine.</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -40,6 +40,7 @@ end
 module Desert #:nodoc:
   module Generator #:nodoc:
     module Commands #:nodoc:
+
       module Create
         def map_route_from_plugin
           logger.route &quot;adding map.routes_from_plugin(:#{file_name}) to top of routes.rb&quot;
@@ -57,7 +58,7 @@ module Desert #:nodoc:
           gsub_file 'config/routes.rb', /(#{Regexp.escape(look_for)})/mi, ''
         end
       end
-      
+
       module List
         def map_route_from_plugin
           logger.route &quot;adding map.routes_from_plugin(:#{file_name}) to top of routes.rb&quot;</diff>
      <filename>generators/desert_plugin/desert_plugin_generator.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f668dbc6fb4303b966075c5fe1cdd96edc9b9acb</id>
    </parent>
  </parents>
  <author>
    <name>btakita</name>
    <email>btakita@af276e61-6b34-4dac-905b-574b5f35ef33</email>
  </author>
  <url>http://github.com/tog/desert/commit/163017471422df8056f347573a01369ec7b7aa61</url>
  <id>163017471422df8056f347573a01369ec7b7aa61</id>
  <committed-date>2008-06-22T21:02:56-07:00</committed-date>
  <authored-date>2008-06-22T21:02:56-07:00</authored-date>
  <message>fix incorrect nesting in plugin generator, update readme to include all content from the doc/index folder


git-svn-id: svn+ssh://rubyforge.org/var/svn/pivotalrb/desert/trunk@1713 af276e61-6b34-4dac-905b-574b5f35ef33</message>
  <tree>70081f84308c9a87a2f0c9fcf909745dcb5d11a4</tree>
  <committer>
    <name>btakita</name>
    <email>btakita@af276e61-6b34-4dac-905b-574b5f35ef33</email>
  </committer>
</commit>
