Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/user-guide/commands.xml

    r25b05b7 r4b53c65  
    648648        </bitlbee-setting>
    649649
    650         <bitlbee-setting name="auto_connect" type="boolean" scope="account,global">
     650        <bitlbee-setting name="auto_connect" type="boolean" scope="both">
    651651                <default>true</default>
    652652
    … …  
    672672        </bitlbee-setting>
    673673
    674         <bitlbee-setting name="auto_reconnect" type="boolean" scope="account,global">
     674        <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
    675675                <default>true</default>
    676676
    … …  
    726726        </bitlbee-setting>
    727727
    728         <bitlbee-setting name="away" type="string" scope="account,global">
     728        <bitlbee-setting name="away" type="string" scope="both">
    729729                <description>
    730730                        <para>
    … …  
    10761076        </bitlbee-setting>
    10771077
    1078         <bitlbee-setting name="nick_format" type="string" scope="account,global">
     1078        <bitlbee-setting name="nick_format" type="string" scope="both">
    10791079                <default>%-@nick</default>
    10801080
    … …  
    11261126                <description>
    11271127                        <para>
    1128                                 This enables OAuth authentication for Twitter accounts. From June 2010 this will be mandatory.
    1129                         </para>
    1130 
    1131                         <para>
    1132                                 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.
    1133                         </para>
    1134 
    1135                         <para>
    1136                                 The resulting access token will be saved permanently, so you have to do this only once.
     1128                                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.
     1129                        </para>
     1130
     1131                        <para>
     1132                                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.
     1133                        </para>
     1134
     1135                        <para>
     1136                                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.
    11371137                        </para>
    11381138                </description>
    … …  
    11691169        </bitlbee-setting>
    11701170
    1171         <bitlbee-setting name="password" type="string" scope="account,global">
     1171        <bitlbee-setting name="password" type="string" scope="both">
    11721172                <description>
    11731173                        <para>
    … …  
    13921392                <description>
    13931393                        <para>
    1394                                 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).
    1395                         </para>
    1396 
    1397                         <para>
    1398                                 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.
    1399                         </para>
    1400                 </description>
    1401         </bitlbee-setting>
    1402 
    1403         <bitlbee-setting name="status" type="string" scope="account,global">
    1404                 <description>
    1405                         <para>
    1406                                 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.
     1394                                Currently only available for Jabber connections. Set this to true if the server accepts SSL connections.
     1395                        </para>
     1396                </description>
     1397        </bitlbee-setting>
     1398
     1399        <bitlbee-setting name="status" type="string" scope="both">
     1400                <description>
     1401                        <para>
     1402                                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.
    14071403                        </para>
    14081404
    … …  
    14121408
    14131409                        <para>
    1414                                 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>.
     1410                                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>.
    14151411                        </para>
    14161412                </description>
    … …  
    14851481                        <para>
    14861482                                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.
    1487                         </para>
    1488                 </description>
    1489         </bitlbee-setting>
    1490 
    1491         <bitlbee-setting name="tls_verify" type="boolean" scope="account">
    1492                 <default>true</default>
    1493 
    1494                 <description>
    1495                         <para>
    1496                                 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.
    1497                         </para>
    1498 
    1499                         <para>
    1500                                 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.
    1501                         </para>
    1502 
    1503                         <para>
    1504                                 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.
    15051483                        </para>
    15061484                </description>
Note: See TracChangeset for help on using the changeset viewer.