Browse Source

Change "sercmd" to "kamcmd" in module documentation files - README

Olle E. Johansson 12 years ago
parent
commit
922e7f4a9a

+ 1 - 1
docbook/entities.xml

@@ -46,7 +46,7 @@
 
 <!ENTITY ser "SER">
 <!ENTITY sername "SIP Express Router">
-<!ENTITY sercmd "sercmd">
+<!ENTITY sercmd "kamcmd">
 <!ENTITY ctlsocket "ser_ctl">
 
 <!ENTITY serhome "http://iptel.org/ser">

+ 7 - 7
modules/cfg_rpc/README

@@ -44,10 +44,10 @@ Miklos Tirpak
    such as debug, tcp/sctp/dns attributes, a.s.o. without the need of
    restart.
 
-   RPC connector modules, such as ctl or xmlrpc, although not a dependecy,
-   should be loaded in order to execute the RPC commands exported by this
-   module. When ctl module is loaded, the tool 'sercmd' can be used to
-   execute the RPC commands implemented in this module.
+   RPC connector modules, such as "ctl" or "xmlrpc", although not a
+   dependecy, should be loaded in order to execute the RPC commands
+   exported by this module. When ctl module is loaded, the tool 'kamcmd'
+   can be used to execute the RPC commands implemented in this module.
 
 1.2. Dependencies
 
@@ -73,7 +73,7 @@ Miklos Tirpak
 
    Example 1. Use cfg.get RPC command
 ...
-# sercmd cfg.list
+# kamcmd cfg.list
 ...
 
 1.3.2. cfg.get
@@ -84,7 +84,7 @@ Miklos Tirpak
 
    Example 2. Use cfg.get RPC command
 ...
-# sercmd cfg.get core debug
+# kamcmd cfg.get core debug
 ...
 
 1.3.3. cfg.seti
@@ -96,7 +96,7 @@ Miklos Tirpak
 
    Example 3. Use cfg.seti RPC command
 ...
-# sercmd cfg.seti core debug 1
+# kamcmd cfg.seti core debug 1
 ...
 
 1.3.4. cfg.set_now_int

+ 2 - 2
modules/cfg_rpc/doc/cfg_rpc.xml

@@ -37,10 +37,10 @@
 	    a.s.o. without the need of restart.
 	</para>
 	<para>
-		RPC connector modules, such as ctl or xmlrpc, although
+		RPC connector modules, such as <quote>ctl</quote> or <quote>xmlrpc</quote>, although
 		not a dependecy, should be loaded in order to execute
 		the RPC commands exported by this module. When ctl module
-		is loaded, the tool 'sercmd' can be used to execute
+		is loaded, the tool '&sercmd;' can be used to execute
 		the RPC commands implemented in this module.
 	</para>
     </section>

+ 10 - 5
modules/cfg_rpc/doc/rpc.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
-   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+%docentities;
+
+]>
 
 <section id="cfg_rpc.rpc" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -20,7 +25,7 @@
 		<title>Use <varname>cfg.get</varname> RPC command</title>
 		<programlisting format="linespecific">
 ...
-# sercmd cfg.list
+# &sercmd; cfg.list
 ...
 </programlisting>
 		</example>
@@ -37,7 +42,7 @@
 		<title>Use <varname>cfg.get</varname> RPC command</title>
 		<programlisting format="linespecific">
 ...
-# sercmd cfg.get core debug
+# &sercmd; cfg.get core debug
 ...
 </programlisting>
 		</example>
@@ -55,7 +60,7 @@
 		<title>Use <varname>cfg.seti</varname> RPC command</title>
 		<programlisting format="linespecific">
 ...
-# sercmd cfg.seti core debug 1
+# &sercmd; cfg.seti core debug 1
 ...
 </programlisting>
 		</example>

+ 2 - 2
modules/corex/README

@@ -182,11 +182,11 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060")
    Print the list of sockets the application is listening on.
 
    Example:
-                sercmd corex.list_sockets
+                kamcmd corex.list_sockets
 
 5.2.  corex.list_aliases
 
    Print the list of hostname aliases used to match the myself condition.
 
    Example:
-                sercmd corex.list_aliases
+                kamcmd corex.list_aliases

+ 2 - 2
modules/corex/doc/corex_admin.xml

@@ -193,7 +193,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060")
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd corex.list_sockets
+		&sercmd; corex.list_sockets
 		</programlisting>
     </section>
 	<section>
@@ -208,7 +208,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060")
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd corex.list_aliases
+		&sercmd; corex.list_aliases
 		</programlisting>
     </section>
     </section>

+ 11 - 11
modules/debugger/README

@@ -96,7 +96,7 @@ Chapter 1. Admin Guide
    the routing and response scripts.
 
    Debugging can be done from local or remote host via RPC interface
-   (e.g., XMLRPC, sercmd, siremis).
+   (e.g., XMLRPC, kamcmd, siremis).
 
    The framework to set breakpoints on specific actions and config lines
    is not exported to RPC. Each action can be accompanied by an breakpoint
@@ -258,7 +258,7 @@ if($si=="10.0.0.10")
      * _pid_ : pid for which to list the details. If 'pid' is omitted then
        will print for all processes.
 
-   Examples of use with sercmd:
+   Examples of use with kamcmd:
                 dbg.ls
                 dbg.ls 1234
 
@@ -274,7 +274,7 @@ if($si=="10.0.0.10")
      * _pid_ : pid for which to list the details. If 'pid' is omitted,
        then details for all processes will be printed.
 
-   Examples for using with sercmd:
+   Examples for using with kamcmd:
                 dbg.trace on
                 dbg.trace off
                 dbg.trace on 1234
@@ -309,7 +309,7 @@ if($si=="10.0.0.10")
      * log - evaluate a pseudo-variable and print the result in SIP router
        logs. Pid parameter is mandatory.
 
-   Examples for using with sercmd:
+   Examples for using with kamcmd:
                 dbg.bp off
                 dbg.bp on
                 dbg.bp release
@@ -327,7 +327,7 @@ if($si=="10.0.0.10")
    of the route blocks of the configuration file step-by-step for a
    particular SIP message.
 
-   You need to connect using sercmd (or other RPC client) to Kamailio.
+   You need to connect using kamcmd (or other RPC client) to Kamailio.
    Then you can enable cfg breakpoints and send the SIP message. One
    process will be in waiting state ('state' field different than 0 when
    you do dbg.ls). Calling dbg.release will set the other Kamailio
@@ -342,7 +342,7 @@ if($si=="10.0.0.10")
 
    Example of a session:
 ...
-sercmd> dbg.ls
+kamcmd> dbg.ls
 {
         entry: 0
         pid: 6393
@@ -369,19 +369,19 @@ sercmd> dbg.ls
         in.cmd: 0
 }
 
-sercmd> dbg.bp show 6402
+kamcmd> dbg.bp show 6402
 at bkp [/etc/kamailio/debugger.cfg:369] a=6 n=route
 
-sercmd> dbg.bp next 6402
+kamcmd> dbg.bp next 6402
 exec [/etc/kamailio/debugger.cfg:369] a=6 n=route
 
-sercmd> dbg.bp next 6402
+kamcmd> dbg.bp next 6402
 exec [/etc/kamailio/debugger.cfg:462] a=17 n=if
 
-sercmd> dbg.bp eval 6402 $fu
+kamcmd> dbg.bp eval 6402 $fu
 $fu : t=str v=sip:[email protected]
 
-sercmd> dbg.bp move 6402
+kamcmd> dbg.bp move 6402
 200 ok
 ...
 

+ 11 - 11
modules/debugger/doc/debugger_admin.xml

@@ -24,7 +24,7 @@
 	</para>
 	<para>
 		Debugging can be done from local or remote host via RPC interface (e.g.,
-		XMLRPC, sercmd, siremis).
+		XMLRPC, &sercmd;, siremis).
 	</para>
 	<para>
 		The framework to set breakpoints on specific actions and config lines
@@ -273,7 +273,7 @@ if($si=="10.0.0.10")
 			omitted then will print for all processes.</para></listitem>	  
 		</itemizedlist>
 		<para>
-		Examples of use with sercmd:
+		Examples of use with &sercmd;:
 		</para>
         <programlisting  format="linespecific">
 		dbg.ls
@@ -301,7 +301,7 @@ if($si=="10.0.0.10")
 		</listitem>
 		</itemizedlist>
 		<para>
-		Examples for using with sercmd:
+		Examples for using with &sercmd;:
 		</para>
         <programlisting  format="linespecific">
 		dbg.trace on
