changeset 24432:6cf385e26616

maint: merge stable to default.
author Rik <rik@octave.org>
date Tue, 19 Dec 2017 12:41:30 -0800
parents e1651094f68b (current diff) 0c6cedafc71e (diff)
children 96a228168986
files scripts/geometry/voronoi.m scripts/plot/appearance/axis.m scripts/plot/appearance/box.m scripts/plot/appearance/caxis.m scripts/plot/appearance/datetick.m scripts/plot/appearance/grid.m scripts/plot/appearance/legend.m scripts/plot/appearance/lighting.m scripts/plot/appearance/shading.m scripts/plot/appearance/title.m scripts/plot/appearance/view.m scripts/plot/appearance/xlabel.m scripts/plot/appearance/xlim.m scripts/plot/appearance/ylabel.m scripts/plot/appearance/ylim.m scripts/plot/appearance/zlabel.m scripts/plot/appearance/zlim.m scripts/plot/draw/area.m scripts/plot/draw/bar.m scripts/plot/draw/barh.m scripts/plot/draw/colorbar.m scripts/plot/draw/comet.m scripts/plot/draw/comet3.m scripts/plot/draw/compass.m scripts/plot/draw/contour.m scripts/plot/draw/contour3.m scripts/plot/draw/contourf.m scripts/plot/draw/cylinder.m scripts/plot/draw/ellipsoid.m scripts/plot/draw/errorbar.m scripts/plot/draw/ezcontour.m scripts/plot/draw/ezcontourf.m scripts/plot/draw/ezmesh.m scripts/plot/draw/ezmeshc.m scripts/plot/draw/ezplot.m scripts/plot/draw/ezplot3.m scripts/plot/draw/ezpolar.m scripts/plot/draw/ezsurf.m scripts/plot/draw/ezsurfc.m scripts/plot/draw/feather.m scripts/plot/draw/fill.m scripts/plot/draw/fplot.m scripts/plot/draw/hist.m scripts/plot/draw/line.m scripts/plot/draw/loglog.m scripts/plot/draw/loglogerr.m scripts/plot/draw/mesh.m scripts/plot/draw/meshc.m scripts/plot/draw/meshz.m scripts/plot/draw/pareto.m scripts/plot/draw/patch.m scripts/plot/draw/pcolor.m scripts/plot/draw/pie.m scripts/plot/draw/pie3.m scripts/plot/draw/plot.m scripts/plot/draw/plot3.m scripts/plot/draw/plotmatrix.m scripts/plot/draw/plotyy.m scripts/plot/draw/polar.m scripts/plot/draw/quiver.m scripts/plot/draw/quiver3.m scripts/plot/draw/rectangle.m scripts/plot/draw/ribbon.m scripts/plot/draw/rose.m scripts/plot/draw/scatter.m scripts/plot/draw/scatter3.m scripts/plot/draw/semilogx.m scripts/plot/draw/semilogxerr.m scripts/plot/draw/semilogy.m scripts/plot/draw/semilogyerr.m scripts/plot/draw/slice.m scripts/plot/draw/sphere.m scripts/plot/draw/stairs.m scripts/plot/draw/stem.m scripts/plot/draw/stem3.m scripts/plot/draw/surf.m scripts/plot/draw/surface.m scripts/plot/draw/surfc.m scripts/plot/draw/surfl.m scripts/plot/draw/surfnorm.m scripts/plot/draw/waterfall.m scripts/plot/util/axes.m scripts/plot/util/cla.m scripts/plot/util/gca.m scripts/plot/util/hold.m scripts/plot/util/newplot.m scripts/plot/util/subplot.m
diffstat 87 files changed, 118 insertions(+), 114 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/geometry/voronoi.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/geometry/voronoi.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,8 +35,8 @@
 ## If @qcode{"linespec"} is given it is used to set the color and line style of
 ## the plot.
 ##
-## If an axis graphics handle @var{hax} is supplied then the Voronoi diagram is
-## drawn on the specified axis rather than in a new figure.
+## If an axes graphics handle @var{hax} is supplied then the Voronoi diagram is
+## drawn on the specified axes rather than in a new figure.
 ##
 ## If a single output argument is requested then the Voronoi diagram will be
 ## plotted and a graphics handle @var{h} to the plot is returned.
