From 2f5d7124676fb1e32a0223bd968d671ac2f38333 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 19:10:19 +0100
Subject: Doc: ChatTab and MUC commands

---
 doc/en/usage.txt | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index be6809ba..216e4852 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -57,3 +57,43 @@ These commands work in *any* tab.
 
 */bind <key> <eq>*:: Bind a key to another key or to a "command". For example, "/bind ^H KEY_UP" makes Control + h behave the same way than the Up key.
 
+Chat tab commands
+^^^^^^^^^^^^^^^^^
+
+These commands will work in any conversation tab (MultiUserChat, Private, or Conversation tabs).
+
+*/say <message>*:: Just send the message (only useful it you want your message to begin with a "/").
+
+MultiUserChat tab commands
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*/ignore <nickname>*:: Ignore a specified nickname.
+
+*/unignore <nickname>*:: Remove the specified nickname from the ignore list.
+
+*/kick <nick> [reason]*:: Kick the user with the specified nickname. You can also give an optional reason.
+
+*/topic <subject>*:: Change the subject of the room. You might want to knwow that entering "/topic [tab]" will autocomplete the topic.
+
+*/query <nick> [message]*:: Open a private conversation with <nick>. This nick has to be present in the room you’re currently in. If you specified a message after the nickname, it will be sent to this user.
+
+*/part [message]*:: Disconnect you from a room. You can specify an optional message.
+
+*/close [message]*:: Disconnect you from a room (if you are connected) and close the tab. You can specify an optional message if you are still connected.
+
+*/nick <nickname>*:: Change your nickname in the current room.
+
+*/recolor*:: Re-assign a color to all the participants in the current room, based on the last time they talked. Use this if the participants currently talking have too many identical colors.
+
+*/cycle [message]*:: Leave the current room an rejoint it immediatly. You can specify an optional quit message.
+
+*/info <nickname>*:: Display some information about the user in the room: his/her role, affiliation, status, and status message.
+
+*/version <nickname or jid>*:: Get the software version of the given nick in room or the given jid (usually its XMPP client and Operating System).
+
+*/configure*:: Configure the current room through a form.
+
+*/names*:: Get the list of the users in the room, their number, and the list of the people assuming different roles.
+
+*/clear*:: Clear the current buffer.
+
-- 
cgit v1.2.3


From 6779f7c7a46840b6323280596701cc7606f04a31 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 19:17:38 +0100
Subject: Doc: PrivateTab and ConversationTab commands

---
 doc/en/usage.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 216e4852..872ff0eb 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -97,3 +97,25 @@ MultiUserChat tab commands
 
 */clear*:: Clear the current buffer.
 
+Private tab commands
+^^^^^^^^^^^^^^^^^^^^
+
+*/info*:: Display some info about this user in the MultiUserChat.
+
+*/close*:: Close the tab.
+
+*/unquery*:: Close the tab.
+
+*/version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
+
+Normal Conversation tab commands
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*/info*:: Display the status of this contact.
+
+*/close*:: Close the tab.
+
+*/unquery*:: Close the tab.
+
+*/version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
+
-- 
cgit v1.2.3


From 696ce0f283ea95ddb88705c161691e2fa80c13b8 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 19:38:50 +0100
Subject: Doc: Roster tab commands

---
 doc/en/usage.txt | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 872ff0eb..e00b88de 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -57,6 +57,10 @@ These commands work in *any* tab.
 
 */bind <key> <eq>*:: Bind a key to another key or to a "command". For example, "/bind ^H KEY_UP" makes Control + h behave the same way than the Up key.
 
+NOTE: The following command will work everywhere, except in the Roster tab.
+
+*/close*:: Close the tab.
+
 Chat tab commands
 ^^^^^^^^^^^^^^^^^
 
@@ -102,8 +106,6 @@ Private tab commands
 
 */info*:: Display some info about this user in the MultiUserChat.
 
-*/close*:: Close the tab.
-
 */unquery*:: Close the tab.
 
 */version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
@@ -113,9 +115,30 @@ Normal Conversation tab commands
 
 */info*:: Display the status of this contact.
 
