doc updates and type fixes.

--

2 files changed, 17 insertions, 3 deletions

diff --git a/doc/errorref.txt b/doc/errorref.txt
index 8a96673..f4ff673 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -231,7 +231,13 @@ GPG_ERR_MISSING_CERT		Missing certificate
 67	GPG_ERR_TOO_LARGE		Provided object is too large
 68	GPG_ERR_NO_OBJ			Missing item in object
 69	GPG_ERR_NOT_IMPLEMENTED		Not implemented
-70	GPG_ERR_CONFLICT		Conflicting use
+
+GPG_ERR_CONFLICT		Conflicting use
+
+    NTBTLS: - Function has already been called and may not be called
+              again at this protocol state.
+
+
 71	GPG_ERR_INV_CIPHER_MODE		Invalid cipher mode
 72	GPG_ERR_INV_FLAG		Invalid flag
 73	GPG_ERR_INV_HANDLE		Invalid handle
@@ -395,7 +401,15 @@ GPG_ERR_UNSUPPORTED_ENCODING	Unsupported encoding
 153	GPG_ERR_KEY_EXPIRED		Key expired
 154	GPG_ERR_SIG_EXPIRED		Signature expired
 155	GPG_ERR_ENCODING_PROBLEM	Encoding problem
-156	GPG_ERR_INV_STATE		Invalid state
+
+GPG_ERR_INV_STATE		Invalid state
+
+    The state (of a protocol) is not possible or not defined at all.
+
+    NTBTLS: - Data received in an unexpected state.
+
+
+
 157	GPG_ERR_DUP_VALUE		Duplicated value
 
 GPG_ERR_MISSING_ACTION		Missing action
diff --git a/src/estream.c b/src/estream.c
index 1bff535..46be363 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -1749,7 +1749,7 @@ init_stream_obj (estream_t stream,
      reading mode.  This is required in case we are working on a
      stream which is not seeekable (like stdout).  Without this
      pre-initialization we would do a seek at the first write call and
-     as this will fail no utput will be delivered. */
+     as this will fail no output will be delivered. */
   if ((modeflags & O_WRONLY) || (modeflags & O_RDWR) )
     stream->flags.writing = 1;
   else