--- a/scripts/plot/appearance/axis.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/axis.m	Tue Dec 19 12:41:30 2017 -0800
@@ -34,7 +34,7 @@
 ## and sixth specify the limits for the z-axis, and the seventh and eighth
 ## specify the limits for the color axis.  The special values -Inf and Inf may
 ## be used to indicate that the limit should be automatically computed based
-## on the data in the axis.
+## on the data in the axes.
 ##
 ## Without any arguments, @code{axis} turns autoscaling on.
 ##
@@ -95,7 +95,7 @@
 ## Turn tick labels off for all axes.
 ## @end table
 ##
-## Note: If there are no tick marks for an axis then there can be no labels.
+## Note: If there are no tick marks for an axes then there can be no labels.
 ##
 ## @noindent
 ## The following options affect the direction of increasing values on the axes.
--- a/scripts/plot/appearance/box.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/box.m	Tue Dec 19 12:41:30 2017 -0800
@@ -21,13 +21,13 @@
 ## @deftypefnx {} {} box on
 ## @deftypefnx {} {} box off
 ## @deftypefnx {} {} box (@var{hax}, @dots{})
-## Control display of the axis border.
+## Control display of the axes border.
 ##
 ## The argument may be either @qcode{"on"} or @qcode{"off"}.  If it is
 ## omitted, the current box state is toggled.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on this
-## axis rather than the current axes returned by @code{gca}.
+## axes rather than the current axes returned by @code{gca}.
 ## @seealso{axis, grid}
 ## @end deftypefn
 
--- a/scripts/plot/appearance/caxis.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/caxis.m	Tue Dec 19 12:41:30 2017 -0800
@@ -36,7 +36,7 @@
 ## numeric values in the @qcode{"clim"} property are used for limits.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## Called without arguments the current color axis limits are returned.
 ##
--- a/scripts/plot/appearance/datetick.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/datetick.m	Tue Dec 19 12:41:30 2017 -0800
@@ -18,12 +18,13 @@
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {} datetick ()
+## @deftypefnx {} {} datetick (@var{axis_str})
 ## @deftypefnx {} {} datetick (@var{date_format})
 ## @deftypefnx {} {} datetick (@var{axis_str}, @var{date_format})
 ## @deftypefnx {} {} datetick (@dots{}, "keeplimits")
 ## @deftypefnx {} {} datetick (@dots{}, "keepticks")
 ## @deftypefnx {} {} datetick (@var{hax}, @dots{})
-## Add date formatted tick labels to an axis.
+## Add date-formatted tick labels to an axis.
 ##
 ## The axis to apply the ticks to is determined by @var{axis_str} which can
 ## take the values @qcode{"x"}, @qcode{"y"}, or @qcode{"z"}.  The default
@@ -33,6 +34,9 @@
 ## @var{date_format}, which can either be a string or positive integer that
 ## @code{datestr} accepts.
 ##
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
+## rather than the current axes returned by @code{gca}.
+##
 ## @seealso{datenum, datestr}
 ## @end deftypefn
 
--- a/scripts/plot/appearance/grid.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/grid.m	Tue Dec 19 12:41:30 2017 -0800
@@ -33,9 +33,9 @@
 ## modify the minor grid rather than the major grid.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
-## To control the grid lines for an individual axis use the @code{set}
+## To control the grid lines for an individual axes use the @code{set}
 ## function.  For example:
 ##
 ## @example
--- a/scripts/plot/appearance/legend.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/legend.m	Tue Dec 19 12:41:30 2017 -0800
@@ -33,7 +33,7 @@
 ## Legend entries may be specified as individual character string arguments,
 ## a character array, or a cell array of character strings.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.  If the handles,
 ## @var{hobjs}, are not specified then the legend's strings will be associated
 ## with the axes' descendants.  @code{legend} works on line graphs,
--- a/scripts/plot/appearance/lighting.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/lighting.m	Tue Dec 19 12:41:30 2017 -0800
@@ -36,7 +36,7 @@
 ## @end table
 ##
 ## If the first argument @var{hax} is an axes handle, then change the lighting
-## effects of objects in this axis, rather than the current axes returned by
+## effects of objects in this axes, rather than the current axes returned by
 ## @code{gca}.
 ##
 ## The lighting effects are only visible if at least one light object is
--- a/scripts/plot/appearance/shading.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/shading.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,7 +35,7 @@
 ## invisible.
 ## @end table
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ## @seealso{fill, mesh, patch, pcolor, surf, surface, hidden, lighting}
 ## @end deftypefn
