Changeset 164352e for doc

Timestamp:

2011-12-24T18:02:39Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (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:

Merging mainline.

File:

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

doc/user-guide/commands.xml

@@ -648 +648 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="auto_connect" type="boolean" scope="both">
+        <bitlbee-setting name="auto_connect" type="boolean" scope="account,global">
                 <default>true</default>
 
@@ -672 +672 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
+        <bitlbee-setting name="auto_reconnect" type="boolean" scope="account,global">
                 <default>true</default>
 
@@ -726 +726 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="away" type="string" scope="both">
+        <bitlbee-setting name="away" type="string" scope="account,global">
                 <description>
                         <para>
@@ -1076 +1076 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="nick_format" type="string" scope="both">
+        <bitlbee-setting name="nick_format" type="string" scope="account,global">
                 <default>%-@nick</default>
 
@@ -1169 +1169 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="password" type="string" scope="both">
+        <bitlbee-setting name="password" type="string" scope="account,global">
                 <description>
                         <para>
@@ -1392 +1392 @@
                 <description>
                         <para>
-                                Currently only available for Jabber connections. Set this to true if the server accepts SSL connections.
-                        </para>
-                </description>
-        </bitlbee-setting>
-
-        <bitlbee-setting name="status" type="string" scope="both">
-                <description>
-                        <para>
-                                Certain protocols (like Jabber/XMPP) support status messages, similar to away messages. They can be used to indicate things like your location or activity, without showing up as away/busy.
+                                Currently only available for Jabber connections. Set this to true if you want to connect to the server on an SSL-enabled port (usually 5223).
+                        </para>
+
+                        <para>
+                                Please note that this method of establishing a secure connection to the server has long been deprecated. You are encouraged to look at the <emphasis>tls</emphasis> setting instead.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="status" type="string" scope="account,global">
+                <description>
+                        <para>
+                                Most IM protocols support status messages, similar to away messages. They can be used to indicate things like your location or activity, without showing up as away/busy.
                         </para>
 
@@ -1408 +1412 @@
 
                         <para>
-                                Away states set using <emphasis>/away</emphasis> or the <emphasis>away</emphasis> setting will override this setting. To un-set the setting, use <emphasis>set -del status</emphasis>.
+                                Away states set using <emphasis>/away</emphasis> or the <emphasis>away</emphasis> setting will override this setting. To clear the setting, use <emphasis>set -del status</emphasis>.
                         </para>
                 </description>
@@ -1481 +1485 @@
                         <para>
                                 If you want to force BitlBee to use TLS sessions only (and to give up if that doesn't seem to be possible) you can set this setting to <emphasis>true</emphasis>. Set it to <emphasis>false</emphasis> if you want the session to remain plain-text.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="tls_verify" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Currently only available for Jabber connections in combination with the <emphasis>tls</emphasis> setting. Set this to <emphasis>true</emphasis> if you want BitlBee to strictly verify the server's certificate against a list of trusted certificate authorities.
+                        </para>
+
+                        <para>
+                                The hostname used in the certificate verification is the value of the <emphasis>server</emphasis> setting if the latter is nonempty and the domain of the username else. If you get a hostname related error when connecting to Google Talk with a username from the gmail.com or googlemail.com domain, please try to empty the <emphasis>server</emphasis> setting.
+                        </para>
+
+                        <para>
+                                Please note that no certificate verification is performed when the <emphasis>ssl</emphasis> setting is used, or when the <emphasis>CAfile</emphasis> setting in <emphasis>bitlbee.conf</emphasis> is not set.
                         </para>
                 </description>