Changeset 673a54c for doc


Ignore:
Timestamp:
2009-03-12T19:33:28Z (16 years ago)
Author:
Sven Moritz Hallberg <pesco@…>
Branches:
master
Children:
fc34fb5
Parents:
823de9d (diff), 9e768da (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:

pretty blind try at merging in the latest trunk

Location:
doc/user-guide
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • doc/user-guide/Makefile

    r823de9d r673a54c  
    1313
    1414%.html: %.db.xml
    15         xsltproc --output $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
     15        xsltproc --output $@ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
    1616
    1717%.pdf: %.db.xml

  • doc/user-guide/commands.xml

    r823de9d r673a54c  
    125125                        <description>
    126126                                <para>
    127                                         This command gives you a list of all the accounts known by BitlBee, including the numbers you'll need for most account commands.
     127                                        This command gives you a list of all the accounts known by BitlBee.
    128128                                </para>
    129129                        </description>
    … …  
    138138                        <description>
    139139                                <para>
    140                                         This account can be used to change various settings for IM accounts. For all protocols, this command can be used to change the handle or the password BitlBee uses to log in and if it should be logged in automatically. Some protocols have additional settings. You can see the settings available for a connection by typing <emphasis>account set &lt;account id&gt;</emphasis>.
    141                                 </para>
    142                                
    143                                 <para>
    144                                         For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>. For details about the syntax of this command, see <emphasis>help set</emphasis>.
     140                                        This command can be used to change various settings for IM accounts. For all protocols, this command can be used to change the handle or the password BitlBee uses to log in and if it should be logged in automatically. Some protocols have additional settings. You can see the settings available for a connection by typing <emphasis>account set &lt;account id&gt;</emphasis>.
     141                                </para>
     142                               
     143                                <para>
     144                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
    145145                                </para>
    146146                               
    147147                                <para>
    148148                                        The account ID can be a number (see <emphasis>account list</emphasis>), the protocol name or (part of) the screenname, as long as it matches only one connection.
     149                                </para>
     150                        </description>
     151                </bitlbee-command>
     152        </bitlbee-command>
     153
     154        <bitlbee-command name="chat">
     155                <short-description>Chatroom list maintenance</short-description>
     156                <syntax>chat &lt;action&gt; [&lt;arguments&gt;]</syntax>
     157
     158                <description>
     159
     160                        <para>
     161                                Available actions: add, del, list, with and set. See <emphasis>help chat &lt;action&gt;</emphasis> for more information.
     162                        </para>
     163
     164                </description>
     165
     166                <bitlbee-command name="add">
     167                        <syntax>chat add &lt;account&gt; &lt;room&gt; [&lt;channel&gt;]</syntax>
     168
     169                        <description>
     170                                <para>
     171                                        Add a chatroom to the list of chatrooms you're interested in. BitlBee needs this list to map room names to a proper IRC channel name.
     172                                </para>
     173
     174                                <para>
     175                                        After adding a room to your list, you can simply use the IRC /join command to enter the room. Also, you can tell BitlBee to automatically join the room when you log in. (See <emphasis>chat set</emphasis>)
     176                                </para>
     177                        </description>
     178
     179                </bitlbee-command>
     180
     181                <bitlbee-command name="del">
     182                        <syntax>chat del &lt;chat id&gt;</syntax>
     183
     184                        <description>
     185                                <para>
     186                                        This commands deletes an chatroom from your list.
     187                                </para>
     188
     189                                <para>
     190                                        The room ID can be a number (see <emphasis>chat list</emphasis>), or (part of) the name of the room/channel.
     191                                </para>
     192                        </description>
     193                </bitlbee-command>
     194
     195                <bitlbee-command name="list">
     196                        <syntax>chat list</syntax>
     197
     198                        <description>
     199                                <para>
     200                                        This command gives you a list of all the chatrooms known by BitlBee.
     201                                </para>
     202                        </description>
     203                </bitlbee-command>
     204
     205                <bitlbee-command name="with">
     206                        <syntax>chat with &lt;nickname&gt;</syntax>
     207
     208                        <description>
     209                                <para>
     210                                        While most <emphasis>chat</emphasis> subcommands are about named chatrooms, this command can be used to open an unnamed groupchat with one or more persons. This command is what <emphasis>/join #nickname</emphasis> used to do in older BitlBee versions.
     211                                </para>
     212                        </description>
     213                </bitlbee-command>
     214
     215                <bitlbee-command name="set">
     216                        <syntax>chat set &lt;chat id&gt;</syntax>
     217                        <syntax>chat set &lt;chat id&gt;/&lt;setting&gt;</syntax>
     218                        <syntax>chat set &lt;chat id&gt;/&lt;setting&gt; &lt;value&gt;</syntax>
     219                        <syntax>chat set -del &lt;chat id&gt;/&lt;setting&gt;</syntax>
     220
     221                        <description>
     222                                <para>
     223                                        This command can be used to change various settings for chatrooms.
     224                                </para>
     225                               
     226                                <para>
     227                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
     228                                </para>
     229                               
     230                                <para>
     231                                        The room ID can be a number (see <emphasis>chat list</emphasis>), or (part of) the name of the room/channel.
    149232                                </para>
    150233                        </description>
    … …  
    452535        </bitlbee-setting>
    453536
     537        <bitlbee-setting name="auto_join" type="boolean" scope="chat">
     538                <default>false</default>
     539
     540                <description>
     541                        <para>
     542                                With this option enabled, BitlBee will automatically join this chatroom when you log in.
     543                        </para>
     544                </description>
     545        </bitlbee-setting>
     546
    454547        <bitlbee-setting name="auto_reconnect" type="boolean" scope="both">
    455548                <default>false</default>
    … …  
    712805        </bitlbee-setting>
    713806
     807        <bitlbee-setting name="nick" type="string" scope="chat">
     808
     809                <description>
     810                        <para>
     811                                You can use this option to set your nickname in a chatroom. You won't see this nickname yourself, but other people in the room will. By default, BitlBee will use your username as the chatroom nickname.
     812                        </para>
     813                </description>
     814        </bitlbee-setting>
     815
    714816        <bitlbee-setting name="password" type="string" scope="both">
    715817                <description>
    … …  
    791893        <bitlbee-setting name="resource_select" type="string" scope="account">
    792894                <default>priority</default>
    793                 <possible-values>priority, time</possible-values>
     895                <possible-values>priority, activity</possible-values>
    794896
    795897                <description>
    … …  
    799901
    800902                        <para>
    801                                 Normally it's set to <emphasis>priority</emphasis> which means messages will always be delivered to the buddy's resource with the highest priority. If the setting is set to <emphasis>time</emphasis>, messages will be delivered to the resource that was last used to send you a message (or the resource that most recently connected).
     903                                Normally it's set to <emphasis>priority</emphasis> which means messages will always be delivered to the buddy's resource with the highest priority. If the setting is set to <emphasis>activity</emphasis>, messages will be delivered to the resource that was last used to send you a message (or the resource that most recently connected).
    802904                        </para>
    803905                </description>
    … …  
    10811183
    10821184        </bitlbee-command>
    1083 
    1084         <bitlbee-command name="join_chat">
    1085                 <short-description>Join a named groupchat/conference room</short-description>
    1086                 <syntax>join_chat &lt;connection&gt; &lt;room name&gt; [&lt;channel name&gt;] [&lt;room nickname&gt;] [&lt;password&gt;]</syntax>
    1087 
    1088                 <description>
    1089                         <para>
    1090                                 On most IM-networks groupchats can be started using the /join command. (<emphasis>/join #foo</emphasis> to start a chatroom with you and <emphasis>foo</emphasis>) This doesn't work with names groupchats though (which exist on Jabber networks and AIM, for example), instead you can use this command.
    1091                         </para>
    1092 
    1093                         <para>
    1094                                 The first two arguments are required. <emphasis>room name</emphasis> is the name of the chatroom on the IM-network. <emphasis>channel name</emphasis> is the IRC channel name BitlBee should map this to. <emphasis>room nickname</emphasis> is the nickname you want to have in this channel. If you don't give these options, BitlBee will do the right guesses.
    1095                         </para>
    1096 
    1097                         <para>
    1098                                 The following command will join you to the chatroom called <emphasis>bitlbee@conference.bitlbee.org</emphasis>. The channel will be called <emphasis>&amp;bitlbee-help</emphasis> because <emphasis>&amp;bitlbee</emphasis> will already be in use. Your nickname will be <emphasis>help-me</emphasis>.
    1099                         </para>
    1100                 </description>
    1101 
    1102                 <ircexample>
    1103                         <ircline nick="wilmer">join_chat jabber bitlbee@conference.bitlbee.org &amp;bitlbee-help help-me</ircline>
    1104                 </ircexample>
    1105 
    1106         </bitlbee-command>
    11071185</chapter>

  • doc/user-guide/help.xml

    r823de9d r673a54c  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
    33

  • doc/user-guide/misc.xml

    r823de9d r673a54c  
    6969
    7070<para>
    71 If you want to start a groupchat with the person <emphasis>lisa_msn</emphasis> in it, just join the channel <emphasis>#lisa_msn</emphasis>. BitlBee will refuse to join you to the channel with that name, but it will create a new virtual channel with root, you and lisa_msn in it.
     71To open a groupchat, use the <emphasis>chat with</emphasis> command. For example,  to start a groupchat with the person <emphasis>lisa_msn</emphasis> in it, just type <emphasis>chat with lisa_msn</emphasis>. BitlBee will create a new virtual channel with root, you and lisa_msn in it.
    7272</para>
    7373
    7474<para>
    75 Of course a channel with only two people isn't really exciting yet. So the next step is to invite some other people to the channel. For this, you can use the <emphasis>/invite</emphasis> command of your IRC client. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
     75Then, just use the ordinary IRC <emphasis>/invite</emphasis> command to invite more people. Please do keep in mind that all the people have to be on the same network and contact list! You can't invite Yahoo! buddies into an MSN groupchat.
    7676</para>
    7777
    7878<para>
    79 Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>join_chat</emphasis> command to join them. See <emphasis>help join_chat</emphasis> for more information.
     79Some protocols (like Jabber) also support named groupchats. BitlBee now supports these too. You can use the <emphasis>chat add</emphasis> command to join them. See <emphasis>help chat_add</emphasis> for more information.
    8080</para>
    8181

  • doc/user-guide/user-guide.xml

    r823de9d r673a54c  
    1 <?xml version="1.0" encoding="iso-8859-1"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
    33
Note: See TracChangeset for help on using the changeset viewer.