Roster update: Merge branch 'master' of https://git.louiz.org/poezio

Conflicts:
	src/core.py
	src/tabs.py

2 files changed, 39 insertions, 0 deletions

diff --git a/doc/en/configure.txt b/doc/en/configure.txt
index b6fe41bf..36a49206 100644
--- a/doc/en/configure.txt
+++ b/doc/en/configure.txt
@@ -247,6 +247,33 @@ section of this documentation.
   If you want to show all the tabs in the Tab bar, even those
   with no activity, set to true. Else, set to false
 
+*show_tab_names*:: false
+
+  If you want to show the tab name in the bottom Tab bar, set this to true.
+
+*show_tab_numbers*:: true
+
+  If you want to disable the numbers in the bottom Tab bar, set this to false.
+  Note that if both show_tab_names and show_tab_numbers are set to false, the
+  numbers will still be displayed.
+
+*use_tab_nicks*:: true
+
+  The tabs have a name, and a nick, which is, for a contact, its name in the
+  roster, or for a private conversation, the nickname in the MUC. Set this to
+  true if you want to have them shown instead of the jid of the contact.
+
+*show_muc_jid*:: true
+
+  Set this to false if you want to display only the *user* part of the MUC
+  jid. E.g. if you have poezio@muc.poezio.eu, it will be displayed as
+  `poezio`. This will be used only if use_tab_nicks is set to true.
+
+*show_roster_jids*:: true
+
+  Set this to false if you want to hide the JIDs in the roster (and keep only
+  the contact names). If there is no contact name, the JID will still be
+  displayed.
 
 *beep_on*:: highlight private
 
diff --git a/doc/en/usage.txt b/doc/en/usage.txt
index 46e88a7e..d843a173 100644
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -151,6 +151,14 @@ The commands described in this page are shown like this:
 
 You can get the same help as below with the _/help_ command.
 
+NOTE: Use command parameters like this:
+
+* Do not use quotes if they are unnecessary (words without special chars)
+* If the command takes several agrguments, you need to put quotes around
+ arguments containing special chars such as backslashes or quotes
+* If the command always takes only one argument, then do not use quotes even
+ for words containing special chars
+
 
 Global commands
 ~~~~~~~~~~~~~~~
@@ -364,6 +372,10 @@ Roster tab commands
 */groupadd <jid> <group>*:: Add the given JID to the given group (if the group
  does not exist, it will be created).
 
+*/groupmove <jid> <old_group> <new_group>*:: Move the given JID from one group
+ to another (the JID has to be in the first group, and the new group  may not
+ exist).
+
 */groupremove <jid> <group>*:: Remove the given JID from the given group (if
  the group is empty after that, it will get deleted).