Document return values of putenv and setenv

	[BZ #10153]
	* manual/startup.texi (Environment Access): Describe return
	value for putenv and setenv.

3 files changed, 20 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ce740970c4..519fec7975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-04-08  Andreas Jaeger  <aj@suse.de>
 
+	[BZ #10153]
+	* manual/startup.texi (Environment Access): Describe return value
+	for putenv and setenv.
+
 	[BZ #6895]
 	* manual/filesys.texi (Directory Entries): Add description for
 	DT_LNK.
diff --git a/NEWS b/NEWS
index 01b730c67a..1150b9443d 100644
--- a/NEWS
+++ b/NEWS
@@ -12,15 +12,15 @@ Version 2.16
   174, 350, 369, 411, 2541, 2547, 2548, 2551, 2552, 2553, 2554, 2562, 2563,
   2565, 2566, 2576, 2678, 3335, 3866, 3868, 3976, 3992, 4026, 4108, 4596,
   4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730, 6770, 6884,
-  6890, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140, 10210, 10346,
-  10545, 10716, 11174, 11322, 11365, 11451, 11494, 12047, 12340, 13058,
-  13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547,
-  13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637,
-  13656, 13658, 13673, 13691, 13695, 13704, 13706, 13726, 13738, 13760,
-  13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851,
-  13852, 13854, 13871, 13879, 13883, 13892, 13895, 13908, 13910, 13911,
-  13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926,
-  13928, 13938
+  6890, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140, 10153, 10210,
+  10346, 10545, 10716, 11174, 11322, 11365, 11451, 11494, 12047, 12340,
+  13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533,
+  13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618,
+  13637, 13656, 13658, 13673, 13691, 13695, 13704, 13706, 13726, 13738,
+  13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846,
+  13851, 13852, 13854, 13871, 13879, 13883, 13892, 13895, 13908, 13910,
+  13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921,
+  13926, 13928, 13938
 
 * ISO C11 support:
 
diff --git a/manual/startup.texi b/manual/startup.texi
index 93dca303ca..ed75e7bdc3 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -335,6 +335,9 @@ definition is added to the environment.  Otherwise, the @var{string} is
 interpreted as the name of an environment variable, and any definition
 for this variable in the environment is removed.
 
+If the function is successful it returns @code{0}.  Otherwise the return
+value is nonzero and @code{errno} is set to indicate the error.
+
 The difference to the @code{setenv} function is that the exact string
 given as the parameter @var{string} is put into the environment.  If the
 user should change the string after the @code{putenv} call this will
@@ -364,6 +367,10 @@ the old entry is replaced by the new one.
 
 Please note that you cannot remove an entry completely using this function.
 
+If the function is successful it returns @code{0}.  Otherwise the
+environment is unchanged and the return value is @code{-1} and
+@code{errno} is set.
+
 This function was originally part of the BSD library but is now part of
 the Unix standard.
 @end deftypefun