merge with 1.12

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 5c73951..70781de 100644 (file)
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* A `struct linebuffer' holds a line of text. */
 

diff --git a/src/cat.c b/src/cat.c
index 8c250fc..de99b0d 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* Differences from the Unix cat:
    * Always unbuffered, -u is ignored.

diff --git a/src/cksum.c b/src/cksum.c
index 9b1e79e..dfc0c8d 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* Written by Q. Frank Xia, qx@math.columbia.edu.
    Cosmetic changes and reorganization by David MacKenzie, djm@gnu.ai.mit.edu.

diff --git a/src/comm.c b/src/comm.c
index ad980d7..1d27f75 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Richard Stallman and David MacKenzie. */
 \f

diff --git a/src/csplit.c b/src/csplit.c
index f75cbd2..a4588e3 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Stuart Kemp, cpsrk@groper.jcu.edu.au.
    Modified by David MacKenzie, djm@gnu.ai.mit.edu. */

diff --git a/src/expand.c b/src/expand.c
index d7366a2..eba1be7 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* By default, convert all tabs to spaces.
    Preserves backspace characters in the output; they decrement the

diff --git a/src/fmt.c b/src/fmt.c
index ef412c9..98e5080 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /* Written by Ross Paterson <rap@doc.ic.ac.uk>.  */

diff --git a/src/fold.c b/src/fold.c
index 2dfd30f..2dade75 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by David MacKenzie, djm@gnu.ai.mit.edu. */
 

diff --git a/src/head.c b/src/head.c
index 67e0f15..4670ab1 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Options: (see usage)
    Reads from standard input if no files are given or when a filename of

diff --git a/src/join.c b/src/join.c
index 0121e9c..c037b60 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Written by Mike Haertel, mike@gnu.ai.mit.edu. */
 

diff --git a/src/nl.c b/src/nl.c
index f9ac3c9..7caea7e 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* Written by Scott Bartram (nancy!scott@uunet.uu.net)
    Revised by David MacKenzie (djm@gnu.ai.mit.edu) */

diff --git a/src/od.c b/src/od.c
index 99d9994..ffce0d6 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Jim Meyering.  */
 

diff --git a/src/pr.c b/src/pr.c
index 234c217..15f2f23 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /*  Author: Pete TerMaat.  */
 \f

diff --git a/src/sort.c b/src/sort.c
index a216e6b..0d03ec8 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
    Written December 1988 by Mike Haertel.
    The author may be reached (Email) at the address mike@gnu.ai.mit.edu,

diff --git a/src/split.c b/src/split.c
index 29beaab..f2a028d 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 \f
 /* By tege@sics.se, with rms.
 

diff --git a/src/sum.c b/src/sum.c
index da4ea7c..06467ba 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Like BSD sum or SysV sum -r, except like SysV sum if -s option is given. */
 

diff --git a/src/tac.c b/src/tac.c
index 06b373b..6d45917 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Jay Lepreau (lepreau@cs.utah.edu).
    GNU enhancements by David MacKenzie (djm@gnu.ai.mit.edu). */

diff --git a/src/tail.c b/src/tail.c
index cbe05c7..c4dc378 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Can display any amount of data, unlike the Unix version, which uses
    a fixed size buffer and therefore can only deliver a limited number

diff --git a/src/tr.c b/src/tr.c
index 6eb7df3..3b4eb11 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Jim Meyering, meyering@cs.utexas.edu.  */
 

diff --git a/src/unexpand.c b/src/unexpand.c
index afcbf4d..0597a4d 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* By default, convert only maximal strings of initial blanks and tabs
    into tabs.

diff --git a/src/uniq.c b/src/uniq.c
index 334bbf3..1ccd6df 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Richard Stallman and David MacKenzie. */
 \f

diff --git a/src/wc.c b/src/wc.c
index e8b1208..8c812ca 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -13,7 +13,7 @@
 
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Written by Paul Rubin, phr@ocf.berkeley.edu
    and David MacKenzie, djm@gnu.ai.mit.edu. */