-*/close*:: Close the tab.
-
 */unquery*:: Close the tab.
 
 */version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
 
+Roster tab commands
+^^^^^^^^^^^^^^^^^^^
+
+*/accept [jid]*:: Authorize the provided JID (or the selected contact in the roster) to see your presence.
+
+*/deny [jid]*:: Prevent the provided JID (or the selected contact in the roster) from seeing your presence.
+
+*/add <jid>*:: Add the specified JID to your roster and authorize him to see your presence. If he accepts you, the subscription will be mutual (and if he doesn’t, you can still /deny him).
+
+*/name <jid> <name>*:: Set the given JID’s name.
+
+*/groupadd <jid> <group>*:: Add the given JID to the given group (if the group does not exist, it will be created).
+
+*/groupremove <jid> <group>*:: Remove the given JID from the given group (if the group is empty after that, it will get deleted).
+
+*/remove [jid]*:: Remove the specified JID from your roster. TThis will unsubscribe you from its presence, cancel it subscription to yours, and remove the item from your roster.
+
+NOTE: The following commands do not comply with any XEP or whatever, but they can still prove useful when you are migrating to an other JID.
+
+*/export [/path/to/file]*:: Export your contacts into /path/to/file if specified, or $HOME/poezio_contacts if not.
+
+*/import [/path/to/file]*:: Import your contacts from /path/to/file if specified, or $HOME/poezio_contacts if not.
+
-- 
cgit v1.2.3


From d28b70ccd4a29c6ef5b0f7f740ac04b4348669b4 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 19:39:12 +0100
Subject: Some documentation improvements.

---
 doc/en/usage.txt | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index e00b88de..e7df6ce8 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -1,18 +1,27 @@
 Usage
 =====
 
+This page is the main page of the documentation for poezio, explaining how to use it and describing its interfaces.
+
+Poezio is composed of tabs which can be of various types. Each tab type has
+a distinct interface, list of commands and list of key shortcuts, in addition
+to the global commands and key shortcuts.
+
 Commands
 --------
 
-Command listing
-~~~~~~~~~~~~~~~
+Commands start with the _/_ character and can take a list of any number
+of arguments, separated by spaces. If an argument should contain a space,
+you can use the _"_ character to surround this argument.
 
-The commands are shown like this:
+The commands described in this page are shown like this:
 
+===========================================================
 /command <mandatory argument> [optional argument]
+===========================================================
 
 Global commands
-^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~
 
 These commands work in *any* tab.
 
@@ -41,7 +50,7 @@ These commands work in *any* tab.
 
 */status <availability> [status message]*:: Set your availability and (optionaly) your status message. The <availability> argument is one of "available, chat, away, afk, dnd, busy, xa" and the optional [status] argument will be your status message.'
 
-*/bookmark [roomname][/nick]*:: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses the same syntax as /join. Type /help join for syntax examples. Note that when typing /bookmark on its own, the room will be bookmarked with the nickname you're currently using in this room (instead of default_nick).
+*/bookmark [roomname][/nick]*:: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses almost the same syntax as /join. Type /help join for syntax examples. Note that when typing /bookmark on its own, the room will be bookmarked with the nickname you're currently using in this room (instead of default_nick).
 
 */set <option> [value]*:: Sets the value to the option in your configuration file. You can, for example, change your default nickname by doing "/set default_nick toto" or your resource with "/set resource blabla". You can also set an empty value (nothing) by providing no [value] after <option>.
 
@@ -55,21 +64,21 @@ These commands work in *any* tab.
 
 */server_cycle [server.tld] [message]*:: Disconnect and reconnect in all the rooms of server.tld.
 
-*/bind <key> <eq>*:: Bind a key to another key or to a "command". For example, "/bind ^H KEY_UP" makes Control + h behave the same way than the Up key.
+*/bind <key> <eq>*:: Bind a key to another key or to a "command". For example, "/bind ^H KEY_UP" makes Control + h behave the same way as the Up key. See the link:keys.html[key bindings documentation page] for more details.
 
 NOTE: The following command will work everywhere, except in the Roster tab.
 
 */close*:: Close the tab.
 
 Chat tab commands
