# HG changeset patch # User Mikael Berthe # Date 1494505944 -7200 # Node ID 0d5660c6b4aa4dc763318a8ca4455dfba8bf9aad # Parent 70f8ae7d690e3a223e4107fdf87f6778fc732764 Update manpage diff -r 70f8ae7d690e -r 0d5660c6b4aa mcabber/doc/build --- a/mcabber/doc/build Fri Apr 21 21:50:16 2017 +0200 +++ b/mcabber/doc/build Thu May 11 14:32:24 2017 +0200 @@ -2,7 +2,7 @@ set -e -x -asciidoc -b css -d manpage mcabber.1.txt +asciidoc -b html5 -d manpage mcabber.1.txt asciidoc -b docbook -d manpage mcabber.1.txt mv mcabber.1 mcabber.1.before xmlto man mcabber.1.xml diff -r 70f8ae7d690e -r 0d5660c6b4aa mcabber/doc/mcabber.1 --- a/mcabber/doc/mcabber.1 Fri Apr 21 21:50:16 2017 +0200 +++ b/mcabber/doc/mcabber.1 Thu May 11 14:32:24 2017 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: mcabber -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 09/18/2016 +.\" Author: Mikael BERTHE +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: May 2017 .\" Manual: \ \& .\" Source: \ \& 1.0.6-dev .\" Language: English .\" -.TH "MCABBER" "1" "09/18/2016" "v1\&.0\&.6\-dev" +.TH "MCABBER" "1" "May 2017" "\ \& 1\&.0\&.6\-dev" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -48,7 +48,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fISASL/SSL/TLS support\fR\&. .RE .sp @@ -60,7 +59,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fIMUC support\fR (Multi\-User Chat)\&. .RE @@ -73,7 +71,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fIPGP, OTR support\fR .RE .sp @@ -85,7 +82,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fIChat States\fR support (typing notifications) .RE @@ -98,7 +94,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fIHistory logging:\fR If enabled (see the CONFIGURATION FILE section), mcabber @@ -113,7 +108,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fICommands completion:\fR If possible, mcabber @@ -128,7 +122,6 @@ .sp -1 .IP \(bu 2.3 .\} - \fIInput line history:\fR Any message or command entered is in the input line history and can be reused easily\&. .RE @@ -141,7 +134,6 @@ .sp -1 .IP \(bu 2.3 .\} - \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 @@ -156,9 +148,7 @@ .sp -1 .IP \(bu 2.3 .\} - -\fIModules:\fR -mcabber +\fIModules:\fRmcabber can load modules (a\&.k\&.a\&. plugins) at runtime that extend its features\&. .RE .SH "OPTIONS" @@ -186,7 +176,7 @@ .sp 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\&. .sp -To display buddies chat buffers, you will have to enter \fIchat mode\fR\&. You can enter chat mode by pressing enter (unless \fIvi_mode\fR is enabled), and leave chat mode with the ESC key\&. Simply sending a message will also enable chat mode (unless \fIvi_mode\fR is enabled)\&. +To display buddies chat buffers, you will have to enter \fIchat mode\fR\&. You can enter chat mode by pressing enter (unless \fIvi mode\fR is enabled), and leave chat mode with the ESC key\&. Simply sending a message will also enable chat mode (unless \fIvi mode\fR is enabled)\&. .sp 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" @@ -294,7 +284,7 @@ Additional key bindings may be specified using the \fI/bind\fR command described in the COMMANDS section\&. .SH "VI MODE" .sp -If the \fIvi_mode\fR option is set to \fI1\fR, MCabber accepts a few commands loosely based on those available in \fBvi\fR(1)'s normal mode\&. In this case, chat mode can \fInot\fR be entered by pressing enter, and messages cannot be composed outside of the chat mode\&. The following commands are accepted: +If the "vi_mode" option is set to 1, mcabber(1) accepts a few commands loosely based on those available in vi(1)\*(Aqs normal mode\&. In this case, chat mode is not entered by pressing enter, and messages cannot be composed outside of the chat mode\&. The following commands are accepted: .PP A .RS 4 @@ -331,14 +321,14 @@ Enter chat mode\&. .RE .PP -[\fIn\fR]j +[N]j .RS 4 -Call "/roster down [\fIn\fR]"\&. +Call "/roster down [N]"\&. .RE .PP -[\fIn\fR]k +[N]k .RS 4 -Call "/roster up [\fIn\fR]"\&. +Call "/roster up [N]"\&. .RE .PP n @@ -371,7 +361,7 @@ Call "/group unfold" for all groups\&. .RE .PP -\&'' +\*(Aq\*(Aq .RS 4 Call "/roster alternate"\&. .RE @@ -390,32 +380,27 @@ .RS 4 Call "/group toggle" for the current group\&. .RE -.PP +.sp A leading slash enables search mode: .PP -/\fIstring\fR +/string .RS 4 -Call "/roster search \fIstring\fR"\&. -.RE -.PP -A leading colon enabled command-line mode: -.PP -:q -.RS 4 -Call "/quit"\&. +Call "/roster search string"\&. .RE -.PP -:\fIn\fR +.sp +A leading colon enabled command\-line mode: +.sp +.if n \{\ .RS 4 -Jump to line \fIn\fR in the roster\&. +.\} +.nf +above commands)\&. +.fi +.if n \{\ .RE -.PP -:\fIcommand-line\fR -.RS 4 -Call "/\fIcommand-line\fR" (unless the \fIcommand-line\fR matches one of the above commands)\&. -.RE -.PP -Commands entered with a leading colon and searches are either submitted by pressing enter or aborted by hitting escape\&. In either case, MCabber returns to the normal (non-chat) mode\&. History editing is supported in command-line mode and in search mode\&. In command-line mode, tab completion is supported as well\&. +.\} +.sp +Commands entered with a leading colon and searches are either submitted by pressing enter or aborted by hitting escape\&. In either case, mcabber(1) returns to the normal (non\-chat) mode\&. History editing is supported in command\-line mode and in search mode\&. In command\-line mode, tab completion is supported as well\&. .SH "MCABBER\(cqS ROSTER" .sp The first listed item 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\&. @@ -479,7 +464,7 @@ .sp Examples: .PP -\fI\-\-\- Buds\fR +\*(Aq \-\-\- Buds\*(Aq .RS 4 This is a group named \fIBuds\fR @@ -490,12 +475,12 @@ John is online, can see your status, and sent you a message that you did not read yet .RE .PP -\fI{?} Sally\fR +\*(Aq {?} Sally\*(Aq .RS 4 Neither you nor Sally have authorized each other to see your online status .RE .PP -\fI{a} Jane\fR +\*(Aq {a} Jane\*(Aq .RS 4 Jane is away, but she cannot see your online status .RE @@ -1451,7 +1436,7 @@ Please note that this command doesn\(cqt 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\&. -You can send a message to a specific resource of the currently selected contact by using /say_to ./resourcename message\&. +You can send a message to a specific resource of the currently selected contact by using /say_to \&./resourcename message\&. The "\-n" flag turns the message to "normal" type, "\-h" to "headline"\&. "\-\-" can be used to send chat messages beginning with \-n or \-h\&. @@ -1519,6 +1504,7 @@ .\} .nf $HOME/\&.mcabber/mcabberrc Default configuration file +$HOME/\&.config/mcabber/mcabberrc Alternate location (can use XDG_CONFIG_HOME) $HOME/\&.mcabberrc Configuration file used if no other has been found $HOME/\&.mcabber/histo/ Default directory for storing chat history files, if enabled /usr/share/mcabber/help/ Default directory for online help files @@ -1545,6 +1531,12 @@ Copyright (C) 2005\-2017 Mikael Berthe and others\&. .sp Free use of this software is granted under the terms of the GNU General Public License (GPL)\&. +.SH "AUTHOR" +.PP +\fBMikael BERTHE\fR <\&mcabber@lilotux\&.net\&> +.RS 4 +Author. +.RE .SH "NOTES" .IP " 1." 4 Mikael BERTHE diff -r 70f8ae7d690e -r 0d5660c6b4aa mcabber/doc/mcabber.1.html --- a/mcabber/doc/mcabber.1.html Fri Apr 21 21:50:16 2017 +0200 +++ b/mcabber/doc/mcabber.1.html Thu May 11 14:32:24 2017 +0200 @@ -1,16 +1,25 @@ - - + + - - + + MCABBER(1) - +
+

