merge with 1.12

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 5c73951e839738f6846a65123b571f9b04d11bec..70781de3b79fa5ccea3c5fce3b19a630560f292a 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 8c250fc1e7577f8338ada01108646f74d4b771d5..de99b0dfd48b188d587376adb940c28594ade3f8 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 9b1e79e7d48d7911cc12359353daad84c5ecc40d..dfc0c8d488676f2882647f01c9b43166c783e1fb 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 ad980d7e58b24eb1cdbd49d6cc1acda047720327..1d27f75c594ab5a47602398dfa4219a109678f6a 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 f75cbd218398065166c7c7536a92f5db0d5127c6..a4588e3c41a739df2e7582c6eeac62a77834f475 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 d7366a26b97e94dfdd6be6b08d4102d691dd97c2..eba1be78ce4d2e3db31e2e368a94d033b93b67aa 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 ef412c9dedf584044067e880f52302d6296a9627..98e5080e256027580fa359b89c59870f782b774f 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 2dfd30f79338c2fb8466f01352fccfc21c3feacf..2dade75e26fb413c1eb489d50095021a6ded830e 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 67e0f15e2733e0636055340d5e8809aa2ca8a367..4670ab16ec5bfb77e83e803c193a4acdcebf0da2 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 0121e9c205c684c81d40dfc49164a4f91ebf5767..c037b60c97ff5ac074f0126cb71a9bd9e5cbe3bb 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 f9ac3c9d7fda9d95adaa892b3fbfb30b7a8e4d01..7caea7e9982485f891bd5e2405c8f5feb7f07f2d 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 99d9994993caa91bfb8f339cd4161ea37d325078..ffce0d6a0d1431f61b6c262865854edb198b7fef 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 234c217b9583912b9f5ff9bf11244fabd01177d3..15f2f236349318626b94784c74e2429a39f66948 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 a216e6bbaf73cc88b1fae485a036a0d09a91784a..0d03ec832c82147660c430b0a4041df1c27b6f4b 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 29beaab03cbdd4c14dfab6c2499bef4e5e69af4c..f2a028d2e1b388cea1004091add89143dff93514 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 da4ea7c02adadbbe1911e999449bb01399b8dcad..06467ba612039479445260f78d769649c9c904b5 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 06b373bcc29c6baa6d977f81c8380124f77e10fb..6d4591723d626fbeb78cc87c29ad6519a1274f84 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 cbe05c73c1c27f8e5d16c5935a302294ab8c5cd2..c4dc378c5c0e045e6ead4fe8d51494e6b5870f10 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 6eb7df3e31cdc71bb4583a7c8dfd7e12b5ed469a..3b4eb1179cc4a4474e37a5b3e36988640ec88448 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 afcbf4d4b648250ed01feae44afd9fa3c397d040..0597a4d5e4b65e00728bc1bddd16f4e6da709f57 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 334bbf38ecc8b64e1b8f9530d65394c9ae792c30..1ccd6dfad86746a6a2a209cc583204d23fa57c46 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 e8b1208270234bb64fe3921a37f8a8598f9ceb5e..8c812ca38ccf8cbc831b6e84a68324ced74eb002 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. */