diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-23 23:00:54 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-11-23 23:00:54 +0000 |
| commit | 4e041946706d3fc3aed405152028b02ec2794902 (patch) | |
| tree | ef4a4862f5476c49150cdd25f2ebbb3707ea2246 /doc/user-guide | |
| parent | b3117f2524775ff7c61ead7c3bdb3799064ed97f (diff) | |
| parent | fb51d85751b36098ad4271bc4553ade4dc53f20b (diff) | |
Merging BitlBee 1.2.4+
Diffstat (limited to 'doc/user-guide')
| -rw-r--r-- | doc/user-guide/commands.xml | 4 | ||||
| -rw-r--r-- | doc/user-guide/misc.xml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index fcb1c8be..af566de4 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -174,6 +174,10 @@ <para> 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>) </para> + + <para> + Password-protected rooms work exactly like on IRC, by passing the password as an extra argument to /join. + </para> </description> </bitlbee-command> diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml index 3102b8b0..68b44e95 100644 --- a/doc/user-guide/misc.xml +++ b/doc/user-guide/misc.xml @@ -76,7 +76,7 @@ Then, just use the ordinary IRC <emphasis>/invite</emphasis> command to invite m </para> <para> -Some 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. +Some 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. </para> </sect1> |