[asterisk-commits] pabelanger: branch pabelanger/config-names r373118 - in /team/pabelanger/conf...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Sep 17 09:46:05 2012
New Revision: 373118

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373118
Log:
Rename xmpp.conf to res_xmpp.conf

This brings the configuration filename inline with other res modules.

Added:
    team/pabelanger/config-names/configs/res_xmpp.conf.sample
      - copied unchanged from r373117, team/pabelanger/config-names/configs/xmpp.conf.sample
Removed:
    team/pabelanger/config-names/configs/xmpp.conf.sample
Modified:
    team/pabelanger/config-names/res/res_xmpp.c

Modified: team/pabelanger/config-names/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/config-names/res/res_xmpp.c?view=diff&rev=373118&r1=373117&r2=373118
==============================================================================
--- team/pabelanger/config-names/res/res_xmpp.c (original)
+++ team/pabelanger/config-names/res/res_xmpp.c Mon Sep 17 09:46:05 2012
@@ -62,7 +62,7 @@
 		<syntax>
 			<parameter name="account" required="true">
 				<para>The local named account to listen on (specified in
-				xmpp.conf)</para>
+				res_xmpp.conf)</para>
 			</parameter>
 			<parameter name="jid" required="true">
 				<para>Jabber ID of the buddy to send the message to. It can be a
@@ -78,7 +78,7 @@
 			<replaceable>jid</replaceable></para>
 			<para>Example: JabberSend(asterisk,bob at domain.com,Hello world) sends "Hello world"
 			to <replaceable>bob at domain.com</replaceable> as an XMPP message from the account
-			<replaceable>asterisk</replaceable>, configured in xmpp.conf.</para>
+			<replaceable>asterisk</replaceable>, configured in res_xmpp.conf.</para>
 		</description>
 		<see-also>
 			<ref type="function">JABBER_STATUS</ref>
@@ -92,7 +92,7 @@
 		<syntax>
 			<parameter name="account" required="true">
 				<para>The local named account to listen on (specified in
-				xmpp.conf)</para>
+				res_xmpp.conf)</para>
 			</parameter>
 			<parameter name="jid" required="true">
 				<para>Jabber ID of the buddy to receive message from. It can be a
@@ -107,7 +107,7 @@
 			from the buddy identified by <replaceable>jid</replaceable> and returns the contents.</para>
 			<para>Example: ${JABBER_RECEIVE(asterisk,bob at domain.com)} returns an XMPP message
 			sent from <replaceable>bob at domain.com</replaceable> (or nothing in case of a time out), to
-			the <replaceable>asterisk</replaceable> XMPP account configured in xmpp.conf.</para>
+			the <replaceable>asterisk</replaceable> XMPP account configured in res_xmpp.conf.</para>
 		</description>
 		<see-also>
 			<ref type="function">JABBER_STATUS</ref>
@@ -121,7 +121,7 @@
 		<syntax>
 			<parameter name="account" required="true">
 				<para>The local named account to listen on (specified in
-				xmpp.conf)</para>
+				res_xmpp.conf)</para>
 			</parameter>
 			<parameter name="jid" required="true">
 				<para>Jabber ID of the buddy to receive message from. It can be a
@@ -137,7 +137,7 @@
 			<para>If not in roster variable will be set to 7.</para>
 			<para>Example: ${JABBER_STATUS(asterisk,bob at domain.com)} returns 1 if
 			<replaceable>bob at domain.com</replaceable> is online. <replaceable>asterisk</replaceable> is
-			the associated XMPP account configured in xmpp.conf.</para>
+			the associated XMPP account configured in res_xmpp.conf.</para>
 		</description>
 		<see-also>
 			<ref type="function">JABBER_RECEIVE</ref>
@@ -660,7 +660,7 @@
 struct aco_type *client_options[] = ACO_TYPES(&client_option);
 
 struct aco_file res_xmpp_conf = {
-	.filename = "xmpp.conf",
+	.filename = "res_xmpp.conf",
 	.alias = "jabber.conf",
 	.types = ACO_TYPES(&global_option, &client_option),
 };
@@ -3768,7 +3768,7 @@
 		e->usage =
 			"Usage: xmpp list nodes <connection> [collection]\n"
 			"       Lists the user's nodes on the respective connection\n"
-			"       ([connection] as configured in xmpp.conf.)\n";
+			"       ([connection] as configured in res_xmpp.conf.)\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -3854,7 +3854,7 @@
 		e->usage =
 			"Usage: xmpp purge nodes <connection> <node>\n"
 			"       Purges nodes on PubSub server\n"
-			"       as configured in xmpp.conf.\n";
+			"       as configured in res_xmpp.conf.\n";
 			return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -3899,7 +3899,7 @@
 		e->usage =
 			"Usage: xmpp delete node <connection> <node>\n"
 			"       Deletes a node on PubSub server\n"
-			"       as configured in xmpp.conf.\n";
+			"       as configured in res_xmpp.conf.\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -3936,7 +3936,7 @@
 		e->usage =
 			"Usage: xmpp create collection <connection> <collection>\n"
 			"       Creates a PubSub collection node using the account\n"
-			"       as configured in xmpp.conf.\n";
+			"       as configured in res_xmpp.conf.\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -3976,7 +3976,7 @@
 		e->usage =
 			"Usage: xmpp create leaf <connection> <collection> <leaf>\n"
 			"       Creates a PubSub leaf node using the account\n"
-			"       as configured in xmpp.conf.\n";
+			"       as configured in res_xmpp.conf.\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;