From: Walter Doekes <walter+asterisk@wjd.nu>
Date: Mon, 7 Apr 2014 14:50:04 +0000 (+0000)
Subject: configs: Clean up long line and typo in res_odbc.conf.sample.
X-Git-Tag: 12.3.0-rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0ad8ce3e47da83e2a88810f11e707cccf0ab651;p=thirdparty%2Fasterisk.git

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


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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 037e2ec889..029b6cb494 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -71,7 +71,7 @@ ODBC:
 
   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
diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
index 581389fda1..035f38c84f 100644
--- a/configs/res_odbc.conf.sample
+++ b/configs/res_odbc.conf.sample
@@ -23,7 +23,8 @@ enabled => no
 ; (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 @@ pre-connect => yes
 ; 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