2 files changed, 15 insertions, 12 deletions
diff --git a/manual/math.texi b/manual/math.texi
index 9c0552d2ff..a7d6c8821b 100644
--- a/manual/math.texi
+++ b/manual/math.texi
@@ -1360,14 +1360,15 @@ The prototypes for these functions are in @file{stdlib.h}.
 
 @comment stdlib.h
 @comment BSD
-@deftypefun {int32_t} random (void)
+@deftypefun {long int} random (void)
 This function returns the next pseudo-random number in the sequence.
 The value returned ranges from @code{0} to @code{RAND_MAX}.
 
-@strong{Note:} Historically this function returned a @code{long int}
-value.  On 64-bit systems @code{long int} would have been larger than
-programs expected, so @code{random} is now defined to return exactly 32
-bits.
+@strong{Note:} Temporarily this function was defined to return a
+@code{int32_t} value to indicate that the return value always contains
+32 bits even if @code{long int} is wider.  The standard demands it
+differently.  Users must always be aware of the 32-bit limitation,
+though.
 @end deftypefun
 
 @comment stdlib.h
diff --git a/manual/startup.texi b/manual/startup.texi
index 526d19d639..66c4a88fd5 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -364,23 +364,25 @@ the old entry is replaced by the new one.
 
 Please note that you cannot remove an entry completely using this function.
 
-This function is part of the BSD library.  The GNU C Library provides
-this function for compatibility but it may not be available on other
-systems.
+This function was originally part of the BSD library but is now part of
+the Unix standard.
 @end deftypefun
 
 @comment stdlib.h
 @comment BSD
-@deftypefun void unsetenv (const char *@var{name})
+@deftypefun int unsetenv (const char *@var{name})
 Using this function one can remove an entry completely from the
 environment.  If the environment contains an entry with the key
 @var{name} this whole entry is removed.  A call to this function is
 equivalent to a call to @code{putenv} when the @var{value} part of the
 string is empty.
 
-This function is part of the BSD library.  The GNU C Library provides
-this function for compatibility but it may not be available on other
-systems.
+The function return @code{-1} if @var{name} is a null pointer, points to
+an empty string, or points to a string containing a @code{=} character.
+It returns @code{0} if the call succeeded.
+
+This function was originall part of the BSD library but is now part of
+the Unix standard.  The BSD version had no return value, though.
 @end deftypefun
 
 There is one more function to modify the whole environment.  This