Merge branch 'master' of ssh://git.sip-router.org/sip-router

modules/lcr/README

@@ -64,7 +64,7 @@ Juha Heinanen
               3.37. dont_strip_or_tag_flag (integer)
               3.38. fetch_rows (integer)
               3.39. ping_interval (integer)
-              3.40. ping_inactive_threshold (integer)
+              3.40. ping_inactivate_threshold (integer)
               3.41. ping_valid_reply_codes (string)
               3.42. ping_from (string)
               3.43. ping_socket (string)
@@ -199,7 +199,7 @@ Chapter 1. Admin Guide
         3.37. dont_strip_or_tag_flag (integer)
         3.38. fetch_rows (integer)
         3.39. ping_interval (integer)
-        3.40. ping_inactive_threshold (integer)
+        3.40. ping_inactivate_threshold (integer)
         3.41. ping_valid_reply_codes (string)
         3.42. ping_from (string)
         3.43. ping_socket (string)
@@ -351,7 +351,7 @@ Chapter 1. Admin Guide
    3.37. dont_strip_or_tag_flag (integer)
    3.38. fetch_rows (integer)
    3.39. ping_interval (integer)
-   3.40. ping_inactive_threshold (integer)
+   3.40. ping_inactivate_threshold (integer)
    3.41. ping_valid_reply_codes (string)
    3.42. ping_from (string)
    3.43. ping_socket (string)
@@ -831,7 +831,7 @@ modparam("lcr", "fetch_rows", 3000)
 modparam("lcr", "ping_interval", 15)
 ...
 
-3.40. ping_inactive_threshold (integer)
+3.40. ping_inactivate_threshold (integer)
 
    Tells after how many failures (= inactivate_gw() function calls) a
    gateway is marked as inactive.

modules/lcr/doc/lcr_admin.xml

@@ -1032,7 +1032,7 @@ modparam("lcr", "ping_interval", 15)
 	</section>
 
 	<section>
-		<title><varname>ping_inactive_threshold</varname> (integer)</title>
+		<title><varname>ping_inactivate_threshold</varname> (integer)</title>
 		<para>
 		  Tells after how many failures (= inactivate_gw() function
 		  calls) a gateway is marked as inactive.
@@ -1040,16 +1040,16 @@ modparam("lcr", "ping_interval", 15)
 		<para>
 		<emphasis>
 			Default value is <quote>1</quote>, i.e., gateway is
-			marked inactive after first failure.
+			inactivated after first failure.
 		</emphasis>
 		</para>
 		<example>
 		<title>
-		Set <varname>ping_inactive_threshold</varname> parameter
+		Set <varname>ping_inactivate_threshold</varname> parameter
 		</title>
 <programlisting format="linespecific">
 ...
-modparam("lcr", "ping_inactive_threshold", 3)
+modparam("lcr", "ping_inactivate_threshold", 3)
 ...
 </programlisting>
 		</example>