diff --git a/lib/data_mapper/property.rb b/lib/data_mapper/property.rb
index <HASH>..<HASH> 100644
--- a/lib/data_mapper/property.rb
+++ b/lib/data_mapper/property.rb
@@ -174,6 +174,27 @@ module DataMapper
   #   User['bill']
   #      # when :name is the primary (natural) key on the users table
   #
+  # == Indeces
+  # You can add indeces for your properties by using the <tt>:index</tt>
+  # option. If you use <tt>true</tt> as the option value, the index will be 
+  # automatically named. If you want to name the index yourself, use a symbol
+  # as the value.
+  #
+  #   property :last_name,  String, :index => true
+  #   property :first_name, String, :index => :name
+  # 
+  # You can create multi-column composite indeces by using the same symbol in
+  # all the columns belonging to the index. The columns will appear in the
+  # index in the order they are declared.
+  #
+  #   property :last_name,  String, :index => :name
+  #   property :first_name, String, :index => :name
+  #      # => index on (last_name, first_name)
+  #
+  # 
+  # If you want to make the indeces unique, use <tt>:unique_index</tt> instead
+  # of <tt>:index</tt>
+  #
   # == Inferred Validations
   # If you require the dm-validations plugin, auto-validations will
   # automatically be mixed-in in to your model classes:
Added documentation for the index and unique_index options in Resource#property.