A bunch of typo correction from Thomas.

 @example
 @example
-@code{/* Prefix @emph{address_} is reserve */}
+@code{/* Prefix @emph{address_} is reserved */}
 @code{#include <mailutils/address.h>}
 @code{#include <mailutils/address.h>}
 
 
 @end example
 @end example
@@ -91,7 +91,7 @@ The @var{addr} is destroyed.
 
 
 @deftypefun  int address_get_email (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_email (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the @var{no}th email address component of the address list. This
+Accesses the @var{no}th email address component of the address list. This
 address is the plain email address, correctly quoted, suitable for
 address is the plain email address, correctly quoted, suitable for
 using in an smtp dialog, for example, or as the address part of
 using in an smtp dialog, for example, or as the address part of
 a contact book entry.
 a contact book entry.
@@ -105,7 +105,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_personal (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_personal (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the display-name describing the @var{no}th email address. This
+Accesses the display-name describing the @var{no}th email address. This
 display-name is optional, so may not be present. If it is not present, but
 display-name is optional, so may not be present. If it is not present, but
 there is an RFC822 comment after the address, that comment will be
 there is an RFC822 comment after the address, that comment will be
 returned as the personal phrase, as this is a common usage of the comment
 returned as the personal phrase, as this is a common usage of the comment
@@ -127,7 +127,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_comments (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_comments (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the comments extracted while parsing the @var{no}th email address.
+Accesses the comments extracted while parsing the @var{no}th email address.
 These comments have no defined meaning, and are not currently collected.
 These comments have no defined meaning, and are not currently collected.
 
 
 The return value is @code{0} on success and a code number on error conditions:
 The return value is @code{0} on success and a code number on error conditions:
@@ -140,7 +140,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_email (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_email (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the email addr-spec extracted while
+Accesses the email addr-spec extracted while
 parsing the @var{no}th email address. This will be @code{0}
 parsing the @var{no}th email address. This will be @code{0}
 length for a unix-mbox.
 length for a unix-mbox.
 
 
@@ -153,7 +153,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_local_part (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_local_part (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the local-part of an email addr-spec extracted while
+Accesses the local-part of an email addr-spec extracted while
 parsing the @var{no}th email address.
 parsing the @var{no}th email address.
 
 
 The return value is @code{0} on success and a code number on error conditions:
 The return value is @code{0} on success and a code number on error conditions:
@@ -165,7 +165,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_domain (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_domain (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the domain of an email addr-spec extracted while
+Accesses the domain of an email addr-spec extracted while
 parsing the @var{no}th email address. This will be @code{0}
 parsing the @var{no}th email address. This will be @code{0}
 length for a unix-mbox.
 length for a unix-mbox.
 
 
@@ -178,7 +178,7 @@ The return value is @code{0} on success and a code number on error conditions:
 
 
 @deftypefun  int address_get_route (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 @deftypefun  int address_get_route (address_t *@var{addr}, size_t @var{no}, char* @var{buf}, size_t @var{len}, size_t* @var{n})
 
 
-Acesses the route of an email addr-spec extracted while
+Accesses the route of an email addr-spec extracted while
 parsing the @var{no}th email address. This is a rarely used RFC822 address
 parsing the @var{no}th email address. This is a rarely used RFC822 address
 syntax, but is legal in SMTP as well. The entire route is returned as
 syntax, but is legal in SMTP as well. The entire route is returned as
 a string, those wishing to parse it should look at <mailutils/parse822.h>.
 a string, those wishing to parse it should look at <mailutils/parse822.h>.

 @example
 @example
-@code{/* Prefix @emph{attribute_} is reserve */}
+@code{/* Prefix @emph{attribute_} is reserved */}
 @code{#include <mailutils/attribute.h>}
 @code{#include <mailutils/attribute.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{auth_} is reserve */}
+@code{/* Prefix @emph{auth_} is reserved */}
 @code{#include <mailutils/auth.h>}
 @code{#include <mailutils/auth.h>}
 
 
 @end example
 @end example
 
 
-There are many ways to authenticate to a server, to be flexible the
+There are many ways to authenticate to a server.  To be flexible the
 authentication process is provided by two objects @code{auth_t} and
 authentication process is provided by two objects @code{auth_t} and
 @code{ticket_t}.  The @code{auth_t} can implement different protocol like
 @code{ticket_t}.  The @code{auth_t} can implement different protocol like
 APOP, MD5-AUTH, One Time Passwd etc .. By default if a mailbox
 APOP, MD5-AUTH, One Time Passwd etc .. By default if a mailbox
 does not understand or know how to authenticate it falls back to
 does not understand or know how to authenticate it falls back to
-user/passwd authentication.  The @code{ticket_t} is away to
+user/passwd authentication.  The @code{ticket_t} is a way for
 Mailboxes and Mailers provide a way to authenticate when the URL does not
 Mailboxes and Mailers provide a way to authenticate when the URL does not
-contain enough information.  The default action is to call function
-@code{auth_authenticate} who will get the @emph{user} and @emph{passwd}
-if not set, this function can be override by a custom method.
+contain enough information.  The default action is to call the function
+@code{auth_authenticate} which will get the @emph{user} and @emph{passwd}
+if not set, this function can be overriden by a custom method.
 
 
 @deftypefun int auth_create (auth_t *@var{pauth}, void *@var{owner})
 @deftypefun int auth_create (auth_t *@var{pauth}, void *@var{owner})
 @end deftypefun
 @end deftypefun

 @example
 @example
-@code{/* Prefix @emph{body_} is reserve */}
+@code{/* Prefix @emph{body_} is reserved */}
 @code{#include <mailutils/body.h>}
 @code{#include <mailutils/body.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{envelope_} is reserve */}
+@code{/* Prefix @emph{envelope_} is reserved */}
 @code{#include <mailutils/envelope.h>}
 @code{#include <mailutils/envelope.h>}
 
 
 @end example
 @end example

@@ -16,10 +16,10 @@
 
 
 @end menu
 @end menu
 
 
-Where ever the mail is and whatever format it is store in, the same operations
+Whereever the mail is and whatever format it is stored in, the same operations
 to manipulate emails are common.  To unified the C API, GNU mailutils offers
 to manipulate emails are common.  To unified the C API, GNU mailutils offers
-an heteroclite set of objects that work in aggregation to do operations on
-emails.  Each object do a specific task and delegate non related tasks to
+a heteroclite set of objects that work in aggregation to do operations on
+emails.  Each object do a specific task and delegates non related tasks to
 others.  The object comes alive by specifying a @emph{URL} parameter when
 others.  The object comes alive by specifying a @emph{URL} parameter when
 created, it will indicate the storage format or protocol
 created, it will indicate the storage format or protocol
 (POP3, IMAP4, MH, MAILDIR, etc ..).
 (POP3, IMAP4, MH, MAILDIR, etc ..).

 @example
 @example
-@code{/* Prefix @emph{header_} is reserve */}
+@code{/* Prefix @emph{header_} is reserved */}
 @code{#include <mailutils/header.h>}
 @code{#include <mailutils/header.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{imap4_} is reserve */}
+@code{/* Prefix @emph{imap4_} is reserved */}
 @code{#include <mailutils/imap4.h>}
 @code{#include <mailutils/imap4.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{iterator_} is reserve */}
+@code{/* Prefix @emph{iterator_} is reserved */}
 @code{#include <mailutils/iterator.h>}
 @code{#include <mailutils/iterator.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{locker_} is reserve */}
+@code{/* Prefix @emph{locker_} is reserved */}
 @code{#include <mailutils/locker.h>}
 @code{#include <mailutils/locker.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{mailbox_} is reserve */}
+@code{/* Prefix @emph{mailbox_} is reserved */}
 @code{#include <mailutils/mailbox.h>}
 @code{#include <mailutils/mailbox.h>}
 
 
 @end example
 @end example
 
 
 @deftp {Data Type} mailbox_t
 @deftp {Data Type} mailbox_t
 The @code{mailbox_t} object is used to hold information and it is an opaque
 The @code{mailbox_t} object is used to hold information and it is an opaque
-data structure to the user. Functions are provided to retrieve the information.
+data structure to the user. Functions are provided to retrieve information
+from the data structure.
 @end deftp
 @end deftp
 @example
 @example
 @group
 @group
@@ -64,9 +65,9 @@ Not enough memory to allocate resources.
 @end deftypefun
 @end deftypefun
 
 
 @deftypefun int mailbox_create_default (mailbox_t *@var{pmbox}, const char *@var{name})
 @deftypefun int mailbox_create_default (mailbox_t *@var{pmbox}, const char *@var{name})
-The environment variable @emph{$MAIL} or the string formed by
+Create a mailbox with @code{mailbox_create ()} based on the environment
+variable @emph{$MAIL} or the string formed by
 @emph{_PATH_MAILDIR}/@var{user}" or @emph{$LOGNAME} if @var{user} is null,
 @emph{_PATH_MAILDIR}/@var{user}" or @emph{$LOGNAME} if @var{user} is null,
-for a default mailbox and calls @code{mailbox_create}.
 @end deftypefun
 @end deftypefun
 
 
 @deftypefun  void mailbox_destroy (mailbox_t *@var{pmbox})
 @deftypefun  void mailbox_destroy (mailbox_t *@var{pmbox})

 @example
 @example
-@code{/* Prefix @emph{maildir_} is reserve */}
+@code{/* Prefix @emph{maildir_} is reserved */}
 @code{#include <mailutils/maildir.h>}
 @code{#include <mailutils/maildir.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{mailer_} is reserve */}
+@code{/* Prefix @emph{mailer_} is reserved */}
 @code{#include <mailutils/mailer.h>}
 @code{#include <mailutils/mailer.h>}
 
 
 @end example
 @end example

@@ -104,7 +104,7 @@ This document was produced for version @value{VERSION} of @sc{gnu}
 @end ifinfo
 @end ifinfo
 @menu
 @menu
 * Introduction::                GNU @sc{mailutils}
 * Introduction::                GNU @sc{mailutils}
-* C API::                       C API.
+* Concrete API::                Concrete API.
 * Framework::                   Framework.
 * Framework::                   Framework.
 * Programs::                    Programs.
 * Programs::                    Programs.
 * Reporting Bugs::              Reporting Bugs.
 * Reporting Bugs::              Reporting Bugs.
@@ -114,7 +114,7 @@ This document was produced for version @value{VERSION} of @sc{gnu}
 
 
 @end menu
 @end menu
 
 
-@node Introduction, C API, Top, Top
+@node Introduction, Concrete API, Top, Top
 @comment  node-name,  next,  previous,  up
 @comment  node-name,  next,  previous,  up
 @chapter Introduction
 @chapter Introduction
 @cindex Introduction
 @cindex Introduction
@@ -217,14 +217,14 @@ Misc
 @cite{Internet Email Protocols a Developer's Guide by Kevin Johnson}
 @cite{Internet Email Protocols a Developer's Guide by Kevin Johnson}
 @end itemize
 @end itemize
 
 
-@node C API, Framework, Introduction, Top
+@node Concrete API, Framework, Introduction, Top
 @comment  node-name,  next,  previous,  up
 @comment  node-name,  next,  previous,  up
-@chapter C API
-@cindex C API
+@chapter Concrete API
+@cindex Concrete API
 
 
 @include c-api.texi
 @include c-api.texi
 
 
-@node Framework, Programs, C API, Top
+@node Framework, Programs, Concrete API, Top
 @comment  node-name,  next,  previous,  up
 @comment  node-name,  next,  previous,  up
 @chapter Framework
 @chapter Framework
 @cindex Framework
 @cindex Framework

 @example
 @example
-@code{/* Prefix @emph{mbox_} is reserve */}
+@code{/* Prefix @emph{mbox_} is reserved */}
 @code{#include <mailutils/mbox.h>}
 @code{#include <mailutils/mbox.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{mh_} is reserve */}
+@code{/* Prefix @emph{mh_} is reserved */}
 @code{#include <mailutils/mh.h>}
 @code{#include <mailutils/mh.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{nntp_} is reserve */}
+@code{/* Prefix @emph{nntp_} is reserved */}
 @code{#include <mailutils/nntp.h>}
 @code{#include <mailutils/nntp.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{parse822_} is reserve */}
+@code{/* Prefix @emph{parse822_} is reserved */}
 @code{#include <mailutils/parse822.h>}
 @code{#include <mailutils/parse822.h>}
 
 
 @end example
 @end example

 @example
 @example
-@code{/* Prefix @emph{pop3_} is reserve */}
+@code{/* Prefix @emph{pop3_} is reserved */}
 @code{#include <mailutils/pop3.h>}
 @code{#include <mailutils/pop3.h>}
 
 
 @end example
 @end example
 
 
 The Post Office Protocol Version 3 (POP3) purpose is to permit a client to
 The Post Office Protocol Version 3 (POP3) purpose is to permit a client to
-download a maildrop from a remote server.  It does not provide complexe or
+download a maildrop from a remote server.  It does not provide complex or
 extensive operation on the maildrop.
 extensive operation on the maildrop.
 
 
 @example
 @example
@@ -45,7 +45,7 @@ Capa (extension)
 Auth (extension)
 Auth (extension)
 @end itemize
 @end itemize
 
 
-When the client successfully authenticate the server acquires an exclusive
+When the client successfully authenticates the server acquires an exclusive
 access lock on the mailbox and holds it the entire duration of the session.
 access lock on the mailbox and holds it the entire duration of the session.
 The POP3 session enters The TRANSACTION State and the client may issues
 The POP3 session enters The TRANSACTION State and the client may issues
 commands to access the mailbox:
 commands to access the mailbox:
@@ -80,36 +80,36 @@ and closes the TCP connection.
 @cindex pop3_t
 @cindex pop3_t
 
 
 An opaque structure @emph{pop3_t} is use as a handle for the session, it is
 An opaque structure @emph{pop3_t} is use as a handle for the session, it is
-allocate and initiliaze by calling @code{pop3_create ()}.  All Functions will
+allocated and initiliazed by calling @code{pop3_create ()}.  All Functions will
 wait for a reply from the POP3 server before returning.  The duration of
 wait for a reply from the POP3 server before returning.  The duration of
-the waiting can be set by calling @code{pop3_set_timeout ()}, the default
+the wait can be set by calling @code{pop3_set_timeout ()}, the default
 is 10 minutes@footnote{@strong{Caution:} Although the @cite{RFC 1939}
 is 10 minutes@footnote{@strong{Caution:} Although the @cite{RFC 1939}
 specifies that the minimum default timeout is ten minutes many servers has
 specifies that the minimum default timeout is ten minutes many servers has
 shorter idle period, care should be taken to at least send a
 shorter idle period, care should be taken to at least send a
 @code{pop3_noop ()} between lengthy period of times.}.  Once a succesfull
 @code{pop3_noop ()} between lengthy period of times.}.  Once a succesfull
-connection is establish with @code{pop3_open ()}, two builtin authentications
+connection is established with @code{pop3_open ()}, two builtin authentications
 are provided @code{pop3_apop ()} or @code{pop3_user ()}, @code{pop3_pass ()}.
 are provided @code{pop3_apop ()} or @code{pop3_user ()}, @code{pop3_pass ()}.
 The @code{pop3_stat ()} and @code{pop3_list ()} functions can be use to get the
 The @code{pop3_stat ()} and @code{pop3_list ()} functions can be use to get the
-messages count and sizes. Downloading of messages are done via a stream
+number and size of messages. Downloading of messages is done via a stream
 provided by @code{pop3_retr ()} or @code{pop3_top ()}@footnote{
 provided by @code{pop3_retr ()} or @code{pop3_top ()}@footnote{
 @strong{Caution:} Some Internet Service Providers do not permit to leave mail
 @strong{Caution:} Some Internet Service Providers do not permit to leave mail
 on server and the message will be deleted once downloaded.}.
 on server and the message will be deleted once downloaded.}.
-The @code{stream_t} should be
-destroy to indicate to the library that the action is finish.  POP3 only
-provide a single channel for operation, it means only one operation can be
-done at a time, all the functions will return MU_ERROR_OPERATION_IN_PROGRESS
-if call during another operation.  The functions @code{pop3_list_all ()},
-@code{pop3_uidl_all ()} and @code{pop3_capa ()} give an @code{iterator_t},
-when iterating @code{iterator_current ()} will give an object that should
-be cast appropriatly and @code{free ()} by the caller, the @code{iterator_t}
-must also be destroy, @code{iterator_destroy ()}.
+The @code{stream_t} should be destroyed to indicate to the library that the
+action is finished.  POP3 only provide a single channel for operation, it
+means only one operation can be done at a time, all the functions will return
+MU_ERROR_OPERATION_IN_PROGRESS if call during another operation.  The
+functions @code{pop3_list_all ()},
+@code{pop3_uidl_all ()} and @code{pop3_capa ()} return an @code{iterator_t},
+when iterating @code{iterator_current ()} will return an object that should
+be cast appropriatly and @code{free ()}'ed by the caller, the @code{iterator_t}
+must also be destroyed, @code{iterator_destroy ()}.
 
 
 @subsubsection Initialisation
 @subsubsection Initialisation
 @cindex POP3 Initialisation
 @cindex POP3 Initialisation
 
 
 @deftypefun int pop3_create (pop3_t *)
 @deftypefun int pop3_create (pop3_t *)
 
 
-A valid @code{pop3_t} handle must be create first.
+A valid @code{pop3_t} handle must be created first.
 
 
 @table @code
 @table @code
 @item MU_ERROR_NO_MEMORY
 @item MU_ERROR_NO_MEMORY
@@ -119,15 +119,15 @@ A valid @code{pop3_t} handle must be create first.
 
 
 @deftypefun void pop3_destroy (pop3_t *)
 @deftypefun void pop3_destroy (pop3_t *)
 
 
-When the POP3 session is finished, the structure must be free to reclaim
+When the POP3 session is finished, the structure must be @code{free ()}'ed to reclaim
 memory.
 memory.
 @end deftypefun
 @end deftypefun
 
 
 @deftypefun int pop3_open (pop3_t, const char *@var{host}, unsigned port, int @var{flags})
 @deftypefun int pop3_open (pop3_t, const char *@var{host}, unsigned port, int @var{flags})
 
 
-A connection is establish by calling @code{pop3d_open()}.  If non-blocking
-the function should be recall until the return value is no MU_ERROR_TRY_AGAIN
-or MU_ERROR_IN_PROGRESS.
+A connection is established by calling @code{pop3d_open()}.  If non-blocking
+the function should be recalled until the return value is not
+MU_ERROR_TRY_AGAIN or MU_ERROR_IN_PROGRESS.
 
 
 @table @code
 @table @code
 @item MU_ERROR_NO_MEMORY
 @item MU_ERROR_NO_MEMORY
@@ -141,10 +141,10 @@ or MU_ERROR_IN_PROGRESS.
 @end table
 @end table
 @end deftypefun
 @end deftypefun
 
 
-@deftypefun int pop3_set_carrier (pop3_t, stream_t @var{carrier});
+@deftypefun int pop3_set_stream (pop3_t, stream_t @var{carrier});
 
 
 A connection may have been started elsewhere, in this case the @code{stream_t}
 A connection may have been started elsewhere, in this case the @code{stream_t}
-object is set on the @code{pop3_t} handle.
+object is set in the @code{pop3_t} handle.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -152,6 +152,10 @@ object is set on the @code{pop3_t} handle.
 @end deftypefun
 @end deftypefun
 
 
 @deftypefun int pop3_get_carrier (pop3_t, stream_t *@var{carrier});
 @deftypefun int pop3_get_carrier (pop3_t, stream_t *@var{carrier});
+
+Fill in the @code{stream_t} object with the stream form the @code{pop3_t}
+handle.
+
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_NO_MEMORY
 @item MU_ERROR_NO_MEMORY
@@ -168,7 +172,7 @@ use of POP3, for example checking for new mail, it is the prefered
 authentication.  It reduces the risk of passwd capture.  The @var{user}
 authentication.  It reduces the risk of passwd capture.  The @var{user}
 and the shared @var{secret} are pass to @code{pop3_apop ()}, the MD5 digest
 and the shared @var{secret} are pass to @code{pop3_apop ()}, the MD5 digest
 is calculated by applying the timestamp given by the server in the greeting
 is calculated by applying the timestamp given by the server in the greeting
-followed by the @var{secret} and a @emph{APOP user digest} command is send.
+followed by the @var{secret} and @emph{APOP user digest} command is send.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -185,8 +189,8 @@ followed by the @var{secret} and a @emph{APOP user digest} command is send.
 @deftypefun int pop3_auth (pop3_t, const char *@var{auth})
 @deftypefun int pop3_auth (pop3_t, const char *@var{auth})
 
 
 To allow the use of mechanism such as @emph{SASL}, @cite{RFC 2449}, extended
 To allow the use of mechanism such as @emph{SASL}, @cite{RFC 2449}, extended
-POP3 mechanism whith AUTH. It permits the client to choose an alternate
-way of authenticate.  @strong{Caution:} The @code{pop_auth()} is a simple
+POP3 mechanism with AUTH. It permits the client to choose an alternate
+way of authenticating.  @strong{Caution:} The @code{pop_auth()} is a simple
 cover function that sends @emph{AUTH auth}, functions @code{pop3_sendline},
 cover function that sends @emph{AUTH auth}, functions @code{pop3_sendline},
 @code{pop3_readline}, @code{pop3_response} or the pop3 stream
 @code{pop3_readline}, @code{pop3_response} or the pop3 stream
 @code{pop3_get_carrier ()} should be use appropriately to deal with the
 @code{pop3_get_carrier ()} should be use appropriately to deal with the
@@ -204,13 +208,13 @@ challenges.
 @subsubsection Capa
 @subsubsection Capa
 @cindex POP3 Capa
 @cindex POP3 Capa
 
 
-@deftypefun int pop3_capa (pop3_t, iterator_t *)
+@deftypefun int pop3_capa (pop3_t, iterator_t *@var{iterator})
 
 
 The CAPA command is send to the sever and the list of capabilities is
 The CAPA command is send to the sever and the list of capabilities is
 return in an @var{iterator}. The @code{iterator_current ()} should be cast
 return in an @var{iterator}. The @code{iterator_current ()} should be cast
-to a @code{char **} and the string should be free by the caller.
+to a @code{char **} and the string should be @code{free ()}'ed by the caller.
 @strong{Caution:} The iterator must be destroy after use, it will discard
 @strong{Caution:} The iterator must be destroy after use, it will discard
-any remaining response from CAPA and clear the way for new operations.
+any remaining responses from CAPA and clear the way for new operations.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -247,12 +251,12 @@ void print_capabilities (pop3_t pop3)
 
 
 @end deftypefun
 @end deftypefun
 
 
-@subsubsection Dele
-@cindex POP3 Dele
+@subsubsection DELE
+@cindex POP3 DELE
 
 
 @deftypefun int pop3_dele (pop3_t, unsigned @var{msgno})
 @deftypefun int pop3_dele (pop3_t, unsigned @var{msgno})
 
 
-Sends A Dele to the servers who will mark the @var{msgno} for deletion.
+Sends a DELE to the servers who will mark the @var{msgno} for deletion.
 The @var{msgno} may not refer to a message already marked deleted.
 The @var{msgno} may not refer to a message already marked deleted.
 If successfull any future reference to @var{msgno} in other operations will
 If successfull any future reference to @var{msgno} in other operations will
 be an error, unless unmarked by RSET.
 be an error, unless unmarked by RSET.
@@ -267,13 +271,13 @@ be an error, unless unmarked by RSET.
 
 
 @end deftypefun
 @end deftypefun
 
 
-@subsubsection List
-@cindex POP3 List
+@subsubsection LIST
+@cindex POP3 LIST
 @cindex struct pop3_list
 @cindex struct pop3_list
 
 
 @deftypefun int pop3_list (pop3_t, unsigned @var{msgno}, size_t *@var{size})
 @deftypefun int pop3_list (pop3_t, unsigned @var{msgno}, size_t *@var{size})
 
 
-Sends a List for a specific @var{msgno} and returns the @var{size}.
+Sends a LIST for a specific @var{msgno} and returns the @var{size}.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -284,12 +288,12 @@ Sends a List for a specific @var{msgno} and returns the @var{size}.
 @end table
 @end table
 @end deftypefun
 @end deftypefun
 
 
-@deftypefun int pop3_list_all (pop3_t, unsigned @var{msgno}, iterator_t *)
+@deftypefun int pop3_list_all (pop3_t, unsigned @var{msgno}, iterator_t *@var{iterator})
 
 
 Sends A LIST with no argument to the server. The @var{iterator} must be
 Sends A LIST with no argument to the server. The @var{iterator} must be
 destroy after use, it will discard any remaining response from LIST and
 destroy after use, it will discard any remaining response from LIST and
 clear the way for new operations.  The @code{iterator_current ()} returns
 clear the way for new operations.  The @code{iterator_current ()} returns
-a @code{struct pop3_list *} that must be @code{free ()}.
+a @code{struct pop3_list *} that must be @code{free ()}'ed.
 
 
 @example
 @example
 struct pop3_list
 struct pop3_list
@@ -371,7 +375,7 @@ Sends the PASS, to authenticate after the USER command.
 
 
 @deftypefun int pop3_quit (pop3_t)
 @deftypefun int pop3_quit (pop3_t)
 
 
-Enter the UPDATE state.  The server will delet all mesages marked
+Enter the UPDATE state.  The server will delete all messages marked
 deleted before closing the connection.
 deleted before closing the connection.
 
 
 @table @code
 @table @code
@@ -388,9 +392,9 @@ deleted before closing the connection.
 
 
 @deftypefun int pop3_retr (pop3_t, unsigned @var{msgno}, stream_t *)
 @deftypefun int pop3_retr (pop3_t, unsigned @var{msgno}, stream_t *)
 
 
-If successfull a @code{stream_t} is created to allow dowloading of the message,
+If successfull a @code{stream_t} is created to allow downloading of the message,
 byte-stuff lines or handle internally, CRLFs are converted to LF.  All other
 byte-stuff lines or handle internally, CRLFs are converted to LF.  All other
-operations will failed until the stream is destroyed by the caller.
+operations will fail until the stream is destroyed by the caller.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -406,7 +410,7 @@ operations will failed until the stream is destroyed by the caller.
 
 
 @deftypefun int pop3_rset (pop3_t)
 @deftypefun int pop3_rset (pop3_t)
 
 
-Sends a RSET to unmarked the messages maked deleted.
+Sends a RSET to unmark the messages marked as deleted.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -422,8 +426,8 @@ Sends a RSET to unmarked the messages maked deleted.
 
 
 @deftypefun int pop3_stat (pop3_t, unsigned @var{msgno}, unsigned *@var{msg_count}, size_t *@var{size})
 @deftypefun int pop3_stat (pop3_t, unsigned @var{msgno}, unsigned *@var{msg_count}, size_t *@var{size})
 
 
-Call a drop listing for the maildrop.  The number of messages in the mailbox
-and the size of the mailbox in octets. @strong{Caution:} The size is in RFC
+The number of messages in the mailbox and the size of the mailbox in octets.
+@strong{Caution:} The size is in RFC
 822 where line termination is CRLF, messages marked as deleted are not counted
 822 where line termination is CRLF, messages marked as deleted are not counted
 in either total.
 in either total.
 
 
@@ -459,8 +463,8 @@ operations will failed until the stream is destroyed by the caller.
 
 
 @deftypefun int pop3_uidl (pop3_t, unsigned @var{msgno}, char **@var{uidl})
 @deftypefun int pop3_uidl (pop3_t, unsigned @var{msgno}, char **@var{uidl})
 
 
-The Uniq Identifier is return in @var{uidl}, the string must be free,
-by the caller.
+The Uniq Identifier is return in @var{uidl}, the string must be
+@code{free ()}'ed, by the caller.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -474,8 +478,8 @@ by the caller.
 @deftypefun int pop3_uidl_all (pop3_t, iterator_t *)
 @deftypefun int pop3_uidl_all (pop3_t, iterator_t *)
 
 
 An @code{iterator_t} object is return to iterate through the response and
 An @code{iterator_t} object is return to iterate through the response and
-must be destroy by the caller.  The @code{iterator_current ()} is a
-@code{char **} that must be @code{free ()} by the caller.
+must be destroyed by the caller.  The @code{iterator_current ()} is a
+@code{char **} that must be @code{free ()}'ed by the caller.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -507,7 +511,7 @@ Sends the User command.
 @deftypefun int pop3_writeline (pop3_t, const char *@var{format}, ...);
 @deftypefun int pop3_writeline (pop3_t, const char *@var{format}, ...);
 
 
 Copy in the internal buffer of @code{pop3_t} the string, @code{pop3_send ()}
 Copy in the internal buffer of @code{pop3_t} the string, @code{pop3_send ()}
-should be call later to flush the string to POP3 server.
+should be called later to flush the string to the POP3 server.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER
@@ -545,7 +549,7 @@ int pop3_sendline (pop3_t pop3, const char *line)
 
 
 @deftypefun int pop3_send (pop3_t, const char *@var{cmd});
 @deftypefun int pop3_send (pop3_t, const char *@var{cmd});
 
 
-Flushes out the strings int the @code{pop3_t} internal buffer to the channel.
+Flushes out the strings in the @code{pop3_t} internal buffer to the channel.
 
 
 @table @code
 @table @code
 @item MU_ERROR_INVALID_PARAMETER
 @item MU_ERROR_INVALID_PARAMETER

 @example
 @example
-@code{/* Prefix @emph{sendmail_} is reserve */}
+@code{/* Prefix @emph{sendmail_} is reserved */}
 @code{#include <mailutils/sendmail.h>}
 @code{#include <mailutils/sendmail.h>}
 
 
 @end example
 @end example
 
 
-Spawning Sedmail daemon to deliver mail. Not implemented.
+Spawning Sendmail daemon to deliver mail. Not implemented.

 @example
 @example
-@code{/* Prefix @emph{smtp_} is reserve */}
+@code{/* Prefix @emph{smtp_} is reserved */}
 @code{#include <mailutils/smtp.h>}
 @code{#include <mailutils/smtp.h>}
 
 
 @end example
 @end example