# HG changeset patch # User Brian Gough # Date 1227778104 -3600 # Node ID fa78cb8d8a5c4e418384e0bce3ec90de50ca18a4 # Parent 8302788f09dbc901e58148d5e07d3979ae39a343 corrections for typos Here is a patch with some corrections for typos and missing/extra words in the manual. changeset: 8347:34fd1d1c2294 user: Brian Gough date: Wed Nov 26 11:00:15 2008 -0500 summary: [docs] can not => cannot diff --git a/doc/interpreter/basics.txi b/doc/interpreter/basics.txi --- a/doc/interpreter/basics.txi +++ b/doc/interpreter/basics.txi @@ -296,7 +296,7 @@ command in the @file{~/.octaverc} file will affect the directory that Octave searches for the file @file{.octaverc}. -If you start Octave in your home directory, commands from from the file +If you start Octave in your home directory, commands from the file @file{~/.octaverc} will only be executed once. @end table diff --git a/doc/interpreter/container.txi b/doc/interpreter/container.txi --- a/doc/interpreter/container.txi +++ b/doc/interpreter/container.txi @@ -277,7 +277,7 @@ @end example Furthermore, the structure array can return a comma separated list -(@pxref{Comma Separated Lists}), if indexed by one of itself field +(@pxref{Comma Separated Lists}), if indexed by one of its own field names. For example @example @@ -541,7 +541,7 @@ @code{cell} function accepts any number of positive integers to describe the size of the returned cell array. It is also possible to set the size of the cell array through a vector of positive integers. In the -following example two cell arrays of equal size is created, and the size +following example two cell arrays of equal size are created, and the size of the first one is displayed @example @@ -557,7 +557,7 @@ do the other functions describing the size of an object, such as @code{length}, @code{numel}, @code{rows}, and @code{columns}. -An alternative to creating empty cell arrays, and then filling them, it +As an alternative to creating empty cell arrays, and then filling them, it is possible to convert numerical arrays into cell arrays using the @code{num2cell} and @code{mat2cell} functions. @@ -716,7 +716,7 @@ @noindent where @code{@var{i}, @var{j}} is equally a comma separated list. Comma -separated lists can not be directly manipulated by the user. However, +separated lists cannot be directly manipulated by the user. However, both structures and cell arrays can be converted into comma separated lists, which makes them useful to keep the input arguments and return values of functions organized. Another example of where a comma @@ -797,7 +797,7 @@ @end example Structure arrays can equally be used to create comma separated -lists. This is done by addresses one of the fields of a structure +lists. This is done by addressing one of the fields of a structure array. For example @example diff --git a/doc/interpreter/debug.txi b/doc/interpreter/debug.txi --- a/doc/interpreter/debug.txi +++ b/doc/interpreter/debug.txi @@ -79,7 +79,7 @@ @DOCSTRING(dbstop) @noindent -Note that breakpoints can not be set in built-in functions +Note that breakpoints cannot be set in built-in functions (eg. @code{sin}, etc) or dynamically loaded function (ie. oct-files). To set a breakpoint immediately on entering a function, the breakpoint should be set to line 1. The leading comment block will be ignored and diff --git a/doc/interpreter/dynamic.txi b/doc/interpreter/dynamic.txi --- a/doc/interpreter/dynamic.txi +++ b/doc/interpreter/dynamic.txi @@ -69,7 +69,7 @@ @end itemize Also, as oct- and mex-files are dynamically linked to octave, they -introduce to possibility of having Octave abort due to coding errors in +introduce the possibility of Octave crashing due to errors in the user code. For example a segmentation violation in the user's code will cause Octave to abort. @@ -1137,7 +1137,7 @@ @noindent where, as can be seen, end line of text within the help string is -terminated by @code{\n\} which is an an embedded new-line in the string +terminated by @code{\n\} which is an embedded new-line in the string together with a C++ string continuation character. Note that the final @code{\} must be the last character on the line. @@ -1259,7 +1259,7 @@ m-file. This can also be useful to allow a sample implementation of the mex-file within the Octave language itself for testing purposes. -Although we can not have multiple entry points into a single mex-file, +Although we cannot have multiple entry points into a single mex-file, we can use the @code{mexFunctionName} function to determine what name the mex-file was called with. This can be used to alter the behavior of the mex-file based on the function name. For example if diff --git a/doc/interpreter/errors.txi b/doc/interpreter/errors.txi --- a/doc/interpreter/errors.txi +++ b/doc/interpreter/errors.txi @@ -170,7 +170,7 @@ can be useful when an error needs to be detected, but the program should still abort. This is possible using the @code{rethrow} function. The previous example can now be changed to count the number of errors -related to the @samp{*} operator, but still abort of another kind of +related to the @samp{*} operator, but still abort if another kind of error occurs. @example @@ -240,7 +240,7 @@ It is however possible to access the last warning as a string using the @code{lastwarn} function. -It is also possible to assign an identification string a a warning. +It is also possible to assign an identification string to a warning. If a warning has such an ID the user can enable and disable this warning as will be described in the next section. To assign an ID to a warning, simply call @code{warning} with two string arguments, where the first diff --git a/doc/interpreter/eval.txi b/doc/interpreter/eval.txi --- a/doc/interpreter/eval.txi +++ b/doc/interpreter/eval.txi @@ -25,7 +25,7 @@ Sometimes, you may find it necessary to evaluate an expression that has been computed and stored in a string, which is exactly what the -@code{eval} lets you do. +@code{eval} function lets you do. @DOCSTRING(eval) @@ -38,7 +38,7 @@ @section Calling a Function by its Name The @code{feval} function allows you to call a function from a string -containing its name. This is useful when writing a function that need to +containing its name. This is useful when writing a function that needs to call user-supplied functions. The @code{feval} function takes the name of the function to call as its first argument, and the remaining arguments are given to the function. diff --git a/doc/interpreter/expr.txi b/doc/interpreter/expr.txi --- a/doc/interpreter/expr.txi +++ b/doc/interpreter/expr.txi @@ -267,7 +267,7 @@ a temporary location in memory before being passed to the function. There is currently no way to specify that a function parameter should be passed by reference instead of by value. This means that it is -impossible to directly alter the value of function parameter in the +impossible to directly alter the value of a function parameter in the calling function. It can only change the local copy within the function body. For example, the function @@ -624,7 +624,7 @@ Element-by-element boolean expressions can be used wherever comparison expressions can be used. They can be used in @code{if} and @code{while} -statements. However, if a matrix value used as the condition in an +statements. However, a matrix value used as the condition in an @code{if} or @code{while} statement is only true if @emph{all} of its elements are nonzero. diff --git a/doc/interpreter/func.txi b/doc/interpreter/func.txi --- a/doc/interpreter/func.txi +++ b/doc/interpreter/func.txi @@ -641,7 +641,7 @@ function without any input or output arguments. It is possible to add or remove directories to or from the load path -using the @code{addpath} and @code{rmpath}. As an example, the following +using @code{addpath} and @code{rmpath}. As an example, the following code adds @samp{~/Octave} to the load path. @example @@ -752,7 +752,7 @@ @end example @noindent -Which aliases the @code{spsin} to @code{sin}, but only for real sparse +which aliases the user-defined function @code{spsin} to @code{sin}, but only for real sparse matrices. Note that the builtin @code{sin} already correctly treats sparse matrices and so this example is only illustrative. diff --git a/doc/interpreter/geometry.txi b/doc/interpreter/geometry.txi --- a/doc/interpreter/geometry.txi +++ b/doc/interpreter/geometry.txi @@ -19,7 +19,7 @@ @node Geometry @chapter Geometry -Much of geometry code in Octave is based on the QHull @footnote{Barber, +Much of geometry code in Octave is based on the QHull library@footnote{Barber, C.B., Dobkin, D.P., and Huhdanpaa, H.T., "The Quickhull algorithm for convex hulls," ACM Trans. on Mathematical Software, 22(4):469-483, Dec 1996, @url{http://www.qhull.org}}. Some of the documentation for Qhull, @@ -145,7 +145,7 @@ the N-Simplex. This parametric form is called the Barycentric Coordinates of the point. If the points defining the N-Simplex are given by @code{@var{N} + 1} vectors @var{t}(@var{i},:), then the Barycentric -coordinates defining the point @var{p} is given by +coordinates defining the point @var{p} are given by @example @var{p} = sum (@var{beta}(1:@var{N}+1) * @var{t}(1:@var{N}+1),:) @@ -278,7 +278,7 @@ tessellation where @var{p} is a member of @var{s}, are closer to @var{p} than any other point in @var{s}. The Voronoi diagram is related to the Delaunay triangulation of a set of points, in that the vertexes of the -Voronoi tessellation are the center's of the circum-circles of the +Voronoi tessellation are the centers of the circum-circles of the simplicies of the Delaunay tessellation. @DOCSTRING(voronoi) diff --git a/doc/interpreter/image.txi b/doc/interpreter/image.txi --- a/doc/interpreter/image.txi +++ b/doc/interpreter/image.txi @@ -109,14 +109,14 @@ @code{uint8} intensities are between 0 and 255, and if it is of class @code{uint16} intensities are between 0 and 65535. -A binary image is a M-by-N matrix of class @code{logical}. +A binary image is an M-by-N matrix of class @code{logical}. A pixel in a binary image is black if it is @code{false} and white if it is @code{true}. An indexed image consists of an M-by-N matrix of integers and a C-by-3 color map. Each integer corresponds to an index in the color map, and each row in the color map corresponds to -a RGB color. The color map must be of class @code{double} with values +an RGB color. The color map must be of class @code{double} with values between 0 and 1. @DOCSTRING(gray2ind) @@ -165,7 +165,7 @@ An additional colormap is @code{gmap40}. This code map contains only colors with integer values of the red, green and blue components. This -workaround a limitation on gnuplot 4.0, that does not allow the color of +is a workaround for a limitation of gnuplot 4.0, that does not allow the color of line or patch objects to be set, and so @code{gmap40} is useful for gnuplot 4.0 users, and in particular in conjunction with the @var{bar}, @var{barh} or @var{contour} functions. diff --git a/doc/interpreter/interp.txi b/doc/interpreter/interp.txi --- a/doc/interpreter/interp.txi +++ b/doc/interpreter/interp.txi @@ -29,7 +29,7 @@ Octave supports several methods for one-dimensional interpolation, most of which are described in this section. @ref{Polynomial Interpolation} -and @ref{Interpolation on Scattered Data} describes further methods. +and @ref{Interpolation on Scattered Data} describe further methods. @DOCSTRING(interp1) @@ -133,7 +133,7 @@ @DOCSTRING(spline) -The @code{lookup} is used by other interpolation function to identify +The @code{lookup} function is used by other interpolation functions to identify the points of the original data that are closest to the current point of interest. diff --git a/doc/interpreter/io.txi b/doc/interpreter/io.txi --- a/doc/interpreter/io.txi +++ b/doc/interpreter/io.txi @@ -21,7 +21,7 @@ Octave supports several ways of reading and writing data to or from the prompt or a file. The most simple functions for data Input and Output -(I/O) are easy to use, but only provides a limited control of how +(I/O) are easy to use, but only provides limited control of how data is processed. For more control, a set of functions modelled after the C standard library are also provided by Octave. @@ -218,7 +218,7 @@ @node Saving Data on Unexpected Exits @subsubsection Saving Data on Unexpected Exits -If Octave for some reason exits unexpected it will by default save the +If Octave for some reason exits unexpectedly it will by default save the variables available in the workspace to a file in the current directory. By default this file is named @samp{octave-core} and can be loaded into memory with the @code{load} command. While the default behaviour diff --git a/doc/interpreter/linalg.txi b/doc/interpreter/linalg.txi --- a/doc/interpreter/linalg.txi +++ b/doc/interpreter/linalg.txi @@ -22,7 +22,7 @@ This chapter documents the linear algebra functions of Octave. Reference material for many of these functions may be found in Golub and Van Loan, @cite{Matrix Computations, 2nd Ed.}, Johns Hopkins, -1989, and in @cite{@sc{Lapack} Users' Guide}, SIAM, 1992. +1989, and in the @cite{@sc{Lapack} Users' Guide}, SIAM, 1992. @menu * Techniques used for Linear Algebra:: @@ -68,7 +68,7 @@ The user can force the type of the matrix with the @code{matrix_type} function. This overcomes the cost of discovering the type of the matrix. -However, it should be noted incorrectly identifying the type of the matrix +However, it should be noted that identifying the type of the matrix incorrectly will lead to unpredictable results, and so @code{matrix_type} should be used with care. diff --git a/doc/interpreter/numbers.txi b/doc/interpreter/numbers.txi --- a/doc/interpreter/numbers.txi +++ b/doc/interpreter/numbers.txi @@ -504,7 +504,7 @@ While many numerical computations can't be carried out in integers, Octave does support basic operations like addition and multiplication on integers. The operators @code{+}, @code{-}, @code{.*}, and @code{./} -works on integers of the same type. So, it is possible to add two 32 bit +work on integers of the same type. So, it is possible to add two 32 bit integers, but not to add a 32 bit integer and a 16 bit integer. The arithmetic operations on integers are performed by casting the @@ -573,7 +573,7 @@ This is the double precision version of the functions @code{intmax}, previously discussed. -Octave also include the basic bitwise 'and', 'or' and 'exclusive or' +Octave also includes the basic bitwise 'and', 'or' and 'exclusive or' operators. @DOCSTRING(bitand) @@ -582,19 +582,19 @@ @DOCSTRING(bitxor) -The bitwise 'not' operator is unary operator that performs a logical +The bitwise 'not' operator is a unary operator that performs a logical negation of each of the bits of the value. For this to make sense, the mask against which the value is negated must be defined. Octave's bitwise 'not' operator is @code{bitcmp}. @DOCSTRING(bitcmp) -Octave also includes the ability to left and right values bitwise. +Octave also includes the ability to left-shift and right-shift values bitwise. @DOCSTRING(bitshift) Bits that are shifted out of either end of the value are lost. Octave -also uses arithmetic shifts, where the sign bit of the value is keep +also uses arithmetic shifts, where the sign bit of the value is kept during a right shift. For example @example @@ -619,7 +619,7 @@ not the comparison is true. The basic logical operations are @code{&}, @code{|}, and @code{!}, -that corresponds to ``Logical And'', ``Logical Or'', and ``Logical +which correspond to ``Logical And'', ``Logical Or'', and ``Logical Negation''. These operations all follow the rules of logic. It is also possible to use logical values as part of standard numerical @@ -728,7 +728,7 @@ @section Predicates for Numeric Objects Since the type of a variable may change during the execution of a -program, it can be necessary to type checking at run-time. Doing this +program, it can be necessary to do type checking at run-time. Doing this also allows you to change the behaviour of a function depending on the type of the input. As an example, this naive implementation of @code{abs} returns the absolute value of the input if it is a real number, and the diff --git a/doc/interpreter/oop.txi b/doc/interpreter/oop.txi --- a/doc/interpreter/oop.txi +++ b/doc/interpreter/oop.txi @@ -38,7 +38,7 @@ Octave includes the capability to include user classes, including the features of operator and function overloading. Equally a user class can be used to encapsulate certain properties of the class so that -they can not be altered accidentally and can be set up to address the +they cannot be altered accidentally and can be set up to address the issue of class precedence in mixed class operations. This chapter discussions the means of constructing a user class with diff --git a/doc/interpreter/package.txi b/doc/interpreter/package.txi --- a/doc/interpreter/package.txi +++ b/doc/interpreter/package.txi @@ -284,7 +284,7 @@ @subsection The DESCRIPTION File The @code{DESCRIPTION} file contains various information about the -package, such as it's name, author, and version. This file has a very +package, such as its name, author, and version. This file has a very simple format @noindent @@ -382,13 +382,13 @@ @item SystemRequirements These are the external install dependencies of the package and are not checked by the package manager. This is here as a hint to the -distribution packager. They follows the same conventions as the +distribution packager. They follow the same conventions as the @code{Depends} keyword. @item BuildRequires These are the external build dependencies of the package and are not checked by the package manager. This is here as a hint to the -distribution packager. They follows the same conventions as the +distribution packager. They follow the same conventions as the @code{Depends} keyword. Note that in general, packaging systems such as @code{rpm} or @code{deb} and autoprobe the install dependencies from the build dependencies, and therefore the often a @@ -401,7 +401,7 @@ The developer is free to add additional arguments to the @code{DESCRIPTION} file for their own purposes. One further detail to aid the packager is that the @code{SystemRequirements} and -@code{BuildRequires} keywords can have distribution dependent section, +@code{BuildRequires} keywords can have a distribution dependent section, and the automatic build process will use these. An example of the format of this is @@ -417,7 +417,7 @@ @node The INDEX file @subsection The INDEX file -The optional @code{INDEX} file provides an categorical view of the +The optional @code{INDEX} file provides a categorical view of the functions in the package. This file has a very simple format @noindent @@ -434,7 +434,7 @@ category of functions. @item Lines starting with a white space character indicate that the -function names on the line belong to last mentioned category. +function names on the line belong to the last mentioned category. @end itemize @noindent diff --git a/doc/interpreter/plot.txi b/doc/interpreter/plot.txi --- a/doc/interpreter/plot.txi +++ b/doc/interpreter/plot.txi @@ -118,7 +118,7 @@ @DOCSTRING(contourc) The @code{errorbar}, @code{semilogxerr}, @code{semilogyerr}, and -@code{loglogerr} functions produces plots with error bar markers. For +@code{loglogerr} functions produce plots with error bar markers. For example, @example diff --git a/doc/interpreter/set.txi b/doc/interpreter/set.txi --- a/doc/interpreter/set.txi +++ b/doc/interpreter/set.txi @@ -36,7 +36,7 @@ Octave supports the basic set operations. That is, Octave can compute the union, intersection, complement, and difference of two sets. -Octave can also supports the @emph{Exclusive Or} set operation, and +Octave also supports the @emph{Exclusive Or} set operation, and membership determination. The functions for set operations all work in pretty much the same way. As an example, assume that @code{x} and @code{y} contains two sets, then diff --git a/doc/interpreter/sparse.txi b/doc/interpreter/sparse.txi --- a/doc/interpreter/sparse.txi +++ b/doc/interpreter/sparse.txi @@ -435,7 +435,7 @@ An important consideration in the use of the sparse functions of Octave is that many of the internal functions of Octave, such as -@dfn{diag}, can not accept sparse matrices as an input. The sparse +@dfn{diag}, cannot accept sparse matrices as an input. The sparse implementation in Octave therefore uses the @dfn{dispatch} function to overload the normal Octave functions with equivalent functions that work with sparse matrices. However, at any time the @@ -576,7 +576,7 @@ large number of terms @code{0 .^ 0} which is 1. There @code{@var{s} .^ @var{s}} is a full matrix. -Likewise @code{@var{s} .^ -2} involves terms terms like @code{0 .^ -2} which +Likewise @code{@var{s} .^ -2} involves terms like @code{0 .^ -2} which is infinity, and so @code{@var{s} .^ -2} is equally a full matrix. For the "./" operator @code{@var{s} ./ 2} has no problems, but @@ -811,7 +811,7 @@ The user can force the type of the matrix with the @code{matrix_type} function. This overcomes the cost of discovering the type of the matrix. -However, it should be noted incorrectly identifying the type of the matrix +However, it should be noted that identifying the type of the matrix incorrectly will lead to unpredictable results, and so @code{matrix_type} should be used with care. diff --git a/doc/interpreter/stmt.txi b/doc/interpreter/stmt.txi --- a/doc/interpreter/stmt.txi +++ b/doc/interpreter/stmt.txi @@ -33,7 +33,7 @@ @cindex @code{end} statement Each control statement has a corresponding @dfn{end} statement that -marks the end of the end of the control statement. For example, the +marks the end of the control statement. For example, the keyword @code{endif} marks the end of an @code{if} statement, and @code{endwhile} marks the end of a @code{while} statement. You can use the keyword @code{end} anywhere a more specific end keyword is expected, @@ -247,7 +247,7 @@ @noindent This code makes the repetitive structure of the problem more explicit, making the code easier to read, and hence maintain. Also, if the -variable @code{X} should change it's name, only one line would need +variable @code{X} should change its name, only one line would need changing compared to one line per case when @code{if} statements are used. diff --git a/doc/interpreter/strings.txi b/doc/interpreter/strings.txi --- a/doc/interpreter/strings.txi +++ b/doc/interpreter/strings.txi @@ -218,7 +218,7 @@ @end example @noindent -To determine if two functions are identical it is therefore necessary +To determine if two strings are identical it is therefore necessary to use the @code{strcmp} or @code{strncpm} functions. Similar functions exist for doing case-insensitive comparisons. diff --git a/doc/interpreter/tips.txi b/doc/interpreter/tips.txi --- a/doc/interpreter/tips.txi +++ b/doc/interpreter/tips.txi @@ -398,7 +398,7 @@ @table @asis @item -*- texinfo -*- -This string signals Octave that the follow text is in Texinfo format, +This string signals Octave that the following text is in Texinfo format, and should be the first part of any help string in Texinfo format. @item @@deftypefn@{class@} @dots{} @@end deftypefn The entire help string should be enclosed within the block defined by diff --git a/doc/interpreter/var.txi b/doc/interpreter/var.txi --- a/doc/interpreter/var.txi +++ b/doc/interpreter/var.txi @@ -361,7 +361,7 @@ @DOCSTRING(clear) -Information about a function or variable such as it's location in the +Information about a function or variable such as its location in the file system can also be acquired from within Octave. This is usually only useful during development of programs, and not within a program. diff --git a/scripts/deprecated/loadimage.m b/scripts/deprecated/loadimage.m --- a/scripts/deprecated/loadimage.m +++ b/scripts/deprecated/loadimage.m @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{x}, @var{map}] =} loadimage (@var{file}) -## Load an image file and it's associated color map from the specified +## Load an image file and its associated color map from the specified ## @var{file}. The image must be stored in Octave's image format. ## @seealso{saveimage, load, save} ## @end deftypefn diff --git a/scripts/general/del2.m b/scripts/general/del2.m --- a/scripts/general/del2.m +++ b/scripts/general/del2.m @@ -44,7 +44,7 @@ ## derivative over the higher dimensions. ## ## The spacing between evaluation points may be defined by @var{h}, which is a -## scalar defining the spacing in all dimensions. Or alternative, the spacing +## scalar defining the spacing in all dimensions. Or alternatively, the spacing ## in each dimension may be defined separately by @var{dx}, @var{dy}, etc. ## Scalar spacing values give equidistant spacing, whereas vector spacing ## values can be used to specify variable spacing. The length of the vectors diff --git a/scripts/general/interp2.m b/scripts/general/interp2.m --- a/scripts/general/interp2.m +++ b/scripts/general/interp2.m @@ -25,7 +25,7 @@ ## ## Two-dimensional interpolation. @var{x}, @var{y} and @var{z} describe a ## surface function. If @var{x} and @var{y} are vectors their length -## must correspondent to the size of @var{z}. @var{x} and @var{Yy} must be +## must correspondent to the size of @var{z}. @var{x} and @var{y} must be ## monotonic. If they are matrices they must have the @code{meshgrid} ## format. ## diff --git a/scripts/general/interp3.m b/scripts/general/interp3.m --- a/scripts/general/interp3.m +++ b/scripts/general/interp3.m @@ -24,7 +24,7 @@ ## @deftypefnx {Function File} {@var{vi} =} interp3 (@dots{}, @var{method}) ## @deftypefnx {Function File} {@var{vi} =} interp3 (@dots{}, @var{method}, @var{extrapval}) ## -## Perform 3-dimensional interpolation. Each element of then 3-dimensional +## Perform 3-dimensional interpolation. Each element of the 3-dimensional ## array @var{v} represents a value at a location given by the parameters ## @var{x}, @var{y}, and @var{z}. The parameters @var{x}, @var{x}, and ## @var{z} are either 3-dimensional arrays of the same size as the array diff --git a/scripts/general/interpn.m b/scripts/general/interpn.m --- a/scripts/general/interpn.m +++ b/scripts/general/interpn.m @@ -25,7 +25,7 @@ ## @deftypefnx {Function File} {@var{vi} =} interpn (@dots{}, @var{method}, @var{extrapval}) ## ## Perform @var{n}-dimensional interpolation, where @var{n} is at least two. -## Each element of then @var{n}-dimensional array @var{v} represents a value +## Each element of the @var{n}-dimensional array @var{v} represents a value ## at a location given by the parameters @var{x1}, @var{x2}, @dots{}, @var{xn}. ## The parameters @var{x1}, @var{x2}, @dots{}, @var{xn} are either ## @var{n}-dimensional arrays of the same size as the array @var{v} in diff --git a/scripts/general/structfun.m b/scripts/general/structfun.m --- a/scripts/general/structfun.m +++ b/scripts/general/structfun.m @@ -34,8 +34,8 @@ ## returned as separate output variables. ## ## If the param 'UniformOutput' is set to true (the default), then the function -## must return either a single element which will be concatenated into the -## return value. If 'UniformOutput is false, the outputs placed in a structure +## must return a single element which will be concatenated into the +## return value. If 'UniformOutput' is false, the outputs placed in a structure ## with the same fieldnames as the input structure. ## ## @example diff --git a/scripts/geometry/dsearch.m b/scripts/geometry/dsearch.m --- a/scripts/geometry/dsearch.m +++ b/scripts/geometry/dsearch.m @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {@var{idx} =} dsearch (@var{x}, @var{y}, @var{tri}, @var{xi}, @var{yi}) ## @deftypefnx {Function File} {@var{idx} =} dsearch (@var{x}, @var{y}, @var{tri}, @var{xi}, @var{yi}, @var{s}) -## Returns the index @var{idx} or the closest point in @code{@var{x}, @var{y})} +## Returns the index @var{idx} or the closest point in @code{@var{x}, @var{y}} ## to the elements @code{[@var{xi}(:), @var{yi}(:)]}. The variable @var{s} is ## accepted but ignored for compatibility. ## @seealso{dsearchn, tsearch} diff --git a/scripts/geometry/voronoi.m b/scripts/geometry/voronoi.m --- a/scripts/geometry/voronoi.m +++ b/scripts/geometry/voronoi.m @@ -23,7 +23,7 @@ ## @deftypefnx {Function File} {[@var{vx}, @var{vy}] =} voronoi (@dots{}) ## plots voronoi diagram of points @code{(@var{x}, @var{y})}. ## The voronoi facets with points at infinity are not drawn. -## [@var{vx}, @var{vy}] = voronoi(...) returns the vertices instead plotting the +## [@var{vx}, @var{vy}] = voronoi(...) returns the vertices instead of plotting the ## diagram. plot (@var{vx}, @var{vy}) shows the voronoi diagram. ## ## A fourth optional argument, which must be a string, contains extra options diff --git a/scripts/image/image_viewer.m b/scripts/image/image_viewer.m --- a/scripts/image/image_viewer.m +++ b/scripts/image/image_viewer.m @@ -29,7 +29,7 @@ ## behaviour. ## ## When called with one input argument images will be displayed by saving -## the image to a file and the system command @var{command} will called +## the image to a file and the system command @var{command} will be called ## to view the image. The @var{command} must be a string containing ## @code{%s} and possibly @code{%f}. The @code{%s} will be replaced by ## the filename of the image, and the @code{%f} will (if present) be diff --git a/scripts/image/rgb2ind.m b/scripts/image/rgb2ind.m --- a/scripts/image/rgb2ind.m +++ b/scripts/image/rgb2ind.m @@ -20,7 +20,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {[@var{x}, @var{map}] =} rgb2ind (@var{rgb}) ## @deftypefnx {Function File} {[@var{x}, @var{map}] =} rgb2ind (@var{r}, @var{g}, @var{b}) -## Convert and RGB image to an Octave indexed image. +## Convert an RGB image to an Octave indexed image. ## @seealso{ind2rgb, rgb2ntsc} ## @end deftypefn diff --git a/scripts/image/saveimage.m b/scripts/image/saveimage.m --- a/scripts/image/saveimage.m +++ b/scripts/image/saveimage.m @@ -30,7 +30,7 @@ ## Portable pixmap format. ## ## @item "ps" -## PostScript format. Note that images saved in PostScript format can not +## PostScript format. Note that images saved in PostScript format cannot ## be read back into Octave with loadimage. ## @end table ## diff --git a/scripts/linear-algebra/condest.m b/scripts/linear-algebra/condest.m --- a/scripts/linear-algebra/condest.m +++ b/scripts/linear-algebra/condest.m @@ -21,7 +21,7 @@ ## @deftypefnx {Function File} {[@var{est}, @var{v}] =} condest (@var{a}, @var{solve}, @var{solve_t}, @var{t}) ## @deftypefnx {Function File} {[@var{est}, @var{v}] =} condest (@var{apply}, @var{apply_t}, @var{solve}, @var{solve_t}, @var{n}, @var{t}) ## -## Estimate the 1-norm condition number of a matrix matrix @var{A} +## Estimate the 1-norm condition number of a matrix @var{A} ## using @var{t} test vectors using a randomized 1-norm estimator. ## If @var{t} exceeds 5, then only 5 test vectors are used. ## diff --git a/scripts/plot/surface.m b/scripts/plot/surface.m --- a/scripts/plot/surface.m +++ b/scripts/plot/surface.m @@ -33,7 +33,7 @@ ## @var{z} correspond to different @var{y} values. If @var{x} and @var{y} ## are missing, they are constructed from size of the matrix @var{z}. ## -## Any additional properties passed are assigned the the surface.. +## Any additional properties passed are assigned to the surface. ## @seealso{surf, mesh, patch, line} ## @end deftypefn diff --git a/scripts/polynomial/unmkpp.m b/scripts/polynomial/unmkpp.m --- a/scripts/polynomial/unmkpp.m +++ b/scripts/polynomial/unmkpp.m @@ -24,7 +24,7 @@ ## ## @table @asis ## @item @var{x} -## Samples points. +## Sample points. ## @item @var{p} ## Polynomial coefficients for points in sample interval. @code{@var{p} ## (@var{i}, :)} contains the coefficients for the polynomial over diff --git a/scripts/statistics/distributions/tinv.m b/scripts/statistics/distributions/tinv.m --- a/scripts/statistics/distributions/tinv.m +++ b/scripts/statistics/distributions/tinv.m @@ -18,7 +18,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} tinv (@var{x}, @var{n}) -## For each probability value @var{x}, compute the the inverse of the +## For each probability value @var{x}, compute the inverse of the ## cumulative distribution function (CDF) of the t (Student) ## distribution with degrees of freedom @var{n}. This function is ## analagous to looking in a table for the t-value of a single-tailed diff --git a/scripts/strings/dec2bin.m b/scripts/strings/dec2bin.m --- a/scripts/strings/dec2bin.m +++ b/scripts/strings/dec2bin.m @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} dec2bin (@var{n}, @var{len}) -## Return a binary number corresponding the nonnegative decimal number +## Return a binary number corresponding to the nonnegative decimal number ## @var{n}, as a string of ones and zeros. For example, ## ## @example diff --git a/src/DLD-FUNCTIONS/cellfun.cc b/src/DLD-FUNCTIONS/cellfun.cc --- a/src/DLD-FUNCTIONS/cellfun.cc +++ b/src/DLD-FUNCTIONS/cellfun.cc @@ -91,8 +91,8 @@ input arguments.\n\ \n\ If the param 'UniformOutput' is set to true (the default), then the function\n\ -must return either a single element which will be concatenated into the\n\ -return value. If 'UniformOutput is false, the outputs are concatenated in\n\ +must return a single element which will be concatenated into the\n\ +return value. If 'UniformOutput' is false, the outputs are concatenated in\n\ a cell array. For example\n\ \n\ @example\n\ diff --git a/src/DLD-FUNCTIONS/dmperm.cc b/src/DLD-FUNCTIONS/dmperm.cc --- a/src/DLD-FUNCTIONS/dmperm.cc +++ b/src/DLD-FUNCTIONS/dmperm.cc @@ -195,7 +195,7 @@ @cindex Structural Rank\n\ Calculates the structural rank of a sparse matrix @var{s}. Note that\n\ only the structure of the matrix is used in this calculation based on\n\ -a Dulmage-Mendelsohn to block triangular form. As such the numerical\n\ +a Dulmage-Mendelsohn permutation to block triangular form. As such the numerical\n\ rank of the matrix @var{s} is bounded by @code{sprank (@var{s}) >=\n\ rank (@var{s})}. Ignoring floating point errors @code{sprank (@var{s}) ==\n\ rank (@var{s})}.\n\ diff --git a/src/bitfcns.cc b/src/bitfcns.cc --- a/src/bitfcns.cc +++ b/src/bitfcns.cc @@ -412,7 +412,7 @@ integers in @var{a}. A positive @var{k} leads to a left shift.\n\ A negative value to a right shift. If @var{n} is omitted it defaults\n\ to log2(bitmax)+1.\n\ -@var{n} must be in range [1,log2(bitmax)+1] usually [1,33]\n\ +@var{n} must be in the range [1,log2(bitmax)+1] usually [1,33]\n\ \n\ @example\n\ bitshift (eye (3), 1)\n\ diff --git a/src/data.cc b/src/data.cc --- a/src/data.cc +++ b/src/data.cc @@ -533,7 +533,7 @@ "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} atan2 (@var{y}, @var{x})\n\ Compute atan (@var{y} / @var{x}) for corresponding elements of @var{y}\n\ -and @var{x}. The result is in range -pi to pi.\n\ +and @var{x}. The result is in the range -pi to pi.\n\ @end deftypefn") { octave_value retval; diff --git a/src/debug.cc b/src/debug.cc --- a/src/debug.cc +++ b/src/debug.cc @@ -373,7 +373,7 @@ String representing the function name. When already in debug\n\ mode this should be left out and only the line should be given.\n\ @item line\n\ -Line you would like the breakpoint to be set on. Multiple\n\ +Line number you would like the breakpoint to be set on. Multiple\n\ lines might be given as separate arguments or as a vector.\n\ @end table\n\ \n\ @@ -405,7 +405,7 @@ String representing the function name. When already in debug\n\ mode this should be left out and only the line should be given.\n\ @item line\n\ -Line where you would like to remove the breakpoint. Multiple\n\ +Line number where you would like to remove the breakpoint. Multiple\n\ lines might be given as separate arguments or as a vector.\n\ @end table\n\ No checking is done to make sure that the line you requested is really\n\ diff --git a/src/error.cc b/src/error.cc --- a/src/error.cc +++ b/src/error.cc @@ -1417,7 +1417,7 @@ The message identifier of this error message\n\ @item 'stack'\n\ A structure containing information on where the message occurred. This might\n\ -be an empty structure if this in the case where this information can not\n\ +be an empty structure if this in the case where this information cannot\n\ be obtained. The fields of this structure are:\n\ \n\ @table @asis\n\ diff --git a/src/help.cc b/src/help.cc --- a/src/help.cc +++ b/src/help.cc @@ -1817,7 +1817,7 @@ Note that the ability of @code{lookfor} to correctly identify the first\n\ sentence of the help of the functions is dependent on the format of the\n\ functions help. All of the functions in Octave itself will correctly\n\ -find the first sentence, but the same can not be guaranteed for other\n\ +find the first sentence, but the same cannot be guaranteed for other\n\ functions. Therefore the use of the '-all' argument might be necessary\n\ to find related functions that are not part of Octave.\n\ @seealso{help, which}\n\ diff --git a/src/octave.cc b/src/octave.cc --- a/src/octave.cc +++ b/src/octave.cc @@ -917,7 +917,7 @@ DEFUN (program_name, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} program_name ()\n\ -Return the last component of of the value returned by\n\ +Return the last component of the value returned by\n\ @code{program_invocation_name}.\n\ @seealso{program_invocation_name}\n\ @end deftypefn") diff --git a/src/toplev.cc b/src/toplev.cc --- a/src/toplev.cc +++ b/src/toplev.cc @@ -790,7 +790,7 @@ argument is optional. If @var{type} is @code{\"async\"}, the process\n\ is started in the background and the process id of the child process\n\ is returned immediately. Otherwise, the process is started, and\n\ -Octave waits until it exits. If @var{type} argument is omitted, a\n\ +Octave waits until it exits. If the @var{type} argument is omitted, a\n\ value of @code{\"sync\"} is assumed.\n\ \n\ If two input arguments are given (the actual value of\n\