0
@@ -5,6 +5,8 @@ module Merb
0
   class Config
0
     class << self
0
 
0
+      # ==== Returns
0
+      # Hash:: The defaults for the config.
0
       def defaults
0
         @defaults ||= {
0
           :host                   => "0.0.0.0",
0
@@ -19,43 +21,86 @@ module Merb
0
         }
0
       end
0
 
0
+      # Yields the configuration.
0
+      #
0
+      # ==== Examples
0
+      # {{[
0
+      #   Merb::Config.use do |config|
0
+      #     config[:exception_details] = false
0
+      #   end
0
+      # ]}}
0
       def use
0
         @configuration ||= {}
0
         yield @configuration
0
       end
0
 
0
+      # ==== Parameters
0
+      # key<Object>:: The key to check.
0
+      #
0
+      # ==== Returns
0
+      # Boolean:: True if the key exists in the config.
0
       def key?(key)
0
         @configuration.key?(key)
0
       end
0
 
0
+      # ==== Parameters
0
+      # key<Object>:: The key to retrieve the parameter for.
0
+      #
0
+      # ==== Returns
0
+      # Object:: The value of the configuration parameter.
0
       def [](key)
0
         (@configuration||={})[key]
0
       end
0
 
0
+      # ==== Parameters
0
+      # key<Object>:: The key to set the parameter for.
0
+      # val<Object>:: The value of the parameter.
0
       def []=(key,val)
0
         @configuration[key] = val
0
       end
0
 
0
+      # ==== Parameters
0
+      # key<Object>:: The key of the parameter to delete.
0
       def delete(key)
0
-        @configuration.delete key
0
+        @configuration.delete(key)
0
       end
0
 
0
+      # ==== Parameters
0
+      # key<Object>:: The key to retrieve the parameter for.
0
+      # default<Object>::
0
+      #   The default value to return if the parameter is not set.
0
+      #
0
+      # ==== Returns
0
+      # Object:: The value of the configuration parameter or the default.
0
       def fetch(key, default)
0
-        @configuration.fetch key, default
0
+        @configuration.fetch(key, default)
0
       end
0
 
0
+      # ==== Returns
0
+      # Hash:: The config as a hash.
0
       def to_hash
0
         @configuration
0
       end
0
 
0
+      # ==== Returns
0
+      # String:: The config as YAML.
0
       def to_yaml
0
         @configuration.to_yaml  
0
       end
0
 
0
+      # Sets up the configuration by storing the given settings.
0
+      #
0
+      # ==== Parameters
0
+      # settings<Hash>::
0
+      #   Configuration settings to use. These are merged with the defaults.
0
       def setup(settings = {})
0
         @configuration = defaults.merge(settings)
0
       end
0
 
0
+      # Parses the command line arguments and stores them in the config.
0
+      #
0
+      # ==== Parameters
0
+      # argv<String>:: The command line arguments. Defaults to +ARGV+.
0
       def parse_args(argv = ARGV)
0
          @configuration ||= {}
0
          # Our primary configuration hash for the length of this method

0
@@ -97,12 +97,16 @@ module Merb
0
 
0
     class Base < StandardError #:doc:
0
 
0
+      # ==== Returns
0
+      # String:: The snake cased name of the error without the namespace.
0
       def name
0
         self.class.to_s.snake_case.split('::').last
0
       end
0
       
0
-      # Makes it possible to pass a status-code class to render :status
0
-
0
+      # Makes it possible to pass a status-code class to render :status.
0
+      #
0
+      # ==== Returns
0
+      # Fixnum:: The status code of this exception.
0
       def self.to_i
0
         STATUS
0
       end