diff --git a/src/modules/cdp/README b/src/modules/cdp/README
index bd109b5fd9f..ed9cd3b1223 100644
--- a/src/modules/cdp/README
+++ b/src/modules/cdp/README
@@ -8,12 +8,8 @@ Edited by
 
 Jason Penton
 
-Edited by
-
 Richard Good
 
-Edited by
-
 Carsten Bock
 
    ng-voice GmbH
@@ -40,8 +36,9 @@ Carsten Bock
 
               4.1. config_file (string)
               4.2. latency_threshold (int)
-              4.3. workerq_length_threshold_percentage (int)
-              4.4. debug_heavy (int)
+              4.3. workerq_latency_threshold (int)
+              4.4. workerq_length_threshold_percentage (int)
+              4.5. debug_heavy (int)
 
         5. Functions
 
@@ -136,12 +133,13 @@ Carsten Bock
 
    1.1. Set config_file parameter
    1.2. Set latency_threshold parameter
-   1.3. Set workerq_length_threshold_percentage parameter
-   1.4. Set debug_heavy parameter
-   1.5. cdp_check_peer usage
+   1.3. Set workerq_latency_threshold parameter
+   1.4. Set workerq_length_threshold_percentage parameter
+   1.5. Set debug_heavy parameter
    1.6. cdp_check_peer usage
    1.7. cdp_check_peer usage
-   1.8. DiameterPeer.xml example
+   1.8. cdp_check_peer usage
+   1.9. DiameterPeer.xml example
 
 Chapter 1. Admin Guide
 
@@ -158,8 +156,9 @@ Chapter 1. Admin Guide
 
         4.1. config_file (string)
         4.2. latency_threshold (int)
-        4.3. workerq_length_threshold_percentage (int)
-        4.4. debug_heavy (int)
+        4.3. workerq_latency_threshold (int)
+        4.4. workerq_length_threshold_percentage (int)
+        4.5. debug_heavy (int)
 
    5. Functions
 
@@ -230,8 +229,9 @@ Chapter 1. Admin Guide
 
    4.1. config_file (string)
    4.2. latency_threshold (int)
-   4.3. workerq_length_threshold_percentage (int)
-   4.4. debug_heavy (int)
+   4.3. workerq_latency_threshold (int)
+   4.4. workerq_length_threshold_percentage (int)
+   4.5. debug_heavy (int)
 
 4.1. config_file (string)
 
@@ -256,7 +256,19 @@ modparam("cdp", "config_file", "/etc/kamailio/diametercfg.xml")
 modparam("cdp", "latency_threshold", 1000)
 ...
 
-4.3. workerq_length_threshold_percentage (int)
+4.3. workerq_latency_threshold (int)
+
+   The time in ms above which a log error is written to log file for
+   putting tasks into task queue.
+
+   Default value is “100”.
+
+   Example 1.3. Set workerq_latency_threshold parameter
+...
+modparam("cdp", "workerq_latency_threshold", 250)
+...
+
+4.4. workerq_length_threshold_percentage (int)
 
    The threshold of the length of the worker queue as a percentage of the
    maximum queue size - when exceeded a warning is written to the log
@@ -264,12 +276,12 @@ modparam("cdp", "latency_threshold", 1000)
 
    Default value is “0”.
 
-   Example 1.3. Set workerq_length_threshold_percentage parameter
+   Example 1.4. Set workerq_length_threshold_percentage parameter
 ...
 modparam("cdp", "workerq_length_threshold_percentage", 25)
 ...
 
-4.4. debug_heavy (int)
+4.5. debug_heavy (int)
 
    Flag to enable a more verbose log, which tells you more details about
    peers. This is disabled by default because it brings to a log too much
@@ -277,7 +289,7 @@ modparam("cdp", "workerq_length_threshold_percentage", 25)
 
    Default value is “0”.
 
-   Example 1.4. Set debug_heavy parameter
+   Example 1.5. Set debug_heavy parameter
 ...
 modparam("cdp", "debug_heavy", 1)
 ...
@@ -295,7 +307,7 @@ modparam("cdp", "debug_heavy", 1)
      * fqdn - the Fully qualified domain name of the peer, that should be
        checked. The parameter may contain pseudovariables.
 
