changeset 7031:120f3135952f

[project @ 2007-10-15 15:30:03 by jwe]
author jwe
date Mon, 15 Oct 2007 15:31:21 +0000
parents bdcea6ede1cd
children 4d4197ffb09d
files doc/ChangeLog doc/interpreter/basics.txi doc/interpreter/container.txi doc/interpreter/errors.txi doc/interpreter/expr.txi doc/interpreter/func.txi doc/interpreter/io.txi doc/interpreter/package.txi doc/interpreter/preface.txi doc/interpreter/strings.txi doc/interpreter/var.txi scripts/ChangeLog scripts/control/base/lqg.m scripts/control/hinf/hinfdemo.m scripts/control/system/ss.m scripts/control/system/ss2sys.m scripts/control/system/sysscale.m scripts/control/system/syssetsignals.m scripts/general/cplxpair.m scripts/general/rat.m scripts/optimization/sqp.m scripts/polynomial/polygcd.m scripts/signal/arch_rnd.m scripts/sparse/pcg.m scripts/sparse/pcr.m scripts/statistics/models/logistic_regression.m scripts/strings/str2double.m src/ChangeLog src/DLD-FUNCTIONS/besselj.cc src/DLD-FUNCTIONS/urlwrite.cc src/error.cc src/load-save.cc src/ov-struct.cc
diffstat 33 files changed, 180 insertions(+), 130 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-15  Søren Hauberg  <hauberg@gmail.com>
+
+	* interpreter/preface.txi, interpreter/basics.txi,
+	interpreter/strings.txi, interpreter/container.txi,
+	interpreter/var.txi, interpreter/expr.txi, interpreter/errors.txi,
+	interpreter/io.txi, interpreter/func.txi, interpreter/package.txi:
+	Make text fit on pages when using smallbook.
+
 2007-10-12  John W. Eaton  <jwe@octave.org>
 
 	* Change copyright notices in all files that are part of Octave to
@@ -828,7 +836,7 @@
 
 2003-05-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
-	* interpreter/Makefile.in, doc/liboctave/Makefile.in: Handle DESTDIR.
+	* interpreter/Makefile.in, liboctave/Makefile.in: Handle DESTDIR.
 
 2003-02-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
--- a/doc/interpreter/basics.txi
+++ b/doc/interpreter/basics.txi
@@ -187,15 +187,16 @@
 
 @example
 @group
-  PS1                             = ">> "
-  PS2                             = ""
-  beep_on_error                   = true
-  crash_dumps_octave_core         = false
-  default_save_options            = "-mat-binary"
-  fixed_point_format              = true
-  history_timestamp_format_string = "%%-- %D %I:%M %p --%%"
-  page_screen_output              = false
-  print_empty_dimensions          = false
+PS1                     = ">> "
+PS2                     = ""
+beep_on_error           = true
+crash_dumps_octave_core = false
+default_save_options    = "-mat-binary"
+fixed_point_format      = true
+history_timestamp_format_string
+                        = "%%-- %D %I:%M %p --%%"
+page_screen_output      = false
+print_empty_dimensions  = false
 @end group
 @end example
 
@@ -203,9 +204,9 @@
 and disable the following warnings
 @example
 @group
-  Octave:fopen-file-in-path
-  Octave:function-name-clash
-  Octave:load-file-in-path
+Octave:fopen-file-in-path
+Octave:function-name-clash
+Octave:load-file-in-path
 @end group
 @end example
 
@@ -762,14 +763,15 @@
 @noindent
 Octave will respond with
 
-@example
+@c Using 'smallexample' to make text fit on page when creating smallbook.
+@smallexample
 @group
 error: `x' undefined near line 1 column 24
 error: evaluating expression near line 1, column 24
 error: evaluating assignment expression near line 1, column 22
 error: called from `f'
 @end group
-@end example
+@end smallexample
 
 @noindent
 This error message has several parts, and gives you quite a bit of
