Add 2010 to copyright years.

[gnu-emacs] / admin / notes / multi-tty

diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index c20364ec5767c5795336346b4b37f54d09e2cf54..d7f689302042c289daeaddf09c6186e252bda4ad 100644 (file)
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
 -*- coding: utf-8; mode: text; -*-
 
-Copyright (C) 2007, 2008  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 From README.multi-tty in the multi-tty branch.
@@ -93,7 +93,7 @@ Known problems:
 
                emacsclient -e '(top-level)'
 
-         Note that this (perhaps) unintuitive behaviour is by design.
+         Note that this (perhaps) unintuitive behavior is by design.
          Single-kboard mode is required because of an intrinsic Emacs
          limitation that is very hard to eliminate.  (This limitation
          is related to the single-threaded nature of Emacs.)
@@ -733,7 +733,7 @@ DIARY OF CHANGES
    term_init/delete_tty.  The hint was right, in a way.)
 
 -- Issue with SIGIO: it needs to be disabled during redisplay.  See if
-   fcntl kernel behaviour could be emulated by emacsclient.
+   fcntl kernel behavior could be emulated by emacsclient.
 
    (Done.  Simply disabled the SIGIO emulation hack in emacsclient.)
    (Update: it was added back.)  (Update^2: and removed again.)
@@ -1347,10 +1347,10 @@ DIARY OF CHANGES
 \f
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs 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 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1358,8 +1358,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d