SYNOPSIS

mcabber [ -h | -V | -f configfile ]

+
+

DESCRIPTION

-

mcabber(1) is a small Jabber (XMPP) console client.
+

mcabber(1) is a small Jabber (XMPP) 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:

+

Here are some of the features of mcabber:

  • @@ -616,12 +782,12 @@

  • History logging: If enabled (see the CONFIGURATION FILE section), - mcabber can save discussions to text history log files. + mcabber can save discussions to text history log files.

  • -Commands completion: If possible, mcabber will try to complete your +Commands completion: If possible, mcabber will try to complete your command line if you hit the Tab key.

  • @@ -636,17 +802,19 @@ 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. + mcabber source code, in the contrib directory.

  • -Modules: mcabber can load modules (a.k.a. plugins) at runtime that +Modules: mcabber can load modules (a.k.a. plugins) at runtime that extend its features.

+
+

OPTIONS

@@ -663,7 +831,7 @@

- Displays mcabber version and compile-time definitions. + Displays mcabber version and compile-time definitions.

@@ -676,9 +844,11 @@
+
+

WINDOWS/PANES

-

The mcabber(1) screen is divided into 4 regions. +

The mcabber(1) screen is divided into 4 regions. The roster, alias buddylist, is on the left. The chat window, or chat buffer, is on the right. The input line lies at the bottom of the screen, under a small log window.