-^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~
 
 These commands will work in any conversation tab (MultiUserChat, Private, or Conversation tabs).
 
-*/say <message>*:: Just send the message (only useful it you want your message to begin with a "/").
+*/say <message>*:: Just send the message (only useful it you want your message to begin with a _/_).Note that you can also send message starting with a _/_ by starting it with _//_.
 
 MultiUserChat tab commands
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 */ignore <nickname>*:: Ignore a specified nickname.
 
@@ -102,7 +111,7 @@ MultiUserChat tab commands
 */clear*:: Clear the current buffer.
 
 Private tab commands
-^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~
 
 */info*:: Display some info about this user in the MultiUserChat.
 
@@ -111,7 +120,7 @@ Private tab commands
 */version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
 
 Normal Conversation tab commands
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 */info*:: Display the status of this contact.
 
-- 
cgit v1.2.3


From aa2623c0c6872a456e2dcaf077910d8c5d921108 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 19:40:28 +0100
Subject: change title level for Roster tab commands

---
 doc/en/usage.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index e7df6ce8..7eb1b335 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -129,7 +129,7 @@ Normal Conversation tab commands
 */version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
 
 Roster tab commands
-^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~
 
 */accept [jid]*:: Authorize the provided JID (or the selected contact in the roster) to see your presence.
 
-- 
cgit v1.2.3


From 718e2f3851744a54dac2028ff4ecc7897c1e0a13 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 19:58:10 +0100
Subject: 80 cols.

---
 doc/en/usage.txt | 118 +++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 85 insertions(+), 33 deletions(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 7eb1b335..c77a8076 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -1,7 +1,8 @@
 Usage
 =====
 
-This page is the main page of the documentation for poezio, explaining how to use it and describing its interfaces.
+This page is the main page of the documentation for poezio, explaining how to
+ use it and describing its interfaces.
 
 Poezio is composed of tabs which can be of various types. Each tab type has
 a distinct interface, list of commands and list of key shortcuts, in addition
@@ -25,7 +26,13 @@ Global commands
 
 These commands work in *any* tab.
 
-*/join [room_name][@server][/nick] [password]*:: Join the specified room. You can specify a nickname after a slash (/). If no nickname is specified, you will use the default_nick in the configuration file. You can omit the room name: you will then join the room you're looking at (useful if you were kicked). You can also provide a room_name without specifying a server, the server of the room you're currently in will be used. You can also provide a password to join the room.
+*/join [room_name][@server][/nick] [password]*:: Join the specified room. You
+ can specify a nickname after a slash (/). If no nickname is specified, you
+ will use the default_nick in the configuration file. You can omit the room
+ name: you will then join the room you're looking at (useful if you were
+ kicked). You can also provide a room_name without specifying a server, the
+ server of the room you're currently in will be used. You can also provide a
+ password to join the room.
 
 - Examples:
 * /join room@server.tld
@@ -48,23 +55,40 @@ These commands work in *any* tab.
 
 */w <number>*:: Like /win.
 
-*/status <availability> [status message]*:: Set your availability and (optionaly) your status message. The <availability> argument is one of "available, chat, away, afk, dnd, busy, xa" and the optional [status] argument will be your status message.'
+*/status <availability> [status message]*:: Set your availability and
+ (optionaly) your status message. The <availability> argument is one of
+ "available, chat, away, afk, dnd, busy, xa" and the optional [status] argument
+ will be your status message.'
 
-*/bookmark [roomname][/nick]*:: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses almost the same syntax as /join. Type /help join for syntax examples. Note that when typing /bookmark on its own, the room will be bookmarked with the nickname you're currently using in this room (instead of default_nick).
+*/bookmark [roomname][/nick]*:: Bookmark the specified room (you will then
+ auto-join it on each poezio start). This commands uses almost the same syntax
+ as /join. Type /help join for syntax examples. Note that when typing /bookmark
+ on its own, the room will be bookmarked with the nickname you're currently
+ using in this room (instead of default_nick).
 
