diff --git a/lib/lwres/man/lwres_context.3 b/lib/lwres/man/lwres_context.3
index e7a908c026..d55c14fef6 100644
--- a/lib/lwres/man/lwres_context.3
+++ b/lib/lwres/man/lwres_context.3
@@ -143,10 +143,6 @@ allocates
 \fIlen\fR
 bytes of memory and if successful returns a pointer to the allocated
 storage.
-\fBlwres_context_allocmem()\fR
-checks that
-\fIlen\fR
-must be greater than 0.
 \fBlwres_context_freemem()\fR
 frees
 \fIlen\fR
diff --git a/lib/lwres/man/lwres_context.html b/lib/lwres/man/lwres_context.html
index b9e2b69390..377125c434 100644
--- a/lib/lwres/man/lwres_context.html
+++ b/lib/lwres/man/lwres_context.html
@@ -364,18 +364,6 @@ bytes of memory and if successful returns a pointer to the allocated
 storage.
 <TT
 CLASS="FUNCTION"
->lwres_context_allocmem()</TT
->
-checks that
-<TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->
-must be greater than 0.
-<TT
-CLASS="FUNCTION"
 >lwres_context_freemem()</TT
 >
 frees
@@ -434,7 +422,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN117"
+NAME="AEN115"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -497,7 +485,7 @@ times out waiting for a response.</P
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN132"
+NAME="AEN130"
 ></A
 ><H2
 >SEE ALSO</H2
diff --git a/lib/lwres/man/lwres_getrrsetbyname.3 b/lib/lwres/man/lwres_getrrsetbyname.3
index 7a47bb0a11..301630e232 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.3
+++ b/lib/lwres/man/lwres_getrrsetbyname.3
@@ -118,9 +118,25 @@ created by a call to
 .SH "RETURN VALUES"
 .PP
 \fBlwres_getrrsetbyname()\fR
-returns zero on success or an error code if an error occurs. The defined
-error codes are ERRSET_NOMEMORY (memory could not be allocated),
-ERRSET_INVAL (a parameter is invalid) and ERRSET_FAIL (other failure).
+returns zero on success, and one of the following error
+codes if an error occurred:
+.TP
+\fBERRSET_NONAME\fR
+the name does not exist
+.TP
+\fBERRSET_NODATA\fR
+the name exists, but does not have data of the desired type
+.TP
+\fBERRSET_NOMEMORY\fR
+memory could not be allocated
+.TP
+\fBERRSET_INVAL\fR
+a parameter is invalid
+.TP
+\fBERRSET_FAIL\fR
+other failure
+.TP
+\fB\fR
 .SH "SEE ALSO"
 .PP
 \fBlwres\fR(3).
diff --git a/lib/lwres/man/lwres_getrrsetbyname.html b/lib/lwres/man/lwres_getrrsetbyname.html
index ba6c118f7f..3e5ab615c2 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.html
+++ b/lib/lwres/man/lwres_getrrsetbyname.html
@@ -285,14 +285,75 @@ NAME="AEN62"
 CLASS="FUNCTION"
 >lwres_getrrsetbyname()</TT
 >
-returns zero on success or an error code if an error occurs.  The defined
-error codes are ERRSET_NOMEMORY (memory could not be allocated),
-ERRSET_INVAL (a parameter is invalid) and ERRSET_FAIL (other failure).</P
+returns zero on success, and one of the following error
+codes if an error occurred:
+<P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+><TT
+CLASS="CONSTANT"
+>ERRSET_NONAME</TT
+></DT
+><DD
+><P
+>the name does not exist</P
+></DD
+><DT
+><TT
+CLASS="CONSTANT"
+>ERRSET_NODATA</TT
+></DT
+><DD
+><P
+>the name exists, but does not have data of the desired type</P
+></DD
+><DT
+><TT
+CLASS="CONSTANT"
+>ERRSET_NOMEMORY</TT
+></DT
+><DD
+><P
+>memory could not be allocated</P
+></DD
+><DT
+><TT
+CLASS="CONSTANT"
+>ERRSET_INVAL</TT
+></DT
+><DD
+><P
+>a parameter is invalid</P
+></DD
+><DT
+><TT
+CLASS="CONSTANT"
+>ERRSET_FAIL</TT
+></DT
+><DD
+><P
+>other failure</P
+></DD
+><DT
+><TT
+CLASS="CONSTANT"
+></TT
+></DT
+><DD
+><P
+></P
+></DD
+></DL
+></DIV
+>&#13;</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66"
+NAME="AEN97"
 ></A
 ><H2
 >SEE ALSO</H2
diff --git a/lib/lwres/man/lwres_packet.3 b/lib/lwres/man/lwres_packet.3
index 9b2a591f73..d7fb6f077b 100644
--- a/lib/lwres/man/lwres_packet.3
+++ b/lib/lwres/man/lwres_packet.3
@@ -138,10 +138,6 @@ buffer \fI*b\fR to resolver packet
 \fI*pkt\fR. The contents of the buffer
 \fIb\fR should correspond to a
 \fBlwres_lwpacket_t\fR.
-.PP
-Both functions have assertion checks to ensure that
-\fIb\fR and \fIpkt\fR are not
-\fBNULL\fR.
 .SH "RETURN VALUES"
 .PP
 Successful calls to
diff --git a/lib/lwres/man/lwres_packet.html b/lib/lwres/man/lwres_packet.html
index 2d2ab53b49..5c5828f498 100644
--- a/lib/lwres/man/lwres_packet.html
+++ b/lib/lwres/man/lwres_packet.html
@@ -329,28 +329,11 @@ CLASS="PARAMETER"
 CLASS="TYPE"
 >lwres_lwpacket_t</SPAN
 >.</P
