4 files changed, 27 insertions, 18 deletions
diff --git a/doc/en/autogen/user/buflist_commands.adoc b/doc/en/autogen/user/buflist_commands.adoc
index ca80e8765..abe134263 100644
--- a/doc/en/autogen/user/buflist_commands.adoc
+++ b/doc/en/autogen/user/buflist_commands.adoc
@@ -22,11 +22,15 @@ The following variables can be used in these options:
     - ${buffer.full_name}
     - ${buffer.short_name}
     - ${buffer.nicklist_nicks_count}
+  - irc_server: IRC server data, defined only on an IRC buffer (see hdata "irc_server" in API doc)
+  - irc_channel: IRC channel data, defined only on an IRC channel buffer (see hdata "irc_channel" in API doc)
   - extra variables added by buflist for convenience:
     - ${format_buffer}: the evaluated value of option buflist.format.buffer; this can be used in option buflist.format.buffer_current to just change the background color for example
     - ${format_number}: indented number with separator (evaluation of option buflist.format.number)
     - ${number}: indented number, for example " 1" if there are between 10 and 99 buffers
-    - ${indent}: indentation for name (channel and private buffers are indented)
+    - ${indent}: indentation for name (channel and private buffers are indented) (evaluation of option buflist.format.indent)
+    - ${format_nick_prefix}: colored nick prefix for a channel (evaluation of option buflist.format.nick_prefix)
+    - ${color_nick_prefix}: color of nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
     - ${nick_prefix}: nick prefix for a channel (set only if the option buflist.look.nick_prefix is enabled)
     - ${name}: the short name (if set), with a fallback on the name
     - ${color_hotlist}: the color depending on the highest hotlist level for the buffer (evaluation of option buflist.format.hotlist_xxx where xxx is the level)
diff --git a/doc/en/autogen/user/buflist_options.adoc b/doc/en/autogen/user/buflist_options.adoc
index cb487694a..019d946f0 100644
--- a/doc/en/autogen/user/buflist_options.adoc
+++ b/doc/en/autogen/user/buflist_options.adoc
@@ -6,13 +6,13 @@
 ** description: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)]
 ** type: string
 ** values: any string
-** default value: `+"${format_number}${indent}${nick_prefix}${color_hotlist}${name}"+`
+** default value: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${name}"+`
 
 * [[option_buflist.format.buffer_current]] *buflist.format.buffer_current*
 ** description: pass:none[format for the line with current buffer (note: content is evaluated, see /help buflist)]
 ** type: string
 ** values: any string
-** default value: `+"${color:lightgreen,blue}${format_buffer}"+`
+** default value: `+"${color:,blue}${format_buffer}"+`
 
 * [[option_buflist.format.hotlist]] *buflist.format.hotlist*
 ** description: pass:none[format for hotlist (note: content is evaluated, see /help buflist)]
@@ -56,12 +56,24 @@
 ** values: any string
 ** default value: `+"${color:default},"+`
 
+* [[option_buflist.format.indent]] *buflist.format.indent*
+** description: pass:none[string displayed to indent channel and private buffers (note: content is evaluated, see /help buflist)]
+** type: string
+** values: any string
+** default value: `+"  "+`
+
 * [[option_buflist.format.lag]] *buflist.format.lag*
 ** description: pass:none[format for lag on an IRC server buffer (note: content is evaluated, see /help buflist)]
 ** type: string
 ** values: any string
 ** default value: `+" ${color:green}[${color:brown}${lag}${color:green}]"+`
 
+* [[option_buflist.format.nick_prefix]] *buflist.format.nick_prefix*
+** description: pass:none[format for nick prefix on a channel (note: content is evaluated, see /help buflist)]
+** type: string
+** values: any string
+** default value: `+"${color_nick_prefix}${nick_prefix}"+`
+
 * [[option_buflist.format.number]] *buflist.format.number*
 ** description: pass:none[format for buffer number, ${number} is the indented number (note: content is evaluated, see /help buflist)]
 ** type: string
@@ -69,7 +81,7 @@
 ** default value: `+"${color:green}${number}${if:${number_displayed}?.: }"+`
 
 * [[option_buflist.look.display_conditions]] *buflist.look.display_conditions*
-** description: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist)]
+** description: pass:none[conditions to display a buffer (note: content is evaluated, see /help buflist); for example to hide server buffers if they are merged with core buffer: "${buffer.hidden}==0 && ((${type}!=server && ${buffer.full_name}!=core.weechat) || ${buffer.active}==1)"]
 ** type: string
 ** values: any string
 ** default value: `+"${buffer.hidden}==0"+`
diff --git a/doc/en/autogen/user/script_options.adoc b/doc/en/autogen/user/script_options.adoc
index 122b9768f..ce23b0272 100644
--- a/doc/en/autogen/user/script_options.adoc
+++ b/doc/en/autogen/user/script_options.adoc
@@ -237,13 +237,7 @@
 ** default value: `+"%h/script"+`
 
 * [[option_script.scripts.url]] *script.scripts.url*
-** description: pass:none[URL for file with list of scripts; by default HTTPS is forced, see option script.scripts.url_force_https]
+** description: pass:none[URL for file with list of scripts]
 ** type: string
 ** values: any string
-** default value: `+"http://weechat.org/files/plugins.xml.gz"+`
-
-* [[option_script.scripts.url_force_https]] *script.scripts.url_force_https*
-** description: pass:none[force use of HTTPS for downloads (index and scripts); you should disable this option only if you have problems with the downloads]
-** type: boolean
-** values: on, off
-** default value: `+on+`
+** default value: `+"https://weechat.org/files/plugins.xml.gz"+`
diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc
index 1ceded3cd..aaa5bc7e7 100644
--- a/doc/en/autogen/user/weechat_commands.adoc
+++ b/doc/en/autogen/user/weechat_commands.adoc
@@ -285,9 +285,9 @@ Some variables are replaced in expression, using the format ${variable}, variabl
   1. an evaluated sub-string (format: "eval:xxx")
   2. a string with escaped chars (format: "esc:xxx" or "\xxx")
   3. a string with chars to hide (format: "hide:char,string")
-  4. a string with max chars (format: "cut:max,suffix,string")
-     or max chars displayed on screen (format: "cutscr:max,suffix,string")
-  5. a color (format: "color:xxx")
+  4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
+     or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
+  5. a color (format: "color:xxx", see "Plugin API reference", function "color")
   6. an info (format: "info:name,arguments", arguments are optional)
   7. current date/time (format: "date" or "date:format")
   8. an environment variable (format: "env:XXX")
@@ -314,9 +314,8 @@ Examples (simple strings):
   /eval -n ${window.buffer.number}               ==> 1
   /eval -n ${\t}                                 ==> <tab>
   /eval -n ${hide:-,${relay.network.password}}   ==> --------
-  /eval -n ${cut:2,+,test}                       ==> te+
-  /eval -n ${cut:2,+,こんにちは世界}             ==> こん+
-  /eval -n ${cutscr:2,+,こんにちは世界}          ==> こ+
+  /eval -n ${cut:3,+,test}                       ==> tes+
+  /eval -n ${cut:+3,+,test}                      ==> te+
   /eval -n ${date:%H:%M:%S}                      ==> 07:46:40
   /eval -n ${if:${info:term_width}>80?big:small} ==> big