Merged revisions 373579 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r373579 | kmoore | 2012-09-25 08:28:20 -0500 (Tue, 25 Sep 2012) | 11 lines

  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)
  Reported by: Stefan x
  ........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373607 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
index 2980bad68cb3d24fc4392dbc7fa8f6e24b0e6b6f..66659ae42ea2a8588146ca3b2860ecb055116283 100644 (file)
--- a/configs/res_odbc.conf.sample
+++ b/configs/res_odbc.conf.sample
@@ -23,7 +23,7 @@ enabled => no
 ; (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