diff libinterp/corefcn/file-io.cc @ 20492:642ce72cf1ab

maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Thu, 20 Aug 2015 06:42:54 -0700
parents 859423f351a3 97edbce9b975
children c41595061186
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc	Wed Aug 19 16:18:45 2015 -0400
+++ b/libinterp/corefcn/file-io.cc	Thu Aug 20 06:42:54 2015 -0700
@@ -1608,7 +1608,12 @@
 IEEE little endian.\n\
 @end table\n\
 \n\
+If no @var{arch} is given the value used in the call to @code{fopen} which\n\
+created the file descriptor is used.  Otherwise, the value specified with\n\
+@code{fread} overrides that of @code{fopen} and determines the data format.\n\
+\n\
 The output argument @var{val} contains the data read from the file.\n\
+\n\
 The optional return value @var{count} contains the number of elements read.\n\
 @seealso{fwrite, fgets, fgetl, fscanf, fopen}\n\
 @end deftypefn")