summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-21 12:50:09 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-21 12:50:09 -0400
commit2f2635528d8e428e0fafaf7877a4572a397cdf52 (patch)
treeaea27617e406050b507efa379ea6a1bf7497d6d3
parent14a50deef7c83c104ce5e706dfb2e9887a37e663 (diff)
update my email address and homepage url
-rw-r--r--.mailmap6
-rw-r--r--Annex.hs2
-rw-r--r--Annex/AutoMerge.hs2
-rw-r--r--Annex/Branch.hs2
-rw-r--r--Annex/Branch/Transitions.hs2
-rw-r--r--Annex/BranchState.hs2
-rw-r--r--Annex/CatFile.hs2
-rw-r--r--Annex/CheckAttr.hs2
-rw-r--r--Annex/CheckIgnore.hs2
-rw-r--r--Annex/Content.hs2
-rw-r--r--Annex/Content/Direct.hs2
-rw-r--r--Annex/Direct.hs2
-rw-r--r--Annex/Direct/Fixup.hs2
-rw-r--r--Annex/Drop.hs2
-rw-r--r--Annex/Environment.hs2
-rw-r--r--Annex/FileMatcher.hs2
-rw-r--r--Annex/Hook.hs2
-rw-r--r--Annex/Index.hs2
-rw-r--r--Annex/Init.hs2
-rw-r--r--Annex/Journal.hs2
-rw-r--r--Annex/Link.hs2
-rw-r--r--Annex/LockFile.hs2
-rw-r--r--Annex/MakeRepo.hs2
-rw-r--r--Annex/MetaData.hs2
-rw-r--r--Annex/MetaData/StandardFields.hs2
-rw-r--r--Annex/Notification.hs2
-rw-r--r--Annex/Path.hs2
-rw-r--r--Annex/Perms.hs2
-rw-r--r--Annex/Queue.hs2
-rw-r--r--Annex/Quvi.hs2
-rw-r--r--Annex/ReplaceFile.hs2
-rw-r--r--Annex/Ssh.hs2
-rw-r--r--Annex/TaggedPush.hs2
-rw-r--r--Annex/Transfer.hs2
-rw-r--r--Annex/UUID.hs2
-rw-r--r--Annex/Url.hs2
-rw-r--r--Annex/VariantFile.hs2
-rw-r--r--Annex/Version.hs2
-rw-r--r--Annex/View.hs2
-rw-r--r--Annex/View/ViewedFile.hs2
-rw-r--r--Annex/Wanted.hs2
-rw-r--r--Assistant.hs2
-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
-rw-r--r--Backend.hs2
-rw-r--r--Backend/Hash.hs2
-rw-r--r--Backend/URL.hs2
-rw-r--r--Backend/Utilities.hs2
-rw-r--r--Backend/WORM.hs2
-rw-r--r--Build/BundledPrograms.hs2
-rw-r--r--Build/DesktopFile.hs2
-rw-r--r--Build/EvilLinker.hs2
-rw-r--r--Build/EvilSplicer.hs2
-rw-r--r--Build/InstallDesktopFile.hs2
-rw-r--r--Build/LinuxMkLibs.hs2
-rw-r--r--Build/NullSoftInstaller.hs2
-rw-r--r--Build/OSXMkLibs.hs2
-rw-r--r--Build/Standalone.hs2
-rw-r--r--BuildFlags.hs2
-rw-r--r--Checks.hs2
-rw-r--r--CmdLine.hs2
-rw-r--r--CmdLine/Action.hs2
-rw-r--r--CmdLine/GitAnnex.hs2
-rw-r--r--CmdLine/GitAnnex/Options.hs2
-rw-r--r--CmdLine/GitAnnexShell.hs2
-rw-r--r--CmdLine/GitAnnexShell/Fields.hs2
-rw-r--r--CmdLine/Option.hs2
-rw-r--r--CmdLine/Seek.hs2
-rw-r--r--CmdLine/Usage.hs2
-rw-r--r--Command.hs2
-rw-r--r--Command/Add.hs2
-rw-r--r--Command/AddUnused.hs2
-rw-r--r--Command/AddUrl.hs2
-rw-r--r--Command/Assistant.hs2
-rw-r--r--Command/Commit.hs2
-rw-r--r--Command/ConfigList.hs2
-rw-r--r--Command/Copy.hs2
-rw-r--r--Command/Dead.hs2
-rw-r--r--Command/Describe.hs2
-rw-r--r--Command/DiffDriver.hs2
-rw-r--r--Command/Direct.hs2
-rw-r--r--Command/Drop.hs2
-rw-r--r--Command/DropKey.hs2
-rw-r--r--Command/DropUnused.hs2
-rw-r--r--Command/EnableRemote.hs2
-rw-r--r--Command/ExamineKey.hs2
-rw-r--r--Command/Find.hs2
-rw-r--r--Command/FindRef.hs2
-rw-r--r--Command/Fix.hs2
-rw-r--r--Command/Forget.hs2
-rw-r--r--Command/FromKey.hs2
-rw-r--r--Command/Fsck.hs2
-rw-r--r--Command/FuzzTest.hs2
-rw-r--r--Command/GCryptSetup.hs2
-rw-r--r--Command/Get.hs2
-rw-r--r--Command/Group.hs2
-rw-r--r--Command/Help.hs2
-rw-r--r--Command/Import.hs2
-rw-r--r--Command/ImportFeed.hs2
-rw-r--r--Command/InAnnex.hs2
-rw-r--r--Command/Indirect.hs2
-rw-r--r--Command/Info.hs2
-rw-r--r--Command/Init.hs2
-rw-r--r--Command/InitRemote.hs2
-rw-r--r--Command/List.hs2
-rw-r--r--Command/Lock.hs2
-rw-r--r--Command/Log.hs2
-rw-r--r--Command/LookupKey.hs2
-rw-r--r--Command/Map.hs2
-rw-r--r--Command/Merge.hs2
-rw-r--r--Command/MetaData.hs2
-rw-r--r--Command/Migrate.hs2
-rw-r--r--Command/Mirror.hs2
-rw-r--r--Command/Move.hs2
-rw-r--r--Command/NotifyChanges.hs2
-rw-r--r--Command/NumCopies.hs2
-rw-r--r--Command/PreCommit.hs2
-rw-r--r--Command/Proxy.hs2
-rw-r--r--Command/ReKey.hs2
-rw-r--r--Command/RecvKey.hs2
-rw-r--r--Command/Reinit.hs2
-rw-r--r--Command/Reinject.hs2
-rw-r--r--Command/RemoteDaemon.hs2
-rw-r--r--Command/Repair.hs2
-rw-r--r--Command/ResolveMerge.hs2
-rw-r--r--Command/RmUrl.hs2
-rw-r--r--Command/Schedule.hs2
-rw-r--r--Command/Semitrust.hs2
-rw-r--r--Command/SendKey.hs2
-rw-r--r--Command/SetPresentKey.hs2
-rw-r--r--Command/Status.hs2
-rw-r--r--Command/Sync.hs2
-rw-r--r--Command/Test.hs2
-rw-r--r--Command/TestRemote.hs2
-rw-r--r--Command/TransferInfo.hs2
-rw-r--r--Command/TransferKey.hs2
-rw-r--r--Command/TransferKeys.hs2
-rw-r--r--Command/Trust.hs2
-rw-r--r--Command/Unannex.hs2
-rw-r--r--Command/Undo.hs2
-rw-r--r--Command/Ungroup.hs2
-rw-r--r--Command/Uninit.hs2
-rw-r--r--Command/Unlock.hs2
-rw-r--r--Command/Untrust.hs2
-rw-r--r--Command/Unused.hs2
-rw-r--r--Command/Upgrade.hs2
-rw-r--r--Command/VAdd.hs2
-rw-r--r--Command/VCycle.hs2
-rw-r--r--Command/VFilter.hs2
-rw-r--r--Command/VPop.hs2
-rw-r--r--Command/Version.hs2
-rw-r--r--Command/Vicfg.hs2
-rw-r--r--Command/View.hs2
-rw-r--r--Command/Wanted.hs2
-rw-r--r--Command/Watch.hs2
-rw-r--r--Command/WebApp.hs2
-rw-r--r--Command/Whereis.hs2
-rw-r--r--Command/XMPPGit.hs2
-rw-r--r--Config.hs2
-rw-r--r--Config/Cost.hs2
-rw-r--r--Config/Files.hs2
-rw-r--r--Config/NumCopies.hs2
-rw-r--r--Creds.hs2
-rw-r--r--Crypto.hs2
-rw-r--r--Git.hs2
-rw-r--r--Git/AutoCorrect.hs2
-rw-r--r--Git/Branch.hs2
-rw-r--r--Git/BuildVersion.hs2
-rw-r--r--Git/CatFile.hs2
-rw-r--r--Git/CheckAttr.hs2
-rw-r--r--Git/CheckIgnore.hs2
-rw-r--r--Git/Command.hs2
-rw-r--r--Git/Command/Batch.hs2
-rw-r--r--Git/Config.hs2
-rw-r--r--Git/Construct.hs2
-rw-r--r--Git/CurrentRepo.hs2
-rw-r--r--Git/DiffTree.hs2
-rw-r--r--Git/DiffTreeItem.hs2
-rw-r--r--Git/FileMode.hs2
-rw-r--r--Git/FilePath.hs2
-rw-r--r--Git/Filename.hs2
-rw-r--r--Git/Fsck.hs2
-rw-r--r--Git/GCrypt.hs2
-rw-r--r--Git/HashObject.hs2
-rw-r--r--Git/Hook.hs2
-rw-r--r--Git/Index.hs2
-rw-r--r--Git/LsFiles.hs2
-rw-r--r--Git/LsTree.hs2
-rw-r--r--Git/Merge.hs2
-rw-r--r--Git/Objects.hs2
-rw-r--r--Git/Queue.hs2
-rw-r--r--Git/Ref.hs2
-rw-r--r--Git/RefLog.hs2
-rw-r--r--Git/Remote.hs2
-rw-r--r--Git/Remote/Remove.hs2
-rw-r--r--Git/Repair.hs2
-rw-r--r--Git/Sha.hs2
-rw-r--r--Git/SharedRepository.hs2
-rw-r--r--Git/Types.hs2
-rw-r--r--Git/UnionMerge.hs2
-rw-r--r--Git/UpdateIndex.hs2
-rw-r--r--Git/Url.hs2
-rw-r--r--Git/Version.hs2
-rw-r--r--Limit.hs2
-rw-r--r--Limit/Wanted.hs2
-rw-r--r--Locations.hs2
-rw-r--r--Logs.hs2
-rw-r--r--Logs/Chunk.hs2
-rw-r--r--Logs/Chunk/Pure.hs2
-rw-r--r--Logs/FsckResults.hs2
-rw-r--r--Logs/Group.hs2
-rw-r--r--Logs/Location.hs2
-rw-r--r--Logs/MapLog.hs2
-rw-r--r--Logs/MetaData.hs2
-rw-r--r--Logs/NumCopies.hs2
-rw-r--r--Logs/PreferredContent.hs2
-rw-r--r--Logs/PreferredContent/Raw.hs2
-rw-r--r--Logs/Presence.hs2
-rw-r--r--Logs/Presence/Pure.hs2
-rw-r--r--Logs/Remote.hs2
-rw-r--r--Logs/RemoteState.hs2
-rw-r--r--Logs/Schedule.hs2
-rw-r--r--Logs/SingleValue.hs2
-rw-r--r--Logs/Transfer.hs2
-rw-r--r--Logs/Transitions.hs2
-rw-r--r--Logs/Trust.hs2
-rw-r--r--Logs/Trust/Basic.hs2
-rw-r--r--Logs/Trust/Pure.hs2
-rw-r--r--Logs/UUID.hs2
-rw-r--r--Logs/UUIDBased.hs2
-rw-r--r--Logs/Unused.hs2
-rw-r--r--Logs/View.hs2
-rw-r--r--Logs/Web.hs2
-rw-r--r--Messages.hs2
-rw-r--r--Messages/JSON.hs2
-rw-r--r--Remote.hs2
-rw-r--r--Remote/BitTorrent.hs2
-rw-r--r--Remote/Bup.hs2
-rw-r--r--Remote/Ddar.hs2
-rw-r--r--Remote/Directory.hs2
-rw-r--r--Remote/Directory/LegacyChunked.hs2
-rw-r--r--Remote/External.hs2
-rw-r--r--Remote/External/Types.hs2
-rw-r--r--Remote/GCrypt.hs2
-rw-r--r--Remote/Git.hs2
-rw-r--r--Remote/Glacier.hs2
-rw-r--r--Remote/Helper/AWS.hs2
-rw-r--r--Remote/Helper/Chunked.hs2
-rw-r--r--Remote/Helper/Chunked/Legacy.hs2
-rw-r--r--Remote/Helper/Encryptable.hs2
-rw-r--r--Remote/Helper/Git.hs2
-rw-r--r--Remote/Helper/Hooks.hs2
-rw-r--r--Remote/Helper/Http.hs2
-rw-r--r--Remote/Helper/Messages.hs2
-rw-r--r--Remote/Helper/ReadOnly.hs2
-rw-r--r--Remote/Helper/Special.hs2
-rw-r--r--Remote/Helper/Ssh.hs2
-rw-r--r--Remote/Hook.hs2
-rw-r--r--Remote/List.hs2
-rw-r--r--Remote/Rsync.hs2
-rw-r--r--Remote/Rsync/RsyncUrl.hs2
-rw-r--r--Remote/S3.hs2
-rw-r--r--Remote/Tahoe.hs2
-rw-r--r--Remote/Web.hs2
-rw-r--r--Remote/WebDAV.hs2
-rw-r--r--Remote/WebDAV/DavLocation.hs2
-rw-r--r--RemoteDaemon/Common.hs2
-rw-r--r--RemoteDaemon/Core.hs2
-rw-r--r--RemoteDaemon/Transport.hs2
-rw-r--r--RemoteDaemon/Transport/Ssh.hs2
-rw-r--r--RemoteDaemon/Transport/Ssh/Types.hs2
-rw-r--r--RemoteDaemon/Types.hs2
-rw-r--r--Test.hs2
-rw-r--r--Types.hs2
-rw-r--r--Types/Availability.hs2
-rw-r--r--Types/Backend.hs2
-rw-r--r--Types/BranchState.hs2
-rw-r--r--Types/CleanupActions.hs2
-rw-r--r--Types/Command.hs2
-rw-r--r--Types/Creds.hs2
-rw-r--r--Types/Crypto.hs2
-rw-r--r--Types/DesktopNotify.hs2
-rw-r--r--Types/Distribution.hs2
-rw-r--r--Types/FileMatcher.hs2
-rw-r--r--Types/GitConfig.hs2
-rw-r--r--Types/Group.hs2
-rw-r--r--Types/Key.hs2
-rw-r--r--Types/KeySource.hs2
-rw-r--r--Types/LockPool.hs2
-rw-r--r--Types/Messages.hs2
-rw-r--r--Types/MetaData.hs2
-rw-r--r--Types/NumCopies.hs2
-rw-r--r--Types/Option.hs2
-rw-r--r--Types/Remote.hs2
-rw-r--r--Types/ScheduledActivity.hs2
-rw-r--r--Types/StandardGroups.hs2
-rw-r--r--Types/StoreRetrieve.hs2
-rw-r--r--Types/TrustLevel.hs2
-rw-r--r--Types/UUID.hs2
-rw-r--r--Types/UrlContents.hs2
-rw-r--r--Types/View.hs2
-rw-r--r--Upgrade.hs2
-rw-r--r--Upgrade/V0.hs2
-rw-r--r--Upgrade/V1.hs2
-rw-r--r--Upgrade/V2.hs2
-rw-r--r--Upgrade/V3.hs2
-rw-r--r--Upgrade/V4.hs2
-rw-r--r--Utility/Applicative.hs2
-rw-r--r--Utility/Base64.hs2
-rw-r--r--Utility/Batch.hs2
-rw-r--r--Utility/Bloom.hs2
-rw-r--r--Utility/CoProcess.hs2
-rw-r--r--Utility/CopyFile.hs2
-rw-r--r--Utility/DBus.hs2
-rw-r--r--Utility/Daemon.hs2
-rw-r--r--Utility/Data.hs2
-rw-r--r--Utility/DataUnits.hs2
-rw-r--r--Utility/DirWatcher.hs2
-rw-r--r--Utility/DirWatcher/FSEvents.hs2
-rw-r--r--Utility/DirWatcher/INotify.hs2
-rw-r--r--Utility/DirWatcher/Kqueue.hs2
-rw-r--r--Utility/DirWatcher/Types.hs2
-rw-r--r--Utility/DirWatcher/Win32Notify.hs2
-rw-r--r--Utility/Directory.hs2
-rw-r--r--Utility/DiskFree.hs2
-rw-r--r--Utility/Dot.hs2
-rw-r--r--Utility/DottedVersion.hs2
-rw-r--r--Utility/Env.hs2
-rw-r--r--Utility/Exception.hs2
-rw-r--r--Utility/ExternalSHA.hs2
-rw-r--r--Utility/FileMode.hs2
-rw-r--r--Utility/FileSystemEncoding.hs2
-rw-r--r--Utility/Format.hs2
-rw-r--r--Utility/FreeDesktop.hs2
-rw-r--r--Utility/Glob.hs2
-rw-r--r--Utility/Gpg.hs2
-rw-r--r--Utility/HumanNumber.hs2
-rw-r--r--Utility/HumanTime.hs2
-rw-r--r--Utility/InodeCache.hs2
-rw-r--r--Utility/JSONStream.hs2
-rw-r--r--Utility/LinuxMkLibs.hs2
-rw-r--r--Utility/LockFile.hs2
-rw-r--r--Utility/LockFile/Posix.hs2
-rw-r--r--Utility/LockFile/Windows.hs2
-rw-r--r--Utility/LogFile.hs2
-rw-r--r--Utility/Lsof.hs2
-rw-r--r--Utility/Matcher.hs2
-rw-r--r--Utility/Metered.hs2
-rw-r--r--Utility/Misc.hs2
-rw-r--r--Utility/Monad.hs2
-rw-r--r--Utility/Mounts.hsc2
-rw-r--r--Utility/Network.hs2
-rw-r--r--Utility/NotificationBroadcaster.hs2
-rw-r--r--Utility/OSX.hs2
-rw-r--r--Utility/PID.hs2
-rw-r--r--Utility/Parallel.hs2
-rw-r--r--Utility/Path.hs2
-rw-r--r--Utility/Percentage.hs2
-rw-r--r--Utility/PosixFiles.hs2
-rw-r--r--Utility/QuickCheck.hs2
-rw-r--r--Utility/Quvi.hs2
-rw-r--r--Utility/Rsync.hs2
-rw-r--r--Utility/SRV.hs2
-rw-r--r--Utility/SafeCommand.hs2
-rw-r--r--Utility/Scheduled.hs2
-rw-r--r--Utility/Shell.hs2
-rw-r--r--Utility/SimpleProtocol.hs2
-rw-r--r--Utility/SshConfig.hs2
-rw-r--r--Utility/TList.hs2
-rw-r--r--Utility/Tense.hs2
-rw-r--r--Utility/ThreadLock.hs2
-rw-r--r--Utility/ThreadScheduler.hs2
-rw-r--r--Utility/Tmp.hs2
-rw-r--r--Utility/Touch.hsc2
-rw-r--r--Utility/URI.hs2
-rw-r--r--Utility/Url.hs2
-rw-r--r--Utility/UserInfo.hs2
-rw-r--r--Utility/Verifiable.hs2
-rw-r--r--Utility/WebApp.hs2
-rw-r--r--Utility/WinProcess.hs2
-rw-r--r--Utility/Yesod.hs2
-rw-r--r--Utility/libdiskfree.c2
-rw-r--r--Utility/libkqueue.c2
-rw-r--r--Utility/libmounts.c2
-rw-r--r--debian/copyright18
-rw-r--r--doc/contact.mdwn2
-rw-r--r--doc/encryption.mdwn2
-rw-r--r--doc/forum/example_of_massively_disconnected_operation.mdwn2
-rw-r--r--doc/git-annex-shell.mdwn2
-rw-r--r--doc/git-annex.mdwn2
-rw-r--r--doc/git-union-merge.mdwn2
-rw-r--r--doc/special_remotes/rsync.mdwn4
-rw-r--r--doc/special_remotes/webdav.mdwn2
-rw-r--r--doc/thanks.mdwn2
-rw-r--r--doc/tips/using_box.com_as_a_special_remote.mdwn2
-rw-r--r--doc/users/joey.mdwn4
-rw-r--r--git-annex.cabal2
-rw-r--r--git-annex.hs2
-rw-r--r--git-union-merge.hs2
473 files changed, 485 insertions, 485 deletions
diff --git a/.mailmap b/.mailmap
index 46423bd59..032707e4b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
-Joey Hess <joey@kitenet.net> http://joey.kitenet.net/ <joey@web>
-Joey Hess <joey@kitenet.net> http://joeyh.name/ <joey@web>
-Joey Hess <joey@kitenet.net> http://joeyh.name/ <http://joeyh.name/@web>
+Joey Hess <id@joeyh.name> http://joey.kitenet.net/ <joey@web>
+Joey Hess <id@joeyh.name> http://joeyh.name/ <joey@web>
+Joey Hess <id@joeyh.name> http://joeyh.name/ <http://joeyh.name/@web>
Yaroslav Halchenko <debian@onerussian.com>
Yaroslav Halchenko <debian@onerussian.com> http://yarikoptic.myopenid.com/ <site-myopenid@web>
Yaroslav Halchenko <debian@onerussian.com> https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY <Yaroslav@web>
diff --git a/Annex.hs b/Annex.hs
index 50c852526..f85c7e0f2 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -1,6 +1,6 @@
{- git-annex monad
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs
index c19011e2d..92cccc004 100644
--- a/Annex/AutoMerge.hs
+++ b/Annex/AutoMerge.hs
@@ -1,6 +1,6 @@
{- git-annex automatic merge conflict resolution
-
- - 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/Annex/Branch.hs b/Annex/Branch.hs
index f5c490212..2191ec263 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -1,6 +1,6 @@
{- management of the git-annex branch
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs
index 9d306fe80..a9c7daa20 100644
--- a/Annex/Branch/Transitions.hs
+++ b/Annex/Branch/Transitions.hs
@@ -1,6 +1,6 @@
{- git-annex branch transitions
-
- - 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/Annex/BranchState.hs b/Annex/BranchState.hs
index 9b2f9a04c..889a936b9 100644
--- a/Annex/BranchState.hs
+++ b/Annex/BranchState.hs
@@ -2,7 +2,7 @@
-
- Runtime state about the git-annex branch.
-
- - Copyright 2011-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index 8a6f10def..179149844 100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
@@ -1,6 +1,6 @@
{- git cat-file interface, with handle automatically stored in the Annex monad
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/CheckAttr.hs b/Annex/CheckAttr.hs
index 8eed9e804..46c71fe72 100644
--- a/Annex/CheckAttr.hs
+++ b/Annex/CheckAttr.hs
@@ -1,6 +1,6 @@
{- git check-attr interface, with handle automatically stored in the Annex 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/Annex/CheckIgnore.hs b/Annex/CheckIgnore.hs
index f2ed93543..8d7df1e2c 100644
--- a/Annex/CheckIgnore.hs
+++ b/Annex/CheckIgnore.hs
@@ -1,7 +1,7 @@
{- git check-ignore interface, with handle automatically stored in
- the Annex monad
-
- - 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/Annex/Content.hs b/Annex/Content.hs
index 60daaab90..73f27fd28 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -1,6 +1,6 @@
{- git-annex file content managing
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 4392b5198..e6a9b5eda 100644
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -1,6 +1,6 @@
{- git-annex file content managing for direct mode
-
- - 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/Annex/Direct.hs b/Annex/Direct.hs
index 998849ad3..06d0342c1 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -1,6 +1,6 @@
{- git-annex direct mode
-
- - 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/Annex/Direct/Fixup.hs b/Annex/Direct/Fixup.hs
index 13485242a..793f92eaf 100644
--- a/Annex/Direct/Fixup.hs
+++ b/Annex/Direct/Fixup.hs
@@ -1,6 +1,6 @@
{- git-annex direct mode guard fixup
-
- - 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/Annex/Drop.hs b/Annex/Drop.hs
index c5a3fbe5f..6f3b95615 100644
--- a/Annex/Drop.hs
+++ b/Annex/Drop.hs
@@ -1,6 +1,6 @@
{- dropping of unwanted content
-
- - 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/Annex/Environment.hs b/Annex/Environment.hs
index ffdd07157..13b52aa75 100644
--- a/Annex/Environment.hs
+++ b/Annex/Environment.hs
@@ -1,6 +1,6 @@
{- git-annex environment
-
- - 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/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index 856c68122..c6a729a9c 100644
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -1,6 +1,6 @@
{- git-annex file matching
-
- - 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/Annex/Hook.hs b/Annex/Hook.hs
index 44542c12d..253c77a60 100644
--- a/Annex/Hook.hs
+++ b/Annex/Hook.hs
@@ -4,7 +4,7 @@
- not change, otherwise removing old hooks using an old version of
- the script would fail.
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Index.hs b/Annex/Index.hs
index 7757a412b..60340c50b 100644
--- a/Annex/Index.hs
+++ b/Annex/Index.hs
@@ -1,6 +1,6 @@
{- Using other git index 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/Annex/Init.hs b/Annex/Init.hs
index b335d10d3..6947ea119 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -1,6 +1,6 @@
{- git-annex repository initialization
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Journal.hs b/Annex/Journal.hs
index 798bcba29..148cefbbc 100644
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
@@ -4,7 +4,7 @@
- git-annex branch. Among other things, it ensures that if git-annex is
- interrupted, its recorded data is not lost.
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Link.hs b/Annex/Link.hs
index e50b97447..98b200f0a 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -5,7 +5,7 @@
- On other filesystems, git instead stores the symlink target in a regular
- file.
-
- - 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/Annex/LockFile.hs b/Annex/LockFile.hs
index 75047e005..18e876c75 100644
--- a/Annex/LockFile.hs
+++ b/Annex/LockFile.hs
@@ -1,6 +1,6 @@
{- git-annex lock files.
-
- - 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/Annex/MakeRepo.hs b/Annex/MakeRepo.hs
index a1f797a76..73443c43d 100644
--- a/Annex/MakeRepo.hs
+++ b/Annex/MakeRepo.hs
@@ -1,6 +1,6 @@
{- making local repositories (used by webapp mostly)
-
- - 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/Annex/MetaData.hs b/Annex/MetaData.hs
index 22e9e7e50..3b776a6d7 100644
--- a/Annex/MetaData.hs
+++ b/Annex/MetaData.hs
@@ -1,6 +1,6 @@
{- git-annex metadata
-
- - 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/Annex/MetaData/StandardFields.hs b/Annex/MetaData/StandardFields.hs
index d41fb1506..c91b53930 100644
--- a/Annex/MetaData/StandardFields.hs
+++ b/Annex/MetaData/StandardFields.hs
@@ -1,6 +1,6 @@
{- git-annex metadata, standard fields
-
- - 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/Annex/Notification.hs b/Annex/Notification.hs
index 608bda7e2..25f1ee678 100644
--- a/Annex/Notification.hs
+++ b/Annex/Notification.hs
@@ -1,6 +1,6 @@
{- git-annex desktop notifications
-
- - 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/Annex/Path.hs b/Annex/Path.hs
index a8c4907b2..6186a887b 100644
--- a/Annex/Path.hs
+++ b/Annex/Path.hs
@@ -1,6 +1,6 @@
{- git-annex program path
-
- - 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/Annex/Perms.hs b/Annex/Perms.hs
index 3430554c7..3ae351d8c 100644
--- a/Annex/Perms.hs
+++ b/Annex/Perms.hs
@@ -1,6 +1,6 @@
{- git-annex file permissions
-
- - 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/Annex/Queue.hs b/Annex/Queue.hs
index a5ef60037..47837e2d9 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -1,6 +1,6 @@
{- git-annex command queue
-
- - Copyright 2011, 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011, 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Quvi.hs b/Annex/Quvi.hs
index 1a2edf6b8..8d4591b48 100644
--- a/Annex/Quvi.hs
+++ b/Annex/Quvi.hs
@@ -1,6 +1,6 @@
{- quvi options for git-annex
-
- - 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/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs
index 0355ddd51..1144ba083 100644
--- a/Annex/ReplaceFile.hs
+++ b/Annex/ReplaceFile.hs
@@ -1,6 +1,6 @@
{- git-annex file replacing
-
- - 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/Annex/Ssh.hs b/Annex/Ssh.hs
index 15b169862..84637fd3d 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -1,6 +1,6 @@
{- git-annex ssh interface, with connection caching
-
- - 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/Annex/TaggedPush.hs b/Annex/TaggedPush.hs
index a31758022..642d4db0b 100644
--- a/Annex/TaggedPush.hs
+++ b/Annex/TaggedPush.hs
@@ -1,6 +1,6 @@
{- git-annex tagged pushes
-
- - 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/Annex/Transfer.hs b/Annex/Transfer.hs
index 1603974ff..2723b2351 100644
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -1,6 +1,6 @@
{- git-annex transfers
-
- - 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/Annex/UUID.hs b/Annex/UUID.hs
index ec642a0fe..7776b778a 100644
--- a/Annex/UUID.hs
+++ b/Annex/UUID.hs
@@ -6,7 +6,7 @@
- UUIDs of remotes are cached in git config, using keys named
- remote.<name>.annex-uuid
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Url.hs b/Annex/Url.hs
index 736905d33..b1a932e62 100644
--- a/Annex/Url.hs
+++ b/Annex/Url.hs
@@ -1,7 +1,7 @@
{- Url downloading, with git-annex user agent and configured http
- headers and wget/curl options.
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/VariantFile.hs b/Annex/VariantFile.hs
index 7c849c59f..89cfbc16a 100644
--- a/Annex/VariantFile.hs
+++ b/Annex/VariantFile.hs
@@ -1,6 +1,6 @@
{- git-annex .variant files for automatic merge conflict resolution
-
- - 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/Annex/Version.hs b/Annex/Version.hs
index 2a75a1c55..d08f994e9 100644
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -1,6 +1,6 @@
{- git-annex repository versioning
-
- - Copyright 2010,2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/View.hs b/Annex/View.hs
index e148203c2..3a9168f6c 100644
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -1,6 +1,6 @@
{- metadata based branch views
-
- - 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/Annex/View/ViewedFile.hs b/Annex/View/ViewedFile.hs
index 0b963fcd5..0acba235a 100644
--- a/Annex/View/ViewedFile.hs
+++ b/Annex/View/ViewedFile.hs
@@ -1,6 +1,6 @@
{- filenames (not paths) used in views
-
- - 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/Annex/Wanted.hs b/Annex/Wanted.hs
index 42f813bbb..87b4377c2 100644
--- a/Annex/Wanted.hs
+++ b/Annex/Wanted.hs
@@ -1,6 +1,6 @@
{- git-annex checking whether content is wanted
-
- - 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.hs b/Assistant.hs
index 2ba778d80..e49924928 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -1,6 +1,6 @@
{- git-annex assistant daemon
-
- - 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/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.
-}
diff --git a/Backend.hs b/Backend.hs
index 0fcaaa7ed..922d0c2a7 100644
--- a/Backend.hs
+++ b/Backend.hs
@@ -1,6 +1,6 @@
{- git-annex key/value backends
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Backend/Hash.hs b/Backend/Hash.hs
index 8ddccd229..82763a9be 100644
--- a/Backend/Hash.hs
+++ b/Backend/Hash.hs
@@ -1,6 +1,6 @@
{- git-tnnex hashing backends
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Backend/URL.hs b/Backend/URL.hs
index ac517a5f3..8ec270e95 100644
--- a/Backend/URL.hs
+++ b/Backend/URL.hs
@@ -1,6 +1,6 @@
{- git-annex "URL" backend -- keys whose content is available from urls.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Backend/Utilities.hs b/Backend/Utilities.hs
index 6426353e7..4c1f70eda 100644
--- a/Backend/Utilities.hs
+++ b/Backend/Utilities.hs
@@ -1,6 +1,6 @@
{- git-annex backend 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/Backend/WORM.hs b/Backend/WORM.hs
index 24dba5795..59f9a7354 100644
--- a/Backend/WORM.hs
+++ b/Backend/WORM.hs
@@ -1,6 +1,6 @@
{- git-annex "WORM" backend -- Write Once, Read Many
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index d5cf3ee7b..1e826cb10 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -1,6 +1,6 @@
{- Bundled programs
-
- - 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/Build/DesktopFile.hs b/Build/DesktopFile.hs
index 6a5838f81..6e70b0d5f 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -1,7 +1,7 @@
{- Generating and installing a desktop menu entry file and icon,
- and a desktop autostart file. (And OSX equivilants.)
-
- - 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/Build/EvilLinker.hs b/Build/EvilLinker.hs
index e2921cc8c..d1b0cc746 100644
--- a/Build/EvilLinker.hs
+++ b/Build/EvilLinker.hs
@@ -3,7 +3,7 @@
-
- See https://ghc.haskell.org/trac/ghc/ticket/8596
-
- - 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/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index fc41c624f..1fd64670b 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -23,7 +23,7 @@
- need modifications to compile.
-
-
- - 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/Build/InstallDesktopFile.hs b/Build/InstallDesktopFile.hs
index c8a3f07f5..d6a94adde 100644
--- a/Build/InstallDesktopFile.hs
+++ b/Build/InstallDesktopFile.hs
@@ -1,7 +1,7 @@
{- Generating and installing a desktop menu entry file and icon,
- and a desktop autostart file. (And OSX equivilants.)
-
- - 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/Build/LinuxMkLibs.hs b/Build/LinuxMkLibs.hs
index 1ca2fa651..3fb757a22 100644
--- a/Build/LinuxMkLibs.hs
+++ b/Build/LinuxMkLibs.hs
@@ -1,6 +1,6 @@
{- Linux library copier and binary shimmer
-
- - 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/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index bc94e60cd..554681d9d 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -11,7 +11,7 @@
- exception of git. The user needs to install git separately,
- and the installer checks for that.
-
- - 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/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index ef668bb4a..9622bcb14 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -1,6 +1,6 @@
{- OSX library copier
-
- - 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/Build/Standalone.hs b/Build/Standalone.hs
index da030933d..2a6c04e6d 100644
--- a/Build/Standalone.hs
+++ b/Build/Standalone.hs
@@ -1,6 +1,6 @@
{- Makes standalone bundle.
-
- - 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/BuildFlags.hs b/BuildFlags.hs
index b29c83c1f..168085749 100644
--- a/BuildFlags.hs
+++ b/BuildFlags.hs
@@ -1,6 +1,6 @@
{- git-annex build flags reporting
-
- - 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/Checks.hs b/Checks.hs
index 831c0a009..e344cef2d 100644
--- a/Checks.hs
+++ b/Checks.hs
@@ -3,7 +3,7 @@
- Common sanity checks for commands, and an interface to selectively
- remove them, or add others.
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine.hs b/CmdLine.hs
index 1d93855ce..cd7a1a986 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -1,6 +1,6 @@
{- git-annex command line parsing and dispatch
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs
index 65cdbec14..57e1fa60b 100644
--- a/CmdLine/Action.hs
+++ b/CmdLine/Action.hs
@@ -1,6 +1,6 @@
{- git-annex command-line actions
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs
index 6903ea1a8..cbae7d486 100644
--- a/CmdLine/GitAnnex.hs
+++ b/CmdLine/GitAnnex.hs
@@ -1,6 +1,6 @@
{- git-annex main program
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index f9f5989ee..aaa77c92c 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -1,6 +1,6 @@
{- git-annex options
-
- - Copyright 2010, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index 21284f400..b1b351e3b 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/CmdLine/GitAnnexShell.hs
@@ -1,6 +1,6 @@
{- git-annex-shell main program
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/GitAnnexShell/Fields.hs b/CmdLine/GitAnnexShell/Fields.hs
index 4f208773b..93b048040 100644
--- a/CmdLine/GitAnnexShell/Fields.hs
+++ b/CmdLine/GitAnnexShell/Fields.hs
@@ -1,6 +1,6 @@
{- git-annex-shell fields
-
- - 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/CmdLine/Option.hs b/CmdLine/Option.hs
index ce44d2ace..1c1331aab 100644
--- a/CmdLine/Option.hs
+++ b/CmdLine/Option.hs
@@ -1,6 +1,6 @@
{- common command-line options
-
- - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs
index 9a874807b..4a0bb299b 100644
--- a/CmdLine/Seek.hs
+++ b/CmdLine/Seek.hs
@@ -4,7 +4,7 @@
- the values a user passes to a command, and prepare actions operating
- on them.
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/CmdLine/Usage.hs b/CmdLine/Usage.hs
index 1998a5f54..82619a304 100644
--- a/CmdLine/Usage.hs
+++ b/CmdLine/Usage.hs
@@ -1,6 +1,6 @@
{- git-annex usage messages
-
- - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command.hs b/Command.hs
index fc440f291..56e895cae 100644
--- a/Command.hs
+++ b/Command.hs
@@ -1,6 +1,6 @@
{- git-annex command infrastructure
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Add.hs b/Command/Add.hs
index d745000f8..2671126ca 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/AddUnused.hs b/Command/AddUnused.hs
index 69dbefc17..4aab8d017 100644
--- a/Command/AddUnused.hs
+++ b/Command/AddUnused.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/AddUrl.hs b/Command/AddUrl.hs
index 97adc75ee..9e3aa31fb 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index 8341a5694..5bdf51682 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -1,6 +1,6 @@
{- 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/Command/Commit.hs b/Command/Commit.hs
index 1f2478ee5..73f9e2d5e 100644
--- a/Command/Commit.hs
+++ b/Command/Commit.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/ConfigList.hs b/Command/ConfigList.hs
index 7d8f1ea70..33b348b07 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Copy.hs b/Command/Copy.hs
index 23fa83a35..e5b093c61 100644
--- a/Command/Copy.hs
+++ b/Command/Copy.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Dead.hs b/Command/Dead.hs
index c19812b73..464db25f9 100644
--- a/Command/Dead.hs
+++ b/Command/Dead.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Describe.hs b/Command/Describe.hs
index 39a762c06..56a73334d 100644
--- a/Command/Describe.hs
+++ b/Command/Describe.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/DiffDriver.hs b/Command/DiffDriver.hs
index 41ccc26c2..fa4f49366 100644
--- a/Command/DiffDriver.hs
+++ b/Command/DiffDriver.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Direct.hs b/Command/Direct.hs
index 3493e103d..1a6b2cb05 100644
--- a/Command/Direct.hs
+++ b/Command/Direct.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Drop.hs b/Command/Drop.hs
index 3779b3459..6adc13ca5 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index ca20a1a64..890a79466 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/DropUnused.hs b/Command/DropUnused.hs
index b9bc2bef6..36ff49720 100644
--- a/Command/DropUnused.hs
+++ b/Command/DropUnused.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs
index 909f1ea2f..db3ec2b37 100644
--- a/Command/EnableRemote.hs
+++ b/Command/EnableRemote.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/ExamineKey.hs b/Command/ExamineKey.hs
index 94f84c5b5..00d4d3a95 100644
--- a/Command/ExamineKey.hs
+++ b/Command/ExamineKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Find.hs b/Command/Find.hs
index 5ca2191db..a52d17384 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/FindRef.hs b/Command/FindRef.hs
index a552e64e4..2e3d859fa 100644
--- a/Command/FindRef.hs
+++ b/Command/FindRef.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Fix.hs b/Command/Fix.hs
index 774ef8583..1ef15d0eb 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Forget.hs b/Command/Forget.hs
index 3ea64d5c9..94a1fb421 100644
--- a/Command/Forget.hs
+++ b/Command/Forget.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/FromKey.hs b/Command/FromKey.hs
index 3b20749fe..14a3d8176 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 5dad10127..46fe983d8 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/FuzzTest.hs b/Command/FuzzTest.hs
index 87bee963f..d6c9e1ac1 100644
--- a/Command/FuzzTest.hs
+++ b/Command/FuzzTest.hs
@@ -1,6 +1,6 @@
{- git-annex fuzz generator
-
- - 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/Command/GCryptSetup.hs b/Command/GCryptSetup.hs
index 77aadb22d..7a7f8ae50 100644
--- a/Command/GCryptSetup.hs
+++ b/Command/GCryptSetup.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Get.hs b/Command/Get.hs
index 2213e32fb..b1929a79c 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Group.hs b/Command/Group.hs
index e1420be88..820f6ab17 100644
--- a/Command/Group.hs
+++ b/Command/Group.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Help.hs b/Command/Help.hs
index fc1206e03..72913d7c4 100644
--- a/Command/Help.hs
+++ b/Command/Help.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Import.hs b/Command/Import.hs
index b20e63853..29c139eb6 100644
--- a/Command/Import.hs
+++ b/Command/Import.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/ImportFeed.hs b/Command/ImportFeed.hs
index c45fad961..b9d78d713 100644
--- a/Command/ImportFeed.hs
+++ b/Command/ImportFeed.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/InAnnex.hs b/Command/InAnnex.hs
index db48a1422..8e792c4bb 100644
--- a/Command/InAnnex.hs
+++ b/Command/InAnnex.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index a363981be..34a2ef8c9 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Info.hs b/Command/Info.hs
index 86b608928..0e66cbce2 100644
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Init.hs b/Command/Init.hs
index b921c0657..23203b035 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index 51ea15373..7831fe22a 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011,2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011,2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/List.hs b/Command/List.hs
index 98cb82311..bc4e3edec 100644
--- a/Command/List.hs
+++ b/Command/List.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
- Copyright 2013 Antoine Beaupré
-
- Licensed under the GNU GPL version 3 or higher.
diff --git a/Command/Lock.hs b/Command/Lock.hs
index f227ab380..574e747c4 100644
--- a/Command/Lock.hs
+++ b/Command/Lock.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Log.hs b/Command/Log.hs
index 11fd51eb8..7eaa48f70 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/LookupKey.hs b/Command/LookupKey.hs
index 202233233..0485232ae 100644
--- a/Command/LookupKey.hs
+++ b/Command/LookupKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Map.hs b/Command/Map.hs
index e15fd9c33..75af591d5 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Merge.hs b/Command/Merge.hs
index eeb151c27..28e3bbb4d 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/MetaData.hs b/Command/MetaData.hs
index 50b9b1f9a..095637959 100644
--- a/Command/MetaData.hs
+++ b/Command/MetaData.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Migrate.hs b/Command/Migrate.hs
index a7198c71f..9c7dec9ef 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Mirror.hs b/Command/Mirror.hs
index ec9ef92c3..558f906c5 100644
--- a/Command/Mirror.hs
+++ b/Command/Mirror.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Move.hs b/Command/Move.hs
index edb7ede7b..4a3633e8f 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/NotifyChanges.hs b/Command/NotifyChanges.hs
index 36997666d..7ec6072dd 100644
--- a/Command/NotifyChanges.hs
+++ b/Command/NotifyChanges.hs
@@ -1,6 +1,6 @@
{- git-annex-shell command
-
- - 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/Command/NumCopies.hs b/Command/NumCopies.hs
index 773e10b6a..6c69b2166 100644
--- a/Command/NumCopies.hs
+++ b/Command/NumCopies.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/PreCommit.hs b/Command/PreCommit.hs
index 91a972024..f4dcff269 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Proxy.hs b/Command/Proxy.hs
index c34b86c8e..59a6bf959 100644
--- a/Command/Proxy.hs
+++ b/Command/Proxy.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/ReKey.hs b/Command/ReKey.hs
index 5dadf4e60..980b27f5a 100644
--- a/Command/ReKey.hs
+++ b/Command/ReKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/RecvKey.hs b/Command/RecvKey.hs
index 424ca923d..8572596d2 100644
--- a/Command/RecvKey.hs
+++ b/Command/RecvKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Reinit.hs b/Command/Reinit.hs
index 6de7b9932..b1264effa 100644
--- a/Command/Reinit.hs
+++ b/Command/Reinit.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Reinject.hs b/Command/Reinject.hs
index a968f6f56..2c785feb6 100644
--- a/Command/Reinject.hs
+++ b/Command/Reinject.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/RemoteDaemon.hs b/Command/RemoteDaemon.hs
index 9f4cc884d..2e3d62555 100644
--- a/Command/RemoteDaemon.hs
+++ b/Command/RemoteDaemon.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Repair.hs b/Command/Repair.hs
index 8eb937ce5..d41a074c0 100644
--- a/Command/Repair.hs
+++ b/Command/Repair.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/ResolveMerge.hs b/Command/ResolveMerge.hs
index 145db37df..ce199e504 100644
--- a/Command/ResolveMerge.hs
+++ b/Command/ResolveMerge.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/RmUrl.hs b/Command/RmUrl.hs
index 514dcc689..5287718c5 100644
--- a/Command/RmUrl.hs
+++ b/Command/RmUrl.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Schedule.hs b/Command/Schedule.hs
index ce8b67da0..91ef2c138 100644
--- a/Command/Schedule.hs
+++ b/Command/Schedule.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Semitrust.hs b/Command/Semitrust.hs
index 146ec2192..49004d7f9 100644
--- a/Command/Semitrust.hs
+++ b/Command/Semitrust.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/SendKey.hs b/Command/SendKey.hs
index 90eca20bb..62b4edcba 100644
--- a/Command/SendKey.hs
+++ b/Command/SendKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/SetPresentKey.hs b/Command/SetPresentKey.hs
index 4e2cdc5a9..1c41dc2ae 100644
--- a/Command/SetPresentKey.hs
+++ b/Command/SetPresentKey.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Status.hs b/Command/Status.hs
index f49684258..26e96a925 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Sync.hs b/Command/Sync.hs
index 5ecd0745a..65a025606 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -1,7 +1,7 @@
{- git-annex command
-
- Copyright 2011 Joachim Breitner <mail@joachim-breitner.de>
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Test.hs b/Command/Test.hs
index 4d481369d..3c4251460 100644
--- a/Command/Test.hs
+++ b/Command/Test.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/TestRemote.hs b/Command/TestRemote.hs
index f0735e087..4a65aa4ec 100644
--- a/Command/TestRemote.hs
+++ b/Command/TestRemote.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/TransferInfo.hs b/Command/TransferInfo.hs
index ae7fbf033..f90e2ad73 100644
--- a/Command/TransferInfo.hs
+++ b/Command/TransferInfo.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/TransferKey.hs b/Command/TransferKey.hs
index 469e01322..55d6b95a1 100644
--- a/Command/TransferKey.hs
+++ b/Command/TransferKey.hs
@@ -1,6 +1,6 @@
{- git-annex plumbing command (for use by old assistant, and users)
-
- - 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/Command/TransferKeys.hs b/Command/TransferKeys.hs
index 346e413e6..990582196 100644
--- a/Command/TransferKeys.hs
+++ b/Command/TransferKeys.hs
@@ -1,6 +1,6 @@
{- git-annex command, used internally by assistant
-
- - 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/Command/Trust.hs b/Command/Trust.hs
index f02fcf617..9d380990e 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010, 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index e8cf70f51..a88b07c8b 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Undo.hs b/Command/Undo.hs
index d47251ab8..8e6b1c44f 100644
--- a/Command/Undo.hs
+++ b/Command/Undo.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Ungroup.hs b/Command/Ungroup.hs
index a26bd34a9..dd6e8c952 100644
--- a/Command/Ungroup.hs
+++ b/Command/Ungroup.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Uninit.hs b/Command/Uninit.hs
index ea4a3a9f6..28c169919 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Unlock.hs b/Command/Unlock.hs
index 56c4f1dc0..31bc1f2e2 100644
--- a/Command/Unlock.hs
+++ b/Command/Unlock.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Untrust.hs b/Command/Untrust.hs
index ecd0ae4cf..92e28b637 100644
--- a/Command/Untrust.hs
+++ b/Command/Untrust.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 1859856af..4bbde4da4 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 7e03ec3ee..081d7ff35 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/VAdd.hs b/Command/VAdd.hs
index 33614ae59..ea98e6639 100644
--- a/Command/VAdd.hs
+++ b/Command/VAdd.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/VCycle.hs b/Command/VCycle.hs
index eead9e022..f9a21892b 100644
--- a/Command/VCycle.hs
+++ b/Command/VCycle.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/VFilter.hs b/Command/VFilter.hs
index 320f28568..fd5ec9630 100644
--- a/Command/VFilter.hs
+++ b/Command/VFilter.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/VPop.hs b/Command/VPop.hs
index 5046b54b5..1fb1d7a56 100644
--- a/Command/VPop.hs
+++ b/Command/VPop.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Version.hs b/Command/Version.hs
index 255fd8188..c0c89af68 100644
--- a/Command/Version.hs
+++ b/Command/Version.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs
index 8fc10deb5..f1a64ba23 100644
--- a/Command/Vicfg.hs
+++ b/Command/Vicfg.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/View.hs b/Command/View.hs
index ae8fe824e..ae2878396 100644
--- a/Command/View.hs
+++ b/Command/View.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Wanted.hs b/Command/Wanted.hs
index 3f721e368..6b87e51d8 100644
--- a/Command/Wanted.hs
+++ b/Command/Wanted.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Command/Watch.hs b/Command/Watch.hs
index 2d25b54c3..2f82a7b7f 100644
--- a/Command/Watch.hs
+++ b/Command/Watch.hs
@@ -1,6 +1,6 @@
{- git-annex watch command
-
- - 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/Command/WebApp.hs b/Command/WebApp.hs
index 3a074218f..1c7bcfaa7 100644
--- a/Command/WebApp.hs
+++ b/Command/WebApp.hs
@@ -1,6 +1,6 @@
{- git-annex webapp launcher
-
- - 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/Command/Whereis.hs b/Command/Whereis.hs
index 314c204be..d612ce4f0 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Command/XMPPGit.hs b/Command/XMPPGit.hs
index ab238c85e..2bcb7405e 100644
--- a/Command/XMPPGit.hs
+++ b/Command/XMPPGit.hs
@@ -1,6 +1,6 @@
{- git-annex command
-
- - 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/Config.hs b/Config.hs
index 32644263f..57ced7821 100644
--- a/Config.hs
+++ b/Config.hs
@@ -1,6 +1,6 @@
{- Git configuration
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Config/Cost.hs b/Config/Cost.hs
index 44a26f064..026a90576 100644
--- a/Config/Cost.hs
+++ b/Config/Cost.hs
@@ -1,6 +1,6 @@
{- Remote costs.
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Config/Files.hs b/Config/Files.hs
index 8d5c1fd12..b503a5443 100644
--- a/Config/Files.hs
+++ b/Config/Files.hs
@@ -1,6 +1,6 @@
{- git-annex extra config files
-
- - 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/Config/NumCopies.hs b/Config/NumCopies.hs
index 26d81b8a4..b25e0818d 100644
--- a/Config/NumCopies.hs
+++ b/Config/NumCopies.hs
@@ -1,6 +1,6 @@
{- git-annex numcopies configuration
-
- - 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/Creds.hs b/Creds.hs
index 1f5c83570..765be5a17 100644
--- a/Creds.hs
+++ b/Creds.hs
@@ -1,6 +1,6 @@
{- Credentials storage
-
- - 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/Crypto.hs b/Crypto.hs
index 8d4d4f04f..c2076f461 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -3,7 +3,7 @@
- Currently using gpg; could later be modified to support different
- crypto backends if neccessary.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git.hs b/Git.hs
index c9750a3af..6e270815e 100644
--- a/Git.hs
+++ b/Git.hs
@@ -3,7 +3,7 @@
- This is written to be completely independant of git-annex and should be
- suitable for other uses.
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/AutoCorrect.hs b/Git/AutoCorrect.hs
index ecc64e036..7a9d78851 100644
--- a/Git/AutoCorrect.hs
+++ b/Git/AutoCorrect.hs
@@ -1,6 +1,6 @@
{- git autocorrection using Damerau-Levenshtein edit distance
-
- - 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/Git/Branch.hs b/Git/Branch.hs
index 5c6135d57..fd04f1f46 100644
--- a/Git/Branch.hs
+++ b/Git/Branch.hs
@@ -1,6 +1,6 @@
{- git branch stuff
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/BuildVersion.hs b/Git/BuildVersion.hs
index 832ee8ab7..50e4a3ae7 100644
--- a/Git/BuildVersion.hs
+++ b/Git/BuildVersion.hs
@@ -1,6 +1,6 @@
{- git build version
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/CatFile.hs b/Git/CatFile.hs
index d0bcef4fb..a1a0a0d28 100644
--- a/Git/CatFile.hs
+++ b/Git/CatFile.hs
@@ -1,6 +1,6 @@
{- git cat-file interface
-
- - Copyright 2011, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/CheckAttr.hs b/Git/CheckAttr.hs
index 430154116..21eeed493 100644
--- a/Git/CheckAttr.hs
+++ b/Git/CheckAttr.hs
@@ -1,6 +1,6 @@
{- git check-attr interface
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/CheckIgnore.hs b/Git/CheckIgnore.hs
index 2ab7cb3dc..5fa3cb637 100644
--- a/Git/CheckIgnore.hs
+++ b/Git/CheckIgnore.hs
@@ -1,6 +1,6 @@
{- git check-ignore interface
-
- - 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/Git/Command.hs b/Git/Command.hs
index 53b1d68fd..02e3e5a34 100644
--- a/Git/Command.hs
+++ b/Git/Command.hs
@@ -1,6 +1,6 @@
{- running git commands
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Command/Batch.hs b/Git/Command/Batch.hs
index 9cc176008..b2d6509b6 100644
--- a/Git/Command/Batch.hs
+++ b/Git/Command/Batch.hs
@@ -1,6 +1,6 @@
{- running batch git commands
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Config.hs b/Git/Config.hs
index 32c0dd1cc..15109319a 100644
--- a/Git/Config.hs
+++ b/Git/Config.hs
@@ -1,6 +1,6 @@
{- git repository configuration handling
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Construct.hs b/Git/Construct.hs
index 572c5eb37..a0632a223 100644
--- a/Git/Construct.hs
+++ b/Git/Construct.hs
@@ -1,6 +1,6 @@
{- Construction of Git Repo objects
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs
index f611f7a34..9de00034b 100644
--- a/Git/CurrentRepo.hs
+++ b/Git/CurrentRepo.hs
@@ -1,6 +1,6 @@
{- The current git repository.
-
- - 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/Git/DiffTree.hs b/Git/DiffTree.hs
index 3ea14a15f..5cdcc16bc 100644
--- a/Git/DiffTree.hs
+++ b/Git/DiffTree.hs
@@ -1,6 +1,6 @@
{- git diff-tree interface
-
- - 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/Git/DiffTreeItem.hs b/Git/DiffTreeItem.hs
index 2389b698a..859f590c1 100644
--- a/Git/DiffTreeItem.hs
+++ b/Git/DiffTreeItem.hs
@@ -1,6 +1,6 @@
{- git diff-tree item
-
- - 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/Git/FileMode.hs b/Git/FileMode.hs
index fc4d0264e..c3dfe570a 100644
--- a/Git/FileMode.hs
+++ b/Git/FileMode.hs
@@ -1,6 +1,6 @@
{- git file modes
-
- - 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/Git/FilePath.hs b/Git/FilePath.hs
index 88f315b1c..edc3c0f90 100644
--- a/Git/FilePath.hs
+++ b/Git/FilePath.hs
@@ -5,7 +5,7 @@
- top of the repository even when run in a subdirectory. Adding some
- types helps keep that straight.
-
- - 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/Git/Filename.hs b/Git/Filename.hs
index 5e076d3b5..382eb8d48 100644
--- a/Git/Filename.hs
+++ b/Git/Filename.hs
@@ -1,7 +1,7 @@
{- Some git commands output encoded filenames, in a rather annoyingly complex
- C-style encoding.
-
- - Copyright 2010, 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Fsck.hs b/Git/Fsck.hs
index c6002f681..f3e6db9f9 100644
--- a/Git/Fsck.hs
+++ b/Git/Fsck.hs
@@ -1,6 +1,6 @@
{- git fsck interface
-
- - 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/Git/GCrypt.hs b/Git/GCrypt.hs
index db067e25c..46da37257 100644
--- a/Git/GCrypt.hs
+++ b/Git/GCrypt.hs
@@ -2,7 +2,7 @@
-
- https://github.com/blake2-ppc/git-remote-gcrypt
-
- - 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/Git/HashObject.hs b/Git/HashObject.hs
index 8cd35167d..07c72d080 100644
--- a/Git/HashObject.hs
+++ b/Git/HashObject.hs
@@ -1,6 +1,6 @@
{- git hash-object interface
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Hook.hs b/Git/Hook.hs
index 0ea9fd1e7..aec2563f4 100644
--- a/Git/Hook.hs
+++ b/Git/Hook.hs
@@ -1,6 +1,6 @@
{- git hooks
-
- - Copyright 2013-2015 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2015 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Index.hs b/Git/Index.hs
index 7145bb943..551fd98d3 100644
--- a/Git/Index.hs
+++ b/Git/Index.hs
@@ -1,6 +1,6 @@
{- git index file stuff
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs
index 8d32ba7ef..c23c282d0 100644
--- a/Git/LsFiles.hs
+++ b/Git/LsFiles.hs
@@ -1,6 +1,6 @@
{- git ls-files interface
-
- - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/LsTree.hs b/Git/LsTree.hs
index ca5e323e0..7ef951807 100644
--- a/Git/LsTree.hs
+++ b/Git/LsTree.hs
@@ -1,6 +1,6 @@
{- git ls-tree interface
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Merge.hs b/Git/Merge.hs
index 12dfa7c1f..b3a048937 100644
--- a/Git/Merge.hs
+++ b/Git/Merge.hs
@@ -1,6 +1,6 @@
{- git merging
-
- - 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/Git/Objects.hs b/Git/Objects.hs
index dadd4f543..bda220b5e 100644
--- a/Git/Objects.hs
+++ b/Git/Objects.hs
@@ -1,6 +1,6 @@
{- .git/objects
-
- - 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/Git/Queue.hs b/Git/Queue.hs
index 9b87a18ea..d5c19cd95 100644
--- a/Git/Queue.hs
+++ b/Git/Queue.hs
@@ -1,6 +1,6 @@
{- git repository command queue
-
- - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Ref.hs b/Git/Ref.hs
index 3d0c68fb0..5ad7577ff 100644
--- a/Git/Ref.hs
+++ b/Git/Ref.hs
@@ -1,6 +1,6 @@
{- git ref stuff
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/RefLog.hs b/Git/RefLog.hs
index 98c9d66ff..f3a9dad38 100644
--- a/Git/RefLog.hs
+++ b/Git/RefLog.hs
@@ -1,6 +1,6 @@
{- git reflog interface
-
- - 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/Git/Remote.hs b/Git/Remote.hs
index 156e30891..717b54045 100644
--- a/Git/Remote.hs
+++ b/Git/Remote.hs
@@ -1,6 +1,6 @@
{- git remote stuff
-
- - 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/Git/Remote/Remove.hs b/Git/Remote/Remove.hs
index ab1da9cde..2ffc9b358 100644
--- a/Git/Remote/Remove.hs
+++ b/Git/Remote/Remove.hs
@@ -1,6 +1,6 @@
{- git remote stuff
-
- - 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/Git/Repair.hs b/Git/Repair.hs
index bee9f2b50..2557e3b83 100644
--- a/Git/Repair.hs
+++ b/Git/Repair.hs
@@ -1,6 +1,6 @@
{- git repository recovery
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Sha.hs b/Git/Sha.hs
index cbb66ea2d..b802c8556 100644
--- a/Git/Sha.hs
+++ b/Git/Sha.hs
@@ -1,6 +1,6 @@
{- git SHA stuff
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/SharedRepository.hs b/Git/SharedRepository.hs
index f3efa8fde..3aab1e39a 100644
--- a/Git/SharedRepository.hs
+++ b/Git/SharedRepository.hs
@@ -1,6 +1,6 @@
{- git core.sharedRepository handling
-
- - 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/Git/Types.hs b/Git/Types.hs
index 838c9e0e7..bb91a1703 100644
--- a/Git/Types.hs
+++ b/Git/Types.hs
@@ -1,6 +1,6 @@
{- git data types
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index 464200af4..d4dc35e4a 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -1,6 +1,6 @@
{- git-union-merge library
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/UpdateIndex.hs b/Git/UpdateIndex.hs
index 613596d57..55c5b3bb2 100644
--- a/Git/UpdateIndex.hs
+++ b/Git/UpdateIndex.hs
@@ -1,6 +1,6 @@
{- git-update-index library
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Url.hs b/Git/Url.hs
index d383a6aca..fa7d200dc 100644
--- a/Git/Url.hs
+++ b/Git/Url.hs
@@ -1,6 +1,6 @@
{- git repository urls
-
- - Copyright 2010, 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Git/Version.hs b/Git/Version.hs
index 73ce2f81d..ecd12444c 100644
--- a/Git/Version.hs
+++ b/Git/Version.hs
@@ -1,6 +1,6 @@
{- git versions
-
- - Copyright 2011, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Limit.hs b/Limit.hs
index 1053547ec..ec21b7287 100644
--- a/Limit.hs
+++ b/Limit.hs
@@ -1,6 +1,6 @@
{- user-specified limits on files to act on
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Limit/Wanted.hs b/Limit/Wanted.hs
index 01b8da6b3..e3305398d 100644
--- a/Limit/Wanted.hs
+++ b/Limit/Wanted.hs
@@ -1,6 +1,6 @@
{- git-annex limits by wanted 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/Locations.hs b/Locations.hs
index 614cbdde3..596bf4f85 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -1,6 +1,6 @@
{- git-annex file locations
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs.hs b/Logs.hs
index d18339361..7452339cd 100644
--- a/Logs.hs
+++ b/Logs.hs
@@ -1,6 +1,6 @@
{- git-annex log file names
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Chunk.hs b/Logs/Chunk.hs
index a3e18efc1..8ca3ffed3 100644
--- a/Logs/Chunk.hs
+++ b/Logs/Chunk.hs
@@ -10,7 +10,7 @@
-
- Format: "timestamp uuid:chunksize chunkcount"
-
- - 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/Logs/Chunk/Pure.hs b/Logs/Chunk/Pure.hs
index 26fdd63c2..af209d7e1 100644
--- a/Logs/Chunk/Pure.hs
+++ b/Logs/Chunk/Pure.hs
@@ -1,6 +1,6 @@
{- Chunk logs, pure operations.
-
- - 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/Logs/FsckResults.hs b/Logs/FsckResults.hs
index 23367a3d3..e6db9a076 100644
--- a/Logs/FsckResults.hs
+++ b/Logs/FsckResults.hs
@@ -1,6 +1,6 @@
{- git-annex fsck results log files
-
- - 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/Logs/Group.hs b/Logs/Group.hs
index 3f88b627d..3725c046c 100644
--- a/Logs/Group.hs
+++ b/Logs/Group.hs
@@ -1,6 +1,6 @@
{- git-annex group log
-
- - 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/Logs/Location.hs b/Logs/Location.hs
index cb1e415fd..d0109b848 100644
--- a/Logs/Location.hs
+++ b/Logs/Location.hs
@@ -8,7 +8,7 @@
- Repositories record their UUID and the date when they --get or --drop
- a value.
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/MapLog.hs b/Logs/MapLog.hs
index dd3cc0696..3c7eef26b 100644
--- a/Logs/MapLog.hs
+++ b/Logs/MapLog.hs
@@ -4,7 +4,7 @@
-
- A line of the log will look like: "timestamp field value"
-
- - 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/Logs/MetaData.hs b/Logs/MetaData.hs
index d63a87470..3091935cf 100644
--- a/Logs/MetaData.hs
+++ b/Logs/MetaData.hs
@@ -18,7 +18,7 @@
- and so foo currently has no value.
-
-
- - 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/Logs/NumCopies.hs b/Logs/NumCopies.hs
index 5cce61ce6..3fc29c2f2 100644
--- a/Logs/NumCopies.hs
+++ b/Logs/NumCopies.hs
@@ -1,6 +1,6 @@
{- git-annex numcopies log
-
- - 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/Logs/PreferredContent.hs b/Logs/PreferredContent.hs
index a485ec600..83269e6d7 100644
--- a/Logs/PreferredContent.hs
+++ b/Logs/PreferredContent.hs
@@ -1,6 +1,6 @@
{- git-annex preferred content matcher configuration
-
- - 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/Logs/PreferredContent/Raw.hs b/Logs/PreferredContent/Raw.hs
index bbf5a1edc..119261ab8 100644
--- a/Logs/PreferredContent/Raw.hs
+++ b/Logs/PreferredContent/Raw.hs
@@ -1,6 +1,6 @@
{- unparsed preferred content expressions
-
- - 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/Logs/Presence.hs b/Logs/Presence.hs
index 7545f5afc..cb21adfb3 100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
@@ -6,7 +6,7 @@
- A line of the log will look like: "date N INFO"
- Where N=1 when the INFO is present, and 0 otherwise.
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Presence/Pure.hs b/Logs/Presence/Pure.hs
index 6bf36d883..88f18435f 100644
--- a/Logs/Presence/Pure.hs
+++ b/Logs/Presence/Pure.hs
@@ -1,6 +1,6 @@
{- git-annex presence log, pure operations
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Remote.hs b/Logs/Remote.hs
index 48ee9eb60..91afa242b 100644
--- a/Logs/Remote.hs
+++ b/Logs/Remote.hs
@@ -1,6 +1,6 @@
{- git-annex remote log
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/RemoteState.hs b/Logs/RemoteState.hs
index 195d710c7..7b3859a35 100644
--- a/Logs/RemoteState.hs
+++ b/Logs/RemoteState.hs
@@ -1,6 +1,6 @@
{- Remote state logs.
-
- - 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/Logs/Schedule.hs b/Logs/Schedule.hs
index 540667059..d2dd0c343 100644
--- a/Logs/Schedule.hs
+++ b/Logs/Schedule.hs
@@ -1,6 +1,6 @@
{- git-annex scheduled activities log
-
- - 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/Logs/SingleValue.hs b/Logs/SingleValue.hs
index bb774b6f4..dbbe996f3 100644
--- a/Logs/SingleValue.hs
+++ b/Logs/SingleValue.hs
@@ -6,7 +6,7 @@
-
- The line with the newest timestamp wins.
-
- - 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/Logs/Transfer.hs b/Logs/Transfer.hs
index 16c3ebb68..5b5b8f8cb 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -1,6 +1,6 @@
{- git-annex transfer information files and lock files
-
- - 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/Logs/Transitions.hs b/Logs/Transitions.hs
index 15ea32401..d782455a6 100644
--- a/Logs/Transitions.hs
+++ b/Logs/Transitions.hs
@@ -7,7 +7,7 @@
- done that is listed in the remote branch by checking that the local
- branch contains the same transition, with the same or newer start time.
-
- - 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/Logs/Trust.hs b/Logs/Trust.hs
index 41ce5a551..3d8d7bbae 100644
--- a/Logs/Trust.hs
+++ b/Logs/Trust.hs
@@ -1,6 +1,6 @@
{- git-annex trust log
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Trust/Basic.hs b/Logs/Trust/Basic.hs
index c356be28f..30e8dfb58 100644
--- a/Logs/Trust/Basic.hs
+++ b/Logs/Trust/Basic.hs
@@ -1,6 +1,6 @@
{- git-annex trust log, basics
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Trust/Pure.hs b/Logs/Trust/Pure.hs
index 11cfbe056..d493db63c 100644
--- a/Logs/Trust/Pure.hs
+++ b/Logs/Trust/Pure.hs
@@ -1,6 +1,6 @@
{- git-annex trust log, pure operations
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/UUID.hs b/Logs/UUID.hs
index 154f86d51..8bdf41b9a 100644
--- a/Logs/UUID.hs
+++ b/Logs/UUID.hs
@@ -8,7 +8,7 @@
-
- uuid.log stores a list of known uuids, and their descriptions.
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/UUIDBased.hs b/Logs/UUIDBased.hs
index fe1c9e012..ac876e65f 100644
--- a/Logs/UUIDBased.hs
+++ b/Logs/UUIDBased.hs
@@ -9,7 +9,7 @@
-
- New uuid based logs instead use the form: "timestamp UUID INFO"
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/Unused.hs b/Logs/Unused.hs
index cadf7ed9d..883ab8c5b 100644
--- a/Logs/Unused.hs
+++ b/Logs/Unused.hs
@@ -10,7 +10,7 @@
- The timestamp indicates when the key was first determined to be unused.
- Older versions of the log omit the timestamp.
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Logs/View.hs b/Logs/View.hs
index b2a92c405..5ba4bf7c2 100644
--- a/Logs/View.hs
+++ b/Logs/View.hs
@@ -4,7 +4,7 @@
-
- This file is stored locally in .git/annex/, not in the git-annex branch.
-
- - 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/Logs/Web.hs b/Logs/Web.hs
index 39f177c3b..4729cead4 100644
--- a/Logs/Web.hs
+++ b/Logs/Web.hs
@@ -1,6 +1,6 @@
{- Web url logs.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Messages.hs b/Messages.hs
index 976ba96d7..88a4a8c18 100644
--- a/Messages.hs
+++ b/Messages.hs
@@ -1,6 +1,6 @@
{- git-annex output messages
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Messages/JSON.hs b/Messages/JSON.hs
index d57d69318..d0ed85a1f 100644
--- a/Messages/JSON.hs
+++ b/Messages/JSON.hs
@@ -1,6 +1,6 @@
{- git-annex JSON output
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote.hs b/Remote.hs
index a48c5f75e..58c1a0f17 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -1,6 +1,6 @@
{- git-annex remotes
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs
index d0a35fa30..0ecf3ef25 100644
--- a/Remote/BitTorrent.hs
+++ b/Remote/BitTorrent.hs
@@ -1,6 +1,6 @@
{- BitTorrent remote.
-
- - 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/Remote/Bup.hs b/Remote/Bup.hs
index 16f73a66f..01501dc9e 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -1,6 +1,6 @@
{- Using bup as a remote.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Ddar.hs b/Remote/Ddar.hs
index f77193051..d22a1f899 100644
--- a/Remote/Ddar.hs
+++ b/Remote/Ddar.hs
@@ -1,6 +1,6 @@
{- Using ddar as a remote. Based on bup and rsync remotes.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
- Copyright 2014 Robie Basak <robie@justgohome.co.uk>
-
- Licensed under the GNU GPL version 3 or higher.
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 66a3de49f..2b887a82f 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -1,6 +1,6 @@
{- A "remote" that is just a filesystem directory.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Directory/LegacyChunked.hs b/Remote/Directory/LegacyChunked.hs
index b2248c5f6..72d52f95d 100644
--- a/Remote/Directory/LegacyChunked.hs
+++ b/Remote/Directory/LegacyChunked.hs
@@ -2,7 +2,7 @@
-
- Can be removed eventually.
-
- - Copyright 2011-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/External.hs b/Remote/External.hs
index dd8e793c7..0ec284ff4 100644
--- a/Remote/External.hs
+++ b/Remote/External.hs
@@ -1,6 +1,6 @@
{- External special remote interface.
-
- - 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/Remote/External/Types.hs b/Remote/External/Types.hs
index 73177d316..d0fb2ff7a 100644
--- a/Remote/External/Types.hs
+++ b/Remote/External/Types.hs
@@ -1,6 +1,6 @@
{- External special remote data 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/Remote/GCrypt.hs b/Remote/GCrypt.hs
index 6bf7f89f5..b977750c3 100644
--- a/Remote/GCrypt.hs
+++ b/Remote/GCrypt.hs
@@ -1,6 +1,6 @@
{- git remotes encrypted using git-remote-gcrypt
-
- - 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/Remote/Git.hs b/Remote/Git.hs
index 583e9c728..b31a1d850 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -1,6 +1,6 @@
{- Standard git remotes.
-
- - Copyright 2011-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index f24369d52..bffe33be8 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -1,6 +1,6 @@
{- Amazon Glacier remotes.
-
- - 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/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs
index 17e1a2921..145c48714 100644
--- a/Remote/Helper/AWS.hs
+++ b/Remote/Helper/AWS.hs
@@ -1,6 +1,6 @@
{- Amazon Web Services common infrastructure.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs
index 8516268ce..2f21ba66c 100644
--- a/Remote/Helper/Chunked.hs
+++ b/Remote/Helper/Chunked.hs
@@ -1,6 +1,6 @@
{- git-annex chunked remotes
-
- - 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/Remote/Helper/Chunked/Legacy.hs b/Remote/Helper/Chunked/Legacy.hs
index 4f402705a..ae3a29f32 100644
--- a/Remote/Helper/Chunked/Legacy.hs
+++ b/Remote/Helper/Chunked/Legacy.hs
@@ -1,6 +1,6 @@
{- legacy git-annex chunked remotes
-
- - 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/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index 11e20d7b0..c1243a518 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -1,6 +1,6 @@
{- common functions for encryptable remotes
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Helper/Git.hs b/Remote/Helper/Git.hs
index 9ed27ac8b..3b438a0bb 100644
--- a/Remote/Helper/Git.hs
+++ b/Remote/Helper/Git.hs
@@ -1,6 +1,6 @@
{- Utilities for git remotes.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs
index 529c35d3f..3765281be 100644
--- a/Remote/Helper/Hooks.hs
+++ b/Remote/Helper/Hooks.hs
@@ -1,6 +1,6 @@
{- Adds hooks to remotes.
-
- - 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/Remote/Helper/Http.hs b/Remote/Helper/Http.hs
index 3d08066ba..81c1654ef 100644
--- a/Remote/Helper/Http.hs
+++ b/Remote/Helper/Http.hs
@@ -1,6 +1,6 @@
{- helpers for remotes using http
-
- - 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/Remote/Helper/Messages.hs b/Remote/Helper/Messages.hs
index 774716ca1..30db70fbb 100644
--- a/Remote/Helper/Messages.hs
+++ b/Remote/Helper/Messages.hs
@@ -1,6 +1,6 @@
{- git-annex remote messages
-
- - 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/Remote/Helper/ReadOnly.hs b/Remote/Helper/ReadOnly.hs
index cd92a083c..2e327a040 100644
--- a/Remote/Helper/ReadOnly.hs
+++ b/Remote/Helper/ReadOnly.hs
@@ -1,6 +1,6 @@
{- Adds readonly support to remotes.
-
- - 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/Remote/Helper/Special.hs b/Remote/Helper/Special.hs
index 181d7548f..bdf0ead22 100644
--- a/Remote/Helper/Special.hs
+++ b/Remote/Helper/Special.hs
@@ -1,6 +1,6 @@
{- helpers for special remotes
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs
index 9f0a77178..5d39f3bc8 100644
--- a/Remote/Helper/Ssh.hs
+++ b/Remote/Helper/Ssh.hs
@@ -1,6 +1,6 @@
{- git-annex remote access with ssh and git-annex-shell
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index 5955e51c2..ce7781cfb 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -1,6 +1,6 @@
{- A remote that provides hooks to run shell commands.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/List.hs b/Remote/List.hs
index a4d18c7c8..49b0a35f2 100644
--- a/Remote/List.hs
+++ b/Remote/List.hs
@@ -2,7 +2,7 @@
{- git-annex remote list
-
- - Copyright 2011,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index ad5b77d38..ae6f5450e 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -1,6 +1,6 @@
{- A remote that is only accessible by rsync.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Rsync/RsyncUrl.hs b/Remote/Rsync/RsyncUrl.hs
index 61bbe2f3f..7ebd2f68d 100644
--- a/Remote/Rsync/RsyncUrl.hs
+++ b/Remote/Rsync/RsyncUrl.hs
@@ -1,6 +1,6 @@
{- Rsync urls.
-
- - 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/Remote/S3.hs b/Remote/S3.hs
index 104fdddca..b0c1de114 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -1,6 +1,6 @@
{- S3 remotes
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs
index 27bb12884..56bf66427 100644
--- a/Remote/Tahoe.hs
+++ b/Remote/Tahoe.hs
@@ -13,7 +13,7 @@
-
- Tahoe has its own encryption, so git-annex's encryption is not used.
-
- - 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/Remote/Web.hs b/Remote/Web.hs
index 594f90b97..17e3830a8 100644
--- a/Remote/Web.hs
+++ b/Remote/Web.hs
@@ -1,6 +1,6 @@
{- Web remote.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index ae1e4b972..aaebecf41 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -1,6 +1,6 @@
{- WebDAV remotes.
-
- - 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/Remote/WebDAV/DavLocation.hs b/Remote/WebDAV/DavLocation.hs
index 33c3aa079..b5d374943 100644
--- a/Remote/WebDAV/DavLocation.hs
+++ b/Remote/WebDAV/DavLocation.hs
@@ -1,6 +1,6 @@
{- WebDAV locations.
-
- - 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/RemoteDaemon/Common.hs b/RemoteDaemon/Common.hs
index e844e2c88..50524b44c 100644
--- a/RemoteDaemon/Common.hs
+++ b/RemoteDaemon/Common.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon utilities
-
- - 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/RemoteDaemon/Core.hs b/RemoteDaemon/Core.hs
index ed79c0195..bc5ad8a58 100644
--- a/RemoteDaemon/Core.hs
+++ b/RemoteDaemon/Core.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon core
-
- - 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/RemoteDaemon/Transport.hs b/RemoteDaemon/Transport.hs
index 09118ca8b..8297bb3b0 100644
--- a/RemoteDaemon/Transport.hs
+++ b/RemoteDaemon/Transport.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon transports
-
- - 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/RemoteDaemon/Transport/Ssh.hs b/RemoteDaemon/Transport/Ssh.hs
index 6315ede85..509b8f319 100644
--- a/RemoteDaemon/Transport/Ssh.hs
+++ b/RemoteDaemon/Transport/Ssh.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon, git-annex-shell over ssh transport
-
- - 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/RemoteDaemon/Transport/Ssh/Types.hs b/RemoteDaemon/Transport/Ssh/Types.hs
index d3fd314b4..fa6a55d3d 100644
--- a/RemoteDaemon/Transport/Ssh/Types.hs
+++ b/RemoteDaemon/Transport/Ssh/Types.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon, git-annex-shell notifychanges protocol types
-
- - 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/RemoteDaemon/Types.hs b/RemoteDaemon/Types.hs
index bdc94d949..9009533e1 100644
--- a/RemoteDaemon/Types.hs
+++ b/RemoteDaemon/Types.hs
@@ -1,6 +1,6 @@
{- git-remote-daemon data types.
-
- - 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/Test.hs b/Test.hs
index 803bc6220..8d432cb61 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1,6 +1,6 @@
{- git-annex test suite
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types.hs b/Types.hs
index 8768ed1fe..4d1cde61b 100644
--- a/Types.hs
+++ b/Types.hs
@@ -1,6 +1,6 @@
{- git-annex abstract data types
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/Availability.hs b/Types/Availability.hs
index f8c8ea3f3..6956537d2 100644
--- a/Types/Availability.hs
+++ b/Types/Availability.hs
@@ -1,6 +1,6 @@
{- git-annex remote availability
-
- - 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/Types/Backend.hs b/Types/Backend.hs
index 117ce8b24..8967f3153 100644
--- a/Types/Backend.hs
+++ b/Types/Backend.hs
@@ -2,7 +2,7 @@
-
- Most things should not need this, using Types instead
-
- - Copyright 2010,2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/BranchState.hs b/Types/BranchState.hs
index 2f7948ebb..8c57a223a 100644
--- a/Types/BranchState.hs
+++ b/Types/BranchState.hs
@@ -1,6 +1,6 @@
{- git-annex BranchState data type
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/CleanupActions.hs b/Types/CleanupActions.hs
index fafa2ee00..508579643 100644
--- a/Types/CleanupActions.hs
+++ b/Types/CleanupActions.hs
@@ -1,6 +1,6 @@
{- Enumeration of cleanup actions
-
- - 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/Types/Command.hs b/Types/Command.hs
index 1f8456194..de6e78038 100644
--- a/Types/Command.hs
+++ b/Types/Command.hs
@@ -1,6 +1,6 @@
{- git-annex command data types
-
- - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/Creds.hs b/Types/Creds.hs
index c16e530b1..ad1827bc9 100644
--- a/Types/Creds.hs
+++ b/Types/Creds.hs
@@ -1,6 +1,6 @@
{- credentials
-
- - 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/Types/Crypto.hs b/Types/Crypto.hs
index 48d03ce12..682629d6a 100644
--- a/Types/Crypto.hs
+++ b/Types/Crypto.hs
@@ -1,6 +1,6 @@
{- git-annex crypto types
-
- - Copyright 2011-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/DesktopNotify.hs b/Types/DesktopNotify.hs
index f8494487d..9ea51401f 100644
--- a/Types/DesktopNotify.hs
+++ b/Types/DesktopNotify.hs
@@ -1,6 +1,6 @@
{- git-annex DesktopNotify type
-
- - 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/Types/Distribution.hs b/Types/Distribution.hs
index 4201f49ad..2a44a1575 100644
--- a/Types/Distribution.hs
+++ b/Types/Distribution.hs
@@ -1,6 +1,6 @@
{- Data type for a distribution of git-annex
-
- - 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/Types/FileMatcher.hs b/Types/FileMatcher.hs
index 03a86a38c..a79bbd258 100644
--- a/Types/FileMatcher.hs
+++ b/Types/FileMatcher.hs
@@ -1,6 +1,6 @@
{- git-annex file matcher 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/Types/GitConfig.hs b/Types/GitConfig.hs
index 3d89b0433..ef8068cc4 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -1,6 +1,6 @@
{- git-annex configuration
-
- - 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/Types/Group.hs b/Types/Group.hs
index 88bc35207..2695670ab 100644
--- a/Types/Group.hs
+++ b/Types/Group.hs
@@ -1,6 +1,6 @@
{- git-annex repo groups
-
- - 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/Types/Key.hs b/Types/Key.hs
index da9ff494a..037437303 100644
--- a/Types/Key.hs
+++ b/Types/Key.hs
@@ -2,7 +2,7 @@
-
- Most things should not need this, using Types instead
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/KeySource.hs b/Types/KeySource.hs
index fd4af07a6..7c2fd13d5 100644
--- a/Types/KeySource.hs
+++ b/Types/KeySource.hs
@@ -1,6 +1,6 @@
{- KeySource data type
-
- - 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/Types/LockPool.hs b/Types/LockPool.hs
index c7d411cdc..803822042 100644
--- a/Types/LockPool.hs
+++ b/Types/LockPool.hs
@@ -1,6 +1,6 @@
{- git-annex lock pool data types
-
- - 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/Types/Messages.hs b/Types/Messages.hs
index 2196028e3..224c2fe87 100644
--- a/Types/Messages.hs
+++ b/Types/Messages.hs
@@ -1,6 +1,6 @@
{- git-annex Messages 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/Types/MetaData.hs b/Types/MetaData.hs
index f19e0b439..2a6b3b864 100644
--- a/Types/MetaData.hs
+++ b/Types/MetaData.hs
@@ -1,6 +1,6 @@
{- git-annex general metadata
-
- - 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/Types/NumCopies.hs b/Types/NumCopies.hs
index b93fcf968..d8ea31e69 100644
--- a/Types/NumCopies.hs
+++ b/Types/NumCopies.hs
@@ -1,6 +1,6 @@
{- git-annex numcopies type
-
- - 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/Types/Option.hs b/Types/Option.hs
index 036257838..f3b5ca9e1 100644
--- a/Types/Option.hs
+++ b/Types/Option.hs
@@ -1,6 +1,6 @@
{- git-annex command options
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/Remote.hs b/Types/Remote.hs
index 4d17abf95..5df08c775 100644
--- a/Types/Remote.hs
+++ b/Types/Remote.hs
@@ -2,7 +2,7 @@
-
- Most things should not need this, using Types instead
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/ScheduledActivity.hs b/Types/ScheduledActivity.hs
index 5cdbe29e8..f4f80635b 100644
--- a/Types/ScheduledActivity.hs
+++ b/Types/ScheduledActivity.hs
@@ -1,6 +1,6 @@
{- git-annex scheduled activities
-
- - 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/Types/StandardGroups.hs b/Types/StandardGroups.hs
index 66c1dd5ef..83e612917 100644
--- a/Types/StandardGroups.hs
+++ b/Types/StandardGroups.hs
@@ -1,6 +1,6 @@
{- git-annex standard repository groups
-
- - 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/Types/StoreRetrieve.hs b/Types/StoreRetrieve.hs
index a21fa7866..13710fba2 100644
--- a/Types/StoreRetrieve.hs
+++ b/Types/StoreRetrieve.hs
@@ -1,6 +1,6 @@
{- Types for Storer and Retriever actions for remotes.
-
- - 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/Types/TrustLevel.hs b/Types/TrustLevel.hs
index 4af71294a..1cc4c662e 100644
--- a/Types/TrustLevel.hs
+++ b/Types/TrustLevel.hs
@@ -1,6 +1,6 @@
{- git-annex trust levels
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/UUID.hs b/Types/UUID.hs
index df3884059..de7ddd65d 100644
--- a/Types/UUID.hs
+++ b/Types/UUID.hs
@@ -1,6 +1,6 @@
{- git-annex UUID type
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Types/UrlContents.hs b/Types/UrlContents.hs
index 2085aebfa..411c3ae42 100644
--- a/Types/UrlContents.hs
+++ b/Types/UrlContents.hs
@@ -1,6 +1,6 @@
{- git-annex URL contents
-
- - 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/Types/View.hs b/Types/View.hs
index 43afdb8c8..0426ba977 100644
--- a/Types/View.hs
+++ b/Types/View.hs
@@ -1,6 +1,6 @@
{- types for metadata based branch views
-
- - 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/Upgrade.hs b/Upgrade.hs
index 8566f0d5d..8d205a874 100644
--- a/Upgrade.hs
+++ b/Upgrade.hs
@@ -1,6 +1,6 @@
{- git-annex upgrade support
-
- - Copyright 2010, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Upgrade/V0.hs b/Upgrade/V0.hs
index 00a08cb45..b3486f864 100644
--- a/Upgrade/V0.hs
+++ b/Upgrade/V0.hs
@@ -1,6 +1,6 @@
{- git-annex v0 -> v1 upgrade support
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs
index 347b102ac..1f0dae43e 100644
--- a/Upgrade/V1.hs
+++ b/Upgrade/V1.hs
@@ -1,6 +1,6 @@
{- git-annex v1 -> v2 upgrade support
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs
index 0672de8b6..2b0b277e8 100644
--- a/Upgrade/V2.hs
+++ b/Upgrade/V2.hs
@@ -1,6 +1,6 @@
{- git-annex v2 -> v3 upgrade support
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Upgrade/V3.hs b/Upgrade/V3.hs
index 38f700cf8..8d873a6ce 100644
--- a/Upgrade/V3.hs
+++ b/Upgrade/V3.hs
@@ -2,7 +2,7 @@
-
- There was no explicit v3 to v4 upgrade, so run v5 upgrade code.
-
- - 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/Upgrade/V4.hs b/Upgrade/V4.hs
index dad073d0b..cb1643ffd 100644
--- a/Upgrade/V4.hs
+++ b/Upgrade/V4.hs
@@ -1,6 +1,6 @@
{- git-annex v4 -> v5 uppgrade support
-
- - 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/Utility/Applicative.hs b/Utility/Applicative.hs
index fd8944b28..fce3c0485 100644
--- a/Utility/Applicative.hs
+++ b/Utility/Applicative.hs
@@ -1,6 +1,6 @@
{- applicative stuff
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Base64.hs b/Utility/Base64.hs
index 3f0c19965..56637a117 100644
--- a/Utility/Base64.hs
+++ b/Utility/Base64.hs
@@ -1,6 +1,6 @@
{- Simple Base64 access
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Batch.hs b/Utility/Batch.hs
index ff81318fb..d96f9d3f3 100644
--- a/Utility/Batch.hs
+++ b/Utility/Batch.hs
@@ -1,6 +1,6 @@
{- Running a long or expensive batch operation niced.
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Bloom.hs b/Utility/Bloom.hs
index b0988a8c4..aee760a1d 100644
--- a/Utility/Bloom.hs
+++ b/Utility/Bloom.hs
@@ -1,6 +1,6 @@
{- bloomfilter compatability wrapper
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/CoProcess.hs b/Utility/CoProcess.hs
index 97826ec1e..9854b47fc 100644
--- a/Utility/CoProcess.hs
+++ b/Utility/CoProcess.hs
@@ -1,7 +1,7 @@
{- Interface for running a shell command as a coprocess,
- sending it queries and getting back results.
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/CopyFile.hs b/Utility/CopyFile.hs
index 503ab842a..b123d006d 100644
--- a/Utility/CopyFile.hs
+++ b/Utility/CopyFile.hs
@@ -1,6 +1,6 @@
{- file copying
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DBus.hs b/Utility/DBus.hs
index 29dbc9479..5b0470301 100644
--- a/Utility/DBus.hs
+++ b/Utility/DBus.hs
@@ -1,6 +1,6 @@
{- DBus utilities
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs
index d1f539e98..d7f0407be 100644
--- a/Utility/Daemon.hs
+++ b/Utility/Daemon.hs
@@ -1,6 +1,6 @@
{- daemon support
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Data.hs b/Utility/Data.hs
index 2df12b36d..5ecd218fb 100644
--- a/Utility/Data.hs
+++ b/Utility/Data.hs
@@ -1,6 +1,6 @@
{- utilities for simple data types
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DataUnits.hs b/Utility/DataUnits.hs
index e035b2f86..3ff553887 100644
--- a/Utility/DataUnits.hs
+++ b/Utility/DataUnits.hs
@@ -1,6 +1,6 @@
{- data size display and parsing
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-
diff --git a/Utility/DirWatcher.hs b/Utility/DirWatcher.hs
index 7e582239d..3d3c14619 100644
--- a/Utility/DirWatcher.hs
+++ b/Utility/DirWatcher.hs
@@ -4,7 +4,7 @@
- (and subdirectories) for changes, and runs hooks for different
- sorts of events as they occur.
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DirWatcher/FSEvents.hs b/Utility/DirWatcher/FSEvents.hs
index e16de7b94..a07139c44 100644
--- a/Utility/DirWatcher/FSEvents.hs
+++ b/Utility/DirWatcher/FSEvents.hs
@@ -1,6 +1,6 @@
{- FSEvents interface
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DirWatcher/INotify.hs b/Utility/DirWatcher/INotify.hs
index 9400c7940..4d11b95a8 100644
--- a/Utility/DirWatcher/INotify.hs
+++ b/Utility/DirWatcher/INotify.hs
@@ -1,6 +1,6 @@
{- higher-level inotify interface
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DirWatcher/Kqueue.hs b/Utility/DirWatcher/Kqueue.hs
index 453c8d3f1..b0a6ed84f 100644
--- a/Utility/DirWatcher/Kqueue.hs
+++ b/Utility/DirWatcher/Kqueue.hs
@@ -1,6 +1,6 @@
{- BSD kqueue file modification notification interface
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DirWatcher/Types.hs b/Utility/DirWatcher/Types.hs
index 2c92d6cd5..75ef69f83 100644
--- a/Utility/DirWatcher/Types.hs
+++ b/Utility/DirWatcher/Types.hs
@@ -1,6 +1,6 @@
{- generic directory watching types
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DirWatcher/Win32Notify.hs b/Utility/DirWatcher/Win32Notify.hs
index 54f34935a..3428f3db3 100644
--- a/Utility/DirWatcher/Win32Notify.hs
+++ b/Utility/DirWatcher/Win32Notify.hs
@@ -1,6 +1,6 @@
{- Win32-notify interface
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index e4e4b80a7..85ec8bf45 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -1,6 +1,6 @@
{- directory traversal and manipulation
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DiskFree.hs b/Utility/DiskFree.hs
index af4431e88..c4125d4f0 100644
--- a/Utility/DiskFree.hs
+++ b/Utility/DiskFree.hs
@@ -1,6 +1,6 @@
{- disk free space checking
-
- - Copyright 2012, 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Dot.hs b/Utility/Dot.hs
index 3bea644f7..e21915d32 100644
--- a/Utility/Dot.hs
+++ b/Utility/Dot.hs
@@ -1,6 +1,6 @@
{- a simple graphviz / dot(1) digraph description generator library
-
- - Copyright 2010 Joey Hess <joey@kitenet.net>
+ - Copyright 2010 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/DottedVersion.hs b/Utility/DottedVersion.hs
index 14aa16da9..67e40ff3c 100644
--- a/Utility/DottedVersion.hs
+++ b/Utility/DottedVersion.hs
@@ -1,6 +1,6 @@
{- dotted versions, such as 1.0.1
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Env.hs b/Utility/Env.hs
index ff6644fbf..fdf06d807 100644
--- a/Utility/Env.hs
+++ b/Utility/Env.hs
@@ -1,6 +1,6 @@
{- portable environment variables
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Exception.hs b/Utility/Exception.hs
index ef3ab1dac..ab47ae95f 100644
--- a/Utility/Exception.hs
+++ b/Utility/Exception.hs
@@ -1,6 +1,6 @@
{- Simple IO exception handling (and some more)
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/ExternalSHA.hs b/Utility/ExternalSHA.hs
index 858d04e6a..6cef2830d 100644
--- a/Utility/ExternalSHA.hs
+++ b/Utility/ExternalSHA.hs
@@ -3,7 +3,7 @@
- This is typically a bit faster than using Haskell libraries,
- by around 1% to 10%. Worth it for really big files.
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs
index 832250bde..5c4001ed8 100644
--- a/Utility/FileMode.hs
+++ b/Utility/FileMode.hs
@@ -1,6 +1,6 @@
{- File mode utilities.
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/FileSystemEncoding.hs b/Utility/FileSystemEncoding.hs
index fa4b39aa3..844e81e59 100644
--- a/Utility/FileSystemEncoding.hs
+++ b/Utility/FileSystemEncoding.hs
@@ -1,6 +1,6 @@
{- GHC File system encoding handling.
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Format.hs b/Utility/Format.hs
index 78620f9b9..0a6f6ce7d 100644
--- a/Utility/Format.hs
+++ b/Utility/Format.hs
@@ -1,6 +1,6 @@
{- Formatted string handling.
-
- - Copyright 2010, 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010, 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
index c1f042ce8..ee1c2f302 100644
--- a/Utility/FreeDesktop.hs
+++ b/Utility/FreeDesktop.hs
@@ -5,7 +5,7 @@
- http://standards.freedesktop.org/menu-spec/latest/
- http://standards.freedesktop.org/icon-theme-spec/latest/
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Glob.hs b/Utility/Glob.hs
index 373f3fdbf..d35a96849 100644
--- a/Utility/Glob.hs
+++ b/Utility/Glob.hs
@@ -3,7 +3,7 @@
- This uses TDFA when available, with a fallback to regex-compat.
- TDFA is less buggy in its support for non-unicode characters.
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index cda89028f..37508a495 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -1,6 +1,6 @@
{- gpg interface
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Utility/HumanNumber.hs b/Utility/HumanNumber.hs
index 8783f8152..c3fede95f 100644
--- a/Utility/HumanNumber.hs
+++ b/Utility/HumanNumber.hs
@@ -1,6 +1,6 @@
{- numbers for humans
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs
index 3c23f31f7..85a9e15b6 100644
--- a/Utility/HumanTime.hs
+++ b/Utility/HumanTime.hs
@@ -1,6 +1,6 @@
{- Time for humans.
-
- - Copyright 2012-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
index d068e3801..b5fe9034e 100644
--- a/Utility/InodeCache.hs
+++ b/Utility/InodeCache.hs
@@ -1,7 +1,7 @@
{- Caching a file's inode, size, and modification time
- to see when it's changed.
-
- - Copyright 2013, 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013, 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/JSONStream.hs b/Utility/JSONStream.hs
index b28646268..2746678cc 100644
--- a/Utility/JSONStream.hs
+++ b/Utility/JSONStream.hs
@@ -1,6 +1,6 @@
{- Streaming JSON output.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs
index aaafd8d0c..db64d1236 100644
--- a/Utility/LinuxMkLibs.hs
+++ b/Utility/LinuxMkLibs.hs
@@ -1,6 +1,6 @@
{- Linux library copier and binary shimmer
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/LockFile.hs b/Utility/LockFile.hs
index 4f0d4ba3e..f9a0e6783 100644
--- a/Utility/LockFile.hs
+++ b/Utility/LockFile.hs
@@ -4,7 +4,7 @@
- This module does *not* attempt to be a portability shim, it just exposes
- the native locking of the OS.
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/LockFile/Posix.hs b/Utility/LockFile/Posix.hs
index 6e4444fcf..a5775dba1 100644
--- a/Utility/LockFile/Posix.hs
+++ b/Utility/LockFile/Posix.hs
@@ -1,6 +1,6 @@
{- Posix lock files
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/LockFile/Windows.hs b/Utility/LockFile/Windows.hs
index 73c248b03..eff129cee 100644
--- a/Utility/LockFile/Windows.hs
+++ b/Utility/LockFile/Windows.hs
@@ -1,6 +1,6 @@
{- Windows lock files
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/LogFile.hs b/Utility/LogFile.hs
index e4f90d418..bc6d92ca9 100644
--- a/Utility/LogFile.hs
+++ b/Utility/LogFile.hs
@@ -1,6 +1,6 @@
{- log files
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs
index ae74b25fd..433b7c679 100644
--- a/Utility/Lsof.hs
+++ b/Utility/Lsof.hs
@@ -1,6 +1,6 @@
{- lsof interface
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Matcher.hs b/Utility/Matcher.hs
index 3356bdd07..19a77201c 100644
--- a/Utility/Matcher.hs
+++ b/Utility/Matcher.hs
@@ -10,7 +10,7 @@
- Is forgiving about misplaced closing parens, so "foo and (bar or baz"
- will be handled, as will "foo and ( bar or baz ) )"
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Metered.hs b/Utility/Metered.hs
index e4f3b448a..84694b26b 100644
--- a/Utility/Metered.hs
+++ b/Utility/Metered.hs
@@ -1,6 +1,6 @@
{- Metered IO
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Misc.hs b/Utility/Misc.hs
index 949f41e7b..e4eccac43 100644
--- a/Utility/Misc.hs
+++ b/Utility/Misc.hs
@@ -1,6 +1,6 @@
{- misc utility functions
-
- - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Monad.hs b/Utility/Monad.hs
index eba3c4283..878e0da67 100644
--- a/Utility/Monad.hs
+++ b/Utility/Monad.hs
@@ -1,6 +1,6 @@
{- monadic stuff
-
- - Copyright 2010-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Mounts.hsc b/Utility/Mounts.hsc
index b6defda43..1fb2362df 100644
--- a/Utility/Mounts.hsc
+++ b/Utility/Mounts.hsc
@@ -4,7 +4,7 @@
- Volker Wysk <hsss@volker-wysk.de>
-
- Modified to support BSD, Mac OS X, and Android by
- - Joey Hess <joey@kitenet.net>
+ - Joey Hess <id@joeyh.name>
-
- Licensed under the GNU LGPL version 2.1 or higher.
-}
diff --git a/Utility/Network.hs b/Utility/Network.hs
index 9c6980261..7f228e155 100644
--- a/Utility/Network.hs
+++ b/Utility/Network.hs
@@ -1,6 +1,6 @@
{- network functions
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/NotificationBroadcaster.hs b/Utility/NotificationBroadcaster.hs
index 8a6e09f92..6f7cabf10 100644
--- a/Utility/NotificationBroadcaster.hs
+++ b/Utility/NotificationBroadcaster.hs
@@ -6,7 +6,7 @@
-
- Multiple clients are supported. Each has a unique id.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/OSX.hs b/Utility/OSX.hs
index 4c930f2f8..22028e210 100644
--- a/Utility/OSX.hs
+++ b/Utility/OSX.hs
@@ -1,6 +1,6 @@
{- OSX stuff
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/PID.hs b/Utility/PID.hs
index a70a4e2a4..ac63045a7 100644
--- a/Utility/PID.hs
+++ b/Utility/PID.hs
@@ -1,6 +1,6 @@
{- process ids
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Parallel.hs b/Utility/Parallel.hs
index 7966811ab..2352ba706 100644
--- a/Utility/Parallel.hs
+++ b/Utility/Parallel.hs
@@ -1,6 +1,6 @@
{- parallel processing via threads
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Path.hs b/Utility/Path.hs
index b9dbd92a9..4ff88f72e 100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
@@ -1,6 +1,6 @@
{- path manipulation
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Percentage.hs b/Utility/Percentage.hs
index f2fb45762..a30c26037 100644
--- a/Utility/Percentage.hs
+++ b/Utility/Percentage.hs
@@ -1,6 +1,6 @@
{- percentages
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/PosixFiles.hs b/Utility/PosixFiles.hs
index 5abbb5785..5a94ead01 100644
--- a/Utility/PosixFiles.hs
+++ b/Utility/PosixFiles.hs
@@ -2,7 +2,7 @@
-
- This is like System.PosixCompat.Files, except with a fixed rename.
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
index a498ee619..54200d3f7 100644
--- a/Utility/QuickCheck.hs
+++ b/Utility/QuickCheck.hs
@@ -1,6 +1,6 @@
{- QuickCheck with additional instances
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Quvi.hs b/Utility/Quvi.hs
index cf3a23cfd..7f73809c0 100644
--- a/Utility/Quvi.hs
+++ b/Utility/Quvi.hs
@@ -1,6 +1,6 @@
{- querying quvi (import qualified)
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs
index ed1eab6f3..241202813 100644
--- a/Utility/Rsync.hs
+++ b/Utility/Rsync.hs
@@ -1,6 +1,6 @@
{- various rsync stuff
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/SRV.hs b/Utility/SRV.hs
index 1b86aeb76..203585a7e 100644
--- a/Utility/SRV.hs
+++ b/Utility/SRV.hs
@@ -3,7 +3,7 @@
- Uses either the ADNS Haskell library, or the standalone Haskell DNS
- package, or the host command.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/SafeCommand.hs b/Utility/SafeCommand.hs
index 86e60db0e..a5556200a 100644
--- a/Utility/SafeCommand.hs
+++ b/Utility/SafeCommand.hs
@@ -1,6 +1,6 @@
{- safely running shell commands
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs
index 4fa3a29f1..e077a1fea 100644
--- a/Utility/Scheduled.hs
+++ b/Utility/Scheduled.hs
@@ -1,6 +1,6 @@
{- scheduled activities
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Shell.hs b/Utility/Shell.hs
index 00f60d09f..e71ca53aa 100644
--- a/Utility/Shell.hs
+++ b/Utility/Shell.hs
@@ -1,6 +1,6 @@
{- /bin/sh handling
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/SimpleProtocol.hs b/Utility/SimpleProtocol.hs
index 0ac0be4cc..4a2d8635e 100644
--- a/Utility/SimpleProtocol.hs
+++ b/Utility/SimpleProtocol.hs
@@ -1,6 +1,6 @@
{- Simple line-based protocols.
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/SshConfig.hs b/Utility/SshConfig.hs
index e45d09acd..ca336a4b8 100644
--- a/Utility/SshConfig.hs
+++ b/Utility/SshConfig.hs
@@ -1,6 +1,6 @@
{- ssh config file parsing and modification
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/TList.hs b/Utility/TList.hs
index 5532cdce5..033c8ca02 100644
--- a/Utility/TList.hs
+++ b/Utility/TList.hs
@@ -6,7 +6,7 @@
- Unlike a TQueue, the entire contents of a TList can be efficiently
- read without modifying it.
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-}
{-# LANGUAGE BangPatterns #-}
diff --git a/Utility/Tense.hs b/Utility/Tense.hs
index 0392ba500..ef2454bdc 100644
--- a/Utility/Tense.hs
+++ b/Utility/Tense.hs
@@ -1,6 +1,6 @@
{- Past and present tense text.
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/ThreadLock.hs b/Utility/ThreadLock.hs
index 548d524e1..e212fc11f 100644
--- a/Utility/ThreadLock.hs
+++ b/Utility/ThreadLock.hs
@@ -1,6 +1,6 @@
{- locking between threads
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs
index e6a81aebd..da05e9966 100644
--- a/Utility/ThreadScheduler.hs
+++ b/Utility/ThreadScheduler.hs
@@ -1,6 +1,6 @@
{- thread scheduling
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
- Copyright 2011 Bas van Dijk & Roel van Dijk
-
- License: BSD-2-clause
diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs
index 7599cdd00..dc5598137 100644
--- a/Utility/Tmp.hs
+++ b/Utility/Tmp.hs
@@ -1,6 +1,6 @@
{- Temporary files and directories.
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Touch.hsc b/Utility/Touch.hsc
index 87d551ad6..f87bb62d6 100644
--- a/Utility/Touch.hsc
+++ b/Utility/Touch.hsc
@@ -1,6 +1,6 @@
{- More control over touching a file.
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/URI.hs b/Utility/URI.hs
index 30c6be3db..e68fda58d 100644
--- a/Utility/URI.hs
+++ b/Utility/URI.hs
@@ -1,6 +1,6 @@
{- Network.URI
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Url.hs b/Utility/Url.hs
index a8828e048..9d131353a 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -1,6 +1,6 @@
{- Url downloading.
-
- - Copyright 2011-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/UserInfo.hs b/Utility/UserInfo.hs
index c82f04079..5bf8d5c09 100644
--- a/Utility/UserInfo.hs
+++ b/Utility/UserInfo.hs
@@ -1,6 +1,6 @@
{- user info
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Verifiable.hs b/Utility/Verifiable.hs
index a62213074..a861416e2 100644
--- a/Utility/Verifiable.hs
+++ b/Utility/Verifiable.hs
@@ -1,6 +1,6 @@
{- values verified using a shared secret
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index 6c42e103b..54f2d6f2b 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -1,6 +1,6 @@
{- Yesod webapp
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/WinProcess.hs b/Utility/WinProcess.hs
index 4621b4fa6..36f079d04 100644
--- a/Utility/WinProcess.hs
+++ b/Utility/WinProcess.hs
@@ -1,6 +1,6 @@
{- Windows processes
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- License: BSD-2-clause
-}
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs
index ecd4eaf94..231bb291e 100644
--- a/Utility/Yesod.hs
+++ b/Utility/Yesod.hs
@@ -3,7 +3,7 @@
- Also a bit of a compatability layer to make it easier to support yesod
- 1.1-1.4 in the same code base.
-
- - 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/Utility/libdiskfree.c b/Utility/libdiskfree.c
index fd8f87766..c2f8368f0 100644
--- a/Utility/libdiskfree.c
+++ b/Utility/libdiskfree.c
@@ -1,6 +1,6 @@
/* disk free space checking, C mini-library
*
- * Copyright 2012, 2014 Joey Hess <joey@kitenet.net>
+ * Copyright 2012, 2014 Joey Hess <id@joeyh.name>
*
* License: BSD-2-clause
*/
diff --git a/Utility/libkqueue.c b/Utility/libkqueue.c
index 8e33d2885..3f40465e3 100644
--- a/Utility/libkqueue.c
+++ b/Utility/libkqueue.c
@@ -1,6 +1,6 @@
/* kqueue interface, C mini-library
*
- * Copyright 2012 Joey Hess <joey@kitenet.net>
+ * Copyright 2012 Joey Hess <id@joeyh.name>
*
* License: BSD-2-clause
*/
diff --git a/Utility/libmounts.c b/Utility/libmounts.c
index 9b3ae9578..c469d7710 100644
--- a/Utility/libmounts.c
+++ b/Utility/libmounts.c
@@ -5,7 +5,7 @@
* Copyright (c) 2001
* David Rufino <daverufino@btinternet.com>
* Copyright 2012
- * Joey Hess <joey@kitenet.net>
+ * Joey Hess <id@joeyh.name>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/debian/copyright b/debian/copyright
index 0053276b1..7b9807680 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,30 +2,30 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: native package
Files: *
-Copyright: © 2010-2015 Joey Hess <joey@kitenet.net>
+Copyright: © 2010-2015 Joey Hess <id@joeyh.name>
License: GPL-3+
Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/*
-Copyright: © 2012-2014 Joey Hess <joey@kitenet.net>
+Copyright: © 2012-2014 Joey Hess <id@joeyh.name>
© 2014 Sören Brunk
License: AGPL-3+
Files: Remote/Ddar.hs
-Copyright: © 2011 Joey Hess <joey@kitenet.net>
+Copyright: © 2011 Joey Hess <id@joeyh.name>
© 2014 Robie Basak <robie@justgohome.co.uk>
License: GPL-3+
Files: Utility/ThreadScheduler.hs
Copyright: 2011 Bas van Dijk & Roel van Dijk
- 2012, 2013 Joey Hess <joey@kitenet.net>
+ 2012, 2013 Joey Hess <id@joeyh.name>
License: BSD-2-clause
Files: Utility/*
-Copyright: 2012-2015 Joey Hess <joey@kitenet.net>
+Copyright: 2012-2015 Joey Hess <id@joeyh.name>
License: BSD-2-clause
Files: Utility/Gpg.hs Utility/DirWatcher*
-Copyright: © 2010-2014 Joey Hess <joey@kitenet.net>
+Copyright: © 2010-2014 Joey Hess <id@joeyh.name>
License: GPL-3+
Files: Assistant/WebApp/Bootstrap3.hs
@@ -34,7 +34,7 @@ License: BSD-2-clause
Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/*
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
- 2010 Joey Hess <joey@kitenet.net>
+ 2010 Joey Hess <id@joeyh.name>
2013 John Lawrence
License: other
Free to modify and redistribute with due credit, and obviously free to use.
@@ -46,14 +46,14 @@ License: LGPL-2.1+
Files: Utility/libmounts.c
Copyright: 1980, 1989, 1993, 1994 The Regents of the University of California
2001 David Rufino <daverufino@btinternet.com>
- 2012 Joey Hess <joey@kitenet.net>
+ 2012 Joey Hess <id@joeyh.name>
License: BSD-3-clause
* Copyright (c) 1980, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
* Copyright (c) 2001
* David Rufino <daverufino@btinternet.com>
* Copyright 2012
- * Joey Hess <joey@kitenet.net>
+ * Joey Hess <id@joeyh.name>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
diff --git a/doc/contact.mdwn b/doc/contact.mdwn
index b2ccf8201..db9914d50 100644
--- a/doc/contact.mdwn
+++ b/doc/contact.mdwn
@@ -1,4 +1,4 @@
-Joey Hess <joey@kitenet.net> is the author of git-annex. If you need to
+Joey Hess <id@joeyh.name> is the author of git-annex. If you need to
talk about something privately, email me.
The [[forum]] is the best place to discuss git-annex.
diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn
index 3cbc37ee3..29cb8a0bc 100644
--- a/doc/encryption.mdwn
+++ b/doc/encryption.mdwn
@@ -34,7 +34,7 @@ flexibility, it is the default and recommended encryption scheme.
Here the KEYID(s) are passed to `gpg` to find encryption keys.
Typically, you will say "keyid=2512E3C7" to use a specific gpg key.
-Or, you might say "keyid=joey@kitenet.net" to search for matching keys.
+Or, you might say "keyid=id@joeyh.name" to search for matching keys.
To add a new key and allow it to access all the content that is stored
in the encrypted special remote, just run `git annex
diff --git a/doc/forum/example_of_massively_disconnected_operation.mdwn b/doc/forum/example_of_massively_disconnected_operation.mdwn
index 00a5d8d6c..78ed6784b 100644
--- a/doc/forum/example_of_massively_disconnected_operation.mdwn
+++ b/doc/forum/example_of_massively_disconnected_operation.mdwn
@@ -4,7 +4,7 @@ So, I synced it back up! :) --[[Joey]]
<pre>
commit 4151f4595fe6205d4aed653617ab23eb3335130a
-Author: Joey Hess <joey@kitenet.net>
+Author: Joey Hess <id@joeyh.name>
Date: Tue Oct 26 02:18:03 2010 -0400
joey> git pull
diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn
index 26ccb9a40..e43d51657 100644
--- a/doc/git-annex-shell.mdwn
+++ b/doc/git-annex-shell.mdwn
@@ -126,7 +126,7 @@ git-shell(1)
# AUTHOR
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>
<http://git-annex.branchable.com/>
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index b8ad6a1d6..c92208e5c 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1896,7 +1896,7 @@ should be included, in, for example, `/usr/share/doc/git-annex/`.
# AUTHOR
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>
<http://git-annex.branchable.com/>
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn
index 8e3c34f8f..d0ceb3a8f 100644
--- a/doc/git-union-merge.mdwn
+++ b/doc/git-union-merge.mdwn
@@ -31,7 +31,7 @@ File modes are not currently merged.
# AUTHOR
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>
<http://git-annex.branchable.com/>
diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn
index 628d2e8cb..2271cbc2a 100644
--- a/doc/special_remotes/rsync.mdwn
+++ b/doc/special_remotes/rsync.mdwn
@@ -2,12 +2,12 @@ This special remote type rsyncs file contents to somewhere else.
Setup example:
- # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=joey@kitenet.net encryption=shared
+ # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=id@joeyh.name encryption=shared
# git annex describe myrsync "rsync server"
Or for using rsync over SSH
- # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=joey@kitenet.net encryption=shared
+ # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=id@joeyh.name encryption=shared
# git annex describe myrsync "rsync server"
## configuration
diff --git a/doc/special_remotes/webdav.mdwn b/doc/special_remotes/webdav.mdwn
index 6b5f5b122..100de8c20 100644
--- a/doc/special_remotes/webdav.mdwn
+++ b/doc/special_remotes/webdav.mdwn
@@ -37,4 +37,4 @@ the webdav remote.
Setup example:
- # WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunk=10mb keyid=joey@kitenet.net
+ # WEBDAV_USERNAME=id@joeyh.name WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunk=10mb keyid=id@joeyh.name
diff --git a/doc/thanks.mdwn b/doc/thanks.mdwn
index 90c994847..4b86a45d9 100644
--- a/doc/thanks.mdwn
+++ b/doc/thanks.mdwn
@@ -4,7 +4,7 @@ you individually, but until I meet all 1500 of you, this page will have to
do. You have my most sincere thanks. --[[Joey]]
(If I got your name wrong, or you don't want it publically posted here,
-email <joey@kitenet.net>.)
+email <id@joeyh.name>.)
## 2014-2015
diff --git a/doc/tips/using_box.com_as_a_special_remote.mdwn b/doc/tips/using_box.com_as_a_special_remote.mdwn
index 149d1f824..2edd200b1 100644
--- a/doc/tips/using_box.com_as_a_special_remote.mdwn
+++ b/doc/tips/using_box.com_as_a_special_remote.mdwn
@@ -42,7 +42,7 @@ using the webdav special remote.
* Create `~/.davfs2/secrets`. This file contains your Box.com login and password.
Your login is probably the email address you signed up with.
- echo "/media/box.com joey@kitenet.net mypassword" > ~/.davfs2/secrets
+ echo "/media/box.com id@joeyh.name mypassword" > ~/.davfs2/secrets
chmod 600 ~/.davfs2/secrets
* Now you should be able to mount Box, as a non-root user:
diff --git a/doc/users/joey.mdwn b/doc/users/joey.mdwn
index 306e1cc76..2180dd64f 100644
--- a/doc/users/joey.mdwn
+++ b/doc/users/joey.mdwn
@@ -1,2 +1,2 @@
-Joey Hess <joey@kitenet.net>
-<http://kitenet.net/~joey/>
+Joey Hess <id@joeyh.name>
+<https://joeyh.name/>
diff --git a/git-annex.cabal b/git-annex.cabal
index 17d3131de..b4d3e03cd 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -2,7 +2,7 @@ Name: git-annex
Version: 5.20150113
Cabal-Version: >= 1.8
License: GPL-3
-Maintainer: Joey Hess <joey@kitenet.net>
+Maintainer: Joey Hess <id@joeyh.name>
Author: Joey Hess
Stability: Stable
Copyright: 2010-2014 Joey Hess
diff --git a/git-annex.hs b/git-annex.hs
index f2005e13e..cdaa75434 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -1,6 +1,6 @@
{- git-annex main program dispatch
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/git-union-merge.hs b/git-union-merge.hs
index 0e4cd644c..31c71ba72 100644
--- a/git-union-merge.hs
+++ b/git-union-merge.hs
@@ -1,6 +1,6 @@
{- git-union-merge program
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}