Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 4 Nov 2011 19:46:33 +0000 (20:46 +0100)
bti.example
bti.xml

index 615cc10..57c55c9 100644 (file)
@@ -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 f71fc1e..58d05ae 100644 (file)
--- a/bti.xml
+++ b/bti.xml
                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>
                 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>