Mercurial > ~mikael > mcabber > hg

changeset 1096:3d92e648a8db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update manpage
author Mikael Berthe <mikael@lilotux.net>
date Sat, 09 Dec 2006 11:42:14 +0100
parents 8188037a9e2a
children 5031b5f74532
files mcabber/doc/mcabber.1 mcabber/doc/mcabber.1.html mcabber/doc/mcabber.1.txt
diffstat 3 files changed, 1124 insertions(+), 450 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/doc/mcabber.1	Sat Dec 09 11:41:36 2006 +0100
+++ b/mcabber/doc/mcabber.1	Sat Dec 09 11:42:14 2006 +0100
@@ -1,433 +1,984 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "MCABBER" 1 "" "" ""
-.SH NAME
+.\"     Title: mcabber
+.\"    Author: Mikael BERTHE
+.\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
+.\"      Date: 12/09/2006
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "MCABBER" "1" "12/09/2006" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
 mcabber \- a simple Jabber console client
 .SH "SYNOPSIS"
-
-
-mcabber [ \-f configfile ] [ --help | \-h ]
-
+\fImcabber\fR [ \-f configfile ] [ \-\-help | \-h ]
 .SH "DESCRIPTION"
-
-
-mcabber(1) is a small Jabber console client\&. For now it needs a configuration file to start, so please copy the sample mcabberrc file and adapt your connection settings\&.
-
-
-You also need to have an existing Jabber account to use this software, as it cannot (un)register accounts yet\&.
-
-
+mcabber(1) is a small Jabber console client. For now it needs a configuration file to start, so please copy the sample mcabberrc file and adapt your connection settings.
+You also need to have an existing Jabber account to use this software, as it cannot (un)register accounts yet.
 Here are some of the features of mcabber:
