Changeset eb6df6a for doc/user-guide/commands.xml

Timestamp:

2010-07-11T17:21:21Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

be999a5

Parents:

3759849 (diff), 00540d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with upstraem bitlbee 1.2.8

File:

• doc/user-guide/commands.xml (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -633 +633 @@
         </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>
@@ -1231 +1249 @@
         </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>
@@ -1244 +1276 @@
                         </para>
                 </description>
-
         </bitlbee-setting>