# HG changeset patch # User Rik # Date 1349894649 25200 # Node ID 6e834a1137608e8f52293bd91df3c002614b4f8d # Parent acfee9c61f8005d990fd39b4436ab140019dc09e maint: Periodic merge of stable to default. diff --git a/README b/README --- 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 http://savannah.gnu.org/bugs/?group=octave. Specific -suggestions for ways to improve Octave and its documentation are -always welcome. Reports with patches are even more welcome. +bug tracker at http://bugs.octave.org. Specific suggestions for ways +to improve Octave and its documentation are always welcome. Reports +with patches are even more welcome. Additional Information ---------------------- diff --git a/doc/interpreter/contrib.txi b/doc/interpreter/contrib.txi --- 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{http://octave.sf.net}). Note that the Octave project is +(@url{http://octave.sourceforge.net}). 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: @example -hg clone http://hg.savannah.gnu.org/hgweb/octave +hg clone http://www.octave.org/hg/octave @end example @item diff --git a/etc/HACKING b/etc/HACKING --- 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: - http://www.gnu.org/software/octave/download.html + http://www.octave.org/download.html After cloning Octave, you will need to run the bootstrap script: diff --git a/etc/PROJECTS b/etc/PROJECTS --- a/etc/PROJECTS +++ b/etc/PROJECTS @@ -3,7 +3,7 @@ A list of proposed projects is maintained at: - http://wiki.octave.org/wiki.pl?Projects + http://wiki.octave.org/Projects If you start working steadily on a project, please let maintainers@octave.org know. We might have information that could help diff --git a/etc/README.MacOS b/etc/README.MacOS --- 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. - http://www.gnu.org/software/octave/download.html + http://www.octave.org/download.html 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. - http://wiki.octave.org/wiki.pl?BuildFromSource + http://wiki.octave.org/Build_from_source 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. - http://wiki.octave.org/wiki.pl?BuildFromSource + http://wiki.octave.org/Build_from_source TODO - Modify the configure script to test for 64 bit vecLib bug. When the bug is present, apply the wrapper solution. diff --git a/etc/README.MinGW b/etc/README.MinGW --- 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. http://www.gnu.org/software/octave/download.html + web site. http://www.octave.org/download.html 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 diff --git a/libinterp/version.in.h b/libinterp/version.in.h --- a/libinterp/version.in.h +++ b/libinterp/version.in.h @@ -58,7 +58,7 @@ #define OCTAVE_CONTRIB_STATEMENT \ "Please contribute if you find this software useful.\n\ -For more information, visit http://www.octave.org/help-wanted.html" +For more information, visit http://www.octave.org/get-involved.html" #define OCTAVE_BUGS_STATEMENT \ "Read http://www.octave.org/bugs.html to learn how to submit bug reports." diff --git a/scripts/help/unimplemented.m b/scripts/help/unimplemented.m --- 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{http://octave.sf.net/linear-algebra/}."]; + "linear-algebra package at ",... + "@url{http://octave.sourceforge.net/linear-algebra/}."]; 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{http://octave.sf.net/odepkg/}."]; + "See @url{http://octave.sourceforge.net/odepkg/}."]; otherwise if (ismember (fcn, missing_functions ())) diff --git a/scripts/miscellaneous/info.m b/scripts/miscellaneous/info.m --- a/scripts/miscellaneous/info.m +++ b/scripts/miscellaneous/info.m @@ -27,8 +27,9 @@ Additional information about GNU Octave is available at\n\ http://www.octave.org\n\ \n\ - Descriptions of mailing lists devoted to Octave are available at\n\ - http://www.octave.org/archive.html\n\ + Links to the mailing list and other resources for getting help with\n\ + Octave are available at\n\ + http://www.octave.org/support.html\n\ \n\ You may also find some information in the Octave Wiki at\n\ http://wiki.octave.org\n\ diff --git a/scripts/plot/subplot.m b/scripts/plot/subplot.m --- a/scripts/plot/subplot.m +++ b/scripts/plot/subplot.m @@ -206,7 +206,7 @@ else objpos = get (child, "outerposition"); endif - 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;