Changeset 601e813 for doc

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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] Wilmer

Location:

doc

Files:

• bitlbee.8 (modified) (1 diff)
• bitlbee.xinetd (modified) (1 diff)
• example_plugin.c (modified) (1 diff)
• user-guide/commands.xml (modified) (5 diffs)

doc/bitlbee.8

@@ -116 +116 @@
 .SH AUTHORS
 .PP
- Wilmer van der Gaast <lintux@lintux.cx>
+ Wilmer van der Gaast <wilmer@gaast.net>
 .BR
  Jelmer Vernooij <jelmer@vernstok.nl>

doc/bitlbee.xinetd

@@ -14 +14 @@
         server          = /usr/local/sbin/bitlbee
         
-        ## xinetd is fucking retarded, what's the use of this port flag if
-        ## it HAS to be the same as in /etc/services ?
-        # port          = 6667
+        ## You might want to limit access to localhost only:
+        # bind            = 127.0.0.1
+        
+        ## Thanks a lot to friedman@splode.com for telling us about the type
+        ## argument, so now this file can be used without having to edit
+        ## /etc/services too.
+        type            = UNLISTED
+        port            = 6667
 }

doc/example_plugin.c

@@ -3 +3 @@
  * a shared library and place it in the plugin directory: 
  *
- * gcc -o example.so -shared example.c
+ * gcc -o example.so -shared example.c `pkg-config --cflags bitlbee`
  * cp example.so /usr/local/lib/bitlbee
  */
 #include <stdio.h>
+#include <bitlbee.h>
 
 void init_plugin(void)

doc/user-guide/commands.xml

@@ -141 +141 @@
                 <short-description>Add a buddy to your contact list</short-description>
                 <syntax>add &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
+                <syntax>add -tmp &lt;connection&gt; &lt;handle&gt; [&lt;nick&gt;]</syntax>
 
                 <description>
@@ -149 +150 @@
                         <para>
                                 If you want, you can also tell BitlBee what nick to give the new contact. Of course you can also use the <emphasis>rename</emphasis> command for that, but sometimes this might be more convenient.
+                        </para>
+                        
+                        <para>
+                                Adding -tmp adds the buddy to the internal BitlBee structures only, not to the real contact list (like done by <emphasis>set handle_unknown add</emphasis>). This allows you to talk to people who are not in your contact list.
                         </para>
                 </description>
@@ -197 +202 @@
                 <syntax>block &lt;nick&gt;</syntax>
                 <syntax>block &lt;connection&gt; &lt;handle&gt;</syntax>
+                <syntax>block &lt;connection&gt;</syntax>
 
                 <description>
                         <para>
                                 Puts the specified user on your ignore list. Either specify the user's nick when you have him/her in your contact list or a connection number and a user handle.
+                        </para>
+                        
+                        <para>
+                                When called with only a connection specification as an argument, the command displays the current block list for that connection.
                         </para>
                 </description>
@@ -214 +224 @@
                                 Reverse of block. Unignores the specified user or user handle on specified connection.
                         </para>
+                        
+                        <para>
+                                When called with only a connection specification as an argument, the command displays the current allow list for that connection.
+                        </para>
                 </description>
         </bitlbee-command>
@@ -607 +621 @@
 
                         <para>
-                                To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command.
+                                To identify yourself in later sessions, you can use the <emphasis>identify</emphasis> command. To change your password later, you can use the <emphasis>set password</emphasis> command.
                         </para>
                 </description>