# HG changeset patch
# User Rik <rik@octave.org>
# Date 1439177744 25200
# Node ID 859423f351a36ac99266197a6f226c003ae3a2d1
# Parent  a76e20f2f156ebd4ddfc60416b78e835ab289f54# Parent  8fcbb55745efb79383fb111af06a6644d4b477b4
maint: Periodic merge of stable to default.

diff --git a/libinterp/corefcn/bitfcns.cc b/libinterp/corefcn/bitfcns.cc
--- a/libinterp/corefcn/bitfcns.cc
+++ b/libinterp/corefcn/bitfcns.cc
@@ -687,7 +687,7 @@
 value.\n\
 \n\
 The default class is @qcode{\"double\"}, but @qcode{\"single\"} is a\n\
-valid option.  On IEEE-754 compatible systems, @code{bitmax} is\n\
+valid option.  On IEEE 754 compatible systems, @code{bitmax} is\n\
 @w{@math{2^{53} - 1}} for @qcode{\"double\"} and @w{@math{2^{24} -1}} for\n\
 @qcode{\"single\"}.\n\
 @seealso{flintmax, intmax, realmax, realmin}\n\
@@ -724,8 +724,8 @@
 floating point value.\n\
 \n\
 The default class is @qcode{\"double\"}, but @qcode{\"single\"} is a valid\n\
-option.  On IEEE-754 compatible systems, @code{flintmax} is @w{@math{2^53}}\n\
-for @qcode{\"double\"} and @w{@math{2^24}} for @qcode{\"single\"}.\n\
+option.  On IEEE 754 compatible systems, @code{flintmax} is @w{@math{2^{53}}}\n\
+for @qcode{\"double\"} and @w{@math{2^{24}}} for @qcode{\"single\"}.\n\
 @seealso{bitmax, intmax, realmax, realmin}\n\
 @end deftypefn")
 {
diff --git a/libinterp/corefcn/file-io.cc b/libinterp/corefcn/file-io.cc
--- a/libinterp/corefcn/file-io.cc
+++ b/libinterp/corefcn/file-io.cc
@@ -668,19 +668,19 @@
 The parameter @var{arch} is a string specifying the default data format\n\
 for the file.  Valid values for @var{arch} are:\n\
 \n\
-@table @samp\n\
-@item native (default)\n\
+@table @asis\n\
+@item @qcode{\"native\"} or @qcode{\"n\"} (default)\n\
 The format of the current machine.\n\
 \n\
-@item ieee-be\n\
+@item @qcode{\"ieee-be\"} or @qcode{\"b\"}\n\
 IEEE big endian format.\n\
 \n\
-@item ieee-le\n\
+@item @qcode{\"ieee-le\"} or @qcode{\"l\"}\n\
 IEEE little endian format.\n\
 @end table\n\
 \n\
 @noindent\n\
-however, conversions are currently only supported for @samp{native}\n\
+However, conversions are currently only supported for @samp{native},\n\
 @samp{ieee-be}, and @samp{ieee-le} formats.\n\
 \n\
 When opening a new file that does not yet exist, permissions will be set to\n\
@@ -1598,13 +1598,13 @@
 for the file.  Valid values are\n\
 \n\
 @table @asis\n\
-@item @qcode{\"native\"}\n\
+@item @qcode{\"native\"} or @qcode{\"n\"}\n\
 The format of the current machine.\n\
 \n\
-@item @qcode{\"ieee-be\"}\n\
+@item @qcode{\"ieee-be\"} or @qcode{\"b\"}\n\
 IEEE big endian.\n\
 \n\
-@item @qcode{\"ieee-le\"}\n\
+@item @qcode{\"ieee-le\"} or @qcode{\"l\"}\n\
 IEEE little endian.\n\
 @end table\n\
 \n\
diff --git a/libinterp/octave-value/ov-fcn-handle.cc b/libinterp/octave-value/ov-fcn-handle.cc
--- a/libinterp/octave-value/ov-fcn-handle.cc
+++ b/libinterp/octave-value/ov-fcn-handle.cc
@@ -1854,6 +1854,10 @@
 \n\
 If the optional @qcode{\"global\"} argument is passed, locally visible\n\
 functions are ignored in the lookup.\n\
+\n\
+Note: @code{str2func} does not currently accept strings which define\n\
+anonymous functions (those which begin with @samp{a}).\n\
+Use @code{eval (@var{str})} as a replacement.\n\
 @seealso{func2str, inline}\n\
 @end deftypefn")
 {
diff --git a/scripts/statistics/distributions/unidpdf.m b/scripts/statistics/distributions/unidpdf.m
--- a/scripts/statistics/distributions/unidpdf.m
+++ b/scripts/statistics/distributions/unidpdf.m
@@ -25,7 +25,7 @@
 ##
 ## Warning: The underlying implementation uses the double class and will only
 ## be accurate for @var{n} @leq{} @code{bitmax} (@w{@math{2^{53} - 1}} on
-## IEEE-754 compatible systems).
+## IEEE 754 compatible systems).
 ## @end deftypefn
 
 function pdf = unidpdf (x, n)