--- a/scripts/plot/appearance/title.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/title.m	Tue Dec 19 12:41:30 2017 -0800
@@ -26,7 +26,7 @@
 ## An optional list of @var{property}/@var{value} pairs can be used to change
 ## the appearance of the created title text object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created text
--- a/scripts/plot/appearance/view.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/view.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,7 +37,7 @@
 ## and @w{@var{elevation} = 30}, which is the default for 3-D graphs.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## If no inputs are given, return the current @var{azimuth} and
 ## @var{elevation}.
--- a/scripts/plot/appearance/xlabel.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/xlabel.m	Tue Dec 19 12:41:30 2017 -0800
@@ -27,7 +27,7 @@
 ## the properties of the created text label.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created text
 ## object.
--- a/scripts/plot/appearance/xlim.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/xlim.m	Tue Dec 19 12:41:30 2017 -0800
@@ -40,7 +40,7 @@
 ## or @qcode{"manual"} as the argument.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## Programming Note: The @code{xlim} function operates by modifying the
 ## @qcode{"xlim"} and @qcode{"xlimmode"} properties of an axes object.  These
--- a/scripts/plot/appearance/ylabel.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/ylabel.m	Tue Dec 19 12:41:30 2017 -0800
@@ -29,7 +29,7 @@
 ## the properties of the created text label.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created text
 ## object.
--- a/scripts/plot/appearance/ylim.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/ylim.m	Tue Dec 19 12:41:30 2017 -0800
@@ -40,7 +40,7 @@
 ## or @qcode{"manual"} as the argument.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## Programming Note: The @code{ylim} function operates by modifying the
 ## @qcode{"ylim"} and @qcode{"ylimmode"} properties of an axes object.  These
--- a/scripts/plot/appearance/zlabel.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/zlabel.m	Tue Dec 19 12:41:30 2017 -0800
@@ -27,7 +27,7 @@
 ## the properties of the created text label.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created text
 ## object.
--- a/scripts/plot/appearance/zlim.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/appearance/zlim.m	Tue Dec 19 12:41:30 2017 -0800
@@ -40,7 +40,7 @@
 ## or @qcode{"manual"} as the argument.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ##
 ## Programming Note: The @code{zlim} function operates by modifying the
 ## @qcode{"zlim"} and @qcode{"zlimmode"} properties of an axes object.  These
--- a/scripts/plot/draw/area.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/area.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,7 +37,7 @@
 ## Additional property/value pairs are passed directly to the underlying patch
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the hggroup
--- a/scripts/plot/draw/bar.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/bar.m	Tue Dec 19 12:41:30 2017 -0800
@@ -59,7 +59,7 @@
 ## Optional property/value pairs are passed directly to the underlying patch
 ## objects.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of handles to the created
--- a/scripts/plot/draw/barh.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/barh.m	Tue Dec 19 12:41:30 2017 -0800
@@ -59,7 +59,7 @@
 ## Optional property/value pairs are passed directly to the underlying patch
 ## objects.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/colorbar.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/colorbar.m	Tue Dec 19 12:41:30 2017 -0800
@@ -65,7 +65,7 @@
 ## the @var{delete_option}: @qcode{"off"}, @qcode{"delete"}, @qcode{"hide"}.
 ##
 ## If the first argument @var{hax} is an axes handle, then the colorbar is
-## added to this axis, rather than the current axes returned by @code{gca}.
+## added to this axes, rather than the current axes returned by @code{gca}.
 ## Alternatively, If the argument @qcode{"peer"} is given, then the following
 ## argument is treated as the axes handle in which to add the colorbar.  The
 ## @qcode{"peer"} calling syntax may be removed in the future and is not
--- a/scripts/plot/draw/comet.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/comet.m	Tue Dec 19 12:41:30 2017 -0800
@@ -30,7 +30,7 @@
 ## time each point is displayed before moving to the next one.  The default for
 ## @var{p} is 0.1 seconds.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ## @seealso{comet3}
 ## @end deftypefn
--- a/scripts/plot/draw/comet3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/comet3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -31,7 +31,7 @@
 ## time each point is displayed before moving to the next one.  The default for
 ## @var{p} is 0.1 seconds.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ## @seealso{comet}
 ## @end deftypefn
--- a/scripts/plot/draw/compass.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/compass.m	Tue Dec 19 12:41:30 2017 -0800
@@ -33,7 +33,7 @@
 ## The style to use for the plot can be defined with a line style @var{style}
 ## of the same format as the @code{plot} command.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to the
