# HG changeset patch # User Rafael Laboissiere # Date 1429437210 10800 # Node ID 1f9ed81bd17311337c8b9940e3067ee265d313be # Parent bb59bdbdb8acdefbe8030bd502ff5b53688e410b maint: Fix spelling and grammar mistakes in docs and comments (bug #44878) * NEWS, io.txi, file-io.cc, jit-ir.h, jit-typeinfo.h, ls-oct-binary.cc: Fix misspellings of "compatibility" and "compatible". * bsxfun.cc, file-io.cc, ov-base.h, oct-shlib.h, mesh.m: Fix misspellings of "overridden". * emacs.txi, image.txi, graphics.cc, __magick_read__.cc: Replace verb phrase "allows to" with "allows one to". diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -74,7 +74,7 @@ for --traditional. ** The "backtrace" warning option is now enabled by default. This change - was made for Matlab compatability. + was made for Matlab compatibility. ** For compatibility with Matlab, the "ismatrix (x)" function now only checks the dimension of "x". The old behaviour of "ismatrix" is obtained by diff --git a/doc/interpreter/emacs.txi b/doc/interpreter/emacs.txi --- a/doc/interpreter/emacs.txi +++ b/doc/interpreter/emacs.txi @@ -506,7 +506,7 @@ You can use either `plain' Emacs Info or the function @code{octave-help} as your Octave info reader (for @samp{help -i}). In the former case, use @code{info_program ("info-emacs-info")}. -The latter is perhaps more attractive because it allows to look up keys +The latter is perhaps more attractive because it allows one to look up keys in the indices of @emph{several} info files related to Octave (provided that the Emacs variable @code{octave-help-files} is set correctly). In this case, use @code{info_program ("info-emacs-octave-help")}. diff --git a/doc/interpreter/image.txi b/doc/interpreter/image.txi --- a/doc/interpreter/image.txi +++ b/doc/interpreter/image.txi @@ -84,11 +84,11 @@ capable of reading them all. Because of this, the function @code{imformats} keeps a configurable list of available formats, their extensions, and what functions should the image IO functions -use. This allows to expand Octave's image IO capabilities by +use. This allows one to expand Octave's image IO capabilities by creating functions aimed at acting on specific file formats. While it would be possible to call the extra functions directly, -properly configuring Octave with @code{imformats} allows to keep a +properly configuring Octave with @code{imformats} allows one to keep a consistent code that is abstracted from file formats. It is important to note that a file format is not actually defined by its diff --git a/doc/interpreter/io.txi b/doc/interpreter/io.txi --- a/doc/interpreter/io.txi +++ b/doc/interpreter/io.txi @@ -392,7 +392,7 @@ interpret the format template differently in order to improve the performance of printing vector and matrix values. -Implementation Note: For compatability with @sc{matlab}, escape sequences in +Implementation Note: For compatibility with @sc{matlab}, escape sequences in the template string (e.g., @qcode{"\n"} => newline) are expanded even when the template string is defined with single quotes. diff --git a/libinterp/corefcn/bsxfun.cc b/libinterp/corefcn/bsxfun.cc --- a/libinterp/corefcn/bsxfun.cc +++ b/libinterp/corefcn/bsxfun.cc @@ -359,7 +359,7 @@ || (func.is_function_handle () && ! A.is_object () && ! B.is_object ())) { - // This may break if the default behavior is overriden. But if you + // This may break if the default behavior is overridden. But if you // override arithmetic operators for builtin classes, you should // expect mayhem anyway (constant folding etc). Querying // is_overloaded() may not be exactly what we need here. 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 @@ -889,7 +889,7 @@ \n\ The optional output returns the number of bytes written to the file.\n\ \n\ -Implementation Note: For compatability with @sc{matlab}, escape sequences in\n\ +Implementation Note: For compatibility with @sc{matlab}, escape sequences in\n\ the template string (e.g., @qcode{\"\\\\n\"} => newline) are expanded even\n\ when the template string is defined with single quotes.\n\ @seealso{fputs, fdisp, fwrite, fscanf, printf, sprintf, fopen}\n\ @@ -959,7 +959,7 @@ complete description of the syntax of the template string.\n\ @end ifclear\n\ \n\ -Implementation Note: For compatability with @sc{matlab}, escape sequences in\n\ +Implementation Note: For compatibility with @sc{matlab}, escape sequences in\n\ the template string (e.g., @qcode{\"\\\\n\"} => newline) are expanded even\n\ when the template string is defined with single quotes.\n\ @seealso{fprintf, sprintf, scanf}\n\ @@ -1068,7 +1068,7 @@ returns the string, automatically sized to hold all of the items\n\ converted.\n\ \n\ -Implementation Note: For compatability with @sc{matlab}, escape sequences in\n\ +Implementation Note: For compatibility with @sc{matlab}, escape sequences in\n\ the template string (e.g., @qcode{\"\\\\n\"} => newline) are expanded even\n\ when the template string is defined with single quotes.\n\ @seealso{printf, fprintf, sscanf}\n\ @@ -2289,7 +2289,7 @@ \n\ Programming Note: The value returned by @code{P_tmpdir} is always the\n\ default location. This value may not agree with that returned from\n\ -@code{tempdir} if the user has overriden the default with the @env{TMPDIR}\n\ +@code{tempdir} if the user has overridden the default with the @env{TMPDIR}\n\ environment variable.\n\ @seealso{tempdir, tempname, mkstemp, tmpfile}\n\ @end deftypefn") diff --git a/libinterp/corefcn/graphics.cc b/libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc +++ b/libinterp/corefcn/graphics.cc @@ -11561,8 +11561,8 @@ @var{type} may also be the concatenation of a core object type and\n\ a valid property name for that object type. The property created\n\ then has the same characteristics as the referenced property (type,\n\ -possible values, hidden state@dots{}). This allows to clone an existing\n\ -property into the graphics object @var{h}.\n\ +possible values, hidden state@dots{}). This allows one to clone an\n\ +existing property into the graphics object @var{h}.\n\ \n\ Examples:\n\ \n\ diff --git a/libinterp/corefcn/jit-ir.h b/libinterp/corefcn/jit-ir.h --- a/libinterp/corefcn/jit-ir.h +++ b/libinterp/corefcn/jit-ir.h @@ -566,7 +566,7 @@ void replace_in_phi (jit_block *ablock, jit_block *with); - // we have a new internal list, but we want to stay compatable with jit_value + // we have a new internal list, but we want to stay compatible with jit_value jit_use *first_use (void) const { return jit_value::first_use (); } size_t use_count (void) const { return jit_value::use_count (); } diff --git a/libinterp/corefcn/jit-typeinfo.h b/libinterp/corefcn/jit-typeinfo.h --- a/libinterp/corefcn/jit-typeinfo.h +++ b/libinterp/corefcn/jit-typeinfo.h @@ -40,7 +40,7 @@ // Operations are defined and implemented in jit_typeinfo. Eventually they // should be moved elsewhere. (just like with octave_typeinfo) -// jit_range is compatable with the llvm range structure +// jit_range is compatible with the llvm range structure struct jit_range { @@ -63,7 +63,7 @@ std::ostream& operator << (std::ostream& os, const jit_range& rng); -// jit_array is compatable with the llvm array/matrix structures +// jit_array is compatible with the llvm array/matrix structures template struct jit_array diff --git a/libinterp/corefcn/ls-oct-binary.cc b/libinterp/corefcn/ls-oct-binary.cc --- a/libinterp/corefcn/ls-oct-binary.cc +++ b/libinterp/corefcn/ls-oct-binary.cc @@ -207,7 +207,7 @@ { // FIXME: // This is cruft, since its for a save type that is old. Maybe - // this is taking backward compatability too far!! + // this is taking backward compatibility too far!! int32_t len; if (! is.read (reinterpret_cast (&len), 4)) goto data_read_error; diff --git a/libinterp/dldfcn/__magick_read__.cc b/libinterp/dldfcn/__magick_read__.cc --- a/libinterp/dldfcn/__magick_read__.cc +++ b/libinterp/dldfcn/__magick_read__.cc @@ -1873,7 +1873,7 @@ "Copyright", // actually an Exif tag "DigitalCamera", "GPSInfo", - // Notes for the future: GM allows to get many attributes, and even has + // Notes for the future: GM allows one to get many attributes, and even has // attribute() to obtain arbitrary ones, that may exist in only some // cases. The following is a list of some methods and into what possible // Matlab compatible values they may be converted. diff --git a/libinterp/octave-value/ov-base.h b/libinterp/octave-value/ov-base.h --- a/libinterp/octave-value/ov-base.h +++ b/libinterp/octave-value/ov-base.h @@ -219,7 +219,7 @@ virtual octave_base_value * empty_clone (void) const; - // Unique clone. Usually clones, but may be overriden to fake the + // Unique clone. Usually clones, but may be overridden to fake the // cloning when sharing copies is to be controlled from within an // instance (see octave_class). virtual octave_base_value * @@ -764,7 +764,7 @@ virtual bool fast_elem_insert (octave_idx_type n, const octave_value& x); - // This is a helper for the above, to be overriden in scalar types. The + // This is a helper for the above, to be overridden in scalar types. The // whole point is to handle the insertion efficiently with just *two* VM // calls, which is basically the theoretical minimum. virtual bool diff --git a/liboctave/util/oct-shlib.h b/liboctave/util/oct-shlib.h --- a/liboctave/util/oct-shlib.h +++ b/liboctave/util/oct-shlib.h @@ -65,7 +65,7 @@ bool is_out_of_date (void) const; - // This method will be overriden conditionally. + // This method will be overridden conditionally. static shlib_rep *new_instance (const std::string& f); static shlib_rep *get_instance (const std::string& f, bool fake); diff --git a/scripts/plot/draw/mesh.m b/scripts/plot/draw/mesh.m --- a/scripts/plot/draw/mesh.m +++ b/scripts/plot/draw/mesh.m @@ -141,6 +141,6 @@ %! xlabel 'X-axis'; %! ylabel 'Y-axis'; %! zlabel 'Z-axis'; -%! title ({'mesh() default properties overriden', ... +%! title ({'mesh() default properties overridden', ... %! 'transparent mesh with cyan color'});