Ignore:
Timestamp:
2016-09-24T20:14:34Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
ba52ac5
Parents:
63cad66 (diff), 82cb190 (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 branch 'master' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/user-guide/commands.xml

    r63cad66 r3fbce97  
    182182                               
    183183                                <para>
    184                                         For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
     184                                        For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
    185185                                </para>
    186186                               
     
    240240                               
    241241                                <para>
    242                                         For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
     242                                        For more information about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
    243243                                </para>
    244244                               
     
    785785                        <para>
    786786                                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.
     787                        </para>
     788                </description>
     789        </bitlbee-setting>
     790
     791        <bitlbee-setting name="carbons" type="boolean" scope="account">
     792                <default>true</default>
     793
     794                <description>
     795                        <para>
     796                                Jabber specific. "Message carbons" (XEP-0280) is a server feature to get copies of outgoing messages sent from other clients connected to the same account. It's not widely supported by most public XMPP servers (easier if you host your own), but this will probably change in the next few years.
     797                        </para>
     798                        <para>
     799                                This defaults to true, which will enable it if the server supports it, or fail silently if it's not. This setting only exists to allow disabling the feature if anyone considers it undesirable.
     800                        </para>
     801                        <para>
     802                                See also the <emphasis>self_messages</emphasis> setting.
    787803                        </para>
    788804                </description>
     
    10931109                       
    10941110                        <para>
    1095                                 With modes "chat" and "many", you can send direct messages by /msg'ing your contacts directly. Note, however, that incoming DMs are not fetched yet.
     1111                                With modes "chat" and "many", you can send direct messages by /msg'ing your contacts directly. Incoming DMs are only fetched if the "stream" setting is on (default).
    10961112                        </para>
    10971113                       
     
    11581174                <description>
    11591175                        <para>
    1160                                 By default, BitlBee generates a nickname for every contact by taking its handle and chopping off everything after the @. In some cases, this gives very inconvenient nicknames. The Facebook XMPP server is a good example, as all Facebook XMPP handles are numeric.
     1176                                By default, BitlBee generates a nickname for every contact by taking its handle and chopping off everything after the @. In some cases, this gives very inconvenient nicknames. Some servers use internal identifiers, which are often just numbers.
    11611177                        </para>
    11621178
     
    11721188                <description>
    11731189                        <para>
    1174                                 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.
     1190                                This enables OAuth authentication for an IM account; right now the Twitter (working for Twitter only) and Jabber (for Google Talk only) module support it.
    11751191                        </para>
    11761192
     
    13241340        </bitlbee-setting>
    13251341
     1342        <bitlbee-setting name="proxy" type="string" scope="account">
     1343                <default>&lt;local&gt;&lt;auto&gt;</default>
     1344
     1345                <description>
     1346                        <para>
     1347                                A list of <emphasis>file transfer proxies</emphasis> for jabber. This isn't the connection proxy. Sorry, look in bitlbee.conf for those.
     1348                        </para>
     1349
     1350                        <para>
     1351                                It's a semicolon-separated list of items that can be either <emphasis>JID,HOST,PORT</emphasis> or two special values, <emphasis>&lt;local&gt;</emphasis> (to try a direct connection first) and <emphasis>&lt;auto&gt;</emphasis> (to try to discover a proxy). For example, "&lt;local&gt;;proxy.somewhere.org,123.123.123.123,7777".
     1352                        </para>
     1353                        <para>
     1354                                The address should point to a SOCKS5 bytestreams server, usually provided by jabber servers. This is only used for sending files. Note that the host address might not match what DNS tells you, and the port isn't always the same.
     1355                        </para>
     1356                        <para>
     1357                                The correct way to get a socks proxy host/port is a mystery, and the file transfer might fail anyway. Maybe just try using dropbox instead.
     1358                        </para>
     1359                </description>
     1360        </bitlbee-setting>
     1361
    13261362        <bitlbee-setting name="query_order" type="string" scope="global">
    13271363                <default>lifo</default>
     
    13841420        </bitlbee-setting>
    13851421
     1422        <bitlbee-setting name="self_messages" type="string" scope="global">
     1423                <default>true</default>
     1424                <possible-values>true, false, prefix, prefix_notice</possible-values>
     1425
     1426                <description>
     1427                        <para>
     1428                                Change this setting to customize how (or whether) to show self-messages, which are messages sent by yourself from other locations (for example, mobile clients), for IM protocols that support it.
     1429                        </para>
     1430
     1431                        <para>
     1432                                When this is set to "true", it will send those messages in the "standard" way, which is a PRIVMSG with source and target fields swapped.
     1433                        </para>
     1434                       
     1435                        <para>
     1436                                Since this isn't very well supported by some clients (the messages might appear in the wrong window), you can set it to "prefix" to show them as a normal message prefixed with "-> ", or use "prefix_notice" which is the same thing but with a NOTICE instead.
     1437                        </para>
     1438
     1439                        <para>
     1440                                You can also set it to "false" to disable these messages completely.
     1441                        </para>
     1442
     1443                        <para>
     1444                                This setting only applies to private messages. Self messages in groupchats are always shown, since they haven't caused issues in any clients so far.
     1445                        </para>
     1446
     1447                        <para>
     1448                                More information: <emphasis>https://wiki.bitlbee.org/SelfMessages</emphasis>
     1449                        </para>
     1450                </description>
     1451        </bitlbee-setting>
     1452
    13861453        <bitlbee-setting name="server" type="string" scope="account">
    13871454                <description>
     
    14171484
    14181485        <bitlbee-setting name="show_users" type="string" scope="channel">
    1419                 <default>online+,away</default>
     1486                <default>online+,special%,away</default>
    14201487
    14211488                <description>
     
    14241491                                and any modes they should have. The following statuses are currently
    14251492                                recognised: <emphasis>online</emphasis> (i.e. available, not
    1426                                 away), <emphasis>away</emphasis>, and <emphasis>offline</emphasis>.
     1493                                away), <emphasis>special</emphasis>, <emphasis>away</emphasis>,
     1494                                and <emphasis>offline</emphasis>.
    14271495                        </para>
    14281496                       
     
    14301498                                If a status is followed by a valid channel mode character
    14311499                                (@, % or +), it will be given to users with that status.
    1432                                 For example, <emphasis>online@,away+,offline</emphasis> will
    1433                                 show all users in the channel. Online people will
     1500                                For example, <emphasis>online@,special%,away+,offline</emphasis>
     1501                                will show all users in the channel. Online people will
    14341502                                have +o, people who are online but away will have +v,
    14351503                                and others will have no special modes.
     
    18911959
    18921960                        <description>
    1893                                 <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para>
     1961                                <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is necessary. Or is it?</para>
    18941962                        </description>
    18951963
Note: See TracChangeset for help on using the changeset viewer.