Update list of included modules

crowbot · Mar 14, 2012 · d426368 · d426368
1 parent 761dccc
commit d426368
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/friendly_id/base.rb b/lib/friendly_id/base.rb
@@ -156,7 +156,8 @@ module Base
     # @option options [Symbol,Module] :use The addon or name of an addon to use.
     #   By default, FriendlyId provides {FriendlyId::Slugged :slugged},
     #   {FriendlyId::History :history}, {FriendlyId::Reserved :reserved}, and
-    #   {FriendlyId::Scoped :scoped}.
+    #   {FriendlyId::Scoped :scoped}, {FriendlyId::SimpleI18n :simple_i18n},
+    #   and {FriendlyId::Globalize :globalize}.
     #
     # @option options [Array] :reserved_words Available when using +:reserved+,
     #   which is loaded by default. Sets an array of words banned for use as

diff --git a/lib/friendly_id/configuration.rb b/lib/friendly_id/configuration.rb
@@ -54,7 +54,7 @@ def initialize(model_class, values = nil)
     # @param [#to_s,Module] *modules Arguments should be Modules, or symbols or
     #   strings that correspond with the name of a module inside the FriendlyId
     #   namespace. By default FriendlyId provides +:slugged+, +:history+,
-    #   +:simple_i18n+ and +:scoped+.
+    #   +:simple_i18n+, +:globalize+, and +:scoped+.
     def use(*modules)
       modules.to_a.flatten.compact.map do |object|
         mod = object.kind_of?(Module) ? object : FriendlyId.const_get(object.to_s.classify)