-   Example 1.5. cdp_check_peer usage
+   Example 1.6. cdp_check_peer usage
 ...
 if(!cdp_check_peer("hss.mnc001.mcc001.3gppnetwork.org")) {
         send_reply("503", "HSS not ready");
@@ -312,7 +324,7 @@ if(!cdp_check_peer("hss.mnc001.mcc001.3gppnetwork.org")) {
      * vendorid - The Vendor ID of the App
        application - The Application ID
 
-   Example 1.6. cdp_check_peer usage
+   Example 1.7. cdp_check_peer usage
 ...
 if(!cdp_has_app("10415", "4")) {
         send_reply("503", "Charging Server not ready");
@@ -320,7 +332,7 @@ if(!cdp_has_app("10415", "4")) {
 }
 ...
 
-   Example 1.7. cdp_check_peer usage
+   Example 1.8. cdp_check_peer usage
 ...
 if(!cdp_has_app("16777216")) {
         send_reply("503", "Cx/Dx Interface not ready");
@@ -353,7 +365,7 @@ if(!cdp_has_app("16777216")) {
    This is an example CDP configuration file. The location of this file is
    configured as a CDP parameter (config_file) - See section 4.1 Above
 
-   Example 1.8. DiameterPeer.xml example
+   Example 1.9. DiameterPeer.xml example
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
@@ -926,28 +938,28 @@ Chapter 3. Frequently Asked Questions
 
    3.1.
 
-       Where can I find more about Kamailio?
+   Where can I find more about Kamailio?
 
-       Take a look at https://www.kamailio.org/.
+   Take a look at https://www.kamailio.org/.
 
    3.2.
 
-       Where can I post a question about this module?
+   Where can I post a question about this module?
 
-       First at all check if your question was already answered on one of our
-       mailing lists:
-         * User Mailing List -
-           https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users
-         * Developer Mailing List -
-           https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
+   First at all check if your question was already answered on one of our
+   mailing lists:
+     * User Mailing List -
+       https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users
+     * Developer Mailing List -
+       https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
 
-       E-mails regarding any stable Kamailio release should be sent to
-       <sr-users@lists.kamailio.org> and e-mails regarding development
-       versions should be sent to <sr-dev@lists.kamailio.org>.
+   E-mails regarding any stable Kamailio release should be sent to
+   <sr-users@lists.kamailio.org> and e-mails regarding development
+   versions should be sent to <sr-dev@lists.kamailio.org>.
 
    3.3.
 
-       How can I report a bug?
+   How can I report a bug?
 
-       Please follow the guidelines provided at:
-       https://github.com/kamailio/kamailio/issues.
+   Please follow the guidelines provided at:
+   https://github.com/kamailio/kamailio/issues.
diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README
index ace384e35f0..f02bd970df8 100644
--- a/src/modules/dispatcher/README
+++ b/src/modules/dispatcher/README
@@ -60,35 +60,36 @@ Julien Chavanton
               3.5. destination_col (string)
               3.6. flags_col (string)
               3.7. priority_col (string)
-              3.8. force_dst (int)
-              3.9. flags (int)
-              3.10. use_default (int)
-              3.11. xavp_dst (str)
-              3.12. xavp_dst_mode (int)
-              3.13. xavp_ctx (str)
-              3.14. xavp_ctx_mode (int)
-              3.15. hash_pvar (str)
-              3.16. setid_pvname (str)
-              3.17. attrs_pvname (str)
-              3.18. ds_ping_method (string)
-              3.19. ds_ping_from (string)
-              3.20. ds_ping_interval (int)
-              3.21. ds_probing_threshold (int)
-              3.22. ds_inactive_threshold (int)
-              3.23. ds_ping_reply_codes (string)
-              3.24. ds_probing_mode (int)
-              3.25. ds_ping_latency_stats (int)
-              3.26. ds_latency_estimator_alpha (int)
-              3.27. ds_hash_size (int)
-              3.28. ds_hash_expire (int)
-              3.29. ds_hash_initexpire (int)
-              3.30. ds_hash_check_interval (int)
-              3.31. outbound_proxy (str)
-              3.32. ds_default_socket (str)
-              3.33. ds_timer_mode (int)
-              3.34. event_callback (str)
-              3.35. ds_attrs_none (int)
-              3.36. ds_db_extra_attrs (str)
+              3.8. attrs_col (string)
+              3.9. force_dst (int)
+              3.10. flags (int)
+              3.11. use_default (int)
+              3.12. xavp_dst (str)
+              3.13. xavp_dst_mode (int)
+              3.14. xavp_ctx (str)
+              3.15. xavp_ctx_mode (int)
+              3.16. hash_pvar (str)
+              3.17. setid_pvname (str)
+              3.18. attrs_pvname (str)
+              3.19. ds_ping_method (string)
+              3.20. ds_ping_from (string)
+              3.21. ds_ping_interval (int)
+              3.22. ds_probing_threshold (int)
+              3.23. ds_inactive_threshold (int)
+              3.24. ds_ping_reply_codes (string)
+              3.25. ds_probing_mode (int)
+              3.26. ds_ping_latency_stats (int)
+              3.27. ds_latency_estimator_alpha (int)
+              3.28. ds_hash_size (int)
+              3.29. ds_hash_expire (int)
+              3.30. ds_hash_initexpire (int)
+              3.31. ds_hash_check_interval (int)
+              3.32. outbound_proxy (str)
+              3.33. ds_default_socket (str)
+              3.34. ds_timer_mode (int)
+              3.35. event_callback (str)
+              3.36. ds_attrs_none (int)
+              3.37. ds_db_extra_attrs (str)
 
         4. Functions
 
@@ -139,48 +140,49 @@ Julien Chavanton
    1.5. Set “destination_col” parameter
    1.6. Set “flags_col” parameter
    1.7. Set “priority_col” parameter
-   1.8. Set the “force_dst” parameter
-   1.9. Set the “flags” parameter
-   1.10. Set the “use_default” parameter
-   1.11. Set the “xavp_dst” parameter
-   1.12. Set the “xavp_dst_mode” parameter
-   1.13. Set the “xavp_ctx” parameter
-   1.14. Set the “xavp_ctx_mode” parameter
-   1.15. Use $avp(hash) for hashing:
-   1.16. Use combination of PVs for hashing:
-   1.17. Set the “setid_pvname” parameter
-   1.18. Set the “attrs_pvname” parameter
-   1.19. Set the “ds_ping_method” parameter
-   1.20. Set the “ds_ping_from” parameter
-   1.21. Set the “ds_ping_interval” parameter
-   1.22. Set the “ds_probing_threshold” parameter
-   1.23. Set the “ds_inactive_threshold” parameter
-   1.24. Set the “ds_ping_reply_codes” parameter
-   1.25. Set the “ds_probing_mode” parameter
-   1.26. accessing the metrics
-   1.27. Set the “ds_ping_latency_stats” parameter
-   1.28. Set the “ds_hash_size” parameter
+   1.8. Set “attrs_col” parameter
+   1.9. Set the “force_dst” parameter
+   1.10. Set the “flags” parameter
+   1.11. Set the “use_default” parameter
+   1.12. Set the “xavp_dst” parameter
+   1.13. Set the “xavp_dst_mode” parameter
+   1.14. Set the “xavp_ctx” parameter
+   1.15. Set the “xavp_ctx_mode” parameter
+   1.16. Use $avp(hash) for hashing:
+   1.17. Use combination of PVs for hashing:
+   1.18. Set the “setid_pvname” parameter
+   1.19. Set the “attrs_pvname” parameter
+   1.20. Set the “ds_ping_method” parameter
+   1.21. Set the “ds_ping_from” parameter
+   1.22. Set the “ds_ping_interval” parameter
+   1.23. Set the “ds_probing_threshold” parameter
+   1.24. Set the “ds_inactive_threshold” parameter
+   1.25. Set the “ds_ping_reply_codes” parameter
+   1.26. Set the “ds_probing_mode” parameter
+   1.27. accessing the metrics
+   1.28. Set the “ds_ping_latency_stats” parameter
    1.29. Set the “ds_hash_size” parameter
-   1.30. Set the “ds_hash_expire” parameter
-   1.31. Set the “ds_hash_initexpire” parameter
-   1.32. Set the “ds_hash_check_interval” parameter
-   1.33. Set the “outbound_proxy” parameter
-   1.34. Set the “ds_default_socket” parameter
-   1.35. Set the “ds_timer_mode” parameter
-   1.36. Set event_callback parameter
-   1.37. Set the “ds_attrs_none” parameter
-   1.38. Set the “ds_db_extra_attrs” parameter
-   1.39. ds_select_dst usage
-   1.40. configuring load balancing with congestion detection
-   1.41. ds_select_domain usage
-   1.42. ds_select usage
-   1.43. ds_select_routes usage
-   1.44. ds_mark_dst usage
-   1.45. ds_list_exists usage
-   1.46. ds_is_from_list usage
-   1.47. ds_load_unset usage
-   1.48. dispatcher list file
-   1.49. Kamailio config script - sample dispatcher usage
+   1.30. Set the “ds_hash_size” parameter
+   1.31. Set the “ds_hash_expire” parameter
+   1.32. Set the “ds_hash_initexpire” parameter
+   1.33. Set the “ds_hash_check_interval” parameter
+   1.34. Set the “outbound_proxy” parameter
+   1.35. Set the “ds_default_socket” parameter
+   1.36. Set the “ds_timer_mode” parameter
+   1.37. Set event_callback parameter
+   1.38. Set the “ds_attrs_none” parameter
+   1.39. Set the “ds_db_extra_attrs” parameter
+   1.40. ds_select_dst usage
+   1.41. configuring load balancing with congestion detection
+   1.42. ds_select_domain usage
+   1.43. ds_select usage
+   1.44. ds_select_routes usage
+   1.45. ds_mark_dst usage
+   1.46. ds_list_exists usage
+   1.47. ds_is_from_list usage
+   1.48. ds_load_unset usage
+   1.49. dispatcher list file
+   1.50. Kamailio config script - sample dispatcher usage
 
 Chapter 1. Admin Guide
 
@@ -201,35 +203,36 @@ Chapter 1. Admin Guide
         3.5. destination_col (string)
         3.6. flags_col (string)
         3.7. priority_col (string)
-        3.8. force_dst (int)
-        3.9. flags (int)
-        3.10. use_default (int)
-        3.11. xavp_dst (str)
-        3.12. xavp_dst_mode (int)
-        3.13. xavp_ctx (str)
-        3.14. xavp_ctx_mode (int)
-        3.15. hash_pvar (str)
-        3.16. setid_pvname (str)
-        3.17. attrs_pvname (str)
-        3.18. ds_ping_method (string)
-        3.19. ds_ping_from (string)
-        3.20. ds_ping_interval (int)
-        3.21. ds_probing_threshold (int)
-        3.22. ds_inactive_threshold (int)
-        3.23. ds_ping_reply_codes (string)
-        3.24. ds_probing_mode (int)
-        3.25. ds_ping_latency_stats (int)
-        3.26. ds_latency_estimator_alpha (int)
-        3.27. ds_hash_size (int)
-        3.28. ds_hash_expire (int)
-        3.29. ds_hash_initexpire (int)
-        3.30. ds_hash_check_interval (int)
-        3.31. outbound_proxy (str)
-        3.32. ds_default_socket (str)
-        3.33. ds_timer_mode (int)
-        3.34. event_callback (str)
-        3.35. ds_attrs_none (int)
-        3.36. ds_db_extra_attrs (str)
+        3.8. attrs_col (string)
+        3.9. force_dst (int)
+        3.10. flags (int)
+        3.11. use_default (int)
+        3.12. xavp_dst (str)
+        3.13. xavp_dst_mode (int)
+        3.14. xavp_ctx (str)
+        3.15. xavp_ctx_mode (int)
+        3.16. hash_pvar (str)
+        3.17. setid_pvname (str)
+        3.18. attrs_pvname (str)
+        3.19. ds_ping_method (string)
+        3.20. ds_ping_from (string)
+        3.21. ds_ping_interval (int)
+        3.22. ds_probing_threshold (int)
+        3.23. ds_inactive_threshold (int)
+        3.24. ds_ping_reply_codes (string)
+        3.25. ds_probing_mode (int)
+        3.26. ds_ping_latency_stats (int)
+        3.27. ds_latency_estimator_alpha (int)
+        3.28. ds_hash_size (int)
+        3.29. ds_hash_expire (int)
+        3.30. ds_hash_initexpire (int)
+        3.31. ds_hash_check_interval (int)
+        3.32. outbound_proxy (str)
+        3.33. ds_default_socket (str)
+        3.34. ds_timer_mode (int)
+        3.35. event_callback (str)
+        3.36. ds_attrs_none (int)
+        3.37. ds_db_extra_attrs (str)
 
    4. Functions
 
@@ -313,35 +316,36 @@ Chapter 1. Admin Guide
    3.5. destination_col (string)
    3.6. flags_col (string)
    3.7. priority_col (string)
-   3.8. force_dst (int)
-   3.9. flags (int)
-   3.10. use_default (int)
-   3.11. xavp_dst (str)
-   3.12. xavp_dst_mode (int)
-   3.13. xavp_ctx (str)
-   3.14. xavp_ctx_mode (int)
-   3.15. hash_pvar (str)
-   3.16. setid_pvname (str)
-   3.17. attrs_pvname (str)
-   3.18. ds_ping_method (string)
-   3.19. ds_ping_from (string)
-   3.20. ds_ping_interval (int)
-   3.21. ds_probing_threshold (int)
-   3.22. ds_inactive_threshold (int)
-   3.23. ds_ping_reply_codes (string)
-   3.24. ds_probing_mode (int)
-   3.25. ds_ping_latency_stats (int)
-   3.26. ds_latency_estimator_alpha (int)
-   3.27. ds_hash_size (int)
-   3.28. ds_hash_expire (int)
-   3.29. ds_hash_initexpire (int)
-   3.30. ds_hash_check_interval (int)
-   3.31. outbound_proxy (str)
-   3.32. ds_default_socket (str)
-   3.33. ds_timer_mode (int)
-   3.34. event_callback (str)
-   3.35. ds_attrs_none (int)
-   3.36. ds_db_extra_attrs (str)
+   3.8. attrs_col (string)
+   3.9. force_dst (int)
+   3.10. flags (int)
+   3.11. use_default (int)
+   3.12. xavp_dst (str)
+   3.13. xavp_dst_mode (int)
+   3.14. xavp_ctx (str)
+   3.15. xavp_ctx_mode (int)
+   3.16. hash_pvar (str)
+   3.17. setid_pvname (str)
+   3.18. attrs_pvname (str)
+   3.19. ds_ping_method (string)
+   3.20. ds_ping_from (string)
+   3.21. ds_ping_interval (int)
+   3.22. ds_probing_threshold (int)
+   3.23. ds_inactive_threshold (int)
+   3.24. ds_ping_reply_codes (string)
+   3.25. ds_probing_mode (int)
+   3.26. ds_ping_latency_stats (int)
+   3.27. ds_latency_estimator_alpha (int)
+   3.28. ds_hash_size (int)
+   3.29. ds_hash_expire (int)
+   3.30. ds_hash_initexpire (int)
+   3.31. ds_hash_check_interval (int)
+   3.32. outbound_proxy (str)
+   3.33. ds_default_socket (str)
+   3.34. ds_timer_mode (int)
+   3.35. event_callback (str)
+   3.36. ds_attrs_none (int)
+   3.37. ds_db_extra_attrs (str)
 
 3.1. list_file (string)
 
@@ -425,7 +429,19 @@ modparam("dispatcher", "flags_col", "dstflags")
 modparam("dispatcher", "priority_col", "dstpriority")
 ...
 
-3.8. force_dst (int)
+3.8. attrs_col (string)
+
+   The column's name in the database storing the attributes for
+   destination URI.
+
+   Default value is “attrs”.
+
+   Example 1.8. Set “attrs_col” parameter
+...
+modparam("dispatcher", "attrs_col", "dstattrs")
+...
+
+3.9. force_dst (int)
 
    If set to 1, force overwriting of destination address (outbound proxy)
    when that is already set. If set to 0, will return error when the
@@ -433,12 +449,12 @@ modparam("dispatcher", "priority_col", "dstpriority")
 
    Default value is “1”.
 
-   Example 1.8. Set the “force_dst” parameter
+   Example 1.9. Set the “force_dst” parameter
 ...
 modparam("dispatcher", "force_dst", 1)
 ...
 
-3.9. flags (int)
+3.10. flags (int)
 
    Various flags that affect dispatcher's behaviour. The flags are defined
    as a bitmask on an integer value. If flag 1 is set only the username
@@ -454,12 +470,12 @@ modparam("dispatcher", "force_dst", 1)
 
    Default value is “0”.
 
-   Example 1.9. Set the “flags” parameter
+   Example 1.10. Set the “flags” parameter
  ...
  modparam("dispatcher", "flags", 3)
  ...
 
-3.10. use_default (int)
+3.11. use_default (int)
 
    If the parameter is set to 1, the last address in destination set is
    used as a final option to send the request to. For example, it is
@@ -468,12 +484,12 @@ modparam("dispatcher", "force_dst", 1)
 
    Default value is “0”.
 
-   Example 1.10. Set the “use_default” parameter
+   Example 1.11. Set the “use_default” parameter
  ...
  modparam("dispatcher", "use_default", 1)
  ...
 
-3.11. xavp_dst (str)
+3.12. xavp_dst (str)
 
    The name of the XAVP which will hold the list with addresses and
    associated properties, in the order they have been selected by the
@@ -491,12 +507,12 @@ Note
 
    Default value is “_dsdst_”.
 
-   Example 1.11. Set the “xavp_dst” parameter
+   Example 1.12. Set the “xavp_dst” parameter
  ...
  modparam("dispatcher", "xavp_dst", "_dsdst_")
  ...
 
-3.12. xavp_dst_mode (int)
+3.13. xavp_dst_mode (int)
 
    Control what fields are added to the XAVP specified by xavp_dst
    parameter.
@@ -512,12 +528,12 @@ Note
 
    Default value is “0” (add all fields).
 
-   Example 1.12. Set the “xavp_dst_mode” parameter
+   Example 1.13. Set the “xavp_dst_mode” parameter
  ...
  modparam("dispatcher", "xavp_dst_mode", 1)
  ...
 
-3.13. xavp_ctx (str)
+3.14. xavp_ctx (str)
 
    The name of the XAVP which will hold some attributes specific to
    dispatcher routing context. The XAVP can hold the next fields: cnt -
@@ -525,12 +541,12 @@ Note
 
    Default value is “_dsctx_”.
 
-   Example 1.13. Set the “xavp_ctx” parameter
+   Example 1.14. Set the “xavp_ctx” parameter
  ...
  modparam("dispatcher", "xavp_ctx", "_dsctx_")
  ...
 
-3.14. xavp_ctx_mode (int)
+3.15. xavp_ctx_mode (int)
 
    Control what fields are added to the XAVP specified by xavp_ctx
    parameter. The cnt field is added if xavp_cnt_mode does not have the
@@ -538,12 +554,12 @@ Note
 
    Default value is “0” (add all fields).
 
-   Example 1.14. Set the “xavp_ctx_mode” parameter
+   Example 1.15. Set the “xavp_ctx_mode” parameter
  ...
  modparam("dispatcher", "xavp_ctx_mode", 1)
  ...
 
-3.15. hash_pvar (str)
+3.16. hash_pvar (str)
 
    String with PVs used for the hashing algorithm 7.
 
@@ -554,41 +570,41 @@ Note
 
    Default value is “null” - disabled.
 
-   Example 1.15. Use $avp(hash) for hashing:
+   Example 1.16. Use $avp(hash) for hashing:
  ...
  modparam("dispatcher", "hash_pvar", "$avp(hash)")
  ...
 
-   Example 1.16. Use combination of PVs for hashing:
+   Example 1.17. Use combination of PVs for hashing:
  ...
  modparam("dispatcher", "hash_pvar", "hash the $fU@$ci")
  ...
 
-3.16. setid_pvname (str)
+3.17. setid_pvname (str)
 
    The name of the PV where to store the set ID (group ID) when calling
    ds_is_from_list() with no parameter.
 
    Default value is “null” - don't set PV.
 
-   Example 1.17. Set the “setid_pvname” parameter
+   Example 1.18. Set the “setid_pvname” parameter
  ...
  modparam("dispatcher", "setid_pvname", "$var(setid)")
  ...
 
-3.17. attrs_pvname (str)
+3.18. attrs_pvname (str)
 
    The name of the PV where to store the attributes of matching address
    when calling ds_is_from_list().
 
    Default value is “null” - don't set PV.
 
-   Example 1.18. Set the “attrs_pvname” parameter
+   Example 1.19. Set the “attrs_pvname” parameter
  ...
  modparam("dispatcher", "attrs_pvname", "$var(attrs)")
  ...
 
-3.18. ds_ping_method (string)
+3.19. ds_ping_method (string)
 
    With this method you can define, with which method you want to probe
    the gateways. Pinging gateways feature depends on ds_ping_interval
@@ -596,12 +612,12 @@ Note
 
    Default value is “OPTIONS”.
 
-   Example 1.19. Set the “ds_ping_method” parameter
+   Example 1.20. Set the “ds_ping_method” parameter
  ...
  modparam("dispatcher", "ds_ping_method", "INFO")
  ...
 
-3.19. ds_ping_from (string)
+3.20. ds_ping_from (string)
 
    With this Method you can define the "From:"-Line for the request, sent
    to the failed gateways. This method is only available, if compiled with
@@ -609,12 +625,12 @@ Note
 
    Default value is “sip:dispatcher@localhost”.
 
-   Example 1.20. Set the “ds_ping_from” parameter
+   Example 1.21. Set the “ds_ping_from” parameter
  ...
  modparam("dispatcher", "ds_ping_from", "sip:proxy@sip.somehost.com")
  ...
 
-3.20. ds_ping_interval (int)
+3.21. ds_ping_interval (int)
 
    With this parameter you can define the interval for sending a request
    to a gateway marked as inactive upon a failed request routing to it.
@@ -623,12 +639,12 @@ Note
 
    Default value is “0”.
 
-   Example 1.21. Set the “ds_ping_interval” parameter
+   Example 1.22. Set the “ds_ping_interval” parameter
  ...
  modparam("dispatcher", "ds_ping_interval", 30)
  ...
 
-3.21. ds_probing_threshold (int)
+3.22. ds_probing_threshold (int)
 
    If you want to set a gateway into inactive mode, there can be a
    specific number of failed requests until it will change from "active"
@@ -639,12 +655,12 @@ Note
 
    Default value is “1” (set inactive with first failure).
 
-   Example 1.22. Set the “ds_probing_threshold” parameter
+   Example 1.23. Set the “ds_probing_threshold” parameter
  ...
  modparam("dispatcher", "ds_probing_threshold", 10)
  ...
 
-3.22. ds_inactive_threshold (int)
+3.23. ds_inactive_threshold (int)
 
    If you want to set a gateway into active mode (after being inactive),
    there can be a specific number of successful requests until it will
@@ -654,12 +670,12 @@ Note
 
    Default value is “1” (set active with first success).
 
-   Example 1.23. Set the “ds_inactive_threshold” parameter
+   Example 1.24. Set the “ds_inactive_threshold” parameter
  ...
  modparam("dispatcher", "ds_inactive_threshold", 10)
  ...
 
-3.23. ds_ping_reply_codes (string)
+3.24. ds_ping_reply_codes (string)
 
    This parameter defines the valid response codes, which are accepted as
    a valid reply to the PING-Method. It is a list separated by colons,
@@ -678,13 +694,13 @@ Note
 
    Default value is “” (only 200 OK is accepted).
 
-   Example 1.24. Set the “ds_ping_reply_codes” parameter
+   Example 1.25. Set the “ds_ping_reply_codes” parameter
  ...
  modparam("dispatcher", "ds_ping_reply_codes", "class=2;code=403;code=488;class=
 3")
  ...
 
-3.24. ds_probing_mode (int)
+3.25. ds_probing_mode (int)
 
    Controls what gateways are tested to see if they are reachable.
      * Value 0: If set to 0, only the gateways with state PROBING are
@@ -707,12 +723,12 @@ Note
 
    Default value is “0”.
 
-   Example 1.25. Set the “ds_probing_mode” parameter
+   Example 1.26. Set the “ds_probing_mode” parameter
  ...
  modparam("dispatcher", "ds_probing_mode", 1)
  ...
 
-3.25. ds_ping_latency_stats (int)
+3.26. ds_ping_latency_stats (int)
 
    Enable latency measurement when pinging nodes
      * If set to 0, disable latency measurement.
@@ -720,7 +736,7 @@ Note
 
    Default value is “0”.
 
-   Example 1.26. accessing the metrics
+   Example 1.27. accessing the metrics
 # using the command :
 kamcmd dispatcher.list
  ...
@@ -739,12 +755,12 @@ estimator_alpha
 }
  ...
 
-   Example 1.27. Set the “ds_ping_latency_stats” parameter
+   Example 1.28. Set the “ds_ping_latency_stats” parameter
  ...
  modparam("dispatcher", "ds_ping_latency_stats", 1)
  ...
 
-3.26. ds_latency_estimator_alpha (int)
+3.27. ds_latency_estimator_alpha (int)
 
    The value to be used to control the memory of the estimator EWMA
    "exponential weighted moving average" or "the speed at which the older
@@ -756,12 +772,12 @@ estimator_alpha
 
    Default value is “900 => 0.9”.
 
-   Example 1.28. Set the “ds_hash_size” parameter
+   Example 1.29. Set the “ds_hash_size” parameter
  ...
  modparam("dispatcher", "ds_latency_estimator_alpha", 900)
  ...
 
-3.27. ds_hash_size (int)
+3.28. ds_hash_size (int)
 
    The value to be used as power of two to set the number of slots to hash
    table storing data for call load dispatching (e.g., value 8 will create
@@ -770,24 +786,24 @@ estimator_alpha
 
    Default value is “0”.
 
-   Example 1.29. Set the “ds_hash_size” parameter
+   Example 1.30. Set the “ds_hash_size” parameter
  ...
  modparam("dispatcher", "ds_hash_size", 9)
  ...
 
-3.28. ds_hash_expire (int)
+3.29. ds_hash_expire (int)
 
    Expiration time in seconds to remove the load on a destination if no
    BYE was received meanwhile.
 
    Default value is “7200”.
 
-   Example 1.30. Set the “ds_hash_expire” parameter
+   Example 1.31. Set the “ds_hash_expire” parameter
  ...
  modparam("dispatcher", "ds_hash_expire", 3600)
  ...
 
-3.29. ds_hash_initexpire (int)
+3.30. ds_hash_initexpire (int)
 
    Expiration time in seconds to remove the load on a destination if no
    200 for INVITE was received meanwhile and state updated with
@@ -795,35 +811,35 @@ estimator_alpha
 
    Default value is “7200”.
 
-   Example 1.31. Set the “ds_hash_initexpire” parameter
+   Example 1.32. Set the “ds_hash_initexpire” parameter
  ...
  modparam("dispatcher", "ds_hash_initexpire", 60)
  ...
 
-3.30. ds_hash_check_interval (int)
+3.31. ds_hash_check_interval (int)
 
    Time interval in seconds to scan internal hash table with call load
    dispatching data for expired items.
 
    Default value is “30”.
 
-   Example 1.32. Set the “ds_hash_check_interval” parameter
+   Example 1.33. Set the “ds_hash_check_interval” parameter
  ...
  modparam("dispatcher", "ds_hash_check_interval", 60)
  ...
 
-3.31. outbound_proxy (str)
+3.32. outbound_proxy (str)
 
    SIP URI of outbound proxy to be used when sending pings.
 
    By default no outbound proxy is defined.
 
-   Example 1.33. Set the “outbound_proxy” parameter
+   Example 1.34. Set the “outbound_proxy” parameter
  ...
  modparam("dispatcher", "outbound_proxy", "sip:outbound.example.com")
  ...
 
-3.32. ds_default_socket (str)
+3.33. ds_default_socket (str)
 
    Default socket to be used for sending pings and dispatching requests
    when a gateway has no send socket configured.
@@ -831,12 +847,12 @@ estimator_alpha
    By default no default socket is defined, the first configuration script
    listen directive is used.
 
-   Example 1.34. Set the “ds_default_socket” parameter
+   Example 1.35. Set the “ds_default_socket” parameter
  ...
  modparam("dispatcher", "ds_default_socket", "udp:192.168.0.125:5060")
  ...
 
-3.33. ds_timer_mode (int)
+3.34. ds_timer_mode (int)
 
    Specify the timer process to be used by the module for keepalives and
    active dialogs tracking.
@@ -851,12 +867,12 @@ estimator_alpha
 
    Default value is “0”.
 
-   Example 1.35. Set the “ds_timer_mode” parameter
+   Example 1.36. Set the “ds_timer_mode” parameter
  ...
  modparam("dispatcher", "ds_timer_mode", 1)
  ...
 
-3.34. event_callback (str)
+3.35. event_callback (str)
 
    The name of the function in the kemi configuration file (embedded
    scripting language such as Lua, Python, ...) to be executed instead of
@@ -867,7 +883,7 @@ estimator_alpha
 
    Default value is 'empty' (no function is executed for events).
 
-   Example 1.36. Set event_callback parameter
+   Example 1.37. Set event_callback parameter
 ...
 modparam("dispatcher", "event_callback", "ksr_dispatcher_event")
 ...
@@ -878,7 +894,7 @@ function ksr_dispatcher_event(evname)
 end
 ...
 
-3.35. ds_attrs_none (int)
+3.36. ds_attrs_none (int)
 
    If set to 1, "none=yes" is set in the attrs for those records that have
    no attrs value, to ensure that corresponding XAVP fields for records do
@@ -886,12 +902,12 @@ end
 
    Default value is “0”.
 
-   Example 1.37. Set the “ds_attrs_none” parameter
+   Example 1.38. Set the “ds_attrs_none” parameter
  ...
  modparam("dispatcher", "ds_attrs_none", 1)
  ...
 
-3.36. ds_db_extra_attrs (str)
+3.37. ds_db_extra_attrs (str)
 
    Set a list of column names to be loaded from database dispatcher table
    and be concatenated to 'attrs' field. The format is:
@@ -903,7 +919,7 @@ end
 
    Default value is “empty”.
 
-   Example 1.38. Set the “ds_db_extra_attrs” parameter
+   Example 1.39. Set the “ds_db_extra_attrs” parameter
 ...
 modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix")
 ...
@@ -1008,7 +1024,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix")
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-   Example 1.39. ds_select_dst usage
+   Example 1.40. ds_select_dst usage
 ...
 ds_select_dst("1", "0");
 ...
@@ -1018,7 +1034,7 @@ ds_select_dst("1", "$var(a)");
 ds_select_dst("1", "4", "3");
 ...
 
-   Example 1.40. configuring load balancing with congestion detection
+   Example 1.41. configuring load balancing with congestion detection
 ...
 # sample of SQL provisionning statements
 INSERT INTO "dispatcher"
@@ -1070,7 +1086,7 @@ DEST: {
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-   Example 1.41. ds_select_domain usage
+   Example 1.42. ds_select_domain usage
 ...
 $var(a) = 4;
 if(ds_select_domain("1", "$var(a)")) {
@@ -1094,7 +1110,7 @@ if(ds_select_domain("1", "$var(a)")) {
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.42. ds_select usage
+   Example 1.43. ds_select usage
 ...
 $var(a) = 4;
 if(ds_select("1", "$var(a)")) {
@@ -1137,7 +1153,7 @@ if(ds_select("1", "$var(a)")) {
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.43. ds_select_routes usage
+   Example 1.44. ds_select_routes usage
 ...
 $var(alg) = 4;
 $var(limit) = 8;
@@ -1212,7 +1228,7 @@ failure_route[REROUTE] {
 
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
 
-   Example 1.44. ds_mark_dst usage
+   Example 1.45. ds_mark_dst usage
 ...
 failure_route[tryagain] {
 ...
@@ -1231,7 +1247,7 @@ failure_route[tryagain] {
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.45. ds_list_exists usage
+   Example 1.46. ds_list_exists usage
 ...
 if(ds_list_exists("10")) {
     ...
@@ -1274,7 +1290,7 @@ if(ds_list_exists("10")) {
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.46. ds_is_from_list usage
+   Example 1.47. ds_is_from_list usage
 ...
 if(ds_is_from_list()) {
     ...
@@ -1308,7 +1324,7 @@ if(ds_is_from_list("10", "3", "sip:127.0.0.1:5080")) {
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
    BRANCH_ROUTE and ONREPLY_ROUTE.
 
-   Example 1.47. ds_load_unset usage
+   Example 1.48. ds_load_unset usage
 ...
 route {
     ...
@@ -1509,7 +1525,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt)
    For database, each element of a line resides in a different column.
    Next is a dispatcher.list file example:
 
-   Example 1.48. dispatcher list file
+   Example 1.49. dispatcher list file
 ...
 #
 # dispatcher destination sets (groups)
@@ -1534,7 +1550,7 @@ r,opt)
 
    Next listing shows a sample config for using the dispatcher module.
 
-   Example 1.49. Kamailio config script - sample dispatcher usage
+   Example 1.50. Kamailio config script - sample dispatcher usage
 ...
 #!KAMAILIO
 #
diff --git a/src/modules/dmq_usrloc/README b/src/modules/dmq_usrloc/README
index 3a05cbddfd2..2d362dc4023 100644
--- a/src/modules/dmq_usrloc/README
+++ b/src/modules/dmq_usrloc/README
@@ -47,7 +47,7 @@ Julien Chavanton
 
    1.1. Set enable parameter
    1.2. Set sync parameter
-   1.3. Set batch size parameter
+   1.3. Set batch_size parameter
    1.4. Set batch_usleep parameter
    1.5. Set batch_msg_size parameter
    1.6. Set batch_msg_contacts parameter
@@ -135,7 +135,7 @@ modparam("dmq_usrloc", "sync", 0)
 
    Default value is 0.
 
-   Example 1.3. Set batch size parameter
+   Example 1.3. Set batch_size parameter
 ...
 modparam("dmq_usrloc", "batch_size", 4000)
 ...
diff --git a/src/modules/dnssec/README b/src/modules/dnssec/README
index 3e4d51089ef..05d6bf59fd9 100644
--- a/src/modules/dnssec/README
+++ b/src/modules/dnssec/README
@@ -21,7 +21,7 @@ Marius Zbihlei
 
    List of Examples
 
-   1.1. Set enable_full_lr parameter
+   1.1. Set general_query_flags parameter
 
 Chapter 1. Admin Guide
 
@@ -116,7 +116,7 @@ Chapter 1. Admin Guide
 
    Default value is 0(no changes)
 
-   Example 1.1. Set enable_full_lr parameter
+   Example 1.1. Set general_query_flags parameter
  ...
  modparam("dnssec", "general_query_flags", 1) # QUERY_DONT_VALIDATE disable vali
 dation
diff --git a/src/modules/htable/README b/src/modules/htable/README
index afe50dabe80..e156747254d 100644
--- a/src/modules/htable/README
+++ b/src/modules/htable/README
@@ -91,7 +91,7 @@ Ovidiu Sas
    1.1. Accessing $sht(htname=>key)
    1.2. Dictionary attack limitation
    1.3. Storing array values
-   1.4. Set hash_size parameter
+   1.4. Set htable parameter
    1.5. Set db_url parameter
    1.6. Set key_name_column parameter
    1.7. Set key_type_column parameter
@@ -475,7 +475,7 @@ $ kamcmd htable.dump htable
 
    Default value is NULL.
 
-   Example 1.4. Set hash_size parameter
+   Example 1.4. Set htable parameter
 ...
 modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;")
 modparam("htable", "htable", "b=>size=5;")
diff --git a/src/modules/lcr/README b/src/modules/lcr/README
index 0dd6fae04e0..1e7c32335d1 100644
--- a/src/modules/lcr/README
+++ b/src/modules/lcr/README
@@ -98,7 +98,7 @@ Juha Heinanen
    List of Examples
 
    1.1. Setting db_url module parameter
-   1.2. Setting gw_table module parameter
+   1.2. Setting lcr_gw_table module parameter
    1.3. Setting id_column module parameter
    1.4. Setting lcr_id_column module parameter
    1.5. Setting gw_name_column module parameter
@@ -403,7 +403,7 @@ modparam("lcr","db_url","dbdriver://username:password@dbhost/dbname")
 
    Default value is “lcr_gw”.
 
-   Example 1.2. Setting gw_table module parameter
+   Example 1.2. Setting lcr_gw_table module parameter
 ...
 modparam("lcr", "lcr_gw_table","gw")
 ...
diff --git a/src/modules/msilo/README b/src/modules/msilo/README
index 7b8b8abd3cd..139597f9cb0 100644
--- a/src/modules/msilo/README
+++ b/src/modules/msilo/README
@@ -1,871 +1,2 @@
-MSILO Module
 
-Daniel-Constantin Mierla
 
-   <miconda@gmail.com>
-
-Juha Heinanen
-
-   <jh@tutpro.com>
-
-Edited by
-
-Daniel-Constantin Mierla
-
-   <miconda@gmail.com>
-
-Juha Heinanen
-
-   <jh@tutpro.com>
-
-   Copyright © 2003 FhG FOKUS
-
-   Copyright © 2009 Juha Heinanen
-     __________________________________________________________________
-
-   Table of Contents
-
-   1. Admin Guide
-
-        1. Overview
-        2. Dependencies
-
-              2.1. Kamailio modules
-              2.2. External libraries or applications
-
-        3. Parameters
-
-              3.1. db_url (string)
-              3.2. db_table (string)
-              3.3. sc_mid (string)
-              3.4. sc_from (string)
-              3.5. sc_to (string)
-              3.6. sc_uri_user (string)
-              3.7. sc_uri_host (string)
-              3.8. sc_body (string)
-              3.9. sc_ctype (string)
-              3.10. sc_exp_time (string)
-              3.11. sc_inc_time (string)
-              3.12. sc_snd_time (string)
-              3.13. from_address (string)
-              3.14. contact_hdr (string)
-              3.15. extra_hdrs (string)
-              3.16. offline_message (string)
-              3.17. content_type_hdr (string)
-              3.18. reminder (string)
-              3.19. outbound_proxy (string)
-              3.20. expire_time (int)
-              3.21. check_time (int)
-              3.22. send_time (int)
-              3.23. clean_period (int)
-              3.24. use_contact (int)
-              3.25. snd_time_avp (str)
-              3.26. add_date (int)
-              3.27. max_messages (int)
-              3.28. add_contact (int)
-              3.29. extra_hdrs_avp (str)
-              3.30. skip_notification_flag (int)
-
-        4. Functions
-
-              4.1. m_store([owner])
-              4.2. m_dump([owner])
-
-        5. Statistics
-
-              5.1. stored_messages
-              5.2. dumped_messages
-              5.3. failed_messages
-              5.4. dumped_reminders
-              5.5. failed_reminders
-
-        6. Installation and Running
-
-              6.1. Kamailio config file
-
-   List of Examples
-
-   1.1. Set the “db_url” parameter
-   1.2. Set the “db_table” parameter
-   1.3. Set the “sc_mid” parameter
-   1.4. Set the “sc_from” parameter
-   1.5. Set the “sc_to” parameter
-   1.6. Set the “sc_uri_user” parameter
-   1.7. Set the “sc_uri_host” parameter
-   1.8. Set the “sc_body” parameter
-   1.9. Set the “sc_ctype” parameter
-   1.10. Set the “sc_exp_time” parameter
-   1.11. Set the “sc_inc_time” parameter
-   1.12. Set the “sc_snd_time” parameter
-   1.13. Set the “from_address” parameter
-   1.14. Set the “contact_hdr” parameter
-   1.15. Set the “extra_hdrs” parameter
-   1.16. Set the “offline_message” parameter
-   1.17. Set the “content_type_hdr” parameter
-   1.18. Set the “reminder” parameter
-   1.19. Set the “outbound_proxy” parameter
-   1.20. Set the “expire_time” parameter
-   1.21. Set the “check_time” parameter
-   1.22. Set the “send_time” parameter
-   1.23. Set the “clean_period” parameter
-   1.24. Set the “use_contact” parameter
-   1.25. Set the “snd_time_avp” parameter
-   1.26. Set the “add_date” parameter
-   1.27. Set the “max_messages” parameter
-   1.28. Set the “add_contact” parameter
-   1.29. Set the “extra_hdrs_avp” parameter
-   1.30. Set the “skip_notification_flag” parameter
-   1.31. m_store usage
-   1.32. m_dump usage
-   1.33. Kamailio config script - sample msilo usage
-
-Chapter 1. Admin Guide
-
-   Table of Contents
-
-   1. Overview
-   2. Dependencies
-
-        2.1. Kamailio modules
-        2.2. External libraries or applications
-
-   3. Parameters
-
-        3.1. db_url (string)
-        3.2. db_table (string)
-        3.3. sc_mid (string)
-        3.4. sc_from (string)
-        3.5. sc_to (string)
-        3.6. sc_uri_user (string)
-        3.7. sc_uri_host (string)
-        3.8. sc_body (string)
-        3.9. sc_ctype (string)
-        3.10. sc_exp_time (string)
-        3.11. sc_inc_time (string)
-        3.12. sc_snd_time (string)
-        3.13. from_address (string)
-        3.14. contact_hdr (string)
-        3.15. extra_hdrs (string)
-        3.16. offline_message (string)
-        3.17. content_type_hdr (string)
-        3.18. reminder (string)
-        3.19. outbound_proxy (string)
-        3.20. expire_time (int)
-        3.21. check_time (int)
-        3.22. send_time (int)
-        3.23. clean_period (int)
-        3.24. use_contact (int)
-        3.25. snd_time_avp (str)
-        3.26. add_date (int)
-        3.27. max_messages (int)
-        3.28. add_contact (int)
-        3.29. extra_hdrs_avp (str)
-        3.30. skip_notification_flag (int)
-
-   4. Functions
-
-        4.1. m_store([owner])
-        4.2. m_dump([owner])
-
-   5. Statistics
-
-        5.1. stored_messages
-        5.2. dumped_messages
-        5.3. failed_messages
-        5.4. dumped_reminders
-        5.5. failed_reminders
-
-   6. Installation and Running
-
-        6.1. Kamailio config file
-
-1. Overview
-
-   This module provides offline message storage for Kamailio SIP Server
-   Platform. It stores received messages for an offline user and sends
-   them when the user comes back online. It can also send reminders and
-   auto-expire messages.
-
-   For each message, the modules stores “Request-URI” (“R-URI”) only if it
-   is a complete address of record (“username@hostname”), URI from “To”
-   header, URI from “From” header, incoming time, expiration time, content
-   type and body of the message. If “R-URI” is not an address of record
-   (it might be the contact address for current SIP session) the URI from
-   “To” header will be used as R-URI.
-
-   When the expiration time is passed, the message is discarded from
-   database. Expiration time is computed based on incoming time and one of
-   the module's parameters.
-
-   Every time when a user registers with Kamailio, the module is looking
-   in database for offline messages intended for that user. All of them
-   will be sent to contact address provided in REGISTER request and then
-   be deleted.
-
-   It may happen that the SIP user registering use a SIP User Agent that
-   has no support for MESSAGE requests. In this case the “failure_route”
-   should be used to re-store the undelivered requests.
-
-   Another functionality provided by the MSILO module is to send messages
-   at a certain time -- the reminder functionality. Using config logic, a
-   received message can be stored and delivered at a time specified while
-   storing with the 'snd_time_avp'.
-
-2. Dependencies
-
-   2.1. Kamailio modules
-   2.2. External libraries or applications
-
-2.1. Kamailio modules
-
-   The following modules must be loaded before this module:
-     * database module - mysql, dbtext or other module that implements the
-       “db” interface and provides support for storing/receiving data
-       to/from a database system.
-     * TM--transaction module-- used to send SIP requests.
-
-2.2. External libraries or applications
-
-   The following libraries or applications must be installed before
-   running Kamailio with this module:
-     * none.
-
-3. Parameters
-
-   3.1. db_url (string)
-   3.2. db_table (string)
-   3.3. sc_mid (string)
-   3.4. sc_from (string)
-   3.5. sc_to (string)
-   3.6. sc_uri_user (string)
-   3.7. sc_uri_host (string)
-   3.8. sc_body (string)
-   3.9. sc_ctype (string)
-   3.10. sc_exp_time (string)
-   3.11. sc_inc_time (string)
-   3.12. sc_snd_time (string)
-   3.13. from_address (string)
-   3.14. contact_hdr (string)
-   3.15. extra_hdrs (string)
-   3.16. offline_message (string)
-   3.17. content_type_hdr (string)
-   3.18. reminder (string)
-   3.19. outbound_proxy (string)
-   3.20. expire_time (int)
-   3.21. check_time (int)
-   3.22. send_time (int)
-   3.23. clean_period (int)
-   3.24. use_contact (int)
-   3.25. snd_time_avp (str)
-   3.26. add_date (int)
-   3.27. max_messages (int)
-   3.28. add_contact (int)
-   3.29. extra_hdrs_avp (str)
-   3.30. skip_notification_flag (int)
-
-3.1. db_url (string)
-
-   Database URL.
-
-   Default value is “mysql://kamailio:kamailiorw@localhost/kamailio”.
-
-   Example 1.1. Set the “db_url” parameter
-...
-modparam("msilo", "db_url", "dbdriver://username:password@dbhost/dbname")
-...
-
-3.2. db_table (string)
-
-   The name of table where to store the messages.
-
-   Default value is “silo”.
-
-   Example 1.2. Set the “db_table” parameter
-...
-modparam("msilo", "db_table", "silo")
-...
-
-3.3. sc_mid (string)
-
-   The name of the column in silo table used to store the message id.
-
-   Default value is “mid”.
-
-   Example 1.3. Set the “sc_mid” parameter
-...
-modparam("msilo", "sc_mid", "other_mid")
-...
-
-3.4. sc_from (string)
-
-   The name of the column in silo table, storing the source address.
-
-   Default value is “src_addr”.
-
-   Example 1.4. Set the “sc_from” parameter
-...
-modparam("msilo", "sc_from", "source_address")
-...
-
-3.5. sc_to (string)
-
-   The name of the column in silo table, storing the destination address.
-
-   Default value is “dst_addr”.
-
-   Example 1.5. Set the “sc_to” parameter
-...
-modparam("msilo", "sc_to", "destination_address")
-...
-
-3.6. sc_uri_user (string)
-
-   The name of the column in silo table, storing the user name.
-
-   Default value is “username”.
-
-   Example 1.6. Set the “sc_uri_user” parameter
-...
-modparam("msilo", "sc_uri_user", "user")
-...
-
-3.7. sc_uri_host (string)
-
-   The name of the column in silo table, storing the domain.
-
-   Default value is “domain”.
-
-   Example 1.7. Set the “sc_uri_host” parameter
-...
-modparam("msilo", "sc_uri_host", "domain")
-...
-
-3.8. sc_body (string)
-
-   The name of the column storing the message body in silo table.
-
-   Default value is “body”.
-
-   Example 1.8. Set the “sc_body” parameter
-...
-modparam("msilo", "sc_body", "message_body")
-...
-
-3.9. sc_ctype (string)
-
-   The name of the column in silo table, storing content type.
-
-   Default value is “ctype”.
-
-   Example 1.9. Set the “sc_ctype” parameter
-...
-modparam("msilo", "sc_ctype", "content_type")
-...
-
-3.10. sc_exp_time (string)
-
-   The name of the column in silo table, storing the expire time of the
-   message.
-
-   Default value is “exp_time”.
-
-   Example 1.10. Set the “sc_exp_time” parameter
-...
-modparam("msilo", "sc_exp_time", "expire_time")
-...
-
-3.11. sc_inc_time (string)
-
-   The name of the column in silo table, storing the incoming time of the
-   message.
-
-   Default value is “inc_time”.
-
-   Example 1.11. Set the “sc_inc_time” parameter
-...
-modparam("msilo", "sc_inc_time", "incoming_time")
-...
-
-3.12. sc_snd_time (string)
-
-   The name of the column in silo table, storing the send time for the
-   reminder.
-
-   Default value is “snd_time”.
-
-   Example 1.12. Set the “sc_snd_time” parameter
-...
-modparam("msilo", "sc_snd_time", "send_reminder_time")
-...
-
-3.13. from_address (string)
-
-   The SIP address used to inform users that destination of their message
-   is not online and the message will be delivered next time when that
-   user goes online. If the parameter is not set, the module will not send
-   any notification. This parameter may contain pseudo-variables.
-
-   Default value is “NULL”.
-
-   Example 1.13. Set the “from_address” parameter
-...
-modparam("msilo", "from_address", "sip:registrar@example.org")
-modparam("msilo", "from_address", "sip:$rU@example.org")
-...
-
-3.14. contact_hdr (string)
-
-   The value of the “Contact” header (including header name and ending
-   \r\n) to be added in notification messages. It can contain
-   pseudo-variables.
-
-   Default value is “NULL”.
-
-   Example 1.14. Set the “contact_hdr” parameter
-...
-modparam("msilo", "contact_hdr", "Contact: <sip:null@example.com>\r\n")
-...
-
-3.15. extra_hdrs (string)
-
-   Extra headers (each ending with \r\n) to be added in messages sent from
-   silo by m_dump. It can contain pseudo-variables.
-
-   Default value is “NULL”.
-
-   Example 1.15. Set the “extra_hdrs” parameter
-...
-modparam("msilo", "extra_hdrs", "X-Extra: $tu\r\nY-Extra: foo\r\n")
-...
-
-3.16. offline_message (string)
-
-   The body of the notification message. It can contain pseudo-variables.
-
-   Default value is “NULL”.
-
-   Example 1.16. Set the “offline_message” parameter
-...
-modparam("msilo", "offline_message", "*** User $rU is offline!")
-modparam("msilo", "offline_message", "<em>I am offline!</em>")
-...
-
-3.17. content_type_hdr (string)
-
-   The value of the Content-Type header (including header name and ending
-   \r\n) to be added in notification messages. It must reflect what the
-   'offline_message' contains. It can contain pseudo-variables.
-
-   Default value is “NULL”.
-
-   Example 1.17. Set the “content_type_hdr” parameter
-...
-modparam("msilo", "content_type_hdr", "Content-Type: text/plain\r\n")
-modparam("msilo", "content_type_hdr", "Content-Type: text/html\r\n")
-...
-
-3.18. reminder (string)
-
-   The SIP address used to send reminder messages. If this value is not
-   set, the reminder feature is disabled.
-
-   Default value is “NULL”.
-
-   Example 1.18. Set the “reminder” parameter
-...
-modparam("msilo", "reminder", "sip:registrar@example.org")
-...
-
-3.19. outbound_proxy (string)
-
-   The SIP address used as next hop when sending the message. Very useful
-   when using Kamailio with a domain name not in DNS, or when using a
-   separate Kamailio instance for msilo processing. If not set, the
-   message will be sent to the address in destination URI.
-
-   Default value is “NULL”.
-
-   Example 1.19. Set the “outbound_proxy” parameter
-...
-modparam("msilo", "outbound_proxy", "sip:kamailio.org;transport=tcp")
-...
-
-3.20. expire_time (int)
-
-   Expire time of stored messages - seconds. When this time passed, the
-   message is silently discarded from database.
-
-   Default value is “259200 (72 hours = 3 days)”.
-
-   Example 1.20. Set the “expire_time” parameter
-...
-modparam("msilo", "expire_time", 36000)
-...
-
-3.21. check_time (int)
-
-   Timer interval to check if dumped messages are sent OK - seconds. The
-   module keeps each request send by itself for a new online user and if
-   the reply is 2xx then the message is deleted from database.
-
-   Default value is “60”.
-
-   Example 1.21. Set the “check_time” parameter
-...
-modparam("msilo", "check_time", 10)
-...
-
-3.22. send_time (int)
-
-   Timer interval in seconds to check if there are reminder messages. The
-   module takes all reminder messages that must be sent at that moment or
-   before that moment.
-
-   If the value is 0, the reminder feature is disabled.
-
-   Default value is “0”.
-
-   Example 1.22. Set the “send_time” parameter
-...
-modparam("msilo", "send_time", 60)
-...
-
-3.23. clean_period (int)
-
-   Number of “check_time” cycles when to check if there are expired
-   messages in database.
-
-   Default value is “10”.
-
-   Example 1.23. Set the “clean_period” parameter
-...
-modparam("msilo", "clean_period", 3)
-...
-
-3.24. use_contact (int)
-
-   Turns on/off the usage of the “Contact” address to send notification
-   back to sender whose message is stored by MSILO.
-
-   Default value is “1 (0 = off, 1 = on)”.
-
-   Example 1.24. Set the “use_contact” parameter
-...
-modparam("msilo", "use_contact", 0)
-...
-
-3.25. snd_time_avp (str)
-
-   The name of an AVP which may contain the time when to sent the received
-   message as reminder.The AVP is used ony by m_store().
-
-   If the parameter is not set, the module does not look for this AVP. If
-   the value is set to a valid AVP name, then the module expects in the
-   AVP to be a time value in format “YYYYMMDDHHMMSS” (e.g.,
-   20060101201500).
-
-   Default value is “null”.
-
-   Example 1.25. Set the “snd_time_avp” parameter
-...
-modparam("msilo", "snd_time_avp", "$avp(i:123)")
-...
-
-3.26. add_date (int)
-
-   Whether to add as prefix the date when the message was stored.
-
-   Default value is “1” (1==on/0==off).
-
-   Example 1.26. Set the “add_date” parameter
-...
-modparam("msilo", "add_date", 0)
-...
-
-3.27. max_messages (int)
-
-   Maximum number of stored message for an AoR. Value 0 equals to no
-   limit.
-
-   Default value is 0.
-
-   Example 1.27. Set the “max_messages” parameter
-...
-modparam("msilo", "max_messages", 0)
-...
-
-3.28. add_contact (int)
-
-   Whether to add contact header to generated messages. The contact
-   address is the From URI.
-
-   Default value is “0” (1==on; 0==off as per RFC3428).
-
-   Example 1.28. Set the “add_contact” parameter
-...
-modparam("msilo", "add_contact", 1)
-...
-
-3.29. extra_hdrs_avp (str)
-
-   Name of an AVP which may contain extra headers that are stored with the
-   message when m_store() is called. These extra headers (if any) are then
-   included in MESSAGE request generated by m_dump().
-
-   If the parameter is not set, m_store() does not look for extra headers
-   from any AVP.
-
-   Default value is “null”.
-
-   Example 1.29. Set the “extra_hdrs_avp” parameter
-...
-modparam("msilo", "extra_hdrs_avp", "$avp(msilo_extra_hdrs)")
-...
-
-3.30. skip_notification_flag (int)
-
-   Flag to mark the message for which no notification should be sent back
-   to sender when storing in msilo. Valid value is in between 0 and 31.
-
-   Default value is “-1” (feature disabled).
-
-   Example 1.30. Set the “skip_notification_flag” parameter
-...
-modparam("msilo", "skip_notification_flag", 18)
-...
-setflag(18);
-m_store(...);
-...
-
-4. Functions
-
-   4.1. m_store([owner])
-   4.2. m_dump([owner])
-
-4.1. m_store([owner])
-
-   The method stores certain parts of the current SIP request (it should
-   be called when the request type is MESSAGE and the destination user is
-   offline or his UA does not support MESSAGE requests). If the user is
-   registered with a UA which does not support MESSAGE requests you should
-   not use mode=“0” if you have changed the request uri with the contact
-   address of user's UA.
-
-   Meaning of the parameters is as follows:
-     * owner - is a string that must contain a SIP URI in whose inbox the
-       message will be stored. It can have any pseudo variable. If "owner"
-       is missing, the SIP address is taken from R-URI.
-
-   This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
-
-   Example 1.31. m_store usage
-...
-m_store();
-m_store("$tu");
-...
-
-4.2. m_dump([owner])
-
-   The method sends stored messages for the SIP user that has registered
-   to the contact address in the registration. The method should be called
-   when a REGISTER request is received and the “Expire” header has a value
-   greater than zero.
-
-   Meaning of the parameters is as follows:
-     * owner - is a string that must contain a SIP URI whose inbox will be
-       dumped. It can have any pseudo variable. If "owner" is missing, the
-       SIP address is taken from To URI.
-
-   This function can be used from REQUEST_ROUTE.
-
-   Example 1.32. m_dump usage
-...
-m_dump();
-m_dump("$fu");
-...
-
-5. Statistics
-
-   5.1. stored_messages
-   5.2. dumped_messages
-   5.3. failed_messages
-   5.4. dumped_reminders
-   5.5. failed_reminders
-
-5.1. stored_messages
-
-   The number of messages stored by msilo.
-
-5.2. dumped_messages
-
-   The number of dumped messages.
-
-5.3. failed_messages
-
-   The number of failed dumped messages.
-
-5.4. dumped_reminders
-
-   The number of dumped reminder messages.
-
-5.5. failed_reminders
-
-   The number of failed reminder messages.
-
-6. Installation and Running
-
-   6.1. Kamailio config file
-
-6.1. Kamailio config file
-
-   Next picture displays a sample usage of msilo.
-
-   Example 1.33. Kamailio config script - sample msilo usage
-...
-#
-# MSILO usage example
-#
-#
-
-
-debug=9           # debug level (cmd line: -dddddddddd)
-fork=no           # don't fork
-log_stderror=yes  # log to stderr (cmd line: -E)
-
-
-children=2        # number of children
-check_via=no      # (cmd. line: -v)
-dns=off           # (cmd. line: -r)
-rev_dns=off       # (cmd. line: -R)
-port=5060
-
-listen=10.0.0.2   # listen address
-
-# ------------------ module loading ----------------------------------
-mpath="/usr/local/lib/kamailio/modules/"
-
-loadmodule "textops.so"
-
-loadmodule "sl.so"
-loadmodule "mysql.so"
-loadmodule "maxfwd.so"
-loadmodule "msilo.so"
-loadmodule "tm.so"
-loadmodule "registrar.so"
-loadmodule "usrloc.so"
-
-# ----------------- setting module-specific parameters ---------------
-
-# -- registrar params --
-
-modparam("registrar", "default_expires", 120)
-
-# -- registrar params --
-
-modparam("usrloc", "db_mode", 0)
-
-# -- msilo params --
-
-modparam("msilo","db_url","mysql://kamailio:kamailiorw@localhost/kamailio")
-modparam("msilo","from_address","sip:registrar@kamailio.org")
-modparam("msilo","contact_hdr","Contact: registrar@192.168.1.2:5060;msilo=yes\r\
-n")
-modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n")
-modparam("msilo","offline_message","*** User $rU is offline!")
-
-
-route{
-    if ( !mf_process_maxfwd_header("10") )
-    {
-        sl_send_reply("483","To Many Hops");
-        exit;
-    };
-
-
-    if (uri==myself) {
-    {
-        # for testing purposes, simply okay all REGISTERs
-        if (method=="REGISTER")
-        {
-            save("location");
-            log("REGISTER received -> dumping messages with MSILO\n");
-
-            # MSILO - dumping user's offline messages
-            if (m_dump())
-            {
-                log("MSILO: offline messages dumped - if they were\n");
-            }else{
-                log("MSILO: no offline messages dumped\n");
-            };
-            exit;
-        };
-
-        # domestic SIP destinations are handled using our USRLOC DB
-
-        if(!lookup("location"))
-        {
-            if (! t_newtran())
-            {
-                sl_reply_error();
-                exit;
-            };
-            # we do not care about anything else but MESSAGEs
-            if (!method=="MESSAGE")
-            {
-                if (!t_reply("404", "Not found"))
-                {
-                    sl_reply_error();
-                };
-                exit;
-            };
-            log("MESSAGE received -> storing using MSILO\n");
-            # MSILO - storing as offline message
-            if (m_store("$ru"))
-            {
-                log("MSILO: offline message stored\n");
-                if (!t_reply("202", "Accepted"))
-                {
-                    sl_reply_error();
-                };
-            }else{
-                log("MSILO: offline message NOT stored\n");
-                if (!t_reply("503", "Service Unavailable"))
-                {
-                    sl_reply_error();
-                };
-            };
-            exit;
-        };
-        # if the downstream UA does not support MESSAGE requests
-        # go to failure_route[1]
-        t_on_failure("1");
-        t_relay();
-        exit;
-    };
-
-    # forward anything else
-    t_relay();
-}
-
-failure_route[1] {
-    # forwarding failed -- check if the request was a MESSAGE
-    if (!method=="MESSAGE")
-    {
-        exit;
-    };
-
-    log(1,"MSILO:the downstream UA doesn't support MESSAGEs\n");
-    # we have changed the R-URI with the contact address, ignore it now
-    if (m_store("$ou"))
-    {
-        log("MSILO: offline message stored\n");
-        t_reply("202", "Accepted");
-    }else{
-        log("MSILO: offline message NOT stored\n");
-        t_reply("503", "Service Unavailable");
-    };
-}
-
-
-
-...
diff --git a/src/modules/nsq/README b/src/modules/nsq/README
index 1359253143f..fc63d25b9e6 100644
--- a/src/modules/nsq/README
+++ b/src/modules/nsq/README
@@ -35,7 +35,7 @@ Emmanuel Schmidbauer
               4.4. nsqd_port(int)
               4.5. consumer_use_nsqd(int)
               4.6. consumer_event_key(str)
-              4.7. consumer_event_sub_key(str)
+              4.7. consumer_event_subkey(str)
               4.8. max_in_flight(int)
               4.9. consumer_workers(int)
               4.10. topic_channel(str)
@@ -51,7 +51,7 @@ Emmanuel Schmidbauer
    1.4. Set nsqd_port parameter
    1.5. Set consumer_use_nsqd parameter
    1.6. Set consumer_event_key parameter
-   1.7. Set consumer_event_sub_key parameter
+   1.7. Set consumer_event_subkey parameter
    1.8. Set max_in_flight parameter
    1.9. Set consumer_workers parameter
    1.10. Set topic_channel parameter
@@ -80,7 +80,7 @@ Chapter 1. Admin Guide
         4.4. nsqd_port(int)
         4.5. consumer_use_nsqd(int)
         4.6. consumer_event_key(str)
-        4.7. consumer_event_sub_key(str)
+        4.7. consumer_event_subkey(str)
         4.8. max_in_flight(int)
         4.9. consumer_workers(int)
         4.10. topic_channel(str)
@@ -152,7 +152,7 @@ Chapter 1. Admin Guide
    4.4. nsqd_port(int)
    4.5. consumer_use_nsqd(int)
    4.6. consumer_event_key(str)
-   4.7. consumer_event_sub_key(str)
+   4.7. consumer_event_subkey(str)
    4.8. max_in_flight(int)
    4.9. consumer_workers(int)
    4.10. topic_channel(str)
@@ -237,7 +237,7 @@ modparam("nsq", "consumer_use_nsqd", 1)
 modparam("nsq", "consumer_event_key", "My-JSON-Field-Name")
 ...
 
-4.7. consumer_event_sub_key(str)
+4.7. consumer_event_subkey(str)
 
    The default name of the field in json payload to compose the event name
    2nd part
@@ -246,9 +246,9 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name")
 
    Default value is “Event-Name”.
 
-   Example 1.7. Set consumer_event_sub_key parameter
+   Example 1.7. Set consumer_event_subkey parameter
 ...
-modparam("nsq", "consumer_event_sub_key", "My-JSON-SubField-Name")
+modparam("nsq", "consumer_event_subkey", "My-JSON-SubField-Name")
 ...
 
 4.8. max_in_flight(int)
@@ -320,7 +320,7 @@ modparam("nsq", "topic_channel", "My-NSQ-Topic-2:My-NSQ-Channel-2")
    Example 1.12. Define the event routes
 ...
 modparam("nsq", "consumer_event_key", "Event-Category")
-modparam("nsq", "consumer_event_sub_key", "Event-Name")
+modparam("nsq", "consumer_event_subkey", "Event-Name")
 ...
 
 event_route[nsq:consumer-event-presence-update]
@@ -348,7 +348,7 @@ nsqE{json.parse,From})");
 event_route[nsq:consumer-event-event-category-event-name]
 {
         # event-category is the name of the consumer_event_key parameter
-        # event-name is the name of the consumer_event_sub_key parameter
+        # event-name is the name of the consumer_event_subkey parameter
         # this event route is executed if we can't find the previous
         ...
 }
diff --git a/src/modules/presence_xml/README b/src/modules/presence_xml/README
index 20983953739..8b1218d9618 100644
--- a/src/modules/presence_xml/README
+++ b/src/modules/presence_xml/README
@@ -28,12 +28,13 @@ Anca-Maria Vamanu
               3.3. disable_presence(int)
               3.4. disable_winfo(int)
               3.5. disable_bla(int)
-              3.6. force_active (int)
-              3.7. integrated_xcap_server (int)
-              3.8. xcap_server (str)
-              3.9. passive_mode(int)
-              3.10. xcapauth_userdel_reason(str)
-              3.11. force_dummy_presence(int)
+              3.6. disable_xcapdiff(int)
+              3.7. force_active (int)
+              3.8. integrated_xcap_server (int)
+              3.9. xcap_server (str)
+              3.10. passive_mode(int)
+              3.11. xcapauth_userdel_reason(str)
+              3.12. force_dummy_presence(int)
 
         4. Functions
 
@@ -51,14 +52,15 @@ Anca-Maria Vamanu
    1.3. Set disable_presence parameter
    1.4. Set disable_winfo parameter
    1.5. Set disable_bla parameter
-   1.6. Set force_active parameter
-   1.7. Set integrated_xcap_server parameter
-   1.8. Set xcap_server parameter
-   1.9. Set passive_mode parameter
-   1.10. Set xcapauth_userdel_reason parameter
-   1.11. Set force_dummy_presence parameter
-   1.12. pres_check_basic usage
-   1.13. pres_check_activities usage
+   1.6. Set disable_xcapdiff parameter
+   1.7. Set force_active parameter
+   1.8. Set integrated_xcap_server parameter
+   1.9. Set xcap_server parameter
+   1.10. Set passive_mode parameter
+   1.11. Set xcapauth_userdel_reason parameter
+   1.12. Set force_dummy_presence parameter
+   1.13. pres_check_basic usage
+   1.14. pres_check_activities usage
 
 Chapter 1. Admin Guide
 
@@ -77,12 +79,13 @@ Chapter 1. Admin Guide
         3.3. disable_presence(int)
         3.4. disable_winfo(int)
         3.5. disable_bla(int)
-        3.6. force_active (int)
-        3.7. integrated_xcap_server (int)
-        3.8. xcap_server (str)
-        3.9. passive_mode(int)
-        3.10. xcapauth_userdel_reason(str)
-        3.11. force_dummy_presence(int)
+        3.6. disable_xcapdiff(int)
+        3.7. force_active (int)
+        3.8. integrated_xcap_server (int)
+        3.9. xcap_server (str)
+        3.10. passive_mode(int)
+        3.11. xcapauth_userdel_reason(str)
+        3.12. force_dummy_presence(int)
 
    4. Functions
 
@@ -135,12 +138,13 @@ Chapter 1. Admin Guide
    3.3. disable_presence(int)
    3.4. disable_winfo(int)
    3.5. disable_bla(int)
-   3.6. force_active (int)
-   3.7. integrated_xcap_server (int)
-   3.8. xcap_server (str)
-   3.9. passive_mode(int)
-   3.10. xcapauth_userdel_reason(str)
-   3.11. force_dummy_presence(int)
+   3.6. disable_xcapdiff(int)
+   3.7. force_active (int)
+   3.8. integrated_xcap_server (int)
+   3.9. xcap_server (str)
+   3.10. passive_mode(int)
+   3.11. xcapauth_userdel_reason(str)
+   3.12. force_dummy_presence(int)
 
 3.1. db_url(str)
 
@@ -198,7 +202,18 @@ modparam("presence_xml", "disable_winfo", 1)
 modparam("presence_xml", "disable_bla", 1)
 ...
 
-3.6. force_active (int)
+3.6. disable_xcapdiff(int)
+
+   Set this parameter to disable the handling of the "xcap-diff" event.
+
+   Default value: “0”.
+
+   Example 1.6. Set disable_xcapdiff parameter
+...
+modparam("presence_xml", "disable_xcapdiff", 1)
+...
+
+3.7. force_active (int)
 
    This parameter is used for permissions when handling Subscribe
    messages. If set to 1, subscription state is considered active and the
@@ -213,12 +228,12 @@ modparam("presence_xml", "disable_bla", 1)
 
    Default value is “0”.
 
-   Example 1.6. Set force_active parameter
+   Example 1.7. Set force_active parameter
 ...
 modparam("presence_xml", "force_active", 1)
 ...
 
-3.7. integrated_xcap_server (int)
+3.8. integrated_xcap_server (int)
 
    This parameter is a flag for the type of XCAP servers used. If the XCAP
    server is integrated with Kamailio presence_xml module and access the
@@ -235,25 +250,25 @@ modparam("presence_xml", "force_active", 1)
 
    Default value is “0”.
 
-   Example 1.7. Set integrated_xcap_server parameter
+   Example 1.8. Set integrated_xcap_server parameter
 ...
 modparam("presence_xml", "integrated_xcap_server", 1)
 ...
 
-3.8. xcap_server (str)
+3.9. xcap_server (str)
 
    The address of the xcap servers used for storage. This parameter is
    compulsory if the integrated_xcap_server parameter is not set. It can
    be set more that once, to construct an address list of trusted XCAP
    servers.
 
-   Example 1.8. Set xcap_server parameter
+   Example 1.9. Set xcap_server parameter
 ...
 modparam("presence_xml", "xcap_server", "xcap_server.example.org")
 modparam("presence_xml", "xcap_server", "xcap_server.ag.org")
 ...
 
-3.9. passive_mode(int)
+3.10. passive_mode(int)
 
    If set to 1, module acts in passive mode - no bind to presence module,
    no connection to database. Useful when needing only to use $xml(...)
@@ -261,12 +276,12 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org")
 
    Default value: “0” (0 - active mode, 1 - passive mode).
 
-   Example 1.9. Set passive_mode parameter
+   Example 1.10. Set passive_mode parameter
 ...
 modparam("presence_xml", "passive_mode", 1)
 ...
 
-3.10. xcapauth_userdel_reason(str)
+3.11. xcapauth_userdel_reason(str)
 
    This parameter represents the reason that will be included in the
    Subscription-State header of the Notify when a rule is no longer found
@@ -280,20 +295,20 @@ modparam("presence_xml", "passive_mode", 1)
    parameter to specify after at least how may seconds the client should
    reattempt to resubscribe, you can include this in the parameter also.
 
-   Example 1.10. Set xcapauth_userdel_reason parameter
+   Example 1.11. Set xcapauth_userdel_reason parameter
 ...
 modparam("presence_xml", "xcapauth_userdel_reason", "probation;retry-after=30")
 modparam("presence_xml", "xcapauth_userdel_reason", "rejected")
 ...
 
-3.11. force_dummy_presence(int)
+3.12. force_dummy_presence(int)
 
    Set this parameter to enable simple body notify with status 'open' when
    presentity info is not available.
 
    Default value: “0”.
 
-   Example 1.11. Set force_dummy_presence parameter
+   Example 1.12. Set force_dummy_presence parameter
 ...
 modparam("presence_xml", "force_dummy_presence", 1)
 ...
@@ -314,7 +329,7 @@ modparam("presence_xml", "force_dummy_presence", 1)
      * 1 - if a match is found.
      * -1 - if a match is not found.
 
-   Example 1.12. pres_check_basic usage
+   Example 1.13. pres_check_basic usage
 ...
     if (pres_check_basic("$ru", "open")) {
         ...
@@ -338,7 +353,7 @@ modparam("presence_xml", "force_dummy_presence", 1)
      * -1 - if a match is not found.
      * -2 - if /presence/person or /presence/person/activity do not exist.
 
-   Example 1.13. pres_check_activities usage
+   Example 1.14. pres_check_activities usage
 ...
     if (pres_check_basic("$ru", "open")) {
         pres_check_activities("$ru", "unknown");
diff --git a/src/modules/rls/README b/src/modules/rls/README
index 677046344c6..47c4af67c23 100644
--- a/src/modules/rls/README
+++ b/src/modules/rls/README
@@ -45,9 +45,10 @@ Anca-Maria Vamanu
               3.20. outbound_proxy (str)
               3.21. server_address (str)
               3.22. max_notify_body_length (int)
-              3.23. fetch_rows (integer)
-              3.24. disable_remote_presence (integer)
-              3.25. max_backend_subs (integer)
+              3.23. reload_db_subs (integer)
+              3.24. fetch_rows (integer)
+              3.25. disable_remote_presence (integer)
+              3.26. max_backend_subs (integer)
 
         4. Functions
 
@@ -87,12 +88,13 @@ Anca-Maria Vamanu
    1.20. Set outbound_proxy parameter
    1.21. Set server_address parameter
    1.22. Set max_notify_body_length parameter
-   1.23. Set fetch_rows parameter
-   1.24. Set disable_remote_presence parameter
-   1.25. Set max_backend_subs parameter
-   1.26. rls_handle_subscribe usage
-   1.27. rls_handle_notify usage
-   1.28. rls_update_subs usage
+   1.23. Set reload_db_subs parameter
+   1.24. Set fetch_rows parameter
+   1.25. Set disable_remote_presence parameter
+   1.26. Set max_backend_subs parameter
+   1.27. rls_handle_subscribe usage
+   1.28. rls_handle_notify usage
+   1.29. rls_update_subs usage
 
 Chapter 1. Admin Guide
 
@@ -128,9 +130,10 @@ Chapter 1. Admin Guide
         3.20. outbound_proxy (str)
         3.21. server_address (str)
         3.22. max_notify_body_length (int)
-        3.23. fetch_rows (integer)
-        3.24. disable_remote_presence (integer)
-        3.25. max_backend_subs (integer)
+        3.23. reload_db_subs (integer)
+        3.24. fetch_rows (integer)
+        3.25. disable_remote_presence (integer)
+        3.26. max_backend_subs (integer)
 
    4. Functions
 
@@ -215,9 +218,10 @@ Chapter 1. Admin Guide
    3.20. outbound_proxy (str)
    3.21. server_address (str)
    3.22. max_notify_body_length (int)
-   3.23. fetch_rows (integer)
-   3.24. disable_remote_presence (integer)
-   3.25. max_backend_subs (integer)
+   3.23. reload_db_subs (integer)
+   3.24. fetch_rows (integer)
+   3.25. disable_remote_presence (integer)
+   3.26. max_backend_subs (integer)
 
 3.1. db_url(str)
 
@@ -511,18 +515,30 @@ modparam("rls", "server_address", "sip:rls@ip.address.ofyour.proxy:5060")
 modparam("rls", "max_notify_body_length", 32000)
 ...
 
-3.23. fetch_rows (integer)
+3.23. reload_db_subs (integer)
+
+   Reload subscriptions on module initialization (requires db_mode 0
+   (memory only mode)).
+
+   Default value is 0 (do not load rows from db).
+
+   Example 1.23. Set reload_db_subs parameter
+...
+modparam("rls", "reload_db_subs", 1)
+...
+
+3.24. fetch_rows (integer)
 
    Number of rows to be loaded in one step from database.
 
    Default value is 500.
 
-   Example 1.23. Set fetch_rows parameter
+   Example 1.24. Set fetch_rows parameter
 ...
 modparam("rls", "fetch_rows", 1000)
 ...
 
-3.24. disable_remote_presence (integer)
+3.25. disable_remote_presence (integer)
 
    When set to a non-zero value RLS will not perform back-end SUBSCRIBEs
    to non-local presentities. When people have large contact lists RLS
@@ -535,12 +551,12 @@ modparam("rls", "fetch_rows", 1000)
 
    Default value is 0
 
-   Example 1.24. Set disable_remote_presence parameter
+   Example 1.25. Set disable_remote_presence parameter
 ...
 modparam("rls", "disable_remote_presence", 1)
 ...
 
-3.25. max_backend_subs (integer)
+3.26. max_backend_subs (integer)
 
    When set to a non-zero value RLS will limit the number of back-end
    SUBSCRIBEs for each RLS SUBSCRIBE to this value. Leaving this at the
@@ -551,7 +567,7 @@ modparam("rls", "disable_remote_presence", 1)
 
    Default value is 0
 
-   Example 1.25. Set max_backend_subs parameter
+   Example 1.26. Set max_backend_subs parameter
 ...
 modparam("rls", "max_backend_subs", 30)
 ...
@@ -576,7 +592,7 @@ modparam("rls", "max_backend_subs", 30)
 
    This function can be used from REQUEST_ROUTE.
 
-   Example 1.26. rls_handle_subscribe usage
+   Example 1.27. rls_handle_subscribe usage
 ...
 For presence and rls on the same machine:
         modparam("rls", "to_presence_code", 10)
@@ -606,7 +622,7 @@ For rls only:
 
    This function can be used from REQUEST_ROUTE.
 
-   Example 1.27. rls_handle_notify usage
+   Example 1.28. rls_handle_notify usage
 ...
 if(method=="NOTIFY")
     rls_handle_notify();
@@ -625,7 +641,7 @@ if(method=="NOTIFY")
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.28. rls_update_subs usage
+   Example 1.29. rls_update_subs usage
 ...
 Within event_route[xhttp:request]:
         case "PUT":
diff --git a/src/modules/sms/README b/src/modules/sms/README
index 552dbb5b9a5..bbba0f0c375 100644
--- a/src/modules/sms/README
+++ b/src/modules/sms/README
@@ -25,7 +25,7 @@ Bogdan Iancu
               3.3. links (string)
               3.4. default_net (string)
               3.5. max_sms_parts (integer)
-              3.6. domain_str (string)
+              3.6. domain (string)
               3.7. use_contact (integer)
               3.8. sms_report_type (integer)
 
@@ -41,7 +41,7 @@ Bogdan Iancu
    1.3. Set links parameter
    1.4. Set default_net parameter
    1.5. Set max_sms_parts parameter
-   1.6. Set domain_str parameter
+   1.6. Set domain parameter
    1.7. Set use_contact parameter
    1.8. Set sms_report_type parameter
    1.9. sms_send_msg_to_net usage
@@ -65,7 +65,7 @@ Chapter 1. Admin Guide
         3.3. links (string)
         3.4. default_net (string)
         3.5. max_sms_parts (integer)
-        3.6. domain_str (string)
+        3.6. domain (string)
         3.7. use_contact (integer)
         3.8. sms_report_type (integer)
 
@@ -142,7 +142,7 @@ Chapter 1. Admin Guide
    3.3. links (string)
    3.4. default_net (string)
    3.5. max_sms_parts (integer)
-   3.6. domain_str (string)
+   3.6. domain (string)
    3.7. use_contact (integer)
    3.8. sms_report_type (integer)
 
@@ -256,7 +256,7 @@ modparam("sms", "default_net", "D1")
 modparam("sms", "max_sms_parts", 10)
 ...
 
-3.6. domain_str (string)
+3.6. domain (string)
 
    Specify a fake domain name to be used by the gateway. The Contact
    headers and the From header from request will be construct based on
@@ -265,9 +265,9 @@ modparam("sms", "max_sms_parts", 10)
 
    Default is the name of the machine the gateway is running on.
 
-   Example 1.6. Set domain_str parameter
+   Example 1.6. Set domain parameter
 ...
-modparam("sms", "domain_str", "foo.bar")
+modparam("sms", "domain", "foo.bar")
 ...
 
 3.7. use_contact (integer)
diff --git a/src/modules/tmx/README b/src/modules/tmx/README
index 58237382cda..b247accdf92 100644
--- a/src/modules/tmx/README
+++ b/src/modules/tmx/README
@@ -16,8 +16,6 @@ Daniel-Constantin Mierla
 
    <miconda@gmail.com>
 
-Edited by
-
 Juha Heinanen
 
    <jh@tutpro.com>
@@ -37,7 +35,7 @@ Juha Heinanen
 
         3. Parameters
 
-              3.1. precheck_trans
+              3.1. precheck_trans (int)
 
         4. Functions
 
@@ -75,7 +73,7 @@ Juha Heinanen
 
    List of Examples
 
-   1.1. precheck_trans usage
+   1.1. precheck_trans (int)
    1.2. t_cancel_branches usage
    1.3. t_cancel_callid usage
    1.4. t_reply_callid usage
@@ -102,7 +100,7 @@ Chapter 1. Admin Guide
 
    3. Parameters
 
-        3.1. precheck_trans
+        3.1. precheck_trans (int)
 
    4. Functions
 
@@ -163,9 +161,9 @@ Chapter 1. Admin Guide
 
 3. Parameters
 
-   3.1. precheck_trans
+   3.1. precheck_trans (int)
 
-3.1.  precheck_trans
+3.1. precheck_trans (int)
 
    Enable/disable transaction pre-check via t_precheck_trans() function.
    If set to 0, the internal structures are not created at startup and the
@@ -173,7 +171,7 @@ Chapter 1. Admin Guide
 
    Default value is 1 (enabled).
 
-   Example 1.1. precheck_trans usage
+   Example 1.1. precheck_trans (int)
 ...
 modparam("tmx", "precheck_trans", 0)
 ...
diff --git a/src/modules/xcap_server/README b/src/modules/xcap_server/README
index 8cff81ec738..dc31507f283 100644
--- a/src/modules/xcap_server/README
+++ b/src/modules/xcap_server/README
@@ -31,7 +31,7 @@ Daniel-Constantin Mierla
               3.4. buf_size (int)
               3.5. xml_ns (str)
               3.6. directory_scheme (int)
-              3.7. directory_hostname (str)
+              3.7. directory_hostname (string)
 
         4. Functions
 
@@ -46,7 +46,7 @@ Daniel-Constantin Mierla
 
    1.1. Set the “db_url” parameter
    1.2. Set the “xcap_table” parameter
-   1.3. Set url_match parameter
+   1.3. Set xcap_root parameter
    1.4. Set the “buf_size” parameter
    1.5. Set xml_ns parameter
    1.6. Set directory_scheme parameter
@@ -75,7 +75,7 @@ Chapter 1. Admin Guide
         3.4. buf_size (int)
         3.5. xml_ns (str)
         3.6. directory_scheme (int)
-        3.7. directory_hostname (str)
+        3.7. directory_hostname (string)
 
    4. Functions
 
@@ -140,7 +140,7 @@ Chapter 1. Admin Guide
    3.4. buf_size (int)
    3.5. xml_ns (str)
    3.6. directory_scheme (int)
-   3.7. directory_hostname (str)
+   3.7. directory_hostname (string)
 
 3.1. db_url (string)
 
@@ -170,7 +170,7 @@ modparam("xcap_server", "xcap_table", "xcapdocs")
 
    Default value is '/xcap-root/'.
 
-   Example 1.3. Set url_match parameter
+   Example 1.3. Set xcap_root parameter
 ...
 modparam("xcap_server", "xcap_root", "/xcap-root/")
 ...
@@ -223,7 +223,7 @@ modparam("xcap_server", "xml_ns",
 modparam("xcap_server", "directory_scheme", 0)
 ...
 
-3.7. directory_hostname (str)
+3.7. directory_hostname (string)
 
    Allows the hostname (and port) used in
    org.openmobilealliance.xcap-directory listings to be set to a specific
diff --git a/src/modules/xmpp/README b/src/modules/xmpp/README
index dd762ec174c..f860e969a59 100644
--- a/src/modules/xmpp/README
+++ b/src/modules/xmpp/README
@@ -25,7 +25,7 @@ Andreea Spirea
 
         3. Parameters
 
-              3.1. backend(string)
+              3.1. backend (string)
               3.2. domain_separator (string)
               3.3. gateway_domain (string)
               3.4. xmpp_domain (string)
@@ -66,7 +66,7 @@ Chapter 1. Admin Guide
 
    3. Parameters
 
-        3.1. backend(string)
+        3.1. backend (string)
         3.2. domain_separator (string)
         3.3. gateway_domain (string)
         3.4. xmpp_domain (string)
@@ -185,7 +185,7 @@ Chapter 1. Admin Guide
 
 3. Parameters
 
-   3.1. backend(string)
+   3.1. backend (string)
    3.2. domain_separator (string)
    3.3. gateway_domain (string)
    3.4. xmpp_domain (string)
@@ -195,7 +195,7 @@ Chapter 1. Admin Guide
    3.8. outbound_proxy (string)
    3.9. gwmap (string)
 
-3.1. backend(string)
+3.1. backend (string)
 
    The mode you are using the module; it can be either "component" or
    "server".