<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,14 @@
 module MongoMapper
   # Controls the parsing and handling of options used by finders.
+  #
+  # == Important Note
+  #
+  # This class is private to MongoMapper and should not be considered part of 
+  # MongoMapper's public API. Some documentation herein, however, may prove 
+  # useful for understanding how MongoMapper handles the parsing of finder 
+  # conditions and options.
+  #
+  # @private
   class FinderOptions
     attr_reader :options
     
@@ -9,9 +18,12 @@ module MongoMapper
     #
     # @overload
     #   to_mongo_criteria(conditions, parent_key)
-    #   @param [Hash] conditions
+    #   @param [Hash] conditions field/value pairs
+    #   @param [#to_s] parent_key the name of the key that the current value 
+    #     belongs to. This is used internally by this method when recursively 
+    #     parsing nested Hash conditions.
     #
-    # @return [Hash] 
+    # @return [Hash] conditions compatible with Mongo DB
     def self.to_mongo_criteria(conditions, parent_key=nil)
       criteria = {}
       conditions.each_pair do |field, value|
@@ -34,16 +46,11 @@ module MongoMapper
       criteria
     end
         
-    # @param [Hash] options a set of optoins to convert into a Mongo 
+    # @param [Hash] options a set of options to convert into a Mongo 
     #   compatible form
-    # @option [] :fields
-    # @option [] :select may be used instead of &lt;tt&gt;:fields&lt;/tt&gt;
-    # @option [#to_i] :skip ..., defaults to zero (0)
-    # @option [#to_i] :offset may be be used instead of &lt;tt&gt;:skip&lt;/tt&gt;
-    # @option [#to_i] :limit the number of records to limit your results to, 
-    #   defaults to zero (0)
-    # @option [] :sort
-    # @option [] :order may be used instead of &lt;tt&gt;:order&lt;/tt&gt;
+    #
+    # @see FinderOptions#initialize for more information on the +options+ 
+    #   parameter
     #
     # @return [Hash] converts the provided options into a Mongo compatible 
     #   form. This Hash has four keys: &lt;tt&gt;:fields&lt;/tt&gt;, &lt;tt&gt;:skip&lt;/tt&gt;, 
@@ -78,13 +85,15 @@ module MongoMapper
     # automatically discovered.
     #
     # @param [Hash] options any number of options or conditions
-    # @option [] :fields
-    # @option [] :select
-    # @option [] :skip
-    # @option [Integer] :offset
-    # @option [Integer] :limit
-    # @option [] :sort
-    # @option [String] :order
+    # @option [String, Array] :fields a list of field names to use for the 
+    #   returned documents
+    # @option [String, Array] :select equivalent to &lt;tt&gt;:fields&lt;/tt&gt;
+    # @option [#to_i] :skip when returning found documents, ignore the first 
+    #   +n+ records as defined by this paramter
+    # @option [#to_i] :offset equivalent to &lt;tt&gt;:skip&lt;/tt&gt;
+    # @option [Integer] :limit the number of results to maximally return
+    # @option [String] :sort a SQL-style ORDER clause
+    # @option [String] :order equivalent to &lt;tt&gt;:sort&lt;/tt&gt;
     # @option [Hash] :conditions explicit conditions to initialize 
     #   with (optional)
     #
@@ -121,6 +130,7 @@ module MongoMapper
       self.class.to_mongo_options(@options)
     end
     
+    # @return [Array&lt;Hash&gt;] Mongo criteria and options enclosed in an Array
     def to_a
       [criteria, options]
     end</diff>
      <filename>lib/mongo_mapper/finder_options.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>9a340fb47a10d5f1b3abe64ee20eb6d08bafa36b</id>
    </parent>
  </parents>
  <author>
    <name>James Herdman</name>
    <email>james.herdman@gmail.com</email>
  </author>
  <url>http://github.com/collectiveidea/mongomapper/commit/24b626f1d9351a55793d99f8af1325c7afdb91d1</url>
  <id>24b626f1d9351a55793d99f8af1325c7afdb91d1</id>
  <committed-date>2009-10-21T13:03:27-07:00</committed-date>
  <authored-date>2009-10-21T13:03:27-07:00</authored-date>
  <message>Fleshed out the documentation for FinderOptions</message>
  <tree>740b9c31ba6068c007201e4f749538c77aa43f61</tree>
  <committer>
    <name>James Herdman</name>
    <email>james.herdman@gmail.com</email>
  </committer>
</commit>