@@ -374,7 +374,7 @@ if($si=="10.0.0.10")
 		</listitem>
 		</itemizedlist>
 		<para>
-		Examples for using with sercmd:
+		Examples for using with &sercmd;:
 		</para>
         <programlisting  format="linespecific">
 		dbg.bp off
@@ -400,7 +400,7 @@ if($si=="10.0.0.10")
 		particular SIP message.
 		</para>
 		<para>
-		You need to connect using sercmd (or other RPC client) to &kamailio;.
+		You need to connect using &sercmd; (or other RPC client) to &kamailio;.
 		Then you can enable cfg breakpoints and send the SIP message. One
 		process will be in waiting state ('state' field different than 0 when
 		you do dbg.ls). Calling dbg.release will set the other &kamailio;
@@ -419,7 +419,7 @@ if($si=="10.0.0.10")
 		</para>
 <programlisting  format="linespecific">
 ...
-sercmd> dbg.ls
+&sercmd;> dbg.ls
 {
 	entry: 0
 	pid: 6393
@@ -446,19 +446,19 @@ sercmd> dbg.ls
 	in.cmd: 0
 }
 
-sercmd> dbg.bp show 6402
+&sercmd;> dbg.bp show 6402
 at bkp [/etc/kamailio/debugger.cfg:369] a=6 n=route
 
-sercmd> dbg.bp next 6402
+&sercmd;> dbg.bp next 6402
 exec [/etc/kamailio/debugger.cfg:369] a=6 n=route
 
-sercmd> dbg.bp next 6402
+&sercmd;> dbg.bp next 6402
 exec [/etc/kamailio/debugger.cfg:462] a=17 n=if
 
-sercmd> dbg.bp eval 6402 $fu
+&sercmd;> dbg.bp eval 6402 $fu
 $fu : t=str v=sip:[email protected]
 
-sercmd> dbg.bp move 6402
+&sercmd;> dbg.bp move 6402
 200 ok
 ...
 </programlisting>

+ 4 - 4
modules/dialplan/README

@@ -338,7 +338,7 @@ modparam("dialplan", "fetch_rows", 4000)
 
    6.1. dp_translate(id, [src[/dest]])
 
-6.1. dp_translate(id, [src[/dest]])
+6.1.  dp_translate(id, [src[/dest]])
 
    Will try to translate src into dest according to the translation rules
    with dialplan ID equal to id. If src/dest is missing the default
@@ -434,7 +434,7 @@ xlog("translated to var $var(y) \n");
    Parameters: none
 
    Example:
-                sercmd dialplan.reload
+                kamcmd dialplan.reload
 
 8.2. dialplan.translate
 
@@ -448,8 +448,8 @@ xlog("translated to var $var(y) \n");
      * Input String
 
    Example:
-        # sercmd dp_translate dpid "input"
-        sercmd dp_translate 1 "abcdxyz"
+        # kamcmd dp_translate dpid "input"
+        kamcmd dp_translate 1 "abcdxyz"
 
 9. Installation
 

+ 3 - 3
modules/dialplan/doc/dialplan_admin.xml

@@ -529,7 +529,7 @@ xlog("translated to var $var(y) \n");
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd dialplan.reload
+		&sercmd; dialplan.reload
 		</programlisting>
 		</section>
     
@@ -555,8 +555,8 @@ xlog("translated to var $var(y) \n");
 		Example:
 		</para>
         <programlisting  format="linespecific">
-        # sercmd dp_translate dpid "input"
-        sercmd dp_translate 1 "abcdxyz"
+        # &sercmd; dp_translate dpid "input"
+        &sercmd; dp_translate 1 "abcdxyz"
 		</programlisting>
 		</section>
 	</section>

+ 32 - 32
modules/lcr/README

@@ -10,7 +10,7 @@ Juha Heinanen
 
    <[email protected]>
 
-   Copyright © 2005-2010 Juha Heinanen
+   Copyright © 2005-2010 Juha Heinanen
      __________________________________________________________________
 
    Table of Contents
@@ -337,7 +337,7 @@ Chapter 1. Admin Guide
 
    URL of the database table to be used.
 
-   Default value is “mysql://openserro:openserro@localhost/openser�.
+   Default value is "mysql://kamailioro:kamailioro@localhost/kamailio".
 
    Example 1.1. Setting db_url module parameter
 ...
@@ -348,7 +348,7 @@ modparam("lcr","db_url","dbdriver://username:password@dbhost/dbname")
 
    Name of the table holding gateways definitions.
 
-   Default value is “lcr_gw�.
+   Default value is "lcr_gw".
 
    Example 1.2. Setting gw_table module parameter
 ...
@@ -360,7 +360,7 @@ modparam("lcr", "lcr_gw_table","gw")
    Name of the auto-increment, primary key column. Common to all lcr
    module tables.
 
-   Default value is “id�.
+   Default value is "id".
 
    Example 1.3. Setting id_column module parameter
 ...
@@ -374,7 +374,7 @@ modparam("lcr", "id_column", "row_id")
    the column is integer from 1 to lcr_count. In lcr_gw table, value of
    the column is from 0 to lcr_count.
 
-   Default value is “lcr_id�.
+   Default value is "lcr_id".
 
    Example 1.4. Setting lcr_id_column module parameter
 ...
@@ -385,7 +385,7 @@ modparam("lcr", "lcr_id_column", "lcr_identifier")
 
    Name of the column holding gateway's name for documentation purpose.
 
-   Default value is “gw_name�.
+   Default value is "gw_name".
 
    Example 1.5. Setting gw_name_column module parameter
 ...
@@ -396,7 +396,7 @@ modparam("lcr", "gw_name_column", "name")
 
    Name of the column holding the IPv4 or IPv6 address of the gateway.
 
-   Default value is “ip_addr�.
+   Default value is "ip_addr".
 
    Example 1.6. Setting ip_addr_column module parameter
 ...
@@ -408,7 +408,7 @@ modparam("lcr", "ip_addr_column", "ip")
    Name of the column holding gateway's hostname that is used in
    Request-URI hostpart, when request is sent to the gateway.
 
-   Default value is “hostname�.
+   Default value is "hostname".
 
    Example 1.7. Setting hostname_column module parameter
 ...
@@ -419,7 +419,7 @@ modparam("lcr", "hostname_column", "host")
 
    Name of the column holding the port number of the gateway.
 
-   Default value is “port�.
+   Default value is "port".
 
    Example 1.8. Setting port_column module parameter
 ...
@@ -431,7 +431,7 @@ modparam("lcr", "port_column", "port")
    Name of the column holding gateway's parameters that is used in
    Request-URI, when request is sent to the gateway.
 
-   Default value is “params�.
+   Default value is "params".
 
    Example 1.9. Setting params_column module parameter
 ...
@@ -442,7 +442,7 @@ modparam("lcr", "params_column", "parameters")
 
    Name of the column holding the uri scheme of the gateway.
 
-   Default value is “uri_scheme�.
+   Default value is "uri_scheme".
 
    Example 1.10. Setting uri_scheme_column module parameter
 ...
@@ -454,7 +454,7 @@ modparam("lcr", "uri_scheme_column", "uri_scheme")
    Name of the column holding the transport protocol to be used for the
    gateway.
 
-   Default value is “transport�.
+   Default value is "transport".
 
    Example 1.11. Setting transport_column module parameter
 ...
@@ -466,7 +466,7 @@ modparam("lcr", "transport_column", "trans")
    Name of the column holding the number of characters to be stripped from
    the front of Request-URI user part before inserting tag.
 
-   Default value is “strip�.
+   Default value is "strip".
 
    Example 1.12. Setting strip_column module parameter
 ...
@@ -478,7 +478,7 @@ modparam("lcr", "strip_column", "strip_count")
    Name of the column holding gateway specific tag string that is added to
    Request URI userpart after stripping.
 
-   Default value is “tag�.
+   Default value is "tag".
 
    Example 1.13. Setting tag_column module parameter
 ...
@@ -489,7 +489,7 @@ modparam("lcr", "tag_column", "gw_tag")
 
    Name of the column holding gateway specific flag values.
 
-   Default value is “flags�.
+   Default value is "flags".
 
    Example 1.14. Setting flags_column module parameter
 ...
@@ -503,7 +503,7 @@ modparam("lcr", "flags_column", "gw_flags")
    max UNIX timestamp value) or greater, gw is considered currently unused
    and is not loaded into memory at all.
 
-   Default value is “defunct�.
+   Default value is "defunct".
 
    Example 1.15. Setting defunct_column module parameter
 ...
