Changeset b20b32f for doc


Ignore:
Timestamp:
2005-11-28T01:14:06Z (14 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
65e2ce1, cfcc587
Parents:
2cdd8ce (diff), dfde8e0 (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 from Wilmer

Location:
doc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • doc/CHANGES

    r2cdd8ce rb20b32f  
    88- HTML stripping is configurable again.
    99- Quit messages (at least on crashes) should appear again.
     10- Cleaned up some unnecessary code in the Jabber module, and implemented
     11  handlers for headline messages (which allows you to use RSS-to-Jabber
     12  gateways).
    1013
    1114Finished ...
  • doc/Makefile

    r2cdd8ce rb20b32f  
    11-include ../Makefile.settings
     2
     3all:
     4        # Only build the docs if this is a bzr checkout
     5        test ! -d ../.bzr || $(MAKE) -C user-guide
    26
    37install:
  • doc/bitlbee.8

    r2cdd8ce rb20b32f  
    3939networks and acts as a gateway. Users can connect to the server
    4040with any normal IRC client and see their 'buddy list' in
    41 #bitlbee. BitlBee's protocol support is based on the gaim
     41&bitlbee. BitlBee's protocol support is based on the gaim
    4242protocol plugins. BitlBee currently supports Oscar (aim and icq),
    4343MSN, Jabber and Yahoo.
     
    8686.SH COMMANDS
    8787To get a complete list of commands, please use the \fBhelp commands\fP
    88 command in the #bitlbee channel.
     88command in the &bitlbee channel.
    8989.SH "SEE ALSO"
    9090.BR ircd (8),
  • doc/user-guide/Usage.xml

    r2cdd8ce rb20b32f  
    1414
    1515<sect1>
    16 <title>The #bitlbee control channel</title>
     16<title>The &amp;bitlbee control channel</title>
    1717
    1818<para>
    1919Once you are connected to the BitlBee server, you are automatically joined
    20 to #bitlbee on that server. This channel acts like the 'buddy list' you have
     20to &amp;bitlbee on that server. This channel acts like the 'buddy list' you have
    2121on the various other chat networks.
    2222</para>
    2323
    2424<para>
    25 The user 'root' always hangs around in #bitlbee and acts as your interface
    26 to bitlbee. All commands you give on #bitlbee are 'answered' by root.
     25The user 'root' always hangs around in &amp;bitlbee and acts as your interface
     26to bitlbee. All commands you give on &amp;bitlbee are 'answered' by root.
     27</para>
     28
     29<para>
     30You might be slightly confused by the &amp; in the channel name. This is,
     31however, completely allowed by the IRC standards. Just try it on a regular
     32IRC server, it should work. The difference between the standard #channels
     33and &amp;channels is that the #channels are distributed over all the servers
     34on the IRC network, while &amp;channels are local to one server. Because
     35the BitlBee control channel is local to one server (and in fact, to one person),
     36this name seems more suitable. Also, with this name, it's harder to confuse
     37the control channel with the #bitlbee channel on OFTC.
    2738</para>
    2839
  • doc/user-guide/commands.xml

    r2cdd8ce rb20b32f  
    154154                <ircexample>
    155155                        <ircline nick="ctrlsoft">add 3 gryp@jabber.org grijp</ircline>
    156                         <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>#bitlbee</emphasis></ircaction>
     156                        <ircaction nick="grijp" hostmask="gryp@jabber.org">has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
    157157                </ircexample>
    158158        </bitlbee-command>
     
    357357                <description>
    358358                        <para>
    359                                 Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting.
     359                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can change these states using this setting.
    360360                        </para>
    361361
  • doc/user-guide/docbook.xsl

    r2cdd8ce rb20b32f  
    1919
    2020        <xsl:template match="ircaction">
    21                 <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
     21                <xsl:text> * </xsl:text><xsl:value-of select="@nick"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#10;</xsl:text>
    2222        </xsl:template>
    2323
  • doc/user-guide/quickstart.xml

    r2cdd8ce rb20b32f  
    77
    88<para>
    9 The center of BitlBee is the control channel, <emphasis>#bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
     9The center of BitlBee is the control channel, <emphasis>&amp;bitlbee</emphasis>. Two users will always be there, <emphasis>you</emphasis> (where "you" is the nickname you are using) and the system user, <emphasis>root</emphasis>.
    1010</para>
    1111
     
    9797<ircexample>
    9898        <ircline nick="you">add 0 r2d2@example.com</ircline>
    99         <ircaction nick="r2d2"> has joined <emphasis>#bitlbee</emphasis></ircaction>
     99        <ircaction nick="r2d2"> has joined <emphasis>&amp;bitlbee</emphasis></ircaction>
    100100</ircexample>
    101101
     
    122122
    123123<para>
    124 First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in #bitlbee:
     124First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, <emphasis>help groupchats</emphasis> for more). If someone not on your contact list sends you a message, simply add them to the proper account with the <emphasis>add</emphasis> command. Once they are on your list and online, you can chat with them in &amp;bitlbee:
    125125</para>
    126126
     
    131131
    132132<para>
    133 If you'd rather chat with them in a separate window use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the #bitlbee channel, use the <emphasis>set private</emphasis> command: <emphasis>set private true</emphasis> (<emphasis>set private false</emphasis> to change back).
     133If you'd rather chat with them in a separate window use the <emphasis>/msg</emphasis> or <emphasis>/query</emphasis> command, just like you would for a private message in IRC.  If you want to have messages automatically come up in private messages rather than in the &amp;bitlbee channel, use the <emphasis>set private</emphasis> command: <emphasis>set private true</emphasis> (<emphasis>set private false</emphasis> to change back).
    134134</para>
    135135
Note: See TracChangeset for help on using the changeset viewer.