Merged from [email protected] (patch 469)

Patches applied:

 * [email protected]/emacs--cvs-trunk--0--patch-469
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-372

7 files changed, 14 insertions, 14 deletions

diff --git a/admin/admin.el b/admin/admin.el
index 07a2bcb757..3969345cc3 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -16,8 +16,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 0aacb68723..361b3bd2f2 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include <X11/Xlib.h>
 #include <stdio.h>
diff --git a/admin/build-configs b/admin/build-configs
index 1a21b90c17..083c9e766e 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Build Emacs in several different configurations.
 
diff --git a/admin/cus-test.el b/admin/cus-test.el
index cf00bf214f..ff38b0b08f 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index d827de3ec3..7f27ab9987 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 if [ $# != 2 ]; then
     cat <<EOF
diff --git a/admin/make-emacs b/admin/make-emacs
index faa5dc2a39..d17e59e569 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
diff --git a/admin/revdiff b/admin/revdiff
index 5c9d2251c8..d936106aad 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 use File::Basename;