<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -27,12 +27,12 @@ The schema comment looks like this:
 
 It also annotates geometrical columns, geom type and srid, when using SpatialAdapter or PostgisAdapter:
 
- # == Schema Info
- #
- # Table name: trips
- #
- #  local           :geometry        point, 4326
- #  path            :geometry        line_string, 4326
+   # == Schema Info
+   #
+   # Table name: trips
+   #
+   #  local           :geometry        point, 4326
+   #  path            :geometry        line_string, 4326
 
 Also, if you pass the -r option, it'll annotate routes.rb with the output of &quot;rake routes&quot;.
 
@@ -72,6 +72,11 @@ To automatically annotate after running 'rake db:migrate':
   
   [needs more clarity] unpack the gem into vendor/plugins, or maybe vendor/gems, or maybe just require tasks/migrate.rake.
 
+If you install annotate_models as a plugin, it will automatically
+adjust your &lt;tt&gt;rake db:migrate&lt;/tt&gt; tasks so that they update the
+annotations in your model files for you once the migration is
+completed.
+
 == OPTIONS
 
     Usage: annotate [options] [model_file]*
@@ -81,15 +86,11 @@ To automatically annotate after running 'rake db:migrate':
         -v, --version                    Show the current version of this gem
         -m, --show-migration             Include the migration version number in the annotation
         -i, --show-indexes               List the table's database indexes in the annotation
+        -s, --simple-indexes             Concat the column's related indexes in the annotation
             --model-dir dir              Annotate model files stored in dir rather than app/models
         -R, --require path               Additional files to require before loading models
         -e, --exclude [tests,fixtures]   Do not annotate fixtures, test files, or both
 
-  If you install annotate_models as a plugin, it will automatically
-  adjust your &lt;tt&gt;rake db:migrate&lt;/tt&gt; tasks so that they update the
-  annotations in your model files for you once the migration is
-  completed.
-
 
 == WARNING
 
@@ -111,29 +112,13 @@ to an automatically created comment block.
 
 Released under the same license as Ruby. No Support. No Warranty.
 
-== Author:
-
-Original code by:
-
-  Dave Thomas -- Pragmatic Programmers, LLC
-
-AnnotateModels mods by:
-
-  Alexander Semyonov ( http://github.com/rotuka/annotate_models )
+== AUTHOR:
 
-AnnotateRoutes originally by:
+Original code by: Dave Thomas -- Pragmatic Programmers, LLC
+Overhauled by: Alex Chaffee
+Gemmed by: Cuong Tran
+Maintained by: Alex Chaffee and Cuong Tran
 
-  Gavin Montague ( http://github.com/govan/annotate-routes )
-
-
-== Forked from:
-
-  http://github.com/ctran/annotate_models
-
-
-== Modifications
- - alex@pivotallabs.com
-=======
 Modifications by:
 
  - Alex Chaffee - http://github.com/alexch - alex@pivotallabs.com
@@ -145,13 +130,9 @@ Modifications by:
  - Neal Clark - http://github.com/nclark
  - Jacqui Maher - http://github.com/jacqui
  - Nick Plante - http://github.com/zapnap - http://blog.zerosum.org
-
+ - Pedro Visintin - http://github.com/peterpunk - http://www.pedrovisintin.com
+ - Bob Potter - http://github.com/bpot
+ - Gavin Montague - http://github.com/govan/
+ - Alexander Semyonov - http://github.com/rotuka/
+ 
 and many others that I may have missed to add.
-
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
-Primary maintainers: Cuong Tran and Alex Chaffee
-=======
-== This fork
-
-  Marcos Piccinini ( http://github.com/nofxx/annotate )
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; nofxx/master</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -273,7 +273,8 @@ module AnnotateModels
         rescue Exception =&gt; e
           puts &quot;Unable to annotate #{file}: #{e.inspect}&quot;
           puts &quot;&quot;
-          puts e.backtrace.join(&quot;\n\t&quot;)
+# todo: check if all backtrace lines are in &quot;gems&quot; -- if so, it's an annotate bug, so print the whole stack trace.
+#          puts e.backtrace.join(&quot;\n\t&quot;)  
         end
       end
       if annotated.empty?</diff>
      <filename>lib/annotate/annotate_models.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,3 +2,4 @@ TODO
 -----
 change default position back to &quot;top&quot; for all
 add &quot;top&quot; and &quot;bottom&quot; as synonyms for &quot;before&quot; and &quot;after&quot;
+change 'exclude' to 'only' (double negatives are not unconfusing)</diff>
      <filename>todo.txt</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5b3d4459045f2b363523745d0c2ac9c28ff10fc9</id>
    </parent>
  </parents>
  <author>
    <name>Alex Chaffee</name>
    <email>alex@stinky.com</email>
  </author>
  <url>http://github.com/ctran/annotate_models/commit/952013efedbdd483a2e22ebe938789a16c86be24</url>
  <id>952013efedbdd483a2e22ebe938789a16c86be24</id>
  <committed-date>2009-10-23T09:58:27-07:00</committed-date>
  <authored-date>2009-10-23T09:58:27-07:00</authored-date>
  <message>documentation</message>
  <tree>7788fedf384273b2a11e5b1579ec488345c2f8b6</tree>
  <committer>
    <name>Alex Chaffee</name>
    <email>alex@stinky.com</email>
  </committer>
</commit>
