[asterisk-commits] kmoore: branch 11 r373580 - in /branches/11: ./ configs/res_odbc.conf.sample

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Sep 25 08:29:02 2012
New Revision: 373580

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373580
Log:
Fix documentation for default username in res_odbc

This was previously stated to be "root", but is actually the name of
the context if unspecified.

(closes issue ASTERISK-20258)
........

Merged revisions 373578 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373579 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/configs/res_odbc.conf.sample

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/configs/res_odbc.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/11/configs/res_odbc.conf.sample?view=diff&rev=373580&r1=373579&r2=373580
==============================================================================
--- branches/11/configs/res_odbc.conf.sample (original)
+++ branches/11/configs/res_odbc.conf.sample Tue Sep 25 08:29:02 2012
@@ -23,7 +23,7 @@
 ; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
 dsn => asterisk
 ;
-; Username for connecting to the database.  The default user is "root".
+; Username for connecting to the database.  The user defaults to the context name if unspecified.
 ;username => myuser
 ;
 ; Password for authenticating the user to the database.  The default