From 18d86c14eb94f1dafae0103777a6ecb0e577577e Mon Sep 17 00:00:00 2001
From: dequis <dx@dxzone.com.ar>
Date: Mon, 25 Jul 2016 01:50:17 -0300
Subject: settings: Remove actlist_moves, add actlist_sort and actlist_names

---
 _includes/sb_sidebar_settings.html    |  6 ++++--
 documentation/settings/index.markdown | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/_includes/sb_sidebar_settings.html b/_includes/sb_sidebar_settings.html
index e08ec8e..f4799e8 100644
--- a/_includes/sb_sidebar_settings.html
+++ b/_includes/sb_sidebar_settings.html
@@ -7,7 +7,8 @@
 	<option value="activity_hide_targets">activity_hide_targets</option>
 	<option value="activity_hilight_level">activity_hilight_level</option>
 	<option value="activity_msg_level">activity_msg_level</option>
-	<option value="actlist_moves">actlist_moves</option>
+	<option value="actlist_names">actlist_names</option>
+	<option value="actlist_sort">actlist_sort</option>
 	<option value="alternate_nick">alternate_nick</option>
 	<option value="auto_whowas">auto_whowas</option>
 	<option value="autoclose_query">autoclose_query</option>
@@ -250,7 +251,8 @@
 	<option value="activity_hide_targets">activity_hide_targets</option>
 	<option value="activity_hilight_level">activity_hilight_level</option>
 	<option value="activity_msg_level">activity_msg_level</option>
-	<option value="actlist_moves">actlist_moves</option>
+	<option value="actlist_names">actlist_names</option>
+	<option value="actlist_sort">actlist_sort</option>
 	<option value="autoclose_query">autoclose_query</option>
 	<option value="autoclose_windows">autoclose_windows</option>
 	<option value="autocreate_own_query">autocreate_own_query</option>
diff --git a/documentation/settings/index.markdown b/documentation/settings/index.markdown
index bca034d..a935f1a 100644
--- a/documentation/settings/index.markdown
+++ b/documentation/settings/index.markdown
@@ -361,10 +361,22 @@ See the [appendix F](#a_f) for credits and license information of this document.
 
 > Flag a channel as active when messages of this type are displayed there.
 
-{:#actlist_moves}
-` actlist_moves = OFF `
+{:#actlist_names}
+` actlist_names = OFF `
 
-> When on, irssi rearranges the activity list so windows with more recent activity appear first. Otherwise windows are listed in numeric order.
+> Turn on to add active items names in 'act' statusbar item.
+
+{:#actlist_sort}
+` actlist_sort = refnum `
+
+> Specifies the sorting type used for the activity bar. Accepted values:
+>
+> * `refnum` (default) - windows are listed in numeric order
+> * `recent` - windows with more recent activity appear first
+> * `level` - sort by window level (hilight, msg, etc), same ordering used by active_window command. Windows with the same level are sorted by refnum.
+> * `level,recent` - same as level, but windows with the same level are sorted by recent.
+>
+>Added in irssi 0.8.12. Before irssi 0.8.12, a boolean `actlist_moves` setting existed, which was equivalent to setting actlist_sort to refnum.
 
 {:#autoclose_query}
 ` autoclose_query = 0 `
-- 
cgit v1.2.3