From 689a6e0b8f91eecfc3add9dae769bfcda5a35b77 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 21 Nov 2005 12:53:48 +0100 Subject: Changed all documentation references to the control channel from #bitlbee to &bitlbee. --- doc/bitlbee.8 | 4 ++-- doc/user-guide/Usage.xml | 19 +++++++++++++++---- doc/user-guide/commands.xml | 4 ++-- doc/user-guide/quickstart.xml | 8 ++++---- 4 files changed, 23 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/bitlbee.8 b/doc/bitlbee.8 index 27819a4e..f1d4dbce 100644 --- a/doc/bitlbee.8 +++ b/doc/bitlbee.8 @@ -38,7 +38,7 @@ BitlBee \- IRC gateway to IM chat networks BitlBee is an IRC daemon that can talk to instant messaging networks and acts as a gateway. Users can connect to the server with any normal IRC client and see their 'buddy list' in -#bitlbee. BitlBee's protocol support is based on the gaim +&bitlbee. BitlBee's protocol support is based on the gaim protocol plugins. BitlBee currently supports Oscar (aim and icq), MSN, Jabber and Yahoo. @@ -85,7 +85,7 @@ have write permissions in the default location), use this option. Show help information. .SH COMMANDS To get a complete list of commands, please use the \fBhelp commands\fP -command in the #bitlbee channel. +command in the &bitlbee channel. .SH "SEE ALSO" .BR ircd (8), .BR inetd (8), diff --git a/doc/user-guide/Usage.xml b/doc/user-guide/Usage.xml index 5d87e32b..167a74e0 100644 --- a/doc/user-guide/Usage.xml +++ b/doc/user-guide/Usage.xml @@ -13,17 +13,28 @@ it with your favorite irc client. Launch it and connect to localhost port 6667 -The #bitlbee control channel +The &bitlbee control channel Once you are connected to the BitlBee server, you are automatically joined -to #bitlbee on that server. This channel acts like the 'buddy list' you have +to &bitlbee on that server. This channel acts like the 'buddy list' you have on the various other chat networks. -The user 'root' always hangs around in #bitlbee and acts as your interface -to bitlbee. All commands you give on #bitlbee are 'answered' by root. +The user 'root' always hangs around in &bitlbee and acts as your interface +to bitlbee. All commands you give on &bitlbee are 'answered' by root. + + + +You might be slightly confused by the & in the channel name. This is, +however, completely allowed by the IRC standards. Just try it on a regular +IRC server, it should work. The difference between the standard #channels +and &channels is that the #channels are distributed over all the servers +on the IRC network, while &channels are local to one server. Because +the BitlBee control channel is local to one server (and in fact, to one person), +this name seems more suitable. Also, with this name, it's harder to confuse +the control channel with the #bitlbee channel on OFTC. diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 933fb5b6..b04a6b0a 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -153,7 +153,7 @@ add 3 gryp@jabber.org grijp - has joined #bitlbee + has joined &bitlbee @@ -356,7 +356,7 @@ - Some people prefer themself and root to have operator status in #bitlbee, other people don't. You can change these states using this setting. + Some people prefer themself and root to have operator status in &bitlbee, other people don't. You can change these states using this setting. diff --git a/doc/user-guide/quickstart.xml b/doc/user-guide/quickstart.xml index 9a8b8770..520f240f 100644 --- a/doc/user-guide/quickstart.xml +++ b/doc/user-guide/quickstart.xml @@ -6,7 +6,7 @@ Welcome to BitlBee, your IRC gateway to ICQ, MSN, AOL, Jabber and Yahoo Instant -The center of BitlBee is the control channel, #bitlbee. Two users will always be there, you (where "you" is the nickname you are using) and the system user, root. +The center of BitlBee is the control channel, &bitlbee. Two users will always be there, you (where "you" is the nickname you are using) and the system user, root. @@ -96,7 +96,7 @@ Now you might want to add some contacts, to do this we will use the ad add 0 r2d2@example.com - has joined #bitlbee + has joined &bitlbee @@ -121,7 +121,7 @@ When finished, type help quickstart5 to continue. -First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, help groupchats for more). If someone not on your contact list sends you a message, simply add them to the proper account with the add command. Once they are on your list and online, you can chat with them in #bitlbee: +First of all, a person must be on your contact list for you to chat with them (unless it's a group chat, help groupchats for more). If someone not on your contact list sends you a message, simply add them to the proper account with the add command. Once they are on your list and online, you can chat with them in &bitlbee: @@ -130,7 +130,7 @@ First of all, a person must be on your contact list for you to chat with them (u -If you'd rather chat with them in a separate window use the /msg or /query 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 set private command: set private true (set private false to change back). +If you'd rather chat with them in a separate window use the /msg or /query 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 set private command: set private true (set private false to change back). -- cgit v1.2.3 From 43e3368f4ad8249523d9c8a0d57a764ac370daf4 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 23 Nov 2005 18:35:18 +0100 Subject: Little code cleanup in Jabber module, added support for Jabber headline messages. --- doc/CHANGES | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/CHANGES b/doc/CHANGES index 2fe8b960..2981a378 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -7,6 +7,9 @@ Version 1.0: - Reviewed the xinetd file and installation instructions. - HTML stripping is configurable again. - Quit messages (at least on crashes) should appear again. +- Cleaned up some unnecessary code in the Jabber module, and implemented + handlers for headline messages (which allows you to use RSS-to-Jabber + gateways). Finished ... -- cgit v1.2.3 From 513a3239198d3e4ec26799046f75206a4d9c599c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 26 Nov 2005 02:37:28 +0100 Subject: Build docs by default in .bzr checkouts --- doc/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index e3dde912..9b473df3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,9 @@ -include ../Makefile.settings +all: + # Only build the docs if this is a bzr checkout + test ! -d ../.bzr || $(MAKE) -C user-guide + install: mkdir -p $(DESTDIR)$(MANDIR)/man8/ $(DESTDIR)$(MANDIR)/man5/ install -m 0644 bitlbee.8 $(DESTDIR)$(MANDIR)/man8/ -- cgit v1.2.3 From 1aa7ec7d1f2cf23c28cae05b32bd7e4a4aaebc4d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 26 Nov 2005 02:40:03 +0100 Subject: Fix missing space after actions. --- doc/user-guide/docbook.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/user-guide/docbook.xsl b/doc/user-guide/docbook.xsl index cfb27702..9adff305 100644 --- a/doc/user-guide/docbook.xsl +++ b/doc/user-guide/docbook.xsl @@ -18,7 +18,7 @@ - * + * -- cgit v1.2.3