--- a/scripts/plot/draw/contour.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/contour.m	Tue Dec 19 12:41:30 2017 -0800
@@ -34,7 +34,7 @@
 ## in the same manner as @code{plot}.  Only line style and color are used;
 ## Any markers defined by @var{style} are ignored.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional output @var{c} contains the contour levels in @code{contourc}
--- a/scripts/plot/draw/contour3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/contour3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -39,7 +39,7 @@
 ## in the same manner as @code{plot}.  Only line style and color are used;
 ## Any markers defined by @var{style} are ignored.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional output @var{c} are the contour levels in @code{contourc}
--- a/scripts/plot/draw/contourf.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/contourf.m	Tue Dec 19 12:41:30 2017 -0800
@@ -38,7 +38,7 @@
 ## in the same manner as @code{plot}.  Only line style and color are used;
 ## Any markers defined by @var{style} are ignored.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional output @var{c} contains the contour levels in @code{contourc}
--- a/scripts/plot/draw/cylinder.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/cylinder.m	Tue Dec 19 12:41:30 2017 -0800
@@ -31,7 +31,7 @@
 ## The optional input @var{n} determines the number of faces around the
 ## circumference of the cylinder.  The default value is 20.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## If outputs are requested @code{cylinder} returns three matrices in
--- a/scripts/plot/draw/ellipsoid.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ellipsoid.m	Tue Dec 19 12:41:30 2017 -0800
@@ -29,7 +29,7 @@
 ## The optional input @var{n} determines the number of faces around the
 ## circumference of the cylinder.  The default value is 20.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## If outputs are requested @code{ellipsoid} returns three matrices in
--- a/scripts/plot/draw/errorbar.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/errorbar.m	Tue Dec 19 12:41:30 2017 -0800
@@ -111,7 +111,7 @@
 ## Set xyboxes plot style.
 ## @end table
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a handle to the hggroup object
--- a/scripts/plot/draw/ezcontour.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezcontour.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,7 +35,7 @@
 ##
 ## @var{n} is a scalar defining the number of points to use in each dimension.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/ezcontourf.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezcontourf.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,7 +35,7 @@
 ##
 ## @var{n} is a scalar defining the number of points to use in each dimension.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/ezmesh.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezmesh.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## If the argument @qcode{"circ"} is given, then the function is plotted over
 ## a disk centered on the middle of the domain @var{dom}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/ezmeshc.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezmeshc.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## If the argument @qcode{"circ"} is given, then the function is plotted over
 ## a disk centered on the middle of the domain @var{dom}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a 2-element vector with a graphics
--- a/scripts/plot/draw/ezplot.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezplot.m	Tue Dec 19 12:41:30 2017 -0800
@@ -62,7 +62,7 @@
 ## @var{n} is a scalar defining the number of points to use in plotting
 ## the function.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to
--- a/scripts/plot/draw/ezplot3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezplot3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -40,7 +40,7 @@
 ## If the @qcode{"animate"} option is given then the plotting is animated
 ## in the style of @code{comet3}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/ezpolar.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezpolar.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,7 +37,7 @@
 ## @var{n} is a scalar defining the number of points to use in plotting
 ## the function.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/ezsurf.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezsurf.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## If the argument @qcode{"circ"} is given, then the function is plotted over
 ## a disk centered on the middle of the domain @var{dom}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/ezsurfc.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ezsurfc.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## If the argument @qcode{"circ"} is given, then the function is plotted over
 ## a disk centered on the middle of the domain @var{dom}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a 2-element vector with a graphics
--- a/scripts/plot/draw/feather.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/feather.m	Tue Dec 19 12:41:30 2017 -0800
@@ -32,7 +32,7 @@
 ## The style to use for the plot can be defined with a line style @var{style}
 ## of the same format as the @code{plot} command.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to the
--- a/scripts/plot/draw/fill.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/fill.m	Tue Dec 19 12:41:30 2017 -0800
@@ -42,7 +42,7 @@
 ## Multiple property/value pairs for the underlying patch object may be
 ## specified, but they must appear in pairs.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to
--- a/scripts/plot/draw/fplot.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/fplot.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## The @var{fmt} argument specifies the linestyle to be used by the plot
 ## command.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## With no output arguments the results are immediately plotted.  With two
