aboutsummaryrefslogtreecommitdiffstats
path: root/doc/user-guide
diff options
context:
space:
mode:
authorSven Moritz Hallberg <pesco@khjk.org>2010-07-11 19:21:21 +0200
committerSven Moritz Hallberg <pesco@khjk.org>2010-07-11 19:21:21 +0200
commiteb6df6a280c458546ebc57126e63a828674b4cd8 (patch)
treeb8eead746fe97b7fb4bcf9a518c452ad87caed65 /doc/user-guide
parent37598495deeb42e1cd216a0a4ba8068e4a6da453 (diff)
parent00540d40be63b4db537a661d1a17c49a1790f79c (diff)
merge with upstraem bitlbee 1.2.8
Diffstat (limited to 'doc/user-guide')
-rw-r--r--doc/user-guide/commands.xml33
1 files changed, 32 insertions, 1 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 9aa99775..6e0c24d5 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -632,6 +632,24 @@
</description>
</bitlbee-setting>
+ <bitlbee-setting name="base_url" type="string" scope="account">
+ <default>http://twitter.com</default>
+
+ <description>
+ <para>
+ There are more services that understand the Twitter API than just Twitter.com. BitlBee can connect to all Twitter API implementations.
+ </para>
+
+ <para>
+ For example, set this setting to <emphasis>http://identi.ca/api</emphasis> to use Identi.ca.
+ </para>
+
+ <para>
+ Keep two things in mind: When not using Twitter, you <emphasis>must</emphasis> also disable the <emphasis>oauth</emphasis> setting as it currently only works with Twitter. If you're still having issues, make sure there is <emphasis>no</emphasis> slash at the end of the URL you enter here.
+ </para>
+ </description>
+ </bitlbee-setting>
+
<bitlbee-setting name="buddy_sendbuffer" type="boolean" scope="global">
<default>false</default>
@@ -1230,6 +1248,20 @@
</description>
</bitlbee-setting>
+ <bitlbee-setting name="user_agent" type="string" scope="account">
+ <default>BitlBee</default>
+
+ <description>
+ <para>
+ Some Jabber servers are configured to only allow a few (or even just one) kinds of XMPP clients to connect to them.
+ </para>
+
+ <para>
+ You can change this setting to make BitlBee present itself as a different client, so that you can still connect to these servers.
+ </para>
+ </description>
+ </bitlbee-setting>
+
<bitlbee-setting name="voice_buddies" type="string" scope="global">
<default>notaway</default>
<possible-values>encrypted, trusted, notaway, online, false</possible-values>
@@ -1243,7 +1275,6 @@
If "false", the flag is never set. On "notaway", the flag is removed for users marked as "away" and set for all others. On "encrypted", the flag is set for users with whom we have an encrypted connection. On "trusted", it is set only for encrypted connections using a trusted key. On "online", the flag is set whenever the user is online; only meaningful in conjunction with "show_offline".
</para>
</description>
-
</bitlbee-setting>
<bitlbee-setting name="web_aware" type="string" scope="account">