Update my email and status.

[lyx.git] / COPYING

diff --git a/COPYING b/COPYING
index 288ac6991c961560260da8fb7d195d57d06363c1..d4e8cec11288977ce912a526a0713001b7967c05 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -10,16 +10,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
 
     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
-
-    In addition, as a special exception, the LyX Team gives permission to
-    link the code of this program with the XForms library (or with modified
-    versions of XForms that use the same license as XForms), and distribute
-    linked combinations including the two.  You must obey the GNU General
-    Public License in all respects for all of the code used other than XForms.
-    If you modify this file, you may extend this exception to your version of
-    the file, but you are not obligated to do so.  If you do not wish to do so,
-    delete this exception statement from your version.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 
     The GNU General Public License version 2 is included below for your reference.
 
 
     The GNU General Public License version 2 is included below for your reference.
 


@@ -28,7 +19,7 @@
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.

-                          675 Mass Ave, Cambridge, MA 02139, USA
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 


@@ -331,7 +322,8 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
 
     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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+    USA.

 
 Also add information on how to contact you by electronic and paper mail.
 
 
 Also add information on how to contact you by electronic and paper mail.