@@ -1,7 +1,7 @@

 /* $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -2,7 +2,7 @@

  *

  * simple, very fast, malloc library

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -3,7 +3,7 @@

  * memory related stuff (malloc & friends)

  * 

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -78,7 +78,7 @@ void memtest()

 	mem_block=MY_INIT( tst_mem, TEST_SIZE );

-	/* coalesing test w/big fragments */

+	/* coalescing test w/big fragments */

 	p0=ma(8194);

 	p1=ma(8194);

 	p2=ma(8194);

@@ -1,7 +1,7 @@

 /* $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -30,7 +30,7 @@

  *  ????-??-??  created by andrei

  *  2003-04-14  more debugging added in DBG_QM_MALLOC mode (andrei)

  *  2003-06-29  added qm_realloc (andrei)

- *  2004-07-19  fragments book keeping code and suport for 64 bits

+ *  2004-07-19  fragments book keeping code and support for 64 bits

  *               memory blocks (64 bits machine & size>=2^32) (andrei)

  *              GET_HASH s/</<=/ (avoids waste of 1 hash cell) (andrei)

  */

@@ -548,7 +548,7 @@ void* qm_realloc(struct qm_block* qm, void* p, unsigned int size)

 #ifdef DBG_QM_MALLOC

 		DBG("qm_realloc: shrinking from %ld to %d\n", f->size, size);

 		if(split_frag(qm, f, size, file, "fragm. from qm_realloc", line)!=0){

-		DBG("qm_realloc : shrinked succesfull\n");

+		DBG("qm_realloc : shrinked successful\n");

 #else

 		if(split_frag(qm, f, size)!=0){

 #endif

@@ -2,7 +2,7 @@

  *

  * simple & fast malloc library

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -54,7 +54,7 @@

 #else /* DBG_QM_MALLOC */

 	#define ROUNDTO		16 /* size we round to, must be = 2^n  and also

 							 sizeof(qm_frag)+sizeof(qm_frag_end)

-							 must be mutliple of ROUNDTO!

+							 must be multiple of ROUNDTO!

 						   */

 #endif

 #define MIN_FRAG_SIZE	ROUNDTO

@@ -2,7 +2,7 @@

  *

  * Shared memory functions

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -28,7 +28,7 @@

 /*

  * History:

  * --------

- *  2003-03-12  splited shm_mem_init in shm_getmem & shm_mem_init_mallocs

+ *  2003-03-12  split shm_mem_init in shm_getmem & shm_mem_init_mallocs

  *               (andrei)

  *  2004-07-27  ANON mmap support, needed on darwin (andrei)

  */

@@ -81,7 +81,7 @@ inline static void* sh_realloc(void* p, unsigned int size)

 }

 /* look at a buffer if there is perhaps enough space for the new size

-   (It is benefitial to do so because vq_malloc is pretty stateful

+   (It is beneficial to do so because vq_malloc is pretty stateful

     and if we ask for a new buffer size, we can still make it happy

     with current buffer); if so, we return current buffer again;

     otherwise, we free it, allocate a new one and return it; no

@@ -2,7 +2,7 @@

  *

  * shared mem stuff

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -66,7 +66,7 @@

 #	define MY_FREE vqm_free

 #	define MY_STATUS vqm_status

 #	define  shm_malloc_init vqm_malloc_init

-#	warn "no proper vq_realloc implementantion, try another memory allocator"

+#	warn "no proper vq_realloc implementation, try another memory allocator"

 #elif defined F_MALLOC

 #	include "f_malloc.h"

 	extern struct fm_block* shm_block;

@@ -1,6 +1,6 @@

 /* $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -34,7 +34,7 @@

  *

  * About:

  * aggressive, wasteful and very quick malloc library built for

- * servers that continuously alocate and release chunks of only

+ * servers that continuously allocate and release chunks of only

  * few sizes:

  * - free lists are organized by size (which eliminates long list traversal 

  *   thru short free chunks if a long one is asked)

@@ -43,17 +43,17 @@

  *    freeing

  * - the last bucket holds unlikely, huge, variable length chunks;

  *   they are maintained as stack growing from the opposite direction

- *   of our heap; coalesing is enabled; stack-like first-fit used to

+ *   of our heap; coalescing is enabled; stack-like first-fit used to

  *   find free fragments

  *

- * TODO: possibly, some delayed coalescation wouldn't hurt; also, further

+ * TODO: possibly, some delayed coalescence wouldn't hurt; also, further

  * optimization will certainly speed-up the entire process a lot; using

  * knowledge of application as well as trying to make pipeline happy

  * (from which I am sadly far away now)

  * provides optimization space; trying to use other memory allocators

  * to compare would be a great thing to do too;

  *

- * also, comparing to other memory allocaters (like Horde) would not

+ * also, comparing to other memory allocators (like Horde) would not

  * be a bad idea: those folks have been doing that for ages and specifically

  * Horde has been heavily optimized for multi-processor machines

  *

@@ -158,7 +158,7 @@ unsigned char size2bucket( struct vqm_block* qm, int *size  )

 		b = qm->s2b[ real_size ];

 		*size = qm->s2s[ real_size ];

 	/* there might be various allocations slightly 1>1k, I still

-	   don't want to be too agressive and increase useless 

+	   don't want to be too aggressive and increase useless 

 	   allocations in small steps

     	*/	

 	} else {

@@ -396,8 +396,8 @@ void vqm_free(struct vqm_block* qm, void* p)

 		next=FRAG_NEXT(f);

 		if  ((char *)next +sizeof( struct vqm_frag) < qm->core_end) {

 			VQM_DEBUG_FRAG(qm, next);

-			if (! FRAG_ISUSED(next)) { /* coalescate with next fragment */

-				DBG("vqm_free: coalescated with next\n");

+			if (! FRAG_ISUSED(next)) { /* coalesce with next fragment */

+				DBG("vqm_free: coalesced with next\n");

 				vqm_detach_free(qm, next);

 				f->size+=next->size;

 				FRAG_END(f)->size=f->size;

@@ -407,8 +407,8 @@ void vqm_free(struct vqm_block* qm, void* p)

 		if (first_big &&  f>first_big) {

 			prev=FRAG_PREV(f);

 			VQM_DEBUG_FRAG(qm, prev);

-			if (!FRAG_ISUSED(prev)) { /* coalescate with prev fragment */

-				DBG("vqm_free: coalescated with prev\n");

+			if (!FRAG_ISUSED(prev)) { /* coalesce with prev fragment */

+				DBG("vqm_free: coalesced with prev\n");

 				vqm_detach_free(qm, prev );

 				prev->size+=f->size;

 				f=prev;

@@ -1,7 +1,7 @@

 /* $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -35,7 +35,9 @@ Jiri Kuthan

         1.4. Exported Functions

-              1.4.1. t_relay_to(ip, port)

+              1.4.1. t_relay_to_udp(ip, port), t_relay_to_tcp(ip,

+                      port)

+

               1.4.2. t_relay()

               1.4.3. t_on_negative(reply_route)

               1.4.4. append_branch()

@@ -68,7 +70,7 @@ Jiri Kuthan

    1-7. Set retr_timer1p4 parameter

    1-8. Set retr_timer2 parameter

    1-9. Set noisy_ctimer parameter

-   1-10. t_relay_to usage

+   1-10. t_relay_to_udp usage

    1-11. t_relay usage

    1-12. t_on_negative usage

    1-13. append_branch usage

@@ -89,36 +91,37 @@ Chapter 1. User's Guide

    and CPU, is some services inherently need state. For example,

    transaction-based accounting (module acc) needs to process

    transaction state as opposed to individual messages, and any

-   kinds of forking must be implemented statefuly. Other use of

+   kinds of forking must be implemented statefully. Other use of

    stateful processing is it trading CPU caused by retransmission

    processing for memory. That makes however only sense if CPU

    consumption per request is huge. For example, if you want to

    avoid costly DNS resolution for every retransmission of a

-   request to an unresolveable destination, use stateful mode.

+   request to an unresolvable destination, use stateful mode.

    Then, only the initial message burdens server by DNS queries,

-   subsequent retranmissions will be dropped and will not result

+   subsequent retransmissions will be dropped and will not result

    in more processes blocked by DNS resolution. The price is more

    memory consumption and higher processing latency.

-   From user's perspective, there are two major functions :

-   t_relay and t_relay_to. Both setup transaction state, absorb

-   retransmissions from upstream, generate downstream

-   retransmissions and correlate replies to requests. t_relay

-   forwards to current URI (be it original request's URI or a URI

-   changed by some of URI-modifying functions, such as sethost).

-   t_relay_to forwards to a specific address.

+   From user's perspective, there are these major functions :

+   t_relay, t_relay_to_udp and t_relay_to_tcp. All of them setup

+   transaction state, absorb retransmissions from upstream,

+   generate downstream retransmissions and correlate replies to

+   requests. t_relay forwards to current URI (be it original

+   request's URI or a URI changed by some of URI-modifying

+   functions, such as sethost). t_relay_to_udp and t_relay_to_tcp

+   forward to a specific address over UDP or TCP respectively.

    In general, if TM is used, it copies clones of received SIP

    messages in shared memory. That costs the memory and also CPU

    time (memcpys, lookups, shmem locks, etc.) Note that non-TM

    functions operate over the received message in private memory,

    that means that any core operations will have no effect on

-   statefuly processed messages after creating the transactional

+   statefully processed messages after creating the transactional

    state. For example, calling record_route after t_relay is

    pretty useless, as the RR is added to privately held message

    whereas its TM clone is being forwarded.

-   TM is quite big and uneasy to programm--lot of mutexes, shared

+   TM is quite big and uneasy to program--lot of mutexes, shared

    memory access, malloc & free, timers--you really need to be

    careful when you do anything. To simplify TM programming,

    there is the instrument of callbacks. The callback mechanisms

@@ -126,7 +129,7 @@ Chapter 1. User's Guide

    event. See t_hooks.h for a list of possible events.

    Other things programmers may want to know is UAC--it is a very

-   simplictic code which allows you to generate your own

+   simplistic code which allows you to generate your own

    transactions. Particularly useful for things like NOTIFYs or

    IM gateways. The UAC takes care of all the transaction

    machinery: retransmissions , FR timeouts, forking, etc. See

@@ -184,7 +187,7 @@ modparam("tm", "fr_inv_timer", 200)

    Time for which a transaction stays in memory to absorb delayed

    messages after it completed; also, when this timer hits,

    retransmission of local cancels is stopped (a puristic but

-   complex behviour would be not to enter wait state until local

+   complex behavior would be not to enter wait state until local

    branches are finished by a final reply or FR timer--we

    simplified).

@@ -260,8 +263,8 @@ modparam("tm", "retr_timer2", 8)

 1.3.9. noisy_ctimer (integer)

    If set, on FR timer INVITE transactions will be explicitly

-   cancelled if possible, silently dropped otherwise. Preferably,

-   it is turned off to allow very long ringing. This behaviour is

+   canceled if possible, silently dropped otherwise. Preferably,

+   it is turned off to allow very long ringing. This behavior is

    overridden if a request is forked, or some functionality

    explicitly turned it off for a transaction (like acc does to

    avoid unaccounted transactions due to expired timer).

@@ -276,9 +279,9 @@ modparam("tm", "noisy_ctimer", 1)

 1.4. Exported Functions

-1.4.1. t_relay_to(ip, port)

+1.4.1. t_relay_to_udp(ip, port), t_relay_to_tcp(ip, port)

-   Relay a message statefuly to a fixed destination. This along

+   Relay a message statefully to a fixed destination. This along

    with t_relay is the function most users want to use--all other

    are mostly for programming. Programmers interested in writing

    TM logic should review how t_relay is implemented in tm.c and

@@ -289,15 +292,15 @@ modparam("tm", "noisy_ctimer", 1)

      * ip - IP address where the message should be sent.

      * port - Port number.

-   Example 1-10. t_relay_to usage

+   Example 1-10. t_relay_to_udp usage

 ...

-t_relay_to("1.2.3.4", "5060");

+t_relay_to_udp("1.2.3.4", "5060");

 ...

      _________________________________________________________

 1.4.2. t_relay()

-   Relay a message statefuly to destination indicated in current

+   Relay a message statefully to destination indicated in current

    URI. (If the original URI was rewritten by UsrLoc, RR,

    strip/prefix, etc., the new URI will be taken). Returns a

    negative value on failure--you may still want to send a

@@ -314,15 +317,15 @@ if (!t_relay()) { sl_reply_error(); break; };

    Sets reply routing block, to which control is passed after a

    transaction completed with a negative result but before

-   sending a final reply. In the refered block, you can either

+   sending a final reply. In the referred block, you can either

    start a new branch (good for services such as

    forward_on_no_reply) or send a final reply on your own (good

    for example for message silo, which received a negative reply

    from upstream and wants to tell upstream "202 I will take care

-   of it"). Note that the set of command which are useable within

+   of it"). Note that the set of command which are usable within

    reply_routes is strictly limited to rewriting URI, initiating

    new branches, logging, and sending stateful replies (t_reply).

-   Any other commands may result in unpredictable behaviour and

+   Any other commands may result in unpredictable behavior and

    possible server failure. Note that whenever reply_route is

    entered, uri is reset to value which it had on relaying. If it

    temporarily changed during a reply_route processing,

@@ -404,7 +407,7 @@ t_reply("404", "Not found");

    Checks if a transaction exists. Returns a positive value if

    so, negative otherwise. Most likely you will not want to use

-   it, as a typicall application of a looku-up is to introduce a

+   it, as a typical application of a looku-up is to introduce a

    new transaction if none was found. However this is safely

    (atomically) done using t_newtran.

@@ -440,7 +443,7 @@ t_release();

 1.4.10. t_forward_nonack(ip, port)

    mainly for internal usage--forward a non-ACK request

-   statefuly.

+   statefully.

    Meaning of the parameters is as follows:

@@ -534,7 +537,7 @@ Chapter 2. Developer's Guide

 2.1. Defines

-     * ACK_TAG enables stricter matching of acknowledgemnts

+     * ACK_TAG enables stricter matching of acknowledgments

        including to-tags. Without it, to-tags are ignored. It is

        disabled by default for two reasons:

           + It eliminates an unlikely race condition in which

@@ -543,7 +546,7 @@ Chapter 2. Developer's Guide

           + It makes UACs happy who set wrong to-tags.

        It should not make a difference, as there may be only one

        negative reply sent upstream and 200/ACKs are not matched

-       as they consititute another transaction. It will make no

+       as they constitute another transaction. It will make no

        difference at all when the new magic cookie matching is

        enabled anyway.

      * CANCEL_TAG similarly enables strict matching of CANCELs

@@ -3,7 +3,7 @@

  *

  * Fast Call-ID Generator

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -48,7 +48,7 @@

 #define CALLID_SUFFIX_LEN ( 1 /* - */                                            + \

 			    5 /* pid */                                          + \

                            42 /* embedded v4inv6 address can be looong '128.' */ + \

-	                    2 /* parenthessis [] */                              + \

+	                    2 /* parenthesis [] */                              + \

                             1 /* ZT 0 */                                         + \

 	                   16 /* one never knows ;-) */                            \

                           )

@@ -3,7 +3,7 @@

  *

  * Fast Call-ID Generator

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -2,7 +2,7 @@

  * $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -41,7 +41,7 @@

 */

 #include "../../hash_func.h"

-/* maximumum length of localy generated acknowledgement */

+/* maximum length of localy generated acknowledgment */

 #define MAX_ACK_LEN   1024

 /* FINAL_RESPONSE_TIMER ... tells how long should the transaction engine

@@ -76,11 +76,11 @@

 #define MAX_FROM 512

 /* messages generated by server */

-#define CANCELLING "cancelling"

+#define CANCELING "canceling"

 #define CANCEL_DONE "ok -- no more pending branches"

-#define CANCELLED "Request cancelled"

+#define CANCELED "Request canceled"

-/* ACKnowledgement forking hack -- that is good for phones

+/* Acknowledgment forking hack -- that is good for phones

    which send ACKs to the same outbound proxy; if forking is

    enabled, the proxy wouldn't know to which branch to forward;

    without forking, it could forward to other branch than from

@@ -2,7 +2,7 @@

  * $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -350,7 +350,7 @@ static inline int get_route_set(struct sip_msg* _m, rr_t** _rs, unsigned char _o

 /*

- * Extract all necessarry information from a response and put it

+ * Extract all necessary information from a response and put it

  * in a dialog structure

  */

 static inline int response2dlg(struct sip_msg* _m, dlg_t* _d)

@@ -425,7 +425,7 @@ static inline int dlg_new_resp_uac(dlg_t* _d, struct sip_msg* _m)

 	} else {

 		     /* 

 		      * A negative final response, mark the dialog as destroyed

-		      * Again, I do not update the structures here becuase it

+		      * Again, I do not update the structures here because it

 		      * makes no sense to me, a dialog shouldn't be used after

 		      * it is destroyed

 		      */

@@ -1,6 +1,6 @@

 /*

  * $Id$

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -69,7 +69,7 @@ typedef struct dlg_id {

 /*

- * It is neccessary to analyze the dialog data to find out

+ * It is necessary to analyze the dialog data to find out

  * what URI put into the Record-Route, where the message

  * should be really sent and how to construct the route

  * set of the message. This structure stores this information

@@ -101,7 +101,7 @@ typedef struct dlg {

 	rr_t* route_set;        /* Route set */

 	dlg_hooks_t hooks;      /* Various hooks used to store information that

 				 * can be reused when building a message (to

-				 * prevent repeated analysing of the dialog data

+				 * prevent repeated analyzing of the dialog data

 				 */

 } dlg_t;

@@ -18,7 +18,7 @@

 	<itemizedlist>

 	    <listitem>

 		<para>

-		    ACK_TAG enables stricter matching of acknowledgemnts including to-tags. Without

+		    ACK_TAG enables stricter matching of acknowledgments including to-tags. Without

 		    it, to-tags are ignored. It is disabled by default for two reasons: 

 		</para>

 		<itemizedlist>

@@ -40,7 +40,7 @@

 		<para>

 		    It should not make a difference, as there may be only one

 		    negative reply sent upstream and 200/ACKs are not matched

-		    as they consititute another transaction. It will make no

+		    as they constitute another transaction. It will make no

 		    difference at all when the new magic cookie matching is

 		    enabled anyway.

 		</para>

@@ -18,13 +18,13 @@

 	    use of stateful logic, which is costly in terms of memory and <acronym>CPU</acronym>, is

 	    some services inherently need state. For example, transaction-based accounting (module

 	    acc) needs to process transaction state as opposed to individual messages, and any kinds

-	    of forking must be implemented statefuly. Other use of stateful processing is it trading

+	    of forking must be implemented statefully. Other use of stateful processing is it trading

 	    <acronym>CPU</acronym> caused by retransmission processing for memory. That makes

 	    however only sense if <acronym>CPU</acronym> consumption per request is huge. For

 	    example, if you want to avoid costly <acronym>DNS</acronym> resolution for every

-	    retransmission of a request to an unresolveable destination, use stateful mode. Then,

+	    retransmission of a request to an unresolvable destination, use stateful mode. Then,

 	    only the initial message burdens server by <acronym>DNS</acronym> queries, subsequent

-	    retranmissions will be dropped and will not result in more processes blocked by

+	    retransmissions will be dropped and will not result in more processes blocked by

 	    <acronym>DNS</acronym> resolution. The price is more memory consumption and higher

 	    processing latency.

 	</para>

@@ -42,20 +42,20 @@

 	    messages in shared memory. That costs the memory and also <acronym>CPU</acronym> time

 	    (memcpys, lookups, shmem locks, etc.)  Note that non-<acronym>TM</acronym> functions

 	    operate over the received message in private memory, that means that any core operations

-	    will have no effect on statefuly processed messages after creating the transactional

+	    will have no effect on statefully processed messages after creating the transactional

 	    state. For example, calling record_route <emphasis>after</emphasis> t_relay is pretty

 	    useless, as the <acronym>RR</acronym> is added to privately held message whereas its

 	    <acronym>TM</acronym> clone is being forwarded.

 	</para>

 	<para>

-	    <acronym>TM</acronym> is quite big and uneasy to programm--lot of mutexes, shared memory

+	    <acronym>TM</acronym> is quite big and uneasy to program--lot of mutexes, shared memory

 	    access, malloc & free, timers--you really need to be careful when you do anything. To

 	    simplify <acronym>TM</acronym> programming, there is the instrument of callbacks. The

 	    callback mechanisms allow programmers to register their functions to specific event. See

 	    t_hooks.h for a list of possible events.

 	</para>

 	<para>

-	    Other things programmers may want to know is &uac;--it is a very simplictic code which

+	    Other things programmers may want to know is &uac;--it is a very simplistic code which

 	    allows you to generate your own transactions. Particularly useful for things like

 	    NOTIFYs or <acronym>IM</acronym> gateways. The &uac; takes care of all the transaction

 	    machinery: retransmissions , FR timeouts, forking, etc.  See t_uac prototype in uac.h

@@ -141,7 +141,7 @@ modparam("tm", "fr_inv_timer", 200)

 	    <para>

 		Time for which a transaction stays in memory to absorb delayed messages after it

 		completed; also, when this timer hits, retransmission of local cancels is stopped (a

-		puristic but complex behviour would be not to enter wait state until local branches

+		puristic but complex behavior would be not to enter wait state until local branches

 		are finished by a final reply or FR timer--we simplified).

 	    </para>

 	    <para>

@@ -263,9 +263,9 @@ modparam("tm", "retr_timer2", 8)

 	<section>

 	    <title><varname>noisy_ctimer</varname> (integer)</title>

 	    <para>

-		If set, on FR timer INVITE transactions will be explicitly cancelled if possible,

+		If set, on FR timer INVITE transactions will be explicitly canceled if possible,

 		silently dropped otherwise. Preferably, it is turned off to allow very long ringing.

-		This behaviour is overridden if a request is forked, or some functionality

+		This behavior is overridden if a request is forked, or some functionality

 		explicitly turned it off for a transaction (like acc does to avoid unaccounted

 		transactions due to expired timer).

 	    </para>

@@ -295,7 +295,7 @@ modparam("tm", "noisy_ctimer", 1)

 		<function moreinfo="none">t_relay_to_tcp(ip, port)</function>

 	    </title>

 	    <para>

-		Relay a message statefuly to a fixed destination. This along with <function

+		Relay a message statefully to a fixed destination. This along with <function

 		    moreinfo="none">t_relay</function> is the function most users want to use--all

 		other are mostly for programming. Programmers interested in writing

 		<acronym>TM</acronym> logic should review how t_relay is implemented in tm.c and

@@ -327,7 +327,7 @@ t_relay_to_udp("1.2.3.4", "5060");

 		<function moreinfo="none">t_relay()</function>

 	    </title>

 	    <para>

-		Relay a message statefuly to destination indicated in current &uri;. (If the

+		Relay a message statefully to destination indicated in current &uri;. (If the

 		original &uri; was rewritten by UsrLoc, RR, strip/prefix, etc., the new &uri; will

 		be taken). Returns a negative value on failure--you may still want to send a

 		negative reply upstream statelessly not to leave upstream &uac; in lurch.

@@ -348,14 +348,14 @@ if (!t_relay()) { sl_reply_error(); break; };

 	    </title>

 	    <para>

 		Sets reply routing block, to which control is passed after a transaction completed

-		with a negative result but before sending a final reply. In the refered block, you

+		with a negative result but before sending a final reply. In the referred block, you

 		can either start a new branch (good for services such as forward_on_no_reply) or

 		send a final reply on your own (good for example for message silo, which received a

 		negative reply from upstream and wants to tell upstream <quote>202 I will take care

-		of it</quote>). Note that the set of command which are useable within reply_routes

+		of it</quote>). Note that the set of command which are usable within reply_routes

 		is strictly limited to rewriting &uri;, initiating new branches, logging, and

 		sending stateful replies (<function>t_reply</function>). Any other commands may

-		result in unpredictable behaviour and possible server failure. Note that whenever

+		result in unpredictable behavior and possible server failure. Note that whenever

 		reply_route is entered, uri is reset to value which it had on relaying. If it

 		temporarily changed during a reply_route processing, subsequent reply_route will

 		ignore the changed value and use again the original one.

@@ -472,7 +472,7 @@ t_reply("404", "Not found");

 	    </title>

 	    <para>

 		Checks if a transaction exists. Returns a positive value if so, negative otherwise.

-		Most likely you will not want to use it, as a typicall application of a looku-up is

+		Most likely you will not want to use it, as a typical application of a looku-up is

 		to introduce a new transaction if none was found. However this is safely

 		(atomically) done using <function>t_newtran</function>.

 	    </para>

@@ -528,7 +528,7 @@ t_release();

 		<function moreinfo="none">t_forward_nonack(ip, port)</function>

 	    </title>

 	    <para>

-		mainly for internal usage--forward a non-ACK request statefuly.

+		mainly for internal usage--forward a non-ACK request statefully.

 	    </para>

 	    <para>Meaning of the parameters is as follows:</para>

 	    <itemizedlist>

@@ -7,7 +7,7 @@

  *

  * I admit it is not a nice hack; -jiri 

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -31,7 +31,7 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

 /*

- * Histoy:

+ * History:

  * -------

  *  2003-11-24  changed free_via_lump to free_via_clen_lump and make it

  *              handle CONTENTLENGTH lumps also (andrei)

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -182,7 +182,7 @@ static inline void init_synonym_id( struct cell *t )

 		p_msg=t->uas.request;

 		if (p_msg) {

 			/* char value of a proxied transaction is

-			   calculated out of header-fileds forming

+			   calculated out of header-fields forming

 			   transaction key

 			*/

 			char_msg_val( p_msg, t->md5 );

@@ -351,14 +351,14 @@ error0:

 /*  Takes an already created cell and links it into hash table on the

- *  appropiate entry. */

+ *  appropriate entry. */

 void insert_into_hash_table_unsafe( struct cell * p_cell, unsigned int _hash )

 {

 	struct entry* p_entry;

 	p_cell->hash_index=_hash;

-	/* locates the apropiate entry */

+	/* locates the appropriate entry */

 	p_entry = &tm_table->entrys[ _hash ];

 	p_cell->label = p_entry->next_label++;

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -90,7 +90,7 @@ void unlock_hash(int i);

    REQ_RPLD means that a transaction has been replied -- either

             it implies going to wait state, or for invite transactions

             FR timer is ticking until ACK arrives

-   REQ_RLSD means that a transaction was put on wait explicitely

+   REQ_RLSD means that a transaction was put on wait explicitly

             from t_release_transaction

    REQ_EXIST means that this request is a retransmission which does not

             affect transactional state

@@ -114,7 +114,7 @@ typedef struct retr_buf

 	struct timer_link fr_timer;

 	enum lists retr_list;

-	/*the cell that containes this retrans_buff*/

+	/*the cell that contains this retrans_buff*/

 	struct cell* my_T;

 	unsigned int branch;

 }retr_buf_type;

@@ -143,7 +143,7 @@ typedef struct ua_client

 {

 	struct retr_buf  request;

 	/* we maintain a separate copy of cancel rather than

-	   reuse the strructure for original request; the 

+	   reuse the structure for original request; the 

 	   original request is no longer needed but its delayed

 	   timer may fire and interfere with whoever tries to

 	   rewrite it

@@ -167,10 +167,10 @@ struct totag_elem {

-/* transaction's falgs */

+/* transaction's flags */

 /* is the transaction's request an INVITE? */

 #define T_IS_INVITE_FLAG     (1<<0)

-/* is this a trnasaction generated by local request? */

+/* is this a transaction generated by local request? */

 #define T_IS_LOCAL_FLAG      (1<<1)

 /* set to one if you want to disallow silent transaction

    dropping when C timer hits */

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -50,8 +50,8 @@

 #define SEM_MAX		4096

 /* we implement mutex here using lock sets; as the number of

-   sempahores may be limited (e.g. sysv) and number of synchronized 

-   elements high, we partition the sync'ed SER elements and share 

+   semaphores may be limited (e.g. sysv) and number of synchronized 

+   elements high, we partition the synced SER elements and share 

    semaphores in each of the partitions; we try to use as many 

    semaphores as OS gives us for finest granularity. 

@@ -84,7 +84,7 @@ static ser_lock_t* timer_group_lock=0; /* pointer to a TG_NR lock array,

 								    it's safer if we alloc this in shared mem 

 									( required for fast lock ) */

-/* intitialize the locks; return 0 on success, -1 otherwise

+/* initialize the locks; return 0 on success, -1 otherwise

 */

 int lock_initialize()

 {

@@ -157,7 +157,7 @@ again:

 					continue;

 				/* failure after we stepped back; give up */

 			} else {

-					DBG("DEBUG: lock_initialize:   second time sempahore"

+					DBG("DEBUG: lock_initialize:   second time semaphore"

 							" allocation failure\n");

 					goto error;

 			}

@@ -210,7 +210,7 @@ void lock_cleanup()

 /* remove the semaphore set from system */

 void lock_cleanup()

 {

-	/* that's system-wide; all othe processes trying to use

+	/* that's system-wide; all other processes trying to use

 	   the semaphore will fail! call only if it is for sure

 	   no other process lives 

 	*/

@@ -257,7 +257,7 @@ int init_entry_lock( struct s_table* ht, struct entry *entry )

 #else

 	/* just advice which of the available semaphores to use;

 	   specifically, all entries are partitioned into as

-	   many partitions as number of available semaphors allows

+	   many partitions as number of available semaphores allows

         */

 	entry->mutex.semaphore_set=entry_semaphore;

 	entry->mutex.semaphore_index = ( ((char *)entry - (char *)(ht->entrys ) )

@@ -1,7 +1,7 @@

 /*

  * $Id$

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -12,7 +12,7 @@

  * not only take lookup in fragment table but also a shmem lock

  * operation (the same for shm_free)

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -62,7 +62,7 @@

 /* rounds to the first 4 byte multiple on 32 bit archs 

- * and to the first 8 byte multipe on 64 bit archs */

+ * and to the first 8 byte multiple on 64 bit archs */

 #define ROUND4(s) \

 	(((s)+(sizeof(char*)-1))&(~(sizeof(char*)-1)))

@@ -466,7 +466,7 @@ do { \

 			hdr->body.s);

 		/* by default, we assume we don't understand this header in TM

 		   and better set it to zero; if we do, we will set a specific