@@ -514,7 +514,7 @@ modparam("lcr", "defunct_column", "defunct_until")
 
    Name of the table holding the LCR rules.
 
-   Default value is “lcr_rule�.
+   Default value is "lcr_rule".
 
    Example 1.16. Setting lcr_rule_table module parameter
 ...
@@ -526,7 +526,7 @@ modparam("lcr", "lcr_rule_table", "rules")
    Name of the column holding prefix of Request-URI user part and prefix
    of gateway.
 
-   Default value is “prefix�.
+   Default value is "prefix".
 
    Example 1.17. Setting prefix_column module parameter
 ...
@@ -537,7 +537,7 @@ modparam("lcr", "prefix_column", "number_prefix")
 
    Name of the column holding the From (caller's) URI.
 
-   Default value is “from_uri�.
+   Default value is "from_uri".
 
    Example 1.18. Setting from_uri_column module parameter
 ...
@@ -549,7 +549,7 @@ modparam("lcr", "from_uri_column", "caller_uri")
    Name of the column holding the regular expression to match against the
    complete request URI (including the "sip:" prefix).
 
-   Default value is “request_uri�.
+   Default value is "request_uri".
 
    Example 1.19. Setting request_uri_column module parameter
 ...
@@ -560,7 +560,7 @@ modparam("lcr", "request_uri_column", "callee_uri")
 
    Name of the column holding rule's stopper attribute.
 
-   Default value is “stopper�.
+   Default value is "stopper".
 
    Example 1.20. Setting stopper_column module parameter
 ...
@@ -572,7 +572,7 @@ modparam("lcr", "stopper_column", "stop")
    Name of the column telling is the rule is currently enabled or
    disabled.
 
-   Default value is “enabled�.
+   Default value is "enabled".
 
    Example 1.21. Setting enabled_column module parameter
 ...
@@ -584,7 +584,7 @@ modparam("lcr", "enabled_column", "in_use")
    Name of the table holding information about the LCR rule targets
    (gateways).
 
-   Default value is “lcr_rule_target�.
+   Default value is "lcr_rule_target".
 
    Example 1.22. Setting lcr_rule_target_table module parameter
 ...
@@ -596,7 +596,7 @@ modparam("lcr", "lcr_rule_target_table", "rules")
    Name of lcr_rule_target_table column containing an id of lcr_rule
    table.
 
-   Default value is “rule_id�.
+   Default value is "rule_id".
 
    Example 1.23. Setting rule_id_column module parameter
 ...
@@ -607,7 +607,7 @@ modparam("lcr", "rule_id_column", "rule")
 
    Name of lcr_rule_target_table column containing an id of lcr_gw table.
 
-   Default value is “gw_id�.
+   Default value is "gw_id".
 
    Example 1.24. Setting gw_id_column module parameter
 ...
@@ -618,7 +618,7 @@ modparam("lcr", "gw_id_column", "gw")
 
    Name of the column holding the priority of the rule target.
 
-   Default value is “priority�.
+   Default value is "priority".
 
    Example 1.25. Setting priority_column module parameter
 ...
@@ -629,7 +629,7 @@ modparam("lcr", "priority_column", "priority")
 
    Name of the column holding weight of rule target.
 
-   Default value is “weight�.
+   Default value is "weight".
 
    Example 1.26. Setting weight_column module parameter
 ...
@@ -781,7 +781,7 @@ modparam("lcr", "dont_strip_or_tag_flag", 10)
    3750. In order for this parameter to have effect, the database driver
    must support fetch_result() capability.
 
-   Default value is “1024�.
+   Default value is "1024".
 
    Example 1.38. Set fetch_rows parameter
 ...
@@ -1009,7 +1009,7 @@ if (to_any_gw("192.55.66.2", 1)) {
    Parameters: none
 
    Example 1.47. lcr.reload RPC example
-                $ sercmd lcr.reload
+                $ kamcmd lcr.reload
 
 5.2. lcr.dump_gws
 
@@ -1018,7 +1018,7 @@ if (to_any_gw("192.55.66.2", 1)) {
    Parameters: none
 
    Example 1.48. lcr.dump_gws RPC example
-                $ sercmd lcr.dump_gws
+                $ kamcmd lcr.dump_gws
 
 5.3. lcr.dump_rules
 
@@ -1028,7 +1028,7 @@ if (to_any_gw("192.55.66.2", 1)) {
    Parameters: none
 
    Example 1.49. lcr.dump_rules RPC example
-                $ sercmd lcr.dump_rules
+                $ kamcmd lcr.dump_rules
 
 5.4. lcr.defunct_gw
 
@@ -1041,7 +1041,7 @@ if (to_any_gw("192.55.66.2", 1)) {
    Parameters: lcr_id gw_id period
 
    Example 1.50. lcr.defunct_gw RPC example
-                $ sercmd lcr.defunct_gw 1 4 120
+                $ kamcmd lcr.defunct_gw 1 4 120
 
 6. Known Limitations
 

+ 4 - 4
modules/lcr/doc/lcr_admin.xml

@@ -1318,7 +1318,7 @@ if (to_any_gw("192.55.66.2", 1)) {
 		<example>
 		<title><function>lcr.reload</function> RPC example</title>
 		<programlisting  format="linespecific">
-		$ sercmd lcr.reload
+		$ &sercmd; lcr.reload
 		</programlisting>
 		</example>
 		</section>
@@ -1333,7 +1333,7 @@ if (to_any_gw("192.55.66.2", 1)) {
 		<example>
 		<title><function>lcr.dump_gws</function> RPC example</title>
 		<programlisting  format="linespecific">
-		$ sercmd lcr.dump_gws
+		$ &sercmd; lcr.dump_gws
 		</programlisting>
 		</example>
 		</section>
@@ -1348,7 +1348,7 @@ if (to_any_gw("192.55.66.2", 1)) {
  		<example>
 		<title><function>lcr.dump_rules</function> RPC example</title>
         <programlisting  format="linespecific">
-		$ sercmd lcr.dump_rules
+		$ &sercmd; lcr.dump_rules
 		</programlisting>
 		</example>
 		</section>
@@ -1367,7 +1367,7 @@ if (to_any_gw("192.55.66.2", 1)) {
 		<example>
 		<title><function>lcr.defunct_gw</function> RPC example</title>
 		<programlisting  format="linespecific">
-		$ sercmd lcr.defunct_gw 1 4 120
+		$ &sercmd; lcr.defunct_gw 1 4 120
 		</programlisting>
 		</example>
 		</section>

+ 13 - 13
modules/pipelimit/README

@@ -145,7 +145,7 @@ Chapter 1. Admin Guide
 
    URL of the database server to be used.
 
-   Default value is "mysql://openser:openserrw@localhost/openser".
+   Default value is "mysql://kamailio:kamailiorw@localhost/kamailio".
 
    Example 1.1. Set db_url parameter
 ...
@@ -223,10 +223,10 @@ modparam("ratelimit", "timer_interval", 5)
 modparam("ratelimit", "reply_code", 505)
 ...
 
-   This value can be modified at runtime using sercmd
+   This value can be modified at runtime using kamcmd
 
    Example 1.8.  Set reply_code parameter at runtime
-sercmd cfg.set_now_int ratelimit reply_code 505
+kamcmd cfg.set_now_int ratelimit reply_code 505
 
 3.8. reply_reason (string)
 
@@ -239,17 +239,17 @@ sercmd cfg.set_now_int ratelimit reply_code 505
 modparam("ratelimit", "reply_reason", "Limiting")
 ...
 
-   This value can be modified at runtime using sercmd
+   This value can be modified at runtime using kamcmd
 
    Example 1.10.  Set reply_reason parameter at runtime
-sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
+kamcmd cfg.set_now_string ratelimit reply_reason "Limiting"
 
 4. Functions
 
    4.1. pl_check(name)
    4.2. pl_drop([ [min ], max ])
 
-4.1. pl_check(name)
+4.1.  pl_check(name)
 
    Check the current request against the 'name' pipe. The pipe name can be
    provided via a pseudo variabile.
@@ -278,7 +278,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
         }
 ...
 
-4.2. pl_drop([ [min ], max ])
+4.2.  pl_drop([ [min ], max ])
 
    For the current request, a "503 - Server Unavailable" reply is sent
    back. The reply may or may not have a "Retry-After" header. If no
@@ -313,7 +313,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
    5.5. pl_get_pid
    5.6. pl_push_load
 
-5.1. pl_stats
+5.1.  pl_stats
 
    Lists the parameters and variabiles in the pipelimit module.
 
@@ -325,7 +325,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
                 :pl_stats:_reply_fifo_file_
                 _empty_line_
 
-5.2. pl_set_pipe
+5.2.  pl_set_pipe
 
    Sets the pipe parameters for the given pipe id.
 
@@ -343,7 +343,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
                 10
                 _empty_line_
 
-5.3. pl_get_pipes
+5.3.  pl_get_pipes
 
    Gets the list of in use pipes.
 
@@ -355,7 +355,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
                 :pl_get_pipes:_reply_fifo_file_
                 _empty_line_
 
-5.4. pl_set_pid
+5.4.  pl_set_pid
 
    Sets the PID Controller parameters for the Feedback Algorithm.
 
@@ -373,7 +373,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
                 0.5
                 _empty_line_
 
-5.5. pl_get_pid
+5.5.  pl_get_pid
 
    Gets the list of in use PID Controller parameters.
 
@@ -385,7 +385,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
                 :pl_get_pid:_reply_fifo_file_
                 _empty_line_
 
-5.6. pl_push_load
+5.6.  pl_push_load
 
    Force the value of the load parameter. This command is useful for
    testing the Feedback algorithm.

+ 4 - 4
modules/pipelimit/doc/pipelimit_admin.xml

@@ -210,13 +210,13 @@ modparam("ratelimit", "reply_code", 505)
 </programlisting>
 		</example>
 		<para>
-		This value can be modified at runtime using sercmd
+		This value can be modified at runtime using &sercmd;
 		</para>
 		<example>
 		<title> Set <varname>reply_code</varname> parameter at runtime </title>
 		<programlisting format="linespecific">
 
-sercmd cfg.set_now_int ratelimit reply_code 505
+&sercmd; cfg.set_now_int ratelimit reply_code 505
 
 		</programlisting>
 		</example>
@@ -240,13 +240,13 @@ modparam("ratelimit", "reply_reason", "Limiting")
 </programlisting>
 		</example>
 		<para>
-		This value can be modified at runtime using sercmd
+		This value can be modified at runtime using &sercmd;
 		</para>
 		<example>
 		<title> Set <varname>reply_reason</varname> parameter at runtime </title>
 		<programlisting format="linespecific">
 
-sercmd cfg.set_now_string ratelimit reply_reason "Limiting"
+&sercmd; cfg.set_now_string ratelimit reply_reason "Limiting"
 
 		</programlisting>
 		</example>

+ 9 - 9
modules/ratelimit/README

@@ -428,7 +428,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
    Parameters: none
 
    RPC Command Format:
-                sercmd rl.stats
+                kamcmd rl.stats
 
 7.2.  rl.set_pipe
 
@@ -442,7 +442,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
      * pipe_limit - the limit assigned to the given pipe id.
 
    RPC Command Format:
-                sercmd rl.set_pipe 2 RED 10
+                kamcmd rl.set_pipe 2 RED 10
 
 7.3.  rl.get_pipes
 
@@ -453,7 +453,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
    Parameters:none
 
    RPC Command Format:
-                sercmd rl.get_pipes
+                kamcmd rl.get_pipes
 
 7.4.  rl.set_queue
 
@@ -467,7 +467,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
      * pipe_id - the pipe id assigned to the given queue id.
 
    RPC Command Format:
-                sercmd rl.set_queue 3 INVITE 2
+                kamcmd rl.set_queue 3 INVITE 2
 
 7.5.  rl.get_queues
 
@@ -478,7 +478,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
    Parameters: none
 
    RPC Command Format:
-                sercmd rl.get_queues
+                kamcmd rl.get_queues
 
 7.6.  rl.set_pid
 
@@ -492,7 +492,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
      * kd - the derivative parameter.
 
    RPC Command Format:
-                sercmd rl.set_pid 0.5 0.5 0.5
+                kamcmd rl.set_pid 0.5 0.5 0.5
 
 7.7.  rl.get_pid
 
@@ -503,7 +503,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
    Parameters: none
 
    RPC Command Format:
-                sercmd rl.get_pid
+                kamcmd rl.get_pid
 
 7.8.  rl.push_load
 
@@ -517,7 +517,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
        smaller then 1.0).
 
    RPC Command Format:
-                sercmd rl.push_load 0.85
+                kamcmd rl.push_load 0.85
 
 7.9.  rl.set_dbg
 
@@ -531,7 +531,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
      * dbg - the debug value (0 means disable and 1 means enable).
 
    RPC Command Format:
-                sercmd rl.set_dbg 1
+                kamcmd rl.set_dbg 1
 
 8. Known limitations
 

+ 9 - 9
modules/ratelimit/doc/ratelimit_admin.xml

@@ -394,7 +394,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.stats
+		&sercmd; rl.stats
 		</programlisting>
 	</section>
 	<section>
@@ -425,7 +425,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.set_pipe 2 RED 10
+		&sercmd; rl.set_pipe 2 RED 10
 		</programlisting>
 	</section>
 	<section>
@@ -443,7 +443,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.get_pipes
+		&sercmd; rl.get_pipes
 		</programlisting>
 	</section>
 	<section>
@@ -474,7 +474,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.set_queue 3 INVITE 2
+		&sercmd; rl.set_queue 3 INVITE 2
 		</programlisting>
 	</section>
 	<section>
@@ -492,7 +492,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.get_queues
+		&sercmd; rl.get_queues
 		</programlisting>
 	</section>
 	<section>
@@ -521,7 +521,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.set_pid 0.5 0.5 0.5
+		&sercmd; rl.set_pid 0.5 0.5 0.5
 		</programlisting>
 	</section>
 	<section>
@@ -539,7 +539,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.get_pid
+		&sercmd; rl.get_pid
 		</programlisting>
 	</section>
 	<section>
@@ -564,7 +564,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.push_load 0.85
+		&sercmd; rl.push_load 0.85
 		</programlisting>
 	</section>
 	<section>
@@ -589,7 +589,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000")
 		RPC Command Format:
 		</para>
 		<programlisting  format="linespecific">
-		sercmd rl.set_dbg 1
+		&sercmd; rl.set_dbg 1
 		</programlisting>
 	</section>
 	</section>

+ 116 - 114
modules/sca/README

@@ -1,12 +1,11 @@
-
 sca Module
 
 Andrew Mortensen
 
    University of Pennsylvania
 
-   Copyright © 2012 Andrew Mortensen, [email protected]
-     _________________________________________________________________
+   Copyright © 2012 Andrew Mortensen, [email protected]
+     __________________________________________________________________
 
    Table of Contents
 
@@ -29,8 +28,8 @@ Andrew Mortensen
 
         4. Functions
 
-              4.1. sca_handle_subscribe() 
-              4.2. sca_call_info_update() 
+              4.1. sca_handle_subscribe()
+              4.2. sca_call_info_update()
 
         5. Exported RPC Commands
 
@@ -76,8 +75,8 @@ Chapter 1. Admin Guide
 
    4. Functions
 
-        4.1. sca_handle_subscribe() 
-        4.2. sca_call_info_update() 
+        4.1. sca_handle_subscribe()
+        4.2. sca_call_info_update()
 
    5. Exported RPC Commands
 
@@ -92,47 +91,50 @@ Chapter 1. Admin Guide
 1. Overview
 
    The sca module implements Shared Call Appearances. It handles SUBSCRIBE
-   messages for call-info and line-seize events, and sends call-info NOTIFYs to
-   line subscribers to implement line bridging. The module implements SCA as
-   defined in Broadworks SIP Access Side Extensions Interface Specifications,
-   Release 13.0, version 1, sections 2, 3 and 4.
-
-   SCA group members receive call state notifications when other group members
-   participate in calls. An SCA caller can place a call on hold, and the call
-   may be retrieved from hold by another member of the group.
-
-   Subscribers to SCA call-info events SUBSCRIBE to their address-of-record
-   (AoR), asking the application server to send call-info NOTIFYs with line
-   state information as lines in the subscriber group are used.
-
-   For example, when an SCA subscriber takes the phone off hook, it sends a
-   line-seize SUBSCRIBE to the application server. The application server
-   acknowledges the request, and sends to the subscriber a line-seize NOTIFY
-   with  the appearance index of the line claimed for the subscriber. The
-   application also sends call-info NOTIFYs to the other SCA subscribers to the
-   AoR, letting them know that an appearance within the group has gone off
-   hook. Subscribers update their display appropriately.
-
-   Subscribers to an SCA address-of-record will receive call-info NOTIFYs when
-   a  member  of the group seizes a line (seized); receives a 180 ringing
-   response  from  the remote party (ringing); receives a 183 progressing
-   response from the remote party (progressing); when the remote party answers
-   the call (active); when either party in the call places the call on hold
-   (held); and when an SCA line goes back on hook (idle).
-
-   The call-info subscriber information is stored in memory and is periodically
-   written to the database. Call state information is stored in memory. A
-   future release may periodically write call state to the database, as well.
-   The database is purely for restoring subscriptions after a restart of the
-   application server. Subscriber information is also flushed to the database
-   when the service is stopped.
-
-   At  the  time of this writing, Polycom and Cisco handsets are known to
-   implement  the  call-info and line-seize event packages defined in the
+   messages for call-info and line-seize events, and sends call-info
+   NOTIFYs to line subscribers to implement line bridging. The module
+   implements SCA as defined in Broadworks SIP Access Side Extensions
+   Interface Specifications, Release 13.0, version 1, sections 2, 3 and 4.
+
+   SCA group members receive call state notifications when other group
+   members participate in calls. An SCA caller can place a call on hold,
+   and the call may be retrieved from hold by another member of the group.
+
+   Subscribers to SCA call-info events SUBSCRIBE to their
+   address-of-record (AoR), asking the application server to send
+   call-info NOTIFYs with line state information as lines in the
+   subscriber group are used.
+
+   For example, when an SCA subscriber takes the phone off hook, it sends
+   a line-seize SUBSCRIBE to the application server. The application
+   server acknowledges the request, and sends to the subscriber a
+   line-seize NOTIFY with the appearance index of the line claimed for the
+   subscriber. The application also sends call-info NOTIFYs to the other
+   SCA subscribers to the AoR, letting them know that an appearance within
+   the group has gone off hook. Subscribers update their display
+   appropriately.
+
+   Subscribers to an SCA address-of-record will receive call-info NOTIFYs
+   when a member of the group seizes a line (seized); receives a 180
+   ringing response from the remote party (ringing); receives a 183
+   progressing response from the remote party (progressing); when the
+   remote party answers the call (active); when either party in the call
+   places the call on hold (held); and when an SCA line goes back on hook
+   (idle).
+
+   The call-info subscriber information is stored in memory and is
+   periodically written to the database. Call state information is stored
+   in memory. A future release may periodically write call state to the
+   database, as well. The database is purely for restoring subscriptions
+   after a restart of the application server. Subscriber information is
+   also flushed to the database when the service is stopped.
+
+   At the time of this writing, Polycom and Cisco handsets are known to
+   implement the call-info and line-seize event packages defined in the
    document, which may be found freely on the web.
 
-   To date, this module has only been tested with Polycom Soundpoint 550s and
-   650s running Polycom SIP 3.3.4.
+   To date, this module has only been tested with Polycom Soundpoint 550s
+   and 650s running Polycom SIP 3.3.4.
 
 2. Dependencies
 
@@ -159,10 +161,10 @@ Chapter 1. Admin Guide
 
    Size, as a power of two, of the shared memory hash table containing the
    call-info subscriptions and the appearance state. A larger power of two
-   means better performance (fewer collisions, making for fewer subscriber URI
-   comparisons) at the expense of increased shared memory use.
+   means better performance (fewer collisions, making for fewer subscriber
+   URI comparisons) at the expense of increased shared memory use.
 
-   Default value is 9 (2 ^ 9 == 512). 
+   Default value is 9 (2 ^ 9 == 512).
 
    Example 1.1. Set hash_table_size:
 ...
@@ -174,7 +176,7 @@ modparam( "sca", "hash_table_size", 8 )
 
    The maximum allowed call-info subscription time in seconds.
 
-   Default value is 3600 (1 hour). 
+   Default value is 3600 (1 hour).
 
    Example 1.2. Set call_info_max_expires:
 ...
@@ -185,12 +187,12 @@ modparam( "sca", "call_info_max_expires", 1800 )
 
    The maximum allowed line-seize subscription time in seconds.
 
-   Default value is 15 (15 seconds). 
+   Default value is 15 (15 seconds).
 
-   A maximum line-seize subscription time of 15 seconds is recommended in the
-   SIP Access Side Extensions document. This interval is purposely short to
-   prevent  a client from seizing an appearance without making a call for
-   extended periods of time.
+   A maximum line-seize subscription time of 15 seconds is recommended in
+   the SIP Access Side Extensions document. This interval is purposely
+   short to prevent a client from seizing an appearance without making a
+   call for extended periods of time.
 
    Example 1.3. Set line_seize_max_expires:
 ...
@@ -199,16 +201,16 @@ modparam( "sca", "line_seize_max_expires", 30 )
 
 3.4. purge_expired_interval (integer)
 
-   The  period of time in seconds between purges of expired call-info and
+   The period of time in seconds between purges of expired call-info and
    line-seize subscriptions.
 
-   Default value is 120 (2 minutes). 
+   Default value is 120 (2 minutes).
 
-   On finding an expired subscription, the module removes the subscription from
-   the shared memory hash table, and sends a NOTIFY with Subscription-State
-   "terminated;expired" header value to the subscriber. It also NOTIFYs other
-   members of the group, in the event that the expired subscription was a
-   line-seize.
+   On finding an expired subscription, the module removes the subscription
+   from the shared memory hash table, and sends a NOTIFY with
+   Subscription-State "terminated;expired" header value to the subscriber.
+   It also NOTIFYs other members of the group, in the event that the
+   expired subscription was a line-seize.
 
    Example 1.4. Set purge_expired_interval:
 ...
@@ -230,7 +232,7 @@ modparam( "sca", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio" )
 
    Name of the database table where call-info subscriptions are written.
 
-   Default value is “sca_subscriptions�. 
+   Default value is "sca_subscriptions".
 
    Example 1.6. Set subs_table parameter:
 ...
@@ -239,10 +241,10 @@ modparam( "sca", "subs_table", "call_info_subscriptions" )
 
 3.7. db_update_interval (integer)
 
-   Period in seconds between writes of call-info subscriber information to the
-   database.
+   Period in seconds between writes of call-info subscriber information to
+   the database.
 
-   Default value is 300 (5 minutes). 
+   Default value is 300 (5 minutes).
 
    Example 1.7. Set db_update_interval:
 ...
@@ -251,20 +253,20 @@ modparam( "sca", "db_update_interval", 120 )
 
 4. Functions
 
-   4.1. sca_handle_subscribe() 
-   4.2. sca_call_info_update() 
+   4.1. sca_handle_subscribe()
+   4.2. sca_call_info_update()
 
 4.1.  sca_handle_subscribe()
 
-   The function handling call-info and line-seize SUBSCRIBE requests. It stores
-   or updates the subscriptions in shared memory, and sends NOTIFYs to the
-   subscriber and other members of the group as needed.
+   The function handling call-info and line-seize SUBSCRIBE requests. It
+   stores or updates the subscriptions in shared memory, and sends NOTIFYs
+   to the subscriber and other members of the group as needed.
 
    For example, a line-seize SUBSCRIBE will cause the module to reserve an
-   appearance  index  for the subscriber; send a line-seize NOTIFY to the
-   subscriber indicating which appearance index it must use; and send call-info
-   NOTIFYs to other subscribers to the address-of-record letting them know the
-   appearance is off hook.
+   appearance index for the subscriber; send a line-seize NOTIFY to the
+   subscriber indicating which appearance index it must use; and send
+   call-info NOTIFYs to other subscribers to the address-of-record letting
+   them know the appearance is off hook.
 
    This function can be used from the REQUEST_ROUTE.
 
@@ -284,19 +286,20 @@ if ( is_method( "SUBSCRIBE" )) {
 
 4.2.  sca_call_info_update()
 
-   The sca_call_info_update function updates call state for SCA appearances. If
-   a request or response packet contains a Call-Info header, the function
-   extracts call state from the header and sends NOTIFYs to subscribers if
-   needed. If no Call-Info header is included in the packet, the module looks
-   up the To and From URIs to see if either are SCA addresses-of-record. If
-   either the To or From URI are SCA AoRs, the function looks up the appearance
-   by dialog and updates call state as needed, sending NOTIFYs to members of
-   the group if the call state has changed.
+   The sca_call_info_update function updates call state for SCA
+   appearances. If a request or response packet contains a Call-Info
+   header, the function extracts call state from the header and sends
+   NOTIFYs to subscribers if needed. If no Call-Info header is included in
+   the packet, the module looks up the To and From URIs to see if either
+   are SCA addresses-of-record. If either the To or From URI are SCA AoRs,
+   the function looks up the appearance by dialog and updates call state
+   as needed, sending NOTIFYs to members of the group if the call state
+   has changed.
 
-   The sca_call_info_update function updates call state for INVITE, CANCEL,
-   BYE, PRACK and REFER requests and responses.
+   The sca_call_info_update function updates call state for INVITE,
+   CANCEL, BYE, PRACK and REFER requests and responses.
 
-   This  function  can  be  used from the REQUEST_ROUTE, REPLY_ROUTE, and
+   This function can be used from the REQUEST_ROUTE, REPLY_ROUTE, and
    FAILURE_ROUTE.
 
    Return code:
@@ -351,7 +354,7 @@ failure_route[FAILURE_ROUTE]
    Parameters: none
 
    Example:
-            sercmd sca.all_subscriptions
+            kamcmd sca.all_subscriptions
 
 5.2. sca.all_appearances
 
@@ -362,13 +365,13 @@ failure_route[FAILURE_ROUTE]
    Parameters: none
 
    Example:
-            sercmd sca.all_appearances
+            kamcmd sca.all_appearances
 
 5.3. sca.seize_appearance
 
-   Seize an appearance index for a specific contact within an SCA group, and
-   notify other members of the group that the appearance is off hook. Useful
-   for testing SCA signaling.
+   Seize an appearance index for a specific contact within an SCA group,
+   and notify other members of the group that the appearance is off hook.
+   Useful for testing SCA signaling.
 
    Name: sca.seize_appearance
 
@@ -379,31 +382,32 @@ failure_route[FAILURE_ROUTE]
    Example:
             # seize next available appearance of sip:[email protected]
             # for contact sip:[email protected]
-            sercmd sca.seize_appearance sip:[email protected] sip:[email protected].
-1.2
+            kamcmd sca.seize_appearance sip:[email protected] sip:[email protected].1
+.2
 
 5.4. sca.update_appearance
 
-   Update the state of an in-use appearance index, and notify other members of
-   the group. Useful for testing SCA signaling.
+   Update the state of an in-use appearance index, and notify other
+   members of the group. Useful for testing SCA signaling.
 
    Name: sca.update_appearance
 
    Parameters: 3 or 4
      * SCA Address-of-Record
      * Index of In-Use Appearance
-     * Appearance  State  (seized,  ringing,  progressing,  active, held,
+     * Appearance State (seized, ringing, progressing, active, held,
        held-private)
      * Appearance Display Info (Optional)
 
    Example:
             # update in-use appearance index 3 of sip:[email protected]
             # state held.
-            sercmd sca.update_appearance sip:[email protected] 3 held
+            kamcmd sca.update_appearance sip:[email protected] 3 held
 
 5.5. sca.release_appearance
 
-   Set a non-idle appearance index to idle and NOTIFY members of the group.
+   Set a non-idle appearance index to idle and NOTIFY members of the
+   group.
 
    Name: sca.release_appearance
 
@@ -414,12 +418,12 @@ failure_route[FAILURE_ROUTE]
    Example:
             # release appearance of sip:[email protected] with
             # appearance index 3
-            sercmd sca.release_appearance sip:[email protected] 3
+            kamcmd sca.release_appearance sip:[email protected] 3
 
 6. Sample kamailio.cfg with SCA
 
-   The following is a basic kamailio.cfg providing Shared Call Appearances to
-   local subscribers. It has been tested with Polycom handsets.
+   The following is a basic kamailio.cfg providing Shared Call Appearances
+   to local subscribers. It has been tested with Polycom handsets.
 
    Example 1.10. kamailio.cfg
 ##
@@ -468,8 +472,8 @@ port=5060
 #!ifdef WITH_SRCPATH
 mpath="modules_k:modules"
 #!else
-mpath="/usr/local/kamailio/lib64/kamailio/modules_k/:/usr/local/kamailio/lib64/
-kamailio/modules/"
+mpath="/usr/local/kamailio/lib64/kamailio/modules_k/:/usr/local/kamailio/lib64/k
+amailio/modules/"
 #!endif
 
 #!ifdef WITH_MYSQL
@@ -581,7 +585,7 @@ request_route {
                 if (t_check_trans()) {
                         route(SCA);
                         t_relay();
-		}
+                }
                 exit;
         }
 
@@ -660,8 +664,8 @@ route[WITHINDLG] {
                 # take the path determined by record-routing
                 if (loose_route()) {
                         if ( is_method("NOTIFY") ) {
-                                # Add Record-Route for in-dialog NOTIFY as per
-RFC 6665.
+                                # Add Record-Route for in-dialog NOTIFY as per R
+FC 6665.
                                 record_route();
                         }
                         route(RELAY);
@@ -679,8 +683,8 @@ RFC 6665.
                                         t_relay();
                                         exit;
                                 } else {
-                                        # ACK without matching transaction ...
-ignore and discard
+                                        # ACK without matching transaction ... i
+gnore and discard
                                         exit;
                                 }
                         }
@@ -758,8 +762,7 @@ route[AUTH] {
 route[SCA] {
 #!ifdef WITH_SCA
         if(is_method("SUBSCRIBE")) {
-                if ($hdr(Event) == "call-info" || $hdr(Event) == "line-seize")
-{
+                if ($hdr(Event) == "call-info" || $hdr(Event) == "line-seize") {
                         xdbg("SCA: $hdr(Event) SUBSCRIBE $ru from $si:$sp");
                         sca_handle_subscribe();
                         exit;
@@ -795,10 +798,9 @@ route[XMLRPC] {
         # allow XMLRPC from localhost
         if ((method=="POST" || method=="GET")
                         && (src_ip==127.0.0.1)) {
-                # close connection only for xmlrpclib user agents (there is a b
-ug in
-                # xmlrpclib: it waits for EOF before interpreting the response)
-.
+                # close connection only for xmlrpclib user agents (there is a bu
+g in
+                # xmlrpclib: it waits for EOF before interpreting the response).
                 if ($hdr(User-Agent) =~ "xmlrpclib")
                         set_reply_close();
                 set_reply_no_connect();

+ 5 - 5
modules/sca/doc/sca_admin.xml

@@ -413,7 +413,7 @@ failure_route[FAILURE_ROUTE]
 		Example:
 	    </para>
 	    <programlisting format="linespecific">
-	    sercmd sca.all_subscriptions
+	    &sercmd; sca.all_subscriptions
 	    </programlisting>
 	</section>
 
@@ -432,7 +432,7 @@ failure_route[FAILURE_ROUTE]
                 Example:
             </para>
             <programlisting format="linespecific">
-            sercmd sca.all_appearances
+            &sercmd; sca.all_appearances
             </programlisting>
         </section>
 
@@ -467,7 +467,7 @@ failure_route[FAILURE_ROUTE]
             <programlisting format="linespecific">
 	    # seize next available appearance of sip:[email protected]
 	    # for contact sip:[email protected]
-            sercmd sca.seize_appearance sip:[email protected] sip:[email protected]
+            &sercmd; sca.seize_appearance sip:[email protected] sip:[email protected]
             </programlisting>
         </section>
 
@@ -512,7 +512,7 @@ failure_route[FAILURE_ROUTE]
             <programlisting format="linespecific">
 	    # update in-use appearance index 3 of sip:[email protected]
 	    # state held.
-            sercmd sca.update_appearance sip:[email protected] 3 held
+            &sercmd; sca.update_appearance sip:[email protected] 3 held
             </programlisting>
         </section>
 
@@ -546,7 +546,7 @@ failure_route[FAILURE_ROUTE]
             <programlisting format="linespecific">
 	    # release appearance of sip:[email protected] with
 	    # appearance index 3
-            sercmd sca.release_appearance sip:[email protected] 3
+            &sercmd; sca.release_appearance sip:[email protected] 3
             </programlisting>
         </section>
     </section>

+ 14 - 14
modules/tm/README

@@ -8,9 +8,9 @@ Juha Heinanen
 
    <[email protected]>
 
-   Copyright © 2003 FhG FOKUS
+   Copyright © 2003 FhG FOKUS
 
-   Copyright © 2008 Juha Heinanen
+   Copyright © 2008 Juha Heinanen
      __________________________________________________________________
 
    1.1. Overview
@@ -179,13 +179,13 @@ Juha Heinanen
 Note
 
    Several Kamailio TM module functions are now implemented in the TMX
-   module: “modules_k/tmx�. Check it to see if what you are looking for is
+   module: "modules_k/tmx". Check it to see if what you are looking for is
    there.
 
 1.2. Serial Forking Based on Q Value
 
    A single SIP INVITE request may be forked to multiple destinations. We
-   call the set of all such destinations a “destination set�. Individual
+   call the set of all such destinations a "destination set". Individual
    elements within the destination sets are called branches. The script
    writer can add URIs to the destination set from the configuration file,
    or they can be loaded from the user location database. Each registered
@@ -218,7 +218,7 @@ Note
    and t_next_contacts().
 
    Every branch in the destination set is assigned a priority number, also
-   known as the “q value�. The q value is a floating point number in a
+   known as the "q value". The q value is a floating point number in a
    range 0 to 1.0. The higher the q value number, the more priority is
    given to the particular branch in the destination set. Branches with q
    value 1.0 have maximum priority, such branches should be always be
@@ -987,7 +987,7 @@ modparam("tm", "unmatched_cancel", "2")
    Default value is 1 (on).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm ruri_matching 0
+        $ kamcmd cfg.set_now_int tm ruri_matching 0
 
    Example 31. Set ruri_matching parameter
 ...
@@ -1006,7 +1006,7 @@ modparam("tm", "ruri_matching", 1)
    Default value is 1 (on).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm via1_matching 0
+        $ kamcmd cfg.set_now_int tm via1_matching 0
 
    Example 32. Set via1_matching parameter
 ...
@@ -1021,7 +1021,7 @@ modparam("tm", "via1_matching", 1)
    Default value is 0 (off).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm pass_provisional_replies 1
+        $ kamcmd cfg.set_now_int tm pass_provisional_replies 1
 
    Example 33. Set pass_provisional_replies parameter
 ...
@@ -1036,7 +1036,7 @@ modparam("tm", "pass_provisional_replies", 1)
    Default value is 500.
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm default_code 505
+        $ kamcmd cfg.set_now_int tm default_code 505
 
    Example 34. Set default_code parameter
 ...
@@ -1051,7 +1051,7 @@ modparam("tm", "default_code", 501)
    Default value is "Server Internal Error".
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_string tm default_reason "Unknown error"
+        $ kamcmd cfg.set_now_string tm default_reason "Unknown error"
 
    Example 35. Set default_reason parameter
 ...
@@ -1073,7 +1073,7 @@ modparam("tm", "default_reason", "Unknown reason")
    Default value is 0 (off, rfc conformant behaviour).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm disable_6xx_block 0
+        $ kamcmd cfg.set_now_int tm disable_6xx_block 0
 
    See also: t_set_disable_6xx().
 
@@ -1105,7 +1105,7 @@ Note
    The default value is 0 (rfc conformant behaviour).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm local_ack_mode 0
+        $ kamcmd cfg.set_now_int tm local_ack_mode 0
 
    Example 37. Set local_ack_mode parameter
 ...
@@ -1181,7 +1181,7 @@ modparam("tm", "faked_reply_prio", 2000)
    Default value is 1 (enabled).
 
    Can be set at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm local_cancel_reason 0
+        $ kamcmd cfg.set_now_int tm local_cancel_reason 0
 
    See also: e2e_cancel_reason.
 
@@ -1199,7 +1199,7 @@ modparam("tm", "local_cancel_reason", 0)
    Default value is 1 (enabled).
 
    Can be changed at runtime, e.g.:
-        $ sercmd cfg.set_now_int tm e2e_cancel_reason 0
+        $ kamcmd cfg.set_now_int tm e2e_cancel_reason 0
 
    See also: t_set_no_e2e_cancel_reason() and local_cancel_reason.
 

+ 17 - 10
modules/tm/doc/params.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
-   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+	[ <!ENTITY % local.common.attrib
+	 "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'">
+	 <!-- Include general documentation entities -->
+	 <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml">
+	 %docentities;
+	]
+>
 
 <section id="tm.parameters" xmlns:xi="http://www.w3.org/2001/XInclude">
     <sectioninfo>
@@ -935,7 +942,7 @@ modparam("tm", "unmatched_cancel", "2")
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm ruri_matching 0
+	$ &sercmd; cfg.set_now_int tm ruri_matching 0
 		</programlisting>
 	</para>
 	<example>
@@ -965,7 +972,7 @@ modparam("tm", "ruri_matching", 1)
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm via1_matching 0
+	$ &sercmd; cfg.set_now_int tm via1_matching 0
 		</programlisting>
 	</para>
 	<example>
@@ -990,7 +997,7 @@ modparam("tm", "via1_matching", 1)
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm pass_provisional_replies 1
+	$ &sercmd; cfg.set_now_int tm pass_provisional_replies 1
 		</programlisting>
 	</para>
 	<example>
@@ -1017,7 +1024,7 @@ modparam("tm", "pass_provisional_replies", 1)
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm default_code 505
+	$ &sercmd; cfg.set_now_int tm default_code 505
 		</programlisting>
 	</para>
 	<example>
@@ -1042,7 +1049,7 @@ modparam("tm", "default_code", 501)
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_string tm default_reason "Unknown error"
+	$ &sercmd; cfg.set_now_string tm default_reason "Unknown error"
 		</programlisting>
 	</para>
 	<example>
@@ -1077,7 +1084,7 @@ modparam("tm", "default_reason", "Unknown reason")
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm disable_6xx_block 0
+	$ &sercmd; cfg.set_now_int tm disable_6xx_block 0
 		</programlisting>
 	</para>
 	<para>
@@ -1127,7 +1134,7 @@ modparam("tm", "disable_6xx_block", 1)
 	<para>
 		Can be set at runtime, e.g.:
 		<programlisting>
-	$ sercmd cfg.set_now_int tm local_ack_mode 0
+	$ &sercmd; cfg.set_now_int tm local_ack_mode 0
 		</programlisting>
 	</para>
 	<example>
@@ -1248,7 +1255,7 @@ modparam("tm", "faked_reply_prio", 2000)
 		<para>
 			Can be set at runtime, e.g.:
 			<programlisting>
-	$ sercmd cfg.set_now_int tm local_cancel_reason 0
+	$ &sercmd; cfg.set_now_int tm local_cancel_reason 0
 			</programlisting>
 		</para>
 		<para>
@@ -1279,7 +1286,7 @@ modparam("tm", "local_cancel_reason", 0)
 		<para>
 			Can be changed at runtime, e.g.:
 			<programlisting>
-	$ sercmd cfg.set_now_int tm e2e_cancel_reason 0
+	$ &sercmd; cfg.set_now_int tm e2e_cancel_reason 0
 			</programlisting>
 		</para>
 		<para>

+ 20 - 20
modules_k/dispatcher/README

@@ -683,7 +683,7 @@ Note
    4.7. ds_load_update()
    4.8. ds_load_unset()
 
-4.1. ds_select_dst(set, alg)
+4.1.  ds_select_dst(set, alg)
 
    The method selects a destination from addresses set.
 
@@ -740,7 +740,7 @@ $var(a) = 4;
 ds_select_dst("1", "$var(a)");
 ...
 
-4.2. ds_select_domain(set, alg)
+4.2.  ds_select_domain(set, alg)
 
    The method selects a destination from addresses set and rewrites the
    host and port from R-URI. The parameters have same meaning as for
@@ -753,21 +753,21 @@ ds_select_dst("1", "$var(a)");
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-4.3. ds_next_dst()
+4.3.  ds_next_dst()
 
    Takes the next destination address from the AVPs with id 'dst_avp_id'
    and sets the dst_uri (outbound proxy address).
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-4.4. ds_next_domain()
+4.4.  ds_next_domain()
 
    Takes the next destination address from the AVPs with id 'dst_avp_id'
    and sets the domain part of the request URI.
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-4.5. ds_mark_dst([state])
+4.5.  ds_mark_dst([state])
 
    Mark the last used address from destination set as inactive ("i"/"I"),
    active ("a"/"A"), disabled ("d"/"D") or trying ("t"/"T"). Apart of
@@ -804,7 +804,7 @@ failure_route[tryagain] {
 }
 ...
 
-4.6. ds_is_from_list([groupid])
+4.6.  ds_is_from_list([groupid])
 
    This function returns true, if the current request comes from a host in
    the given group of the dispatcher-list; otherwise false.
@@ -823,7 +823,7 @@ if(ds_is_from_list("10")) {
 }
 ...
 
-4.7. ds_load_update()
+4.7.  ds_load_update()
 
    Updates the load state:
      * if it is a BYE or CANCEL - remove the load from destination address
@@ -834,7 +834,7 @@ if(ds_is_from_list("10")) {
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
    BRANCH_ROUTE and ONREPLY_ROUTE.
 
-4.8. ds_load_unset()
+4.8.  ds_load_unset()
 
    Remove the call load for the destination that routed the call.
 
@@ -871,7 +871,7 @@ onreply_route {
    5.2. ds_list
    5.3. ds_reload
 
-5.1. ds_set_state
+5.1.  ds_set_state
 
    Sets the status for a destination address (can be use to mark the
    destination as active or inactive).
@@ -896,7 +896,7 @@ onreply_route {
                 _address_
                 _empty_line_
 
-5.2. ds_list
+5.2.  ds_list
 
    It lists the groups and included destinations.
 
@@ -908,7 +908,7 @@ onreply_route {
                 :ds_list:_reply_fifo_file_
                 _empty_line_
 
-5.3. ds_reload
+5.3.  ds_reload
 
    It reloads the groups and included destinations. For algorithm 10 (call
    load distribution), old internal list of active calls is destroyed
@@ -928,7 +928,7 @@ onreply_route {
    6.2. dispatcher.list
    6.3. dispatcher.reload
 
-6.1. dispatcher.set_state
+6.1.  dispatcher.set_state
 
    Sets the state for a destination address (can be use to mark the
    destination as active or inactive).
@@ -948,11 +948,11 @@ onreply_route {
 
    Example:
 ...
-# prototype: sercmd dispatcher.set_state _state_ _group_ _address_
-sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
+# prototype: kamcmd dispatcher.set_state _state_ _group_ _address_
+kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
 ...
 
-6.2. dispatcher.list
+6.2.  dispatcher.list
 
    Lists the groups and included destinations.
 
@@ -961,9 +961,9 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
    Parameters: none
 
    Example:
-                sercmd dispatcher.list
+                kamcmd dispatcher.list
 
-6.3. dispatcher.reload
+6.3.  dispatcher.reload
 
    Reloads the groups and included destinations. The command is disabled
    for call load based dispatching (algorithm 10) since removal of
@@ -974,7 +974,7 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
    Parameters: none
 
    Example
-                sercmd dispatcher.reload
+                kamcmd dispatcher.reload
 
 7. Installation and Running
 
@@ -1328,7 +1328,7 @@ failure_route[RTF_DISPATCH] {
    8.1. dispatcher:dst-down
    8.2. dispatcher:dst-up
 
-8.1. dispatcher:dst-down
+8.1.  dispatcher:dst-down
 
    When defined, the module calls event_route[dispatcher:ds-down] when a
    destination goes down (becomes probing). A typical use case is to
@@ -1339,7 +1339,7 @@ event_route[dispatcher:dst-down] {
 }
 ...
 
-8.2. dispatcher:dst-up
+8.2.  dispatcher:dst-up
 
    When defined, the module calls event_route[dispatcher:ds-up] when a
    destination that was previously down (probing) comes up. A typical use

+ 4 - 4
modules_k/dispatcher/doc/dispatcher_admin.xml

@@ -1168,8 +1168,8 @@ onreply_route {
 		</para>
 <programlisting  format="linespecific">
 ...
-# prototype: sercmd dispatcher.set_state _state_ _group_ _address_
-sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
+# prototype: &sercmd; dispatcher.set_state _state_ _group_ _address_
+&sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080
 ...
 </programlisting>
     </section>
@@ -1188,7 +1188,7 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd dispatcher.list
+		&sercmd; dispatcher.list
 		</programlisting>
     </section>
 	<section>
@@ -1209,7 +1209,7 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080
 		Example
 		</para>
         <programlisting  format="linespecific">
-		sercmd dispatcher.reload
+		&sercmd; dispatcher.reload
 		</programlisting>
     </section>
 

+ 4 - 4
modules_k/domain/README

@@ -147,7 +147,7 @@ Chapter 1. Admin Guide
 
    This is URL of the database to be used.
 
-   Default value is "mysql://openserro:openserro@localhost/openser"
+   Default value is "mysql://kamailioro:kamailioro@localhost/kamailio"
 
    Example 1.1. Setting db_url parameter
 modparam("domain", "db_url", "mysql://ser:pass@db_host/ser")
@@ -367,7 +367,7 @@ if (lookup_domain("$fd", "from_")) {
    Parameters: none
 
    Example:
-                sercmd domain.reload
+                kamcmd domain.reload
 
 6.2. domain.dump
 
@@ -378,7 +378,7 @@ if (lookup_domain("$fd", "from_")) {
    Parameters: none
 
    Example:
-                sercmd domain.dump
+                kamcmd domain.dump
 
 7. Known Limitations
 
@@ -402,7 +402,7 @@ Chapter 2. Developer Guide
 
    1.1. is_domain_local(domain)
 
-1.1. is_domain_local(domain)
+1.1.  is_domain_local(domain)
 
    Checks if domain given in str* parameter is local.
 

+ 2 - 2
modules_k/domain/doc/domain_admin.xml

@@ -377,7 +377,7 @@ if (lookup_domain("$fd", "from_")) {
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd domain.reload
+		&sercmd; domain.reload
 		</programlisting>
 	</section>
 	<section>
@@ -394,7 +394,7 @@ if (lookup_domain("$fd", "from_")) {
 		Example:
 		</para>
         <programlisting  format="linespecific">
-		sercmd domain.dump
+		&sercmd; domain.dump
 		</programlisting>
 	</section>
 	</section>

+ 14 - 14
modules_k/kex/README

@@ -393,7 +393,7 @@ resetdebug();
    4.8. reset_statistics
    4.9. clear_statistics
 
-4.1. arg
+4.1.  arg
 
    Print command line arguments.
 
@@ -405,7 +405,7 @@ resetdebug();
                 :arg:_reply_fifo_file_
                 _empty_line_
 
-4.2. kill
+4.2.  kill
 
    Kill the application.
 
@@ -417,7 +417,7 @@ resetdebug();
                 :kill:_reply_fifo_file_
                 _empty_line_
 
-4.3. pwd
+4.3.  pwd
 
    Print working directory.
 
@@ -429,7 +429,7 @@ resetdebug();
                 :pwd:_reply_fifo_file_
                 _empty_line_
 
-4.4. uptime
+4.4.  uptime
 
    Print uptime.
 
@@ -441,7 +441,7 @@ resetdebug();
                 :uptime:_reply_fifo_file_
                 _empty_line_
 
-4.5. version
+4.5.  version
 
    Print version information.
 
@@ -453,7 +453,7 @@ resetdebug();
                 :version:_reply_fifo_file_
                 _empty_line_
 
-4.6. which
+4.6.  which
 
    Print list of available MI commands.
 
@@ -465,7 +465,7 @@ resetdebug();
                 :which:_reply_fifo_file_
                 _empty_line_
 
-4.7. get_statistics
+4.7.  get_statistics
 
    Print the list of available internal statistics.
 
@@ -481,7 +481,7 @@ resetdebug();
                 _statsid_
                 _empty_line_
 
-4.8. reset_statistics
+4.8.  reset_statistics
 
    Reset internal statistics.
 
@@ -494,7 +494,7 @@ resetdebug();
                 _statsid_
                 _empty_line_
 
-4.9. clear_statistics
+4.9.  clear_statistics
 
    Return statistics and reset their value in one command.
 
@@ -511,7 +511,7 @@ resetdebug();
 
    5.1. pkg.stats
 
-5.1. pkg.stats
+5.1.  pkg.stats
 
    Print private memory (pkg) usage statistics per process. It can take
    optinally a filter to print statistics only for a specific process or
@@ -524,7 +524,7 @@ resetdebug();
      * index value - print statistics for specific index in process table.
 
    Examples:
-                sercmd pkg.stats
-                sercmd pkg.stats pid 1234
-                sercmd pkg.stats rank 1
-                sercmd pkg.stats index 10
+                kamcmd pkg.stats
+                kamcmd pkg.stats pid 1234
+                kamcmd pkg.stats rank 1
+                kamcmd pkg.stats index 10

+ 4 - 4
modules_k/kex/doc/kex_admin.xml

@@ -655,10 +655,10 @@ resetdebug();
 		Examples:
 		</para>
         <programlisting  format="linespecific">
-		sercmd pkg.stats
-		sercmd pkg.stats pid 1234
-		sercmd pkg.stats rank 1
-		sercmd pkg.stats index 10
+		&sercmd; pkg.stats
+		&sercmd; pkg.stats pid 1234
+		&sercmd; pkg.stats rank 1
+		&sercmd; pkg.stats index 10
 		</programlisting>
     </section>
     </section>