--- a/scripts/plot/draw/hist.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/hist.m	Tue Dec 19 12:41:30 2017 -0800
@@ -61,7 +61,7 @@
 ## @end group
 ## @end example
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## With two output arguments, produce the values @var{nn} (numbers of elements)
--- a/scripts/plot/draw/line.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/line.m	Tue Dec 19 12:41:30 2017 -0800
@@ -31,7 +31,7 @@
 ## Multiple property-value pairs may be specified for the line object, but they
 ## must appear in pairs.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle (or vector of
--- a/scripts/plot/draw/loglog.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/loglog.m	Tue Dec 19 12:41:30 2017 -0800
@@ -28,7 +28,7 @@
 ## See the documentation of @code{plot} for a description of the arguments
 ## that @code{loglog} will accept.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/loglogerr.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/loglogerr.m	Tue Dec 19 12:41:30 2017 -0800
@@ -42,7 +42,7 @@
 ## format defined by @var{fmt}.  @xref{XREFerrorbar,,errorbar}, for available
 ## formats and additional information.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ## @seealso{errorbar, semilogxerr, semilogyerr}
 ## @end deftypefn
--- a/scripts/plot/draw/mesh.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/mesh.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/meshc.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/meshc.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a 2-element vector with a graphics
--- a/scripts/plot/draw/meshz.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/meshz.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/pareto.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/pareto.m	Tue Dec 19 12:41:30 2017 -0800
@@ -42,7 +42,7 @@
 ## is given it may be a string array, a cell array of strings, or a numerical
 ## vector.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a 2-element vector with a graphics
--- a/scripts/plot/draw/patch.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/patch.m	Tue Dec 19 12:41:30 2017 -0800
@@ -58,7 +58,7 @@
 ## Instead of using property/value pairs, any property can be set by passing a
 ## structure @var{propstruct} with the respective field names.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created patch
--- a/scripts/plot/draw/pcolor.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/pcolor.m	Tue Dec 19 12:41:30 2017 -0800
@@ -45,7 +45,7 @@
 ## @qcode{"faceted"}, which renders a single color for each cell's face with
 ## the edge visible.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/pie.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/pie.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,7 +35,7 @@
 ## The optional input @var{labels} is a cell array of strings of the same
 ## length as @var{x} specifying the label for each slice.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a list of handles to the patch
--- a/scripts/plot/draw/pie3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/pie3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -36,7 +36,7 @@
 ## The optional input @var{labels} is a cell array of strings of the same
 ## length as @var{x} specifying the label for each slice.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a list of graphics handles to the
--- a/scripts/plot/draw/plot.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/plot.m	Tue Dec 19 12:41:30 2017 -0800
@@ -192,7 +192,7 @@
 ## This will plot the cosine and sine functions and label them accordingly
 ## in the legend.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to
--- a/scripts/plot/draw/plot3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/plot3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -81,7 +81,7 @@
 ## objects drawn by @code{plot3}.  If the @var{fmt} argument is supplied it
 ## will format the line objects in the same manner as @code{plot}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/plotmatrix.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/plotmatrix.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,16 +44,16 @@
 ## The marker to use can be changed with the @var{style} argument, that is a
 ## string defining a marker in the same manner as the @code{plot} command.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} provides handles to the individual
 ## graphics objects in the scatter plots, whereas @var{ax} returns the
-## handles to the scatter plot axis objects.
+## handles to the scatter plot axes objects.
 ##
-## @var{bigax} is a hidden axis object that surrounds the other axes, such
+## @var{bigax} is a hidden axes object that surrounds the other axes, such
 ## that the commands @code{xlabel}, @code{title}, etc., will be associated
-## with this hidden axis.
+## with this hidden axes.
 ##
 ## Finally, @var{p} returns the graphics objects associated with the histogram
 ## and @var{pax} the corresponding axes objects.
--- a/scripts/plot/draw/plotyy.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/plotyy.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,9 +37,9 @@
 ## with @var{fun1} and @var{fun2}.
 ##
 ## If the first argument @var{hax} is an axes handle, then it defines
-## the principal axis in which to plot the @var{x1} and @var{y1} data.
+## the principal axes in which to plot the @var{x1} and @var{y1} data.
 ##
-## The return value @var{ax} is a vector with the axis handles of the two
+## The return value @var{ax} is a vector with the axes handles of the two
 ## y-axes.  @var{h1} and @var{h2} are handles to the objects generated by the
 ## plot commands.
 ##
--- a/scripts/plot/draw/polar.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/polar.m	Tue Dec 19 12:41:30 2017 -0800
@@ -31,7 +31,7 @@
 ## The optional argument @var{fmt} specifies the line format in the same way
 ## as @code{plot}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/quiver.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/quiver.m	Tue Dec 19 12:41:30 2017 -0800