-
-.TP 3
+.TP 3n
 \(bu
- SSL support\&.
-.TP
-\(bu
- MUC support (Multi\-User Chat)\&.
-.TP
-\(bu
- History logging: If enabled (see the CONFIGURATION FILE section), mcabber can save discussions to history log files\&.
-.TP
+
+\fISSL support\fR.
+.TP 3n
 \(bu
- Commands completion: If possible, mcabber will try to complete your command line if you hit the Tab key\&.
-.TP
+
+\fIMUC support\fR
+(Multi\-User Chat).
+.TP 3n
 \(bu
- Input line history: Any message or command entered is in the input line history and can be reused easily\&.
-.TP
+
+\fIPGP support\fR
+.TP 3n
 \(bu
- External actions: Some events (like receiving a message) can trigger an external action such as a shell script if you enable it in your configuration file\&. A sample events script ("eventcmd") is provided with mcabber source code, in the contrib directory\&.
-.LP
-
-.SH "OPTIONS"
 
-.TP
-\-\-help, \-h
-Quick help usage message
-
-.TP
-\-f configfile
-Use configuration file configfile
+\fIChat States\fR
+support (typing notifications)
+.TP 3n
+\(bu
 
-.SH "WINDOWS/PANES"
-
-
-The mcabber(1) screen is divided into 4 regions\&. The \fIroster\fR, alias \fIbuddylist\fR, is on the left\&. The \fIchat window\fR, or chat buffer, is on the right\&. The \fIinput line\fR lies at the bottom of the screen, under a small \fIlog window\fR\&.
-
-
-Two status lines surround the log window\&. The bottom status line is the "main status line" and reflects mcabber general status\&. The other line is the "chat status line" and shows the status of the currently selected buddy\&.
-
-
-To display buddies chat buffers, you will have to enter \fIchat mode\fR\&. You can enter chat mode by pressing enter, and leave chat mode with the ESC key\&. Simply sending a message will also enable chat mode\&.
+\fIHistory logging:\fR
+If enabled (see the CONFIGURATION FILE section),
+mcabber
+can save discussions to history log files.
+.TP 3n
+\(bu
 
-
-There are several advantages to the two\-mode implementation: first, it allows accurate "unread" message functionality, as described in the next section; without this, merely scrolling to a specific buddy will "read" the new messages of all buddies in\-between\&. Second, it allows quickly hiding the conversation with a single keystroke\&. Third, it allows jumping between the few buddies with whom you are conversing with the \fI/roster alternate\fR command described in another section, without having to manually scroll back and forth\&.
-
-.SH "KEYS"
-
-
-Text typing occurs in the \fIinput line\fR; basic operations are supported (left arrow, right arrow, home/end keys, insert, delete, backspace...)\&.
-
+\fICommands completion:\fR
+If possible,
+mcabber
+will try to complete your command line if you hit the Tab key.
+.TP 3n
+\(bu
 
-PageUp and PageDown keys are used to move in the roster\&.
-
-
-Up and Down arrow keys can be used to move in the input line history; they jump to the previous/next line from the history beginning with the same string (from first column to the cursor column)\&.
-
-
-To send a message, move to the choosen buddy in the buddylist, type your message and hit enter\&. If the line begins with a slash, this will be interpreted as a command (see the COMMAND section below)\&. Hit escape to leave the chat mode\&.
-
-
-Here is a quick description of the key bindings:
+\fIInput line history:\fR
+Any message or command entered is in the input line history and can be reused easily.
+.TP 3n
+\(bu
 
-Ctrl\-a		Go to the beginning of the input line
-
-Ctrl\-e		Go to the end of the input line
-
-Ctrl\-l		Force a refresh
-
-Up/Down     	Move in the input line history
-
-PgUp/PgDown	Move inside the roster (buddylist)
-
-Tab    		Complete current word, in the input line
-
-Ctrl\-g		Cancel completion / ctrl\-g
-
-Ctrl\-p/Ctrl\-n	Scroll up/down half a screen in the buffer window (chat mode)
-
-Ctrl\-Left 	Move the cursor back to the start of the current or previous word
-
-Ctrl\-Right	Move the cursor forward to the end of the current or next word
-
-Ctrl\-u		Delete from beginning of the line to the cursor
-
-Ctrl\-k		Delete from the cursor to the end of line
-
-Ctrl\-w		Backward kill word
-
-Ctrl\-t		Transpose chars
-
-Ctrl\-o		Accept line and put the next history line in the input line (accept\-line\-and\-down\-history)
-
-Ctrl\-q		Jump to the next unread message
-
-Additional key bindings may be specified using the /bind command described
-in the COMMANDS section\&.
-
-.SH "MCABBER'S ROSTER"
-
+\fIExternal actions:\fR
+Some events (like receiving a message) can trigger an external action such as a shell script if you enable it in your configuration file. A sample events script ("eventcmd") is provided with
+mcabber
+source code, in the contrib directory.
+.SH "OPTIONS"
+.PP
+\-\-help, \-h
+.RS 3n
+Quick help usage message
+.RE
+.PP
+\-f configfile
+.RS 3n
+Use configuration file
+\fIconfigfile\fR
+.RE
+.SH "WINDOWS/PANES"
+The mcabber(1) screen is divided into 4 regions. The \fIroster\fR, alias \fIbuddylist\fR, is on the left. The \fIchat window\fR, or chat buffer, is on the right. The \fIinput line\fR lies at the bottom of the screen, under a small \fIlog window\fR.
+Two status lines surround the log window. The bottom status line is the "main status line" and reflects mcabber general status. The other line is the "chat status line" and shows the status of the currently selected buddy.
+To display buddies chat buffers, you will have to enter \fIchat mode\fR. You can enter chat mode by pressing enter, and leave chat mode with the ESC key. Simply sending a message will also enable chat mode.
+There are several advantages to the two\-mode implementation: first, it allows accurate "unread" message functionality, as described in the next section; without this, merely scrolling to a specific buddy will "read" the new messages of all buddies in\-between. Second, it allows quickly hiding the conversation with a single keystroke. Third, it allows jumping between the few buddies with whom you are conversing with the \fI/roster alternate\fR command described in another section, without having to manually scroll back and forth.
+.SH "KEYS"
+Text typing occurs in the \fIinput line\fR; basic operations are supported (left arrow, right arrow, home/end keys, insert, delete, backspace\&...).
+PageUp and PageDown keys are used to move in the roster.
+Up and Down arrow keys can be used to move in the input line history; they jump to the previous/next line from the history beginning with the same string (from first column to the cursor column).
+To send a message, move to the choosen buddy in the buddylist, type your message and hit enter. If the line begins with a slash, this will be interpreted as a command (see the COMMAND section below). Hit escape to leave the chat mode.
+Here is a quick description of the key bindings:
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+Esc
+T}:T{
+Disable chat mode
+T}
+T{
+Ctrl\-d
+T}:T{
+Send/terminate a multi\-line message
+T}
+T{
+Ctrl\-p/Ctrl\-n
+T}:T{
+Scroll up/down half a screen in the buffer window (chat mode)
+T}
+T{
+Ctrl\-Left
+T}:T{
+Move the cursor back to the start of the current or previous word
+T}
+T{
+Ctrl\-Right
+T}:T{
+Move the cursor forward to the end of the current or next word
+T}
+T{
+Ctrl\-u
+T}:T{
+Delete from beginning of the line to the cursor
+T}
+T{
+Ctrl\-k
+T}:T{
+Delete from the cursor to the end of line
+T}
+T{
+Ctrl\-w
+T}:T{
+Backward kill word
+T}
+T{
+Ctrl\-t
+T}:T{
+Transpose chars
+T}
+T{
+Ctrl\-o
+T}:T{
+Accept line and put the next history line in the input line (accept\-line\-and\-down\-history)
+T}
+T{
+Ctrl\-q
+T}:T{
+Jump to the next unread message
+T}
+T{
+Ctrl\-a
+T}:T{
+Go to the beginning of the input line
+T}
+T{
+Ctrl\-e
+T}:T{
+Go to the end of the input line
+T}
+T{
+Ctrl\-l
+T}:T{
+Force a refresh
+T}
+T{
+Up/Down
+T}:T{
+Move in the input line history
+T}
+T{
+PgUp/PgDown
+T}:T{
+Move inside the roster (buddylist)
+T}
+T{
+Tab
+T}:T{
+Complete current word, in the input line
+T}
+T{
+Ctrl\-g
+T}:T{
+Cancel completion
+T}
+T{
+Ctrl\-c
+T}:T{
+Abort multi\-line messages and completions
+T}
+.TE
 
-The first listed resource on the roster is \fI[status]\fR, which keeps a log of everything that appears in the short log window below the main chat area\&. While the log window was designed for showing the latest few elements, the dedicated \fI[status]\fR buffer allows more comfortable viewing of the log, as well as scrolling it in a standard manner\&.
-
-
-Group names are displayed above the resources that are within them, and are indicated by \fI\-\-\-\fR to the left of the name\&.
-
-
-For every real Jabber resource, the roster displays four pieces of information: the resource's name or alias, its online status, its authorization status, and whether there are unread messages from the resource waiting for you\&.
-
-
+Additional key bindings may be specified using the \fI/bind\fR command described in the COMMANDS section.
+.SH "MCABBER'S ROSTER"
+The first listed resource on the roster is \fI[status]\fR, which keeps a log of everything that appears in the short log window below the main chat area. While the log window was designed for showing the latest few elements, the dedicated \fI[status]\fR buffer allows more comfortable viewing of the log, as well as scrolling it in a standard manner.
+Group names are displayed above the resources that are within them, and are indicated by \fI\-\-\-\fR to the left of the name.
+For every real Jabber resource, the roster displays four pieces of information: the resource's name or alias, its online status, its authorization status, and whether there are unread messages from the resource waiting for you.
 The online status is one of the following:
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+\fIo\fR
+T}:T{
+online
+T}
+T{
+\fIC\fR
+T}:T{
+a conference room in which you are participating
+T}
+T{
+\fIf\fR
+T}:T{
+free for chat
+T}
+T{
+\fIa\fR
+T}:T{
+away
+T}
+T{
+\fIn\fR
+T}:T{
+not available (labeled \fIextended away\fR in some clients)
+T}
+T{
+\fId\fR
+T}:T{
+do not disturb
+T}
+T{
+\fIi\fR
+T}:T{
+invisible (displayed only for your resource)
+T}
+T{
+\fI_\fR
+T}:T{
+offline (or invisible to you)
+T}
+T{
+\fI?\fR
+T}:T{
+unknown, usually meaning you are not authorized to see this resource's status
+T}
+T{
+\fIx\fR
+T}:T{
+a conference room in which you are not participating
+T}
+.TE
 
- \fBo\fR	online
- \fBf\fR	free for chat
- \fBa\fR	away
- \fBn\fR	not available (labeled \fIextended away\fR in some clients)
- \fBd\fR	do not disturb
- \fBi\fR	invisible (displayed only for your resource)
- \fB_\fR	offline (or invisible to you)
- \fB?\fR	unknown, usually meaning you are not authorized to see this resource's status
- \fBx\fR	a conference room in which you are not participating
- \fBC\fR	a conference room in which you are participating
-
-
-The authorization status indicates whether a resource is authorized to receive your online status updates, and is displayed by the brackets surrounding the resource's online status\&. Square brackets, like \fI[o]\fR, indicate that this resource is authorized to receive your status\&. Curly braces, like \fI{o}\fR, indicate that they are not authorized to receive your status\&.
-
-
-When there are unread messages from the resource which you have not looked at, a hash mark (\fI#\fR) appears in the leftmost section of the roster for that resource\&. The hash mark disappears once you view that resource's message log\&.
-
-
+The authorization status indicates whether a resource is authorized to receive your online status updates, and is displayed by the brackets surrounding the resource's online status. Square brackets, like \fI[o]\fR, indicate that this resource is authorized to receive your status. Curly braces, like \fI{o}\fR, indicate that they are not authorized to receive your status.
+When there are unread messages from the resource which you have not looked at, a hash mark (\fI#\fR) appears in the leftmost section of the roster for that resource. The hash mark disappears once you view that resource's message log.
 Examples:
-
- \fB \-\-\- Buds\fR	This is a group named \fIBuds\fR
- \fB#[o] John\fR   	John is online, can see your status, and sent you a message that you did not read yet
- \fB {?} Sally\fR  	Neither you nor Sally have authorized each other to see your online status
- \fB {a} Jane\fR   	Jane is away, but she cannot see your online status
- \fB#[C] x@y\&.c\fR	You are participating in x@y\&.c conference room, and there are unread messages
-
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l.
+T{
+\fI \-\-\- Buds\fR
+T}:T{
+This is a group named \fIBuds\fR
+T}
+T{
+\fI#[o] John\fR
+T}:T{
+John is online, can see your status, and sent you a message that you did not read yet
+T}
+T{
+\fI {?} Sally\fR
+T}:T{
+Neither you nor Sally have authorized each other to see your online status
+T}
+T{
+\fI {a} Jane\fR
+T}:T{
+Jane is away, but she cannot see your online status
+T}
+T{
+\fI#[C] x@y.c\fR
+T}:T{
+You are participating in x@y.c conference room, and there are unread messages
+T}
+.TE
 
 .SH "COMMANDS RELATED TO MCABBER"
-
-.TP
-\fB/alias\fR [name [= command line]]
-Add "name" as an alias for "command line"\&.
-
-Aliases are expanded only once, thus they can not be chained\&.
-
-"/alias name" displays the value associated with the "name" alias; "/alias name =" unsets the "name" alias\&.
-"/alias" displays a list of the existing aliases\&.
-
-Example: "/alias away = status away"\&.
-
-.TP
-\fB/bind\fR [keycode [= command line]]
-Bind a command line to the key with the "keycode" code number\&.
-
-Keycodes of unused keys are displayed by mcabber in the log window when pressing the key, for example "Unknown key=265"\&.
-
-"/bind keycode" displays the command line bound to the given keycode; "/bind keycode =" unbinds the given keycode\&.
-"/bind" displays a list of the bound keycodes\&.
-
-Note: aliases can be used in key bindings\&.
-
-Example: "/bind 265 = status online" (265 is F1 for me, but it may depend on your ncurses installation)\&.
-
-.TP
-\fB/buffer\fR clear|top|bottom|date|%|search_backward|search_forward|...
-The buffer command manipulates the current buddy's buffer (chat window)\&.
-
- \fBclear\fR      	clear the current buddy chat window
- \fBpurge\fR      	clear the current buddy chat window and empty all contents of the chat buffer
- \fBbottom\fR     	jump to the bottom of the current buddy chat buffer
- \fBtop\fR        	jump to the top of the current buddy chat buffer
- \fBup\fR [n]     	scroll the buffer up n lines (default: half a screen)
- \fBdown\fR [n]   	scroll the buffer down n lines (default: half a screen)
- \fBdate\fR date  	jump to the first line after the specified date in the chat buffer (date format: "YYYY\-mm\-dd[THH:MM:SS]", "\-" and ":" are optional)
- \fB%\fR n        	jump to position %n of the buddy chat buffer
- \fBsearch_backward\fR text	search for "text" in the current buddy chat buffer
- \fBsearch_forward\fR  text	search for "text" in the current buddy chat buffer
- \fBscroll_lock\fR	lock buffer scrolling
- \fBscroll_unlock\fR	unlock buffer scrolling
- \fBscroll_toggle\fR	toggle buffer scrolling (lock/unlock)
-
-.TP
-\fB/clear\fR
-The clear command is actually an alias for "/buffer clear"\&.
-
-.TP
-\fB/help\fR [command]
-Display generic help or help about a specific mcabber command\&.
-
-.TP
-\fB/quit\fR
-Disconnect and leave mcabber(1)\&.
+.PP
+/alias [name [= command line]]
+.RS 3n
+Add "name" as an alias for "command line". Aliases are expanded only once, thus they can not be chained. "/alias name" displays the value associated with the "name" alias; "/alias name =" unsets the "name" alias. "/alias" displays a list of the existing aliases. Example: "/alias away = status away".
+.RE
+.PP
+/bind [keycode [= command line]]
+.RS 3n
+Bind a command line to the key with the "keycode" code number. Keycodes of unused keys are displayed by
+mcabber
+in the log window when pressing the key, for example "Unknown key=265". "/bind keycode" displays the command line bound to the given keycode; "/bind keycode =" unbinds the given keycode. "/bind" displays a list of the bound keycodes. Note: aliases can be used in key bindings. Example: "/bind 265 = status online" (265 is F1 for me, but it may depend on your ncurses installation).
+.RE
+.PP
+/buffer clear|purge|top|bottom|date|%|search_backward|search_forward, /buffer scroll_lock|scroll_unlock|scroll_toggle
+.RS 3n
+The
+\fIbuffer\fR
+command manipulates the current buddy's buffer (chat window).
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+\fIclear\fR
+T}:T{
+clear the current buddy chat window
+T}
+T{
+\fIsearch_forward\fR
+text
+T}:T{
+search for "text" in the current buddy chat buffer
+T}
+T{
+\fIscroll_lock\fR
+T}:T{
+lock buffer scrolling
+T}
+T{
+\fIscroll_unlock\fR
+T}:T{
+unlock buffer scrolling
+T}
+T{
+\fIscroll_toggle\fR
+T}:T{
+toggle buffer scrolling (lock/unlock)
+T}
+T{
+\fIpurge\fR
+T}:T{
+clear the current buddy chat window and empty all contents of the chat buffer
+T}
+T{
+\fIbottom\fR
+T}:T{
+jump to the bottom of the current buddy chat buffer
+T}
+T{
+\fItop\fR
+T}:T{
+jump to the top of the current buddy chat buffer
+T}
+T{
+\fIup\fR
+[n]
+T}:T{
+scroll the buffer up n lines (default: half a screen)
+T}
+T{
+\fIdown\fR
+[n]
+T}:T{
+scroll the buffer down n lines (default: half a screen)
+T}
+T{
+\fIdate\fR
+date
+T}:T{
+jump to the first line after the specified date in the chat buffer (date format: "YYYY\-mm\-dd[THH:MM:SS]", "\-" and ":" are optional)
+T}
+T{
+\fI%\fR
+n
+T}:T{
+jump to position %n of the buddy chat buffer
+T}
+T{
+\fIsearch_backward\fR
+text
+T}:T{
+search for "text" in the current buddy chat buffer
+T}
+.TE
 
-.TP
-\fB/version\fR
+.RE
+.PP
+/clear
+.RS 3n
+The
+\fIclear\fR
+command is actually an alias for "/buffer clear".
+.RE
+.PP
+/help [command]
+.RS 3n
+Display generic help or help about a specific mcabber command.
+.RE
+.PP
+/quit
+.RS 3n
+Disconnect and leave
+mcabber(1).
+.RE
+.PP
+/version
+.RS 3n
 Display mcabber version
-
+.RE
 .SH "COMMANDS RELATED TO THE SERVER AND CONNECTION"
-
-.TP
-\fB/connect\fR
-Establish connection to the Jabber server\&.
-
-.TP
-\fB/disconnect\fR
-Terminate connection to the Jabber server\&. Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected\&.
+.PP
+/connect
+.RS 3n
+Establish connection to the Jabber server.
+.RE
+.PP
+/disconnect
+.RS 3n
+Terminate connection to the Jabber server. Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
+.RE
+.PP
+/event #n|* accept|ignore|reject, /event list
+.RS 3n
+Tell mcabber what to do about a pending event. If the first parameter is "*", the command will apply to all queued events.
+.TS
+tab(:);
+l l
+l l
+l l
+l l.
+T{
+\fIaccept\fR
+T}:T{
+accept the event #n
+T}
+T{
+\fIignore\fR
+T}:T{
+remove the event #n from the list
+T}
+T{
+\fIreject\fR
+T}:T{
+reject the event #n
+T}
+T{
+\fIlist\fR
+T}:T{
+list all pending events
+T}
+.TE
 
-.TP
-\fB/event\fR #n|* accept|ignore|reject, \fB/event\fR list
-Tell mcabber what to do about a pending event\&. If the first parameter is "*", the command will apply to all queued events\&.
+.RE
+.PP
+/rawxml send string
+.RS 3n
 
- \fBaccept\fR	accept the event #n
- \fBignore\fR	remove the event #n from the list
- \fBreject\fR	reject the event #n
- \fBlist\fR	list all pending events
-
-.TP
-\fB/rawxml\fR send string
- \fBsend\fR string: send string (raw XML format) to the Jabber server\&. No check is done on the string provided\&. BEWARE! Use this only if you know what you are doing, or you could terminate the connection\&.
-
+\fIsend\fR
+string: send string (raw XML format) to the Jabber server. No check is done on the string provided. BEWARE! Use this only if you know what you are doing, or you could terminate the connection.
+.RE
 .SH "COMMANDS RELATED TO THE ROSTER AND JABBER RESOURCES"
-
-.TP
-\fB/add\fR [jid [nickname]]
-Add the "jid" Jabber user to our roster (default group), and send a notification request to this buddy\&. If no nickname is specified, the jid is used\&. If no jid (or an empty string "") is provided or if jid is "\&.", the current buddy is used\&.
-
-.TP
-\fB/authorization\fR allow|cancel|request|request_unsubscribe [jid]
-Manage the presence subscriptions\&.
-
-If no jid is provided, the current buddy is used\&.
+.PP
+/add [jid [nickname]]
+.RS 3n
+Add the "jid" Jabber user to our roster (default group), and send a notification request to this buddy. If no nickname is specified, the jid is used. If no jid (or an empty string "") is provided or if jid is ".", the current buddy is used.
+.RE
+.PP
+/authorization allow|cancel|request|request_unsubscribe [jid]
+.RS 3n
+Manage the presence subscriptions. If no jid is provided, the current buddy is used.
+.TS
+tab(:);
+l l
+l l
+l l
+l l.
+T{
+\fIallow\fR
+T}:T{
+allow the buddy to receive your presence updates
+T}
+T{
+\fIcancel\fR
+T}:T{
+cancel the buddy' subscription to your presence updates
+T}
+T{
+\fIrequest\fR
+T}:T{
+request a subscription to the buddy's presence updates
+T}
+T{
+\fIrequest_unsubscribe\fR
+T}:T{
+request unsubscription from the buddy's presence updates
+T}
+.TE
 
- \fBallow\fR  	allow the buddy to receive your presence updates
- \fBcancel\fR 	cancel the buddy' subscription to your presence updates
- \fBrequest\fR	request a subscription to the buddy's presence updates
- \fBrequest_unsubscribe\fR request unsubscription from the buddy's presence updates
-
-.TP
-\fB/del\fR
-Delete the current buddy from our roster, unsubscribe from its presence notification and unsubscribe it from ours\&.
-
-.TP
-\fB/group\fR fold|unfold|toggle
-The group command changes the current group display\&.
-
- \fBfold\fR  	fold (shrink) the current group tree in the roster
- \fBunfold\fR	unfold (expand) the current group tree in the roster
- \fBtoggle\fR	toggle the state (fold/unfold) of the current tree
+.RE
+.PP
+/del
+.RS 3n
+Delete the current buddy from our roster, unsubscribe from its presence notification and unsubscribe it from ours.
+.RE
+.PP
+/group fold|unfold|toggle
+.RS 3n
+The
+\fIgroup\fR
+command changes the current group display.
+.TS
+tab(:);
+l l
+l l
+l l.
+T{
+\fIfold\fR
+T}:T{
+fold (shrink) the current group tree in the roster
+T}
+T{
+\fIunfold\fR
+T}:T{
+unfold (expand) the current group tree in the roster
+T}
+T{
+\fItoggle\fR
+T}:T{
+toggle the state (fold/unfold) of the current tree
+T}
+.TE
 
-.TP
-\fB/info\fR
-Display info on the selected entry (user, agent, group...)\&. For users, resources are displayed with the status, priority and status message (if available) of each resource\&.
-
-.TP
-\fB/move\fR [groupname]
-Move the current buddy to the requested group\&. If no group is specified, then the buddy is moved to the default group\&.  If the group groupname doesn't exist, it is created\&. Tip: if the chatmode is enabled, you can use "/roster alternate" to jump to the moved buddy\&.
-
-.TP
-\fB/msay\fR begin|verbatim|send|send_to|toggle|toggle_verbatim|abort
-Send a multi\-line message\&. To write a single message with several lines, the \fImulti\-line mode\fR should be used\&.
-
-The \fIbegin\fR subcommand enables multi\-line mode\&. Note that it allows a message subject to be specified\&.
-
-In multi\-line mode, each line (except command lines) typed in the input line will be added to the multi\-line message\&. Once the message is finished, it can be sent to the current selected buddy with the "/msay send" command\&.
-
-The \fIverbatim\fR multi\-line mode disables commands, so that it is possible to enter lines starting with a slash\&. Only the "/msay" command (with send or abort parameters) can be used to exit verbatim mode\&.
-
-The \fItoggle\fR and \fItoggle_verbatim\fR subcommands can be bound to a key to use the multi\-line mode quickly (for example, "bind M109 = msay toggle" to switch using the Meta\-m combination)\&.
+.RE
+.PP
+/info
+.RS 3n
+Display info on the selected entry (user, agent, group\&...). For users, resources are displayed with the status, priority and status message (if available) of each resource.
+.RE
+.PP
+/move [groupname]
+.RS 3n
+Move the current buddy to the requested group. If no group is specified, then the buddy is moved to the default group. If the group groupname doesn't exist, it is created. Tip: if the chatmode is enabled, you can use "/roster alternate" to jump to the moved buddy.
+.RE
+.PP
+/msay begin|verbatim|send|send_to|toggle|toggle_verbatim|abort
+.RS 3n
+Send a multi\-line message. To write a single message with several lines, the
+\fImulti\-line mode\fR
+should be used. In multi\-line mode, each line (except command lines) typed in the input line will be added to the multi\-line message. Once the message is finished, it can be sent to the current selected buddy with the "/msay send" command (or Ctrl\-d). The
+\fIbegin\fR
+subcommand enables multi\-line mode. Note that it allows a message subject to be specified. The
+\fIverbatim\fR
+multi\-line mode disables commands, so that it is possible to enter lines starting with a slash. Only the "/msay" command (with send or abort parameters) can be used to exit verbatim mode. The
+\fItoggle\fR
+and
+\fItoggle_verbatim\fR
+subcommands can be bound to a key to use the multi\-line mode quickly (for example, "bind M109 = msay toggle" to switch using the Meta\-m combination).
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+\fIbegin\fR
+[subject]
+T}:T{
+enter multi\-line mode
+T}
+T{
+\fIverbatim\fR
+T}:T{
+enter verbatim multi\-line mode
+T}
+T{
+\fIsend\fR
+T}:T{
+send the current multi\-line message to the currently selected buddy
+T}
+T{
+\fIsend_to\fR
+jid
+T}:T{
+send the current multi\-line message to "jid"
+T}
+T{
+\fItoggle\fR
+T}:T{
+switch to/from multi\-line mode (begin/send)
+T}
+T{
+\fItoggle_verbatim\fR
+T}:T{
+same with verbatim multi\-line mode
+T}
+T{
+\fIabort\fR
+T}:T{
+leave multi\-line mode without sending the message
+T}
+.TE
 
- \fBbegin\fR [subject]	enter multi\-line mode
- \fBverbatim\fR       	enter verbatim multi\-line mode
- \fBsend\fR           	send the current multi\-line message to the currently selected buddy
- \fBsend_to\fR jid    	send the current multi\-line message to "jid"
- \fBtoggle\fR         	switch to/from multi\-line mode (begin/send)
- \fBtoggle_verbatim\fR	same with verbatim multi\-line mode
- \fBabort\fR          	leave multi\-line mode without sending the message
-
-.TP
-\fB/rename\fR name
-Rename current buddy or group to the given name\&. Please note that a group name change is only done when the server's acknowledgment is received, so a slight delay can be noticed\&.
-
-.TP
-\fB/request\fR time|version [jid]
-Send a "IQ" query to the current buddy, or to the specified Jabber user\&. If the resource is not provided with the jid, mcabber will send the query to all known resources for this user\&.
-
-.TP
-\fB/room\fR
-The room command handles Multi\-User Chat room actions\&.
-
- \fBjoin\fR [room [nick [pass]]] 	join "room", using "nick" as nickname\&. If no nickname is provided (or if it is an empty string), the "nickname" option value is used (see sample configuration file)\&. If the currently selected entry is correctly recognized as a room by mcabber, the shortcut "\&." can be used instead of the full room id\&. A password can be provided to enter protected rooms\&. If your nickname contains space characters, use quotes\&.
- \fBleave\fR [message]    	leave the current room
- \fBnames\fR              	display members of the current room
- \fBnick\fR nick          	change your nickname in the current room
- \fBprivmsg\fR nick msg   	send private message "msg" to "nick"
- \fBremove\fR             	remove the current room from the roster (you must have left this room before)
- \fBtopic\fR              	set topic for current room
- \fBunlock\fR             	unlock current room (if you are the owner)
- \fBdestroy\fR [reason]   	destroy the current room (use with care!)
- \fBwhois\fR nick         	display MUC information about "nick"
+.RE
+.PP
+/pgp disable|enable|info [jid], /pgp setkey [jid [key]]
+.RS 3n
+Manipulate PGP settings for the specified jid (by default the currently selected contact). Please note that PGP encryption won't be used if no remote PGP support is detected, even if PGP is enabled with this command.
+.TS
+tab(:);
+l l
+l l
+l l
+l l.
+T{
+\fIdisable\fR
+[jid]
+T}:T{
+disable PGP encryption for jid (or the currently selected contact)
+T}
+T{
+\fIenable\fR
+[jid]
+T}:T{
+enable PGP encryption for jid (or the currently selected contact)
+T}
+T{
+\fIinfo\fR
+[jid]
+T}:T{
+show current PGP settings for the contact
+T}
+T{
+\fIsetkey\fR
+[jid [key]]
+T}:T{
+set the PGP key to be used to encrypt message for this contact. If no key is provided, the current key is erased. You can use the shortcut\-jid "." for the currently selected contact.
+T}
+.TE
 
- \fBinvite\fR jid [reason]	invite jid to the current room
- \fBkick\fR nick [reason] 	kick "nick" from the current room
- \fBban\fR jid [reason]   	ban jid from the current room
- \fBrole\fR jid role [reason]	change jid's role (role can be "none", "visitor", "participant", "moderator")
- \fBaffil\fR jid affil [reason]	change jid's affiliation (affil can be "none", "member", "admin", "owner")
-
-.TP
-\fB/roster\fR
-The roster command manipulates the roster/buddylist\&.  Here are the available parameters:
-
- \fBbottom\fR    	jump to the bottom of the roster
- \fBtop\fR       	jump to the top of the roster
- \fBup\fR        	move up in the roster
- \fBdown\fR      	move down in the roster
- \fBhide_offline\fR  	hide offline buddies
- \fBshow_offline\fR  	show offline buddies
- \fBtoggle_offline\fR	toggle display of offline buddies
- \fBhide\fR      	hide roster (full\-width chat window)
- \fBshow\fR      	show roster
- \fBtoggle\fR    	toggle roster visibility
- \fBitem_lock\fR jid  	lock the roster item so it remains visible regardless of its status
- \fBitem_unlock\fR jid	undo the effects of item_lock
- \fBsearch\fR bud	search for a buddy with a name or jid containing "bud" (only in the displayed buddylist)
- \fBalternate\fR 	jump to alternate buddy\&. The "alternate" buddy is the last buddy left while being in chat mode (this command is thus especially useful after commands like "/roster unread_first")
- \fBunread_first\fR	jump to the first unread message
- \fBunread_next\fR	jump to the next unread message
-
-.TP
-\fB/say\fR text
-Send the "text" message to the currently selected buddy\&. Can be useful if you want to send a message beginning with a slash, for example\&.
+.RE
+.PP
+/rename name
+.RS 3n
+Rename current buddy or group to the given name. Please note that a group name change is only done when the server's acknowledgment is received, so a slight delay can be noticed.
+.RE
+.PP
+/request last|time|vcard|version [jid]
+.RS 3n
+Send a "IQ" query to the current buddy, or to the specified Jabber user. If the resource is not provided with the jid, mcabber will send the query to all known resources for this user.
+.RE
+.PP
+/room join|leave|names|nick|privmsg|remove|topic|unlock|destroy, /room invite|kick|ban|role|affil, /room bookmark [add|del] [\-autojoin|+autojoin]
+.RS 3n
+The
+\fIroom\fR
+command handles Multi\-User Chat room actions.
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+\fIjoin\fR
+[room [nick [pass]]]
+T}:T{
+join "room", using "nick" as nickname. If no nickname is provided (or if it is an empty string), the "nickname" option value is used (see sample configuration file). If the currently selected entry is correctly recognized as a room by mcabber, the shortcut "." can be used instead of the full room id. A password can be provided to enter protected rooms. If your nickname contains space characters, use quotes.
+T}
+T{
+\fIwhois\fR
+nick
+T}:T{
+display MUC information about "nick"
+T}
+T{
+\fIban\fR
+jid [reason]
+T}:T{
+ban jid from the current room
+T}
+T{
+\fIinvite\fR
+jid [reason]
+T}:T{
+invite jid to the current room
+T}
+T{
+\fIkick\fR
+nick [reason]
+T}:T{
+kick "nick" from the current room
+T}
+T{
+\fIrole\fR
+jid role [reason]
+T}:T{
+change jid's role (role can be "none", "visitor", "participant", "moderator")
+T}
+T{
+\fIaffil\fR
+jid affil [reason]
+T}:T{
+change jid's affiliation (affil can be "none", "member", "admin", "owner")
+\fIbookmark\fR
+add/update/remove a room bookmark, set/unset autojoin
+T}
+T{
+\fIleave\fR
+[message]
+T}:T{
+leave the current room
+T}
+T{
+\fInames\fR
+T}:T{
+display members of the current room
+T}
+T{
+\fInick\fR
+nick
+T}:T{
+change your nickname in the current room
+T}
+T{
+\fIprivmsg\fR
+nick msg
+T}:T{
+send private message "msg" to "nick"
+T}
+T{
+\fIremove\fR
+T}:T{
+remove the current room from the roster (you must have left this room before)
+T}
+T{
+\fItopic\fR
+T}:T{
+set topic for current room
+T}
+T{
+\fIunlock\fR
+T}:T{
+unlock current room (if you are the owner)
+T}
+T{
+\fIdestroy\fR
+[reason]
+T}:T{
+destroy the current room (use with care!)
+T}
+.TE
 
-.TP
-\fB/say_to\fR jid text
-Send the "text" message to the specified jid\&. Please note that this command doesn't set the default resource for a contact, so if you want to send several messages to a specific resource you will have to use "/say_to" for each message\&.
-
-.TP
-\fB/status\fR [online|avail|invisible|free|dnd|notavail|away [\-|StatusMessage]]
-Show or set the current status\&.
-
-If no status is specified, display the current status\&.
-
-If a status message is specified, it will overrride the message* variables (these variables can be set in the configuration file)\&. If no relevant message* variable is set and no status message provided, the current status message is kept\&. If StatusMessage is "\-", the current status message is cleared\&.
+.RE
+.PP
+/roster bottom|top|up|down|group_prev|group_next, /roster alternate|unread_first|unread_next, /roster search bud, /roster hide_offline|show_offline|toggle_offline, /roster item_lock|item_unlock, /roster hide|show|toggle, /roster note [\-|text]
+.RS 3n
+The
+\fIroster\fR
+command manipulates the roster/buddylist. Here are the available parameters:
+.TS
+tab(:);
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l
+l l.
+T{
+\fIbottom\fR
+T}:T{
+jump to the bottom of the roster
+T}
+T{
+\fIsearch\fR
+bud
+T}:T{
+search for a buddy with a name or jid containing "bud" (only in the displayed buddylist)
+T}
+T{
+\fIhide_offline\fR
+T}:T{
+hide offline buddies
+T}
+T{
+\fIshow_offline\fR
+T}:T{
+show offline buddies
+T}
+T{
+\fItoggle_offline\fR
+T}:T{
+toggle display of offline buddies
+T}
+T{
+\fIitem_lock\fR
+jid
+T}:T{
+lock the roster item so it remains visible regardless of its status
+T}
+T{
+\fIitem_unlock\fR
+jid
+T}:T{
+undo the effects of item_lock
+T}
+T{
+\fIhide\fR
+T}:T{
+hide roster (full\-width chat window)
+T}
+T{
+\fIshow\fR
+T}:T{
+show roster
+T}
+T{
+\fItoggle\fR
+T}:T{
+toggle roster visibility
+T}
+T{
+\fInote\fR
+[text]
+T}:T{
+display or set an annotation (if text is "\-", the annotation is deleted). In the "status" buffer, it will display all annotations.
+T}
+T{
+\fItop\fR
+T}:T{
+jump to the top of the roster
+T}
+T{
+\fIup\fR
+T}:T{
+move up in the roster
+T}
+T{
+\fIdown\fR
+T}:T{
+move down in the roster
+T}
+T{
+\fIgroup_prev\fR
+T}:T{
+jump to the previous group in the roster
+T}
+T{
+\fIgroup_next\fR
+T}:T{
+jump to the next group in the roster
+T}
+T{
+\fIalternate\fR
+T}:T{
+jump to alternate buddy. The "alternate" buddy is the last buddy left while being in chat mode (this command is thus especially useful after commands like "/roster unread_first")
+T}
+T{
+\fIunread_first\fR
+T}:T{
+jump to the first unread message
+T}
+T{
+\fIunread_next\fR
+T}:T{
+jump to the next unread message
+T}
+.TE
 
-.TP
-\fB/status_to\fR jid online|avail|invisible|free|dnd|notavail|away [StatusMessage]
-Send the requested status to the specified Jabber user\&.
-
-If the specified jid is "\&.", the current buddy is used\&.
-
-Note: this status will be overridden by subsequent "/status" commands\&. If you are using the auto\-away feature, the status will overridden too\&.
-
-Note: The jid can include a resource (i\&.e\&. user@server/resource)\&.
-
+.RE
+.PP
+/say text
+.RS 3n
+Send the "text" message to the currently selected buddy. Can be useful if you want to send a message beginning with a slash, for example.
+.RE
+.PP
+/say_to jid text
+.RS 3n
+Send the "text" message to the specified jid. Please note that this command doesn't set the default resource for a contact, so if you want to send several messages to a specific resource you will have to use "/say_to" for each message.
+.RE
+.PP
+/status [online|avail|invisible|free|dnd|notavail|away [\-|StatusMessage]]
+.RS 3n
+Show or set the current status. If no status is specified, display the current status. If a status message is specified, it will overrride the message* variables (these variables can be set in the configuration file). If no relevant message* variable is set and no status message provided, the current status message is kept. If StatusMessage is "\-", the current status message is cleared.
+.RE
+.PP
+/status_to jid online|avail|invisible|free|dnd|notavail|away [StatusMessage]
+.RS 3n
+Send the requested status to the specified Jabber user. If the specified jid is ".", the current buddy is used. Note: this status will be overridden by subsequent "/status" commands. If you are using the auto\-away feature, the status will overridden too. Note: The jid can include a resource (i.e. user@server/resource).
+.RE
 .SH "CONFIGURATION FILE"
-
-
-See the provided sample configuration file, which should be self\-documenting\&.
-
+See the provided sample configuration file, which should be self\-documenting.
 .SH "FILES"
-
-
 The following files can be used by mcabber(1):
 
+.RS 3n
 .nf
-$HOME/\&.mcabber/mcabberrc    Default configuration file
-$HOME/\&.mcabberrc            Configuration file used if no other has been found
-$HOME/\&.mcabber/histo/       Default directory for storing chat history files, if enabled
+$HOME/.mcabber/mcabberrc    Default configuration file
+$HOME/.mcabberrc            Configuration file used if no other has been found
+$HOME/.mcabber/histo/       Default directory for storing chat history files, if enabled
 .fi
-
+.RE
 .SH "BUGS"
-
-
-Certainly\&. Please tell me if you find one! :\-)
-
+Certainly. Please tell me if you find one! :\-)
 .SH "AUTHOR"
-
-
-Written by Mikael BERTHE <\fImcabber@lilotux.net\fR>\&.
-Originally based on cabber (Cabber homepage: <\fIhttp://cabber.sourceforge.net\fR>), please consult the AUTHORS file for details\&.
-
+Written by [1]\&\fIMikael BERTHE\fR. Originally based on [2]\&\fICabber\fR, please consult the AUTHORS file for details.
 .SH "RESOURCES"
-
-
-Main web site: <\fIhttp://www.lilotux.net/~mikael/mcabber/\fR>
-
+[3]\&\fIMain web site\fR
 .SH "COPYING"
-
-
-Copyright (C) 2005, 2006 Mikael Berthe\&.
-
-Some portions are Copyright (C) 2002\-2004 <cabber@ajmacias\&.com>\&.
-
-
-Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
-
+Copyright (C) 2005, 2006 Mikael Berthe. Some portions are Copyright (C) 2002\-2004 [4]\&\fIcabber@ajmacias.com\fR.
+Free use of this software is granted under the terms of the GNU General Public License (GPL).
+.SH "REFERENCES"
+.TP 3
+1.\ Mikael BERTHE
+\%mailto:mcabber@lilotux.net
+.TP 3
+2.\ Cabber
+\%http://cabber.sourceforge.net
+.TP 3
+3.\ Main web site
+\%http://www.lilotux.net/~mikael/mcabber/
+.TP 3
+4.\ cabber@ajmacias.com
+\%mailto:cabber@ajmacias.com
--- a/mcabber/doc/mcabber.1.html	Sat Dec 09 11:41:36 2006 +0100
+++ b/mcabber/doc/mcabber.1.html	Sat Dec 09 11:42:14 2006 +0100
@@ -39,6 +39,16 @@
 </li>
 <li>
 <p>
+<b>PGP support</b>
+</p>
+</li>
+<li>
+<p>
+<b>Chat States</b> support (typing notifications)
+</p>
+</li>
+<li>
+<p>
 <b>History logging:</b>  If enabled (see the CONFIGURATION FILE section),
   <tt>mcabber</tt> can save discussions to history log files.
 </p>
@@ -114,6 +124,14 @@
 <table class="hlist">
 <tr valign="top">
 <td>
+Esc
+</td>
+<td>
+Disable chat mode
+</td>
+</tr>
+<tr valign="top">
+<td>
 Ctrl-a
 </td>
 <td>
@@ -165,7 +183,23 @@
 Ctrl-g
 </td>
 <td>
-Cancel completion / ctrl-g
+Cancel completion
+</td>
+</tr>
+<tr valign="top">
+<td>
+Ctrl-c
+</td>
+<td>
+Abort multi-line messages and completions
+</td>
+</tr>
+<tr valign="top">
+<td>
+Ctrl-d
+</td>
+<td>
+Send/terminate a multi-line message
 </td>
 </tr>
 <tr valign="top">
@@ -241,7 +275,7 @@
 </td>
 </tr>
 </table>
-<p>Additional key bindings may be specified using the /bind command described
+<p>Additional key bindings may be specified using the <b>/bind</b> command described
 in the COMMANDS section.</p>
 <h2>MCABBER'S ROSTER</h2>
 <p>The first listed resource on the roster is <b>[status]</b>, which keeps a log of
@@ -742,7 +776,7 @@
         In multi-line mode, each line (except command lines) typed in the input
         line will be added to the multi-line message.  Once the message is
         finished, it can be sent to the current selected buddy with the "/msay
-        send" command.<br />
+        send" command (or Ctrl-d).<br />
         The <b>begin</b> subcommand enables multi-line mode.  Note that it allows
         a message subject to be specified.<br />
         The <b>verbatim</b> multi-line mode disables commands, so that it is
@@ -812,6 +846,49 @@
 </table>
 </dd>
 <dt><b>
+/pgp disable|enable|info [jid]
+</b></dt>
+<dt><b>
+/pgp setkey [jid [key]]
+</b></dt>
+<dd>
+        Manipulate PGP settings for the specified jid (by default the currently selected contact).  Please note that PGP encryption won't be used if no remote PGP support is detected, even if PGP is enabled with this command.
+<table class="hlist">
+<tr valign="top">
+<td>
+<b>disable</b> [jid]
+</td>
+<td>
+disable PGP encryption for jid (or the currently selected contact)
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>enable</b> [jid]
+</td>
+<td>
+enable PGP encryption for jid (or the currently selected contact)
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>info</b> [jid]
+</td>
+<td>
+show current PGP settings for the contact
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>setkey</b> [jid [key]]
+</td>
+<td>
+set the PGP key to be used to encrypt message for this contact.  If no key is provided, the current key is erased.  You can use the shortcut-jid "." for the currently selected contact.
+</td>
+</tr>
+</table>
+</dd>
+<dt><b>
 /rename name
 </b></dt>
 <dd>
@@ -820,7 +897,7 @@
         acknowledgment is received, so a slight delay can be noticed.
 </dd>
 <dt><b>
-/request time|version [jid]
+/request last|time|vcard|version [jid]
 </b></dt>
 <dd>
         Send a "IQ" query to the current buddy, or to the specified Jabber
@@ -833,6 +910,9 @@
 <dt><b>
 /room invite|kick|ban|role|affil
 </b></dt>
+<dt><b>
+/room bookmark [add|del] [-autojoin|+autojoin]
+</b></dt>
 <dd>
         The <b>room</b> command handles Multi-User Chat room actions.
 <table class="hlist">
@@ -954,15 +1034,13 @@
 </td>
 <td>
 change jid's affiliation (affil can be "none", "member", "admin", "owner")
+        <b>bookmark</b>              add/update/remove a room bookmark, set/unset autojoin
 </td>
 </tr>
 </table>
 </dd>
 <dt><b>
-/roster bottom|top|hide_offline|show_offline|toggle_offline
-</b></dt>
-<dt><b>
-/roster hide|show|toggle
+/roster bottom|top|up|down|group_prev|group_next
 </b></dt>
 <dt><b>
 /roster alternate|unread_first|unread_next
@@ -970,6 +1048,18 @@
 <dt><b>
 /roster search bud
 </b></dt>
+<dt><b>
+/roster hide_offline|show_offline|toggle_offline
+</b></dt>
+<dt><b>
+/roster item_lock|item_unlock
+</b></dt>
+<dt><b>
+/roster hide|show|toggle
+</b></dt>
+<dt><b>
+/roster note [-|text]
+</b></dt>
 <dd>
         The <b>roster</b> command manipulates the roster/buddylist.  Here are the available parameters:
 <table class="hlist">
@@ -1007,6 +1097,54 @@
 </tr>
 <tr valign="top">
 <td>
+<b>group_prev</b>
+</td>
+<td>
+jump to the previous group in the roster
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>group_next</b>
+</td>
+<td>
+jump to the next group in the roster
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>alternate</b>
+</td>
+<td>
+jump to alternate buddy.  The "alternate" buddy is the last buddy left while being in chat mode (this command is thus especially useful after commands like "/roster unread_first")
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>unread_first</b>
+</td>
+<td>
+jump to the first unread message
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>unread_next</b>
+</td>
+<td>
+jump to the next unread message
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>search</b> bud
+</td>
+<td>
+search for a buddy with a name or jid containing "bud" (only in the displayed buddylist)
+</td>
+</tr>
+<tr valign="top">
+<td>
 <b>hide_offline</b>
 </td>
 <td>
@@ -1031,6 +1169,22 @@
 </tr>
 <tr valign="top">
 <td>
+<b>item_lock</b> jid
+</td>
+<td>
+lock the roster item so it remains visible regardless of its status
+</td>
+</tr>
+<tr valign="top">
+<td>
+<b>item_unlock</b> jid
+</td>
+<td>
+undo the effects of item_lock
+</td>
+</tr>
+<tr valign="top">
+<td>
 <b>hide</b>
 </td>
 <td>
@@ -1055,50 +1209,10 @@
 </tr>
 <tr valign="top">
 <td>
-<b>item_lock</b> jid
-</td>
-<td>
-lock the roster item so it remains visible regardless of its status
-</td>
-</tr>
-<tr valign="top">
-<td>
-<b>item_unlock</b> jid
-</td>
-<td>
-undo the effects of item_lock
-</td>
-</tr>
-<tr valign="top">
-<td>
-<b>search</b> bud
+<b>note</b> [text]
 </td>
 <td>
-search for a buddy with a name or jid containing "bud" (only in the displayed buddylist)
-</td>
-</tr>
-<tr valign="top">
-<td>
-<b>alternate</b>
-</td>
-<td>
-jump to alternate buddy.  The "alternate" buddy is the last buddy left while being in chat mode (this command is thus especially useful after commands like "/roster unread_first")
-</td>
-</tr>
-<tr valign="top">
-<td>
-<b>unread_first</b>
-</td>
-<td>
-jump to the first unread message
-</td>
-</tr>
-<tr valign="top">
-<td>
-<b>unread_next</b>
-</td>
-<td>
-jump to the next unread message
+display or set an annotation (if text is "-", the annotation is deleted).  In the "status" buffer, it will display all annotations.
 </td>
 </tr>
 </table>
@@ -1159,14 +1273,14 @@
 <h2>RESOURCES</h2>
 <p><a href="http://www.lilotux.net/~mikael/mcabber/">Main web site</a></p>
 <h2>COPYING</h2>
-<p>Copyright &#169; 2005, 2006 Mikael Berthe.<br />
-Some portions are Copyright &#169; 2002-2004 <a href="mailto:cabber@ajmacias.com">cabber@ajmacias.com</a>.</p>
+<p>Copyright (C) 2005, 2006 Mikael Berthe.<br />
+Some portions are Copyright (C) 2002-2004 <a href="mailto:cabber@ajmacias.com">cabber@ajmacias.com</a>.</p>
 <p>Free use of this software is granted under the terms of the GNU General Public
 License (GPL).</p>
 <div id="footer">
 <p>
-Version 0.8.3-dev<br />
-Last updated 01-Oct-2006 23:57:04 CEST
+Version 0.9.0-dev<br />
+Last updated 09-Dec-2006 11:19:42 CEST
 </p>
 </div>
 </div>
--- a/mcabber/doc/mcabber.1.txt	Sat Dec 09 11:41:36 2006 +0100
+++ b/mcabber/doc/mcabber.1.txt	Sat Dec 09 11:42:14 2006 +0100
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v0.8.4-dev, November 2006
+v0.9.0-dev, December 2006
 
 NAME
 ----
@@ -108,7 +108,7 @@
 Ctrl-o::        Accept line and put the next history line in the input line (accept-line-and-down-history)
 Ctrl-q::        Jump to the next unread message
 
-Additional key bindings may be specified using the /bind command described
+Additional key bindings may be specified using the '/bind' command described
 in the COMMANDS section.
 
 MCABBER'S ROSTER
@@ -298,6 +298,15 @@
         'toggle_verbatim';; same with verbatim multi-line mode
         'abort';;           leave multi-line mode without sending the message
 
+/pgp disable|enable|info [jid]::
+/pgp setkey [jid [key]]::
+        Manipulate PGP settings for the specified jid (by default the currently selected contact).  Please note that PGP encryption won't be used if no remote PGP support is detected, even if PGP is enabled with this command.
+
+        'disable' [jid];;   disable PGP encryption for jid (or the currently selected contact)
+        'enable' [jid];;    enable PGP encryption for jid (or the currently selected contact)
+        'info' [jid];;      show current PGP settings for the contact
+        'setkey' [jid [key]];;  set the PGP key to be used to encrypt message for this contact.  If no key is provided, the current key is erased.  You can use the shortcut-jid "." for the currently selected contact.
+
 /rename name::
         Rename current buddy or group to the given name.
         Please note that a group name change is only done when the server's
@@ -414,8 +423,8 @@
 
 COPYING
 -------
-Copyright (C) 2005, 2006 Mikael Berthe. +
-Some portions are Copyright (C) 2002-2004 mailto:cabber@ajmacias.com[].
+Copyright \(C) 2005, 2006 Mikael Berthe. +
+Some portions are Copyright \(C) 2002-2004 mailto:cabber@ajmacias.com[].
 
 Free use of this software is granted under the terms of the GNU General Public
 License (GPL).