-*/set <option> [value]*:: Sets the value to the option in your configuration file. You can, for example, change your default nickname by doing "/set default_nick toto" or your resource with "/set resource blabla". You can also set an empty value (nothing) by providing no [value] after <option>.
+*/set <option> [value]*:: Sets the value to the option in your configuration
+ file. You can, for example, change your default nickname by doing "/set
+ default_nick toto" or your resource with "/set resource blabla". You can also
+ set an empty value (nothing) by providing no [value] after <option>.
 
 */theme*:: Reload the theme defined in the config file.
 
-*/list [server.tld]*:: Get the list of public chatrooms in the specified server.
+*/list [server.tld]*:: Get the list of public chatrooms in the specified server
+.
 
-*/message <jid> [optional message]*:: Open a conversation with the specified JID (event if it is not in our roster), and send a message to him, if specified.
+*/message <jid> [optional message]*:: Open a conversation with the specified
+ JID (event if it is not in our roster), and send a message to him, if
+ specified.
 
-*/version <jid>*:: Get the software version of the given JID (usually its XMPP client and Operating System).
+*/version <jid>*:: Get the software version of the given JID (usually its XMPP
+ client and Operating System).
 
-*/server_cycle [server.tld] [message]*:: Disconnect and reconnect in all the rooms of server.tld.
+*/server_cycle [server.tld] [message]*:: Disconnect and reconnect in all the
+ rooms of server.tld.
 
-*/bind <key> <eq>*:: Bind a key to another key or to a "command". For example, "/bind ^H KEY_UP" makes Control + h behave the same way as the Up key. See the link:keys.html[key bindings documentation page] for more details.
+*/bind <key> <eq>*:: Bind a key to another key or to a "command". For example,
+ "/bind ^H KEY_UP" makes Control + h behave the same way as the Up key. See the
+ link:keys.html[key bindings documentation page] for more details.
 
 NOTE: The following command will work everywhere, except in the Roster tab.
 
@@ -73,9 +97,12 @@ NOTE: The following command will work everywhere, except in the Roster tab.
 Chat tab commands
 ~~~~~~~~~~~~~~~~~
 
-These commands will work in any conversation tab (MultiUserChat, Private, or Conversation tabs).
+These commands will work in any conversation tab (MultiUserChat, Private, or
+ Conversation tabs).
 
-*/say <message>*:: Just send the message (only useful it you want your message to begin with a _/_).Note that you can also send message starting with a _/_ by starting it with _//_.
+*/say <message>*:: Just send the message (only useful it you want your message
+ to begin with a _/_).Note that you can also send message starting with a _/_
+ by starting it with _//_.
 
 MultiUserChat tab commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,29 +111,41 @@ MultiUserChat tab commands
 
 */unignore <nickname>*:: Remove the specified nickname from the ignore list.
 
-*/kick <nick> [reason]*:: Kick the user with the specified nickname. You can also give an optional reason.
+*/kick <nick> [reason]*:: Kick the user with the specified nickname. You can
+ also give an optional reason.
 
-*/topic <subject>*:: Change the subject of the room. You might want to knwow that entering "/topic [tab]" will autocomplete the topic.
+*/topic <subject>*:: Change the subject of the room. You might want to knwow
+ that entering "/topic [tab]" will autocomplete the topic.
 
-*/query <nick> [message]*:: Open a private conversation with <nick>. This nick has to be present in the room you’re currently in. If you specified a message after the nickname, it will be sent to this user.
+*/query <nick> [message]*:: Open a private conversation with <nick>. This nick
+ has to be present in the room you’re currently in. If you specified a message
+ after the nickname, it will be sent to this user.
 
-*/part [message]*:: Disconnect you from a room. You can specify an optional message.
+*/part [message]*:: Disconnect you from a room. You can specify an optional
+ message.
 
-*/close [message]*:: Disconnect you from a room (if you are connected) and close the tab. You can specify an optional message if you are still connected.
+*/close [message]*:: Disconnect you from a room (if you are connected) and
+ close the tab. You can specify an optional message if you are still connected.
 
 */nick <nickname>*:: Change your nickname in the current room.
 