-><P
->Both functions have assertion checks to ensure that
-<TT
-CLASS="PARAMETER"
-><I
->b</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->pkt</I
-></TT
-> are not
-<SPAN
-CLASS="TYPE"
->NULL</SPAN
->.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN111"
+NAME="AEN107"
 ></A
 ><H2
 >RETURN VALUES</H2
diff --git a/lib/lwres/man/lwres_resutil.3 b/lib/lwres/man/lwres_resutil.3
index d23a062857..6db4825b0f 100644
--- a/lib/lwres/man/lwres_resutil.3
+++ b/lib/lwres/man/lwres_resutil.3
@@ -50,12 +50,9 @@ length of that string is given by \fI*len\fR. The
 buffer's current pointer is advanced to point at the character
 following the string length, the encoded string, and the trailing
 \fBNULL\fR character.
-\fBlwres_string_parse()\fR has an assertion check that
-\fIb\fR is not \fBNULL\fR.
 .PP
 \fBlwres_addr_parse()\fR extracts an address from the
-buffer \fIb\fR. It checks that
-\fIaddr\fR is not null. The buffer's current pointer
+buffer \fIb\fR. The buffer's current pointer
 b->current is presumed to point at an encoded
 address: the address preceded by a 32-bit protocol family identifier
 and a 16-bit length field. The encoded address is copied to
@@ -101,9 +98,6 @@ addresses are to be looked up. Current values for this bitmask are
 \fBLWRES_ADDRTYPE_V4\fR for IPv4 addresses and
 \fBLWRES_ADDRTYPE_V6\fR for IPv6 addresses. Results of the
 lookup are returned in \fI*structp\fR.
-\fBlwres_getaddrsbyname()\fR checks that its pointer
-arguments are not \fBNULL\fR and that
-\fIaddrtypes\fR is non-zero. 
 .PP
 \fBlwres_getnamebyaddr()\fR performs reverse lookups.
 Resolver context \fIctx\fR is used for memory
@@ -112,13 +106,7 @@ allocation. The address type is indicated by
 \fBLWRES_ADDRTYPE_V6\fR. The address to be looked up is given
 by \fIaddr\fR and its length is
 \fIaddrlen\fR bytes. The result of the function call
-is made available through \fI*structp\fR. Like
-\fBlwres_getaddrsbyname()\fR,
-\fBlwres_getnamebyaddr()\fR uses assertion checking to
-ensure its pointer arguments are not \fBNULL\fR and
-\fIaddrtype\fR is not zero.
-\fBlwres_getaddrsbyname()\fR also checks that
-\fIaddrlen\fR is non-zero.
+is made available through \fI*structp\fR.
 .SH "RETURN VALUES"
 .PP
 Successful calls to
diff --git a/lib/lwres/man/lwres_resutil.html b/lib/lwres/man/lwres_resutil.html
index 31466df7fd..ae3a2f6463 100644
--- a/lib/lwres/man/lwres_resutil.html
+++ b/lib/lwres/man/lwres_resutil.html
@@ -135,20 +135,7 @@ following the string length, the encoded string, and the trailing
 <SPAN
 CLASS="TYPE"
 >NULL</SPAN
-> character.
-<TT
-CLASS="FUNCTION"
->lwres_string_parse()</TT
-> has an assertion check that
-<TT
-CLASS="PARAMETER"
-><I
->b</I
-></TT
-> is not <SPAN
-CLASS="TYPE"
->NULL</SPAN
->.</P
+> character.</P
 ><P
 ><TT
 CLASS="FUNCTION"
@@ -159,13 +146,7 @@ CLASS="PARAMETER"
 ><I
 >b</I
 ></TT
->.  It checks that
-<TT
-CLASS="PARAMETER"
-><I
->addr</I
-></TT
-> is not null.  The buffer's current pointer
+>.  The buffer's current pointer
 <TT
 CLASS="CONSTANT"
 >b-&gt;current</TT
@@ -265,21 +246,7 @@ CLASS="PARAMETER"
 ><I
 >*structp</I
 ></TT
->.
-<TT
-CLASS="FUNCTION"
->lwres_getaddrsbyname()</TT
-> checks that its pointer
-arguments are not <SPAN
-CLASS="TYPE"
->NULL</SPAN
-> and that
-<TT
-CLASS="PARAMETER"
-><I
->addrtypes</I
-></TT
-> is non-zero.  </P
+>.</P
 ><P
 ><TT
 CLASS="FUNCTION"
@@ -322,40 +289,12 @@ CLASS="PARAMETER"
 ><I
 >*structp</I
 ></TT
->.  Like
-<TT
-CLASS="FUNCTION"
->lwres_getaddrsbyname()</TT
->,
-<TT
-CLASS="FUNCTION"
->lwres_getnamebyaddr()</TT
-> uses assertion checking to
-ensure its pointer arguments are not <SPAN
-CLASS="TYPE"
->NULL</SPAN
-> and
-<TT
-CLASS="PARAMETER"
-><I
->addrtype</I
-></TT
-> is not zero.
-<TT
-CLASS="FUNCTION"
->lwres_getaddrsbyname()</TT
-> also checks that
-<TT
-CLASS="PARAMETER"
-><I
->addrlen</I
-></TT
-> is non-zero.</P
+>.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN97"
+NAME="AEN84"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -447,7 +386,7 @@ small.</P
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN118"
+NAME="AEN105"
 ></A
 ><H2
 >SEE ALSO</H2