From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 8 Dec 2005 23:33:08 +0000 (+0000)
Subject: Document two keywords that were previously missing
X-Git-Tag: 1.4.0-beta1~3208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7cda51ffc3062cbcdf8c5cc13aeaa79122fb831;p=thirdparty%2Fasterisk.git

Document two keywords that were previously missing


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
index 6b162a6449..59d5c68c36 100644
--- a/configs/res_odbc.conf.sample
+++ b/configs/res_odbc.conf.sample
@@ -1,17 +1,28 @@
 ;;; odbc setup file 
 
+; ENV is a global set of environmental variables that will get set.
+; Note that all environmental variables can be seen by all connections,
+; so you can't have different values for different connections.
+[ENV]
+INFORMIXSERVER => my_special_database
+INFORMIXDIR => /opt/informix
+
+; All other sections are arbitrary names for database connections.
+
 [asterisk]
+enabled => yes
 dsn => asterisk
 ;username => myuser
 ;password => mypass
 pre-connect => yes
 
 
-;[mysql2]
-;dsn => MySQL-asterisk
-;username => myuser
-;password => mypass
-;pre-connect => yes
+[mysql2]
+enabled => no
+dsn => MySQL-asterisk
+username => myuser
+password => mypass
+pre-connect => yes