changeset 15501:6e834a113760

maint: Periodic merge of stable to default.
author Rik <>
date Wed, 10 Oct 2012 11:44:09 -0700
parents acfee9c61f80
children 96b7343b8a41
files README doc/interpreter/contrib.txi etc/HACKING etc/PROJECTS etc/README.MacOS etc/README.MinGW libinterp/ scripts/help/unimplemented.m scripts/miscellaneous/info.m scripts/plot/subplot.m
diffstat 10 files changed, 19 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/README
+++ b/README
@@ -66,9 +66,9 @@
 bit behind the development of the software.  In particular, there is
 currently no complete documentation of the C++ class libraries.  If
 you notice omissions or inconsistencies, please report them on the
-bug tracker at  Specific
-suggestions for ways to improve Octave and its documentation are
-always welcome.  Reports with patches are even more welcome.
+bug tracker at  Specific suggestions for ways
+to improve Octave and its documentation are always welcome.  Reports
+with patches are even more welcome.
 Additional Information
--- a/doc/interpreter/contrib.txi
+++ b/doc/interpreter/contrib.txi
@@ -41,7 +41,7 @@
 development of Octave core, i.e., code that goes to Octave directly.
 You may consider developing and publishing a package instead; a great
 place for this is the allied Octave-Forge project
-(@url{}).  Note that the Octave project is
+(@url{}).  Note that the Octave project is
 inherently more conservative and follows narrower rules.
 @node Building the Development Sources
@@ -68,7 +68,7 @@
 Check out a copy of the Octave sources:
-hg clone
+hg clone
 @end example
--- a/etc/HACKING
+++ b/etc/HACKING
@@ -41,7 +41,7 @@
 this package from the repository.  For the record, you will find all the
 relevant information on downloading sources at:
 After cloning Octave, you will need to run the bootstrap script:
--- a/etc/PROJECTS
+++ b/etc/PROJECTS
@@ -3,7 +3,7 @@
 A list of proposed projects is maintained at: 
 If you start working steadily on a project, please let know.  We might have information that could help
--- a/etc/README.MacOS
+++ b/etc/README.MacOS
@@ -31,7 +31,7 @@
 the current development sources using mercurial can be found on Octave's 
 web-site below.
 Building on MacOS can vary significantly between versions.  These
 instructions document the procedure for MacOS 10.6.X.
@@ -77,7 +77,7 @@
 Instructions for building Octave are available on the web at the link below.
 In addition, those wishing to build on MacOS X (10.6.x) should read section
 2.1 above.
@@ -143,7 +143,7 @@
 See the link below for additional details about optional dependencies.
 TODO - Modify the configure script to test for 64 bit vecLib bug.  When the bug
        is present, apply the wrapper solution.
--- a/etc/README.MinGW
+++ b/etc/README.MinGW
@@ -73,7 +73,7 @@
   The source for testing snapshots can be downloaded from the official Octave
-  web site. 
+  web site. 
   The very latest development code is also available via anonymous access to a
   read-only Mercurial archive.  The method of download is described on the web
--- a/libinterp/
+++ b/libinterp/
@@ -58,7 +58,7 @@
   "Please contribute if you find this software useful.\n\
-For more information, visit"
+For more information, visit"
   "Read to learn how to submit bug reports."
--- a/scripts/help/unimplemented.m
+++ b/scripts/help/unimplemented.m
@@ -39,7 +39,8 @@
   case "gsvd"
     txt = ["gsvd is not currently part of core Octave.  See the ",...
-    "linear-algebra package at @url{}."];
+    "linear-algebra package at ",...
+    "@url{}."];
   case "linprog"
     txt = ["Octave does not currently provide linprog.  ",...
@@ -50,7 +51,7 @@
     txt = ["Octave provides lsode for solving differential equations.  ",...
     "For more information try @code{help lsode}.  ",...
     "Matlab-compatible ODE functions are provided by the odepkg package.  ",...
-    "See @url{}."];
+    "See @url{}."];
     if (ismember (fcn, missing_functions ()))
--- a/scripts/miscellaneous/info.m
+++ b/scripts/miscellaneous/info.m
@@ -27,8 +27,9 @@
   Additional information about GNU Octave is available at\n\\n\
-  Descriptions of mailing lists devoted to Octave are available at\n\
+  Links to the mailing list and other resources for getting help with\n\
+  Octave are available at\n\
   You may also find some information in the Octave Wiki at\n\\n\
--- a/scripts/plot/subplot.m
+++ b/scripts/plot/subplot.m
@@ -206,7 +206,7 @@
           objpos = get (child, "outerposition");
-        if (all (objpos == pos) && ! replace_axes)
+        if (all (abs (objpos - pos) < eps) && ! replace_axes)
           ## If the new axes are in exactly the same position as an
           ## existing axes object, use the existing axes.
           found = true;