-*/recolor*:: Re-assign a color to all the participants in the current room, based on the last time they talked. Use this if the participants currently talking have too many identical colors.
+*/recolor*:: Re-assign a color to all the participants in the current room,
+ based on the last time they talked. Use this if the participants currently
+ talking have too many identical colors.
 
-*/cycle [message]*:: Leave the current room an rejoint it immediatly. You can specify an optional quit message.
+*/cycle [message]*:: Leave the current room an rejoint it immediatly. You can
+ specify an optional quit message.
 
-*/info <nickname>*:: Display some information about the user in the room: his/her role, affiliation, status, and status message.
+*/info <nickname>*:: Display some information about the user in the room:
+ his/her role, affiliation, status, and status message.
 
-*/version <nickname or jid>*:: Get the software version of the given nick in room or the given jid (usually its XMPP client and Operating System).
+*/version <nickname or jid>*:: Get the software version of the given nick in
+ room or the given jid (usually its XMPP client and Operating System).
 
 */configure*:: Configure the current room through a form.
 
-*/names*:: Get the list of the users in the room, their number, and the list of the people assuming different roles.
+*/names*:: Get the list of the users in the room, their number, and the list
+ of the people assuming different roles.
 
 */clear*:: Clear the current buffer.
 
@@ -117,7 +156,8 @@ Private tab commands
 
 */unquery*:: Close the tab.
 
-*/version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
+*/version*:: Get the software version of the current interlocutor (usually its
+ XMPP client and Operating System).
 
 Normal Conversation tab commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -126,28 +166,40 @@ Normal Conversation tab commands
 
 */unquery*:: Close the tab.
 
-*/version*:: Get the software version of the current interlocutor (usually its XMPP client and Operating System).
+*/version*:: Get the software version of the current interlocutor (usually its
+ XMPP client and Operating System).
 
 Roster tab commands
 ~~~~~~~~~~~~~~~~~~~
 
-*/accept [jid]*:: Authorize the provided JID (or the selected contact in the roster) to see your presence.
+*/accept [jid]*:: Authorize the provided JID (or the selected contact in the
+ roster) to see your presence.
 
-*/deny [jid]*:: Prevent the provided JID (or the selected contact in the roster) from seeing your presence.
+*/deny [jid]*:: Prevent the provided JID (or the selected contact in the
+ roster) from seeing your presence.
 
-*/add <jid>*:: Add the specified JID to your roster and authorize him to see your presence. If he accepts you, the subscription will be mutual (and if he doesn’t, you can still /deny him).
+*/add <jid>*:: Add the specified JID to your roster and authorize him to see
+ your presence. If he accepts you, the subscription will be mutual (and if he
+ doesn’t, you can still /deny him).
 
 */name <jid> <name>*:: Set the given JID’s name.
 
-*/groupadd <jid> <group>*:: Add the given JID to the given group (if the group does not exist, it will be created).
+*/groupadd <jid> <group>*:: Add the given JID to the given group (if the group
+ does not exist, it will be created).
 
-*/groupremove <jid> <group>*:: Remove the given JID from the given group (if the group is empty after that, it will get deleted).
+*/groupremove <jid> <group>*:: Remove the given JID from the given group (if
+ the group is empty after that, it will get deleted).
 
-*/remove [jid]*:: Remove the specified JID from your roster. TThis will unsubscribe you from its presence, cancel it subscription to yours, and remove the item from your roster.
+*/remove [jid]*:: Remove the specified JID from your roster. This will
+ unsubscribe you from its presence, cancel it subscription to yours, and remove
+ the item from your roster.
 
-NOTE: The following commands do not comply with any XEP or whatever, but they can still prove useful when you are migrating to an other JID.
+NOTE: The following commands do not comply with any XEP or whatever, but they
+ can still prove useful when you are migrating to an other JID.
 
-*/export [/path/to/file]*:: Export your contacts into /path/to/file if specified, or $HOME/poezio_contacts if not.
+*/export [/path/to/file]*:: Export your contacts into /path/to/file if
+ specified, or $HOME/poezio_contacts if not.
 
