comparison doc/interpreter/func.txi @ 18605:f958e8cd6348

maint: Periodic merge of gui-release to default.
author Rik <rik@octave.org>
date Sat, 01 Mar 2014 22:11:32 -0800
parents 4e0d72145c5a 4cf930a64fad
children ff820f92cbb5
comparison
equal deleted inserted replaced
18596:9c8321ea6f58 18605:f958e8cd6348
1131 1131
1132 @item Class method 1132 @item Class method
1133 An overloaded function of a class as in chapter 1133 An overloaded function of a class as in chapter
1134 @ref{Object Oriented Programming}. 1134 @ref{Object Oriented Programming}.
1135 1135
1136 @item Legacy Dispatch
1137 An overloaded function as defined by @code{dispatch}.
1138
1139 @item Command-line Function 1136 @item Command-line Function
1140 A function that has been defined on the command-line. 1137 A function that has been defined on the command-line.
1141 1138
1142 @item Autoload function 1139 @item Autoload function
1143 A function that is marked as autoloaded with @xref{XREFautoload,,autoload}. 1140 A function that is marked as autoloaded with @xref{XREFautoload,,autoload}.
1146 A function that can be found on the users load-path. There can also be 1143 A function that can be found on the users load-path. There can also be
1147 Oct-file, mex-file or m-file versions of this function and the precedence 1144 Oct-file, mex-file or m-file versions of this function and the precedence
1148 between these versions are in that order. 1145 between these versions are in that order.
1149 1146
1150 @item Built-in function 1147 @item Built-in function
1151 A function that is builtin to Octave itself such as @code{numel}, 1148 A function that is a part of core Octave such as @code{numel}, @code{size},
1152 @code{size}, etc. 1149 etc.
1153 @end enumerate 1150 @end enumerate
1154 1151
1155 @node Script Files 1152 @node Script Files
1156 @section Script Files 1153 @section Script Files
1157 1154