startup.rb in adhearsion-0.8.5

- old
+ new

@@ -25,11 +25,12 @@
   # config.end_call_on_error = false
 
   # NOTE: Pay special attention to the argument_delimiter field below:
   # For Asterisk <= 1.4, use "|" (default)
   # For Asterisk >= 1.6, use ","
-  # This setting applies to AMI and AGI
+  # The delimiter can also be specified in Asterisk's asterisk.conf.
+  # This setting applies only to AGI.  The AMI delimiter is auto-detected.
   config.enable_asterisk :argument_delimiter => '|'
   # config.asterisk.enable_ami :host => "127.0.0.1", :username => "admin", :password => "password", :events => true
 
   # config.enable_drb
 
@@ -42,10 +43,12 @@
   # Note: You CANNOT do enable_rails and enable_database at the same time. When you enable Rails,
   # it will automatically connect to same database Rails does and load the Rails app's models.
 
   # Configure a database to use ActiveRecord-backed models. See ActiveRecord::Base.establish_connection
   # for the appropriate settings here.
+  # You can also override the default log destination by supplying an alternate
+  # logging object with :logger.  The default is ahn_log.db.
   # config.enable_database :adapter  => 'mysql',
   #                        :username => 'joe',
   #                        :password => 'secret',
   #                        :host     => 'db.example.org'
 
@@ -57,9 +60,15 @@
   #                    :logger => ahn_log.ldap,
   #                    :bind_dn => "uid=drewry,ou=People,dc=dataspill,dc=org",
   #                    :password => 'password12345',
   #                    :allow_anonymous => false,
   #                    :try_sasl => false
+  
+  # Configure XMPP call controller
+  # config.enable_xmpp :jid => 'active-calls.xmpp.example.com',
+  #                    :password => 'passwd',
+  #                    :server => 'xmpp.example.com',
+  #                    :port => 5347
 
 end
 
 Adhearsion::Initializer.start_from_init_file(__FILE__, File.dirname(__FILE__) + "/..")