--- a/doc/interpreter/container.txi
+++ b/doc/interpreter/container.txi
@@ -310,8 +310,9 @@
 
 @example
 @group
-in = struct ('call1', @{x, Inf, 'last'@}, 'call2', @{x, Inf, 'first'@});
-in (:, 1) = []
+in = struct ("call1", @{x, Inf, "last"@}, 
+             "call2", @{x, Inf, "first"@});
+in (1, :) = []
 @result{} in =
       @{
         call1 =
@@ -343,7 +344,7 @@
 
 @example
 @group
-struct ('field1', 1, 'field2', 2)
+struct ("field1", 1, "field2", 2)
 @result{} ans =
       @{
         field1 =  1
@@ -358,7 +359,8 @@
 
 @example
 @group
-struct ('field1', @{1, 'one'@}, 'field2', @{2, 'two'@}, 'field3', 3);
+struct ("field1", @{1, "one"@}, "field2", @{2, "two"@},
+        "field3", 3)
 @result{} ans =
       @{
         field1 =
@@ -605,7 +607,7 @@
 
 @example
 @group
-x = @{'1', '2'; '3', '4'@};
+x = @{"1", "2"; "3", "4"@};
 x@{1, :@} = []
 @result{} x =
       @{
@@ -709,7 +711,7 @@
 example
 
 @example
-[@var{i}, @var{j}] = ceil (find (@var{x}, [], 'last'));
+[@var{i}, @var{j}] = ceil (find (@var{x}, [], "last"));
 @end example
 
 @noindent
@@ -786,8 +788,8 @@
 @group
 in @{1@} = ceil (rand (10, 1));
 in @{2@} = [];
-in @{3@} = 'last';
-in @{4@} = 'first';
+in @{3@} = "last";
+in @{4@} = "first";
 out = cell (4, 1);
 [out@{1:2@}] = find (in@{1 : 3@});
 [out@{3:4@}] = find (in@{[1, 2, 4]@});
@@ -801,8 +803,9 @@
 @example
 @group
 x = ceil (randn (10, 1)); 
-in = struct ('call1', @{x, Inf, 'last'@}, 'call2', @{x, Inf, 'first'@});
-out = struct ('call1', cell (2, 1), 'call2', cell (2, 1));
+in = struct ("call1", @{x, Inf, "last"@}, 
+             "call2", @{x, Inf, "first"@});
+out = struct ("call1", cell (2, 1), "call2", cell (2, 1));
 [out.call1] = find (in.call1);
 [out.call2] = find (in.call2);
 @end group
--- a/doc/interpreter/errors.txi
+++ b/doc/interpreter/errors.txi
@@ -226,10 +226,10 @@
 @example
 a = -1;
 if (a < 0)
-  warning ("'a' must be non-negative number. Setting 'a' to zero.");
+  warning ("'a' must be non-negative. Setting 'a' to zero.");
   a = 0;
 endif
-     @print{} 'a' must be non-negative number. Setting 'a' to zero.
+     @print{} 'a' must be non-negative. Setting 'a' to zero.
 @end example
 
 Since warnings aren't fatal to a running program, it is not possible
@@ -260,7 +260,7 @@
 
 @example
 warning ("non-negative-variable", 
-         "'a' must be non-negative number. Setting 'a' to zero.");
+         "'a' must be non-negative. Setting 'a' to zero.");
 @end example
 
 @noindent
@@ -269,7 +269,7 @@
 @example
 warning ("off", "non-negative-variable");
 warning ("non-negative-variable", 
-         "'a' must be non-negative number. Setting 'a' to zero.");
+         "'a' must be non-negative. Setting 'a' to zero.");
 @end example
 
 The functions distributed with Octave can issue one of the following
--- a/doc/interpreter/expr.txi
+++ b/doc/interpreter/expr.txi
@@ -943,11 +943,12 @@
 not exceed the number of values on the right side. For example, the
 following will produce an error.
 
-@example
+@c Using 'smallexample' to make text fit on page when creating smallbook.
+@smallexample
 [a, b, c, d] = [u, s, v] = svd (a)
-     @print{} error: element number 4 undefined in return list
-        error: evaluating assignment expression near line 8, column 15
-@end example
+@print{} error: element number 4 undefined in return list
+@print{} error: evaluating assignment expression near line 8, column 15
+@end smallexample
 
 @opindex +=
 A very common programming pattern is to increment an existing variable
--- a/doc/interpreter/func.txi
+++ b/doc/interpreter/func.txi
@@ -775,7 +775,8 @@
 @group
 function count_calls()
   persistent calls = 0;
-  printf ("'count_calls' has been called %d times\n", ++calls);
+  printf ("'count_calls' has been called %d times\n",
+          ++calls);
 endfunction
 mlock ("count_calls");
 
@@ -798,7 +799,8 @@
 function count_calls ()
   mlock ();
   persistent calls = 0;
-  printf ("'count_calls' has been called %d times\n", ++calls);
+  printf ("'count_calls' has been called %d times\n",
+          ++calls);
 endfunction
 @end group
 @end example
--- a/doc/interpreter/io.txi
+++ b/doc/interpreter/io.txi
@@ -376,15 +376,15 @@
 @example
 pct = 37;
 filename = "foo.txt";
-printf ("Processing of `%s' is %d%% finished.\nPlease be patient.\n",
-        filename, pct);
+printf ("Processed %d%% of `%s'.\nPlease be patient.\n",
+        pct, filename);
 @end example
 
 @noindent
 produces output like
 
 @example
-Processing of `foo.txt' is 37% finished.
+Processed 37% of `foo.txt'.
 Please be patient.
 @end example
 
--- a/doc/interpreter/package.txi
+++ b/doc/interpreter/package.txi
@@ -63,9 +63,9 @@
 @example
 @group
 pkg list
-     @print{} Package Name  | Version | Installation directory
-     @print{} --------------+---------+-----------------------
-     @print{}        image *|   1.0.0 | /home/jwe/octave/image-1.0.0
+@print{} Package Name  | Version | Installation directory
+@print{} --------------+---------+-----------------------
+@print{}        image *|   1.0.0 | /home/jwe/octave/image-1.0.0
 @end group
 @end example
 
@@ -307,11 +307,13 @@
 Version: 1.0.0
 Date: 2007-18-04
 Author: The name (and possibly email) of the package author.
-Maintainer: The name (and possibly email) of the current package maintainer.
+Maintainer: The name (and possibly email) of the current
+ package maintainer.
 Title: The title of the package
-Description: A short description of the package. If this description
- gets too long for one line it can continue on the next by adding a
- space to the beginning of the following lines.
+Description: A short description of the package. If this
+ description gets too long for one line it can continue
+ on the next by adding a space to the beginning of the
+ following lines.
 License: GPL version 3 or later
 @end example
 
--- a/doc/interpreter/preface.txi
+++ b/doc/interpreter/preface.txi
@@ -179,7 +179,6 @@
 Boston, MA 02110-1301--1307@*
 USA
 @end quotation
- 
-Octave is also available on the Internet from
-@url{ftp://ftp.octave.org/pub/octave}, and additional information is
-available from @url{http://www.octave.org}.
+
+Octave can also be downloaded from @url{http://www.octave.org}, where
+additional information also is available.
--- a/doc/interpreter/strings.txi
+++ b/doc/interpreter/strings.txi
@@ -211,8 +211,8 @@
 @example
 GNU = "GNU's Not UNIX";
 spaces = (GNU == " ")
-     @result{} spaces =
-           0   0   0   0   0   1   0   0   0   1   0   0   0   0
+@result{} spaces =
+      0   0   0   0   0   1   0   0   0   1   0   0   0   0
 @end example
 
 @noindent
--- a/doc/interpreter/var.txi
+++ b/doc/interpreter/var.txi
@@ -193,7 +193,8 @@
 @group
 function count_calls ()
   persistent calls = 0;
-  printf ("'count_calls' has been called %d times\n", ++calls);
+  printf ("'count_calls' has been called %d times\n",
+          ++calls);
 endfunction
 
 for i = 1:3
@@ -248,7 +249,8 @@
   if (isempty (calls))
     calls = 0;
   endif
-  printf ("'count_calls' has been called %d times\n", ++calls);
+  printf ("'count_calls' has been called %d times\n",
+          ++calls);
 endfunction
 @end group
 @end example
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-15  Søren Hauberg  <hauberg@gmail.com>
+
+	* general/rat.m, sparse/pcg.m, sparse/pcr.m, optimization/sqp.m,
+	statistics/models/logistic_regression.m, polynomial/polygcd.m,
+	control/system/ss.m, signal/arch_rnd.m, control/system/ss2sys.m,
+	control/system/syssetsignals.m, control/base/lqg.m,
+	strings/str2double.m, control/system/sysscale.m,
+	control/hinf/hinfdemo.m, general/cplxpair.m:
+	Make help text fit on pages when using smallbook.
+
 2007-10-15  David Bateman  <dbateman@free.fr>
 
 	* testfun/test.m: In error/warning blocks test for an error before
--- a/scripts/control/base/lqg.m
+++ b/scripts/control/base/lqg.m
@@ -26,8 +26,8 @@
 ## @end example
 ## or
 ## @example
-## x(k+1) = A x(k) + B u(k) + G w(k)       [w]=N(0,[Sigw 0    ])
-##   y(k) = C x(k) + v(k)                  [v]  (    0   Sigv ])
+## x(k+1) = A x(k) + B u(k) + G w(k)   [w]=N(0,[Sigw 0    ])
+##   y(k) = C x(k) + v(k)              [v]  (    0   Sigv ])
 ## @end example
 ##
 ## @strong{Inputs}
--- a/scripts/control/hinf/hinfdemo.m
+++ b/scripts/control/hinf/hinfdemo.m
@@ -62,7 +62,7 @@
 ## @end example
 ## @end ifinfo
 ##
-## @example
+## @smallexample
 ## @group
 ##
 ##                               +----+
@@ -78,7 +78,7 @@
 ##          -----| K |<-------
 ##               +---+
 ## @end group
-## @end example
+## @end smallexample
 ## 
 ## @iftex
 ## @tex
@@ -107,7 +107,7 @@
 ## @end ifinfo
 ## norm of the
 ## augmented plant @var{P} (mixed-sensitivity problem):
-## @example
+## @smallexample
 ## @group
 ##      w
 ##       1 -----------+
@@ -124,7 +124,7 @@
 ##             u                       y (to K)
 ##          (from controller K)
 ## @end group
-## @end example
+## @end smallexample
 ##
 ## @iftex
 ## @tex
@@ -137,7 +137,7 @@
 ## @end tex
 ## @end iftex
 ## @ifinfo
-## @example
+## @smallexample
 ## @group
 ##                   +    +           +    +
 ##                   | z  |           | w  |
@@ -147,7 +147,7 @@
 ##                   | y  |           | u  |
 ##                   +    +           +    +
 ## @end group
-## @end example
+## @end smallexample
 ## @end ifinfo
 ##
 ## @item Discrete system:
@@ -192,7 +192,7 @@
 ## @end example
 ## @end ifinfo
 ##
-## @example
+## @smallexample
 ## @group
 ##
 ##                               +----+
@@ -208,7 +208,7 @@
 ##          -----| K |<-------
 ##               +---+
 ## @end group
-## @end example
+## @end smallexample
 ## @iftex
 ## @tex
 ## $$ { \rm min } \Vert T_{vz} \Vert _\infty $$
--- a/scripts/control/system/ss.m
+++ b/scripts/control/system/ss.m
@@ -144,7 +144,8 @@
 ## octave:1> a = [1 2 3; 4 5 6; 7 8 10];
 ## octave:2> b = [0 0 ; 0 1 ; 1 0];
 ## octave:3> c = eye (3);
-## octave:4> sys = ss (a, b, c, [], 0, 3, 0, @{"volts", "amps", "joules"@});
+## octave:4> sys = ss (a, b, c, [], 0, 3, 0, ...
+## >                   @{"volts", "amps", "joules"@});
 ## octave:5> sysout(sys);
 ## Input(s)
 ##         1: u_1
--- a/scripts/control/system/ss2sys.m
+++ b/scripts/control/system/ss2sys.m
@@ -18,7 +18,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} ss (@var{a}, @var{b}, @var{c}, @var{d}, @var{tsam}, @var{n}, @var{nz}, @var{stname}, @var{inname}, @var{outname}, @var{outlist})
+## @deftypefn {Function File} {} ss2sys (@var{a}, @var{b}, @var{c}, @var{d}, @var{tsam}, @var{n}, @var{nz}, @var{stname}, @var{inname}, @var{outname}, @var{outlist})
 ## Create system structure from state-space data.   May be continuous,
 ## discrete, or mixed (sampled data)
 ##
@@ -141,7 +141,8 @@
 ## octave:1> a = [1 2 3; 4 5 6; 7 8 10];
 ## octave:2> b = [0 0 ; 0 1 ; 1 0];
 ## octave:3> c = eye (3);
-## octave:4> sys = ss (a, b, c, [], 0, 3, 0, @{"volts", "amps", "joules"@});
+## octave:4> sys = ss (a, b, c, [], 0, 3, 0, 
+## >                   @{"volts", "amps", "joules"@});
 ## octave:5> sysout(sys);
 ## Input(s)
 ##         1: u_1
--- a/scripts/control/system/sysscale.m
+++ b/scripts/control/system/sysscale.m
@@ -37,11 +37,11 @@
 ## @table @var
 ## @item retsys
 ## resulting open loop system:
-## @example
+## @smallexample
 ##       -----------    -------    -----------
 ## u --->| inscale |--->| sys |--->| outscale |---> y
 ##       -----------    -------    -----------
-## @end example
+## @end smallexample
 ## @end table
 ## If the input names and output names (each a list of strings)
 ## are not given and the scaling matrices
--- a/scripts/control/system/syssetsignals.m
+++ b/scripts/control/system/syssetsignals.m
@@ -65,8 +65,9 @@
 ##
 ## @strong{Example}
 ## @example
-## octave:1> sys=ss([1 2; 3 4],[5;6],[7 8]);
-## octave:2> sys = syssetsignals(sys,"st",str2mat("Posx","Velx"));
+## octave:1> sys=ss ([1 2; 3 4],[5;6],[7 8]);
+## octave:2> sys = syssetsignals (sys, "st",
+## >                              str2mat("Posx","Velx"));
 ## octave:3> sysout(sys)
 ## Input(s)
 ##         1: u_1
--- a/scripts/general/cplxpair.m
+++ b/scripts/general/cplxpair.m
@@ -35,9 +35,10 @@
 ## error. Note that there are no guarantees on the order of the returned
 ## pairs with identical real parts but differing imaginary parts.
 ##
-## @example
+## @c Using 'smallexample' to make text fit in page when using 'smallbook'
+## @smallexample
 ## cplxpair (exp(2i*pi*[0:4]'/5)) == exp(2i*pi*[3; 2; 4; 1; 0]/5)
-## @end example
+## @end smallexample
 ## @end deftypefn
 
 ## TODO: subsort returned pairs by imaginary magnitude
--- a/scripts/general/rat.m
+++ b/scripts/general/rat.m
@@ -24,8 +24,9 @@
 ## by @var{tol} using a continued fraction expansion. E.g,
 ##
 ## @example
-##    rat(pi) = 3 + 1/(7 + 1/16) = 355/113
-##    rat(e) = 3 + 1/(-4 + 1/(2 + 1/(5 + 1/(-2 + 1/(-7))))) = 1457/536
+## rat(pi) = 3 + 1/(7 + 1/16) = 355/113
+## rat(e) = 3 + 1/(-4 + 1/(2 + 1/(5 + 1/(-2 + 1/(-7))))) 
+##        = 1457/536
 ## @end example
 ##
 ## Called with two arguments returns the numerator and denominator separately
--- a/scripts/optimization/sqp.m
+++ b/scripts/optimization/sqp.m
@@ -77,7 +77,7 @@
 ## If supplied, the gradient function must be of the form
 ##
 ## @example
-##      g = gradient (x)
+## g = gradient (x)
 ## @end example
 ##
 ## @noindent
@@ -86,7 +86,7 @@
 ## If supplied, the hessian function must be of the form
 ##
 ## @example
-##      h = hessian (x)
+## h = hessian (x)
 ## @end example
 ##
 ## @noindent
@@ -103,7 +103,7 @@
 ## of the form
 ##
 ## @example
-##      r = f (x)
+## r = f (x)
 ## @end example
 ##
 ## @noindent
@@ -134,35 +134,37 @@
 ## Here is an example of calling @code{sqp}:
 ##
 ## @example
-##      function r = g (x)
-##        r = [ sumsq(x)-10; x(2)*x(3)-5*x(4)*x(5); x(1)^3+x(2)^3+1];
-##      endfunction
+## function r = g (x)
+##   r = [ sumsq(x)-10;
+##         x(2)*x(3)-5*x(4)*x(5); 
+##         x(1)^3+x(2)^3+1 ];
+## endfunction
+##
+## function obj = phi (x)
+##   obj = exp(prod(x)) - 0.5*(x(1)^3+x(2)^3+1)^2;
+## endfunction
 ##
-##      function obj = phi (x)
-##        obj = exp(prod(x)) - 0.5*(x(1)^3+x(2)^3+1)^2;
-##      endfunction
+## x0 = [-1.8; 1.7; 1.9; -0.8; -0.8];
+##
+## [x, obj, info, iter, nf, lambda] = sqp (x0, @@phi, @@g, [])
 ##
-##      x0 = [-1.8; 1.7; 1.9; -0.8; -0.8];
-##
-##      [x, obj, info, iter, nf, lambda] = sqp (x0, @@phi, @@g, [])
-##
-##      x =
+## x =
+##     
+##   -1.71714
+##    1.59571
+##    1.82725
+##   -0.76364
+##   -0.76364
 ##      
-##        -1.71714
-##         1.59571
-##         1.82725
-##        -0.76364
-##        -0.76364
-##      
-##      obj = 0.053950
-##      info = 101
-##      iter = 8
-##      nf = 10
-##      lambda =
-##      
-##        -0.0401627
-##         0.0379578
-##        -0.0052227
+## obj = 0.053950
+## info = 101
+## iter = 8
+## nf = 10
+## lambda =
+##     
+##   -0.0401627
+##    0.0379578
+##   -0.0052227
 ## @end example
 ##
 ## The value returned in @var{info} may be one of the following:
--- a/scripts/polynomial/polygcd.m
+++ b/scripts/polynomial/polygcd.m
@@ -33,7 +33,8 @@
 ## @example
 ## polygcd (poly(1:8), poly(3:12)) - poly(3:8)
 ## @result{} [ 0, 0, 0, 0, 0, 0, 0 ]
-## deconv (poly(1:8), polygcd (poly(1:8), poly(3:12))) - poly(1:2)
+## deconv (poly(1:8), polygcd (poly(1:8), poly(3:12))) ...
+##   - poly(1:2)
 ## @result{} [ 0, 0, 0 ]
 ## @end example
 ## @seealso{poly, polyinteg, polyderiv, polyreduce, roots, conv, deconv,
--- a/scripts/signal/arch_rnd.m
+++ b/scripts/signal/arch_rnd.m
@@ -23,17 +23,17 @@
 ## coefficients @var{b} and CH coefficients @var{a}.  I.e., the result
 ## @math{y(t)} follows the model
 ##
-## @example
+## @smallexample
 ## y(t) = b(1) + b(2) * y(t-1) + @dots{} + b(lb) * y(t-lb+1) + e(t),
-## @end example
+## @end smallexample
 ##
 ## @noindent
 ## where @math{e(t)}, given @var{y} up to time @math{t-1}, is
 ## @math{N(0, h(t))}, with
 ##
-## @example
+## @smallexample
 ## h(t) = a(1) + a(2) * e(t-1)^2 + @dots{} + a(la) * e(t-la+1)^2
-## @end example
+## @end smallexample
 ## @end deftypefn
 
 ## Author: KH <Kurt.Hornik@wu-wien.ac.at>
--- a/scripts/sparse/pcg.m
+++ b/scripts/sparse/pcg.m
@@ -174,7 +174,8 @@
 ##     y(1:K) = x(1:K)./[1:K]';
 ##   endfunction
 ## 
-##   [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], [], "applyM");
+##   [x, flag, relres, iter, resvec, eigest] = ...
+##                      pcg (A, b, [], [], "applyM");
 ##   semilogy (1:iter+1, resvec);
 ## @end group
 ## @end example
--- a/scripts/sparse/pcr.m
+++ b/scripts/sparse/pcr.m
@@ -137,7 +137,8 @@
 ##     y(1:K) = x(1:K)./[1:K]';	
 ##   endfunction
 ## 
-##   [x, flag, relres, iter, resvec] = pcr(A,b,[],[],'applyM')
+##   [x, flag, relres, iter, resvec] = ...
+##                      pcr(A, b, [], [], 'applyM')
 ##   semilogy([1:iter+1], resvec);
 ## @end group
 ## @end example
@@ -152,7 +153,8 @@
 ##     y = x; y(1:K) = x(1:K)./[1:K]';	 
 ##   endfunction
 ## 
-##   [x, flag, relres, iter, resvec] = pcr(A,b,[],[],'applyM',[],3)
+##   [x, flag, relres, iter, resvec] = ...
+##                      pcr(A, b, [], [], 'applyM', [], 3)
 ## @end group
 ## @end example
 ## 
--- a/scripts/statistics/models/logistic_regression.m
+++ b/scripts/statistics/models/logistic_regression.m
@@ -34,7 +34,7 @@
 ## fits the model
 ##
 ## @example
-## logit (gamma_i (x)) = theta_i - beta' * x,   i = 1, ..., k-1
+## logit (gamma_i (x)) = theta_i - beta' * x,   i = 1...k-1
 ## @end example
 ##
 ## The number of ordinal categories, @var{k}, is taken to be the number
--- a/scripts/strings/str2double.m
+++ b/scripts/strings/str2double.m
@@ -67,12 +67,12 @@
 ##    3.1400    4.4440    0.7000
 ##  -10.0000       NaN       NaN
 ##
-## line = "200,300,400,NaN,-inf,cd,yes,no,999,maybe,NaN";
+## line = "200, 300, NaN, -inf, yes, no, 999, maybe, NaN";
 ## [x, status] = str2double (line)
-## x =
-##    200   300   400   NaN  -Inf   NaN   NaN   NaN   999   NaN   NaN
-## status =
-##     0     0     0     0     0    -1    -1    -1     0    -1     0
+## @result{} x =
+##     200   300   NaN  -Inf   NaN   NaN   999   NaN   NaN
+## @result{} status =
+##       0     0     0     0    -1    -1     0    -1     0
 ## @end example
 ## @end deftypefn
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-15  Søren Hauberg  <hauberg@gmail.com>
+
+	* error.cc (Ferror): Make text fit on pages when using smallbook.
+	* load-save.cc (Fsave_header_format_string): Ditto.
+        * ov-struct.cc (Fcell2struct): Ditto.
+        * DLD-FUNCTIONS/besselj.cc (Fairy): Ditto.
+        * DLD-FUNCTIONS/urlwrite.cc (Furlwrite, Furlread): Ditto.
+
 2007-10-15  David Bateman  <dbateman@free.fr>
 
 	* graphics.cc (axes::properties::get): Fix typo.
--- a/src/DLD-FUNCTIONS/besselj.cc
+++ b/src/DLD-FUNCTIONS/besselj.cc
@@ -415,12 +415,12 @@
 derivatives.\n\
 \n\
 @example\n\
-  K   Function   Scale factor (if a third argument is supplied)\n\
- ---  --------   ----------------------------------------------\n\
-  0   Ai (Z)     exp ((2/3) * Z * sqrt (Z))\n\
-  1   dAi(Z)/dZ  exp ((2/3) * Z * sqrt (Z))\n\
-  2   Bi (Z)     exp (-abs (real ((2/3) * Z *sqrt (Z))))\n\
-  3   dBi(Z)/dZ  exp (-abs (real ((2/3) * Z *sqrt (Z))))\n\
+ K   Function   Scale factor (if 'opt' is supplied)\n\
+---  --------   ---------------------------------------\n\
+ 0   Ai (Z)     exp ((2/3) * Z * sqrt (Z))\n\
+ 1   dAi(Z)/dZ  exp ((2/3) * Z * sqrt (Z))\n\
+ 2   Bi (Z)     exp (-abs (real ((2/3) * Z *sqrt (Z))))\n\
+ 3   dBi(Z)/dZ  exp (-abs (real ((2/3) * Z *sqrt (Z))))\n\
 @end example\n\
 \n\
 The function call @code{airy (@var{z})} is equivalent to\n\
--- a/src/DLD-FUNCTIONS/urlwrite.cc
+++ b/src/DLD-FUNCTIONS/urlwrite.cc
@@ -195,7 +195,8 @@
 @var{localfile}.  For example,\n\
 \n\
 @example\n\
-urlwrite (\"ftp://ftp.octave.org/pub/octave/README\", \"README.txt\");\n\
+urlwrite (\"ftp://ftp.octave.org/pub/octave/README\", \n\
+          \"README.txt\");\n\
 @end example\n\
 \n\
 The full path of the downloaded file is returned in @var{f}.  The\n\
@@ -342,7 +343,7 @@
 URL.  For example,\n\
 \n\
 @example\n\
-s = urlread (\"http://username:password@@example.com/file.txt\");\n\
+s = urlread (\"http://user:password@@example.com/file.txt\");\n\
 @end example\n\
 \n\
 GET and POST requests can be specified by @var{method} and @var{param}.\n\
--- a/src/error.cc
+++ b/src/error.cc
@@ -984,7 +984,7 @@
 calling the function @code{f} will result in a list of messages that\n\
 can help you to quickly locate the exact location of the error:\n\
 \n\
-@example\n\
+@smallexample\n\
 @group\n\
 f ()\n\
 error: nargin != 1\n\
@@ -994,7 +994,7 @@
 error: called from `g'\n\
 error: called from `f'\n\
 @end group\n\
-@end example\n\
+@end smallexample\n\
 \n\
 If the error message ends in a new line character, Octave will print the\n\
 message but will not display any traceback messages as it returns\n\
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -1853,9 +1853,9 @@
 the header comment is omitted from text-format data files.  The\n\
 default value is\n\
 \n\
-@example\n\
+@smallexample\n\
 \"# Created by Octave VERSION, %a %b %d %H:%M:%S %Y %Z <USER@@HOST>\"\n\
-@end example\n\
+@end smallexample\n\
 @seealso{strftime}\n\
 @end deftypefn")
 {
--- a/src/ov-struct.cc
+++ b/src/ov-struct.cc
@@ -829,7 +829,8 @@
 \n\
 @example\n\
 @group\n\
-A = cell2struct (@{'Peter', 'Hannah', 'Robert'; 185, 170, 168@},\n\
+A = cell2struct (@{'Peter', 'Hannah', 'Robert';\n\
+                   185, 170, 168@},\n\
                  @{'Name','Height'@}, 1);\n\
 A(1)\n\
 @result{} ans =\n\