[asterisk-commits] wdoekes: branch 12 r411809 - in /branches/12: ./ configs/

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Mon Apr  7 09:50:04 2014
New Revision: 411809

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411809
Log:
configs: Clean up long line and typo in res_odbc.conf.sample.
........

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

Merged revisions 411808 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/UPGRADE.txt
    branches/12/configs/res_odbc.conf.sample

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

Modified: branches/12/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/12/UPGRADE.txt?view=diff&rev=411809&r1=411808&r2=411809
==============================================================================
--- branches/12/UPGRADE.txt (original)
+++ branches/12/UPGRADE.txt Mon Apr  7 09:50:04 2014
@@ -71,7 +71,7 @@
 
   Disable it for PostgreSQL backends in order to avoid errors caused by
   updating integer columns with an empty string instead of NULL
-  (sipppeers,sipregs)
+  (sippeers, sipregs, ..).
 
 PJSIP:
  - The PJSIP registrar now stores the contents of the User-Agent header of

Modified: branches/12/configs/res_odbc.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/12/configs/res_odbc.conf.sample?view=diff&rev=411809&r1=411808&r2=411809
==============================================================================
--- branches/12/configs/res_odbc.conf.sample (original)
+++ branches/12/configs/res_odbc.conf.sample Mon Apr  7 09:50:04 2014
@@ -23,7 +23,8 @@
 ; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
 dsn => asterisk
 ;
-; Username for connecting to the database.  The user defaults to the context name if unspecified.
+; 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
@@ -68,8 +69,9 @@
 ; during realtime updates. Disabling this option causes empty column values to be
 ; stored as NULLs for non-text columns.
 ; Disable it for PostgreSQL backend in order to avoid errors caused by updating
-; integer columns with an empty string instead of NULL (sipppeers,sipregs)
-; NOTE: This option will be removed in asterisk 13. At that point, it will always behave as if it was set to 'no'.
+; integer columns with an empty string instead of NULL (sippeers, sipregs, ..).
+; NOTE: This option will be removed in asterisk 13. At that point, it will always
+; behave as if it was set to 'no'.
 ;allow_empty_string_in_nontext => yes
 ;
 ; How long (in seconds) should we attempt to connect before considering the