LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / src / LICENCE

diff --git a/src/LICENCE b/src/LICENCE
index f5c5d2987db39342ce79bf6ae1d0561bdf589966..31d076d9653f49c4de61056178749ffcc84c954b 100644 (file)
--- a/src/LICENCE
+++ b/src/LICENCE
@@ -2,7 +2,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.

-     59 Temple Place, Suite 330, Boston, MA 02111 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.
 


@@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
                     END OF TERMS AND CONDITIONS
 \f
 
                     END OF TERMS AND CONDITIONS
 \f

-       Appendix: How to Apply These Terms to Your New Programs
+           How to Apply These Terms to Your New Programs

 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it


@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>

-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -305,14 +305,15 @@ 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., 59 Temple Place, Suite 330, Boston, MA 02111 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.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 

-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author

     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.