<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -510,10 +510,10 @@ module Formtastic #:nodoc:
     #   &lt;/select&gt;
     #
     #
-    # You can customize the options available in the select by passing in a collection (Array) of
-    # ActiveRecord objects through the :collection option.  If not provided, the choices are found
-    # by inferring the parent's class name from the method name and simply calling find(:all) on
-    # it (VehicleOwner.find(:all) in the example above).
+    # You can customize the options available in the select by passing in a collection (an Array or 
+    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+    # parent's class name from the method name and simply calling find(:all) on it 
+    # (VehicleOwner.find(:all) in the example above).
     #
     # Examples:
     #
@@ -521,6 +521,7 @@ module Formtastic #:nodoc:
     #   f.input :author, :collection =&gt; Author.find(:all)
     #   f.input :author, :collection =&gt; [@justin, @kate]
     #   f.input :author, :collection =&gt; {@justin.name =&gt; @justin.id, @kate.name =&gt; @kate.id}
+    #   f.input :author, :collection =&gt; [&quot;Justin&quot;, &quot;Kate&quot;, &quot;Amelia&quot;, &quot;Gus&quot;, &quot;Meg&quot;]
     #
     # Note: This input looks for a label method in the parent association.
     #
@@ -611,16 +612,17 @@ module Formtastic #:nodoc:
     #     &lt;/ol&gt;
     #   &lt;/fieldset&gt;
     #
-    # You can customize the options available in the set by passing in a collection (Array) of
-    # ActiveRecord objects through the :collection option.  If not provided, the choices are found
-    # by inferring the parent's class name from the method name and simply calling find(:all) on
-    # it (Author.find(:all) in the example above).
+    # You can customize the options available in the select by passing in a collection (an Array or 
+    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+    # parent's class name from the method name and simply calling find(:all) on it 
+    # (Author.find(:all) in the example above).
     #
     # Examples:
     #
     #   f.input :author, :as =&gt; :radio, :collection =&gt; @authors
     #   f.input :author, :as =&gt; :radio, :collection =&gt; Author.find(:all)
     #   f.input :author, :as =&gt; :radio, :collection =&gt; [@justin, @kate]
+    #   f.input :author, :collection =&gt; [&quot;Justin&quot;, &quot;Kate&quot;, &quot;Amelia&quot;, &quot;Gus&quot;, &quot;Meg&quot;]
     #
     # You can also customize the text label inside each option tag, by naming the correct method
     # (:full_name, :display_name, :account_number, etc) to call on each object in the collection</diff>
      <filename>lib/formtastic.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>54469762f7a9849f844b767a01c13fca2b81b7c9</id>
    </parent>
  </parents>
  <author>
    <name>Justin French</name>
    <email>justin@indent.com.au</email>
  </author>
  <url>http://github.com/justinfrench/formtastic/commit/35eadf9a0f3e30101993419c3dd3327fb2fdd0b6</url>
  <id>35eadf9a0f3e30101993419c3dd3327fb2fdd0b6</id>
  <committed-date>2009-07-04T17:43:49-07:00</committed-date>
  <authored-date>2009-07-04T17:43:49-07:00</authored-date>
  <message>Improving documentation for :radio and :select inputs:

* it now indicates that you can supply an Array of Strings for the the collection (resolves issue #21)
* it now clearly indicates that the collection can be an Array or a Hash</message>
  <tree>224a771b93a7e623d4846f02ca2ec70edc7e9c24</tree>
  <committer>
    <name>Justin French</name>
    <email>justin@indent.com.au</email>
  </committer>
</commit>
