Key rollover: rewrite the PGP keys manual appendix.

[PuTTY.git] / doc / licence.but

diff --git a/doc/licence.but b/doc/licence.but
index 76ddc80a065925c1bd29fe7db3eeef57d56b0720..0856d8634f001fe1b96c772ee4c4d044f61e0a55 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -1,13 +1,11 @@
-\define{versionidlicence} \versionid $Id$
-

 \A{licence} PuTTY \ii{Licence}
 
 \A{licence} PuTTY \ii{Licence}
 

-PuTTY is \i{copyright} 1997-2005 Simon Tatham.
+PuTTY is \i{copyright} 1997-2015 Simon Tatham.

 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,

-Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,
-and CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, Colin Watson, and CORE SDI S.A.

 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files