summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Alert.hs2
-rw-r--r--Assistant/Alert/Utility.hs2
-rw-r--r--Assistant/BranchChange.hs2
-rw-r--r--Assistant/Changes.hs2
-rw-r--r--Assistant/Commits.hs2
-rw-r--r--Assistant/Common.hs2
-rw-r--r--Assistant/CredPairCache.hs2
-rw-r--r--Assistant/DaemonStatus.hs2
-rw-r--r--Assistant/DeleteRemote.hs2
-rw-r--r--Assistant/Drop.hs2
-rw-r--r--Assistant/Install.hs2
-rw-r--r--Assistant/Install/AutoStart.hs2
-rw-r--r--Assistant/Install/Menu.hs2
-rw-r--r--Assistant/MakeRemote.hs2
-rw-r--r--Assistant/Monad.hs2
-rw-r--r--Assistant/NamedThread.hs2
-rw-r--r--Assistant/NetMessager.hs2
-rw-r--r--Assistant/Pairing.hs2
-rw-r--r--Assistant/Pairing/MakeRemote.hs2
-rw-r--r--Assistant/Pairing/Network.hs2
-rw-r--r--Assistant/Pushes.hs2
-rw-r--r--Assistant/RemoteControl.hs2
-rw-r--r--Assistant/RepoProblem.hs2
-rw-r--r--Assistant/ScanRemotes.hs2
-rw-r--r--Assistant/Ssh.hs2
-rw-r--r--Assistant/Sync.hs2
-rw-r--r--Assistant/Threads/Committer.hs2
-rw-r--r--Assistant/Threads/ConfigMonitor.hs2
-rw-r--r--Assistant/Threads/Cronner.hs2
-rw-r--r--Assistant/Threads/DaemonStatus.hs2
-rw-r--r--Assistant/Threads/Glacier.hs2
-rw-r--r--Assistant/Threads/Merger.hs2
-rw-r--r--Assistant/Threads/MountWatcher.hs2
-rw-r--r--Assistant/Threads/NetWatcher.hs2
-rw-r--r--Assistant/Threads/PairListener.hs2
-rw-r--r--Assistant/Threads/ProblemFixer.hs2
-rw-r--r--Assistant/Threads/Pusher.hs2
-rw-r--r--Assistant/Threads/RemoteControl.hs2
-rw-r--r--Assistant/Threads/SanityChecker.hs2
-rw-r--r--Assistant/Threads/TransferPoller.hs2
-rw-r--r--Assistant/Threads/TransferScanner.hs2
-rw-r--r--Assistant/Threads/TransferWatcher.hs2
-rw-r--r--Assistant/Threads/Transferrer.hs2
-rw-r--r--Assistant/Threads/UpgradeWatcher.hs2
-rw-r--r--Assistant/Threads/Upgrader.hs2
-rw-r--r--Assistant/Threads/Watcher.hs2
-rw-r--r--Assistant/Threads/WebApp.hs2
-rw-r--r--Assistant/Threads/XMPPClient.hs2
-rw-r--r--Assistant/Threads/XMPPPusher.hs2
-rw-r--r--Assistant/TransferQueue.hs2
-rw-r--r--Assistant/TransferSlots.hs2
-rw-r--r--Assistant/TransferrerPool.hs2
-rw-r--r--Assistant/Types/Alert.hs2
-rw-r--r--Assistant/Types/BranchChange.hs2
-rw-r--r--Assistant/Types/Buddies.hs2
-rw-r--r--Assistant/Types/Changes.hs2
-rw-r--r--Assistant/Types/Commits.hs2
-rw-r--r--Assistant/Types/CredPairCache.hs2
-rw-r--r--Assistant/Types/DaemonStatus.hs2
-rw-r--r--Assistant/Types/NamedThread.hs2
-rw-r--r--Assistant/Types/NetMessager.hs2
-rw-r--r--Assistant/Types/Pushes.hs2
-rw-r--r--Assistant/Types/RemoteControl.hs2
-rw-r--r--Assistant/Types/RepoProblem.hs2
-rw-r--r--Assistant/Types/ScanRemotes.hs2
-rw-r--r--Assistant/Types/ThreadName.hs2
-rw-r--r--Assistant/Types/ThreadedMonad.hs2
-rw-r--r--Assistant/Types/TransferQueue.hs2
-rw-r--r--Assistant/Types/TransferSlots.hs2
-rw-r--r--Assistant/Types/TransferrerPool.hs2
-rw-r--r--Assistant/Types/UrlRenderer.hs2
-rw-r--r--Assistant/Unused.hs2
-rw-r--r--Assistant/XMPP.hs2
-rw-r--r--Assistant/XMPP/Buddies.hs2
-rw-r--r--Assistant/XMPP/Client.hs2
-rw-r--r--Assistant/XMPP/Git.hs2
76 files changed, 76 insertions, 76 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index a41baa85f..1286e4590 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -1,6 +1,6 @@
{- git-annex assistant alerts
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Alert/Utility.hs b/Assistant/Alert/Utility.hs
index ea1280dac..65484e0e6 100644
--- a/Assistant/Alert/Utility.hs
+++ b/Assistant/Alert/Utility.hs
@@ -1,6 +1,6 @@
{- git-annex assistant alert utilities
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/BranchChange.hs b/Assistant/BranchChange.hs
index c9354544a..c588c910a 100644
--- a/Assistant/BranchChange.hs
+++ b/Assistant/BranchChange.hs
@@ -1,6 +1,6 @@
{- git-annex assistant git-annex branch change tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Changes.hs b/Assistant/Changes.hs
index 2ecd2036c..6eb9bc28e 100644
--- a/Assistant/Changes.hs
+++ b/Assistant/Changes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant change tracking
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Commits.hs b/Assistant/Commits.hs
index 7d1d3780f..c82f8f4c7 100644
--- a/Assistant/Commits.hs
+++ b/Assistant/Commits.hs
@@ -1,6 +1,6 @@
{- git-annex assistant commit tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Common.hs b/Assistant/Common.hs
index f9719422d..5fab84290 100644
--- a/Assistant/Common.hs
+++ b/Assistant/Common.hs
@@ -1,6 +1,6 @@
{- Common infrastructure for the git-annex assistant.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/CredPairCache.hs b/Assistant/CredPairCache.hs
index 2b8f72e7c..ac355b55a 100644
--- a/Assistant/CredPairCache.hs
+++ b/Assistant/CredPairCache.hs
@@ -1,6 +1,6 @@
{- git-annex assistant CredPair cache.
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs
index 3edc2c174..1ed40595e 100644
--- a/Assistant/DaemonStatus.hs
+++ b/Assistant/DaemonStatus.hs
@@ -1,6 +1,6 @@
{- git-annex assistant daemon status
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/DeleteRemote.hs b/Assistant/DeleteRemote.hs
index 9b1f974ff..5b044fd18 100644
--- a/Assistant/DeleteRemote.hs
+++ b/Assistant/DeleteRemote.hs
@@ -1,6 +1,6 @@
{- git-annex assistant remote deletion utilities
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs
index efd74fdb3..57eef8f3a 100644
--- a/Assistant/Drop.hs
+++ b/Assistant/Drop.hs
@@ -1,6 +1,6 @@
{- git-annex assistant dropping of unwanted content
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index e2d52692e..6da6d2389 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -1,6 +1,6 @@
{- Assistant installation
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs
index b03d20224..b27b69775 100644
--- a/Assistant/Install/AutoStart.hs
+++ b/Assistant/Install/AutoStart.hs
@@ -1,6 +1,6 @@
{- Assistant autostart file installation
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Install/Menu.hs b/Assistant/Install/Menu.hs
index d095cdd88..32393abaf 100644
--- a/Assistant/Install/Menu.hs
+++ b/Assistant/Install/Menu.hs
@@ -1,6 +1,6 @@
{- Assistant menu installation.
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs
index d244a7729..a5eace724 100644
--- a/Assistant/MakeRemote.hs
+++ b/Assistant/MakeRemote.hs
@@ -1,6 +1,6 @@
{- git-annex assistant remote creation utilities
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs
index 5b3f5abb4..a34264a01 100644
--- a/Assistant/Monad.hs
+++ b/Assistant/Monad.hs
@@ -1,6 +1,6 @@
{- git-annex assistant monad
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/NamedThread.hs b/Assistant/NamedThread.hs
index e1b3983f7..f80953053 100644
--- a/Assistant/NamedThread.hs
+++ b/Assistant/NamedThread.hs
@@ -1,6 +1,6 @@
{- git-annex assistant named threads.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/NetMessager.hs b/Assistant/NetMessager.hs
index f042b4e4e..dd1811141 100644
--- a/Assistant/NetMessager.hs
+++ b/Assistant/NetMessager.hs
@@ -1,6 +1,6 @@
{- git-annex assistant out of band network messager interface
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs
index bb1384a15..492b98592 100644
--- a/Assistant/Pairing.hs
+++ b/Assistant/Pairing.hs
@@ -1,6 +1,6 @@
{- git-annex assistant repo pairing, core data types
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs
index 3f3823664..8c0c4d524 100644
--- a/Assistant/Pairing/MakeRemote.hs
+++ b/Assistant/Pairing/MakeRemote.hs
@@ -1,6 +1,6 @@
{- git-annex assistant pairing remote creation
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Pairing/Network.hs b/Assistant/Pairing/Network.hs
index 4bb6088b1..7a4ac3ffe 100644
--- a/Assistant/Pairing/Network.hs
+++ b/Assistant/Pairing/Network.hs
@@ -4,7 +4,7 @@
- each message is repeated until acknowledged. This is done using a
- thread, that gets stopped before the next message is sent.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Pushes.hs b/Assistant/Pushes.hs
index 54f31a84b..7b4de450f 100644
--- a/Assistant/Pushes.hs
+++ b/Assistant/Pushes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant push tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/RemoteControl.hs b/Assistant/RemoteControl.hs
index 86d13cc56..1016f1169 100644
--- a/Assistant/RemoteControl.hs
+++ b/Assistant/RemoteControl.hs
@@ -1,6 +1,6 @@
{- git-annex assistant RemoteDaemon control
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/RepoProblem.hs b/Assistant/RepoProblem.hs
index 6913fefc6..32595916e 100644
--- a/Assistant/RepoProblem.hs
+++ b/Assistant/RepoProblem.hs
@@ -1,6 +1,6 @@
{- git-annex assistant remote problem handling
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/ScanRemotes.hs b/Assistant/ScanRemotes.hs
index 2743c0f36..0ce7a47cc 100644
--- a/Assistant/ScanRemotes.hs
+++ b/Assistant/ScanRemotes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant remotes needing scanning
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 7b82f4624..c41340962 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -1,6 +1,6 @@
{- git-annex assistant ssh utilities
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 4bc63241c..d914d2246 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -1,6 +1,6 @@
{- git-annex assistant repo syncing
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 47c2aa4aa..2c1addb24 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -1,6 +1,6 @@
{- git-annex assistant commit thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/ConfigMonitor.hs b/Assistant/Threads/ConfigMonitor.hs
index d02e53db5..7ab55fb82 100644
--- a/Assistant/Threads/ConfigMonitor.hs
+++ b/Assistant/Threads/ConfigMonitor.hs
@@ -1,6 +1,6 @@
{- git-annex assistant config monitor thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Cronner.hs b/Assistant/Threads/Cronner.hs
index 6dc6f4c6b..451fa75c6 100644
--- a/Assistant/Threads/Cronner.hs
+++ b/Assistant/Threads/Cronner.hs
@@ -1,6 +1,6 @@
{- git-annex assistant sceduled jobs runner
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/DaemonStatus.hs b/Assistant/Threads/DaemonStatus.hs
index 5bbb15acb..d5b2cc25d 100644
--- a/Assistant/Threads/DaemonStatus.hs
+++ b/Assistant/Threads/DaemonStatus.hs
@@ -1,6 +1,6 @@
{- git-annex assistant daemon status thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Glacier.hs b/Assistant/Threads/Glacier.hs
index 4c4012a67..900e0d423 100644
--- a/Assistant/Threads/Glacier.hs
+++ b/Assistant/Threads/Glacier.hs
@@ -1,6 +1,6 @@
{- git-annex assistant Amazon Glacier retrieval
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 62dab59af..f1a64925d 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -1,6 +1,6 @@
{- git-annex assistant git merge thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index bd7aad69c..023af53cb 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant mount watcher, using either dbus or mtab polling
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs
index 6a2515237..ad3a87a91 100644
--- a/Assistant/Threads/NetWatcher.hs
+++ b/Assistant/Threads/NetWatcher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant network connection watcher, using dbus
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs
index cd95ab5a4..a02b8b91a 100644
--- a/Assistant/Threads/PairListener.hs
+++ b/Assistant/Threads/PairListener.hs
@@ -1,6 +1,6 @@
{- git-annex assistant thread to listen for incoming pairing traffic
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/ProblemFixer.hs b/Assistant/Threads/ProblemFixer.hs
index 8095581a6..86ee027f7 100644
--- a/Assistant/Threads/ProblemFixer.hs
+++ b/Assistant/Threads/ProblemFixer.hs
@@ -1,6 +1,6 @@
{- git-annex assistant thread to handle fixing problems with repositories
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Pusher.hs b/Assistant/Threads/Pusher.hs
index 3ec922fe4..35989ed48 100644
--- a/Assistant/Threads/Pusher.hs
+++ b/Assistant/Threads/Pusher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant git pushing thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/RemoteControl.hs b/Assistant/Threads/RemoteControl.hs
index 5af4fddcd..ae63aff5c 100644
--- a/Assistant/Threads/RemoteControl.hs
+++ b/Assistant/Threads/RemoteControl.hs
@@ -1,6 +1,6 @@
{- git-annex assistant communication with remotedaemon
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs
index df29df006..3073cfe41 100644
--- a/Assistant/Threads/SanityChecker.hs
+++ b/Assistant/Threads/SanityChecker.hs
@@ -1,6 +1,6 @@
{- git-annex assistant sanity checker
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/TransferPoller.hs b/Assistant/Threads/TransferPoller.hs
index a5b30b4f0..73562dbf7 100644
--- a/Assistant/Threads/TransferPoller.hs
+++ b/Assistant/Threads/TransferPoller.hs
@@ -1,6 +1,6 @@
{- git-annex assistant transfer polling thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs
index fc2394e62..3cbaadf19 100644
--- a/Assistant/Threads/TransferScanner.hs
+++ b/Assistant/Threads/TransferScanner.hs
@@ -1,6 +1,6 @@
{- git-annex assistant thread to scan remotes to find needed transfers
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs
index 6e8791732..c452d87c2 100644
--- a/Assistant/Threads/TransferWatcher.hs
+++ b/Assistant/Threads/TransferWatcher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant transfer watching thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Transferrer.hs b/Assistant/Threads/Transferrer.hs
index 53d8a578c..073dbef3c 100644
--- a/Assistant/Threads/Transferrer.hs
+++ b/Assistant/Threads/Transferrer.hs
@@ -1,6 +1,6 @@
{- git-annex assistant data transferrer thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/UpgradeWatcher.hs b/Assistant/Threads/UpgradeWatcher.hs
index 431e6f339..e779c8e54 100644
--- a/Assistant/Threads/UpgradeWatcher.hs
+++ b/Assistant/Threads/UpgradeWatcher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant thread to detect when git-annex is upgraded
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Upgrader.hs b/Assistant/Threads/Upgrader.hs
index 100c15414..602d09208 100644
--- a/Assistant/Threads/Upgrader.hs
+++ b/Assistant/Threads/Upgrader.hs
@@ -1,6 +1,6 @@
{- git-annex assistant thread to detect when upgrade is available
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index a921861b8..ca9de6836 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -1,6 +1,6 @@
{- git-annex assistant tree watcher
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index d01096c7a..fd78ba8d8 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -1,6 +1,6 @@
{- git-annex assistant webapp thread
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs
index 8ce99eac6..78d527920 100644
--- a/Assistant/Threads/XMPPClient.hs
+++ b/Assistant/Threads/XMPPClient.hs
@@ -1,6 +1,6 @@
{- git-annex XMPP client
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Threads/XMPPPusher.hs b/Assistant/Threads/XMPPPusher.hs
index 35c76ebf1..ec11b9b94 100644
--- a/Assistant/Threads/XMPPPusher.hs
+++ b/Assistant/Threads/XMPPPusher.hs
@@ -9,7 +9,7 @@
- they would deadlock with only one thread. For larger numbers of
- clients, the two threads are also sufficient.
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs
index d138e16ef..ba13b3f04 100644
--- a/Assistant/TransferQueue.hs
+++ b/Assistant/TransferQueue.hs
@@ -1,6 +1,6 @@
{- git-annex assistant pending transfer queue
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/TransferSlots.hs b/Assistant/TransferSlots.hs
index cafbb7bdf..bbc2ec7e5 100644
--- a/Assistant/TransferSlots.hs
+++ b/Assistant/TransferSlots.hs
@@ -1,6 +1,6 @@
{- git-annex assistant transfer slots
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/TransferrerPool.hs b/Assistant/TransferrerPool.hs
index 3ac9f3452..152625f4f 100644
--- a/Assistant/TransferrerPool.hs
+++ b/Assistant/TransferrerPool.hs
@@ -1,6 +1,6 @@
{- A pool of "git-annex transferkeys" processes
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/Alert.hs b/Assistant/Types/Alert.hs
index 9fd33c7a2..a2e5d5c82 100644
--- a/Assistant/Types/Alert.hs
+++ b/Assistant/Types/Alert.hs
@@ -1,6 +1,6 @@
{- git-annex assistant alert types
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/BranchChange.hs b/Assistant/Types/BranchChange.hs
index 399abee54..f769657d0 100644
--- a/Assistant/Types/BranchChange.hs
+++ b/Assistant/Types/BranchChange.hs
@@ -1,6 +1,6 @@
{- git-annex assistant git-annex branch change tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/Buddies.hs b/Assistant/Types/Buddies.hs
index 36d8a4fed..2887aaef0 100644
--- a/Assistant/Types/Buddies.hs
+++ b/Assistant/Types/Buddies.hs
@@ -1,6 +1,6 @@
{- git-annex assistant buddies
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/Changes.hs b/Assistant/Types/Changes.hs
index e8ecc6e48..1d8b51775 100644
--- a/Assistant/Types/Changes.hs
+++ b/Assistant/Types/Changes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant change tracking
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/Commits.hs b/Assistant/Types/Commits.hs
index 500faa901..bf83fc486 100644
--- a/Assistant/Types/Commits.hs
+++ b/Assistant/Types/Commits.hs
@@ -1,6 +1,6 @@
{- git-annex assistant commit tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/CredPairCache.hs b/Assistant/Types/CredPairCache.hs
index a1e11c257..9777e29ee 100644
--- a/Assistant/Types/CredPairCache.hs
+++ b/Assistant/Types/CredPairCache.hs
@@ -1,6 +1,6 @@
{- git-annex assistant CredPair cache.
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/DaemonStatus.hs b/Assistant/Types/DaemonStatus.hs
index 2adad2828..e1b6c997e 100644
--- a/Assistant/Types/DaemonStatus.hs
+++ b/Assistant/Types/DaemonStatus.hs
@@ -1,6 +1,6 @@
{- git-annex assistant daemon status
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/NamedThread.hs b/Assistant/Types/NamedThread.hs
index 5dd1364ad..b07b322ad 100644
--- a/Assistant/Types/NamedThread.hs
+++ b/Assistant/Types/NamedThread.hs
@@ -1,6 +1,6 @@
{- named threads
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/NetMessager.hs b/Assistant/Types/NetMessager.hs
index f5ad85b4a..475d810ae 100644
--- a/Assistant/Types/NetMessager.hs
+++ b/Assistant/Types/NetMessager.hs
@@ -1,6 +1,6 @@
{- git-annex assistant out of band network messager types
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/Pushes.hs b/Assistant/Types/Pushes.hs
index 99e0ee162..0da8b44b5 100644
--- a/Assistant/Types/Pushes.hs
+++ b/Assistant/Types/Pushes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant push tracking
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/RemoteControl.hs b/Assistant/Types/RemoteControl.hs
index 523cd8b8d..42cb4a5aa 100644
--- a/Assistant/Types/RemoteControl.hs
+++ b/Assistant/Types/RemoteControl.hs
@@ -1,6 +1,6 @@
{- git-annex assistant RemoteDaemon control
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/RepoProblem.hs b/Assistant/Types/RepoProblem.hs
index ece5a5286..3b9c72cf8 100644
--- a/Assistant/Types/RepoProblem.hs
+++ b/Assistant/Types/RepoProblem.hs
@@ -1,6 +1,6 @@
{- git-annex assistant repository problem tracking
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/ScanRemotes.hs b/Assistant/Types/ScanRemotes.hs
index 8219f9baf..ac6d8fef9 100644
--- a/Assistant/Types/ScanRemotes.hs
+++ b/Assistant/Types/ScanRemotes.hs
@@ -1,6 +1,6 @@
{- git-annex assistant remotes needing scanning
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/ThreadName.hs b/Assistant/Types/ThreadName.hs
index c8d264a38..57c704dad 100644
--- a/Assistant/Types/ThreadName.hs
+++ b/Assistant/Types/ThreadName.hs
@@ -1,6 +1,6 @@
{- name of a thread
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/ThreadedMonad.hs b/Assistant/Types/ThreadedMonad.hs
index 1a2aa7eb7..eadf325ea 100644
--- a/Assistant/Types/ThreadedMonad.hs
+++ b/Assistant/Types/ThreadedMonad.hs
@@ -1,6 +1,6 @@
{- making the Annex monad available across threads
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/TransferQueue.hs b/Assistant/Types/TransferQueue.hs
index e4bf2ae92..73a7521c5 100644
--- a/Assistant/Types/TransferQueue.hs
+++ b/Assistant/Types/TransferQueue.hs
@@ -1,6 +1,6 @@
{- git-annex assistant pending transfer queue
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/TransferSlots.hs b/Assistant/Types/TransferSlots.hs
index 5140995a3..5fa1219a7 100644
--- a/Assistant/Types/TransferSlots.hs
+++ b/Assistant/Types/TransferSlots.hs
@@ -1,6 +1,6 @@
{- git-annex assistant transfer slots
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/TransferrerPool.hs b/Assistant/Types/TransferrerPool.hs
index b66fdfa13..697bb8dd5 100644
--- a/Assistant/Types/TransferrerPool.hs
+++ b/Assistant/Types/TransferrerPool.hs
@@ -1,6 +1,6 @@
{- A pool of "git-annex transferkeys" processes available for use
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Types/UrlRenderer.hs b/Assistant/Types/UrlRenderer.hs
index 521905bf3..68c238d6a 100644
--- a/Assistant/Types/UrlRenderer.hs
+++ b/Assistant/Types/UrlRenderer.hs
@@ -1,6 +1,6 @@
{- webapp url renderer access from the assistant
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/Unused.hs b/Assistant/Unused.hs
index c2c10b048..194739367 100644
--- a/Assistant/Unused.hs
+++ b/Assistant/Unused.hs
@@ -1,6 +1,6 @@
{- git-annex assistant unused files
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs
index cc0343abf..b9ae50e27 100644
--- a/Assistant/XMPP.hs
+++ b/Assistant/XMPP.hs
@@ -1,6 +1,6 @@
{- core xmpp support
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/XMPP/Buddies.hs b/Assistant/XMPP/Buddies.hs
index 0c466e51c..29e0e24cf 100644
--- a/Assistant/XMPP/Buddies.hs
+++ b/Assistant/XMPP/Buddies.hs
@@ -1,6 +1,6 @@
{- xmpp buddies
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/XMPP/Client.hs b/Assistant/XMPP/Client.hs
index 314ace64a..6d09d32e6 100644
--- a/Assistant/XMPP/Client.hs
+++ b/Assistant/XMPP/Client.hs
@@ -1,6 +1,6 @@
{- xmpp client support
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs
index 120d4c53a..2186b5bce 100644
--- a/Assistant/XMPP/Git.hs
+++ b/Assistant/XMPP/Git.hs
@@ -1,6 +1,6 @@
{- git over XMPP
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}