@@ -687,8 +857,9 @@ is the "chat status line" and shows the status of the currently selected buddy.

To display buddies chat buffers, you will have to enter chat mode. -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.

+You can enter chat mode by pressing enter (unless vi mode is enabled), and +leave chat mode with the ESC key. Simply sending a message will also enable +chat mode (unless vi mode is enabled).

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 @@ -698,6 +869,8 @@ command described in another section, without having to manually scroll back and forth.

+
+

KEYS

Text typing occurs in the input line; basic operations are supported @@ -860,6 +1033,192 @@

Additional key bindings may be specified using the /bind command described in the COMMANDS section.

+
+
+

VI MODE

+
+

If the "vi_mode" option is set to 1, mcabber(1) accepts a few commands +loosely based on those available in vi(1)'s normal mode. In this case, chat +mode is not entered by pressing enter, and messages cannot be composed outside +of the chat mode. The following commands are accepted:

+
+
+A +
+
+

+Call "/roster unread_first". +

+
+
+a +
+
+

+Call "/roster unread_next". +

+
+
+F +
+
+

+Call "/roster group_prev". +

+
+
+f +
+
+

+Call "/roster group_next". +

+
+
+G +
+
+

+Call "/roster bottom". +

+
+
+gg +
+
+

+Call "/roster top". +

+
+
+i +
+
+

+Enter chat mode. +

+
+
+[N]j +
+
+

+Call "/roster down [N]". +

+
+
+[N]k +
+
+

+Call "/roster up [N]". +

+
+
+n +
+
+

+Repeat the previous search (if any). +

+
+
+O +
+
+

+Call "/roster unread_first" and open chat window. +

+
+
+o +
+
+

+Call "/roster unread_next" and open chat window. +

+
+
+ZZ +
+
+

