Copyedit the license's revised text: (1) remove unnecessary repitition use of the...

diff --git a/COPYING b/COPYING
index c4743692146f9d0bcea71277e01a74db97b78e9c..ea8be59730a0472e4e00544ba13820bd7522bf94 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,15 @@
 Copyright 2005-2014. All code is copyrighted by the respective authors.
 
-Transmission may be used under the GNU Public License
-version 2 (see http://www.gnu.org/licenses/license-list.html#GNUGPLv2), or
-version 3 (see http://www.gnu.org/licenses/license-list.html#GNUGPLv3), or
-any future license endorsed by Mnemosyne LLC.
-
-Some individual source files are licensed under the Expat license
-(see http://www.gnu.org/licenses/license-list.html#Expat) as per their
-contributors' wishes. Those files may, of course, be used by themselves
-under their own licenses.
+Transmission can be redistributed and/or modified under the terms of
+the GNU GPLv2 (http://www.gnu.org/licenses/license-list.html#GPLv2),
+the GNU GPLv3 (http://www.gnu.org/licenses/license-list.html#GNUGPLv3),
+or any future license endorsed by Mnemosyne LLC.
+
+In addition, linking to and/or using OpenSSL is allowed.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Some of Transmission's source files have more permissive licenses.
+Those files may, of course, be used on their own under their own terms.

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 910d9acc2bc45a564b90563d62d6b92a8f1e95d0..0b24c4c6ab99dcaa759321c1a94a9056679e11bf 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/daemon/remote.c b/daemon/remote.c
index 42a0bbc01b37e1bbf521462a55bbb48c84370f98..77acedcba2cb9e9ddde310a85c713ef32568eab6 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/daemon/watch.c b/daemon/watch.c
index 72d2af007b0a29b38954aa31b98a3399f94354e5..3bbed659b414f8e129e372427e2ebabf2960e108 100644 (file)
--- a/daemon/watch.c
+++ b/daemon/watch.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/daemon/watch.h b/daemon/watch.h
index da48d52868a2ed3abb9292dddf23a337d0b5d543..dc108c013c7f1c5676d0e15b2c4babcd4816e75b 100644 (file)
--- a/daemon/watch.h
+++ b/daemon/watch.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/actions.c b/gtk/actions.c
index c5afd81a0665a1a4c3e018d6426af495bee1eaef..45c8a5d56afca52afbfc376c4378dc32a658fc1d 100644 (file)
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/actions.h b/gtk/actions.h
index 36005601bfc7bbf956b2d2b8deeadbea0c7ac5bc..80351b03d2011d1bd8b7d54421310a74452df4e1 100644 (file)
--- a/gtk/actions.h
+++ b/gtk/actions.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/details.c b/gtk/details.c
index a3ded61c6d025eaed025cec836ec9df89f411629..a8b9c2eba9fa52e255618b92b3c97d987f1a8582 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/details.h b/gtk/details.h
index 2135787a5a7bbc96c2785b42d55934537efa2a49..176d2ce3f3fc0519eeea89452926653e9bbab062 100644 (file)
--- a/gtk/details.h
+++ b/gtk/details.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/favicon.c b/gtk/favicon.c
index 099127201f2a97df032304b9ee5b60aba690fb71..efdf8c24463dfa178ba24c6952e6be5cdda8270d 100644 (file)
--- a/gtk/favicon.c
+++ b/gtk/favicon.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/favicon.h b/gtk/favicon.h
index e784bcd82313e8331f001838731f551dff70d616..f73ce2c69f0e6d7779eb5a5791e5616240516014 100644 (file)
--- a/gtk/favicon.h
+++ b/gtk/favicon.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/file-list.c b/gtk/file-list.c
index 0927d3196fa8c2ef07da283baa8b6062fa6d1f95..0f4f8f1649e7d68776b82b78ea0f3194b264dc9b 100644 (file)
--- a/gtk/file-list.c
+++ b/gtk/file-list.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/file-list.h b/gtk/file-list.h
index 0abb01a954f01fe4d9373a8b074cd544fa2c9e37..598003ca97e3478ae79e52fd477f4d8b72c1a56a 100644 (file)
--- a/gtk/file-list.h
+++ b/gtk/file-list.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/filter.c b/gtk/filter.c
index 90cdecf8cbb5f53f79ec7935e6b833bfd131591a..bb529077d5766d64233aa855007a34856fa12309 100644 (file)
--- a/gtk/filter.c
+++ b/gtk/filter.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/filter.h b/gtk/filter.h
index 9acb56a6ab4cd130d4321ad05633a1c129903535..97b7f37aae8c7fbe4814ce7f9d2942a270437c3b 100644 (file)
--- a/gtk/filter.h
+++ b/gtk/filter.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/hig.c b/gtk/hig.c
index 4316134ce2bb0814b325f01aa2e52198da4de71e..105740083edd1e06148b3f33c77d406ab7043ba1 100644 (file)
--- a/gtk/hig.c
+++ b/gtk/hig.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/hig.h b/gtk/hig.h
index 9b6919bc902439e922335ff55ec9be6a5d3a0b33..16c7df1cfe644b42df8dd6d4ef3dc61e949ce214 100644 (file)
--- a/gtk/hig.h
+++ b/gtk/hig.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/main.c b/gtk/main.c
index 29f58342abba5496324f83d5e42684d44a5a283b..a999f45624293129bbe1e25c5e7b13fc717582cf 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -63,8 +63,19 @@
 
 #define SHOW_LICENSE
 static const char * LICENSE =
-"Transmission may be used under the GNU Public License v2 or v3 licenses, or any future license endorsed by Mnemosyne LLC.\n\n"
-"Permission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables. Works derived from Transmission may, at their authors' discretion, keep or delete this exception.";
+  "Copyright 2005-2014. All code is copyrighted by the respective authors.\n"
+  "\n"           
+  "Transmission can be redistributed and/or modified under the terms of the"
+  "GNU GPL versions 2 or 3 or by any future license endorsed by Mnemosyne LLC.\n"
+  "\n"
+  "In addition, linking to and/or using OpenSSL is allowed.\n"
+  "\n"
+  "This program is distributed in the hope that it will be useful,"
+  "but WITHOUT ANY WARRANTY; without even the implied warranty of"
+  "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+  "\n"
+  "Some of Transmission's source files have more permissive licenses."
+  "Those files may, of course, be used on their own under their own terms.\n";
 
 struct cbdata
 {

diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 6fcef886f312c816defd9ecdfd818cda0cac567e..02c9fb6d2f9960dca8135f18f603d1113c5ecb17 100644 (file)
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/makemeta-ui.h b/gtk/makemeta-ui.h
index b833c424a3bae5d131057a83d0a1e2bd629cbd90..05e24e7381caad1e80c4d15b52dbfb4854cc8bb3 100644 (file)
--- a/gtk/makemeta-ui.h
+++ b/gtk/makemeta-ui.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/msgwin.c b/gtk/msgwin.c
index 2e664e64a5ca43c6b1e1909ad4cc5493502107e0..fbe1d98df282dec5f61bcf1e19118dd9efa8ed4e 100644 (file)
--- a/gtk/msgwin.c
+++ b/gtk/msgwin.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/msgwin.h b/gtk/msgwin.h
index 51767936d44bc1e7b0ca4d63e1e8a6f659e98248..35b65d9a98a5aa1c8a2d2bd3426205e0bf750e36 100644 (file)
--- a/gtk/msgwin.h
+++ b/gtk/msgwin.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/notify.c b/gtk/notify.c
index 5bdec0e1e4a899eb8e254651bbcd9e08b70e5685..a6ba9f90468379a5b89a807ca9200a1b7c993e16 100644 (file)
--- a/gtk/notify.c
+++ b/gtk/notify.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/notify.h b/gtk/notify.h
index 30809b87fa1907df28895dadda5109550fbc312c..a9e999bce9a3f788f79a7a81f49f77096a6ed554 100644 (file)
--- a/gtk/notify.h
+++ b/gtk/notify.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/open-dialog.c b/gtk/open-dialog.c
index 9ecb4c7c3a658208f356b4f7ae2744bd0b722ab2..1ae9d105fad9c03dafaf34ffa17aca18658786e2 100644 (file)
--- a/gtk/open-dialog.c
+++ b/gtk/open-dialog.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/open-dialog.h b/gtk/open-dialog.h
index 8887fbc51eca798c4c6bf5d98dfb56573c37887b..7377b51fd22b863f76e16041524ae2b7f2a6f061 100644 (file)
--- a/gtk/open-dialog.h
+++ b/gtk/open-dialog.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/relocate.c b/gtk/relocate.c
index 013cf42604767ba1cbbbdcba8db07168d92acd69..cb73a70cb0749923ac5d18e67417fd04b72653e4 100644 (file)
--- a/gtk/relocate.c
+++ b/gtk/relocate.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/relocate.h b/gtk/relocate.h
index 830775b67b52625ded32d357b9b45e0ae465f7f1..6a0fe503aa5f14d7e6bb8c5da4064bf0c98a9abd 100644 (file)
--- a/gtk/relocate.h
+++ b/gtk/relocate.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/stats.c b/gtk/stats.c
index 23732afa4f6957e74074bce8bd099b095654478d..6d1433cd924c1b81ae184502a9687936c83d1ae7 100644 (file)
--- a/gtk/stats.c
+++ b/gtk/stats.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/stats.h b/gtk/stats.h
index 6e1d61ff67e71b85db6d4245cd8da3f1238b3d59..ed8f8b11538c2e697149e50ae38f99126e5b2ab8 100644 (file)
--- a/gtk/stats.h
+++ b/gtk/stats.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 8217e6bb8883895fed56fc39524df401403be657..f5b55b24c5a46a9450dc74e4d15f1410873d18a0 100644 (file)
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/torrent-cell-renderer.h b/gtk/torrent-cell-renderer.h
index 1cacdfb54446b00d01241d7a800eecb51bc7ddf7..3195aae0b8cd75d4b7620a96a32afb6e5191c036 100644 (file)
--- a/gtk/torrent-cell-renderer.h
+++ b/gtk/torrent-cell-renderer.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/tr-icon.c b/gtk/tr-icon.c
index 445e9dfa49604184154890068c43520bb25b2f7a..a8911b8ca23b774539b39a8f120266b39abbd2db 100644 (file)
--- a/gtk/tr-icon.c
+++ b/gtk/tr-icon.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/tr-icon.h b/gtk/tr-icon.h
index a88cb29b3c1e938ef3657ef2efd5134efb658735..479e2fc04b50fae2eebe05f9925a10c7a486ead5 100644 (file)
--- a/gtk/tr-icon.h
+++ b/gtk/tr-icon.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index be23e5094d2356a92968efbfeaf80a10dc60ac23..1298c5745d598ebe53c6c332a08bfcb3c8b4dac1 100644 (file)
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/tr-prefs.h b/gtk/tr-prefs.h
index b86b9017ce0aa7057fefb6106fdcc4fb93e8dfa6..26218e9371de668c7da5128b422089d9b03063ad 100644 (file)
--- a/gtk/tr-prefs.h
+++ b/gtk/tr-prefs.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/util.c b/gtk/util.c
index af6eefe62465a40e6445d019ec13105a33e756ba..838393e2c0cfa52e8251866d43d15207912c87ba 100644 (file)
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/gtk/util.h b/gtk/util.h
index 18ca5a0eef878fa6cec16f54337884a695d08638..30788c354159bdae34e023b0f340e9db50ebb816 100644 (file)
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/announcer-common.h b/libtransmission/announcer-common.h
index b58bcfbd4bcd6aadb0c1d04dbd751ebe97a28d73..4d00371744b811ce3686102880ba73654e9abf58 100644 (file)
--- a/libtransmission/announcer-common.h
+++ b/libtransmission/announcer-common.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/announcer-http.c b/libtransmission/announcer-http.c
index e7a0d15ccd2d6e6c082b9c0a4719b32b97848d2c..cc754a35b56d829f18a6433eb68dc5539eaa6178 100644 (file)
--- a/libtransmission/announcer-http.c
+++ b/libtransmission/announcer-http.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/announcer-udp.c b/libtransmission/announcer-udp.c
index caf8bd87538edf57b0eacf8ca1898a0c215dab62..6ba034e9a8c5029f164720a26498a820a78440eb 100644 (file)
--- a/libtransmission/announcer-udp.c
+++ b/libtransmission/announcer-udp.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/announcer.c b/libtransmission/announcer.c
index 3c91620bef8ae577a3730f7784418f836dca8b3c..662bd544fb6ec400c3319d93fe511990a26e0d7f 100644 (file)
--- a/libtransmission/announcer.c
+++ b/libtransmission/announcer.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/announcer.h b/libtransmission/announcer.h
index 3973c25cba6776826cd9d88f91fa5d5c3d064f05..d2fada16c3313e856ebb4edb287f8871501d9944 100644 (file)
--- a/libtransmission/announcer.h
+++ b/libtransmission/announcer.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/bandwidth.c b/libtransmission/bandwidth.c
index 339663f21cda4931c9ea3d54c3537a0256223392..43217f236e3881adf3ad1e2eb67ba364b5ec5161 100644 (file)
--- a/libtransmission/bandwidth.c
+++ b/libtransmission/bandwidth.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h
index 08f5045ba785a22ddd6d7b05954aebfe0945a488..06bcb67a7f64d5f250de5c294445de3d836010ad 100644 (file)
--- a/libtransmission/bandwidth.h
+++ b/libtransmission/bandwidth.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/bitfield-test.c b/libtransmission/bitfield-test.c
index e83270dc1d62d40f45296c023a6e27d173966c80..aa59ac6a3080e90837477cc0fe5395656103604c 100644 (file)
--- a/libtransmission/bitfield-test.c
+++ b/libtransmission/bitfield-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/bitfield.c b/libtransmission/bitfield.c
index 0a370debd84bc58f78b7f55532bcb9acd2fca2e4..11320ff49b94bccb766deff88b548bd09f014f81 100644 (file)
--- a/libtransmission/bitfield.c
+++ b/libtransmission/bitfield.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/bitfield.h b/libtransmission/bitfield.h
index 09ff56bdaf4687493760a14108812f7ccfa24627..7cb066d7df9f40b6d28e2d3fd55ba8c9093de272 100644 (file)
--- a/libtransmission/bitfield.h
+++ b/libtransmission/bitfield.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/blocklist-test.c b/libtransmission/blocklist-test.c
index a93b2a3d957900ebc98bea9c7b4cc6b4334b1d1f..9d06a5c4fc3fe0332602d5ae2ddff728bb77b676 100644 (file)
--- a/libtransmission/blocklist-test.c
+++ b/libtransmission/blocklist-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index 9ba46f13b2d093c87f3661b8cb350fc6a059f6dc..c7c0046b72b4ffdd00f019721e6a53d56f7fd1de 100644 (file)
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index e9f9a4a555da78bbe3fb3d74da07b6598581a03b..50fee63f44e52d76a2591cbaa8b3245e0c8af05e 100644 (file)
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/cache.c b/libtransmission/cache.c
index 624f1adbd828a2bc5ba55253508248b5b4d3f12a..933adfac956c4f754cb52f1d9d10fa3b6d364620 100644 (file)
--- a/libtransmission/cache.c
+++ b/libtransmission/cache.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/cache.h b/libtransmission/cache.h
index 45cbdd347c5e96e0cc44fa0c45df478a9c41ff03..81a1992c14cbdbce50fcc01e59b292c3eee9dea0 100644 (file)
--- a/libtransmission/cache.h
+++ b/libtransmission/cache.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/clients-test.c b/libtransmission/clients-test.c
index 94d87adcdac8d29cdfea4a5c7d14da1d8a43f70b..35187b93911b269ddd4866667473df9667d24b9a 100644 (file)
--- a/libtransmission/clients-test.c
+++ b/libtransmission/clients-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/clients.c b/libtransmission/clients.c
index ed8c2d3531dade80cc58301a2073b53dc1b9e9c1..ba60b6e0f38bd932707483e195fea8ef23fd3298 100644 (file)
--- a/libtransmission/clients.c
+++ b/libtransmission/clients.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/clients.h b/libtransmission/clients.h
index 0b4a873b94aadb58e976c7b6c4fc9183bfd0dc00..2cd18dbe29c66f3d2187d159d3f75b3887bb1b10 100644 (file)
--- a/libtransmission/clients.h
+++ b/libtransmission/clients.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/completion.c b/libtransmission/completion.c
index 8b1b3b0e34bd636b73af305afe057500b246b5b0..1ed6e68534ddc85f396d80a4eade07afce687525 100644 (file)
--- a/libtransmission/completion.c
+++ b/libtransmission/completion.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/completion.h b/libtransmission/completion.h
index e38f396b20a36bdb4926e89128952a0a5d9b3e21..a36a112d936a3a78ad6c72071fe6397d9c2e2c41 100644 (file)
--- a/libtransmission/completion.h
+++ b/libtransmission/completion.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/crypto-test.c b/libtransmission/crypto-test.c
index 6cbd44c5c0118ff419f1a7e441e2e31b8d2206b4..e914241b6cd568952984711089627495e40fd4c4 100644 (file)
--- a/libtransmission/crypto-test.c
+++ b/libtransmission/crypto-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index f9a1825dfb463ac779a3926b4fe34fdfc7f944ee..86aacf7b762f65a85e575b128893fcc790aadcf5 100644 (file)
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
index e6745825bd2f9a5bff30e388ebda8eca1320dc4a..f2ee2741fee60ca3b1dbf5f85747b5eac5f6bf5b 100644 (file)
--- a/libtransmission/crypto.h
+++ b/libtransmission/crypto.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 4f1d0e8aebfb3141adb784753c2ed6d9abb9a822..95a217fc6d496211343b6a002c482ba3e97299c1 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2005-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h
index 642bcf90c778232a1170821d024a307e8c31744d..f1cb9bd5f6977e738cce29dc4254a4ff6d20c6b1 100644 (file)
--- a/libtransmission/fdlimit.h
+++ b/libtransmission/fdlimit.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2005-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index 8989e805894ab17c7a943ce02dfec869ef30b588..6d4c2a4ef728640fc69040f15397e263e99a9f22 100644 (file)
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h
index 1206389a729b1fdf1a5c904753b5573db0d997c4..e234271473e1c36cad47373069e21567b8b1e775 100644 (file)
--- a/libtransmission/handshake.h
+++ b/libtransmission/handshake.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/history-test.c b/libtransmission/history-test.c
index 0de6d0458f9f333642b532bdfc53abfeceb52396..8bd9e70ade5dc0e71af49dd03b55098baa855ea4 100644 (file)
--- a/libtransmission/history-test.c
+++ b/libtransmission/history-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/history.c b/libtransmission/history.c
index 1f124ee96d5e289332ce9cd3fb24426e30600f9f..8ca8e8b85cc6701d05b84423196627adb629dfa2 100644 (file)
--- a/libtransmission/history.c
+++ b/libtransmission/history.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/history.h b/libtransmission/history.h
index c8b25028c959c2b387c09d25d6793681b7cee54f..efd2eddf58904aac21a40f700be50398473791d4 100644 (file)
--- a/libtransmission/history.h
+++ b/libtransmission/history.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/inout.c b/libtransmission/inout.c
index 6cf41ebd9707f0d7d485f02fbef06cd942830f1c..50b017f63ccd57b28c24b94189a9da75952a74d8 100644 (file)
--- a/libtransmission/inout.c
+++ b/libtransmission/inout.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/inout.h b/libtransmission/inout.h
index a1c28bda7ac095f46a4a1e6d586a229148d4734d..90515b331e78b45e00e801e6f0260091dae92cde 100644 (file)
--- a/libtransmission/inout.h
+++ b/libtransmission/inout.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/json-test.c b/libtransmission/json-test.c
index 03c4a8b06396a991bdd532c21012fb62a5e6cfb4..52dd5245f16f205af64faa0a2f5344bf54747ebf 100644 (file)
--- a/libtransmission/json-test.c
+++ b/libtransmission/json-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/libtransmission-test.c b/libtransmission/libtransmission-test.c
index 3fe8a293ed267cdf156f18bb282c32d56c81b040..2890df7860d340c5b92450b59400cb4b709513c0 100644 (file)
--- a/libtransmission/libtransmission-test.c
+++ b/libtransmission/libtransmission-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/libtransmission-test.h b/libtransmission/libtransmission-test.h
index 3fbd9bcdea9b7d68b8ace5928d2b6b09075e1287..d82c50593cd9faa088cc583ae699e767cd3ef394 100644 (file)
--- a/libtransmission/libtransmission-test.h
+++ b/libtransmission/libtransmission-test.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/list.c b/libtransmission/list.c
index a03aefe30fd4a4d516281dee7e8fe1a52ca62f00..faee385f959c79b7ff2244f75184b66494fb0c28 100644 (file)
--- a/libtransmission/list.c
+++ b/libtransmission/list.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/list.h b/libtransmission/list.h
index 7aa616b9cef47dff1728b8a8268df2f5146f9dcc..90a07994e99254f34a0b5072731d3921dc8a09ae 100644 (file)
--- a/libtransmission/list.h
+++ b/libtransmission/list.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/log.c b/libtransmission/log.c
index 89a5d96aa6d502bd5c5e588afc2b50de71eb66b7..2fc9fea0139a81a379434a9b1d5573aec8fbb67c 100644 (file)
--- a/libtransmission/log.c
+++ b/libtransmission/log.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id: utils.c 13863 2013-01-24 23:59:52Z jordan $

diff --git a/libtransmission/log.h b/libtransmission/log.h
index 5c6659ca588c216f0371bb6b7436d8706c5e9561..7413a3c5ed1cfdf59b361b157793ea8273c79fab 100644 (file)
--- a/libtransmission/log.h
+++ b/libtransmission/log.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id: list.c 14224 2014-01-18 20:56:57Z jordan $

diff --git a/libtransmission/magnet-test.c b/libtransmission/magnet-test.c
index 594b5a532fee03784ab14d2f2623a9adf71b3f37..56511b316e0de801905e6124e6d9b100e04138f4 100644 (file)
--- a/libtransmission/magnet-test.c
+++ b/libtransmission/magnet-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/magnet.c b/libtransmission/magnet.c
index decd77ed031e8481eb78a1956ceda59c793c8a85..f5d2bb99440861de2ee460766be4141743f5b203 100644 (file)
--- a/libtransmission/magnet.c
+++ b/libtransmission/magnet.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/magnet.h b/libtransmission/magnet.h
index bbc1dafb75d54639b8e6d047ca4c294551019042..9691a27d231fcff9f04518246a115545d830bbee 100644 (file)
--- a/libtransmission/magnet.h
+++ b/libtransmission/magnet.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
index 283ffabdf7dd7757739e001cf91c1df7a35f5c16..01b2e0fdcad8f12d6138d8e755750c1f922943d6 100644 (file)
--- a/libtransmission/makemeta.c
+++ b/libtransmission/makemeta.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/makemeta.h b/libtransmission/makemeta.h
index 0abd2859be58c0bc938b57128ad808bde0e15cb9..44e2bdf6a09a686471085c299c0fd6ff6d215a37 100644 (file)
--- a/libtransmission/makemeta.h
+++ b/libtransmission/makemeta.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/metainfo-test.c b/libtransmission/metainfo-test.c
index 79e181e6b671c73f23ab617c14ecae46e7a0a1fc..02d2acd4572cdc45ee441ccffedb2936e7717e27 100644 (file)
--- a/libtransmission/metainfo-test.c
+++ b/libtransmission/metainfo-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
index 5d7c053b49e17bbb2a000d04c5668cc461ccc5ad..25f7ff91a5694fc3c1122c6fe6563ebcd9aa2b09 100644 (file)
--- a/libtransmission/metainfo.c
+++ b/libtransmission/metainfo.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
index b72de558ab987f2b790f21c396f2d197236881bc..d0d98d2ac2f93333bcfe18ce2e9bd758af89a5ed 100644 (file)
--- a/libtransmission/metainfo.h
+++ b/libtransmission/metainfo.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2005-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/move-test.c b/libtransmission/move-test.c
index e4d15861a84f79093e41b13d7ebb2aae960e4db6..733cdf624f8ce0205867a844a4bc4fa4fbaf60a5 100644 (file)
--- a/libtransmission/move-test.c
+++ b/libtransmission/move-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c
index 074d4423e5345fe03ee178b7780554a7f0bd5f15..8e4e169c519998985c49d125c015e6eefaf7e2d5 100644 (file)
--- a/libtransmission/natpmp.c
+++ b/libtransmission/natpmp.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/natpmp_local.h b/libtransmission/natpmp_local.h
index 3706035fa74ca38780041aead6dda149f815ccbb..22386da192f707261c3d20590c645889d02c02db 100644 (file)
--- a/libtransmission/natpmp_local.h
+++ b/libtransmission/natpmp_local.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $

diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index 62d348c290852784a9b09642bcb72af8cb146c3e..1aaec4a14b1b5314ba0784bf830521114bfb2b21 100644 (file)
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 5c8d1d4468e14efa43953c076357a74f0b385ab4..163dcfa516ab55effe91902f13ced5aae823e748 100644 (file)
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index fe40d8fb00f826e699dcd61199c847ab49f1da9e..afc28d271dcd7b7c2424dd0ac53f86abafbdac4d 100644 (file)
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 0b93f85545fd87cea0474d38eb6a8b70abd1b0b0..376fd19421dbd28f75df8c3b488b660fb2db7bb6 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index dfd1d4ef2a7e2eaa7da51d44d17865bc9b7e598b..be4a1a8f911255f03970d8bd34ca88693e71aa78 100644 (file)
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-msgs-test.c b/libtransmission/peer-msgs-test.c
index 42f61f225f9203025d232108c863fa2c8b98b31d..a1403414c1fd8134be6c8616cc3477d5e0cb91a9 100644 (file)
--- a/libtransmission/peer-msgs-test.c
+++ b/libtransmission/peer-msgs-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 55bc33df47d6e8c9933dcf0082f8150d6a1aae5f..d39a9c9372a7027cd1e44ccd3c64d609b5c55cdc 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 3e1541d8f569f3add80c4f99cf209864672f8825..7497aec255abfd4ace92357bcd7c97b899f52424 100644 (file)
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c
index 00be64a5996b11dda56d8dacceabddb939391e67..28c2d98dea430f47d2d6f2f9c8f37775b4367215 100644 (file)
--- a/libtransmission/platform-quota.c
+++ b/libtransmission/platform-quota.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/platform-quota.h b/libtransmission/platform-quota.h
index 4a5d1cf58af3738fc8fa8bec547c042c1e7737ac..866c5b75482e35dc105b1b8498d2e04bac0c6b62 100644 (file)
--- a/libtransmission/platform-quota.h
+++ b/libtransmission/platform-quota.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/platform.c b/libtransmission/platform.c
index cdb51ba3f5fc821703b2d3b71ab7af96d0de0dd0..22fb0c684844735c544fb86fe3f4f5ba14023aa6 100644 (file)
--- a/libtransmission/platform.c
+++ b/libtransmission/platform.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/platform.h b/libtransmission/platform.h
index c89cac0954cb77a72529b771704f6c83dc4562bc..11405d7c440a143661f51b9748d9d43c17570248 100644 (file)
--- a/libtransmission/platform.h
+++ b/libtransmission/platform.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/port-forwarding.c b/libtransmission/port-forwarding.c
index b4db8e2446aa775d4677db38b2307adcb5b9ca81..5f6c223cfd3a1528c8bbbb4dc550ba6dc0ec0cde 100644 (file)
--- a/libtransmission/port-forwarding.c
+++ b/libtransmission/port-forwarding.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h
index 5249ea23715c84d5e2bb2d15160928cd865379a4..a011a1c09b949b50f226c9cd203a53a8fbbcbe1b 100644 (file)
--- a/libtransmission/port-forwarding.h
+++ b/libtransmission/port-forwarding.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/ptrarray.c b/libtransmission/ptrarray.c
index bb2f4c3638d208db24abfcf436b4eb7e0f1257f4..c3740c301922a366becaadd451fb7c22864aec3f 100644 (file)
--- a/libtransmission/ptrarray.c
+++ b/libtransmission/ptrarray.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/ptrarray.h b/libtransmission/ptrarray.h
index 8a3c81be21cf20b0bb8ca9422e65edd9d0099f38..0a9571ee28dbf0f49d4516a462fdf3f095617a39 100644 (file)
--- a/libtransmission/ptrarray.h
+++ b/libtransmission/ptrarray.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/quark-test.c b/libtransmission/quark-test.c
index 70854547b04d55e8d2b82fade0599918833543b0..5e9f0c51e7b221f42cbc8523543a550b1790a111 100644 (file)
--- a/libtransmission/quark-test.c
+++ b/libtransmission/quark-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/quark.c b/libtransmission/quark.c
index 6beb1d3e80c937c85c2401ce722b158f727bfa41..e24d50dbcfe44e75c3b1182ff4b9f66b51b4d4e8 100644 (file)
--- a/libtransmission/quark.c
+++ b/libtransmission/quark.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/quark.h b/libtransmission/quark.h
index 694c6cae9d0ad3d6a373ad1f55d5ee5d64724186..2e3a9fbf273061b9b21f6f1bbdb3ac127d4d7dd6 100644 (file)
--- a/libtransmission/quark.h
+++ b/libtransmission/quark.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id: utils.h 13667 2012-12-14 04:34:42Z jordan $

diff --git a/libtransmission/rename-test.c b/libtransmission/rename-test.c
index 3a94805dab0281434e3e8ba7749300f0e773c099..96fbd5b0c3b5dbd344b672b4384d846806995a31 100644 (file)
--- a/libtransmission/rename-test.c
+++ b/libtransmission/rename-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/resume.c b/libtransmission/resume.c
index c4b11ffbbdc73f18dee97fb1f3a660840bd53d9b..f8df28578b515c02bcdca7b9b2fc63feec406ff2 100644 (file)
--- a/libtransmission/resume.c
+++ b/libtransmission/resume.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/resume.h b/libtransmission/resume.h
index e29ae0739fced9237abbd8b7ba0266e1446faceb..49bc44bb008303affc1c5b13248d6ace3e3622b1 100644 (file)
--- a/libtransmission/resume.h
+++ b/libtransmission/resume.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index 677aaa88af36a6efc1fdb8267f6982055815081d..0a45798f02fc4b99814aa431b62cda74a3b81261 100644 (file)
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
index 78de611ac07387334bf349a06de6170f460f0316..e0302c5ea738f21018b99583201a49dc95bb01ba 100644 (file)
--- a/libtransmission/rpc-server.h
+++ b/libtransmission/rpc-server.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/rpc-test.c b/libtransmission/rpc-test.c
index 69fe1c12fb3f201823f3db4b7e5c880093518236..9688355d83e6706ddf956ed2bc0dfdfe7deb45bd 100644 (file)
--- a/libtransmission/rpc-test.c
+++ b/libtransmission/rpc-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c
index e71fb45dffe3470491d98db155fd27bedbfc00e9..3fa61f5c7699018de2a9418495277fca674faa28 100644 (file)
--- a/libtransmission/rpcimpl.c
+++ b/libtransmission/rpcimpl.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/rpcimpl.h b/libtransmission/rpcimpl.h
index 3dc405f908d519721f0b0523f3c964e8fb554a26..6b6aab954057874075ccc58dfb8a2a5a7d6a9e1f 100644 (file)
--- a/libtransmission/rpcimpl.h
+++ b/libtransmission/rpcimpl.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/session-test.c b/libtransmission/session-test.c
index e5fca08dd8882e66a2687aa0463b774cd48e0e7b..7524bd0aaf71db23710a770301a5a69208c2ac23 100644 (file)
--- a/libtransmission/session-test.c
+++ b/libtransmission/session-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/session.c b/libtransmission/session.c
index de36bb340078a942e1e08edac6f55c40fa2c5230..56fe0222e904160de24e8ce0b95d7226017a7405 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/session.h b/libtransmission/session.h
index b7746015bf2e053d7e49105218451f0a2b2edacb..f7e4287763672cfe2a844bdfd72ee43a341833f7 100644 (file)
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/stats.c b/libtransmission/stats.c
index b60961fe0e95614b6439dd4611e074952d8270c9..b57a2d2f1ce73243c6aa8b2b00a39d3caca2fd49 100644 (file)
--- a/libtransmission/stats.c
+++ b/libtransmission/stats.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/stats.h b/libtransmission/stats.h
index fc70546f00bd7f4a65099856ba992724490efe06..161db59dd38f4d45899889a6ad79b0ce244305dd 100644 (file)
--- a/libtransmission/stats.h
+++ b/libtransmission/stats.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  */

diff --git a/libtransmission/torrent-ctor.c b/libtransmission/torrent-ctor.c
index 7c286c7cae651c5bbefe3105638cb822d60d389e..317117932d9702c9a2ba79d40b54fcd0f0c92f5b 100644 (file)
--- a/libtransmission/torrent-ctor.c
+++ b/libtransmission/torrent-ctor.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
index cf91d0e013e840dc579701d7380ae03a0b22f435..9452a00cb605c8280ca36e9c909b5796737ba5a4 100644 (file)
--- a/libtransmission/torrent-magnet.c
+++ b/libtransmission/torrent-magnet.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/torrent-magnet.h b/libtransmission/torrent-magnet.h
index a5ef84ac628561b07f24bb676ffdcfd9304f0d16..9cea66b7b53ec710c7a1b284d64d0ad83a52a5a6 100644 (file)
--- a/libtransmission/torrent-magnet.h
+++ b/libtransmission/torrent-magnet.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 224721a3eba54c92d3329c611d7d20d57217ec71..4042baa32d7c066131b6de540a26cc6b3d44ba72 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 6028d273d7113f6bf8bfc640e2de62bf55f53102..a02341734c4b6e6a3142a8a623f4540b41b26660 100644 (file)
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/tr-getopt-test.c b/libtransmission/tr-getopt-test.c
index 2b2ff56f0b56975498c5671a5732c0756976e1a7..ba128685c10bfad633c31d6030a2da2b4f4e5232 100644 (file)
--- a/libtransmission/tr-getopt-test.c
+++ b/libtransmission/tr-getopt-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/tr-getopt.c b/libtransmission/tr-getopt.c
index b11d3971eab3917477b6d357f752b9ba473522aa..c2048d072983c7f026199f8a5b320a424ab81215 100644 (file)
--- a/libtransmission/tr-getopt.c
+++ b/libtransmission/tr-getopt.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/tr-getopt.h b/libtransmission/tr-getopt.h
index 443a78118c78f007840b6de3d3d0c5e880909ee1..4171951cf43ed62bac7ed6d964ee09a34045fde1 100644 (file)
--- a/libtransmission/tr-getopt.h
+++ b/libtransmission/tr-getopt.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/trevent.c b/libtransmission/trevent.c
index b78aaf10e5d0e8ccb96a50926266584fb4db5a27..4e37a9ed968bd583d27980ed7013a72ed25f05bc 100644 (file)
--- a/libtransmission/trevent.c
+++ b/libtransmission/trevent.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h
index 7be73b75268d6c5b5f6f3703d6916b01be257af0..dfeef08939972706c0bd6640f5ab2beced921bee 100644 (file)
--- a/libtransmission/trevent.h
+++ b/libtransmission/trevent.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
index 454e36d236cf12c538cc642bf1c1c718abaf35b4..0513f4f485291a4928ca72da16b55e84c2ae96fb 100644 (file)
--- a/libtransmission/upnp.c
+++ b/libtransmission/upnp.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/upnp.h b/libtransmission/upnp.h
index 04d121af9097a5663b55c20588bda2b89d2901c8..2f9c2087686ffd181e44f42e2e7ea21f1d80e22e 100644 (file)
--- a/libtransmission/upnp.h
+++ b/libtransmission/upnp.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
index e391c60cd8ebb7793dbc600fbe4550d41c49c2a8..18b85b7c108e7c923810210ce56291062fbb7822 100644 (file)
--- a/libtransmission/utils-test.c
+++ b/libtransmission/utils-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index e7e7a1a9034f999e5f04cb6539fdb0245e9c450a..413639633229b5d0d329e35fea7b08de50975e1f 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index 1b682c21d5d43392eaf3a87d29d7b3bcc133c3f8..0ae3edccf044581e291f312ad0a8df21d0fc974a 100644 (file)
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/variant-benc.c b/libtransmission/variant-benc.c
index 164a369bc529006ff942a3d8a3cc253c4a761e0e..c3b0aa70b8e14fcef1b6efac5e6030aa71233875 100644 (file)
--- a/libtransmission/variant-benc.c
+++ b/libtransmission/variant-benc.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/variant-common.h b/libtransmission/variant-common.h
index 3b1dfbe34574d7e1e6477bc46ca935ae619f878b..a59a8650934a172f3b5376bec06c44a9337205a6 100644 (file)
--- a/libtransmission/variant-common.h
+++ b/libtransmission/variant-common.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id: announcer-common.h 13625 2012-12-05 17:29:46Z jordan $

diff --git a/libtransmission/variant-json.c b/libtransmission/variant-json.c
index be50175b9025672b97008dcd7eb798ad69f45232..5ce37e2d666d8b7c3876ffd6979fa3636a72c0ff 100644 (file)
--- a/libtransmission/variant-json.c
+++ b/libtransmission/variant-json.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/variant-test.c b/libtransmission/variant-test.c
index e39958b4b77b286e10d7a14fb7a48f82a9de1db8..d08cda9316af71ba8acfe5a618e256891b240038 100644 (file)
--- a/libtransmission/variant-test.c
+++ b/libtransmission/variant-test.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/variant.c b/libtransmission/variant.c
index eb55633fa38526f4dd2045d2f067dc4099d8f6d7..aa66ba97598d0ab30922c249e0a17d47df4a1d35 100644 (file)
--- a/libtransmission/variant.c
+++ b/libtransmission/variant.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/variant.h b/libtransmission/variant.h
index d7396107e618ae05387b5869ccca390861c14256..91087e47137c0541c275f5ca261427ef032cdf7a 100644 (file)
--- a/libtransmission/variant.h
+++ b/libtransmission/variant.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/verify.c b/libtransmission/verify.c
index ef39502b030981acfb2bd14d961e2a7500f29931..6185fe24621dadf86890950b366656e76a9bfe92 100644 (file)
--- a/libtransmission/verify.c
+++ b/libtransmission/verify.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/verify.h b/libtransmission/verify.h
index f19a825b71fbce72cebbe393ff76371b36caa3ce..23bd66abf229910c9a12268104de97aae1492e1b 100644 (file)
--- a/libtransmission/verify.h
+++ b/libtransmission/verify.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2007-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 81363ac56f71ddb6cd01931ba79e04791ec567c4..85fe1bece22e9502685d2f8a43e7ecfcd9901ce4 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/web.h b/libtransmission/web.h
index 58f53fbcb1b604559cbd12fcabf8336239a88b57..0e6b2284c2210e22027e4c3bc913ca0b4c6fac28 100644 (file)
--- a/libtransmission/web.h
+++ b/libtransmission/web.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/webseed.c b/libtransmission/webseed.c
index fbaec78feb668d155609beb5e5449ca4055b8800..7339f8958ac7cd2afea1b7846ae88ba03fac352d 100644 (file)
--- a/libtransmission/webseed.c
+++ b/libtransmission/webseed.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/libtransmission/webseed.h b/libtransmission/webseed.h
index 0050bdaf350d458069e98c8ef54fc00cef95a19b..d32b092b32fe15e763be4407781b00f2e0dc94d9 100644 (file)
--- a/libtransmission/webseed.h
+++ b/libtransmission/webseed.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2008-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/about.h b/qt/about.h
index 0856439cbfa013948850f3c0b3525314a36b9180..8db1b1309afd75866a2310da22367a60b7fca56e 100644 (file)
--- a/qt/about.h
+++ b/qt/about.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/add-data.h b/qt/add-data.h
index 8d7afe30c0c8a203b31a0c1c63e3f53fe623e863..eda1eaee0e0fa83edf34ffaf6a06ac34dd24e2dd 100644 (file)
--- a/qt/add-data.h
+++ b/qt/add-data.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/app.h b/qt/app.h
index 0393137de66499ded40e11707f1bf0c34d8f2e89..3d4eaa22997b8d457350924388177d00c4326d66 100644 (file)
--- a/qt/app.h
+++ b/qt/app.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/dbus-adaptor.h b/qt/dbus-adaptor.h
index 3bddb25e289abcf4502daba801b82b9fd54732bf..9d9f53a481f8f009a0480d058567ed8d6def4c1a 100644 (file)
--- a/qt/dbus-adaptor.h
+++ b/qt/dbus-adaptor.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/details.h b/qt/details.h
index ae2bdc79553edd565ea445bd91bcb66bea47cc9a..617801c951b02addc9807f4dbef81f1bac5b7bdd 100644 (file)
--- a/qt/details.h
+++ b/qt/details.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/favicon.h b/qt/favicon.h
index 28ae5c1454b06c0943bcbbb0966e975fabf66c3a..e5d0deb288b9807ef9a7539ce842386634e5157d 100644 (file)
--- a/qt/favicon.h
+++ b/qt/favicon.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/file-tree.h b/qt/file-tree.h
index 031c9d47eb9c985401f9dd77081eb61ac0344623..ac4dd955ae33b9ba91c3146269f9be8981d08876 100644 (file)
--- a/qt/file-tree.h
+++ b/qt/file-tree.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/filterbar.h b/qt/filterbar.h
index f4b96c3b8d4b733da20f9ac241fbcb0b73b075e9..5c6393d58a03c15981231b20a186c9458904d1c6 100644 (file)
--- a/qt/filterbar.h
+++ b/qt/filterbar.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/filters.h b/qt/filters.h
index e190bdf91ed7fd3b02babdaccee28d2a66663281..c5c3669166f4b4c47c5210564a8893cf33a0bfee 100644 (file)
--- a/qt/filters.h
+++ b/qt/filters.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/formatter.h b/qt/formatter.h
index 74ee7435e25b6727fb06dd365c6fac2b3bd61dab..e8982def8054e0d3a9df91cd2786a404eadebe0e 100644 (file)
--- a/qt/formatter.h
+++ b/qt/formatter.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/freespace-label.h b/qt/freespace-label.h
index 8aa6444fbcabe38c67be169176873948bcc18192..b97af27090e985bf8b4735fc83334a36178d58fd 100644 (file)
--- a/qt/freespace-label.h
+++ b/qt/freespace-label.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2013-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/hig.h b/qt/hig.h
index b07448e24c9faf183248073c4fb734869fa523d7..d597a6088febd016984de30f5d2e077d3051db48 100644 (file)
--- a/qt/hig.h
+++ b/qt/hig.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/license.cc b/qt/license.cc
index c4dc414635710b67dc72905e884facfebf65d5ce..a8271848ef04c8532be4b824bdda1c02510a8595 100644 (file)
--- a/qt/license.cc
+++ b/qt/license.cc
@@ -23,7 +23,19 @@ LicenseDialog :: LicenseDialog (QWidget * parent):
   QPlainTextEdit * t = new QPlainTextEdit (this);
   t->setReadOnly (true);
   t->setPlainText (
-"Transmission may be used under the GNU Public License v2 or v3 licenses, or any future license endorsed by Mnemosyne LLC.\n \nPermission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables.  Works derived from Transmission may, at their authors' discretion, keep or delete this exception.");
+    "Copyright 2005-2014. All code is copyrighted by the respective authors.\n"
+    "\n"
+    "Transmission can be redistributed and/or modified under the terms of the"
+    "GNU GPL versions 2 or 3 or by any future license endorsed by Mnemosyne LLC.\n"
+    "\n"
+    "In addition, linking to and/or using OpenSSL is allowed.\n"
+    "\n"
+    "This program is distributed in the hope that it will be useful,"
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+    "\n"
+    "Some of Transmission's source files have more permissive licenses."
+    "Those files may, of course, be used on their own under their own terms.\n");
   v->addWidget (t);
 
   QDialogButtonBox * box = new QDialogButtonBox;

diff --git a/qt/license.h b/qt/license.h
index 07a8bc846be6cab57bcf8ac779b117797a5b1b7e..a51a8d5732509eb59f626705a875a8b0ff1122e5 100644 (file)
--- a/qt/license.h
+++ b/qt/license.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/mainwin.h b/qt/mainwin.h
index 6594224c4e5f227fe44bd75c835b0b9ccb657bb7..ea0c42e2f0668c5edf7237c230bedc41b0b1c3ec 100644 (file)
--- a/qt/mainwin.h
+++ b/qt/mainwin.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/make-dialog.h b/qt/make-dialog.h
index ef3b7447a8693de3982aaf44b5e1bbec74ca9250..bb6d5ec4d62308e5e97c986497e20b85220bf8c4 100644 (file)
--- a/qt/make-dialog.h
+++ b/qt/make-dialog.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/options.h b/qt/options.h
index ff620b90eae0be360c71ee676c428ed207209a8a..0f4a2bf0d34ee6d7c141b15167d04a2fc688de89 100644 (file)
--- a/qt/options.h
+++ b/qt/options.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/prefs-dialog.h b/qt/prefs-dialog.h
index 2dd965642a5a71f2aeee9131e6162f953a4a656e..e17a288d02e1dc46d73402c7957f982a19bcb0c2 100644 (file)
--- a/qt/prefs-dialog.h
+++ b/qt/prefs-dialog.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/prefs.h b/qt/prefs.h
index 6cb367ec85c1a5e1c945ef899869192d06f2873a..b5831ea01d5789447eb86f5d4296fe38193817e8 100644 (file)
--- a/qt/prefs.h
+++ b/qt/prefs.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/relocate.h b/qt/relocate.h
index d37cb4eac159c9507baa6d7791bddb1314a55b75..9e21075adf9616a96cb81c4cfde22b7bb18f63d5 100644 (file)
--- a/qt/relocate.h
+++ b/qt/relocate.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/session-dialog.h b/qt/session-dialog.h
index 0fcfda9700ce157315d1f5117f7576b6d03724a4..2b50413b0871ca8873888a75d0a47a3da8056c07 100644 (file)
--- a/qt/session-dialog.h
+++ b/qt/session-dialog.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/session.h b/qt/session.h
index 778a06c4e09c261f912696bafd26a1b53acebdb2..842026343cd71f0ffedc64baf5476e30335e5a14 100644 (file)
--- a/qt/session.h
+++ b/qt/session.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/speed.h b/qt/speed.h
index f7c3c5bf25a0307fe891af93c5a570cc5a7916a0..74de86629a68f5763414f8a71a95fd3f4a76ad35 100644 (file)
--- a/qt/speed.h
+++ b/qt/speed.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/stats-dialog.h b/qt/stats-dialog.h
index 85bee79583f20dd23b61d9aff51943529e59fb7e..727369071fb123db046d9cbb96892076e102887f 100644 (file)
--- a/qt/stats-dialog.h
+++ b/qt/stats-dialog.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/torrent-delegate-min.h b/qt/torrent-delegate-min.h
index 5f7c17286cf33c5ded319139b3e25969e5787c40..0ee40ff48c11865aa9881ef3ccea55c89cf67dc5 100644 (file)
--- a/qt/torrent-delegate-min.h
+++ b/qt/torrent-delegate-min.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/torrent-delegate.h b/qt/torrent-delegate.h
index a0e740eb5756ba653fbd90f9cba1b2d9577229d3..28d8c19ef37239f5ea40c4c4bf446db0d0b42126 100644 (file)
--- a/qt/torrent-delegate.h
+++ b/qt/torrent-delegate.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/torrent-filter.h b/qt/torrent-filter.h
index c933b5782fa05d371bfb191db03c2a651813df08..6f5df7fa44c248713d66cbc8a469f0bdd68a18dd 100644 (file)
--- a/qt/torrent-filter.h
+++ b/qt/torrent-filter.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/torrent-model.h b/qt/torrent-model.h
index 694a4c4bba0b416dad9bf7b464552f8053a2fdf9..8752444183832ce61b721a1b48c8aae6c0444afa 100644 (file)
--- a/qt/torrent-model.h
+++ b/qt/torrent-model.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/torrent.h b/qt/torrent.h
index 154463129c826842665081f24f603c5e35ffe607..85f1b289b5a244a18fb608e5b3f35efafb3f8d61 100644 (file)
--- a/qt/torrent.h
+++ b/qt/torrent.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/tracker-delegate.h b/qt/tracker-delegate.h
index 1c63f15daa26082cc53060cffa044bd949986557..3532cfa379af00ae78a2dc1bdb107b2c9bcdfa65 100644 (file)
--- a/qt/tracker-delegate.h
+++ b/qt/tracker-delegate.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/tracker-model-filter.h b/qt/tracker-model-filter.h
index 2c7937896ab0363f9bf8fce43e41e79b7300f306..825633870db0ae19abe04746acb1057e2ee70e40 100644 (file)
--- a/qt/tracker-model-filter.h
+++ b/qt/tracker-model-filter.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/tracker-model.h b/qt/tracker-model.h
index d38a57ec249d97f699d8de026d08bde0400657c9..a92ea915fcf551fa6f01b051bd7afeab94c70024 100644 (file)
--- a/qt/tracker-model.h
+++ b/qt/tracker-model.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2010-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/triconpushbutton.h b/qt/triconpushbutton.h
index 32e0d08bfb52ce9840726f6876a24dda3a2edfbc..cd3f950ffe4ee13aba0fec13c66af99fe5127881 100644 (file)
--- a/qt/triconpushbutton.h
+++ b/qt/triconpushbutton.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/types.h b/qt/types.h
index cf49beac0f0092859e0bc77bf0bc753f4b3e8048..17cccf662b311db4cba39661c49b279a75cdbb6e 100644 (file)
--- a/qt/types.h
+++ b/qt/types.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/utils.h b/qt/utils.h
index 1496fd1db008dc05a267ca6f6435f70ef1536bc5..cfa039d31293ed5f847530a2fdf0aa4fd54f5873 100644 (file)
--- a/qt/utils.h
+++ b/qt/utils.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/qt/watchdir.h b/qt/watchdir.h
index 558646968987d671dcf38a6c18127a1b48e2255b..a123c7879c0f8ee90ecbcb558c51ea745485ad97 100644 (file)
--- a/qt/watchdir.h
+++ b/qt/watchdir.h
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2009-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/utils/create.c b/utils/create.c
index ab67afbd23175d98e01bcaab9253ec4bba019293..b634be09345e6414baef613e3dfe4da4c2f7e9c7 100644 (file)
--- a/utils/create.c
+++ b/utils/create.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/utils/edit.c b/utils/edit.c
index e60d1be142a2c6f884e6bad5d14f0ec057463f7a..6daef08d9f14c4a2f2063123a3edc24e9ff0ab21 100644 (file)
--- a/utils/edit.c
+++ b/utils/edit.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$

diff --git a/utils/show.c b/utils/show.c
index 953945f762b98f8f1fb0703ece504abb28499990..bf27ad7aa8bbdad72132817521a8ccdab070d63c 100644 (file)
--- a/utils/show.c
+++ b/utils/show.c
@@ -1,7 +1,7 @@
 /*
  * This file Copyright (C) 2012-2014 Mnemosyne LLC
  *
- * It may be used under the GNU Public License v2 or v3 licenses,
+ * It may be used under the GNU GPL versions 2 or 3
  * or any future license endorsed by Mnemosyne LLC.
  *
  * $Id$