diff --git a/doc/doxygen/ser.doxygen b/doc/doxygen/ser.doxygen index 9072e100be2..218434d2694 100644 --- a/doc/doxygen/ser.doxygen +++ b/doc/doxygen/ser.doxygen @@ -1157,7 +1157,7 @@ PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# generate an inheritance diagram (in HTML, RTF and LaTeX) for classes with base # or super classes. Setting the tag to NO turns the diagrams off. Note that # this option is superseded by the HAVE_DOT option below. This is only a # fallback. It is recommended to install and use dot, since it yields more diff --git a/doc/man/kamailio.8 b/doc/man/kamailio.8 index a97b43f3c12..f4fc69ade7e 100644 --- a/doc/man/kamailio.8 +++ b/doc/man/kamailio.8 @@ -166,11 +166,6 @@ Specifies the number of children processes forked to handle tcp incoming connect .BI \-n ). .TP -.BI \-P " pid\-file" -Creates a file containing the pid of the main -.B kamailio -process. -.TP .BI \-O " optimization\-level" Script optimization level (debugging option). .TP @@ -231,8 +226,8 @@ Specify internal manager for shared memory (shm) can be: fm, qm or tlsf .BI \-X " name" Specify internal manager for private memory (pkg) if omitted, the one for shm is used .TP - .BI \-Y " dir" - Runtime dir path +.BI \-Y " dir" +Runtime dir path .TP .BI \-w " working\-dir" Specifies the working directory. In the very improbable event that diff --git a/doc/misc/HISTORY b/doc/misc/HISTORY index 62ee14674f9..464aceba780 100644 --- a/doc/misc/HISTORY +++ b/doc/misc/HISTORY @@ -23,7 +23,7 @@ A short time after this Jiri began testing the code and requesting new features. In Octomber 2001 I made some changes to ser routing language bringing it to what we still use today. In the next months I've created the module interface, the first two modules (print and textops) and I've added the shared memory support (this involved the creation of ser's own malloc library which proved to be much faster for ser's memory usage patterns than standards malloc implementations). During the same period Bogdan and Jan joined me and Jiri also began writing code. -In December 2001 Bogdan announced that tm was up an running (after a sleepless night). +In December 2001 Bogdan announced that tm was up and running (after a sleepless night). At the beginning of 2002 we were joined by Daniel. Jan introduced the mysql, usrloc and auth modules. Ser first public appearance was at the April 2002 Sipit. We ran it on a pda an still managed to be faster than the testing tools that were used against us :-) diff --git a/doc/misc/NEWS b/doc/misc/NEWS index 09b63a72b43..ff1cc47f494 100644 --- a/doc/misc/NEWS +++ b/doc/misc/NEWS @@ -924,7 +924,7 @@ core: Only a limited number of commands are allowed (drop, if + all the checks, msg flag manipulations, send(), log(), textops::search()). In this route the final destination - of the message is available an can be checked (with + of the message is available and can be checked (with snd_ip, snd_port, to_ip, to_port, snd_proto, snd_af). This route is executed only when forwarding requests. It's not executed for replies, retransmissions, or diff --git a/doc/tutorials/rpc_list/docbook/rpc_usrloc.xml b/doc/tutorials/rpc_list/docbook/rpc_usrloc.xml index 23510f5664c..63a19f70782 100644 --- a/doc/tutorials/rpc_list/docbook/rpc_usrloc.xml +++ b/doc/tutorials/rpc_list/docbook/rpc_usrloc.xml @@ -26,7 +26,7 @@ RPC Exports for usrloc
ul.rm - Delete a address of record including its contacts + Delete an address of record including its contacts diff --git a/doc/tutorials/serdev/msg_parser.xml b/doc/tutorials/serdev/msg_parser.xml index 9dc29f68b80..259e517c8c5 100644 --- a/doc/tutorials/serdev/msg_parser.xml +++ b/doc/tutorials/serdev/msg_parser.xml @@ -40,7 +40,7 @@ A SIP message consists of message header and optional message body. The header is separated from the body with - a empty line (containing CRLF only). + an empty line (containing CRLF only). Message header consists of the first line and one or more header diff --git a/doc/tutorials/serdev/sip_msg.xml b/doc/tutorials/serdev/sip_msg.xml index 9cc16c6f0a8..a7a32a4b553 100644 --- a/doc/tutorials/serdev/sip_msg.xml +++ b/doc/tutorials/serdev/sip_msg.xml @@ -339,7 +339,7 @@ struct sip_msg { REQUEST before it will be forwarded. The list will be processed when the request is being converted to character array (i.e. immediately before - the request will be send out). + the request will be sent out). @@ -349,7 +349,7 @@ struct sip_msg { REPLY before it will be forwarded. the list will be processed when the reply is being converted to character array (i.e. immediately before the request will - be send out). + be sent out). diff --git a/doc/tutorials/timers.txt b/doc/tutorials/timers.txt index c50c7368324..ed949ca668f 100644 --- a/doc/tutorials/timers.txt +++ b/doc/tutorials/timers.txt @@ -100,7 +100,7 @@ A "fast" timer is a timer that does very little work in its timer handler (it al 4.2 timer handlers ------------------ -The timer handler can be periodic, one shot or it can change from call to call. It all depends on what value you return from it. If you always return (ticks_t)(-1) or timer_ln->initial_timeout you have a periodic timer. If you return 0 you have an one shot timer (the timer will be removed when your timer handler function exits). For any other value v, your timer will be automatically re-added with the next expire set to v (expressed in ticks). +The timer handler can be periodic, one shot or it can change from call to call. It all depends on what value you return from it. If you always return (ticks_t)(-1) or timer_ln->initial_timeout you have a periodic timer. If you return 0 you have a one shot timer (the timer will be removed when your timer handler function exits). For any other value v, your timer will be automatically re-added with the next expire set to v (expressed in ticks). 4.3 timer_add ------------- @@ -118,7 +118,7 @@ To remove a timer from the active timer list call timer_del(struct timer_ln*). timer_del is the slowest of all the timer functions. If you are trying to delete a timer whose timer is executing. timer_del will wait until it finishes. timer_del returns 0 on success and a negative number on error (for now -1 if an attempt to delete and already removed or expired timer is made and -2 if timer_del is called from the timer handle it is supposed to delete). WARNING: - avoid deleting your own timer from its timer handle (if you try it, you'll get a BUG message in the log). If you _must_ have this, you have a broken design. If you still want it, look at timer_allow_del(). - - if you have an one shot timer that frees its memory before exiting, make sure you don't call timer_del afterwards (e.g. use some reference counters and free the memory only if the counter is 0). + - if you have a one shot timer that frees its memory before exiting, make sure you don't call timer_del afterwards (e.g. use some reference counters and free the memory only if the counter is 0). Race example (using the struct foo defined above):