+Call "/quit". +

+
+
+zM +
+
+

+Call "/group fold" for all groups. +

+
+
+zR +
+
+

+Call "/group unfold" for all groups. +

+
+
+'' +
+
+

+Call "/roster alternate". +

+
+
+! +
+
+

+Toggle attention flag for current buddy. +

+
+
+# +
+
+

+Toggle unread messages flag for current buddy. +

+
+
+<Space> +
+
+

+Call "/group toggle" for the current group. +

+
+
+

A leading slash enables search mode:

+
+
+/string +
+
+

+Call "/roster search string". +

+
+
+

A leading colon enabled command-line mode:

+
+
+
above commands).
+
+

Commands entered with a leading colon and searches are either submitted by +pressing enter or aborted by hitting escape. In either case, mcabber(1) +returns to the normal (non-chat) mode. History editing is supported in +command-line mode and in search mode. In command-line mode, tab completion is +supported as well.

+
+
+

MCABBER’S ROSTER

The first listed item on the roster is [status], which keeps a log of @@ -978,7 +1337,7 @@

- {?} Sally +' {?} Sally'

@@ -986,7 +1345,7 @@

- {a} Jane +' {a} Jane'

@@ -1003,11 +1362,15 @@

+
+

COMMANDS

-

Please refer to the online help (command /help), it is probably more up-to-date than this manpage. Furthermore, help files have been translated into several languages.
-You will find an overview of the mcabber commands in this manual.

+

Please refer to the online help (command /help), it is probably more up-to-date than this manpage. Furthermore, help files have been translated into several languages.
+You will find an overview of the mcabber commands in this manual.

+
+
@@ -1027,8 +1390,8 @@ Add to our roster "jid" as "nickname"

-
-
Example: "/add somebody@jabber.server.com Somebody"
+
+
Example: "/add somebody@jabber.server.com Somebody"
@@ -1038,7 +1401,7 @@

- This command let you to add aliases which can simplify sophisticated commands.
+ This command let you to add aliases which can simplify sophisticated commands.
You can manage your aliases by:

@@ -1074,8 +1437,8 @@ Set alias called "name" with value "command line"

-
-
Example: "/alias away = status away"
+
+
Example: "/alias away = status away"
@@ -1085,7 +1448,7 @@

- This command manages presence subscriptions: it allows you to request presence subscriptions from others on your roster, and allows you to control who receives your presence notifications.
+ This command manages presence subscriptions: it allows you to request presence subscriptions from others on your roster, and allows you to control who receives your presence notifications.
If no JID is provided, the currently-selected buddy is used.

@@ -1128,7 +1491,7 @@

- Bind the command to the key given as "keycode". To examine which keys are currently not used look at mcabber log window and press examined key. For example: "Unknown key=265" means that you can bind some command to key #265. + Bind the command to the key given as "keycode". To examine which keys are currently not used look at mcabber log window and press examined key. For example: "Unknown key=265" means that you can bind some command to key #265.

@@ -1163,10 +1526,10 @@ Bind "command line" to the key with code "keycode"

-
-
Example: "/bind 265 = status away" (265 is F1). +
+
+
Example: "/bind 265 = status away" (265 is F1). +
 Note: keycodes can be different depending on your ncurses configuration. +
-Tip: aliases also can be used instead of commands.
+Tip: aliases also can be used instead of commands.
@@ -1331,7 +1694,7 @@

- Disable chat mode.
+ Disable chat mode.
With --show-roster, the fullscreen mode will be disabled.

@@ -1412,7 +1775,7 @@

- Terminate the connection to the Jabber server.
+ Terminate the 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.

@@ -1432,8 +1795,8 @@

- Tell mcabber what to do about pending events.
- If the first parameter is *, the command will apply to all queued events.
+ Tell mcabber what to do about pending events.
+ If the first parameter is *, the command will apply to all queued events.
Event-specific arguments will be interpreted on event-to event basis. The only built-in case, when argument is used is MUC invitation reject - argument, if present, will be interpreted as reject reason.