@@ -48,7 +48,7 @@
 ## arrowhead is not drawn.  If the argument @qcode{"filled"} is given then the
 ## markers are filled.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to a quiver object.
--- a/scripts/plot/draw/quiver3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/quiver3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -49,7 +49,7 @@
 ## the arrowhead is not drawn.  If the argument @qcode{"filled"} is given then
 ## the markers are filled.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to a quiver object.
--- a/scripts/plot/draw/rectangle.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/rectangle.m	Tue Dec 19 12:41:30 2017 -0800
@@ -47,7 +47,7 @@
 ##
 ## Additional property/value pairs are passed to the underlying patch command.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/ribbon.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/ribbon.m	Tue Dec 19 12:41:30 2017 -0800
@@ -32,7 +32,7 @@
 ## The optional parameter @var{width} specifies the width of a single ribbon
 ## (default is 0.75).
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to
--- a/scripts/plot/draw/rose.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/rose.m	Tue Dec 19 12:41:30 2017 -0800
@@ -34,7 +34,7 @@
 ## defined by the values in @var{bins} and the number of bins is
 ## given by the number of elements in @var{bins}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a vector of graphics handles to the
--- a/scripts/plot/draw/scatter.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/scatter.m	Tue Dec 19 12:41:30 2017 -0800
@@ -49,7 +49,7 @@
 ## Additional property/value pairs are passed directly to the underlying
 ## patch object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/scatter3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/scatter3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -49,7 +49,7 @@
 ## Additional property/value pairs are passed directly to the underlying
 ## patch object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the hggroup
--- a/scripts/plot/draw/semilogx.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/semilogx.m	Tue Dec 19 12:41:30 2017 -0800
@@ -28,7 +28,7 @@
 ## See the documentation of @code{plot} for a description of the
 ## arguments that @code{semilogx} will accept.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/semilogxerr.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/semilogxerr.m	Tue Dec 19 12:41:30 2017 -0800
@@ -43,7 +43,7 @@
 ## format defined by @var{fmt}.  @xref{XREFerrorbar,,errorbar}, for available
 ## formats and additional information.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## @seealso{errorbar, semilogyerr, loglogerr}
--- a/scripts/plot/draw/semilogy.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/semilogy.m	Tue Dec 19 12:41:30 2017 -0800
@@ -28,7 +28,7 @@
 ## See the documentation of @code{plot} for a description of the
 ## arguments that @code{semilogy} will accept.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created plot.
--- a/scripts/plot/draw/semilogyerr.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/semilogyerr.m	Tue Dec 19 12:41:30 2017 -0800
@@ -43,7 +43,7 @@
 ## format defined by @var{fmt}.  @xref{XREFerrorbar,,errorbar}, for available
 ## formats and additional information.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## @seealso{errorbar, semilogxerr, loglogerr}
--- a/scripts/plot/draw/slice.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/slice.m	Tue Dec 19 12:41:30 2017 -0800
@@ -58,7 +58,7 @@
 ##
 ## The default method is @qcode{"linear"}.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/sphere.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/sphere.m	Tue Dec 19 12:41:30 2017 -0800
@@ -26,7 +26,7 @@
 ## The optional input @var{n} determines the number of faces around the
 ## circumference of the sphere.  The default value is 20.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## If outputs are requested @code{sphere} returns three matrices in
--- a/scripts/plot/draw/stairs.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/stairs.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,8 +37,8 @@
 ## Multiple property/value pairs may be specified, but they must appear in
 ## pairs.
 ##
-## If the first argument @var{hax} is an axis handle, then plot into this axis,
-## rather than the current axis handle returned by @code{gca}.
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
+## rather than the current axes returned by @code{gca}.
 ##
 ## If one output argument is requested, return a graphics handle to the
 ## created plot.  If two output arguments are specified, the data are generated
--- a/scripts/plot/draw/stem.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/stem.m	Tue Dec 19 12:41:30 2017 -0800
@@ -54,7 +54,7 @@
 ## Optional property/value pairs may be specified to control the appearance
 ## of the plot.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a handle to a @nospell{"stem series"}
--- a/scripts/plot/draw/stem3.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/stem3.m	Tue Dec 19 12:41:30 2017 -0800
@@ -37,7 +37,7 @@
 ## Optional property/value pairs may be specified to control the appearance
 ## of the plot.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a handle to the @nospell{"stem series"}
