[asterisk-commits] branch oej/test-this-branch r12828 - in /team/oej/test-this-branch: ./ channe...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar 13 13:06:38 2006
New Revision: 12828

URL: http://svn.digium.com/view/asterisk?rev=12828&view=rev
Log:
Documentation fixes. Thanks jsmith! The asterisk docs team hits again :-)

Added:
    team/oej/test-this-branch/doc/iptos.txt
      - copied unchanged from r12827, team/oej/test-this-branch/doc/ip-tos.txt
Removed:
    team/oej/test-this-branch/doc/ip-tos.txt
Modified:
    team/oej/test-this-branch/acl.c
    team/oej/test-this-branch/channels/chan_iax2.c
    team/oej/test-this-branch/channels/chan_sip.c
    team/oej/test-this-branch/channels/iax2-provision.c
    team/oej/test-this-branch/configs/res_ldap.conf.sample

Modified: team/oej/test-this-branch/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/acl.c?rev=12828&r1=12827&r2=12828&view=diff
==============================================================================
--- team/oej/test-this-branch/acl.c (original)
+++ team/oej/test-this-branch/acl.c Mon Mar 13 13:06:38 2006
@@ -259,19 +259,19 @@
 		*tos = fval & 0xff;
 	else if (!strcasecmp(value, "lowdelay")) {
 		*tos = IPTOS_LOWDELAY;
-		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/README.tos for more information.", value);
+		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/iptos.txt for more information.", value);
 	} else if (!strcasecmp(value, "throughput")) {
 		*tos = IPTOS_THROUGHPUT;
-		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/README.tos for more information.", value);
+		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/iptos.txt for more information.", value);
 	} else if (!strcasecmp(value, "reliability")) {
 		*tos = IPTOS_RELIABILITY;
-		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/README.tos for more information.", value);
+		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/iptos.txt for more information.", value);
 	} else if (!strcasecmp(value, "mincost")) {
 		*tos = IPTOS_MINCOST;
-		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/README.tos for more information.", value);
+		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/iptos.txt for more information.", value);
 	} else if (!strcasecmp(value, "none")) {
 		*tos = 0;
-		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/README.tos for more information.", value);
+		ast_log(LOG_WARNING, "tos value %s is deprecated.  See doc/iptos.txt for more information.", value);
 	} else if (!strcasecmp(value, "ef"))
 		*tos = 46 << 2;
 	else if (!strcasecmp(value, "af43"))

Modified: team/oej/test-this-branch/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_iax2.c?rev=12828&r1=12827&r2=12828&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_iax2.c (original)
+++ team/oej/test-this-branch/channels/chan_iax2.c Mon Mar 13 13:06:38 2006
@@ -8997,7 +8997,7 @@
 	tosval = ast_variable_retrieve(cfg, "general", "tos");
 	if (tosval) {
 		if (ast_str2tos(tosval, &tos))
-			ast_log(LOG_WARNING, "Invalid tos value, see doc/README.tos for more information.\n");
+			ast_log(LOG_WARNING, "Invalid tos value, see doc/iptos.txt for more information.\n");
 	}
 	while(v) {
 		if (!strcasecmp(v->name, "bindport")){ 
@@ -9149,7 +9149,7 @@
 				ast_context_create(NULL, regcontext, "IAX2");
 		} else if (!strcasecmp(v->name, "tos")) {
 			if (ast_str2tos(v->value, &tos))
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/README.tos for more information.'\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/iptos.txt for more information.'\n", v->lineno);
 		} else if (!strcasecmp(v->name, "accountcode")) {
 			ast_copy_string(accountcode, v->value, sizeof(accountcode));
 		} else if (!strcasecmp(v->name, "amaflags")) {

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=12828&r1=12827&r2=12828&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Mon Mar 13 13:06:38 2006
@@ -12941,18 +12941,18 @@
 				global_tos_sip = temp_tos;
 				global_tos_audio = temp_tos;
 				global_tos_video = temp_tos;
-				ast_log(LOG_WARNING, "tos value at line %d is deprecated.  See doc/README.tos for more information.", v->lineno);
+				ast_log(LOG_WARNING, "tos value at line %d is deprecated.  See doc/iptos.txt for more information.", v->lineno);
 			} else
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, See doc/README.tos for more information.\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos value at line %d, See doc/iptos.txt for more information.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "tos_sip")) {
 			if (ast_str2tos(v->value, &global_tos_sip))
-				ast_log(LOG_WARNING, "Invalid tos_sip value at line %d, recommended value is 'cs3'. See doc/README.tos.\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos_sip value at line %d, recommended value is 'cs3'. See doc/iptos.txt.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "tos_audio")) {
 			if (ast_str2tos(v->value, &global_tos_audio))
-				ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, recommended value is 'ef'. See doc/README.tos.\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, recommended value is 'ef'. See doc/iptos.txt.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "tos_video")) {
 			if (ast_str2tos(v->value, &global_tos_video))
-				ast_log(LOG_WARNING, "Invalid tos_video value at line %d, recommended value is 'af41'. See doc/README.tos.\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos_video value at line %d, recommended value is 'af41'. See doc/iptos.txt.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "bindport")) {
 			if (sscanf(v->value, "%d", &ourport) == 1) {
 				bindaddr.sin_port = htons(ourport);

Modified: team/oej/test-this-branch/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/iax2-provision.c?rev=12828&r1=12827&r2=12828&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/iax2-provision.c (original)
+++ team/oej/test-this-branch/channels/iax2-provision.c Mon Mar 13 13:06:38 2006
@@ -330,7 +330,7 @@
 				ast_log(LOG_WARNING, "Ignoring invalid codec '%s' for '%s' at line %d\n", v->value, s, v->lineno);
 		} else if (!strcasecmp(v->name, "tos")) {
 			if (ast_str2tos(v->value, &cur->tos))
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/README.tos for more information.\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/iptos.txt for more information.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "user")) {
 			strncpy(cur->user, v->value, sizeof(cur->user) - 1);
 			if (strcmp(cur->user, v->value))

Modified: team/oej/test-this-branch/configs/res_ldap.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/configs/res_ldap.conf.sample?rev=12828&r1=12827&r2=12828&view=diff
==============================================================================
--- team/oej/test-this-branch/configs/res_ldap.conf.sample (original)
+++ team/oej/test-this-branch/configs/res_ldap.conf.sample Mon Mar 13 13:06:38 2006
@@ -6,11 +6,11 @@
 ; sip.conf => ldap,"dc=myDomain,dc=myDomainExt",config
 
 
-[_general]
-dbhost=192.168.1.1,ldap.mydomain.com	; LDAP host(s)
-dbbasedn=MyRootDN	; Base DN
-dbpass=MyPassword	; Bind password
-dbuser=MyDN		; Bind DN
+[general]
+;dbhost=192.168.1.1,ldap.mydomain.com	; LDAP host(s)
+;dbbasedn=MyRootDN	; Base DN
+;dbpass=MyPassword	; Bind password
+;dbuser=MyDN		; Bind DN
 
 ; Configuration Table
 [config]