-*/import [/path/to/file]*:: Import your contacts from /path/to/file if specified, or $HOME/poezio_contacts if not.
+*/import [/path/to/file]*:: Import your contacts from /path/to/file if
+ specified, or $HOME/poezio_contacts if not.
 
-- 
cgit v1.2.3


From f8eb06b68c788eaa880a884a9b4b8797d4573993 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 20:07:24 +0100
Subject: Describe tab system

---
 doc/en/usage.txt | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index c77a8076..6f28572f 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -8,6 +8,32 @@ Poezio is composed of tabs which can be of various types. Each tab type has
 a distinct interface, list of commands and list of key shortcuts, in addition
 to the global commands and key shortcuts.
 
+Tabs
+----
+On all tabs, you get a line showing the the list of all opened tabs. Each tab has a number, each time you open a new tab, it gets the next available number.
+
+image::../images/tab_bar.png["Example of 5 opened tabs", title="Example of 5 opened tabs"]
+
+The tab numbered _0_ is always the _roster_ tab, the other tabs can be of any type.
+
+The status of a tab is represented by its color:
+
+* *[navy]#blue#* (tab _0_): an inactive tab of any type, nothing new to see there.
+* *[purple]#purple#* (tab _1_): a MultiUserChat tab with at least one new unread message.
+* *[green]#green#* (tab _2_): a tab of a private conversation with a new message to read.
+* *[teal]#cyan#* (tab _3_): the current tab.
+* *[red]#red#* (tab _4_): a MultiUserChat tab with at least one new hightlight message.
+
+You can go from one tab to another in many ways:
+
+* Ctrl+n and Ctrl+p
+* <<command-win, win>> command
+* <<command-next, next>> and <<command-prev, prev>> commands
+* Alt+ a number
+* Alt+j followed by a two-digits number
+* Alt+e, this will jump to the next tab with the highest priority. Priority applies in this order: private message > highlight message > normal message.
+
+
 Commands
 --------
 
@@ -47,10 +73,13 @@ These commands work in *any* tab.
 
 */quit*:: Like /exit.
 
+[[command-next]]
 */next*:: Go to the next room.
 
+[[command-prev]]
 */prev*:: Go to the previous room.
 
+[[command-win]]
 */win <number>*:: Go to the specified room.
 
 */w <number>*:: Like /win.
-- 
cgit v1.2.3


From 08664e3ba77d0e337b3d7ca341992f8037513d88 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 20:21:59 +0100
Subject: =?UTF-8?q?80=20cols=C2=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/en/usage.txt | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 6f28572f..95530664 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -10,19 +10,27 @@ to the global commands and key shortcuts.
 
 Tabs
 ----
-On all tabs, you get a line showing the the list of all opened tabs. Each tab has a number, each time you open a new tab, it gets the next available number.
+On all tabs, you get a line showing the the list of all opened tabs. Each tab
+has a number, each time you open a new tab, it gets the next available number.
 
-image::../images/tab_bar.png["Example of 5 opened tabs", title="Example of 5 opened tabs"]
 
-The tab numbered _0_ is always the _roster_ tab, the other tabs can be of any type.
+image::../images/tab_bar.png[title="Example of 5 opened tabs"]
+
+The tab numbered _0_ is always the _roster_ tab, the other tabs can be of any
+type.
+
 
 The status of a tab is represented by its color:
 
-* *[navy]#blue#* (tab _0_): an inactive tab of any type, nothing new to see there.
-* *[purple]#purple#* (tab _1_): a MultiUserChat tab with at least one new unread message.
-* *[green]#green#* (tab _2_): a tab of a private conversation with a new message to read.
+* *[navy]#blue#* (tab _0_): an inactive tab of any type, nothing new to see
+   there.
+* *[purple]#purple#* (tab _1_): a MultiUserChat tab with at least one new
+  unread message.
+* *[green]#green#* (tab _2_): a tab of a private conversation with a new
+   message to read.
 * *[teal]#cyan#* (tab _3_): the current tab.
