Module: kamailio
Branch: 5.1
Commit: 26c623ee6ffe35098c5edc109a16711cc487204a
URL: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2018-03-14T11:25:27+01:00
core: small improvements to help text
(cherry picked from commit 31e21ff23a0d8bff1f7a88a56aa4ab01d93e2cf3)
---
Modified: src/main.c
---
Diff: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711…
Patch: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711…
---
diff --git a/src/main.c b/src/main.c
index 9366884ac7..144b8ffb92 100644
--- a/src/main.c
+++ b/src/main.c
@@ -197,11 +197,11 @@ Options:\n\
-M nr Size of private memory allocated, in Megabytes\n\
-w dir Change the working directory to \"dir\" (default: \"/\")\n\
-t dir Chroot to \"dir\"\n\
- -u uid Change uid \n\
- -g gid Change gid \n\
+ -u uid Change uid (user id)\n\
+ -g gid Change gid (group id)\n\
-P file Create a pid file\n\
-G file Create a pgid file\n\
- -Y dir Runtime dir\n\
+ -Y dir Runtime dir path\n\
-O nr Script optimization level (debugging option)\n\
-a mode Auto aliases mode: enable with yes or on,\n\
disable with no or off\n\
@@ -211,7 +211,7 @@ Options:\n\
-X name Specify internal manager for private memory (pkg)\n\
- if omitted, the one for shm is used\n"
#ifdef STATS
-" -s file File to which statistics is dumped (disabled otherwise)\n"
+" -s file File where to write internal statistics on SIGUSR1\n"
#endif
;
Module: kamailio
Branch: 5.1
Commit: 01338702bac81a9b53d72c4415f37aa4483ce865
URL: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa…
Author: Olle E. Johansson <oej(a)edvina.net>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2018-03-14T11:23:38+01:00
app_jsdt Minor update to documentation
(cherry picked from commit 7b0ad6b1a11687d035d4be92202ae1379f07fb20)
---
Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa…
Patch: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa…
---
diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml
index 47f50bda92..d4fd89d377 100644
--- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml
+++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml
@@ -17,15 +17,16 @@
<section>
<title>Overview</title>
<para>
- This module allows executing JavaScript scripts from config file.
+ This module allows executing JavaScript scripts from the Kamailio
+ configuration file.
It exports all KEMI functions to JavaScript in order to access the
- current processed SIP message. These functions are within JavaScript
- object 'KSR'.
+ currently processed SIP message. These functions are named within
+ the JavaScript object 'KSR'.
</para>
<para>
- It includes the Duktape JavaScript engine (http://www.duktape.org),
- which is a fast and easy to embed JavaScript interpreter. Exported API
- from SIP router to JavaScript is documented in the dokuwiki.
+ The module is based on the Duktape JavaScript engine (http://www.duktape.org),
+ which is a fast and easy to embed JavaScript interpreter. The exported API
+ from Kamailio to JavaScript is documented in the wiki.
</para>
<para>
The module has two JavaScript contexts:
@@ -116,7 +117,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js")
<function moreinfo="none">jsdt_dofile(path)</function>
</title>
<para>
- Execute the JS script stored in 'path'. The parameter can be
+ Execute the JavaScript script stored in 'path'. The parameter can be
a string with pseudo-variables evaluated at runtime.
</para>
<example>
@@ -134,7 +135,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js");
<function moreinfo="none">jsdt_dostring(script)</function>
</title>
<para>
- Execute the Lua script stored in parameter. The parameter can be
+ Execute the JavaScript script stored in parameter. The parameter can be
a string with pseudo-variables.
</para>
<example>
@@ -248,7 +249,7 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")'))
<section>
<title>Example of usage</title>
<para>
- Create your JS script and stored on file system,
+ Create your JS script and store it on the file system,
say: '/usr/local/etc/kamailio/js/myscript.js'.
</para>
<programlisting format="linespecific">