--- a/scripts/plot/draw/surf.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/surf.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/surface.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/surface.m	Tue Dec 19 12:41:30 2017 -0800
@@ -38,7 +38,7 @@
 ## Any property/value input pairs are assigned to the surface object
 ## (@pxref{Surface Properties}).
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/surfc.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/surfc.m	Tue Dec 19 12:41:30 2017 -0800
@@ -44,7 +44,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/surfl.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/surfl.m	Tue Dec 19 12:41:30 2017 -0800
@@ -60,7 +60,7 @@
 ## @item @qcode{"EXP"} specular exponent
 ## @end table
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/draw/surfnorm.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/surfnorm.m	Tue Dec 19 12:41:30 2017 -0800
@@ -36,7 +36,7 @@
 ##
 ## Any property/value input pairs are assigned to the surface object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## If output arguments are requested then the components of the normal
--- a/scripts/plot/draw/waterfall.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/draw/waterfall.m	Tue Dec 19 12:41:30 2017 -0800
@@ -47,7 +47,7 @@
 ## Any property/value pairs are passed directly to the underlying surface
 ## object.
 ##
-## If the first argument @var{hax} is an axes handle, then plot into this axis,
+## If the first argument @var{hax} is an axes handle, then plot into this axes,
 ## rather than the current axes returned by @code{gca}.
 ##
 ## The optional return value @var{h} is a graphics handle to the created
--- a/scripts/plot/util/axes.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/axes.m	Tue Dec 19 12:41:30 2017 -0800
@@ -25,14 +25,14 @@
 ## to @var{hax}.
 ##
 ## Called without any arguments, or with @var{property}/@var{value} pairs,
-## construct a new axes.  For accepted properties and corresponding
-## values, @pxref{XREFset,,set}.
+## construct a new axes.  For accepted properties and corresponding values,
+## @pxref{XREFset,,set}.
 ##
 ## Called with a single axes handle argument @var{hax}, the function makes
-## @var{hax} the current axis.  It also restacks the axes in the
-## corresponding figure so that @var{hax} is the first entry in the list
-## of children.  This causes @var{hax} to be displayed on top of any other
-## axes objects (Z-order stacking).
+## @var{hax} the current axes.  It also restacks the axes in the corresponding
+## figure so that @var{hax} is the first entry in the list of children.  This
+## causes @var{hax} to be displayed on top of any other axes objects (Z-order
+## stacking).
 ##
 ## @seealso{gca, set, get}
 ## @end deftypefn
--- a/scripts/plot/util/cla.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/cla.m	Tue Dec 19 12:41:30 2017 -0800
@@ -27,12 +27,12 @@
 ## handles (HandleVisibility = @qcode{"on"}).
 ##
 ## If the optional argument @qcode{"reset"} is specified, delete all child
-## objects including those with hidden handles and reset all axis properties
+## objects including those with hidden handles and reset all axes properties
 ## to their defaults.  However, the following properties are not reset:
 ## Position, Units.
 ##
 ## If the first argument @var{hax} is an axes handle, then operate on
-## this axis rather than the current axes returned by @code{gca}.
+## this axes rather than the current axes returned by @code{gca}.
 ## @seealso{clf, delete, reset}
 ## @end deftypefn
 
--- a/scripts/plot/util/gca.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/gca.m	Tue Dec 19 12:41:30 2017 -0800
@@ -18,9 +18,9 @@
 
 ## -*- texinfo -*-
 ## @deftypefn {} {@var{h} =} gca ()
-## Return a handle to the current axis object.
+## Return a handle to the current axes object.
 ##
-## The current axis is the default target for graphics output.  In the case
+## The current axes is the default target for graphics output.  In the case
 ## of a figure with multiple axes, @code{gca} returns the last created axes
 ## or the last axes that was clicked on with the mouse.
 ##
@@ -39,7 +39,7 @@
 ## creates an empty axes object and then changes its location and size in the
 ## figure window.
 ##
-## Note: To find the current axis without creating a new axes object if it
+## Note: To find the current axes without creating a new axes object if it
 ## does not exist, query the @qcode{"CurrentAxes"} property of a figure.
 ##
 ## @example
--- a/scripts/plot/util/hold.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/hold.m	Tue Dec 19 12:41:30 2017 -0800
@@ -35,7 +35,7 @@
 ## Equivalent to @code{hold on}.
 ##
 ## @item hold off