-* *[red]#red#* (tab _4_): a MultiUserChat tab with at least one new hightlight message.
+* *[red]#red#* (tab _4_): a MultiUserChat tab with at least one new hightlight
+   message.
 
 You can go from one tab to another in many ways:
 
@@ -31,8 +39,8 @@ You can go from one tab to another in many ways:
 * <<command-next, next>> and <<command-prev, prev>> commands
 * Alt+ a number
 * Alt+j followed by a two-digits number
-* Alt+e, this will jump to the next tab with the highest priority. Priority applies in this order: private message > highlight message > normal message.
-
+* Alt+e, this will jump to the next tab with the highest priority. Priority
+  applies in this order: private message > highlight message > normal message.
 
 Commands
 --------
-- 
cgit v1.2.3


From 8c2cd6e52111d68baf4c10ad1a72c4d06a5d1066 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 20:38:14 +0100
Subject: Describe the roster tab

---
 doc/en/usage.txt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 95530664..2bfecac8 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -42,6 +42,22 @@ You can go from one tab to another in many ways:
 * Alt+e, this will jump to the next tab with the highest priority. Priority
   applies in this order: private message > highlight message > normal message.
 
+Roster tab
+~~~~~~~~~~
+This is a unique tab, always numbered _0_. It contains the list of your
+contacts. You can add/remove/edit/search contacts from there, and you can open
+a conversation with one of them.
+
+Use the _arrows_ to browse the list, the _space_ key to fold or unfold a group
+or a contact.
+
+image::../images/roster.png["The roster tab", title="The roster tab"]
+
+* _1_: The area where information messages are displayed.
+* _2_: The actual list of contacts. The first level is group, the second is the
+* contacts and the third is the resources of you online contacts.
+* _3_: More informations about the selected contact.
+
 Commands
 --------
 
-- 
cgit v1.2.3


From b30c17762a4d14a1c7f13c94e915c3579ef3c0b9 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 21:06:39 +0100
Subject: Describe the muc interface.

---
 doc/en/usage.txt | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 2bfecac8..eb56085d 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -58,6 +58,40 @@ image::../images/roster.png["The roster tab", title="The roster tab"]
 * contacts and the third is the resources of you online contacts.
 * _3_: More informations about the selected contact.
 
+MultiUserChat tab
+~~~~~~~~~~~~~~~~~
+
+This tab contains a multi-users conversation.
+
+image::../images/muc.png["The MUC tab", title="The MUC tab"]
+
+* _1_: The conversation window, this is where all the messages and events
+  related to the muc will be displayed. It can be scrolled up and down with
+  PageUp and PageDown.
+* _2_: The participant list. Participants are listed by their role first, and
+  then alphabetically.
+  In the default theme, The nick colors mean:
+  - Red: moderator
+  - Blue: participant
+  - gray: visitor + 
+  + 
+  The status of each participant is symbolized using the _color_ of the
+  character on the left of its nick.
+  That character also shows the chatstate of each participant:
+  - _|_: inactive
+  - _X_: composing
+  - _A_: active
+  - _p_: paused
+* _3_: Your information in that MUC (the name of the room, your nick, your role
+  and affiliation).
+* _4_: The topic of the room.
+
+You can configure the room (if you have the rights to do it) using the
+_/configure_ command, open a private conversation with someone using the
+_/query_ command, change or view the topic using the _/topic_ command…
+
+
+
 Commands
 --------
 
-- 
cgit v1.2.3


From 77241f7794f616da15543429e64cb5a0bf0c5188 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Tue, 8 Nov 2011 21:31:43 +0100
Subject: describe private, conversation, data form and list tabs.

---
 doc/en/usage.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index eb56085d..d0a58a8f 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -90,7 +90,51 @@ You can configure the room (if you have the rights to do it) using the
 _/configure_ command, open a private conversation with someone using the
 _/query_ command, change or view the topic using the _/topic_ command…
 
+Private tab
+~~~~~~~~~~~
+This is the tab opened with the _/query_ command, letting you talk in private
+with a participant of a multi-users chat.
 
