From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 28 Dec 2016 16:29:21 +0000 (-0400)
Subject: a few last changes post xmpp removal
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~278^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf6545198b07eadd90e163ab1eb215eb0b844d7f;p=git-annex.git

a few last changes post xmpp removal
---

diff --git a/Remote.hs b/Remote.hs
index bcd91b7034..9479e72d1b 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -353,7 +353,7 @@ checkAvailable :: Bool -> Remote -> IO Bool
 checkAvailable assumenetworkavailable = 
 	maybe (return assumenetworkavailable) doesDirectoryExist . localpath
 
-{- Remotes using the XMPP transport have urls like xmpp::user@host -}
+{- Old remotes using the XMPP transport have urls like xmpp::user@host -}
 isXMPPRemote :: Remote -> Bool
 isXMPPRemote remote = Git.repoIsUrl r && "xmpp::" `isPrefixOf` Git.repoLocation r
   where
diff --git a/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
index 257054a90c..4e3c53e0a4 100644
--- a/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
+++ b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn
@@ -1,2 +1,4 @@
 
 While trying so establish a jabber link via a server that runs a nonstandard port I came across the problem that git-annex always appends :5222 to the jabber server address. This effectively stops the connection procedure at a point where it does not need to.
+
+> XMPP support has been removed from git-annex, so closing. [[done]]