-## Restore default graphics settings which clear the graph and reset axis
+## Restore default graphics settings which clear the graph and reset axes
 ## properties before each new plot command.  (default).
 ##
 ## @item hold
@@ -43,7 +43,7 @@
 ## @end table
 ##
 ## When given the additional argument @var{hax}, the hold state is modified
-## for this axis rather than the current axes returned by @code{gca}.
+## for this axes rather than the current axes returned by @code{gca}.
 ##
 ## To query the current hold state use the @code{ishold} function.
 ## @seealso{ishold, cla, clf, newplot}
--- a/scripts/plot/util/newplot.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/newplot.m	Tue Dec 19 12:41:30 2017 -0800
@@ -25,7 +25,7 @@
 ##
 ## This function is called at the beginning of all high-level plotting
 ## functions.  It is not normally required in user programs.  @code{newplot}
-## queries the @qcode{"NextPlot"} field of the current figure and axis to
+## queries the @qcode{"NextPlot"} field of the current figure and axes to
 ## determine what to do.
 ##
 ## @multitable @columnfractions .25 .75
@@ -47,17 +47,17 @@
 ## @end multitable
 ##
 ## @multitable @columnfractions .25 .75
-## @headitem Axis NextPlot @tab Action
+## @headitem Axes NextPlot @tab Action
 ## @item @qcode{"add"} @tab Add new graphic objects to the current axes.  This
 ## is equivalent to @code{hold on}.
 ##
 ## @item @qcode{"replacechildren"} @tab Delete child objects whose
-## HandleVisibility is set to @qcode{"on"}, but leave axis properties
+## HandleVisibility is set to @qcode{"on"}, but leave axes properties
 ## unmodified.  This typically clears a plot, but preserves special settings
 ## such as log scaling for axes.  This is equivalent to @code{cla}.
 ##
 ## @item @qcode{"replace"} (default) @tab Delete all child objects of the
-## axis and reset all axis properties to their defaults.  However, the
+## axes and reset all axes properties to their defaults.  However, the
 ## following properties are not reset: Position, Units.  This is equivalent
 ## to @code{cla reset}.
 ## @end multitable
@@ -69,7 +69,7 @@
 ## axes object (not figure).
 ##
 ## @strong{Caution:} Calling @code{newplot} may change the current figure and
-## current axis.
+## current axes.
 ## @end deftypefn
 
 ## FIXME: The Matlab function takes an optional list of file handles, hsave,
@@ -78,7 +78,7 @@
 ##        compatibility is really tricky and doesn't serve much purpose since
 ##        newplot is nearly exclusively used by Octave's internal plotting
 ##        functions.  In Octave's case the argument is almost always null,
-##        or occasionally the axis handle to plot into.
+##        or occasionally the axes handle to plot into.
 
 function hax = newplot (hsave = [])
 
--- a/scripts/plot/util/subplot.m	Mon Dec 18 21:18:38 2017 -0800
+++ b/scripts/plot/util/subplot.m	Tue Dec 19 12:41:30 2017 -0800
@@ -64,7 +64,7 @@
 ##
 ## @end ifnottex
 ##
-## @var{index} may also be a vector.  In this case, the new axis will enclose
+## @var{index} may also be a vector.  In this case, the new axes will enclose
 ## the grid locations specified.  The first demo illustrates this:
 ##
 ## @example
@@ -75,10 +75,10 @@
 ## handle, @var{hax}, returned from a previous @code{subplot} command.
 ##
 ## If the option @qcode{"align"} is given then the plot boxes of the subwindows
-## will align, but this may leave no room for axis tick marks or labels.
+## will align, but this may leave no room for axes tick marks or labels.
 ##
-## If the option @qcode{"replace"} is given then the subplot axis will be
-## reset, rather than just switching the current axis for plotting to the
+## If the option @qcode{"replace"} is given then the subplot axes will be
+## reset, rather than just switching the current axes for plotting to the
 ## requested subplot.
 ##
 ## The @qcode{"position"} property can be used to exactly position the subplot
@@ -88,7 +88,7 @@
 ##
 ## Any property/value pairs are passed directly to the underlying axes object.
 ##
-## If the output @var{hax} is requested, subplot returns the axis handle for
+## If the output @var{hax} is requested, subplot returns the axes handle for
 ## the subplot.  This is useful for modifying the properties of a subplot
 ## using @code{set}.
 ## @seealso{axes, plot, gca, set}