@@ -1510,7 +1873,7 @@

- Display help for command "command" or topic "topic".
+ Display help for command "command" or topic "topic".
Example: "/help buffer"

@@ -1753,7 +2116,7 @@

- Display info on the selected entry (user, agent, group…).
+ 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.

@@ -1810,7 +2173,7 @@

- 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.
+ 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.

@@ -1819,10 +2182,10 @@

- Send a multi-line message. To write a single message with several lines, the multi-line mode 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.
- The begin subcommand enables multi-line mode. Note that it allows a message subject to be specified.
- The verbatim 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.
+ Send a multi-line message. To write a single message with several lines, the multi-line mode 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.
+ The begin subcommand enables multi-line mode. Note that it allows a message subject to be specified.
+ The verbatim 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 toggle subcommand can be bound to a key to use the multi-line mode quickly (for example, "bind M13 = msay toggle" to switch using the Meta-Enter combination).

@@ -1874,8 +2237,8 @@ Leave multi-line mode without sending the message

-
-
The -n or -h flags turn the message to "normal" or "headline" accordingly, as opposed to default "chat" message.
+
+
The -n or -h flags turn the message to "normal" or "headline" accordingly, as opposed to default "chat" message.
@@ -2003,7 +2366,7 @@

- This command manipulates PGP settings for the specified jid (by default the currently selected contact).
+ This command manipulates 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. You can force PGP encryption with the "force" subcommand.

@@ -2024,7 +2387,7 @@

-force [jid] +force [jid]

@@ -2062,10 +2425,10 @@

- Send "string" (raw XML format) to the Jabber server.
- No check is done on the string provided.
+ 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.
+ Use this only if you know what you are doing, or you could terminate the connection.
Example: "/rawxml send <presence><show>away</show></presence>"

@@ -2313,7 +2676,7 @@

- The roster command manipulates the roster/buddylist.
+ The roster command manipulates the roster/buddylist.
Here are the available parameters:

@@ -2492,7 +2855,7 @@

- Send the "text" message to the currently selected buddy. It can be useful if you want to send a message beginning with a slash, for example.
+ Send the "text" message to the currently selected buddy. It can be useful if you want to send a message beginning with a slash, for example.
The "-n" flag turns the message to "normal" type, "-h" to "headline". "--" can be used to send chat message beginning with -n or -h.

@@ -2501,11 +2864,11 @@

- 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.
- You can send a message to a specific resource of the currently selected contact by using /say_to ./resourcename message.
- The "-n" flag turns the message to "normal" type, "-h" to "headline". "--" can be used to send chat messages beginning with -n or -h.
- When "-q" is used, the message will be sent in the background and will not change the current active window.
+ 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.
+ You can send a message to a specific resource of the currently selected contact by using /say_to ./resourcename message.
+ The "-n" flag turns the message to "normal" type, "-h" to "headline". "--" can be used to send chat messages beginning with -n or -h.
+ When "-q" is used, the message will be sent in the background and will not change the current active window.
A text file can be provided with the "-f" switch (in which case there’s no need to pass a text argument after the jid, of course).

@@ -2522,7 +2885,7 @@

- Display or set an option value.
+ Display or set an option value.
Without arguments prints a list of all set options with their values

@@ -2542,11 +2905,11 @@

- 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.
+ 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.
With the "/status message" command, mcabber will update the message while preserving the status.

@@ -2558,9 +2921,9 @@

- 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.
+ 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).

@@ -2574,50 +2937,65 @@
+
+

CONFIGURATION FILE

See the provided sample configuration file, which should be self-documenting.

+
+

FILES

-

The following files can be used by mcabber(1):

+

The following files can be used by mcabber(1):