+image::../images/muc.png["The private tab", title="The private tab"]
+
+This is just a simple one to one conversation, with a line showing the status,
+name and chatstate of the participant.
+
+Conversation tab
+~~~~~~~~~~~~~~~~
+A tab opened from the roster, to talk in private with one of your contacts.
+
+image::../images/conversation.png["The conversation tab", title="The conversation tab"]
+
+This is also just a simple one to one conversation, with a line showing the status,
+name and chatstate of the participant, as well as a line at the top showing the
+status message of the contact.
+
+Dataforms tab
+~~~~~~~~~~~~~
+
+This tab lets you view a form receive from a remote entity, edit the values and
+send everything back. It is mostly used to configure MUCs with the _/configure_
+command but can actually be used for almost anything.
+
+image::../images/data_forms.png["The dataform tab", title="The dataform tab"]
+
+Use the _up_ and _down_ keys to go from one field to the other, and edit the
+value using the _space_, _left_ or _right_ keys, or by entering text.
+
+You can then send the completed form using _Ctrl+y_ or cancel using _Ctrl+g_.
+
+List tab
+~~~~~~~~
+
+This tab lists all public rooms on a MUC service. It is currently very limited
+but will be improved in the future. There currently is no way to search a room
+or even to sort them.
+
+image::../images/list.png["The list tab", title="The list tab"]
+
+Use the _up_ and _down_ or _PageUp_ and _PageDown_ keys to browse the list, and
+use _Enter_ or _j_ to join the selected room.
 
 Commands
 --------
-- 
cgit v1.2.3


From 75da76285f1d2a4a16d408fd942cbdcdbd321186 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 23:12:03 +0100
Subject: documentation typos/fixes

---
 doc/en/usage.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index d0a58a8f..52123d50 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -95,7 +95,7 @@ Private tab
 This is the tab opened with the _/query_ command, letting you talk in private
 with a participant of a multi-users chat.
 
-image::../images/muc.png["The private tab", title="The private tab"]
+image::../images/private.png["The private tab", title="The private tab"]
 
 This is just a simple one to one conversation, with a line showing the status,
 name and chatstate of the participant.
@@ -232,7 +232,7 @@ These commands will work in any conversation tab (MultiUserChat, Private, or
  Conversation tabs).
 
 */say <message>*:: Just send the message (only useful it you want your message
- to begin with a _/_).Note that you can also send message starting with a _/_
+ to begin with a _/_). Note that you can also send message starting with a _/_
  by starting it with _//_.
 
 MultiUserChat tab commands
@@ -322,8 +322,8 @@ Roster tab commands
  the group is empty after that, it will get deleted).
 
 */remove [jid]*:: Remove the specified JID from your roster. This will
- unsubscribe you from its presence, cancel it subscription to yours, and remove
- the item from your roster.
+ unsubscribe you from its presence, cancel its subscription to yours, and
+ remove the item from your roster.
 
 NOTE: The following commands do not comply with any XEP or whatever, but they
  can still prove useful when you are migrating to an other JID.
-- 
cgit v1.2.3


From 7fadb35fe2e7932a0a4aa6a8184ab6b186669edc Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Tue, 8 Nov 2011 23:39:48 +0100
Subject: Do not forget about the /help command

---
 doc/en/usage.txt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc/en/usage.txt')

diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 52123d50..f11ab5ed 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -149,11 +149,18 @@ The commands described in this page are shown like this:
 /command <mandatory argument> [optional argument]
 ===========================================================
 
+You can get the same help as below with the _/help_ command.
+
+
 Global commands
 ~~~~~~~~~~~~~~~
 
 These commands work in *any* tab.
 
+*/help [command]*:: If called without an argument, this command will list the
+ available commands. If it has a valid command as an argument, this command
+ will show the usage and the help for the given command.
+
 */join [room_name][@server][/nick] [password]*:: Join the specified room. You
  can specify a nickname after a slash (/). If no nickname is specified, you
  will use the default_nick in the configuration file. You can omit the room
-- 
cgit v1.2.3