<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -26,11 +26,11 @@ merb\_global will have the following feature set:
     - choice of providers (po, yaml, database)
         
             Merb::Plugins.config[:merb_global] = {
-              #:provider =&gt; &quot;po&quot;,   # default
-              :provider =&gt; 'yaml'
-              #:provider =&gt; active_record
-              #:provider =&gt; data_mapper
-              #:provider =&gt; sequel
+              #:message_provider =&gt; &quot;po&quot;,   # default
+              :message_provider =&gt; 'yaml'
+              #:message_provider =&gt; active_record
+              #:message_provider =&gt; data_mapper
+              #:message_provider =&gt; sequel
             }
             
     - for JRuby, wrapper allowing use of .properties files.
@@ -80,25 +80,39 @@ Configuration options
 MerbGlobal is possible to configure with:
 
     Merb::Plugins.config[:merb_global] = {
-        :provider =&gt; 'gettext'
+        :message_provider =&gt; 'gettext'
         ...
      }
 
 in init.rb or using plugins.yml file:
 
     :merb_global:
-        :provider: gettext
+        :message_provider: gettext
         ...
 
 Configuration options:
  
- * :provider
+ * :message_provider
    
-   What provider we want to use.
+   What message provider we want to use.
 
    Values: gettext, yaml, sequel, active\_record, data\_mapper
    Default: gettext
 
+ * :date_provider
+ 
+   What date provider we want to use.
+ 
+   Values: fork
+   Default: fork
+
+ * :numeric_providers
+
+   What numeric provider we want to use.
+
+   Values: fork
+   Default: fork
+
  * :flat
 
    Are we running merb-flat or normal merb?
@@ -112,7 +126,7 @@ Configuration options:
 
    If :flat is set to true than MerbGlobal will search in #{Merb.root}+'locale'. If :flat is false than in #{Merb.root}+:localedir. When :flat is false and :localedir configuration is not defined the default will be #{Merb.root}+'app/locale'.
 
- * :domain
+ * :gettext =&gt; :domain
    
    Name of the text domain. Which is basically name of the GetText MO file without .mo extension.
 
@@ -126,7 +140,8 @@ Follwing configuraiton in plugins.yml:
         :provider:  gettext
         :flat:      false
         :localedir: locale
-        :domain:    messages
+	:gettext:
+	    :domain:    messages
 
 will make MerbGlobal to search translations in following places:
 </diff>
      <filename>README.markdown</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5e757e40682f59bab770cec9fca3dae2fb2b7967</id>
    </parent>
  </parents>
  <author>
    <name>Maciej Piechotka</name>
    <email>uzytkownik2@gmail.com</email>
  </author>
  <url>http://github.com/myabc/merb_global/commit/98af9d6786804b486bbb090dd70b302426e4dffa</url>
  <id>98af9d6786804b486bbb090dd70b302426e4dffa</id>
  <committed-date>2008-08-10T14:06:33-07:00</committed-date>
  <authored-date>2008-08-10T14:06:33-07:00</authored-date>
  <message>Updated documentation</message>
  <tree>9beae4faf7b5ff76b57b3417d8103f36a926fb1e</tree>
  <committer>
    <name>Maciej Piechotka</name>
    <email>uzytkownik2@gmail.com</email>
  </committer>
</commit>