-
-
$HOME/.mcabber/mcabberrc    Default configuration file
+
+
$HOME/.mcabber/mcabberrc    Default configuration file
+$HOME/.config/mcabber/mcabberrc Alternate location (can use XDG_CONFIG_HOME)
 $HOME/.mcabberrc            Configuration file used if no other has been found
 $HOME/.mcabber/histo/       Default directory for storing chat history files, if enabled
 /usr/share/mcabber/help/    Default directory for online help files
-/usr/lib/mcabber/           Default directory for modules
+/usr/lib/mcabber/ Default directory for modules
+
+

BUGS

-

Certainly. Please tell me if you find one! :-)
+

Certainly. Please tell me if you find one! :-)
Please visit our website to find out about the MUC room and the bug tracker.

+
+

AUTHOR

Written by Mikael BERTHE and others -(see AUTHORS file).

+(see AUTHORS file).

+
+

RESOURCES

- +

Main web site
+Official wiki
+xmpp://mcabber@conf.lilotux.net[MCabber MUC room]

+
+

COPYING

-

Copyright (C) 2005-2017 Mikael Berthe and others.

+

Copyright (C) 2005-2017 Mikael Berthe and others.

Free use of this software is granted under the terms of the GNU General Public License (GPL).

-

+ +

diff -r 70f8ae7d690e -r 0d5660c6b4aa mcabber/doc/mcabber.1.txt --- a/mcabber/doc/mcabber.1.txt Fri Apr 21 21:50:16 2017 +0200 +++ b/mcabber/doc/mcabber.1.txt Thu May 11 14:32:24 2017 +0200 @@ -1,7 +1,7 @@ MCABBER(1) =========== Mikael BERTHE -v1.0.6-dev, January 2017 +v1.0.6-dev, May 2017 NAME ---- @@ -118,7 +118,7 @@ VI MODE ------- -If the 'vi_mode' option is set to 1, `mcabber(1)` accepts a few commands +If the "vi_mode" option is set to 1, `mcabber(1)` accepts a few commands loosely based on those available in `vi(1)`'s normal mode. In this case, chat mode is not entered by pressing enter, and messages cannot be composed outside of the chat mode. The following commands are accepted: @@ -130,28 +130,28 @@ G:: Call "/roster bottom". gg:: Call "/roster top". i:: Enter chat mode. -['n']j:: Call "/roster down ['n']". -['n']k:: Call "/roster up ['n']". +[N]j:: Call "/roster down [N]". +[N]k:: Call "/roster up [N]". n:: Repeat the previous search (if any). O:: Call "/roster unread_first" and open chat window. o:: Call "/roster unread_next" and open chat window. ZZ:: Call "/quit". zM:: Call "/group fold" for all groups. zR:: Call "/group unfold" for all groups. -\'':: Call "/roster alternate". +'':: Call "/roster alternate". !:: Toggle attention flag for current buddy. #:: Toggle unread messages flag for current buddy. :: Call "/group toggle" for the current group. A leading slash enables search mode: -/'string':: Call "/roster search 'string'". +/string:: Call "/roster search string". A leading colon enabled command-line mode: :q:: Call "/quit". -:'n':: Jump to line 'n' in the roster. -:'cmd-line':: Call "/'cmd-line'" (unless the 'cmd-line' matches one of the +:N:: Jump to line N in the roster. +:CMD-LINE:: Call "/CMD-LINE" (unless the CMD-LINE matches one of the above commands). Commands entered with a leading colon and searches are either submitted by @@ -565,6 +565,7 @@ The following files can be used by `mcabber(1)`: $HOME/.mcabber/mcabberrc Default configuration file + $HOME/.config/mcabber/mcabberrc Alternate location (can use XDG_CONFIG_HOME) $HOME/.mcabberrc Configuration file used if no other has been found $HOME/.mcabber/histo/ Default directory for storing chat history files, if enabled /usr/share/mcabber/help/ Default directory for online help files