diff --git a/INSTALL b/INSTALL index 5aeccba6d3b..6fd7dbfda13 100644 --- a/INSTALL +++ b/INSTALL @@ -155,7 +155,7 @@ OS Notes: Solaris 10 ---------- - As above; you can use Solaris's yacc instead of bison. You might also + As above; you can use Solaris' yacc instead of bison. You might also need gtar and ginstall. If you don't have ginstall you can use Solaris install, just make sure it's in the PATH (it's usually in /usr/sbin) and add INSTALL=install either to the environment or to the make command line diff --git a/doc/docbook/catalog.xml b/doc/docbook/catalog.xml index 50f4fff696f..fb18a5668e3 100644 --- a/doc/docbook/catalog.xml +++ b/doc/docbook/catalog.xml @@ -20,7 +20,7 @@ + documents being processed (they usually contain HTTP URIs). --> diff --git a/doc/docbook/dep.xsl b/doc/docbook/dep.xsl index f65480ddc2f..af4b5ab03b7 100644 --- a/doc/docbook/dep.xsl +++ b/doc/docbook/dep.xsl @@ -66,7 +66,7 @@ in this step. --> - + diff --git a/doc/docbook/entities.xml b/doc/docbook/entities.xml index c91f4dd56b3..5734b4c317d 100644 --- a/doc/docbook/entities.xml +++ b/doc/docbook/entities.xml @@ -19,9 +19,9 @@ - - - + + + &kamailiohome;"> @@ -54,8 +54,8 @@ - - + + &serhome;"> &serbugs;"> diff --git a/doc/docbook/html.chunked.xsl b/doc/docbook/html.chunked.xsl index c80e73433e5..4f291e5d850 100644 --- a/doc/docbook/html.chunked.xsl +++ b/doc/docbook/html.chunked.xsl @@ -5,7 +5,7 @@ - + diff --git a/doc/doxygen/main.dox b/doc/doxygen/main.dox index 5bf7286c952..c509f724e4c 100644 --- a/doc/doxygen/main.dox +++ b/doc/doxygen/main.dox @@ -16,7 +16,7 @@ * The documentation can be generated using doxygen by running "make doxygen" * * \section Other information - * If you want other informaiton about Kamailio, please visit http://www.kamailio.org + * If you want other information about Kamailio, please visit https://www.kamailio.org * * \section License Kamailio license * Kamailio is free software; you can redistribute it and/or modify diff --git a/doc/man/kamailio.cfg.5 b/doc/man/kamailio.cfg.5 index 25e0bf305f2..6a25829fd7f 100644 --- a/doc/man/kamailio.cfg.5 +++ b/doc/man/kamailio.cfg.5 @@ -36,7 +36,7 @@ see .PP Full documentation on kamailio, including configuration guidelines, FAQs and licensing conditions, is available at -.I http://kamailio.org. +.I https://kamailio.org. .PP For reporting bugs see .I diff --git a/doc/misc/HISTORY b/doc/misc/HISTORY index 464aceba780..398d438aacf 100644 --- a/doc/misc/HISTORY +++ b/doc/misc/HISTORY @@ -6,7 +6,7 @@ This is a short ser history based mainly on my memory and my old mail archive. I've tried to mention only the important events. I'm sure I have missed a lot of things and/or people. If this is your case, please don't feel offended, send me an email and I will straighten things up. -Three years ago on 4 September 2001 I committed the first working ser version on a private cvs. In fact I started writting ser 2 days before, on 2nd September. +Three years ago on 4 September 2001 I committed the first working ser version on a private cvs. In fact I started writing ser 2 days before, on 2nd September. I was supposed to write some kind of sip glue for a Cisco PSTN gateway in 1 week, but of course I did it in the last 2 days :-) At that time the config looked like: @@ -20,7 +20,7 @@ At that time the config looked like: A short time after this Jiri began testing the code and requesting new features.2 weeks later I completely changed the config format bringing it pretty close to what we have today. At the time Jiri stronlgy disagreed with the ideea arguing that the new config would increase code complexity too much and would severely impact performance. The final argument was: I already wrote the code and it works :-) -In Octomber 2001 I made some changes to ser routing language bringing it to what we still use today. +In October 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 and running (after a sleepless night). @@ -28,12 +28,12 @@ At the beginning of 2002 we were joined by Daniel. Jan introduced the mysql, usr 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 :-) In May 2002 ser got ipv6 support. -In August 2002 Nils commited sipsak to berlios (very useful testing tool). +In August 2002 Nils committed sipsak to berlios (very useful testing tool). In September 2002 ser went public: it was GPL'ed and the cvs tree was moved to berlios. During the same month Jiri introduced the FIFO interface, Karel committed serweb and we had the first GPL'ed release: ser 0.8.8. In December 2002 ser got its first big external contribution: the enum module, written by Juha Heinanen. -In January 2003 Raphael commited sems on berlios. +In January 2003 Raphael committed sems on berlios. In February 2003 ser got tcp support. Sometime during the 2003 spring ser got the permissions module from Miklos Tirpak and nathelper from Maxim Sobolev. -In August 2003, Uli commited isdngw to sems. +In August 2003, Uli committed isdngw to sems. All the rest is too new to be in the history :-) diff --git a/doc/misc/NEWS b/doc/misc/NEWS index 755d4c861db..9627916dd6d 100644 --- a/doc/misc/NEWS +++ b/doc/misc/NEWS @@ -69,7 +69,7 @@ new config variables: udp4_raw can be used on Linux and FreeBSD. For other BSDs and Darwin one must compile with -DUSE_RAW_SOCKS. On Linux one should also set udp4_raw_mtu if the MTU on any network - interface that could be used for sending is smaller then 1500. + interface that could be used for sending is smaller than 1500. Can be set at runtime as long as sr was started with enough privileges (core.udp4_raw). - udp4_raw_mtu - MTU value used for UDP IPv4 packets when udp4_raw is @@ -215,7 +215,7 @@ core: defined expr - returns true if expr is defined, and false if not. Note: only a standalone avp or pvar can be undefined, everything else is defined. - strlen(expr) - returns the lenght of expr evaluated as string. + strlen(expr) - returns the length of expr evaluated as string. strempty(expr) - returns true if expr evaluates to the empty string (equivalent to expr==""). e.g.: if (defined $v && !strempty($v)) $len=strlen($v); @@ -374,7 +374,7 @@ modules: - t_relay_to renamed to t_relay_to_avp (undocumented function) - t_relay() can now also take host and port parameters (e.g. t_relay(host, port)), behaving like a statefull - forwad(host, port) version (forward to host:port using the same + forward(host, port) version (forward to host:port using the same protocol on which the message was received) - t_relay_to_udp(), t_relay_to_tcp() and t_relay_to_tls() work now even with no parameters: in this case the message is @@ -400,7 +400,7 @@ modules: reply arrives on such a branch - noisy_ctimer is now 1 (on) by default - added maximum transaction lifetime - a transaction is not - allowed to be active longer then this interval. See + allowed to be active longer than this interval. See t_set_max_lifetime(), max_inv_lifetime and max_noninv_lifetime. - support for changing the retransmission intervals on the fly, on a per transaction basis (it is enabled if tm is compiled @@ -497,7 +497,7 @@ core: (can be changed at runtime, e.g. sercmd cfg.set_now_int tcp connection_lifetime 180 ) - fallback to tcp or other congestion controlled transport - protocol if a forwarded udp sip request is greater then + protocol if a forwarded udp sip request is greater than udp_mtu (config). Default off. See udp_mtu and udp_mtu_try_proto. - sctp support (one-to-many, work in progress, for now linux @@ -528,7 +528,7 @@ new config variables: maximum datagram size that can be received over tcp. Default: 4096, can be changed at runtime. tcp_wq_blk_size = block size used for tcp async writes. It should be big - enough to hold a few datagrams. If it's smaller then a + enough to hold a few datagrams. If it's smaller than a datagram (in fact a tcp write()) size, it will be rounded up. It has no influenced on the number of datagrams queued (for that see tcp_conn_wq_max or tcp_wq_max). @@ -539,7 +539,7 @@ new config variables: Default: no, can be changed at runtime. udp_mtu = number - fallback to another protocol (udp_mtu_try_proto must be set also either globally or per packet) if the constructed - request size is greater then udp_mtu. + request size is greater than udp_mtu. Recommended size: 1300. Default: 0 (off). udp_mtu_try_proto = TCP|TLS|SCTP|UDP - if udp_mtu !=0 and udp forwarded request size (after adding all the "local" headers) > @@ -618,17 +618,17 @@ new config variables: associations. sctp_srto_max = milliseconds - maximum value of the retransmission timeout (RTO) (default: OS specific). - WARNING: values lower then the sctp sack_delay will cause lots of + WARNING: values lower than the sctp sack_delay will cause lots of retransmissions and connection instability (see sctp_srto_min for more details). Can be changed at runtime (sctp srto_max) but it will affect only new associations. sctp_srto_min = milliseconds - minimum value of the retransmission timeout (RTO) (default: OS specific). - WARNING: values lower then the sctp sack_delay of any peer might cause + WARNING: values lower than the sctp sack_delay of any peer might cause retransmissions and possible interoperability problems. According to the standard the sack_delay should be between 200 and 500 ms, so avoid trying - values lower then 500 ms unless you control all the possible sctp peers + values lower than 500 ms unless you control all the possible sctp peers and you do make sure their sack_delay is higher or their sack_freq is 1. Can be changed at runtime (sctp srto_min) but it will affect only new associations. @@ -653,8 +653,8 @@ new config variables: associations. sctp_sack_delay = milliseconds - delay until an ACK is generated after receiving a packet. Default: OS specific. - WARNING: a value higher then srto_min can cause a lot of retransmissions - (and strange problems). A value higher then srto_max will result in very + WARNING: a value higher than srto_min can cause a lot of retransmissions + (and strange problems). A value higher than srto_max will result in very high connections instability. According to the standard the sack_delay value should be between 200 and 500 ms. Can be changed at runtime (sctp sack_delay) but it will affect only new @@ -891,7 +891,7 @@ core: - default log level switched to 0 (only messages < L_WARN will be printed by default) - separate memdbg log level which controls the memory/malloc related - debug messages (to see them ser must be compiled with malloc debuging: + debug messages (to see them ser must be compiled with malloc debugging: -DDBG_QM_MALLOC or -DDBG_FM_MALLOC and memdbg must be <= debug ) - added named routes: names can be used instead of numbers in all the route commads or route declarations. route(number) is equivalent to @@ -915,7 +915,7 @@ core: a route reaches its end without executing a return statement, it returns 1. If return is used in the top level route is equivalent with exit [val]. - drop /exit [n] now will end the script execution - exit n will exit with code n (usefull in onreply/onsend routes where + exit n will exit with code n (useful in onreply/onsend routes where if script code !=0 a reply is generated/the message is sent or to force script errors) - added $? which can be used to check the return code of the last executed @@ -956,14 +956,14 @@ core: (see below dns_* and man resolv.conf(6)). The maximum time a dns request can take (before failing) is: (dns_retr_time*dns_retr_no)*(search_list_domains) - If dns_try_ipv6 is yes, mutliply it again by 2. + If dns_try_ipv6 is yes, multiply it again by 2. The fastest possible dns config (max 1s): dns_try_ipv6=no dns_retr_time=1 dns_retr_no=1 dns_use_search_list=no - default on reply route added: onreply_route {.. } will add a default - onreply route that will be executed for any reply (usefull to catch + onreply route that will be executed for any reply (useful to catch replies without using tm) - branch_routes added (tm triggered), only a very limited number of commands are available (see tm docs) @@ -1013,7 +1013,7 @@ new config variables: fact search "" (so even if the search list is empty/missing there will still be 2 dns queries, eg. foo+'.' and foo+""+'.') tcp_connection_lifetime = value (s) - how long the lifetime of a - tcp connection will be exteneded after an IO event (accept, connect, + tcp connection will be extended after an IO event (accept, connect, read, write). Default: 120 s. tcp_poll_method = poll|select|sigio_rt|epoll_et|epoll-lt|kqueue|devpoll - poll method used (by default the best one for the current OS is selected) @@ -1040,7 +1040,7 @@ WARNING: - older 0.10.99-dev version (< 0.10.99-dev46) returned a 480 reply general: - gcc 4.0 support - - mutlicast options are set for all the sockets + - multicast options are set for all the sockets - mediaproxy: memory leak, unchecked memory allocations - postgress: some bugs and cleanups (compiles cleanly now) - tm: shm cloned lumps (SER-55) @@ -1084,7 +1084,7 @@ modules: - TM has a new parameter: restart_fr_on_each_reply. If set (default) fr_inv timer will be restarted for each provisional reply, if not set it will be restarted only for the first reply and for replies >=180 - (but only if increasing, eg.: 180, 181 ...). Usefull when dealing with bad + (but only if increasing, eg.: 180, 181 ...). Useful when dealing with bad UAs that re-transmit 180s. - TM saves the avp list into transactions, and make it available into callbacks, failure and reply routes. @@ -1096,7 +1096,7 @@ modules: email value from DB (as VM), TM looks for the "email" attribute to get the value. vm() function was replaced with t_write_req() - vm_reply() fifo functions was replcated by TM with t_reply() fifo function + vm_reply() fifo functions was replaced by TM with t_reply() fifo function NOTE!! because current version of SEMS/AA try to send reply via vm_reply, it will not work with the TM version. - xlog - printing the body of any header by specifying the name; new @@ -1106,7 +1106,7 @@ modules: new modules: - avp / avp_db / avp_radius - load and check avps per caller or callee - avpops - flexible module for operations with avps and database, introducing - a pseudo-varible support in SER configuration file + a pseudo-variable support in SER configuration file - cpl-c - implementation of Call Processing Language - dispatcher - implements a dispatcher for incoming requests using hashes over parts of the request to select the destination @@ -1143,7 +1143,7 @@ core: - avp (Attribute-Value Pair) support added - avp alias support added - multicast support added (see mcast_loopback & mcast_ttl) - - saving of procces group id enabled, if the -G option is specified + - saving of process group id enabled, if the -G option is specified (a safe way to quickly kill all ser processes) - core dump-ing is enabled by default, see also disable_core_dump - protocol and port can be specified in the alias and listen lines, e.g.: @@ -1196,7 +1196,7 @@ core: log_facility = LOG_LOCAL0 if ser logs to syslog, you can control the facility for logging. Very useful when you want to divert all ser logs to a different log file. - See man page syslog(3) for more detailes. + See man page syslog(3) for more details. unix_sock = "/tmp/ser.sock" The name of the socket the unixsock server should listen on. unix_sock_children = 1 @@ -1212,7 +1212,7 @@ core: force_tcp_alias() force_tcp_alias(port) adds a tcp port alias for the current connection (if tcp). - Usefull if you want to send all the trafic to port_alias through + Useful if you want to send all the traffic to port_alias through the same connection this request came from [it could help for firewall or nat traversal]. With no parameters adds the port from the message via as the alias. @@ -1288,7 +1288,7 @@ auth_db: Bug fixes ========= - memory leak in digest credentials parser fixed -- authenticathion ha1 didn't include domain if username was of the form +- authentication ha1 didn't include domain if username was of the form user@domain and calculate_ha1 was set to yes (modules/auth_db) - tm reply processing race condition (modules/tm), special thanks go to Dong Liu @@ -1355,7 +1355,7 @@ Changes to use of ser scripts About Multiple Transport Support -------------------------------- -SER now suports multiple transport protocols: UDP and TCP. As there +SER now supports multiple transport protocols: UDP and TCP. As there may be UAs which support only either protocol and cannot speak to each other directly, we recommend to alway record-route SIP requests, to keep the transport-translating SER in path. Also, if a destination @@ -1390,7 +1390,7 @@ auth module: authentication - auth_radius contains functions needed for radius authentication - group module contains group membership checking functions -- group_radius contains radius group membeship checking functions +- group_radius contains radius group membership checking functions - is_in_group has been renamed to is_user_in and places to groups module - check_to and check_from have been moved to the uri module @@ -1404,7 +1404,7 @@ exec module: ------------ - exec_uri and exec_user have been obsoleted by exec_dset; exec_dset is identical to exec_uri in capabilities; it - additionaly passes content of request elements (header + additionally passes content of request elements (header fields and URI parts) in environment variables; users of exec_user can use exec_dset now and use the "URI_USER" variable to learn user part of URI @@ -1444,7 +1444,7 @@ rr module: - a new option, "enable_full_lr" can be set to make life with misimplemented UAs easier and put LR in from "lr=on" - rr module can insert two Record-Route header fields when - necesarry (disconnected networks, UDP->TCP and so on) + necessary (disconnected networks, UDP->TCP and so on) tm module: ---------- diff --git a/doc/misc/TODO b/doc/misc/TODO index 9f5c6beb7f9..ba6ab686857 100644 --- a/doc/misc/TODO +++ b/doc/misc/TODO @@ -21,7 +21,7 @@ x [mem] investigate: keep an used/unused flag per fragment, on free check if neighboring frags were not used and if so defragment - [timer] multiple timers? at least ticks should no be affected by the amount of work done in the timer handlers -- [tcp] ser intiated tcp connections use INADDR_ANY (they should be bound first +- [tcp] ser initiated tcp connections use INADDR_ANY (they should be bound first to some ip/port ?function of the dest?) - [tcp] need to confirm fd receipt after send_fd, before closing it (this might happen in tcp_send new conn.) (see FreeBSD send BUGS for more info) @@ -65,7 +65,7 @@ x extend listen and alias to include port numbers and protocol: tcp foo.bar:5063, udp foo.bar:5062, foo2.bar x added set_advertised_{address,port} -- was: add force_via, force_srcip a.s.o (the advertised addresses should be overwritable from the script). -x ? add force_outbound_socket(ip)? (choose an apropriate socket from the +x ? add force_outbound_socket(ip)? (choose an appropriate socket from the listen list for sending the msg; works on udp only) release: @@ -102,7 +102,7 @@ not so critical: x replace remaining mallocs/frees at least in msg_translator.c - add $(INCLUDES) to the Makefiles x make ser suncc ready -- fix parse_cseq!!! (it doesnt parse 1234\n INVITE a.s.o) +- fix parse_cseq!!! (it doesn't parse 1234\n INVITE a.s.o) x fix 0 parameter module f. call x better Via parsing (handle ' ' in uri, eg: foo.bar : 1234 ; received=) and ipv6 addresses ([fec0:aa::01]). @@ -148,7 +148,7 @@ x command line switch for checking the config file syntax - config file version (a la sendmail) 0 loop detection - cfg. file reload -- flags for using names or ip adresses in Via ? +- flags for using names or ip addresses in Via ? - escape char injection/printing fix (verify all log/printed messages for terminal escapes and remove them) @@ -202,7 +202,7 @@ tm optimizations: - inline/macro/drop for: get_tm_table, set_kr, lock_hash, unlock_hash, set_t, get_t - replace snprintfs int build_uac_request, *_dlg -- fix the huge param no. in this functions (use structs if neccessary): +- fix the huge param no. in this functions (use structs if necessary): build_uac_request, build_uac_request_dlg, t_uac, t_uac_dlg - uri2proxy - t_uac_dlg => extra malloc/free (no üroxy needed here) diff --git a/doc/misc/cvs-commit-rules.txt b/doc/misc/cvs-commit-rules.txt index b5153e40c9d..b13738550b9 100644 --- a/doc/misc/cvs-commit-rules.txt +++ b/doc/misc/cvs-commit-rules.txt @@ -3,8 +3,8 @@ Kamailio git commit rules 1. Changing other people's code: -------------------------------- - - send a patch to the code/module mantainer and/or sr-dev - (don't commit changes to code you don't own if you don't have the mantainer's approval) + - send a patch to the code/module maintainer and/or sr-dev + (don't commit changes to code you don't own if you don't have the maintainer's approval) Exceptions: a. compilation (this includes warning) fixes b. bug fixes @@ -25,4 +25,4 @@ Exceptions: linux, freebsd, netbsd, openbsd, solaris >= 8; x86, ultrasparc, strongarm; gcc 4.x, icc, sun cc >=5.3). It should also compile on gcc 2.95 and 3.x. - the code must be tested or the change trivial enough - - the code should compile without warnings on all the arhitectures (with some exceptions) + - the code should compile without warnings on all the architectures (with some exceptions) diff --git a/doc/stylesheets/dbschema_k/catalog.xml b/doc/stylesheets/dbschema_k/catalog.xml index 636d69d2f87..f95a2ea0f8d 100644 --- a/doc/stylesheets/dbschema_k/catalog.xml +++ b/doc/stylesheets/dbschema_k/catalog.xml @@ -64,7 +64,7 @@ diff --git a/doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl b/doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl index b7a1a7f4672..ce140021fe6 100644 --- a/doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl +++ b/doc/stylesheets/dbschema_k/xsl/db_berkeley.xsl @@ -114,8 +114,8 @@ + But it is not possible (at least with XSL 1.0, AFAIK) to append data to a + file. So it's much easier to do this in the Makefile --> diff --git a/doc/stylesheets/dbschema_k/xsl/db_redis.xsl b/doc/stylesheets/dbschema_k/xsl/db_redis.xsl index 0c202b0dc32..1fe347a0a90 100644 --- a/doc/stylesheets/dbschema_k/xsl/db_redis.xsl +++ b/doc/stylesheets/dbschema_k/xsl/db_redis.xsl @@ -46,8 +46,8 @@ + But it is not possible (at least with XSL 1.0, AFAIK) to append data to a + file. So it's much easier to do this in the Makefile --> diff --git a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl index 29c4b4da7de..66d17e95741 100644 --- a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl +++ b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl @@ -46,8 +46,8 @@ + But it is not possible (at least with XSL 1.0, AFAIK) to append data to a + file. So it's much easier to do this in the Makefile --> diff --git a/doc/stylesheets/dbschema_k/xsl/mysql.xsl b/doc/stylesheets/dbschema_k/xsl/mysql.xsl index 0694ef375c4..2fb4a1cf947 100644 --- a/doc/stylesheets/dbschema_k/xsl/mysql.xsl +++ b/doc/stylesheets/dbschema_k/xsl/mysql.xsl @@ -138,7 +138,7 @@ AUTO_INCREMENT - + PRIMARY KEY diff --git a/doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl b/doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl index 58c592c90ce..84b203d45f9 100644 --- a/doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl +++ b/doc/stylesheets/dbschema_k/xsl/pi_framework_mod.xsl @@ -39,7 +39,7 @@ <!-- - provisionning --> + provisioning --> <mod><mod_name> </mod_name> diff --git a/doc/tutorials/presence/cfg/ps.cfg b/doc/tutorials/presence/cfg/ps.cfg index 05fad8140f2..1d6d2ebb2b8 100644 --- a/doc/tutorials/presence/cfg/ps.cfg +++ b/doc/tutorials/presence/cfg/ps.cfg @@ -283,7 +283,7 @@ route[RR] # use different transport protocol # if the initial INVITE got the ACC flag store this in - # an RR AVP cookie. this is more for demonstration purpose + # an RR AVP cookie. This is more for demonstration purpose if (isflagset(FLAG_ACC)) { $account = "yes"; setavpflag($account, "dialog_cookie"); diff --git a/doc/tutorials/presence/install.xml b/doc/tutorials/presence/install.xml index 76ac767f1c6..ebd0e99fcfc 100644 --- a/doc/tutorials/presence/install.xml +++ b/doc/tutorials/presence/install.xml @@ -18,7 +18,7 @@ more information see .
Dependencies -Presence module dependecies may be found in sections Presence module dependencies may be found in sections PA module dependencies and RLS module dependencies. These modules depend on common libraries which have their own dependencies as mentioned below. diff --git a/doc/tutorials/presence/intro.xml b/doc/tutorials/presence/intro.xml index f02c44341b1..ecb0345fadb 100644 --- a/doc/tutorials/presence/intro.xml +++ b/doc/tutorials/presence/intro.xml @@ -65,7 +65,7 @@ libraries. Their interface is described in standalone documents.
Persistence Modules can store their status (working data) into database. This data is automatically reloaded on startup, so it is possible to restart SIP-router and -clients don't note it. Established SIP dialogs are stored in a database too. +clients don't notice it. Established SIP dialogs are stored in a database too. Details about database storage are described for each module separately in module documentation. @@ -85,7 +85,7 @@ rules may be found in and Only XCAP storage of authorization rules is supported at this moment. It is not fully implemented now - only basic rule conditions, no sphere and time conditions. Transformations defined in are -ignored. Maybe, that in the +ignored. Maybe, in the future it will be possible to use other variants like webdav or storing authorization rules in SIP-router's own database. diff --git a/doc/tutorials/serdev/routing_engine.xml b/doc/tutorials/serdev/routing_engine.xml index a3c417f2b59..6ea403c2bd5 100644 --- a/doc/tutorials/serdev/routing_engine.xml +++ b/doc/tutorials/serdev/routing_engine.xml @@ -259,7 +259,7 @@ route statement. - As we have mentioned already, there can be more that one + As we have mentioned already, there can be more than one route statement in the config file. One of them is main (without number), the other are additional. This command makes it possible to execute an additional route statement. diff --git a/doc/tutorials/seruser/otherapps.xml b/doc/tutorials/seruser/otherapps.xml index dbcd1407d64..1c44d405b8a 100644 --- a/doc/tutorials/seruser/otherapps.xml +++ b/doc/tutorials/seruser/otherapps.xml @@ -32,7 +32,7 @@ usage: serctl mail <username> .................... send an email to a user serctl alias show [<alias>] ............... show aliases serctl alias rm <alias> ................... remove an alias - serctl alias add <alias> <uri> ............ add an aliases + serctl alias add <alias> <uri> ............ add an alias * access control lists * serctl acl show [<username>] .............. show user membership diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 68493736d41..715c289af1e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -227,7 +227,7 @@ enable_sctp=no ####### Custom Parameters ######### -/* These parameters can be modified runtime via RPC interface +/* These parameters can be modified at runtime via RPC interface * - see the documentation of 'cfg_rpc' module. * * Format: group.id = value 'desc' description @@ -389,7 +389,7 @@ modparam("registrar", "path_mode", 0) modparam("acc", "early_media", 0) modparam("acc", "report_ack", 0) modparam("acc", "report_cancels", 0) -/* by default ww do not adjust the direct of the sequential requests. +/* by default we do not adjust the direct of the sequential requests. * if you enable this parameter, be sure the enable "append_fromtag" * in "rr" module */ modparam("acc", "detect_direction", 0) diff --git a/etc/sip-router.cfg b/etc/sip-router.cfg index 0390ef7ec57..8669ea63d79 100644 --- a/etc/sip-router.cfg +++ b/etc/sip-router.cfg @@ -1,7 +1,7 @@ # # $Id$ # -# Example configuration file (simpler then ser-oob.cfg, but more +# Example configuration file (simpler than ser-oob.cfg, but more # complex then ser-basic.cfg). # # First start SER sample config script with: @@ -73,7 +73,7 @@ rev_dns=no # (cmd. line: -R) #group=ser #disable_core=yes #disables core dumping #open_fd_limit=1024 # sets the open file descriptors limit -#mhomed=yes # usefull for multihomed hosts, small performance penalty +#mhomed=yes # useful for multihomed hosts, small performance penalty #disable_tcp=yes #tcp_accept_aliases=yes # accepts the tcp alias via option (see NEWS) sip_warning=yes @@ -172,7 +172,7 @@ modparam("ctl", "binrpc", "tcp:127.0.0.1:2046") # failed transactions (=negative responses) should be logged to modparam("acc_db", "failed_transactions", 1) -# comment the next line if you dont want to have accounting to DB +# comment the next line if you don't want to have accounting to DB modparam("acc_db", "log_flag", "FLAG_ACC") # -- tm params -- @@ -197,7 +197,7 @@ modparam("tls", "private_key", "ser-selfsigned.key") # -- xmlrpc params -- -# using a sub-route from the module is a lot safer then relying on the +# using a sub-route from the module is a lot safer than relying on the # request method to distinguish HTTP from SIP modparam("xmlrpc", "route", "RPC"); @@ -358,8 +358,8 @@ route[RR] # particularly good if upstream and downstream entities # use different transport protocol - # if the inital INVITE got the ACC flag store this in - # an RR AVP cookie. this is more for demonstration purpose + # if the initial INVITE got the ACC flag store this in + # an RR AVP cookie. This is more for demonstration purpose if (isflagset(FLAG_ACC)) { $account = "yes"; setavpflag($account, "dialog_cookie"); @@ -377,7 +377,7 @@ route[DOMAIN] # check if the callee is at a local domain lookup_domain("$td", "@ruri.host"); - # we dont know the domain of the caller and also not + # we don't know the domain of the caller and also not # the domain of the callee -> somone uses our proxy as # a relay if (strempty($t.did) && strempty($f.did)) { @@ -528,7 +528,7 @@ route[INBOUND] if (lookup_contacts("location")) { append_hf("P-hint: usrloc applied\r\n"); - # we set the TM module timers according to the prefences + # we set the TM module timers according to the preferences # of the callee (avoid too long ringing of his phones) # Note1: timer values have to be in ms now! # Note2: this makes even more sense if you switch to a voicemail