Changes in doc/user-guide/commands.xml [4b53c65:25b05b7]

File:

• doc/user-guide/commands.xml (modified) (9 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>
 
@@ -1126 +1126 @@
                 <description>
                         <para>
-                                This enables OAuth authentication for an IM account; right now the Twitter (working for Twitter only) and Jabber (for Google Talk, Facebook and MSN Messenger) module support it.
-                        </para>
-
-                        <para>
-                                With OAuth enabled, you shouldn't tell BitlBee your account password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with the service. If this succeeds, you will get a PIN code which you can give back to BitlBee to finish the process.
-                        </para>
-
-                        <para>
-                                The resulting access token will be saved permanently, so you have to do this only once. If for any reason you want to/have to reauthenticate, you can use <emphasis>account set</emphasis> to reset the account password to something random.
+                                This enables OAuth authentication for Twitter accounts. From June 2010 this will be mandatory.
+                        </para>
+
+                        <para>
+                                With OAuth enabled, you shouldn't tell BitlBee your Twitter password. Just add your account with a bogus password and type <emphasis>account on</emphasis>. BitlBee will then give you a URL to authenticate with Twitter. If this succeeds, Twitter will return a PIN code which you can give back to BitlBee to finish the process.
+                        </para>
+
+                        <para>
+                                The resulting access token will be saved permanently, so you have to do this only once.
                         </para>
                 </description>
@@ -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 CAfile setting in bitlbee.conf is not set.
                         </para>
                 </description>