From: gregor herrmann <gregoa@debian.org>
Date: Sun, 25 Sep 2011 15:07:24 +0000 (+0200)
Subject: Merge branch 'master' into gregoa
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/62218d9b082bf37952ee4aecd37a6cee48943f63?hp=02de77283931c1c9a258abf7d4a5d51ab248ad30

Merge branch 'master' into gregoa
---

diff --git a/bti.example b/bti.example
index 615cc10..57c55c9 100644
--- a/bti.example
+++ b/bti.example
@@ -6,7 +6,7 @@
 account=twitmaster
 password=icanhascheezburger
 host=identica
-# Example of a custom laconica installation
+# Example of a custom StatusNet installation
 #host=http://army.twit.tv/api/statuses
 logfile=.bti.log
 #action=update
diff --git a/bti.xml b/bti.xml
index ae08e4f..dfd0718 100644
--- a/bti.xml
+++ b/bti.xml
@@ -99,7 +99,7 @@
 		options are "twitter" to send to twitter.com and "identica" to
         send to identi.ca.
 
-        If you want to send the message to a custom laconi.ca installation,
+        If you want to send the message to a custom StatusNet installation,
         you should specify the API URI. For example identi.ca's URI is:
         https://identi.ca/api/statuses
               </para>
@@ -345,7 +345,7 @@
 		 options are either "twitter" or "identica" to send to
 		 twitter.com or identi.ca respectively.
 
-         If you want to send the message to a custom laconi.ca installation,
+         If you want to send the message to a custom StatusNet installation,
          you should specify the API URI. For example identi.ca's URI is:
          https://identi.ca/api/statuses.
                </para>