Mercurial > hg > octave-nkf
changeset 15545:0272bb60408a
maint: Periodic merge of stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 19 Oct 2012 08:57:10 -0700 |
parents | 9db32cabeacf (current diff) 6a4e79110857 (diff) |
children | 3bf1e0da76b0 |
files | doc/interpreter/basics.txi doc/interpreter/errors.txi doc/interpreter/octave.texi doc/interpreter/package.txi libinterp/corefcn/typecast.cc scripts/help/doc.m |
diffstat | 7 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/basics.txi +++ b/doc/interpreter/basics.txi @@ -379,8 +379,8 @@ @node Getting Help @section Commands for Getting Help -@cindex on-line help -@cindex help, on-line +@cindex online help +@cindex help, online The entire text of this manual is available from the Octave prompt via the command @kbd{doc}. In addition, the documentation for
--- a/doc/interpreter/errors.txi +++ b/doc/interpreter/errors.txi @@ -115,7 +115,7 @@ @print{} @print{} @print{} Additional help for built-in functions and operators is -@print{} available in the on-line version of the manual. Use the command +@print{} available in the online version of the manual. Use the command @print{} `doc <topic>' to search the manual index. @print{} @print{} Help and information about Octave is also available on the WWW
--- a/doc/interpreter/octave.1 +++ b/doc/interpreter/octave.1 @@ -25,7 +25,7 @@ .fi .. .\" -------------------------------------------------------------------- -.TH OCTAVE 1 "4 February 2011" "GNU Octave" +.TH OCTAVE 1 "19 October 2012" "GNU Octave" .SH NAME octave \- A high-level interactive language for numerical computations. .SH SYNOPSIS @@ -44,9 +44,9 @@ .SH DOCUMENTATION The primary documentation for Octave is written using Texinfo, the GNU documentation system, which allows the same source files to be used to -produce on-line and printed versions of the manual. +produce online and printed versions of the manual. .PP -You can read the on-line copy of the Octave documentation by issuing +You can read the online copy of the Octave documentation by issuing the following command from within \fBoctave\fP. .Vb
--- a/doc/interpreter/package.txi +++ b/doc/interpreter/package.txi @@ -24,7 +24,7 @@ installation of extra packages. The `Octave-Forge' project is a community-maintained set of packages that can be downloaded and installed in Octave. At the time of writing the `Octave-Forge' project -can be found on-line at @uref{http://octave.sourceforge.net}, but +can be found online at @uref{http://octave.sourceforge.net}, but since the Internet is an ever-changing place this may not be true at the time of reading. Therefore it is recommended to see the Octave website for an updated reference.
--- a/libinterp/corefcn/typecast.cc +++ b/libinterp/corefcn/typecast.cc @@ -132,7 +132,7 @@ @group\n\ @var{x} = uint16 ([1, 65535]);\n\ typecast (@var{x}, \"uint8\")\n\ - @result{} [ 0, 1, 255, 255]\n\ +@result{} [ 1, 0, 255, 255]\n\ @end group\n\ @end example\n\ @seealso{cast, bitunpack, bitpack, swapbytes}\n\
--- a/scripts/help/doc.m +++ b/scripts/help/doc.m @@ -19,12 +19,12 @@ ## -*- texinfo -*- ## @deftypefn {Command} {} doc @var{function_name} ## Display documentation for the function @var{function_name} -## directly from an on-line version of +## directly from an online version of ## the printed manual, using the GNU Info browser. If invoked without ## any arguments, the manual is shown from the beginning. ## ## For example, the command @kbd{doc rand} starts the GNU Info browser -## at the @code{rand} node in the on-line version of the manual. +## at the @code{rand} node in the online version of the manual. ## ## Once the GNU Info browser is running, help for using it is available ## using the command @kbd{C-h}.
--- a/scripts/help/private/__additional_help_message__.m +++ b/scripts/help/private/__additional_help_message__.m @@ -28,7 +28,7 @@ else msg = "\ Additional help for built-in functions and operators is\n\ -available in the on-line version of the manual. Use the command\n\ +available in the online version of the manual. Use the command\n\ 'doc <topic>' to search the manual index.\n\ \n\ Help and information about Octave is also available on the WWW\n\