# HG changeset patch # User jwe # Date 1143545129 0 # Node ID 067948dc39bf84eaf6b243ab05e55a48365b90cc # Parent 8c224c786df90b6fd13477f8672d0740af183dd0 [project @ 2006-03-28 11:25:29 by jwe] diff --git a/doc/ChangeLog b/doc/ChangeLog --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2006-03-28 John W. Eaton + + * texinfo.tex: Update FSF address. + 2006-03-27 John W. Eaton * interpreter/images/sparseimages.m: Fix missing endif. Omit diff --git a/doc/texinfo.tex b/doc/texinfo.tex --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -20,10 +20,10 @@ % General Public License for more details. % % You should have received a copy of the GNU General Public License -% along with this texinfo.tex file; see the file COPYING. If not, write -% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. -% +% along with Octave; see the file COPYING. If not, write to the Free +% Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +% 02110-1301, USA. +% % As a special exception, when this file is read by TeX when processing % a Texinfo source document, you may use the result without % restriction. (This has been our intent since Texinfo was invented.) diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,13 @@ +2006-03-28 Keith Goodman + + * plot/__errplot__.m: Doc string fix. + + * miscellaneous/doc.m: Mark as command. + + * general/isequal.m, general/__isequal__.m, general/cell2mat.m, + general/isequalwithequalnans.m, general/blkdiag.m, + strings/strfind.m, miscellaneous/doc.m: Update FSF address. + 2006-03-27 Don Bindner * plot/meshgrid.m: If nargout == 3 and vectors are supplied, diff --git a/scripts/general/__isequal__.m b/scripts/general/__isequal__.m --- a/scripts/general/__isequal__.m +++ b/scripts/general/__isequal__.m @@ -11,8 +11,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {} __isequal__ (@var{nans_compare_equal}, @var{x1}, @var{x2}, @dots{}) diff --git a/scripts/general/blkdiag.m b/scripts/general/blkdiag.m --- a/scripts/general/blkdiag.m +++ b/scripts/general/blkdiag.m @@ -11,8 +11,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {} blkdiag (@var{a}, @var{b}, @var{c}, @dots{}) diff --git a/scripts/general/cell2mat.m b/scripts/general/cell2mat.m --- a/scripts/general/cell2mat.m +++ b/scripts/general/cell2mat.m @@ -11,8 +11,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{m} =} cell2mat (@var{c}) diff --git a/scripts/general/isequal.m b/scripts/general/isequal.m --- a/scripts/general/isequal.m +++ b/scripts/general/isequal.m @@ -13,8 +13,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Octave; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {} isequal (@var{x1}, @var{x2}, @dots{}) diff --git a/scripts/general/isequalwithequalnans.m b/scripts/general/isequalwithequalnans.m --- a/scripts/general/isequalwithequalnans.m +++ b/scripts/general/isequalwithequalnans.m @@ -13,8 +13,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with Octave; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {} isequalwithequalnans (@var{x1}, @var{x2}, @dots{}) diff --git a/scripts/miscellaneous/doc.m b/scripts/miscellaneous/doc.m --- a/scripts/miscellaneous/doc.m +++ b/scripts/miscellaneous/doc.m @@ -11,8 +11,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Command} doc @var{function_name} @@ -28,6 +29,8 @@ ## Author: Soren Hauberg ## Adapted-by: jwe +## PKG_ADD: mark_as_command doc + function retval = doc (fname) if (nargin != 1 || ! ischar (fname)) diff --git a/scripts/plot/__errplot__.m b/scripts/plot/__errplot__.m --- a/scripts/plot/__errplot__.m +++ b/scripts/plot/__errplot__.m @@ -28,6 +28,7 @@ ## @seealso{semilogx, semilogy, loglog, polar, mesh, contour, __pltopt__, ## bar, stairs, errorbar, replot, xlabel, ylabel, and title} ## @end deftypefn + ## Created: 18.7.2000 ## Author: Teemu Ikonen ## Keywords: errorbar, plotting diff --git a/scripts/strings/strfind.m b/scripts/strings/strfind.m --- a/scripts/strings/strfind.m +++ b/scripts/strings/strfind.m @@ -11,8 +11,9 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## along with Octave; see the file COPYING. If not, write to the Free +## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +## 02110-1301, USA. ## -*- texinfo -*- ## @deftypefn {Function File} {@var{idx} =} strfind (@var{str}, @var{pattern}) diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-03-28 John W. Eaton + + * DLD-FUNCTIONS/matrix_type.cc: Update copyright notice and FSF + address. + 2006-03-24 John W. Eaton * DLD-FUNCTIONS/spchol.cc (Fsymbfact): Use CHOLMOD_NAME to select diff --git a/src/DLD-FUNCTIONS/matrix_type.cc b/src/DLD-FUNCTIONS/matrix_type.cc --- a/src/DLD-FUNCTIONS/matrix_type.cc +++ b/src/DLD-FUNCTIONS/matrix_type.cc @@ -2,6 +2,8 @@ Copyright (C) 2005 David Bateman +This file is part of Octave. + Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any @@ -13,8 +15,9 @@ for more details. You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +along with Octave; see the file COPYING. If not, write to the Free +Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */