relay: fix crash when decoding a malformed websocket frame (CVE-2021-40516)

Version 2.3.1-dev
Version 2.3
2026-06-13 06:34:47 +02:00 · 2021-09-07 19:05:06 +02:00 · 2021-09-07 19:00:23 +02:00 · 2018-10-21 11:12:41 +02:00 · 2018-10-21 08:54:04 +02:00 · 2018-10-21 08:53:22 +02:00
432 changed files with 27657 additions and 14897 deletions
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a bug report (please do not report security issues here)
+
+---
+
+<!-- Please do not report any security issue here, see file Contributing.adoc -->
+
+## Bug summary
+
+
+
+## Current behavior
+
+
+
+## Steps to reproduce
+
+1. 
+2. 
+3. 
+
+## Desired behavior
+
+
+
+## Suggested solutions
+
+
+
+## Additional information
+
+
+
+---
+
+<!-- MANDATORY INFO: -->
+
+- WeeChat version: 
+- OS, distribution and version: 
@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Request a new feature / enhancement
+
+---
+
+## Feature description
@@ -0,0 +1,14 @@
+---
+name: Question
+about: Ask a question (please read first FAQ and docs)
+
+---
+
+## Question
+
+
+
+---
+
+- WeeChat version: 
+- OS, distribution and version: 
@@ -34,6 +34,7 @@ script:
    - pylint tests/scripts/python/testapigen.py
    - pylint tests/scripts/python/testapi.py
    - pylint tests/scripts/python/unparse.py
+    - ./tools/build-debian.sh test-patches

 after_success:
    - weechat --help
@@ -26,20 +26,24 @@ Alphabetically:
 * Asakura
 * Bazerka
 * Benoit Papillault (benoit)
+* Chris Hills
 * Christian Heinz
 * Christopher O'Neill (deltafire)
 * coypoop
 * David Flatz
 * Dmitry Kobylin
 * Dominik Honnef
+* Dominique Martinet
 * Eduardo Elias
 * Elizabeth Myers (Elizacat)
 * Elián Hanisch (m4v)
 * Emanuele Giaquinta
+* emk
 * Esteban I. Ruiz Moreno (Exio)
 * Evgeny Shmarnev
 * Felix Eckhofer
 * Frank Zacharias
+* Fredrik Fornwall
 * Grant Wu
 * Gu1ll4um3r0m41n
 * Guido Berhoerster
@@ -52,6 +56,8 @@ Alphabetically:
 * Jim Ramsay (lack)
 * Jiri Golembiovsky (GolemJ)
 * Joey Pabalinas (alyptik)
+* Jos Ahrens
+* Joseph Kichline
 * Juan Francisco Cantero Hurtado
 * Julien Louis (ptitlouis)
 * Karthik K
@@ -95,6 +101,7 @@ Alphabetically:
 * Rob Campbell
 * Romero B. de S. Malaquias
 * Rudolf Polzer (divVerent)
+* Ruslan Bekenev
 * Ryuunosuke Ayanokouzi
 * scumjr
 * Sergio Durigan Junior
@@ -116,9 +123,11 @@ Alphabetically:
 * Vasco Almeida
 * Voroskoi
 * Wojciech Kwolek
+* W. Trevor King
 * Yannick Palanque
+* Ørjan Malde

 == Contact

 See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
-or https://weechat.org/dev/support
+or https://weechat.org/about/support
@@ -15,6 +15,118 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).


+[[v2.3.1]]
+== Version 2.3.1 (under dev)
+
+Bug fixes::
+
+  * relay: fix crash when decoding a malformed websocket frame (CVE-2021-40516)
+
+[[v2.3]]
+== Version 2.3 (2018-10-21)
+
+New features::
+
+  * core: add repeat of string in evaluation of expressions with "repeat:count,string" (issue #958)
+  * core: allow specifying buffer number/name for /buffer localvar (issue #1259)
+  * core: allow multiple arguments in command /buffer close
+  * core: allow multiple options "-r" ("--run-command") in command line arguments (issue #1248)
+  * core: add option "-P" (or "--plugins") to customize the plugins to load at startup
+  * core: allow partial buffer name in command /buffer close (issue #1226)
+  * api: add function hook_line
+  * irc: display a warning when the value of option irc.server.xxx.autojoin is set to an invalid value
+  * relay: add real IP in client description (issue #1256)
+  * trigger: allow creation of temporary variables with the regex
+  * trigger: add hook "line"
+
+Bug fixes::
+
+  * core: fix evaluation of nested ternary operators (issue #1263)
+  * core: fix evaluation of condition when the left operand is an empty string
+  * core: fix string evaluation with regex replacement when the string is empty
+  * core: fix check of tags in lines (command /filter and hook_print)
+  * core: fix clear of completion item in case of partial completion (issue #1162)
+  * core: send signal "key_pressed" for mouse code only if the string is UTF-8 valid (issue #1220)
+  * api: fix memory leak in function string_split
+  * lua: fix return code of mkdir functions in case of error (issue #1267)
+  * scripts: fix duplicated lines in output of script eval (python, perl, ruby, lua and guile)
+
+Tests::
+
+  * unit: add tests on line and hook functions
+
+Build::
+
+  * php: add detection of PHP 7.3
+
+[[v2.2]]
+== Version 2.2 (2018-07-14)
+
+New features::
+
+  * core: change default value of option weechat.look.hotlist_add_conditions to check connected relay clients via weechat protocol (issue #1206)
+  * core: add reverse of string in evaluation of expressions with "rev:" (issue #1200)
+  * core: send buffer pointer (when possible) in signal "hotlist_changed" (issue #1133)
+  * core: add support of list options in curl (issue #826, issue #219)
+  * core: allow merge of buffers by name in command /buffer (issue #1108, issue #1159)
+  * api: add function hashtable_add_from_infolist()
+  * api: add function string_format_size in scripting API
+  * irc: add nick, host and log tags in message displayed in private buffer when the nick comes back on the server (issue #1221)
+  * irc: add support for IRCv3.2 chghost, add options irc.look.smart_filter_chghost and irc.color.message_chghost (issue #640)
+  * irc: add support for IRCv3.2 invite-notify (issue #639)
+  * irc: add support for IRCv3.2 Client Capability Negotiation (issue #586, issue #623)
+  * irc: display current nick on connected servers in output of /server list|listfull (issue #1193)
+  * irc: add option "-server" in command /list (issue #1165)
+  * irc: add indexed ban list, add completion for /unban and /unquiet (issue #597, task #11374, task #10876)
+  * relay: add filtering on protocol in info "relay_client_count"
+  * trigger: hide password in command "/msg nickserv set password"
+  * xfer: add option xfer.network.send_ack (issue #1171)
+
+Bug fixes::
+
+  * core: fix TLS handshake failure on server connection when there are multiple addresses in the server (issue #1196)
+  * core: count number of chars instead of bytes for suffix in function string_cut
+  * core: fix delete of previous/next word (keys kbd:[Ctrl+w] and kbd:[Alt+d]) (issue #1195)
+  * core: fix infinite loop in evaluation of strings (issue #1183)
+  * core: change default value of option weechat.look.window_title from "WeeChat ${info:version}" to empty string (issue #1182)
+  * buflist: fix crash when setting the option buflist.look.signals_refresh with a list of signals
+  * fset: fix memory leak when switching the format with kbd:[Ctrl+x]
+  * fset: fix truncation of option values when the length is greater than 4096 (issue #1218)
+  * fset: fix crash when applying filters after closing the fset buffer (issue #1204)
+  * irc: display message 354 (WHOX) received with missing parameters (issue #1212)
+  * irc: always set nick away status on WHO response (sent manually or automatically with server option "away_check")
+  * irc: fix a crash when calling the function hdata_string on the "prefix" variable in the nick
+  * irc: fix split of messages when server option "split_msg_max_length" is set to 0 (no split) (issue #1173)
+  * irc: send whole IRC message including IRCv3 tags in the signals irc_in, irc_in2, irc_raw_in and irc_raw_in2 (issue #787)
+  * irc: fix memory leak when receiving a message with IRCv3 tags
+  * guile: fix memory leak in 7 functions returning allocated strings
+  * lua: fix macros used to return values
+  * php: fix return code of functions config_write_option and config_write_line
+  * php: fix memory leak in 72 functions returning allocated strings
+  * python: fix crash when loading a script with Python >= 3.7 (issue #1219)
+  * relay: fix socket creation for relay server on OpenBSD (issue #1213)
+  * ruby: fix memory leak in 7 functions returning allocated strings
+  * script: fix memory leak in case of invalid XML content in list of scripts
+  * scripts: fix memory leak in hook_info callback
+  * scripts: fix return value of hook_infolist callback (pointer instead of string)
+  * scripts: return long integer instead of string in function infolist_time
+  * xfer: set option TCP_NODELAY on socket when receiving a file via DCC (issue #1171)
+
+Documentation::
+
+  * core: split man pages weechat and weechat-headless
+
+Tests::
+
+  * unit, scripts: add tests on infolists
+
+Build::
+
+  * core: fix build with CMake and Ninja
+  * debian: add package weechat-headless with the headless binary and its man page
+  * javascript: fix compilation of javascript plugin with autotools on some Linux distributions (issue #1208)
+  * python: add detection of Python 3.7
+
 [[v2.1]]
 == Version 2.1 (2018-03-18)

@@ -26,19 +138,16 @@ New features::
  * core: add option "add" in command /buffer (issue #1113)
  * core: add option weechat.completion.partial_completion_templates to force partial completion on specific templates
  * api: add hashtable with variables in plugin structure
+  * api: add time in info "date" (WeeChat compilation date/time) (issue #1138)
  * irc: add server option "split_msg_max_length"
+  * irc: allow ${irc_server.xxx} and ${server} in server evaluated options (issue #1144)
  * logger: add option logger.file.fsync (issue #1145)
  * logger: add option logger.look.backlog_conditions (issue #1132)
+  * script: change default value of option script.look.sort from "p,n" to "i,p,n"
  * scripts: add configuration file for each script plugin (_python.conf_, _perl.conf_, ...)
  * scripts: add "eval" option in script commands and info "xxx_eval" (python, perl, ruby, lua and guile) (issue #128)
  * scripts: add infos "xxx_interpreter" and "xxx_version" in script plugins (issue #1075)
  * scripts: add option "version" in script commands (issue #1075)
-
-Improvements::
-
-  * api: add time in info "date" (WeeChat compilation date/time) (issue #1138)
-  * irc: allow ${irc_server.xxx} and ${server} in server evaluated options (issue #1144)
-  * script: change default value of option script.look.sort from "p,n" to "i,p,n"
  * scripts: display the script name in stdout/stderr output from scripts

 Bug fixes::
@@ -65,19 +174,16 @@ New features::
  * core: add flag "input_get_empty" in buffer
  * core: add signals "buffer_filters_enabled" and "buffer_filters_disabled"
  * core: support loading of plugins from path in environment variable "WEECHAT_EXTRA_LIBDIR" (issue #971, issue #979)
-  * alias: add infolist "alias_default" (list of default aliases)
-  * buflist: add two new bar items ("buflist2" and "buflist3") using the same format configuration options (issue #990)
-  * buflist: add option buflist.look.add_newline (issue #1027)
-  * fset: new plugin "fset" (fast set of WeeChat and plugins options) (issue #584)
-  * php: new plugin "php" (issue #909)
-
-Improvements::
-
  * core: make value optional in command /buffer set (issue #746, issue #1088)
  * core: allow floating point and hexadecimal numbers in comparison of evaluated values
  * core: add option weechat.look.save_config_with_fsync (issue #1083)
  * api: add support of prefix "quiet:" in function key_unbind() to quietly remove keys
  * api: add argument "recurse_subdirs" in function exec_on_files()
+  * alias: add infolist "alias_default" (list of default aliases)
+  * buflist: add two new bar items ("buflist2" and "buflist3") using the same format configuration options (issue #990)
+  * buflist: add option buflist.look.add_newline (issue #1027)
+  * fset: new plugin "fset" (fast set of WeeChat and plugins options) (issue #584)
+  * php: new plugin "php" (issue #909)
  * script: add local variable "filter" in the script buffer (issue #1037)

 Bug fixes::
@@ -121,15 +227,12 @@ Bug fixes::

 New features::

+  * core: improve speed of nicklist bar item callback
+  * core: allow index for hdata arrays in evaluation of expressions
  * api: allow update of variables "scroll_x" and "scroll_y" in bar_window with function hdata_update
  * api: add functions config_option_get_string() and hdata_compare()
  * buflist: add option buflist.look.auto_scroll (issue #332)
  * buflist: add keys kbd:[F1]/kbd:[F2], kbd:[Alt+F1]/kbd:[Alt+F2] to scroll the buflist bar
-
-Improvements::
-
-  * core: improve speed of nicklist bar item callback
-  * core: allow index for hdata arrays in evaluation of expressions
  * buflist: display a warning when the script "buffers.pl" is loaded
  * buflist: add support of char "~" in option buflist.look.sort for case insensitive comparison
  * buflist: add variable `${format_name}` in bar item evaluation and option buflist.format.name (issue #1020)
@@ -160,19 +263,16 @@ New features::
  * core: add cut of string in evaluation of expressions with "cut:" (number of chars) and "cutscr:" (number of chars displayed on screen)
  * core: add ternary operator (condition) in evaluation of expressions (`${if:condition?value_if_true:value_if_false}`)
  * core: add resize of window parents with /window resize [h/v]size (task #11461, issue #893)
+  * core: add hotlist pointer in buffer structure
+  * core: add last start date in output of command /version after at least one /upgrade (issue #903)
  * api: add arraylist functions: arraylist_new(), arraylist_size(), arraylist_get(), arraylist_search(), arraylist_insert(), arraylist_add(), arraylist_remove(), arraylist_clear(), arraylist_free()
  * api: add dynamic string functions: string_dyn_alloc(), string_dyn_copy(), string_dyn_concat(), string_dyn_free()
+  * api: add special key "__quiet" in hashtable for function key_bind()
+  * api: add `${re:#}` to get the index of last group captured in function string_eval_expression()
  * aspell: add options to control delimiters in suggestions: aspell.color.suggestion_delimiter_{dict|word} and aspell.look.suggestion_delimiter_{dict|word} (issue #940)
  * buflist: new plugin "buflist" (bar item with list of buffers)
  * irc: add option "open" in command /server (issue #966)
  * irc: send signal "irc_server_lag_changed" and store the lag in the server buffer (local variable)
-
-Improvements::
-
-  * core: add hotlist pointer in buffer structure
-  * core: add last start date in output of command /version after at least one /upgrade (issue #903)
-  * api: add special key "__quiet" in hashtable for function key_bind()
-  * api: add `${re:#}` to get the index of last group captured in function string_eval_expression()
  * irc: send multiple masks by message in commands /ban, /unban, /quiet and /unquiet, use ban mask default for nicks in /quiet and /unquiet, display an error if /quiet and /unquiet are not supported by server (issue #579, issue #15, issue #577)
  * irc: add option "-include" in commands /allchan, /allpv and /allserv (issue #572)
  * irc: don't smart filter modes given to you (issue #530, issue #897)
@@ -212,19 +312,16 @@ New features::
  * core: add optional command prefix in completion templates "commands", "plugins_commands" and "weechat_commands"
  * core: add optional arguments in completion template, sent to the callback
  * core: add option "time" in command /debug
-  * api: add info "uptime" (WeeChat uptime)
-  * api: add info "pid" (WeeChat PID) (issue #850)
-  * fifo: add file fifo.conf and option fifo.file.path to customize FIFO pipe path/filename (issue #850, issue #122)
-  * irc: add server option "usermode" (issue #377, issue #820)
-  * irc: add tag "self_msg" on self messages (issue #840)
-
-Improvements::
-
  * core, xfer: display more information on fork errors (issue #573)
  * core: add a slash before commands completed in arguments of /command, /debug time, /key bind, /key bindctxt, /mute, /repeat, /wait
  * core: add a warning in header of configuration files to not edit by hand (issue #851)
+  * api: add info "uptime" (WeeChat uptime)
+  * api: add info "pid" (WeeChat PID) (issue #850)
  * alias: add a slash before commands completed in arguments of /alias
  * exec: add option "-oc" in command /exec to execute commands in process output, don't execute commands by default with "-o" (issue #877)
+  * fifo: add file fifo.conf and option fifo.file.path to customize FIFO pipe path/filename (issue #850, issue #122)
+  * irc: add server option "usermode" (issue #377, issue #820)
+  * irc: add tag "self_msg" on self messages (issue #840)
  * irc: evaluate content of server option "ssl_fingerprint" (issue #858)
  * irc: change default value of option irc.network.lag_reconnect from 0 to 300 (issue #818)
  * trigger: do not hide email in command "/msg nickserv register password email" (issue #849)
@@ -257,16 +354,13 @@ New features::

  * core: add optional argument "lowest", "highest" or level mask in command /input hotlist_clear
  * core: add option "cycle" in command /buffer
-  * api: add "extra" argument to evaluate extra variables in function string_eval_expression() (issue #534)
-  * relay: add option relay.network.allow_empty_password (issue #735)
-  * trigger: add support for one-time triggers (issue #399, issue #509)
-
-Improvements::
-
  * core, irc, xfer: display more information on memory allocation errors (issue #573)
+  * api: add "extra" argument to evaluate extra variables in function string_eval_expression() (issue #534)
  * api: remove functions printf_date() and printf_tags()
  * irc: rename server options "default_msg_{kick|part|quit}" to "msg_{kick|part|quit}", evaluate them
+  * relay: add option relay.network.allow_empty_password (issue #735)
  * relay: allow escape of comma in command "init" (weechat protocol) (issue #730)
+  * trigger: add support for one-time triggers (issue #399, issue #509)

 Bug fixes::

@@ -294,16 +388,13 @@ Build::

 New features::

-  * api: add support of functions in hook_process
-  * irc: add option irc.network.sasl_fail_unavailable (issue #600, issue #697)
-
-Improvements::
-
  * core: evaluate content of option "weechat.look.item_time_format" (issue #791)
  * core: change default value of option weechat.look.nick_color_hash to "djb2"
  * core: move nick coloring from irc plugin to core, move options irc.look.nick_color_force, irc.look.nick_color_hash and irc.look.nick_color_stop_chars to core, add info "nick_color" and "nick_color_name", deprecate info "irc_nick_color" and "irc_color_name" (issue #262)
  * core: move irc bar item "away" to core, move options irc.look.item_away_message and irc.color.item_away to core (issue #692)
+  * api: add support of functions in hook_process
  * api: add pointer in callbacks used in scripting API (issue #406)
+  * irc: add option irc.network.sasl_fail_unavailable (issue #600, issue #697)
  * irc: add multiple targets and support of "-server" in command /ctcp (issue #204, issue #493)
  * trigger: add "recover" in default triggers cmd_pass/msg_auth, and "regain" in default trigger "msg_auth" (issue #511)

@@ -342,25 +433,22 @@ New features::
  * core: add a parent name in options, display inherited values if null in /set output, add option weechat.color.chat_value_null (issue #629)
  * core: add tag "term_warning" in warnings about wrong $TERM on startup
  * core: add option weechat.look.paste_auto_add_newline (issue #543)
+  * core: display a more explicit error when a filter fails to be added (issue #522)
  * api: add function string_hex_dump()
+  * api: add argument "length" in function utf8_is_valid()
+  * alias: display completion in /alias list (issue #518)
  * fifo: add /fifo command
  * irc: track real names using extended-join and WHO (issue #351)
  * irc: add support of SNI (Server Name Indication) in SSL connection to IRC server (issue #620)
  * irc: add support of "cap-notify" capability (issue #182, issue #477)
  * irc: add command /cap (issue #8)
  * irc: add hex dump of messages in raw buffer when debug is enabled for irc plugin (level 2 or more)
-  * relay: add option relay.irc.backlog_since_last_message (issue #347)
-  * script: add option script.scripts.download_timeout
-
-Improvements::
-
-  * core: display a more explicit error when a filter fails to be added (issue #522)
-  * api: add argument "length" in function utf8_is_valid()
-  * alias: display completion in /alias list (issue #518)
  * irc: evaluate content of server option "addresses"
  * irc: move option irc.network.alternate_nick into servers (irc.server.xxx.nicks_alternate) (issue #633)
  * irc: use current channel and current server channels first in completions "irc_server_channels" and "irc_channels" (task #12923, issue #260, issue #392)
  * logger: display system error when the log file can not be written (issue #541)
+  * relay: add option relay.irc.backlog_since_last_message (issue #347)
+  * script: add option script.scripts.download_timeout
  * script: add completion with languages and extensions, support search by language/extension in /script search

 Bug fixes::
@@ -404,16 +492,13 @@ New features::
  * core: add option weechat.look.key_grab_delay to set the default delay when grabbing a key with kbd:[Alt+k]
  * core: add option weechat.look.confirm_upgrade (issue #463)
  * core: add signal "signal_sighup"
-  * api: add support of evaluated sub-strings and current date/time in function string_eval_expression() and command /eval
-  * api: add function string_eval_path_home()
-  * irc: add option irc.network.channel_encode (issue #218, issue #482)
-  * irc: add option irc.color.topic_current (issue #475)
-
-Improvements::
-
  * core: allow kbd:[Ctrl+c] to exit WeeChat when the passphrase is asked on startup (issue #452)
  * core: allow pointer as list name in evaluation of hdata (issue #450)
+  * api: add support of evaluated sub-strings and current date/time in function string_eval_expression() and command /eval
+  * api: add function string_eval_path_home()
  * alias: add options "add", "addcompletion" and "del" in command /alias, remove command /unalias (issue #458)
+  * irc: add option irc.network.channel_encode (issue #218, issue #482)
+  * irc: add option irc.color.topic_current (issue #475)
  * irc: evaluate content of server option "nicks"
  * logger: evaluate content of option logger.file.path (issue #388)
  * script: rename option script.scripts.dir to script.scripts.path, evaluate content of option (issue #388)
@@ -462,12 +547,6 @@ New features::
  * core: add options weechat.look.quote_{nick_prefix|nick_suffix|time_format} to customize quoted messages in cursor mode (issue #403)
  * core: add a welcome message on first WeeChat run (issue #318)
  * core: add options weechat.look.word_chars_{highlight|input} (issue #55, task #9459)
-  * irc: add support of "account-notify" capability (issue #11, issue #246)
-  * irc: add support of "ecdsa-nist256p-challenge" SASL mechanism (issue #251)
-  * javascript: new script plugin for JavaScript
-
-Improvements::
-
  * core: remove WeeChat version from config files (issue #407)
  * core: display a warning on startup if the locale can not be set (issue #373)
  * core: allow "*" as plugin name in command /plugin reload to reload all plugins with options
@@ -476,12 +555,15 @@ Improvements::
  * api: add support of environment variables in function string_eval_expression() and command /eval
  * api: add support of full color option name in functions color() and string_eval_expression() and in command /eval
  * api: add "_chat_line" (line pointer) in hashtable of hook_focus
+  * irc: add support of "account-notify" capability (issue #11, issue #246)
+  * irc: add support of "ecdsa-nist256p-challenge" SASL mechanism (issue #251)
  * irc: display a warning when the option irc.look.display_away is set to "channel"
  * irc: optimize search of a nick in nicklist (up to 3x faster)
  * irc: add support of SHA-256 and SHA-512 algorithms in server option "ssl_fingerprint" (issue #281)
  * irc: add option "-noswitch" in command /query (issue #394)
  * irc: format message 008 (RPL_SNOMASK) (issue #144)
  * irc: remove server "freenode" from default config file (issue #309)
+  * javascript: new script plugin for JavaScript

 Bug fixes::

@@ -540,7 +622,12 @@ New features::
  * core: add hide of chars in string in evaluation of expressions
  * core: add arraylists, improve speed of completions (about 50x faster)
  * core: allow incomplete commands if unambiguous, new option weechat.look.command_incomplete (task #5419)
+  * core: check bar conditions in root bars and on each update of a bar item
+  * core: fully evaluate commands bound to keys in cursor and mouse contexts
+  * core: move bar item "scroll" between buffer name and lag in default bar items of status bar
  * api: add regex replace feature in function string_eval_expression()
+  * api: send value returned by command callback in function command(), remove WeeChat error after command callback if return code is WEECHAT_RC_ERROR
+  * api: use microseconds instead of milliseconds in functions util_timeval_diff() and util_timeval_add()
  * irc: add option "reorder" in command /server (issue #229)
  * irc: open channel buffers before the JOIN is received from server (autojoin and manual joins), new options irc.look.buffer_open_before_{autojoin|join} (issue #216)
  * irc: add server option "sasl_fail" (continue/reconnect/disconnect if SASL fails) (issue #265, task #12204)
@@ -548,23 +635,15 @@ New features::
  * irc: add support of "extended-join" capability (issue #143, issue #212)
  * irc: display own nick changes in server buffer (issue #188)
  * irc: disable creation of temporary servers by default with command /connect, new option irc.look.temporary_servers
-  * relay: add options "stop" and "restart" in command /relay
-  * relay: add option relay.network.ssl_priorities (issue #234)
-  * script: add option script.scripts.url_force_https (issue #253)
-  * trigger: evaluate and replace regex groups at same time, new format for regex option in triggers (incompatible with version 1.0) (issue #224)
-  * trigger: add option "restore" in command /trigger
-
-Improvements::
-
-  * core: check bar conditions in root bars and on each update of a bar item
-  * core: fully evaluate commands bound to keys in cursor and mouse contexts
-  * core: move bar item "scroll" between buffer name and lag in default bar items of status bar
-  * api: send value returned by command callback in function command(), remove WeeChat error after command callback if return code is WEECHAT_RC_ERROR
-  * api: use microseconds instead of milliseconds in functions util_timeval_diff() and util_timeval_add()
  * irc: disable SSLv3 by default in server option "ssl_priorities" (issue #248)
  * irc: automatically add current channel in command /samode (issue #241)
  * irc: add tag "nick_xxx" in invite messages
+  * relay: add options "stop" and "restart" in command /relay
+  * relay: add option relay.network.ssl_priorities (issue #234)
  * relay: add host in sender for IRC backlog PRIVMSG messages sent to clients
+  * script: add option script.scripts.url_force_https (issue #253)
+  * trigger: evaluate and replace regex groups at same time, new format for regex option in triggers (incompatible with version 1.0) (issue #224)
+  * trigger: add option "restore" in command /trigger
  * trigger: add `${tg_displayed}` in conditions of default trigger "beep"

 Bug fixes::
@@ -650,6 +729,11 @@ New features::
  * core: add options "-beep" and "-current" in command /print
  * core: add bare display mode for easy text selection and click on URLs, new key: kbd:[Alt+l], new option "bare" in command /window, new options: weechat.look.bare_display_exit_on_input and weechat.look.bare_display_time_format
  * core: add signals "key_combo_{default|search|cursor}"
+  * core: add terabyte unit for size displayed
+  * core: display a warning in case of inconsistency between the options weechat.look.save_{config|layout}_on_exit
+  * core: add option "-mask" in command /unset (issue #112)
+  * core: set option weechat.look.buffer_search_where to prefix_message by default
+  * core: mute all buffers by default in command /mute (replace option -all by -core)
  * api: allow value "-1" for property "hotlist" in function buffer_set() (to remove a buffer from hotlist)
  * api: add option "buffer_flush" in function hook_process_hashtable()
  * api: add support of case insensitive search and search by buffer full name in function buffer_search() (bug #34318)
@@ -659,6 +743,9 @@ New features::
  * api: add support of escaped strings with format `${esc:xxx}` or `${\xxx}` in function string_eval_expression() and command /eval
  * api: add functions hashtable_dup(), string_replace_regex(), string_split_shell(), string_convert_escaped_chars()
  * api: add integer return code for functions hook_{signal|hsignal}_send()
+  * api: add argument "flags" in function hdata_new_list()
+  * api: allow wildcard "*" inside the mask in function string_match()
+  * api: allow negative value for y in function printf_y()
  * alias: add default alias "msgbuf" (send text to a buffer)
  * exec: add exec plugin: new command /exec and file exec.conf
  * irc: add bar item "irc_nick_modes" (issue #71)
@@ -670,23 +757,6 @@ New features::
  * irc: add command /remove (issue #91)
  * irc: add command /unquiet (issue #36)
  * irc: add command /allpv (task #13111)
-  * relay: add messages "_buffer_cleared", "_buffer_hidden" and "_buffer_unhidden"
-  * relay: add info "relay_client_count" with optional status name as argument
-  * relay: add signals "relay_client_xxx" for client status changes (issue #2)
-  * relay: add option relay.network.clients_purge_delay
-  * rmodifier: remove plugin (replaced by trigger)
-  * trigger: add trigger plugin: new command /trigger and file trigger.conf
-
-Improvements::
-
-  * core: add terabyte unit for size displayed
-  * core: display a warning in case of inconsistency between the options weechat.look.save_{config|layout}_on_exit
-  * core: add option "-mask" in command /unset (issue #112)
-  * core: set option weechat.look.buffer_search_where to prefix_message by default
-  * core: mute all buffers by default in command /mute (replace option -all by -core)
-  * api: add argument "flags" in function hdata_new_list()
-  * api: allow wildcard "*" inside the mask in function string_match()
-  * api: allow negative value for y in function printf_y()
  * irc: display locally away status changes in private buffers (in addition to channels) (issue #117)
  * irc: allow many fingerprints in server option ssl_fingerprint (issue #49)
  * irc: rename option irc.look.item_channel_modes_hide_key to irc.look.item_channel_modes_hide_args, value is now a string (task #12070, task #12163, issue #48)
@@ -695,7 +765,13 @@ Improvements::
  * irc: evaluate content of server options "username" and "realname"
  * irc: set option irc.network.autoreconnect_delay_max to 600 by default, increase max value to 604800 seconds (7 days)
  * irc: set option irc.network.whois_double_nick to "off" by default
+  * relay: add messages "_buffer_cleared", "_buffer_hidden" and "_buffer_unhidden"
+  * relay: add info "relay_client_count" with optional status name as argument
+  * relay: add signals "relay_client_xxx" for client status changes (issue #2)
+  * relay: add option relay.network.clients_purge_delay
+  * rmodifier: remove plugin (replaced by trigger)
  * script: set option script.scripts.cache_expire to 1440 by default
+  * trigger: add trigger plugin: new command /trigger and file trigger.conf

 Bug fixes::

@@ -813,6 +889,15 @@ New features::
  * core: add default keys kbd:[Alt+Home] / kbd:[Alt+End] (`meta2-1;3H` / `meta2-1;3F`) and kbd:[Alt+F11] / kbd:[Alt+F12] (`meta2-23;3~` / `meta2-24;3~`) for xterm
  * core: add support of italic text (requires ncurses >= 5.9 patch 20130831)
  * core: add options to customize default text search in buffers: weechat.look.buffer_search_{case_sensitive|force_default|regex|where}
+  * core: add support of UTF-8 chars in horizontal/vertical separators (options weechat.look.separator_{horizontal|vertical})
+  * core: add support of logical and/or for argument "tags" in function hook_print()
+  * core: rename buffer property "highlight_tags" to "highlight_tags_restrict", new behavior for buffer property "highlight_tags" (force highlight on tags), rename option irc.look.highlight_tags to irc.look.highlight_tags_restrict
+  * core: rename options save/reset to store/del in command /layout
+  * core: replace default key kbd:[Ctrl+c], kbd:[r] by kbd:[Ctrl+c], kbd:[v] for reverse video in messages
+  * core: replace default key kbd:[Ctrl+c], kbd:[u] by kbd:[Ctrl+c], kbd:[_] for underlined text in messages
+  * core: rename option weechat.look.set_title to weechat.look.window_title, value is now a string (evaluated)
+  * core: set option weechat.look.paste_bracketed to "on" by default
+  * core: use one date format when day changes from day to day+1
  * api: add function infolist_search_var()
  * api: add stdin options in functions hook_process_hashtable() and hook_set() to send data on stdin of child process, add function hook_set() in script API (task #10847, task #13031)
  * api: add hdata "buffer_visited"
@@ -825,23 +910,11 @@ New features::
  * irc: add option irc.network.lag_max
  * irc: add option irc.look.notice_welcome_tags
  * irc: add server option "default_msg_kick" to customize default kick/kickban message (task #12777)
+  * irc: use MONITOR instead of ISON for /notify when it is available on server (task #11477)
  * relay: send backlog for irc private buffers
  * xfer: add support of IPv6 for DCC chat/file (patch #7992)
  * xfer: add option xfer.file.auto_check_crc32 (patch #7963)

-Improvements::
-
-  * core: add support of UTF-8 chars in horizontal/vertical separators (options weechat.look.separator_{horizontal|vertical})
-  * core: add support of logical and/or for argument "tags" in function hook_print()
-  * core: rename buffer property "highlight_tags" to "highlight_tags_restrict", new behavior for buffer property "highlight_tags" (force highlight on tags), rename option irc.look.highlight_tags to irc.look.highlight_tags_restrict
-  * core: rename options save/reset to store/del in command /layout
-  * core: replace default key kbd:[Ctrl+c], kbd:[r] by kbd:[Ctrl+c], kbd:[v] for reverse video in messages
-  * core: replace default key kbd:[Ctrl+c], kbd:[u] by kbd:[Ctrl+c], kbd:[_] for underlined text in messages
-  * core: rename option weechat.look.set_title to weechat.look.window_title, value is now a string (evaluated)
-  * core: set option weechat.look.paste_bracketed to "on" by default
-  * core: use one date format when day changes from day to day+1
-  * irc: use MONITOR instead of ISON for /notify when it is available on server (task #11477)
-
 Bug fixes::

  * core: fix hotlist problems after apply of a layout (bug #41481)
@@ -917,6 +990,10 @@ New features::
  * core: add option weechat.network.proxy_curl (task #12651)
  * core: add "proxy" infolist and hdata
  * core: add infolist "layout" and hdata "layout", "layout_buffer" and "layout_window"
+  * core: reduce memory used by using shared strings for nicklist and lines in buffers
+  * core: change color format for options weechat.look.buffer_time_format and weechat.look.prefix_{action|error|join|network|quit} from `${xxx}` to `${color:xxx}`
+  * core: optimize the removal of lines in buffers (a lot faster to clear/close buffers with lot of lines)
+  * core: set options weechat.look.color_inactive_{buffer|window} to "on" by default
  * api: return hashtable item pointer in functions hashtable_set() and hashtable_set_with_size()
  * api: add "callback_free_key" in hashtable
  * api: add support of colors with format `${color:xxx}` in function string_eval_expression() and command /eval
@@ -933,17 +1010,10 @@ New features::
  * plugins: remove the demo plugin
  * relay: add command "ping" in weechat protocol (task #12689)
  * rmodifier: add option "missing" in command /rmodifier
+  * script: add info about things defined by script (like commands, options, ...) in the detailed view of script (/script show)
  * scripts: add hdata with script callback
  * xfer: add option xfer.look.pv_tags

-Improvements::
-
-  * core: reduce memory used by using shared strings for nicklist and lines in buffers
-  * core: change color format for options weechat.look.buffer_time_format and weechat.look.prefix_{action|error|join|network|quit} from `${xxx}` to `${color:xxx}`
-  * core: optimize the removal of lines in buffers (a lot faster to clear/close buffers with lot of lines)
-  * core: set options weechat.look.color_inactive_{buffer|window} to "on" by default
-  * script: add info about things defined by script (like commands, options, ...) in the detailed view of script (/script show)
-
 Bug fixes::

  * core: clear whole line before displaying content instead of clearing after the end of content (bug #40115)
@@ -995,10 +1065,12 @@ New features::
  * core: add count for groups, nicks, and total in nicklist
  * core: add option "dirs" in command /debug
  * core: add signal "window_opened" (task #12464)
+  * core: allow read of array in hdata without using index
  * api: add new function hdata_search()
  * api: add property "completion_freeze" for function buffer_set(): do not stop completion when command line is updated
  * aspell: add completion "aspell_dicts" (list of aspell installed dictionaries)
  * aspell: add info "aspell_dict" (dictionaries used on a buffer)
+  * aspell: optimization on spellers to improve speed (save state by buffer)
  * irc: add support of "dh-aes" SASL mechanism (patch #8020)
  * irc: add support of UHNAMES (capability "userhost-in-names") (task #9353)
  * irc: add tag "irc_nick_back" for messages displayed in private buffer when a nick is back on server (task #12576)
@@ -1006,6 +1078,7 @@ New features::
  * irc: add option irc.look.pv_buffer: automatically merge private buffers (optionally by server) (task #11924)
  * irc: hide passwords in commands or messages sent to nickserv (/msg nickserv) with new modifiers "irc_command_auth" and "irc_message_auth", remove option irc.look.hide_nickserv_pwd, add option irc.look.nicks_hide_password (bug #38346)
  * irc: unmask smart filtered join if nick speaks in channel some minutes after the join, new option irc.look.smart_filter_join_unmask (task #12405)
+  * irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect, value is now a number of seconds
  * relay: add message "_nicklist_diff" (differences between old and current nicklist)
  * relay: add support of multiple servers on same port for irc protocol (the client must send the server in the "PASS" command)
  * relay: add WebSocket server support (RFC 6455) for irc and weechat protocols, new option relay.network.websocket_allowed_origins
@@ -1014,12 +1087,6 @@ New features::
  * script: add option script.scripts.autoload, add options "autoload", "noautoload" and "toggleautoload" for command /script, add action "A" (kbd:[Alt+a]) on script buffer (toggle autoload) (task #12393)
  * xfer: add option xfer.file.auto_accept_nicks (patch #7962)

-Improvements::
-
-  * core: allow read of array in hdata without using index
-  * aspell: optimization on spellers to improve speed (save state by buffer)
-  * irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect, value is now a number of seconds
-
 Bug fixes::

  * core: fix display of long lines without time (message beginning with two tabs)
@@ -1100,14 +1167,11 @@ New features::
  * irc: add option irc.network.alternate_nick to disable dynamic nick generation when all nicks are already in use on server (task #12281)
  * irc: add option irc.network.whois_double_nick to double nick in command /whois
  * irc: add option "-noswitch" in command /join (task #12275)
+  * perl: display script filename in error messages
  * relay: add backlog and server capability "server-time" for irc protocol, add new options relay.irc.backlog_max_minutes, relay.irc.backlog_max_number, relay.irc.backlog_since_last_disconnect, relay.irc.backlog_tags, relay.irc.backlog_time_format (task #12076)
  * relay: add support of IPv6, new option relay.network.ipv6, add support of "ipv4." and/or "ipv6." before protocol name, to force IPv4/IPv6 (task #12270)
  * xfer: display remote IP address for DCC chat/file (task #12289)

-Improvements::
-
-  * perl: display script filename in error messages
-
 Bug fixes::

  * core: fix infinite loop when a regex gives an empty match (bug #38112)
@@ -1201,6 +1265,7 @@ New features::
  * irc: generate alternate nicks dynamically when all nicks are already in use (task #12209)
  * irc: add bar item "buffer_modes", remove option irc.look.item_channel_modes (task #12022)
  * irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME (task #12150)
+  * irc: move options from core to irc plugin: weechat.look.nickmode to irc.look.nick_mode (new type: integer with values: none/prefix/action/both) and weechat.look.nickmode_empty to irc.look.nick_mode_empty
  * logger: add tags in backlog lines displayed when opening buffer
  * logger: add messages "Day changed to" in backlog (task #12187)
  * relay: add support of SSL (for irc and weechat protocols), new option relay.network.ssl_cert_key (task #12044)
@@ -1210,10 +1275,6 @@ New features::
  * scripts: add signals for scripts loaded/unloaded/installed/removed
  * scripts: add hdata with list of scripts for each language

-Improvements::
-
-  * irc: move options from core to irc plugin: weechat.look.nickmode to irc.look.nick_mode (new type: integer with values: none/prefix/action/both) and weechat.look.nickmode_empty to irc.look.nick_mode_empty
-
 Bug fixes::

  * core: fix display bug when end of a line is displayed on top of chat (last line truncated and MORE(0) in status bar) (bug #37203)
@@ -1275,11 +1336,15 @@ New features::
  * core: convert tabs to spaces in text pasted (bug #25028)
  * core: add a connection timeout for child process in hook_connect() (bug #35966)
  * core: add support of terminal "bracketed paste mode", new options weechat.look.paste_bracketed and weechat.look.paste_bracketed_timer_delay (task #11316)
+  * core: support lines of 16 Kb long in configuration files (instead of 1 Kb)
+  * core: convert options weechat.look.prefix_align_more and weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
+  * core: follow symbolic links when writing configuration files (.conf) (task #11779)
  * api: add list "gui_buffer_last_displayed" in hdata "buffer"
  * irc: add option "fakerecv" in command /server to simulate a received IRC message (not documented, for debug only)
  * irc: add option "-pending" in command /disconnect (cancel auto-reconnection on servers currently reconnecting) (task #11985)
  * irc: add signals and tags in messages for irc notify (task #11887)
  * irc: add support of "external" SASL mechanism (task #11864)
+  * irc: allow more than one nick in command /invite
  * logger: add colors for backlog lines and end of backlog, new options: logger.color.backlog_line and logger.color.backlog_end (task #11966)
  * relay: add signals "upgrade" and "upgrade_ended" in WeeChat protocol
  * relay: add "date_printed" and "highlight" in signal "_buffer_line_added" (WeeChat protocol)
@@ -1287,13 +1352,6 @@ New features::
  * rmodifier: add default rmodifier "server" to hide passwords in commands /server and /connect (task #11993)
  * rmodifier: add option "release" in default rmodifier "nickserv" (used to hide passwords in command "/msg nickserv") (bug #35705)

-Improvements::
-
-  * core: support lines of 16 Kb long in configuration files (instead of 1 Kb)
-  * core: convert options weechat.look.prefix_align_more and weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
-  * core: follow symbolic links when writing configuration files (.conf) (task #11779)
-  * irc: allow more than one nick in command /invite
-
 Bug fixes::

  * core: fix crash in focus hook for nicklist (bug #36271)
@@ -1351,6 +1409,7 @@ New features::
  * core: add option "jump_last_buffer_displayed" in command /input (key: kbd:[Alt+/]) (task #11553)
  * core: add option weechat.history.max_buffer_lines_minutes: maximum number of minutes in history per buffer (task #10900), rename option weechat.history.max_lines to weechat.history.max_buffer_lines_number
  * core: add optional arguments for command /plugin load/reload/autoload
+  * core: use extended regex in filters (task #9497, patch #7616)
  * api: add modifier "input_text_for_buffer" (bug #35317)
  * api: add support of URL in hook_process() / hook_process_hashtable() (task #10247)
  * api: add new functions strcasecmp_range(), strncasecmp_range(), string_regex_flags(), string_regcomp(), hashtable_map_string(), hook_process_hashtable(), hdata_check_pointer(), hdata_char(), hdata_hashtable() and nicklist_get_next_item()
@@ -1365,16 +1424,12 @@ New features::
  * irc: add case insensitive string comparison based on casemapping of server (rfc1459, strict-rfc1459, ascii) (bug #34239)
  * irc: add option irc.color.mirc_remap to remap mirc colors in messages to WeeChat colors
  * irc: allow URL "irc://" in command /connect
+  * irc: use extended regex in commands /ignore and /list
  * guile: new script plugin for scheme (task #7289)
  * python: add support of Python 3.x (task #11704)
  * relay: add WeeChat protocol for remote GUI
  * xfer: display origin of xfer in core and xfer buffers (task #10956)

-Improvements::
-
-  * core: use extended regex in filters (task #9497, patch #7616)
-  * irc: use extended regex in commands /ignore and /list
-
 Internationalization::

  * add Japanese translations
@@ -1453,18 +1508,15 @@ New features::
  * core: add option weechat.look.eat_newline_glitch (do not add new line at end of each line displayed)
  * core: add options "infolists", "hdata" and "tags" for command /debug
  * core: add horizontal scrolling for buffers with free content (command /window scroll_horiz) (task #11112)
+  * core: change default value of option weechat.network.gnutls_ca_file to "/etc/ssl/certs/ca-certificates.crt"
  * api: add info "cursor_mode"
  * api: add new functions key_bind(), key_unbind(), hook_focus(), hdata_new(), hdata_new_var(), hdata_new_list(), hdata_get(), hdata_get_var_offset(), hdata_get_var_type(), hdata_get_var_type_string(), hdata_get_var_hdata(), hdata_get_var(), hdata_get_var_at_offset(), hdata_get_list(), hdata_move(), hdata_integer(), hdata_string(), hdata_pointer(), hdata_time(), hdata_get_string()
  * irc: allow reason for command /disconnect
  * irc: allow server name for commands /die and /restart
  * irc: add new info_hashtable "irc_message_split"
  * irc: add prefix "#" for all channels on join (if no prefix given)
-  * logger: add option logger.file.flush_delay (task #11118)
-
-Improvements::
-
-  * core: change default value of option weechat.network.gnutls_ca_file to "/etc/ssl/certs/ca-certificates.crt"
  * irc: improve split of privmsg message (keep ctcp), add split of ison, join, notice, wallops, 005, 353 (bug #29879, bug #33448, bug #33592)
+  * logger: add option logger.file.flush_delay (task #11118)

 Bug fixes::

@@ -1541,6 +1593,9 @@ New features::
  * core: add attributes for colors ("*": bold, "!": reverse, "_": underline)
  * core: dynamically allocate color pairs (extended colors can be used without being added with command "/color"), auto reset of color pairs with option weechat.look.color_pairs_auto_reset
  * core: allow background for nick colors (using ":")
+  * core: remember scroll position for all buffers in windows (bug #25555)
+  * core: improve display of commands lists in /help (add arguments -list and -listfull) (task #10299)
+  * core: improve arguments displayed in /help of commands
  * api: add new function config_set_desc_plugin() (task #10925)
  * api: add new functions buffer_match_list() and window_search_with_buffer()
  * aspell: add section "option" in aspell.conf for speller options (task #11083)
@@ -1550,12 +1605,6 @@ New features::
  * irc: add new options irc.look.buffer_switch_autojoin and irc.look.buffer_switch_join (task #8542, task #10506)
  * irc: add new option irc.look.smart_filter_nick
  * irc: add new options irc.look.color_nicks_in_nicklist and irc.look.color_nicks_in_names
-
-Improvements::
-
-  * core: remember scroll position for all buffers in windows (bug #25555)
-  * core: improve display of commands lists in /help (add arguments -list and -listfull) (task #10299)
-  * core: improve arguments displayed in /help of commands
  * irc: replace options irc.color.nick_prefix_{op|halfop|voice|user} by a single option irc.color.nick_prefixes (task #10888)

 Bug fixes::
@@ -1611,6 +1660,8 @@ New features::
  * core: add property "hotlist_max_level_nicks" in buffers to set max hotlist level for some nicks in buffer
  * core: add new options weechat.look.input_share and weechat.look.input_share_overwrite (task #9228)
  * core: add new option weechat.look.prefix_align_min (task #10650)
+  * core: replace the 10 nick color options and number of nick colors by a single option weechat.color.chat_nick_colors (comma separated list of colors)
+  * core: add color support in option weechat.look.buffer_time_format
  * api: add priority for hooks (task #10550)
  * api: add new functions: list_search_pos(), list_casesearch_pos(), hashtable_get_string(), hashtable_set_pointer(), hook_info_hashtable(), info_get_hashtable(), hook_hsignal(), hook_hsignal_send(), hook_completion_get_string(), nicklist_group_get_integer(), nicklist_group_get_string(), nicklist_group_get_pointer(), nicklist_group_set(), nicklist_nick_get_integer(), nicklist_nick_get_string(), nicklist_nick_get_pointer(), nicklist_nick_set()
  * irc: add option "-server" in command /join (task #10837)
@@ -1625,16 +1676,11 @@ New features::
  * irc: display old channel topic when topic is unset (task #9780)
  * irc: add new info_hashtable "irc_parse_message"
  * irc: add signal "irc_input_send"
+  * irc: rename options irc.look.open_channel_near_server and irc.look.open_pv_near_server to irc.look.new_channel_position and irc.look.new_pv_position with new values (none, next or near_server)
  * rmodifier: new plugin "rmodifier": alter modifier strings with regular expressions (bug #26964)
  * relay: beta version of IRC proxy, now relay plugin is compiled by default
  * python: add info "python2_bin" (path to Python 2.x interpreter)

-Improvements::
-
-  * core: replace the 10 nick color options and number of nick colors by a single option weechat.color.chat_nick_colors (comma separated list of colors)
-  * core: add color support in option weechat.look.buffer_time_format
-  * irc: rename options irc.look.open_channel_near_server and irc.look.open_pv_near_server to irc.look.new_channel_position and irc.look.new_pv_position with new values (none, next or near_server)
-
 Bug fixes::

  * core: fix scroll problem on buffers with free content and non-allocated lines (bug #32039)
@@ -1689,9 +1735,6 @@ New features::
  * irc: add message in private buffer when nick is back on server after a /quit
  * irc: add new options irc.network.autoreconnect_delay_growing and irc.network.autoreconnect_delay_max (task #10338)
  * irc: add missing commands 346, 347 (channel invite list)
-
-Improvements::
-
  * irc: improve lag indicator: two colors (counting and finished), update item even when pong has not been received, lag_min_show is now in milliseconds
  * irc: move options weechat.color.nicklist_prefix to irc plugin
  * logger: use tag "no_log" to prevent a line from being written in log file
@@ -1818,14 +1861,11 @@ New features::
  * irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270)
  * irc: add all server options for commands /server and /connect
  * irc: add arguments for command /rehash
+  * irc: improve mask used by command /kickban
  * xfer: add color for nicks in chat
  * xfer: add missing command /me (bug #28658)
  * gui: add color "darkgray", add support for background with light color

-Improvements::
-
-  * irc: improve mask used by command /kickban
-
 Bug fixes::

  * core: fix bug with script installation on BSD/OSX (patch #6980)
@@ -1870,6 +1910,7 @@ New features::
  * core: remove key functions, replaced by /input command
  * core: add argument with buffer number/range for command "/buffer close" (task #9390, task #7239)
  * core: add new command /wait (schedule a command execution in future)
+  * core: improve main loop: higher timeout in select(), less CPU usage
  * gui: new display engine, with prefix and message for each line
  * gui: add new type of buffer, with free content
  * gui: add tags for lines and custom filtering by tags or regex (task #7674)
@@ -1897,10 +1938,6 @@ New features::
  * api: add hooks: command, timer, file descriptor, process, connection, print, signal, config, completion, modifier, info, infolist
  * api: new plugin API with many new functions: hooks, buffer management and nicklist, bars, configuration files, network, infos/infolists, lists, upgrade

-Improvements::
-
-  * core: improve main loop: higher timeout in select(), less CPU usage
-
 Internationalization::

  * add Polish translations
@@ -8,7 +8,7 @@ image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="
 image:https://img.shields.io/badge/google%2B-follow-blue.svg["Google+", link="https://plus.google.com/+WeeChat"]
 image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://weechat.org/blog/"]
 image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="http://www.slant.co/topics/1323/~irc-clients-for-linux"]
-image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/about/donate/"]
+image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/donate/"]

 image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", link="https://travis-ci.org/weechat/weechat"]

@@ -17,6 +17,97 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).


+[[v2.3]]
+== Version 2.3 (2018-10-21)
+
+No release note.
+
+[[v2.2]]
+== Version 2.2 (2018-07-14)
+
+[[v2.2_default_hotlist_conditions]]
+=== Default conditions for hotlist
+
+The default value for option `weechat.look.hotlist_add_conditions` has been
+changed to take care about the number of connected clients on the relay
+with weechat protocol: if at least one client is connected, the buffer is
+always added to the hotlist.
+
+The new value contains three conditions, if one of them is true, the buffer
+is added to the hotlist:
+
+* `${away}`: true if you are away on the server matching the buffer,
+* `${buffer.num_displayed} == 0`: true if the buffer is not displayed in any
+  window
+* `${info:relay_client_count,weechat,connected} > 0`: true if at least
+  one client is connected on a weechat relay (new condition).
+
+To use the new default value, you can reset the option with this command:
+
+----
+/unset weechat.look.hotlist_add_conditions
+----
+
+Or set explicitly the value:
+
+----
+/set weechat.look.hotlist_add_conditions "${away} || ${buffer.num_displayed} == 0 || ${info:relay_client_count,weechat,connected} > 0"
+----
+
+[[v2.2_default_triggers]]
+=== Default triggers
+
+The existing triggers "cmd_pass" and "msg_auth" have been updated to hide
+password in command `/msg nickserv set password` and support the option
+`-server xxx`.
+
+You can restore the default triggers with the following command:
+
+----
+/trigger restore cmd_pass msg_auth
+----
+
+[[v2.2_irc_signals_tags]]
+=== Tags in IRC "in" signals
+
+The IRCv3 tags are now sent in these IRC signals for received messages
+(_xxx_ is IRC server name, _yyy_ is IRC command name):
+
+* _xxx,irc_in_yyy_
+* _xxx,irc_in2_yyy_
+* _xxx,irc_raw_in_yyy_
+* _xxx,irc_raw_in2_yyy_
+
+This could break plugins or scripts that parse IRC messages and don't expect
+to receive tags (even if tags *are* part of the IRC message, so this was a bug
+in the IRC signals).
+
+See issue #787 for more information.
+
+[NOTE]
+It is recommended for plugins and scripts to use the WeeChat IRC parser:
+see the function "info_get_hashtable" in the Plugin API reference.
+
+Now the whole IRC message is received by the signal callback, for example:
+
+----
+@tag1=abc;tag2=def :nick!user@host PRIVMSG #test :this is a test
+----
+
+In older releases, this message was received:
+
+----
+:nick!user@host PRIVMSG #test :this is a test
+----
+
+[[v2.2_debian_headless_package]]
+=== New Debian package for headless version
+
+A new Debian package has been added: _weechat-headless_ which contains the
+binary _weechat-headless_ and its man page.
+
+In version 2.1, this binary was in the package _weechat-curses_.
+
 [[v2.1]]
 == Version 2.1 (2018-03-18)

@@ -98,7 +189,7 @@ For more information about this feature, you can read help with:

 The Debian packaging has changed (for now only on weechat.org repositories,
 not in Debian official repositories). +
-The package `weechat-plugins` has been split into 9 packages:
+The package _weechat-plugins_ has been split into 9 packages:

 - weechat-plugins (with only the following plugins: aspell, exec, fifo, relay,
  script, trigger)
@@ -175,7 +266,7 @@ No release note.
 The option _script.scripts.url_force_https_ has been removed because now the
 site weechat.org can only be used with HTTPS. +
 Both HTTP and HTTPS protocols are allowed in the option _script.scripts.url_.
-For http://weechat.org an automatic redirection to https://weechat.org will
+For http://weechat.org/ an automatic redirection to https://weechat.org/ will
 occur, so you should check that the CA certificates are properly installed
 on your machine.

@@ -64,7 +64,7 @@ run "rm -f ABOUT-NLS"
 run "rm -rf intl"

 # execute autoreconf cmds
-run "autoreconf -fvi"
+run "autoreconf -vi"

 # ending
 rm -f $AUTOGEN_LOG
@@ -28,6 +28,7 @@ endif()

 if(NOT PHP_FOUND)
  find_program(PHP_CONFIG_EXECUTABLE NAMES
+    php-config7.3 php-config73
    php-config7.2 php-config72
    php-config7.1 php-config71
    php-config7.0 php-config70
@@ -39,7 +40,7 @@ if(NOT PHP_FOUND)
    execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
    if(${PHP_VERSION} MATCHES "^7")
      find_library(PHP_LIB
-        NAMES php7.2 php7.1 php7.0 php7
+        NAMES php7.3 php7.2 php7.1 php7.0 php7
        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64)
      if(PHP_LIB)
        get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY)
@@ -35,7 +35,7 @@ endif()

 if(ENABLE_PYTHON3)
  find_program(PYTHON_EXECUTABLE
-    NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
    )
 else()
@@ -67,7 +67,7 @@ if(PYTHON_EXECUTABLE)
    )
  if(ENABLE_PYTHON3)
    find_library(PYTHON_LIBRARY
-      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
      HINTS ${PYTHON_POSSIBLE_LIB_PATH}
      )
  else()
@@ -547,7 +547,7 @@ PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
    if test "x$enable_python3" = "xyes" ; then
-        AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+        AC_PATH_PROGS(PYTHON, python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
    else
        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
    fi
@@ -903,7 +903,7 @@ if test "x$enable_javascript" = "xyes" ; then
    if test "x$ac_found_v8_header" = "xyes" ; then
        #AC_CHECK_LIB(v8,v8,ac_found_v8_lib="yes",ac_found_v8_lib="no")
        ac_save_LIBS="$LIBS"
-        LIBS="$LIBS -lv8"
+        LIBS="$LIBS -lv8 -lpthread"
        AC_MSG_CHECKING(for v8 usability in programs)
        AC_TRY_RUN([
            #include <v8.h>
@@ -917,7 +917,7 @@ if test "x$enable_javascript" = "xyes" ; then
            AC_MSG_RESULT(yes)
            v8_found="yes"
            V8_CFLAGS=""
-            V8_LFLAGS="-lv8"
+            V8_LFLAGS="-lv8 -lpthread"
        else
            AC_MSG_RESULT(no)
            AC_MSG_WARN([
@@ -968,7 +968,7 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        AC_MSG_CHECKING(for PHP headers and libraries with pkg-config)
        echo
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            pkgconfig_php_found=`$PKGCONFIG --exists php$l 2>/dev/null`
            if test "x$?" = "x0" ; then
                pkgconfig_php_found=`$PKGCONFIG --atleast-version=7 php$l 2>/dev/null`
@@ -985,7 +985,7 @@ if test "x$enable_php" = "xyes" ; then
    if test "x$PHP_CFLAGS" = "x" -o "x$PHP_LFLAGS" = "x" ; then
        PHPCONFIG=""
        AC_MSG_CHECKING(for PHP headers and libraries with php-config)
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            AC_CHECK_PROG(PHPCONFIG, "php-config$l", "php-config$l")
            if test "x$PHPCONFIG" != "x" ; then
                php_config_version=`$PHPCONFIG --version`
@@ -1006,7 +1006,7 @@ if test "x$enable_php" = "xyes" ; then
        if test "x$ac_found_php_header" = "xyes" ; then
            PHP_CFLAGS="$CFLAGS"
        fi
-        for l in "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
+        for l in "7.3" "73" "7.2" "72" "7.1" "71" "7.0" "70" "7" "$php_suffix" "" ; do
            AC_CHECK_LIB(php$l,php_execute_script,ac_found_php_lib="yes",ac_found_php_lib="no")
            if test "x$ac_found_php_lib" = "xyes" ; then
                PHP_VERSION=">=7.0.0"
@@ -1 +1 @@
-9
+11
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Sébastien Helleu <flashcode@flashtux.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 9),
-    dh-exec,
+    debhelper (>= 11),
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
@@ -15,20 +14,23 @@ Build-Depends:
    liblua5.1-0-dev,
    tcl8.6-dev,
    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
-    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
+    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
+    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+    libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.5
 Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Git: https://salsa.debian.org/kolter/weechat.git
+Vcs-Browser: https://salsa.debian.org/kolter/weechat

 Package: weechat-devel
 Architecture: all
-Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
+Depends:
+    ${misc:Depends},
+    weechat-devel-curses (>= ${source:Version}) | weechat-devel-headless (>= ${source:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
 Conflicts: weechat
 Description: Fast, light and extensible chat client (metapackage)
@@ -53,10 +55,14 @@ Description: Fast, light and extensible chat client (metapackage)

 Package: weechat-devel-curses
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
-Conflicts: weechat-curses
-Recommends: weechat-devel-plugins (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-core (= ${binary:Version})
+Recommends:
+    weechat-devel-plugins (= ${binary:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-curses
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
@@ -79,22 +85,63 @@ Description: Fast, light and extensible chat client - console client
 .
 This package provides the console client (ncurses).

+Package: weechat-devel-headless
+Architecture: any
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-core (= ${binary:Version})
+Recommends: weechat-devel-plugins (= ${binary:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-headless
+Description: Fast, light and extensible chat client - headless client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-devel-core
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: weechat-core
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends}
 Suggests: weechat-devel-doc (= ${source:Version})
+Conflicts: weechat-core
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.

 Package: weechat-devel-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
+Recommends:
+    weechat-devel-perl,
+    weechat-devel-python,
+    weechat-devel-ruby
+Suggests: weechat-scripts (>> 20090221-1)
 Conflicts: weechat-plugins
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -110,9 +157,12 @@ Description: Fast, light and extensible chat client - plugins

 Package: weechat-devel-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-python
-Description: Fast, light and extensible chat client - python plugin
+Description: Fast, light and extensible chat client - Python plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -120,9 +170,12 @@ Description: Fast, light and extensible chat client - python plugin

 Package: weechat-devel-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-perl
-Description: Fast, light and extensible chat client - perl plugin
+Description: Fast, light and extensible chat client - Perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -130,9 +183,12 @@ Description: Fast, light and extensible chat client - perl plugin

 Package: weechat-devel-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-ruby
-Description: Fast, light and extensible chat client - ruby plugin
+Description: Fast, light and extensible chat client - Ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -140,9 +196,12 @@ Description: Fast, light and extensible chat client - ruby plugin

 Package: weechat-devel-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-lua
-Description: Fast, light and extensible chat client - lua plugin
+Description: Fast, light and extensible chat client - Lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -150,29 +209,38 @@ Description: Fast, light and extensible chat client - lua plugin

 Package: weechat-devel-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-tcl
-Description: Fast, light and extensible chat client - tcl plugin
+Description: Fast, light and extensible chat client - Tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the TCL scripting API plugin.
+ This package provides the Tcl scripting API plugin.

 Package: weechat-devel-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-guile
-Description: Fast, light and extensible chat client - guile plugin
+Description: Fast, light and extensible chat client - Guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

 Package: weechat-devel-javascript
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-javascript
-Description: Fast, light and extensible chat client - javascript plugin
+Description: Fast, light and extensible chat client - JavaScript plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -180,10 +248,13 @@ Description: Fast, light and extensible chat client - javascript plugin

 Package: weechat-devel-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}),
- libphp7.2-embed
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
+    libphp-embed
 Conflicts: weechat-php
-Description: Fast, light and extensible chat client - php plugin
+Description: Fast, light and extensible chat client - PHP plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -202,7 +273,7 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-devel-dev
 Section: devel
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Conflicts: weechat-dev
 Description: Fast, light and extensible chat client - development headers
@@ -210,16 +281,3 @@ Description: Fast, light and extensible chat client - development headers
 for many operating systems. Everything can be done with a keyboard.
 .
 This package contains the headers needed to build plugins.
-
-Package: weechat-devel-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, weechat-devel-curses (= ${binary:Version}) |
- weechat-devel-core (= ${binary:Version}), weechat-devel-plugins (= ${binary:Version})
-Conflicts: weechat-dbg
-Description: Fast, light and extensible chat client - debugging symbols
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f

+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -7,6 +9,7 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -15,19 +18,16 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

-override_dh_strip:
-	dh_strip --dbg-package=weechat-devel-dbg
-
 %:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
+	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.dirs
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.install
@@ -1,9 +1,22 @@
+weechat (2.1-1) unstable; urgency=medium
+
+  This release introduces a new headless client and a new PHP plugin for
+  scripting (respectively weechat-headless and weechat-php binary
+  packages).
+  To avoid at least unnecessary dependencies, each plugin has its own
+  separate binary package:
+    weechat-{perl,python,ruby,lua,guile,javascript,php}
+  Depending on your needs about scripting with weechat you should consider
+  to install the missing packages.
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:53:40 +0100
+
 weechat (1.1.1-1) unstable; urgency=medium

  Since version 1.1, there is a new format for regexp replacement in
  triggers. This format is incompatible with version 1.0. The existing
  triggers will not be automatically updated.
-  See http://www.weechat.org/files/releasenotes/ReleaseNotes-1.1.html
+  See https://weechat.org/files/releasenotes/ReleaseNotes-1.1.html

 -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 25 Jan 2015 20:41:50 +0100

@@ -1,3 +1,94 @@
+weechat (2.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove upstream patch about localized manpages for weechat-headless
+  * Bump Standards-Version to 4.1.5
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 19 Sep 2018 09:41:45 +0000
+
+weechat (2.1-2) unstable; urgency=medium
+
+  * Disable build of javascript plugin to fix weechat autoremoval from
+    testing (RC bugs in libv8) (Closes: #894680)
+  * Add missing localized manpages for weechat-headless
+  * Fix debian/copyright Format URI
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 03 Apr 2018 10:48:35 +0200
+
+weechat (2.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #887114)
+    - Enable build against Ruby 2.5 (Closes: #892072)
+    - New PHP plugin (update build dependencies accordingly)
+  * Split up the package so that plugins are now separated in multiple
+    binary packages to avoid unnecessary dependencies (Closes: #745266)
+  * Switch debhelper compatibility to 11
+  * Bump Standards-Version to 4.1.3
+  * Add debian/upstream/metadata (DEP 12)
+  * Rewrite debian/copyright to be more accurate
+  * Update Vcs-Git and Vcs-Browser with new repository on salsa.debian.org
+  * Update debian/NEWS to introduces weechat-headless and the package split
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 21 Mar 2018 07:46:21 +0100
+
+weechat (1.9.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - CVE-2017-14727 - Include a patch which fix a possible crash in logger
+      plugin (Closes: #876553)
+  * Disable build of javascript plugin to fix weechat autoremoval from
+    testing (RC bugs in libv8)
+  * Bump Standards-Version to 4.1.0
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 23 Sep 2017 21:47:32 +0200
+
+weechat (1.9-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove useless weechat-dbg binary package
+  * Bump Standards-Version to 4.0.0
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 04 Jul 2017 13:29:55 +0200
+
+weechat (1.8-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove usless patches (backports from upstream)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 16 May 2017 14:53:07 +0200
+
+weechat (1.7-3) unstable; urgency=medium
+
+  * Add a patch to fix CVE-2017-8073 which allows a remote crash by
+    sending a filename via DCC to the IRC plugin (Closes: #861121)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 25 Apr 2017 10:46:10 +0200
+
+weechat (1.7-2) unstable; urgency=medium
+
+  * Add a patch to fix slowness after terminal resize (Closes: #855079)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 24 Feb 2017 16:43:09 +0100
+
+weechat (1.7-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove lintian-override for weechat-curses manpage
+  * Add a lintian-override about no hardening flags on fifo.so plugin
+    (false positive)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 09 Feb 2017 20:15:48 +0100
+
+weechat (1.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * Add a patch to build html documentation without requiring data
+    (javascript, fonts) on external websites (potential privacy breach)
+  * Documentation is now built with asciidoctor (adjust dependencies
+    accordingly)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Thu, 06 Oct 2016 13:55:35 +0200
+
 weechat (1.5-1) unstable; urgency=medium

  * New upstream release
@@ -1 +1 @@
-9
+11
@@ -4,8 +4,7 @@ Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
-    debhelper (>= 9),
-    dh-exec,
+    debhelper (>= 11),
    cmake, pkg-config,
    libncursesw5-dev,
    gem2deb,
@@ -15,20 +14,23 @@ Build-Depends:
    liblua5.1-0-dev,
    tcl8.6-dev,
    guile-2.0-dev,
-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
-    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
+    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
+    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+    libxml2-dev,
    libcurl4-gnutls-dev,
    libgcrypt20-dev,
    libgnutls28-dev,
    zlib1g-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.1.5
 Homepage: https://weechat.org/
-Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
-Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Git: https://salsa.debian.org/kolter/weechat.git
+Vcs-Browser: https://salsa.debian.org/kolter/weechat

 Package: weechat
 Architecture: all
-Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
+Depends:
+    ${misc:Depends},
+    weechat-curses (>= ${source:Version}) | weechat-headless (>= ${source:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client (metapackage)
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -52,10 +54,12 @@ Description: Fast, light and extensible chat client (metapackage)

 Package: weechat-curses
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
-Conflicts: weechat-common
-Breaks: weechat-scripts (<= 20090221-1)
-Recommends: weechat-plugins (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-core (= ${binary:Version})
+Recommends:
+    weechat-plugins (= ${binary:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -79,10 +83,41 @@ Description: Fast, light and extensible chat client - console client
 .
 This package provides the console client (ncurses).

+Package: weechat-headless
+Architecture: any
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-core (= ${binary:Version})
+Recommends: weechat-plugins (= ${binary:Version})
+Suggests: weechat-doc (= ${source:Version})
+Description: Fast, light and extensible chat client - headless client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-core
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: weechat-common, weechat-plugins (<< 0.3.0)
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends}
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -90,11 +125,18 @@ Description: Fast, light and extensible chat client - core files
 .
 This package provides core plugins and locales files for WeeChat. It
 currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.

 Package: weechat-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Recommends:
+    weechat-perl,
+    weechat-python,
+    weechat-ruby
 Suggests: weechat-scripts (>> 20090221-1)
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -110,8 +152,11 @@ Description: Fast, light and extensible chat client - plugins

 Package: weechat-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - python plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Python plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -119,8 +164,11 @@ Description: Fast, light and extensible chat client - python plugin

 Package: weechat-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - perl plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Perl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -128,8 +176,11 @@ Description: Fast, light and extensible chat client - perl plugin

 Package: weechat-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - ruby plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Ruby plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -137,8 +188,11 @@ Description: Fast, light and extensible chat client - ruby plugin

 Package: weechat-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - lua plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Lua plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -146,26 +200,35 @@ Description: Fast, light and extensible chat client - lua plugin

 Package: weechat-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - tcl plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Tcl plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
- This package provides the TCL scripting API plugin.
+ This package provides the Tcl scripting API plugin.

 Package: weechat-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - guile plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - Guile plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides the Guile scripting API plugin.

 Package: weechat-javascript
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Description: Fast, light and extensible chat client - javascript plugin
+Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
+Description: Fast, light and extensible chat client - JavaScript plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -173,9 +236,12 @@ Description: Fast, light and extensible chat client - javascript plugin

 Package: weechat-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}),
- libphp7.2-embed
-Description: Fast, light and extensible chat client - php plugin
+Depends:
+    ${misc:Depends},
+    ${shlibs:Depends},
+    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
+    libphp-embed
+Description: Fast, light and extensible chat client - PHP plugin
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
@@ -193,22 +259,10 @@ Description: Fast, light and extensible chat client - documentation

 Package: weechat-dev
 Section: devel
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Description: Fast, light and extensible chat client - development headers
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package contains the headers needed to build plugins.
-
-Package: weechat-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
- weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
-Description: Fast, light and extensible chat client - debugging symbols
- WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
- for many operating systems. Everything can be done with a keyboard.
- .
- This package contains gdb debugging symbols for the WeeChat packages.
@@ -1,17 +1,156 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: weechat
 Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
 Source: https://weechat.org/

 Files: *
 Copyright: 2003-2018, Sébastien Helleu <flashcode@flashtux.org>
-           2005-2009, Emmanuel Bouthenot <kolter@openics.org>
-           2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
+License: GPL-3+
+
+Files: src/core/wee-command.c
+       src/core/wee-command.h
+Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-config-file.c
+       src/core/wee-config-file.h
+       src/core/wee-config.c
+       src/core/wee-config.h
+Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/hook/wee-hook-connect.c
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/core/hook/wee-hook-connect.h
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/gui/gui-history.c
+Copyright: 2005, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-completion.c
+       src/core/wee-log.c
+       src/core/wee-utf8.c
+       src/core/weechat.h
+       src/plugins/aspell/weechat-aspell-config.c
+       src/plugins/aspell/weechat-aspell-config.h
+       src/plugins/aspell/weechat-aspell-speller.c
+       src/plugins/aspell/weechat-aspell-speller.h
+       src/plugins/aspell/weechat-aspell.h
+       src/plugins/irc/irc-command.c
+       src/plugins/irc/irc.h
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/core/wee-network.c
+Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
+           2010, Gu1ll4um3r0m41n <aeroxteam@gmail.com>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/aspell/weechat-aspell-bar-item.c
+       src/plugins/aspell/weechat-aspell-bar-item.h
+Copyright: 2012, Nils Görs <weechatter@arcor.de>
+License: GPL-3+
+
+Files: src/plugins/aspell/weechat-aspell.c
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Nils Görs <weechatter@arcor.de>
+License: GPL-3+
+
+Files: src/plugins/guile/weechat-guile-api.c
+       src/plugins/irc/irc-server.h
+       src/plugins/plugin-script-api.c
+       src/plugins/plugin-script-api.h
+Copyright: 2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/irc/irc-protocol.c
+Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org>
+           2014, Shawn Smith <ShawnSmith0828@gmail.com>
+License: GPL-3+
+
+Files: src/plugins/irc/irc-server.c
+Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/javascript/weechat-js-api.cpp
+       src/plugins/javascript/weechat-js-api.h
+       src/plugins/javascript/weechat-js-v8.cpp
+       src/plugins/javascript/weechat-js-v8.h
+       src/plugins/javascript/weechat-js.cpp
+       src/plugins/javascript/weechat-js.h
+Copyright: 2013, Koka El Kiwi <kokakiwi@kokakiwi.net>
+License: GPL-3+
+
+Files: src/plugins/lua/weechat-lua-api.c
+Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/lua/weechat-lua-api.h
+       src/plugins/lua/weechat-lua.c
+       src/plugins/lua/weechat-lua.h
+Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/perl/weechat-perl-api.c
+Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/perl/weechat-perl.c
+Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/php/weechat-php-api.c
+       src/plugins/php/weechat-php-api.h
+       src/plugins/php/weechat-php.c
+       src/plugins/php/weechat-php.h
+Copyright: 2006-2017, Adam Saponara <as@php.net>
+License: GPL-3-with-openssl-exception
+
+Files: src/plugins/python/weechat-python-api.c
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python-api.h
+       src/plugins/ruby/weechat-ruby-api.h
+       src/plugins/ruby/weechat-ruby.c
+       src/plugins/ruby/weechat-ruby.h
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python.c
+       src/plugins/ruby/weechat-ruby-api.c
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/python/weechat-python.h
+Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org>
+License: GPL-3+
+
+Files: src/plugins/tcl/weechat-tcl-api.c
+Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
+           2008, Julien Louis <ptitlouis@sysif.net>
+           2012, Simon Arlott
+License: GPL-3+
+
+Files: src/plugins/tcl/weechat-tcl-api.h
+       src/plugins/tcl/weechat-tcl.c
+       src/plugins/tcl/weechat-tcl.h
+Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

 Files: debian/*
 Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
-           2008-2016, Emmanuel Bouthenot <kolter@openics.org>
+           2008-2018, Emmanuel Bouthenot <kolter@openics.org>
 License: GPL-3+

 License: GPL-3+
@@ -30,3 +169,31 @@ License: GPL-3+
 .
 On Debian systems, the complete text of the GNU General Public License,
 Version 3 can be found in the file /usr/share/common-licenses/GPL-3
+
+License: GPL-3-with-openssl-exception
+ WeeChat is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+ .
+ WeeChat is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License,
+ Version 3 can be found in the file /usr/share/common-licenses/GPL-3
+ .
+ Additional permission under GNU GPL version 3 section 7:
+ .
+ If you modify the Program, or any covered work, by linking or
+ combining it with the OpenSSL project's OpenSSL library (or a
+ modified version of that library), containing parts covered by the
+ terms of the OpenSSL or SSLeay licenses, the licensors of the Program
+ grant you additional permission to convey the resulting work.
+ Corresponding Source for a non-source form of such a combination
+ shall include the source code for the parts of OpenSSL used as well
+ as that of the covered work.
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f

+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 BUILDDIR = builddir

 $(BUILDDIR)/Makefile:
@@ -7,6 +9,7 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
 		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
@@ -15,19 +18,16 @@ $(BUILDDIR)/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-override_dh_auto_build: $(BUILDDIR)/Makefile
-	dh_auto_build
-
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo

+override_dh_auto_build: $(BUILDDIR)/Makefile
+	dh_auto_build
+
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.adoc

-override_dh_strip:
-	dh_strip --dbg-package=weechat-dbg
-
 %:
-	dh $@ --parallel --builddirectory=$(BUILDDIR)
+	dh $@ --builddirectory=$(BUILDDIR) --without autoreconf
@@ -1,8 +1,8 @@
 usr/share/locale/
-usr/lib/weechat/plugins/alias.so
-usr/lib/weechat/plugins/buflist.so
-usr/lib/weechat/plugins/charset.so
-usr/lib/weechat/plugins/fset.so
-usr/lib/weechat/plugins/irc.so
-usr/lib/weechat/plugins/logger.so
-usr/lib/weechat/plugins/xfer.so
+usr/lib/*/weechat/plugins/alias.so
+usr/lib/*/weechat/plugins/buflist.so
+usr/lib/*/weechat/plugins/charset.so
+usr/lib/*/weechat/plugins/fset.so
+usr/lib/*/weechat/plugins/irc.so
+usr/lib/*/weechat/plugins/logger.so
+usr/lib/*/weechat/plugins/xfer.so
@@ -1,7 +1,4 @@
 usr/bin/weechat
-usr/bin/weechat-headless
 debian/weechat.xpm usr/share/pixmaps
 usr/share/man/man1/weechat.1
 usr/share/man/*/man1/weechat.1
-usr/share/man/man1/weechat-headless.1
-usr/share/man/*/man1/weechat-headless.1
@@ -1,2 +1,2 @@
 usr/include/weechat/*
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*
@@ -1 +1 @@
-usr/lib/weechat/plugins/guile.so
+usr/lib/*/weechat/plugins/guile.so
@@ -0,0 +1 @@
+usr/bin
@@ -0,0 +1,3 @@
+usr/bin/weechat-headless
+usr/share/man/man1/weechat-headless.1
+usr/share/man/*/man1/weechat-headless.1
@@ -1,3 +1 @@
-#!/usr/bin/dh-exec
-
-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
+usr/lib/*/weechat/plugins/javascript.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/lua.so
+usr/lib/*/weechat/plugins/lua.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/perl.so
+usr/lib/*/weechat/plugins/perl.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/php.so
+usr/lib/*/weechat/plugins/php.so
@@ -1,6 +1,6 @@
-usr/lib/weechat/plugins/aspell.so
-usr/lib/weechat/plugins/exec.so
-usr/lib/weechat/plugins/fifo.so
-usr/lib/weechat/plugins/relay.so
-usr/lib/weechat/plugins/script.so
-usr/lib/weechat/plugins/trigger.so
+usr/lib/*/weechat/plugins/aspell.so
+usr/lib/*/weechat/plugins/exec.so
+usr/lib/*/weechat/plugins/fifo.so
+usr/lib/*/weechat/plugins/relay.so
+usr/lib/*/weechat/plugins/script.so
+usr/lib/*/weechat/plugins/trigger.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/python.so
+usr/lib/*/weechat/plugins/python.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/ruby.so
+usr/lib/*/weechat/plugins/ruby.so
@@ -1 +1 @@
-usr/lib/weechat/plugins/tcl.so
+usr/lib/*/weechat/plugins/tcl.so
@@ -18,29 +18,34 @@
 #

 if(ENABLE_MAN)
-  # man page
+  # man page: weechat
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (cs)"
  )
  add_custom_target(doc-man-weechat-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)

-  # symbolic link weechat-headless.1 -> weechat.1
+  # man page: weechat-headless
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-    COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-headless.1"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat.1" "weechat-headless.1"
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Creating symbolic link weechat-headless.1 (cs)"
+    COMMENT "Building weechat-headless.1 (cs)"
  )
  add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
@@ -26,8 +26,15 @@
 *-p*, *--no-plugin*::
    Vypne automatické nahrání pluginů.

+// TRANSLATION MISSING
+*-P*, *--plugins* _<plugins>_::
+    Load only these plugins at startup (see /help weechat.plugin.autoload).
+    If this option is given, the option weechat.plugin.autoload is not used.
+
+// TRANSLATION MISSING
 *-r*, *--run-command* _<command>_::
-    Spustí příkaz(y) po startu (více přůkazů může být odděleno středníky).
+    Run command(s) after startup; many commands can be separated by semicolons,
+    this option can be given multiple times.

 *-s*, *--no-script*::
    Vypni automatické nahrání scriptů.
@@ -0,0 +1,13 @@
+WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
+souboru AUTHORS.adoc).
+
+Copyright (C) 2003-2018 {author}
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Prosím přečtěte si soubor COPYING pro více informací.
+
+Web: https://weechat.org/
@@ -0,0 +1,74 @@
+$HOME/.weechat/weechat.conf::
+    hlavní konfigurační soubor WeeChatu
+
+$HOME/.weechat/plugins.conf::
+    soubor konfigurace pluginů
+
+$HOME/.weechat/sec.conf::
+    konfigurační soubor s chráněnými daty
+
+$HOME/.weechat/alias.conf::
+    configurační soubor pro _alias_ plugin
+
+$HOME/.weechat/aspell.conf::
+    konfigurační soubor pro _aspell_ plugin
+
+$HOME/.weechat/buflist.conf::
+    konfigurační soubor pro _buflist_ plugin
+
+$HOME/.weechat/charset.conf::
+    konfigurační soubor pro _charset_ plugin
+
+$HOME/.weechat/exec.conf::
+    konfigurační soubor pro _exec_ plugin
+
+$HOME/.weechat/fifo.conf::
+    konfigurační soubor pro _fifo_ plugin
+
+$HOME/.weechat/fset.conf::
+    konfigurační soubor pro _fset_ plugin
+
+$HOME/.weechat/guile.conf::
+    konfigurační soubor pro _guile_ plugin
+
+$HOME/.weechat/irc.conf::
+    konfigurační soubor pro _irc_ plugin
+
+$HOME/.weechat/javascript.conf::
+    konfigurační soubor pro _javascript_ plugin
+
+$HOME/.weechat/logger.conf::
+    konfigurační soubor pro _logger_ plugin
+
+$HOME/.weechat/lua.conf::
+    konfigurační soubor pro _lua_ plugin
+
+$HOME/.weechat/perl.conf::
+    konfigurační soubor pro _perl_ plugin
+
+$HOME/.weechat/php.conf::
+    konfigurační soubor pro _php_ plugin
+
+$HOME/.weechat/python.conf::
+    konfigurační soubor pro _python_ plugin
+
+$HOME/.weechat/relay.conf::
+    konfigurační soubor pro _relay_ plugin
+
+$HOME/.weechat/ruby.conf::
+    konfigurační soubor pro _ruby_ plugin
+
+$HOME/.weechat/script.conf::
+    konfigurační soubor pro _script_ plugin
+
+$HOME/.weechat/tcl.conf::
+    konfigurační soubor pro _tcl_ plugin
+
+$HOME/.weechat/trigger.conf::
+    konfigurační soubor pro _trigger_ plugin
+
+$HOME/.weechat/xfer.conf::
+    konfigurační soubor pro _xfer_ plugin
+
+$HOME/.weechat/weechat.log::
+    soubor záznamů WeeChatu
@@ -0,0 +1,14 @@
+Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
+https://weechat.org/doc[WeeChat user's guide].
+
+S irc pluginem se můžete doččasně připojit na server s URL jako:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
+
+    irc://mynick@chat.freenode.net/#weechat
+
+IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
@@ -0,0 +1,64 @@
+// TRANSLATION MISSING
+= weechat-headless(1)
+:doctype: manpage
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: cs
+// TRANSLATION MISSING
+:man manual: WeeChat Manual
+:man source: WeeChat {revnumber}
+
+== JMÉNO
+
+weechat-headless - the extensible chat client (headless version)
+
+== PŘEHLED
+
+// TRANSLATION MISSING
+[verse]
+*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat-headless* [-c|--colors]
+*weechat-headless* [-h|--help]
+*weechat-headless* [-l|--license]
+*weechat-headless* [-v|--version]
+
+== POPIS
+
+WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
+Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
+v obvyklých sciptovacích jazycích.
+
+// TRANSLATION MISSING
+The command *weechat-headless* runs WeeChat in a headless mode (no interface).
+It can be used for tests or to daemonize WeeChat with the option "--daemon".
+
+
+== VOLBY
+
+include::cmdline_options.cs.adoc[]
+
+== VOLBY PLUGINŮ
+
+include::man_plugin_options.cs.adoc[]
+
+== SOUBORY
+
+include::man_files.cs.adoc[]
+
+// TRANSLATION MISSING
+== SEE ALSO
+
+*weechat*(1)
+
+== AUTOŘI
+
+Tato manuálová stránka byla napsána {author}.
+Tato manuálová stránka byla přeložena Ondřejem Súkupem.
+
+== COPYRIGHT
+
+include::man_copyright.cs.adoc[]
+
+== PODPORA / HLÁŠENÍ CHYB
+
+Pro pomoc nebo hlášení chyb https://weechat.org/about/support
@@ -13,123 +13,36 @@ weechat - the extensible chat client

 == PŘEHLED

+// TRANSLATION MISSING
 [verse]
-*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
 *weechat* [-c|--colors]
 *weechat* [-h|--help]
 *weechat* [-l|--license]
 *weechat* [-v|--version]

-*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
-
 == POPIS

 WeeChat (Wee Enhanced Environment for Chat) je svobodný chatovací klient.
 Je lehký, plně konfigurovatelný a lehce rozšiřitelný pomocí pluginů a scriptů
 v obvyklých sciptovacích jazycích.

-// TRANSLATION MISSING
-The command *weechat-headless* runs WeeChat in a headless mode (no interface).
-It can be used for tests or to daemonize WeeChat with the option "--daemon".
-
-
 == VOLBY

 include::cmdline_options.cs.adoc[]

 == VOLBY PLUGINŮ

-Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na
-https://weechat.org/doc[WeeChat user's guide].
-
-S irc pluginem se můžete doččasně připojit na server s URL jako:
-
-    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
-
-K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick":
-
-    irc://mynick@chat.freenode.net/#weechat
-
-IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například:
-
-    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+include::man_plugin_options.cs.adoc[]

 == SOUBORY

-$HOME/.weechat/weechat.conf::
-    hlavní konfigurační soubor WeeChatu
+include::man_files.cs.adoc[]

-$HOME/.weechat/plugins.conf::
-    soubor konfigurace pluginů
+// TRANSLATION MISSING
+== SEE ALSO

-$HOME/.weechat/sec.conf::
-    konfigurační soubor s chráněnými daty
-
-$HOME/.weechat/alias.conf::
-    configurační soubor pro _alias_ plugin
-
-$HOME/.weechat/aspell.conf::
-    konfigurační soubor pro _aspell_ plugin
-
-$HOME/.weechat/buflist.conf::
-    konfigurační soubor pro _buflist_ plugin
-
-$HOME/.weechat/charset.conf::
-    konfigurační soubor pro _charset_ plugin
-
-$HOME/.weechat/exec.conf::
-    konfigurační soubor pro _exec_ plugin
-
-$HOME/.weechat/fifo.conf::
-    konfigurační soubor pro _fifo_ plugin
-
-$HOME/.weechat/fset.conf::
-    konfigurační soubor pro _fset_ plugin
-
-$HOME/.weechat/guile.conf::
-    konfigurační soubor pro _guile_ plugin
-
-$HOME/.weechat/irc.conf::
-    konfigurační soubor pro _irc_ plugin
-
-$HOME/.weechat/javascript.conf::
-    konfigurační soubor pro _javascript_ plugin
-
-$HOME/.weechat/logger.conf::
-    konfigurační soubor pro _logger_ plugin
-
-$HOME/.weechat/lua.conf::
-    konfigurační soubor pro _lua_ plugin
-
-$HOME/.weechat/perl.conf::
-    konfigurační soubor pro _perl_ plugin
-
-$HOME/.weechat/php.conf::
-    konfigurační soubor pro _php_ plugin
-
-$HOME/.weechat/python.conf::
-    konfigurační soubor pro _python_ plugin
-
-$HOME/.weechat/relay.conf::
-    konfigurační soubor pro _relay_ plugin
-
-$HOME/.weechat/ruby.conf::
-    konfigurační soubor pro _ruby_ plugin
-
-$HOME/.weechat/script.conf::
-    konfigurační soubor pro _script_ plugin
-
-$HOME/.weechat/tcl.conf::
-    konfigurační soubor pro _tcl_ plugin
-
-$HOME/.weechat/trigger.conf::
-    konfigurační soubor pro _trigger_ plugin
-
-$HOME/.weechat/xfer.conf::
-    konfigurační soubor pro _xfer_ plugin
-
-$HOME/.weechat/weechat.log::
-    soubor záznamů WeeChatu
+*weechat-headless*(1)

 == AUTOŘI

@@ -138,20 +51,8 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem.

 == COPYRIGHT

-WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.adoc).
-
-Copyright (C) 2003-2018 {author}
-
-WeeChat is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Prosím přečtěte si soubor COPYING pro více informací.
-
-Web: https://weechat.org/
+include::man_copyright.cs.adoc[]

 == PODPORA / HLÁŠENÍ CHYB

-Pro pomoc nebo hlášení chyb https://weechat.org/dev/support
+Pro pomoc nebo hlášení chyb https://weechat.org/about/support
@@ -47,34 +47,6 @@ K nastavení voleb napište:
 WeeChat okamžitě použije novou hodnotu (*nikdy* nebudete potřebovat restart
 WeeChatu po změně konfigurace).

-Můžete použít v příkazu `/set` volbu s částečným jménem a zástupným znakem "*"
-na konci nebo začátku k zobrazení všech voleb obsahující dané znaky.
-Například:
-
-* zobrazí všechny volby (WeeChatu a pluginů):
-
----
-/set
----
-
-* zobraz volby WeeChatu:
-
----
-/set weechat.*
----
-
-* zobraz volby IRC pluginu:
-
----
-/set irc.*
----
-
-Můžete zobrazit nápovědu pro voblby s `/help`, například:
-
----
-/help weechat.look.highlight
----
-
 Všechna nastavení jsou uložena při ukončení WeeChatu (nebo použitím příkazu
 `/save` k vynucení zapsaní voleb).

@@ -87,6 +59,38 @@ that were not yet saved with `/save`). +
 You can use the command `/set`, which checks the value and applies immediately
 the changes.

+// TRANSLATION MISSING
+Help is available for options:
+
+----
+/help config.section.option
+----
+
+// TRANSLATION MISSING
+The plugin _fset_ allows you to easily browse options and change them.
+
+// TRANSLATION MISSING
+For example to display WeeChat options:
+
+----
+/fset weechat.*
+----
+
+// TRANSLATION MISSING
+IRC options:
+
+----
+/fset irc.*
+----
+
+// TRANSLATION MISSING
+The `/fset` command has completion on part of option names, so for example if
+you type `/fset hot` and press kbd:[Tab] this is completed as `/fset hotlist`.
+If you press kbd:[Enter], options about the hotlist are displayed.
+
+// TRANSLATION MISSING
+For more information about `/fset` command and keys, see `/help fset`.
+
 [[core_vs_plugins]]
 == Jádro versus pluginy

@@ -108,6 +112,11 @@ Můžete přidat irc server příkazem `/server`, například:
 /server add freenode chat.freenode.net
 ----

+// TRANSLATION MISSING
+In this command, `freenode` is the internal server name used by WeeChat:
+you'll be able to connect with `/connect freenode` and the server options
+are _irc.server.freenode.xxx_.
+
 Jako obvykle je poskytována nápověda pokud se ztratíte:

 ----
@@ -211,7 +220,7 @@ K smazání hodnoty serverové volby a k použití výchozí hodnoty místo ní,
 například k požití výchozích přezdívek (irc.server_default.nicks):

 ----
-/set irc.server.freenode.nicks null
+/unset irc.server.freenode.nicks
 ----

 Ostatní volby: můžete nastavit ostatní volby s následujícím příkazem ("xxx" je
@@ -228,10 +237,10 @@ název volby):
 /connect freenode
 ----

+// TRANSLATION MISSING
 [NOTE]
 Tento příkaz může být použit k vytvoření nového připojení k serveru bez
-použití příkazu `/server` (mohu zopakovat že můžete zobrazit nápovědu
-pro tento příkaz s `/help connect` ?).
+použití příkazu `/server` (see `/help connect`).

 Ve výchozím nastavení jsou serverové bufery spojen s Weechat _core_ buferem.
 K přepnutí mezi _core_ a server bufery můžete použít klávesu kbd:[Ctrl+x].
@@ -309,8 +318,6 @@ Příkazy k spravování buferů a oken:
 /window
 ----

-(nebudu se zde opakovat, můžete k těmto příkazům získat nápovědu pomocí /help)
-
 Například, k svislému rozdělení obrazovky na malé okno (1/3 šířky), a velké
 okno (2/3), použijte příkaz:

@@ -332,6 +339,8 @@ Weechat používá ve výchozím nastavení mnoho klávesových zkratek, Všechn
 najdete v dokumentaci, ale je dobré znát alespoň pár těchto důležitých:

 - kbd:[Alt+←] / kbd:[Alt+→] nebo kbd:[F5] / kbd:[F6]: přepnout na předchozí/další bufer
+// TRANSLATION MISSING
+- kbd:[F1] / kbd:[F2]: scroll bar with list of buffers ("buflist")
 - kbd:[F7] / kbd:[F8]: přepnout na předchozí/další okno (pokud je obrazovka rozdělena)
 - kbd:[F9] / kbd:[F10]: posunoutí titulku
 - kbd:[F11] / kbd:[F12]: posunutí seznamu přezdívek
@@ -18,29 +18,34 @@
 #

 if(ENABLE_MAN)
-  # man page
+  # man page: weechat
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (de)"
  )
  add_custom_target(doc-man-weechat-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)

-  # symbolic link weechat-headless.1 -> weechat.1
+  # man page: weechat-headless
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-    COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-headless.1"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat.1" "weechat-headless.1"
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Creating symbolic link weechat-headless.1 (de)"
+    COMMENT "Building weechat-headless.1 (de)"
  )
  add_custom_target(doc-man-weechat-headless-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/de/man1)
@@ -48,6 +53,8 @@ endif()

 if(ENABLE_DOC)

+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+
  # user's guide
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
@@ -56,7 +63,7 @@ if(ENABLE_DOC)
    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat_user.de.html"
  )
@@ -30,6 +30,10 @@

 | irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen

+| irc | irc_modelist_masks | Modelist Maske für aktuellen IRC Channel; benötigtes Argument: modelist mode
+
+| irc | irc_modelist_numbers | Modelist Nummern für aktuellen IRC Channel; benötigtes Argument: modelist mode
+
 | irc | irc_msg_kick | Standardmitteilung wenn man jemanden aus einem Channel wirft

 | irc | irc_msg_part | Standardmitteilung beim Verlassen (/part) eines IRC-Channels
@@ -74,6 +74,8 @@ _last_nick_   (pointer, hdata: "irc_nick") +
 _nicks_speaking_   (pointer) +
 _nicks_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
 _last_nick_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
+_modelists_   (pointer, hdata: "irc_modelist") +
+_last_modelist_   (pointer, hdata: "irc_modelist") +
 _join_smart_filtered_   (hashtable) +
 _buffer_   (pointer, hdata: "buffer") +
 _buffer_as_string_   (string) +
@@ -106,6 +108,30 @@ _prev_ignore_   (pointer, hdata: "irc_ignore") +
 _next_ignore_   (pointer, hdata: "irc_ignore") +


+| irc
+| [[hdata_irc_modelist]]<<hdata_irc_modelist,irc_modelist>>
+| IRC Modelist
+| -
+| _type_   (char) +
+_state_   (integer) +
+_items_   (pointer, hdata: "irc_modelist_item") +
+_last_item_   (pointer, hdata: "irc_modelist_item") +
+_prev_modelist_   (pointer, hdata: "irc_modelist") +
+_next_modelist_   (pointer, hdata: "irc_modelist") +
+
+
+| irc
+| [[hdata_irc_modelist_item]]<<hdata_irc_modelist_item,irc_modelist_item>>
+| IRC Modelist-Item
+| -
+| _number_   (integer) +
+_mask_   (string) +
+_setter_   (string) +
+_datetime_   (time) +
+_prev_item_   (pointer, hdata: "irc_modelist_item") +
+_next_item_   (pointer, hdata: "irc_modelist_item") +
+
+
 | irc
 | [[hdata_irc_nick]]<<hdata_irc_nick,irc_nick>>
 | IRC-Nick
@@ -217,9 +243,10 @@ _nick_first_tried_   (integer) +
 _nick_alternate_number_   (integer) +
 _nick_   (string) +
 _nick_modes_   (string) +
-_cap_away_notify_   (integer) +
-_cap_account_notify_   (integer) +
-_cap_extended_join_   (integer) +
+_checking_cap_ls_   (integer) +
+_cap_ls_   (hashtable) +
+_checking_cap_list_   (integer) +
+_cap_list_   (hashtable) +
 _isupport_   (string) +
 _prefix_modes_   (string) +
 _prefix_chars_   (string) +
@@ -864,6 +891,7 @@ _str_time_   (string) +
 _tags_count_   (integer) +
 _tags_array_   (shared_string, array_size: "tags_count") +
 _displayed_   (char) +
+_notify_level_   (char) +
 _highlight_   (char) +
 _refresh_needed_   (char) +
 _prefix_   (shared_string) +
@@ -20,6 +20,10 @@

 | irc | irc_ignore | Liste von ignorierten IRCs | Ignore Pointer (optional) | -

+| irc | irc_modelist | Liste der Channel-Mode-Liste für einen IRC-Channel | Modelist Pointer (optional) | Server,Channel,Type (Type ist optional)
+
+| irc | irc_modelist_item | Liste der Items in der Channel-Modeliste | Modelist Item Pointer (optional) | Server,Channel,Type,Nummer (Nummer ist optional)
+
 | irc | irc_nick | Liste der Nicks im IRC-Channel | Nick Pointer (optional) | server,channel,nick (nick ist optional)

 | irc | irc_notify | Liste mit Benachrichtigungen | Benachrichtigungspointer (optional) | Servername (Platzhalter "*" kann verwendet werden) (optional)
@@ -66,7 +66,7 @@

 | python | python_version | Version des verwendeten Interpreters | -

-| relay | relay_client_count | Anzahl an Clients für Relay | Statusname (optional): connecting, waiting_auth, connected, auth_failed, disconnected
+| relay | relay_client_count | Anzahl an Clients für Relay | Protokoll,Status (beide sind Optional, bei beiden Argumenten bedeutet "*", alle; Protokolle: irc, weechat; Status: connecting, waiting_auth, connected, auth_failed, disconnected)

 | ruby | ruby_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll

@@ -100,7 +100,7 @@

 | weechat | inactivity | Inaktivität der Tastatur (Sekunden) | -

-| weechat | locale | Lokalisation welche für die übersetzten Nachrichten verwendet werden soll | -
+| weechat | locale | Spracheinstellung die für die übersetzten Nachrichten verwendet werden soll | -

 | weechat | nick_color | zeigt Farbecode des Nick | Nickname

@@ -4,7 +4,7 @@
 //
 [width="100%",cols="2,^1,7",options="header"]
 |===
-| Einstellung | Type | Konstanten ^(1)^
+| Einstellung | Type ^(1)^ | Konstanten ^(2)^

 | verbose | long |

@@ -114,10 +114,14 @@

 | postfields | string |

+| httppost | list |
+
 | referer | string |

 | useragent | string |

+| httpheader | list |
+
 | cookie | string |

 | cookiefile | string |
@@ -134,6 +138,8 @@

 | cookiesession | long |

+| http200aliases | list |
+
 | unrestricted_auth | long |

 | postfieldsize_large | long long |
@@ -158,12 +164,16 @@

 | headeropt | mask | unified, separate

+| proxyheader | list |
+
 | pipewait | long |

 | stream_weight | long |

 | mail_from | string |

+| mail_rcpt | list |
+
 | mail_auth | string |

 | tftp_blksize | long |
@@ -172,8 +182,14 @@

 | ftpport | string |

+| quote | list |
+
+| postquote | list |
+
 | ftp_use_epsv | long |

+| prequote | list |
+
 | ftp_use_eprt | long |

 | ftp_create_missing_dirs | long |
@@ -270,6 +286,8 @@

 | use_ssl | long | none, try, control, all

+| resolve | list |
+
 | dns_servers | string |

 | accepttimeout_ms | long |
@@ -280,6 +298,8 @@

 | dns_local_ip6 | string |

+| connect_to | list |
+
 | sslcert | string |

 | sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
@@ -354,6 +374,8 @@

 | proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3

+| proxy_ssl_cipher_list | list |
+
 | proxy_ssl_options | long | allow_beast, no_revoke

 | proxy_ssl_verifyhost | long |
@@ -380,4 +402,6 @@

 | new_directory_perms | long |

+| telnetoptions | list |
+
 |===
@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 * [[option_buflist.format.buffer]] *buflist.format.buffer*
-** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist)]
+** Beschreibung: pass:none[Format für eine Zeile mit einem Buffer (Hinweis: Inhalt wird evaluiert, siehe /help buflist); Beispiel: Standardformat für Bar-Item "buflist" anwenden und nur die Buffernummer in eckigen Klammern für die anderen Bar-Items ("buflist2 und "buflist3") anzeigen:  "${if:${bar_item.name}==buflist?${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}:[${number}\]}"]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
@@ -393,13 +393,13 @@
 ** Standardwert: `+"/unset ${name}"+`

 * [[option_fset.format.option1]] *fset.format.option1*
-** Beschreibung: pass:none[erstes Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name}  ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
+** Beschreibung: pass:none[erstes Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name} ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

 * [[option_fset.format.option2]] *fset.format.option2*
-** Beschreibung: pass:none[zweites Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name}  ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
+** Beschreibung: pass:none[zweites Format um Optionen anzuzeigen die weder markiert noch ausgewählt sind (Hinweis: der Inhalt ist evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die Standardeinstellung ("${marked} ${name} ${type}  ${value2}"), dies findet ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den Formaten kann mittels ctrl-X umgeschaltet werden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${marked} ${name}  ${type}  ${value2}${newline}  ${empty_name}  ${_default_value}${color:darkgray} -- ${min}..${max}${newline}  ${empty_name}  ${description}"+`
@@ -411,7 +411,7 @@
 ** Standardwert: `+off+`

 * [[option_fset.look.condition_catch_set]] *fset.look.condition_catch_set*
-** Beschreibung: pass:none[Bedingung um den /set Befehl abzufangen und die Ausgabe im fset Buffer darzustellen; folgende Variablen können verwendet werden:  ${name} (Name der Option die dem /set Befehl übergeben wurde), ${count} (Anzahl der Optionen die mit /set gefunden wurden); eine leere Zeichenkette deaktiviert die Funktion; der Wert "1", nutzt immer den fset Buffer für die Ausgabe des /set Befehls]
+** Beschreibung: pass:none[Bedingung um den /set Befehl abzufangen und die Ausgabe im fset Buffer darzustellen; folgende Variablen können verwendet werden: ${name} (Name der Option die dem /set Befehl übergeben wurde), ${count} (Anzahl der Optionen die mit /set gefunden wurden); eine leere Zeichenkette deaktiviert die Funktion; der Wert "1", nutzt immer den fset Buffer für die Ausgabe des /set Befehls]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"${count} >= 1"+`
@@ -447,7 +447,7 @@
 ** Standardwert: `+off+`

 * [[option_fset.look.sort]] *fset.look.sort*
-** Beschreibung: pass:none[durch Kommata getrennte Liste von Feldern um die Optionen zu sortieren (siehe /help fset um eine Auflistung der Felder zu erhalten); wird das "-" Zeichen vor einem Feld angewendet, wird die Ausgabe umgekehrt, um bei einem Vergleich nicht zwischen Groß- und Kleinschreibung zu unterscheiden wird das Zeichen  "~" verwendet; Beispiel: "-~name" sortiert die Optionsnamen in umgekehrter Reihenfolge und es wird dabei nicht zwischen Groß-und Kleinschreibung unterschieden]
+** Beschreibung: pass:none[durch Kommata getrennte Liste von Feldern um die Optionen zu sortieren (siehe /help fset um eine Auflistung der Felder zu erhalten); wird das "-" Zeichen vor einem Feld angewendet, wird die Ausgabe umgekehrt, um bei einem Vergleich nicht zwischen Groß- und Kleinschreibung zu unterscheiden wird das Zeichen "~" verwendet; Beispiel: "-~name" sortiert die Optionsnamen in umgekehrter Reihenfolge und es wird dabei nicht zwischen Groß-und Kleinschreibung unterschieden]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"~name"+`
@@ -111,9 +111,9 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei

 Ohne Angaben von Argumenten werden "ls" und "list" gesendet.

-Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.
+Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, cap-notify, chghost, extended-join, invite-notify, multi-prefix, server-time, userhost-in-names.

-Fähigkeiten die standardmäßig genutzt werden sollen können mit der Option  irc.server_default.capabilities gesetzt werden (oder individuell für jeden Server mit der Option irc.server.xxx.capabilities).
+Fähigkeiten die standardmäßig genutzt werden sollen, können mit der Option  irc.server_default.capabilities gesetzt werden (oder individuell für jeden Server mit der Option irc.server.xxx.capabilities).

 Beispiele:
   /cap
@@ -376,9 +376,9 @@ reason: Grund der Abmeldung
 * `+links+`: alle Servernamen auflisten die dem antwortenden Server bekannt sind

 ----
-/links  [[<server>] <server_mask>]
+/links  [[<target>] <server_mask>]

-     server: dieser Server soll die Anfrage beantworten
+     target: dieser Remote-Server soll die Anfrage beantworten
 server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
 ----

@@ -386,11 +386,12 @@ server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
 * `+list+`: Channels mit ihrem Thema auflisten

 ----
-/list  [<channel>[,<channel>...]] [<server>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]

-channel: aufzulistender Channel
- server: Servername
+ server: an diesen Server senden (interner Name)
 regexp: erweiterter regulärer POSIX Ausdruck, der auf die Ausgabe angewendet werden soll (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
+channel: aufzulistender Channel
+ target: Servername

 Beispiele:
  listet alle Channels des Servers auf (dies kann bei großen Netzwerken sehr lange dauern):
@@ -573,10 +574,10 @@ message: Abschiedsnachricht (wird anderen Usern angezeigt)
 * `+ping+`: sendet einen Ping an den Server

 ----
-/ping  <server1> [<server2>]
+/ping  <target1> [<target2>]

-server1: Server
-server2: Ping an diesen Server weiterleiten
+target1: Server
+target2: Ping an diesen Server weiterleiten
 ----

 [[command_irc_pong]]
@@ -719,19 +720,19 @@ reason: Grund der Abmeldung
 * `+server+`: auflisten, hinzufügen oder entfernen von IRC-Servern

 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
         deloutq|jump|raw

    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
 listfull: listet alle Server auf, mit detaillierten Informationen zu jedem einzelnen Server
     add: erstellt einen neuen Server
-  server: Servername, dient der internen Nutzung und zur Darstellung
-hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Verschiedene Ports können durch Kommata getrennt werden
+    name: Servername, dient der internen Nutzung und zur Darstellung; dieser Name wird genutzt um sich mit dem Server zu verbinden (/connect name) und um die entsprechenden Optionen anzupassen: irc.server.name.xxx
+hostname: Name oder IP-Adresse des Servers. Optional kann zusätzlich der Port festgelegt werden (Standard-Port: 6667). Mehrere Adressen können durch Kommata getrennt werden
   -temp: erstellt temporären Server (wird nicht gespeichert)
  option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
 nooption: stellt die Boolean Einstellung auf 'off' (Beispiel: -nossl)
@@ -791,9 +792,9 @@ service: Name des Service
 * `+squit+`: Verbindung zum Server trennen

 ----
-/squit  <server> <comment>
+/squit  <target> <comment>

- server: Name des Servers
+ target: Name des Servers
 comment: Kommentar
 ----

@@ -801,10 +802,10 @@ comment: Kommentar
 * `+stats+`: Serverstatistik abfragen

 ----
-/stats  [<query> [<server>]]
+/stats  [<query> [<target>]]

 query: c/h/i/k/l/m/o/y/u (siehe RFC1459)
-server: Name des Servers
+target: Name des Servers
 ----

 [[command_irc_summon]]
@@ -851,20 +852,22 @@ target: Servername
 * `+unban+`: Bann von Nicks oder Hosts aufheben

 ----
-/unban  [<channel>] <nick> [<nick>...]
+/unban  [<channel>] <nick>|<number> [<nick>|<number>...]

 channel: Name des Channel
   nick: Nick oder Host
+ number: ban Nummer (wird beim Befehl /ban angezeigt)
 ----

 [[command_irc_unquiet]]
 * `+unquiet+`: Nicks oder Hosts das Wort erteilen

 ----
-/unquiet  [<channel>] <nick> [<nick>...]
+/unquiet  [<channel>] <nick>|<number> [<nick>|<number>...]

 channel: Name des Channel
   nick: Nick oder Host
+ number: Quiet-Nummer (wird beim Befehl /quiet angezeigt)
 ----

 [[command_irc_userhost]]
@@ -889,9 +892,9 @@ target: Servername
 * `+version+`: Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder angegebenen Nick/Server)

 ----
-/version  [<server>|<nick>]
+/version  [<target>|<nick>]

-server: Servername
+target: Servername
  nick: Nickname
 ----

@@ -938,12 +941,12 @@ mask: nur Information über betreffende Nicknamen abfragen
 * `+whois+`: Information über User abfragen

 ----
-/whois  [<server>] [<nick>[,<nick>...]]
+/whois  [<target>] [<nick>[,<nick>...]]

-server: Name des Servers (interner Servername)
+target: Name des Servers (interner Servername)
  nick: Nick, welcher abgefragt werden soll (es kann auch eine Maske genutzt werden)

-Ohne Angabe von Argumenten, nutzt /whois folgende Nicks:
+Ohne Angabe von Argumenten, nutzt /whois folgende Regel:
 - den eigenen Nick, falls es sich um einen Server/Channel Buffer handelt
 - den Nick des Gesprächspartners, falls es sich um einen privaten Buffer handelt.

@@ -32,6 +32,12 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen
 ** Standardwert: `+default+`

+* [[option_irc.color.message_chghost]] *irc.color.message_chghost*
+** Beschreibung: pass:none[Textfarbe in der chghost Nachrichten dargestellt werden]
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen
+** Standardwert: `+brown+`
+
 * [[option_irc.color.message_join]] *irc.color.message_join*
 ** Beschreibung: pass:none[Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt werden soll]
 ** Typ: Farbe
@@ -45,7 +51,7 @@
 ** Standardwert: `+red+`

 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** Beschreibung: pass:none[ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht näher bezeichnet) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt schwarz durch "darkgray" und schwarz auf blau durch "white,blue"; Tabelle der Standard-IRC-Farben von WeeChat (in Klammern der Farbname, wie er von WeeChat genutzt wird): 0=weiß (white), 1=schwarz (black), 2=blau (blue), 3=grün (green), 4=hellrot (lightred), 5=rot (red), 6=violett (magenta), 7=braun (brown), 8=gelb (yellow), 9= hell-grün (lightgreen), 10=türkis (cyan), 11=hell-türkis (lightcyan), 12=hellblau (lightblue), 13=hell-violett (lightmagenta), 14=grau (gray), 15=weiß (white)]
+** Beschreibung: pass:none[ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht näher bezeichnet) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt schwarz durch "darkgray" und schwarz auf blau durch "white,blue"; Tabelle der Standard-IRC-Farben von WeeChat (in Klammern der Farbname, wie er von WeeChat genutzt wird): 0=weiß (white), 1=schwarz (black), 2=blau (blue), 3=grün (green), 4=hellrot (lightred), 5=rot (red), 6=violett (magenta), 7=braun (brown), 8=gelb (yellow), 9= hell-grün (lightgreen), 10=türkis (cyan), 11=hell-türkis (lightcyan), 12=hellblau (lightblue), 13=hell-violett (lightmagenta), 14=dunkel-grau (darkgray), 15=grau (gray)]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"1,-1:darkgray"+`
@@ -368,6 +374,12 @@
 ** Werte: on, off
 ** Standardwert: `+on+`

+* [[option_irc.look.smart_filter_chghost]] *irc.look.smart_filter_chghost*
+** Beschreibung: pass:none[aktiviert einen intelligenten Filter für "chghost" Nachrichten]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+on+`
+
 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
 ** Beschreibung: pass:none[Verzögerung, in Minuten, für eine Filterung von join/part/quit Mitteilungen. Falls ein Nick in der angegebenen Zeit keine Nachricht schreibt, wird seinejoin/part/quit Mitteilung gefiltert]
 ** Typ: integer
@@ -11,16 +11,16 @@
         flush
         disable

-   list: zeigt den Status der Protokollierung aller geöffneten Buffer an
+   list: zeigt von allen geöffneten Buffern den Status der Protokollierung an
    set: legt den Level fest, nach dem der aktuelle Buffer protokolliert werden soll
  level: legt fest, welche Nachrichten protokolliert werden sollen (0 = nichts protokollieren, 1 = nur die wichtigsten Nachrichten protokollieren .. 9 = alle Nachrichten werden protokolliert)
  flush: sichert alle Protokolle umgehend
-disable: die Protokollierung wird für den aktuellen Buffer ausgeschaltet (der Level wird auf 0 gestellt)
+disable: die Protokollierung wird für den aktuellen Buffer deaktiviert (der Level wird auf 0 gestellt)

 Die Einstellungen "logger.level.*" und "logger.mask.*" können genutzt werden um den Level der Protokollierung festzulegen und um eine Maske für einen oder mehrere Buffer zu definieren.

 Level der Protokollierung, die die IRC Erweiterung unterstützt:
-  1: Nachrichten von Usern, private Nachrichten und Bemerkungen
+  1: Nachrichten von Usern (private und öffentliche Nachrichten) , notice (Server und Channel)
  2: Wechsel von Nicks (/nick)
  3: Nachrichten vom Server
  4: join/part/quit Nachrichten
@@ -34,7 +34,7 @@ protocol.name: Protokoll und Name relay:
                 - Protokoll "weechat" (es wird kein Name verwendet)

 Das "irc" Protokoll dient dazu eine Verbindung zu einem anderen IRC Client (oder zu einem zweiten WeeChat) herzustellen.
-Das "weechat" Protokoll wird von einem Remote-Interface genutzt um eine Verbindung herzustellen. Siehe https://weechat.org/download/
+Das "weechat" Protokoll wird von einem Remote-Interface genutzt um eine Verbindung herzustellen. Siehe https://weechat.org/about/interfaces

 Ohne Angabe von Argumenten werden alle Relay-Clients in einem neuen Buffer dargestellt.

@@ -22,7 +22,7 @@

       list: zeigt eine Liste aller Trigger (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
   listfull: zeigt eine detaillierte Liste, mit zusätzlichen Informationen, aller Trigger an
-listdefault: zeigt die standardmäßig genutzen Trigger an
+listdefault: zeigt die standardmäßig genutzten Trigger an
        add: fügt einen Trigger hinzu
     addoff: fügt einen Trigger hinzu (deaktiviert)
 addreplace: fügt oder ersetzt einen schon existierenden Trigger
@@ -32,6 +32,7 @@ listdefault: zeigt die standardmäßig genutzen Trigger an
             signal: Name(en) des signals (erforderlich)
             hsignal: Name(en) des hsignal (erforderlich)
             modifier: Name(en) des modifier (erforderlich)
+             line: Buffertyp ("formatted", "free" oder "*"), Liste von Buffermasken, Tags
             print: buffer, tags, message, strip colors
             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung
             command_run: Befehl(e) (erforderlich)
@@ -67,9 +68,9 @@ post_action: Aktion welche nach der Abarbeitung des Triggers ausgeführt werden

 Wenn ein Trigger-Callback aufgerufen wird, dann wird folgende Befehlskette ausgeführt:
  1. Überprüfung von Bedingungen; falls unwahr, beenden
-  2. ersetze Text mittels erweitertem regulärer POSIX Ausdruck (sofern im Trigger definiert)
+  2. ersetze Text mittels einem oder mehreren erweiterten regulären POSIX Ausdrücken (sofern im Trigger definiert)
  3. ein oder mehrere Befehle werden ausgeführt (sofern im Trigger definiert)
-  4. Beendigung mit einem Rückgabewert (ausgenommen sind modifiers und focus)
+  4. Beendigung mit einem Rückgabewert (ausgenommen sind modifiers, line und focus)
  5. Aktion welche nach der Abarbeitung des Triggers ausgeführt werden soll

 Beispiele (die standardmäßig, eingebauten Trigger kann man sich mit "/trigger listdefault" anzeigen lassen):
@@ -74,14 +74,14 @@ Beispiele:
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
         renumber [<number1> [<number2> [<start>]]]
-         close [<n1>[-<n2>]|<name>]
+         close [<n1>[-<n2>]|<name>...]
         notify <level>
-         localvar
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -92,14 +92,14 @@ Beispiele:
    move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1); "-" = auf erste Position verschieben, "+" = auf letzte Position + 1 verschieben
    swap: tauscht zwei Buffer miteinander aus (bei Angabe von nur einem Buffer (Buffernummer/-name), wird der aktuelle Buffer mit dem angegebenen Buffer getauscht)
   cycle: springt in einer Schleife von einem Buffer zum nächsten, die in einer Liste angegeben werden
-   merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht eine Zusammenfügung von zwei Buffer
-         (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden)
+   merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer werden zwei Buffer zusammengefügt
+         (Bei der Standardtastenbelegung wird mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet)
 unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen
    hide: versteckt einen Buffer
  unhide: macht Buffer wieder sichtbar
 renumber: Buffer werden um nummeriert (Einstellung weechat.look.buffer_auto_renumber muss deaktiviert sein)
   close: Buffer schließen (Nummer oder Bereich ist optional)
-  notify: setzt den Status der Benachrichtigung für den aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung:
+  notify: setzt den Status der Benachrichtigung für den aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung und ob der Buffer in der Hotlist angezeigt wird:
            none: keine Benachrichtigung
       highlight: Benachrichtigung bei hervorgehobenen Nachrichten (Highlights)
         message: Benachrichtigung bei Nachrichten von Usern + Highlights
@@ -129,15 +129,17 @@ Beispiele:
    /buffer cycle #chan1 #chan2 #chan3
  verbindet Buffer mit dem Core-Buffer:
    /buffer merge 1
+  verbindet Buffer mit #weechat buffer:
+    /buffer merge #weechat
  trennt Buffer voneinander:
    /buffer unmerge
  schließt aktuellen Buffer:
    /buffer close
  schließt Buffer 5 bis 7:
    /buffer close 5-7
-  wechselt zum Buffer: #weechat:
+  springt zum Buffer: #weechat:
    /buffer #weechat
-  wechselt zum nächsten Buffer:
+  springt zum nächsten Buffer:
    /buffer +1
  springt zum letzten Buffer:
    /buffer +
@@ -280,7 +282,7 @@ expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${vari
                !*  stimmt mit Maske NICHT überein (Platzhalter "*" ist erlaubt)

 Ein Ausdruck gilt als "wahr" sofern das Ergebnis weder NULL, nicht leer und von "0" abweichend ist.
-Für einen Vergleich werden Fließkommazahlen genutzt sofern es sich bei beiden Ausdrücken um gültige Nummer handelt, die folgendes Format haben müssen:
+Für einen Vergleich werden Fließkommazahlen genutzt sofern es sich bei beiden Ausdrücken um gültige Nummer handelt, folgende Formate werden unterstützt:
  - Integer (Beispiele: 5, -7)
  - Fließkommazahl (Beispiele: 5.2, -7.5, 2.83e-2)
  - hexadezimale Zahl (Beispiele: 0xA3, -0xA3)
@@ -288,20 +290,22 @@ Um einen Vergleich zwischen zwei Zeichenketten zu erzwingen, müssen die Ausdrü
  50 > 100      ==> 0
  "50" > "100"  ==> 1

-Einige Variablen werden im Ausdruck, mittels der Formatierung ${Variable}, ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität:
+Einige Variablen werden im Ausdruck, mittels der Formatierung ${variable}, ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität:
  1. eine evaluierte Teilzeichenkette (Format: "eval:xxx")
  2. eine Zeichenkette mit Escapesequenzen (Format: "esc:xxx" oder "\xxx")
  3. Zeichen welche in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
  4. eine Zeichenkette mit einer maximalen Anzahl an Zeichen (Format: "cut:+Max,Suffix,Zeichenkette")
     oder maximale Anzahl an Zeichen die auf dem Bildschirm angezeigt werden sollen (Format: "cutscr:Max,Suffix,Zeichenkette oder "cutscr:+Max,Suffix,Zeichenkette")
-  5. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")\n
-  6. eine Info (Format: "info:Name,Argumente", Argumente sind optional)
-  7. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
-  8. eine Umgebungsvariable (Format: "env:XXX")
-  9. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
-  10. eine Option (Format: "file.section.option")
-  11. der Name einer lokalen Variablen eines Buffer
-  12. ein hdata Name/Variable (der Wert wird automatisch in eine Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
+  5. Ende einer Zeichenkette nutzen (Format: "rev:xxx")
+  6. Wiederholung einer Zeichenkette  (Format: "repeat:Anzahl,Zeichenkette")
+  7. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")
+  8. eine Info (Format: "info:Name,Argumente", Argumente sind optional)
+  9. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
+  10. eine Umgebungsvariable (Format: "env:XXX")
+  11. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
+  12. eine Option (Format: "file.section.option")
+  13. der Name einer lokalen Variablen eines Buffer
+  14. ein hdata Name/Variable (der Wert wird automatisch in eine Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
 Das Format für hdata kann wie folgt aufgebaut sein:
  hdata.var1.var2...: startet mit hdata (der Pointer muss bekannt sein) und fragt eine Variable nach der anderen ab (weitere hdata können folgen)
  hdata[list].var1.var2...: startet hdata mittels einer Liste, zum Beispiel:
@@ -315,6 +319,7 @@ Beispiele (einfache Zeichenketten):
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
+  /eval -n ${sec.data.freenode_password}         ==> geheim
  /eval -n ${window}                             ==> 0x2549aa0
  /eval -n ${window.buffer}                      ==> 0x2549320
  /eval -n ${window.buffer.full_name}            ==> core.weechat
@@ -325,6 +330,8 @@ Beispiele (einfache Zeichenketten):
  /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
+  /eval -n ${rev:Hello}                          ==> olleH
+  /eval -n ${repeat:5,-}                         ==> -----

 Beispiele (Bedingungen):
  /eval -n -c ${window.buffer.number} > 2  ==> 0
@@ -372,7 +379,7 @@ disable: Filter deaktivieren
         - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht
         - reguläre Ausdrücke unterscheiden nicht zwischen Groß- und Kleinschreibung. Um zwischen Groß- und Kleinschreibung zu unterscheiden müssen diese mit "(?-i)" eingeleitet werden.

-Mit der Tastenvoreinstellung alt+'=' kann die Filterfunktion (de-)aktiviert werden.
+Mit der Tastenvoreinstellung alt+'=' kann die globale Filterfunktion (de-)aktiviert werden und alt+'-' (de-)aktiviert die Filterfunktion für den aktuellen Buffer.

 Die am häufigsten gebrauchten Schlagwörter lauten:
  no_filter, no_highlight, no_log, log0..log9 (log Level),
@@ -435,7 +435,7 @@
 ** Standardwert: `+"[]`_-^"+`

 * [[option_weechat.completion.partial_completion_alert]] *weechat.completion.partial_completion_alert*
-** Beschreibung: pass:none[informiert User wenn eine teilweise Vervollständigung auftritt]
+** Beschreibung: pass:none[erzeugt eine Mitteilung (BEL) wenn eine teilweise Vervollständigung auftritt]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+on+`
@@ -729,10 +729,10 @@
 ** Standardwert: `+""+`

 * [[option_weechat.look.hotlist_add_conditions]] *weechat.look.hotlist_add_conditions*
-** Beschreibung: pass:none[Bedingungen um einen Buffer in die Hotlist einzutragen (sofern der Notify-Level für den Buffer korrekt ist); es können folgende Bedingungen genutzt werden: "window" (zur Zeit genutzter Window-Pointer), "buffer" (Buffer-Pointer welcher zur Hotlist hinzugefügt werden soll), "priority" (0 = niedrig, 1 = Nachricht, 2 = Privat, 3 = Highlight); standardmäßig wird ein Buffer in die Hotlist eingetragen falls man abwesend sein sollte oder falls der Buffer nicht auf dem Bildschirm sichtbar ist (Buffer wird nicht in einem Fenster dargestellt)]
+** Beschreibung: pass:none[Bedingungen um einen Buffer in die Hotlist einzutragen (sofern der Notify-Level für den Buffer korrekt ist); es können folgende Bedingungen genutzt werden: "window" (zur Zeit genutzter Window-Pointer), "buffer" (Buffer-Pointer welcher zur Hotlist hinzugefügt werden soll), "priority" (0 = niedrig, 1 = Nachricht, 2 = Privat, 3 = Highlight); Standardmäßig wird ein Buffer in die Hotlist eingetragen falls man abwesend sein sollte oder falls der Buffer nicht auf dem Bildschirm angezeigt wird (Buffer wird nicht in einem Fenster dargestellt) oder falls mindestens ein relay client mit dem weechat Protokoll verbunden ist]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
-** Standardwert: `+"${away} || ${buffer.num_displayed} == 0"+`
+** Standardwert: `+"${away} || ${buffer.num_displayed} == 0 || ${info:relay_client_count,weechat,connected} > 0"+`

 * [[option_weechat.look.hotlist_buffer_separator]] *weechat.look.hotlist_buffer_separator*
 ** Beschreibung: pass:none[Zeichen welches zum Trennen zwischen den verschiedenen Buffern in der Hotlist genutzt werden soll]
@@ -741,7 +741,7 @@
 ** Standardwert: `+", "+`

 * [[option_weechat.look.hotlist_count_max]] *weechat.look.hotlist_count_max*
-** Beschreibung: pass:none[maximale Anzahl an Nachrichten für den Nachrichtenzähler in der Hotlist, für jeden Buffer (0 = der Nachrichtenzähler wird nicht dargestellt, siehe weechat.look.buffer_notify_default)]
+** Beschreibung: pass:none[maximale Anzahl an Nachrichtenzähler in der Hotlist, für einen Buffer: 0 = der Nachrichtenzähler wird nicht dargestellt,  nächst höhere Zahl = zeigt maximal <N> Nachrichtenzähler an (von höchster zu niedrigster Priorität)]
 ** Typ: integer
 ** Werte: 0 .. 4
 ** Standardwert: `+2+`
@@ -1179,10 +1179,10 @@
 ** Standardwert: `+on+`

 * [[option_weechat.look.window_title]] *weechat.look.window_title*
-** Beschreibung: pass:none[Fenstertitel setzen (Terminal in dem Curses GUI läuft), wird beim Programmstart gesetzt; ein leerer Eintrag belässt den original Fenstertitel (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[Fenstertitel für Fenster (Terminal in dem Curses GUI läuft), wird beim Programmstart gesetzt; ein leerer Eintrag belässt den original Fenstertitel (Hinweis: Inhalt wird evaluiert, siehe /help eval); Beispiel: "WeeChat ${info:version}"]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
-** Standardwert: `+"WeeChat ${info:version}"+`
+** Standardwert: `+""+`

 * [[option_weechat.look.word_chars_highlight]] *weechat.look.word_chars_highlight*
 ** Beschreibung: pass:none[durch Kommata getrennte Liste von Zeichen (oder eine Auswahl von Zeichen) bei denen bei einem Highlight keine Worttrennung erfolgt; jeder Eintrag kann ein einzelnes Zeichen oder eine Auswahl von Zeichen sein (Format: a-z), eine Auswahl von Breitzeichen (wide character; zum Beispiel "alnum", siehe man wctype); beginnt das Item mit einem "!" wird die Auswahl umgekehrt (bedeutet, das Zeichen ist NICHT Bestandteil eines Wortes); das Zeichen "*" wird als Platzhalter verwendet; Unicode Zeichen müssen folgendes Format nutzen \u1234, zum Beispiel \u00A0 für geschütztes Leerzeichen (siehe /help print für unterstützte Formate)]
@@ -158,6 +158,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`

+* [[option_xfer.network.send_ack]] *xfer.network.send_ack*
+** Beschreibung: pass:none[sendet ACK-Nachrichten wenn Dateien empfangen wurden; wenn deaktiviert kann der Transfer einfrieren, wenn der Absender auf eine ACK-Nachrichtet wartet (zum Beispiel wenn WeeChat eine Datei sendet und die Option xfer.network.fast_send aktiviert ist); andererseits kann die Deaktivierung ein Einfrieren verhindern da die ACK-Nachricht nicht umgehend an den Sender verschickt wird]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+on+`
+
 * [[option_xfer.network.speed_limit]] *xfer.network.speed_limit*
 ** Beschreibung: pass:none[Begrenzt die Übertragungsgeschwindigkeit beim Versenden, in Kilobytes pro Sekunde (0 = keine Begrenzung)]
 ** Typ: integer
@@ -24,9 +24,13 @@
 *-p*, *--no-plugin*::
    unterbindet das Laden der Erweiterungen beim Programmstart.

+*-P*, *--plugins* _<plugins>_::
+    lädt nur die angegebenen Erweiterungen, beim Start (siehe /help weechat.plugin.autoload).
+    Wenn diese Option genutzt wird, dann wird die Option weechat.plugin.autoload ignoriert.
+
 *-r*, *--run-command* _<command>_::
-    führt einen oder mehrere Befehle aus, nachdem WeeChat gestartet wurde
-    (mehrere Befehle müssen durch Kommata voneinander getrennt werden).
+    führt einen oder mehrere Befehle nach dem Start aus; mehrere Befehle können durch ein
+    Semikolon getrennt werden, diese Option kann mehrfach genutzt werden.

 *-s*, *--no-script*::
    Skripten werden beim Programmstart nicht geladen.
@@ -0,0 +1,13 @@
+WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung
+findet man in der AUTHORS.adoc Datei).
+
+Copyright (C) 2003-2018 {author}
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Please read the COPYING file for more information.
+
+Web: https://weechat.org/
@@ -0,0 +1,74 @@
+$HOME/.weechat/weechat.conf::
+    WeeChats Konfigurationsdatei
+
+$HOME/.weechat/plugins.conf::
+    Konfigurationsdatei für Erweiterungen
+
+$HOME/.weechat/sec.conf::
+    Konfigurationsdatei mit schutzwürdigen Daten
+
+$HOME/.weechat/alias.conf::
+    Konfigurationsdatei für _alias_ Erweiterung
+
+$HOME/.weechat/aspell.conf::
+    Konfigurationsdatei für _aspell_ Erweiterung
+
+$HOME/.weechat/buflist.conf::
+    Konfigurationsdatei für _buflist_ Erweiterung
+
+$HOME/.weechat/charset.conf::
+    Konfigurationsdatei für _charset_ Erweiterung
+
+$HOME/.weechat/exec.conf::
+    Konfigurationsdatei für _exec_ Erweiterung
+
+$HOME/.weechat/fifo.conf::
+    Konfigurationsdatei für _fifo_ Erweiterung
+
+$HOME/.weechat/fset.conf::
+    Konfigurationsdatei für _fset_ Erweiterung
+
+$HOME/.weechat/guile.conf::
+    Konfigurationsdatei für _guile_ Erweiterung
+
+$HOME/.weechat/irc.conf::
+    Konfigurationsdatei für _irc_ Erweiterung
+
+$HOME/.weechat/javascript.conf::
+    Konfigurationsdatei für _javascript_ Erweiterung
+
+$HOME/.weechat/logger.conf::
+    Konfigurationsdatei für _logger_ Erweiterung
+
+$HOME/.weechat/lua.conf::
+    Konfigurationsdatei für _lua_ Erweiterung
+
+$HOME/.weechat/perl.conf::
+    Konfigurationsdatei für _perl_ Erweiterung
+
+$HOME/.weechat/php.conf::
+    Konfigurationsdatei für _php_ Erweiterung
+
+$HOME/.weechat/python.conf::
+    Konfigurationsdatei für _python_ Erweiterung
+
+$HOME/.weechat/relay.conf::
+    Konfigurationsdatei für _relay_ Erweiterung
+
+$HOME/.weechat/ruby.conf::
+    Konfigurationsdatei für _ruby_ Erweiterung
+
+$HOME/.weechat/script.conf::
+    Konfigurationsdatei für _script_ Erweiterung
+
+$HOME/.weechat/tcl.conf::
+    Konfigurationsdatei für _tcl_ Erweiterung
+
+$HOME/.weechat/trigger.conf::
+    Konfigurationsdatei für _trigger_ Erweiterung
+
+$HOME/.weechat/xfer.conf::
+    Konfigurationsdatei für _xfer_ Erweiterung
+
+$HOME/.weechat/weechat.log::
+    WeeChat Protokolldatei
@@ -0,0 +1,15 @@
+Um eine vollständige Dokumentation der Optionen zu erhalten, siehe
+https://weechat.org/doc[WeeChat user's guide].
+
+Mittels der IRC Erweiterung kann man sich zu einen temporären Server verbinden lassen,
+indem man eine URL verwendet:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+Um dem WeeChat IRC Support-Channel, mit dem Nick "mynick", beizutreten:
+
+    irc://mynick@chat.freenode.net/#weechat
+
+Um eine IPv6 Adresse zu nutzen, muss diese in eckige Klammern gesetzt werden:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
@@ -0,0 +1,60 @@
+= weechat-headless(1)
+:doctype: manpage
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: de
+:man manual: WeeChat Manual
+:man source: WeeChat {revnumber}
+
+== NAME
+
+weechat-headless - der erweiterbare Chat Client (headless version)
+
+== SYNOPSIS
+
+[verse]
+*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat-headless* [-c|--colors]
+*weechat-headless* [-h|--help]
+*weechat-headless* [-l|--license]
+*weechat-headless* [-v|--version]
+
+== BESCHREIBUNG
+
+WeeChat (Wee Enhanced Environment for Chat) ist ein freier, schneller und
+schlanker Chat-Client der für unterschiedliche Betriebssysteme entwickelt wird.
+Durch Skripten ist das Hauptprogramm äußerst flexibel und erweiterbar.
+
+Mit dem Befehl *weechat-headless* kann man WeeChat ohne Benutzeroberfläche ausführen.
+Dies kann zu Testzwecken oder dazu genutzt werden um WeeChat in einem Deamon-Modus
+zu starten. Dazu nutzt man die Option "--daemon".
+
+== OPTIONEN
+
+include::cmdline_options.de.adoc[]
+
+== OPTIONEN von ERWEITERUNGEN
+
+include::man_plugin_options.de.adoc[]
+
+== DATEIEN
+
+include::man_files.de.adoc[]
+
+== SIEHE AUCH
+
+*weechat*(1)
+
+== AUTOREN
+
+Diese manpage wurde von {author} geschrieben.
+
+Übersetzt von Nils Görs.
+
+== COPYRIGHT
+
+include::man_copyright.de.adoc[]
+
+== SUPPORT / FEHLER MELDEN
+
+für Hilfe oder um einen Fehler zu melden: https://weechat.org/about/support
@@ -13,122 +13,33 @@ weechat - der erweiterbare Chat Client
 == SYNOPSIS

 [verse]
-*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
 *weechat* [-c|--colors]
 *weechat* [-h|--help]
 *weechat* [-l|--license]
 *weechat* [-v|--version]

-*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
-
 == BESCHREIBUNG

 WeeChat (Wee Enhanced Environment for Chat) ist ein freier, schneller und
 schlanker Chat-Client der für unterschiedliche Betriebssysteme entwickelt wird.
 Durch Skripten ist das Hauptprogramm äußerst flexibel und erweiterbar.

-Mit dem Befehl *weechat-headless* kann man WeeChat ohne Benutzeroberfläche ausführen.
-Dies kann zu Testzwecken oder dazu genutzt werden um WeeChat in einem Deamon-Modus
-zu starten. Dazu nutzt man die Option "--daemon".
-
 == OPTIONEN

 include::cmdline_options.de.adoc[]

 == OPTIONEN von ERWEITERUNGEN

-Um eine vollständige Dokumentation der Optionen zu erhalten, siehe
-https://weechat.org/doc[WeeChat user's guide].
-
-Mittels der IRC Erweiterung kann man sich zu einen temporären Server verbinden lassen,
-indem man eine URL verwendet:
-
-    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
-
-Um dem WeeChat IRC Support-Channel, mit dem Nick "mynick", beizutreten:
-
-    irc://mynick@chat.freenode.net/#weechat
-
-Um eine IPv6 Adresse zu nutzen, muss diese in eckige Klammern gesetzt werden:
-
-    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+include::man_plugin_options.de.adoc[]

 == DATEIEN

-$HOME/.weechat/weechat.conf::
-    WeeChats Konfigurationsdatei
+include::man_files.de.adoc[]

-$HOME/.weechat/plugins.conf::
-    Konfigurationsdatei für Erweiterungen
+== SIEHE AUCH

-$HOME/.weechat/sec.conf::
-    Konfigurationsdatei mit schutzwürdigen Daten
-
-$HOME/.weechat/alias.conf::
-    Konfigurationsdatei für _alias_ Erweiterung
-
-$HOME/.weechat/aspell.conf::
-    Konfigurationsdatei für _aspell_ Erweiterung
-
-$HOME/.weechat/buflist.conf::
-    Konfigurationsdatei für _buflist_ Erweiterung
-
-$HOME/.weechat/charset.conf::
-    Konfigurationsdatei für _charset_ Erweiterung
-
-$HOME/.weechat/exec.conf::
-    Konfigurationsdatei für _exec_ Erweiterung
-
-$HOME/.weechat/fifo.conf::
-    Konfigurationsdatei für _fifo_ Erweiterung
-
-$HOME/.weechat/fset.conf::
-    Konfigurationsdatei für _fset_ Erweiterung
-
-$HOME/.weechat/guile.conf::
-    Konfigurationsdatei für _guile_ Erweiterung
-
-$HOME/.weechat/irc.conf::
-    Konfigurationsdatei für _irc_ Erweiterung
-
-$HOME/.weechat/javascript.conf::
-    Konfigurationsdatei für _javascript_ Erweiterung
-
-$HOME/.weechat/logger.conf::
-    Konfigurationsdatei für _logger_ Erweiterung
-
-$HOME/.weechat/lua.conf::
-    Konfigurationsdatei für _lua_ Erweiterung
-
-$HOME/.weechat/perl.conf::
-    Konfigurationsdatei für _perl_ Erweiterung
-
-$HOME/.weechat/php.conf::
-    Konfigurationsdatei für _php_ Erweiterung
-
-$HOME/.weechat/python.conf::
-    Konfigurationsdatei für _python_ Erweiterung
-
-$HOME/.weechat/relay.conf::
-    Konfigurationsdatei für _relay_ Erweiterung
-
-$HOME/.weechat/ruby.conf::
-    Konfigurationsdatei für _ruby_ Erweiterung
-
-$HOME/.weechat/script.conf::
-    Konfigurationsdatei für _script_ Erweiterung
-
-$HOME/.weechat/tcl.conf::
-    Konfigurationsdatei für _tcl_ Erweiterung
-
-$HOME/.weechat/trigger.conf::
-    Konfigurationsdatei für _trigger_ Erweiterung
-
-$HOME/.weechat/xfer.conf::
-    Konfigurationsdatei für _xfer_ Erweiterung
-
-$HOME/.weechat/weechat.log::
-    WeeChat Protokolldatei
+*weechat-headless*(1)

 == AUTOREN

@@ -138,20 +49,8 @@ Diese manpage wurde von {author} geschrieben.

 == COPYRIGHT

-WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung
-findet man in der AUTHORS.adoc Datei).
-
-Copyright (C) 2003-2018 {author}
-
-WeeChat is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Please read the COPYING file for more information.
-
-Web: https://weechat.org/
+include::man_copyright.de.adoc[]

 == SUPPORT / FEHLER MELDEN

-für Hilfe oder um einen Fehler zu melden: https://weechat.org/dev/support
+für Hilfe oder um einen Fehler zu melden: https://weechat.org/about/support
@@ -47,8 +47,8 @@ https://weechat.org/about/features
 [[gui]]
 === Ich habe gehört es gibt verschiedene GUIs für WeeChat. Wie kann ich diese kompilieren bzw. nutzen?

-Die verschiedenen grafischen Oberflächen findet man auf folgender Seite:
-https://weechat.org/about/features
+Es sind einige Remote-Oberflächen verfügbar. Diese findet man auf der Homepage:
+https://weechat.org/about/interfaces

 [[compile_git]]
 === Ich kann WeeChat nach Cloning des git Repository nicht kompilieren - weshalb?
@@ -162,13 +162,14 @@ Falls nötig korrigiere den Wert Deiner Variablen TERM: `export TERM="xxx"`.
 === Wenn ich Weechat mit screen/tmux nutze habe ich merkwürdige Zeichen, wie kann ich dies beheben?

 Dies kann durch einen falschen Wert in der TERM-Umgebungsvariable Deiner Shell hervorgerufen
-werden. Bitte überprüfe die Ausgabe von `echo $TERM` in Deinem Terminal (*außerhalb von screen/tmux*).
-
-Als Beispiel, _xterm-color_ könnte solche merkwürdigen Zeichen produzieren.
-Nutzte stattdessen lieber _xterm_.
-
+werden. Bitte überprüfe die Ausgabe von `echo $TERM` in Deinem Terminal (*außerhalb von screen/tmux*). +
+Als Beispiel, _xterm-color_ kann solche merkwürdigen Zeichen produzieren.
+Nutzte stattdessen lieber _xterm_. +
 Falls notwendig korrigiere den Wert Deiner TERM-Variable: `export TERM="xxx"`.

+Wird das gnome-terminal genutzt sollte unter Bearbeiten/Profileinstellungen/Kompatibilität
+die Option "Zeichen mit unbekannter Breite" auf `schmal` stehen.
+
 [[osx_display_broken]]
 === Ich habe WeeChat unter OS X kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief?

@@ -542,6 +543,13 @@ Es kann auch eine neue Taste eingebunden werden um zu einem Buffer zu wechseln:
 Eine Auflistung der Standardtastenbelegung findet man in
 link:weechat_user.de.html#key_bindings[Benutzeranleitung / Tastenbelegungen].

+Um zu Buffern zu wechseln die an Position ≥ 100 sind kann ein Trigger definiert
+werden um dann z.B. mit einem Kurzbefehl `/123` zum Buffer #123 zu springen:
+
+----
+/trigger add numberjump modifier "2000|input_text_for_buffer" "${tg_string} =~ ^/[0-9]+$" "=\/([0-9]+)=/buffer *${re:1}=" "" "" "none"
+----
+
 [[global_history]]
 === Wie kann ich den globalen Verlaufsspeicher (anstelle des Buffer eigenen) mit den Up-/Down-Tasten nutzen?

@@ -920,6 +928,15 @@ $ cd ~/.weechat/script
 $ curl -O https://weechat.org/files/plugins.xml.gz
 ----

+[[aspell_dictionaries]]
+=== Ich habe aspell Wörterbücher auf mein System installiert. Wie kann ich diese nutzen, ohne WeeChat neu starten zu müssen?
+
+Du braucht lediglich die aspell Erweiterung neu zu laden:
+
+----
+/plugin reload aspell
+----
+
 [[settings]]
 == Einstellungen

@@ -1039,7 +1056,7 @@ für weitere Informationen über Konfigurationsdateien.
 [[bug_task_patch]]
 === Was kann ich machen falls ich einen Fehler gefunden habe, mich nach neuen Funktionen erkundigen, oder Patches einsenden möchte?

-siehe: https://weechat.org/dev/support
+siehe: https://weechat.org/about/support

 [[gdb_error_threads]]
 === Wenn man WeeChat in gdb startet, kann ein Thread-Fehler auftreten. Was beudeutet das?
@@ -1076,10 +1093,10 @@ ist Hilfe gerne gesehen.
 Es gibt einiges zu tun z.B. testen, programmieren, Dokumentation, ...

 Bitte kontaktiere uns via IRC oder email, wirf einen Blick auf die Support-Seite:
-https://weechat.org/dev/support
+https://weechat.org/about/support

 [[donate]]
 === Kann ich Geld oder anderes an die WeeChat Entwickler spenden?

 Du kannst uns Geld zur Unterstützung der weiteren Entwicklung spenden.
-Details hierzu gibt es auf: https://weechat.org/about/donate
+Details hierzu gibt es auf: https://weechat.org/donate
@@ -12,7 +12,7 @@

 * Frank Zacharias <frank_zacharias@web.de>, 2006
 * Juergen Descher <jhdl@gmx.net>, 2009
-* Nils Görs <weechatter@arcor.de>, 2009-2016
+* Nils Görs <weechatter@arcor.de>, 2009-2018


 [[start]]
@@ -57,36 +57,6 @@ der Name der entsprechenden Option).
 WeeChat verwendet umgehend einen neu eingestellten Wert (WeeChat muss also zu *keinem* Zeitpunkt
 neu gestartet werden, nach dem die Konfiguration verändert wurde).

-Beim `/set` Befehl kann beim Optionnamen ein Platzhalter "*" zu Beginn oder am Ende
-der Zeichenkette verwendet werden um sich alle Optionen anzeigen zu lassen, die
-dem Suchmuster entsprechen.
-
-Zum Beispiel:
-
-zeigt alle Optionen an (WeeChat und Erweiterungen):
-
----
-/set
----
-
-zeigt alle WeeChat Optionen an:
-
----
-/set weechat.*
----
-
-zeigt alle Optionen der IRC-Erweiterung an:
-
----
-/set irc.*
----
-
-Du kannst dir mit dem Befehl `/help` eine Hilfe für Optionen anzeigen lassen, z.B.:
-
----
-/help weechat.look.highlight
----
-
 Beim Beenden von WeeChat werden alle Einstellungen gespeichert (mittels des
 Befehls `/save` kann das Sichern der Optionen manuell durchgeführt werden).

@@ -99,6 +69,35 @@ bevor man diese ggf. gesichert hat `/save`). +
 Aus diesen Gründen sollte immer der `/set` Befehl genutzt werden, da
 zusätzlich auch die Eingabe auf Plausibilität geprüft wird und Änderungen sofort wirksam werden.

+Hilfe ist für Optionen verfügbar:
+
+----
+/help config.section.option
+----
+
+Mit der _fset_ Erweiterung kann man sehr einfach Optionen finden und diese
+den eigenen Bedürfnissen anpassen.
+
+Um zum Beispiel alle WeeChat Optionen anzuzeigen:
+
+----
+/fset weechat.*
+----
+
+zeigt alle IRC Optionen an:
+
+----
+/fset irc.*
+----
+
+Der `/fset` Befehl hat eine teilweise Vervollständigung von Optionsnamen, wenn
+man also `/fset hot` eingibt und kbd:[Tab] drückt, wird die Eingabe durch
+`/fset hotlist` vervollständigt. Wenn man nun kbd:[Enter] drückt, werden alle
+hotlist Optionen angezeigt.
+
+Um weitere Informationen zum `/fset` Befehl und seine Tastenbefehle zu behalten,
+siehe `/help fset`.
+
 [[core_vs_plugins]]
 == Kern (Core) vs Erweiterungen

@@ -122,7 +121,11 @@ Um eine Verbindung zu einem IRC Server herzustellen wird der
 /server add freenode chat.freenode.net
 ----

-Falls man nicht mehr weiter weiß, einfach die Hilfe verwenden:
+In dieser Zeile ist `freenode` der interne Servername der von Weechat genutzt wird:
+Damit ist es möglich sich mit dem Server zu verbinden `/connect freenode` und um
+die Server relevanten Optionen anzupassen _irc.server.freenode.xxx_.
+
+Falls noch Fragen offen sein sollten, einfach die Hilfe verwenden:

 ----
 /help server
@@ -226,7 +229,7 @@ Vorgabewert zu nutzen, z.B. Nutzen der vorgegebenen Nicknamen
 (irc.server_default.nicks):

 ----
-/set irc.server.freenode.nicks null
+/unset irc.server.freenode.nicks
 ----

 Andere Optionen: Du kannst andere Optionen mit folgendem Befehl festlegen ("xxx"
@@ -245,16 +248,15 @@ ist der Optionsname):

 [NOTE]
 Dieser Befehl kann dazu benutzt werden um einen neuen Server zu erstellen und
-sich mit ihm zu verbinden, ohne den Befehl `/server` zu benutzen (muss ich
-erwähnen, dass Du die Hilfe zu diesem Befehl mit `/help connect` aufrufen
-kannst?).
+sich mit diesem zu verbinden, ohne den Befehl `/server` zu benutzen
+(siehe `/help connect`).

-Standardmäßig werden alle Server-Buffer und der Buffer des Kerns von WeeChat -der
-core-Buffer- zusammengelegt. Um zwischen dem core-Buffer und den Server-Buffern
+Alle Server-Buffer und der WeeChat Kernbuffer, der sogenannte -core-Buffer-, werden
+standardmäßig zusammengelegt. Um zwischen dem core-Buffer und den Server-Buffern
 zu wechseln, kannst Du kbd:[Ctrl+x] benutzen.

 Es ist möglich das automatische Zusammenlegen der Server-Buffer zu deaktivieren,
-um eigenständige Server-Buffer zu verwenden:
+um dadurch separate Server-Buffer zu erhalten:

 ----
 /set irc.look.server_buffer independent
@@ -327,8 +329,6 @@ Befehle, zum Verwalten von Buffern und Fenstern:
 /window
 ----

-(Ich muss nicht erwähnen, dass man mit /help einen Hilfstext zu dem Befehl erhält)
-
 Beispiel: Um den Bildschirm vertikal in ein kleineres Fenster (1/3 Bildschirmbreite)
 und ein größeres Fenster (2/3 Bildschirmbreite) aufzuteilen:

@@ -351,6 +351,7 @@ kurz erläutert:

 - kbd:[Alt+←] / kbd:[Alt+→] oder kbd:[F5] / kbd:[F6]: Wechsel zum
  vorherigen/nächsten Buffer
+- kbd:[F1] / kbd:[F2]: scrollt die Liste mit Buffern ("buflist")
 - kbd:[F7] / kbd:[F8]: Wechsel zum vorherigen/nächsten Fenster (falls der
  Bildschirm aufgeteilt ist)
 - kbd:[F9] / kbd:[F10]: scrollt die Titelleiste
@@ -443,6 +443,7 @@ Liste der Skript API Funktionen:
  string_has_highlight +
  string_has_highlight_regex +
  string_mask_to_regex +
+  string_format_size +
  string_remove_color +
  string_is_command_char +
  string_input_for_buffer +
@@ -529,6 +530,7 @@ Liste der Skript API Funktionen:
  hook_process +
  hook_process_hashtable +
  hook_connect +
+  hook_line +
  hook_print +
  hook_signal +
  hook_signal_send +
@@ -12,7 +12,7 @@

 Übersetzer:

-* Nils Görs <weechatter@arcor.de>, 2010-2016
+* Nils Görs <weechatter@arcor.de>, 2010-2018


 Diese Anleitung beschreibt den WeeChat Chat Client und ist Teil von WeeChat.
@@ -79,7 +79,7 @@ Binärpakete sind für folgende Distributionen erhältlich:

 zusätzliche Pakete können bzw. sollten installiert werden. Zum Beispiel: weechat-plugins.

-Für andere Distributionen schauen Sie bitte in die jeweilige Anleitung,
+Für nicht aufgeführte Distributionen schauen Sie bitte in die jeweilige Anleitung,
 wie man Pakete installiert.

 [[source_package]]
@@ -100,34 +100,34 @@ zu kompilieren und welche Pakete optional genutzt werden können.

 [width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Paket ^(1)^                 | Version       | benötigt | Funktion
+| Paket ^(1)^            | Version       | benötigt | Funktion
 | C compiler
-  (gcc, clang, ...)           |               | *ja*     | zum Erstellen der Binärdatei.
-| C++ compiler                |               |          | zum Erstellen der Binärdatei und um Test auszuführen, JavaScript Erweiterung.
-| cmake                       |               | *ja*     | zum kompilieren (autotools ist möglich. cmake wird aber empfohlen).
-| pkg-config                  |               | *ja*     | entdeckt installierte Bibliotheken.
-| libncursesw5-dev ^(2)^      |               | *ja*     | Ncurses Oberfläche.
-| libcurl4-gnutls-dev         |               | *ja*     | URL Transfer.
-| zlib1g-dev                  |               | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden.
-| libgcrypt20-dev             |               | *ja*     | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES), Skript-Erweiterung.
-| libgnutls28-dev             | ≥ 2.2.0 ^(3)^ |          | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE).
-| gettext                     |               |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
-| ca-certificates             |               |          | Zertifikate für SSL Verbindungen.
+  (gcc, clang, ...)      |               | *ja*     | zum Erstellen der Binärdatei.
+| C++ compiler           |               |          | zum Erstellen der Binärdatei und um Test auszuführen, JavaScript Erweiterung.
+| cmake                  |               | *ja*     | zum kompilieren (autotools ist möglich. cmake wird aber empfohlen).
+| pkg-config             |               | *ja*     | entdeckt installierte Bibliotheken.
+| libncursesw5-dev ^(2)^ |               | *ja*     | Ncurses Oberfläche.
+| libcurl4-gnutls-dev    |               | *ja*     | URL Transfer.
+| zlib1g-dev             |               | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden.
+| libgcrypt20-dev        |               | *ja*     | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES), Skript-Erweiterung.
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ |          | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung, IRC SASL Authentifikation (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
+| ca-certificates        |               |          | Zertifikate für SSL Verbindungen.
 | libaspell-dev
-  ∥ libenchant-dev            |               |          | Aspell Erweiterung.
-| python-dev                  | ≥ 2.6 ^(4)^   |          | Python Erweiterung.
-| libperl-dev                 |               |          | Perl Erweiterung.
-| ruby-2.3, ruby2.3-dev       | ≥ 1.8         |          | Ruby Erweiterung.
-| liblua5.3-dev               |               |          | Lua Erweiterung.
-| tcl-dev                     | ≥ 8.5         |          | Tcl Erweiterung.
-| guile-2.0-dev               | ≥ 2.0         |          | Guile (scheme) Erweiterung.
-| libv8-dev                   | ≤ 3.24.3      |          | JavaScript Erweiterung.
-| php7.2-dev, libphp7.2-embed | ≥ 7.0         |          | PHP Erweiterung.
-| libxml2-dev                 |               |          | PHP Erweiterung.
-| libargon2-0-dev             |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
-| libsodium-dev               |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
-| asciidoctor                 | ≥ 1.5.4       |          | zum Erstellen der man page und der Dokumentation.
-| libcpputest-dev             | ≥ 3.4         |          | zum Erstellen und um Test auszuführen.
+  ∥ libenchant-dev       |               |          | Aspell Erweiterung.
+| python-dev             | ≥ 2.6 ^(4)^   |          | Python Erweiterung.
+| libperl-dev            |               |          | Perl Erweiterung.
+| ruby2.5, ruby2.5-dev   | ≥ 1.8         |          | Ruby Erweiterung.
+| liblua5.3-dev          |               |          | Lua Erweiterung.
+| tcl-dev                | ≥ 8.5         |          | Tcl Erweiterung.
+| guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) Erweiterung.
+| libv8-dev              | ≤ 3.24.3      |          | JavaScript Erweiterung.
+| php-dev, libphp-embed  | ≥ 7.0         |          | PHP Erweiterung.
+| libxml2-dev            |               |          | PHP Erweiterung.
+| libargon2-0-dev        |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
+| libsodium-dev          |               |          | PHP Erweiterung (wenn PHP ≥ 7.2).
+| asciidoctor            | ≥ 1.5.4       |          | zum Erstellen der man page und der Dokumentation.
+| libcpputest-dev        | ≥ 3.4         |          | zum Erstellen und um Test auszuführen.
 |===

 [NOTE]
@@ -430,12 +430,13 @@ ulimit -c 200000
 [[gdb_backtrace]]
 ==== Rückverfolgung mit gdb

-Falls WeeChat abstürzen sollte, dann wird auf Ihrem System eine _core_ bzw. _core.12345_ Datei
-(_12345_ ist die Prozess-Id) erzeugt.
-Diese Datei wird in dem Verzeichnis erzeugt aus welchem Sie WeeChat gestartet haben (dies
-ist *nicht* das Verzeichnis in welchem sich WeeChat befindet!).
+Sollte WeeChat abstürzen wird durch das System eine _core_ oder _core.12345_
+Datei erstellt (_12345_ ist dabei die Prozess-ID). Dazu muss aber die
+entprechende <<core_files,Option aktiviert sein>>.
+Diese Core-Datei wird in dem Verzeichnis erzeugt aus welchem WeeChat gestartet wurde
+(dies ist *nicht* das Verzeichnis in welchem sich WeeChat befindet!).

-Beispiel: _weechat_ ist installiert in _/usr/bin/_ und die _core_ Datei befindet sich
+Beispiel: _weechat_ ist in _/usr/bin/_ installiert und die _core_ Datei befindet sich
 in _/home/xxx/_. Nun wird gdb mit folgendem Befehl aufgerufen:

 ----
@@ -474,7 +475,7 @@ Copying output to /tmp/crash.txt.
        max_fd = <value optimized out>
 ----

-Diese Fehlermeldung senden Sie bitte an den Entwickler und beschreiben was den Fehler ausgelöst hat.
+Diese Fehlermeldung senden Sie bitte an den Entwickler mit einer Beschreibung was den Fehler ausgelöst hat.

 Danke für Ihre Mithilfe!

@@ -511,7 +512,7 @@ Befehlszeile:

 include::cmdline_options.de.adoc[]

-Wenn WeeChat das erste mal ausgeführt wird, wird die Standardkonfiguration und
+Wird WeeChat das erste mal ausgeführt, wird die Standardkonfiguration und
 die entsprechenden Dateien im Verzeichnis _~/.weechat_ erstellt.
 (siehe <<files_and_directories,Dateien und Verzeichnisse>>).

@@ -1510,9 +1511,9 @@ und für jeden einzelen Nick kann ein maximler Hotlist-Level eingestellt wertden
 * 0: niedrige Priorität (zum Beispiel join/part Nachrichten)
 * 1: Nachricht
 * 2: private Nachricht
-* 3: Highlight (eigentlich unnötigt, da es standardmäßig die höchste Stufe für alle Nachrichten ist)
+* 3: Highlight (eigentlich unnötig, da es standardmäßig die höchste Stufe für alle Nachrichten ist)

-Um zum Bespiel Highlights von "joe" und "mike" im aktuellen Buffer zu deaktivieren:
+Um zum Beispiel Highlights von "joe" und "mike" im aktuellen Buffer zu deaktivieren:

 ----
 /buffer set hotlist_max_level_nicks_add joe:2,mike:2
@@ -2687,7 +2688,7 @@ dadurch kein Passwort während des Verbindungsaufbaus benötigt).
 Ein Schlüssel kann mit folgendem Befehl erzeugt werden:

 ----
-$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+$ openssl ecparam -genkey -name prime256v1 -out ~/.weechat/ecdsa.pem
 ----

 Um den öffentlichen Schlüssel zu erhalten (base64 enkodiert) muss
@@ -3568,6 +3569,43 @@ Um Trigger nutzen zu können ist es von Vorteil zu wissen wie signals,
 modifiers, ... in WeeChat überhaupt funktionieren. Deshalb sollte man überlegen,
 ob man nicht folgende Anleitung lesen sollte link:weechat_plugin_api.en.html#hooks[Anleitung für API Erweiterung / Hooks] (Englisch).

+[[trigger_default]]
+==== standardmäßige Trigger
+
+WeeChat erstellt standardmäßig fünf Trigger, welche deaktiviert, angepasst oder
+gelöscht werden können:
+
+* ein _beep_ Trigger für Benachrichtigungen
+* vier Trigger um Passwörter auf dem Bildschirm zu unterdrücken
+
+Liste der standardmäßigen Trigger:
+
+[width="100%",cols="5m,3,22",options="header"]
+|===
+| Name | Hook | Beschreibung
+
+| beep | print |
+  Beep bei Highlight/privaten Nachrichten.
+
+| cmd_pass | modifier |
+  unterdrückt Passwörter in den Befehlen:
+  `pass:[/msg nickserv id\|identify\|set password\|ghost\|release\|regain\|recover]`,
+  `pass:[/oper]`,
+  `pass:[/quote pass]`,
+  `pass:[/set *password*]`,
+  `pass:[/secure passphrase\|decrypt\|set]`.
+
+| cmd_pass_register | modifier |
+  unterdrückt Passwort im Befehl `pass:[/msg nickserv register]`.
+
+| msg_auth | modifier |
+  unterdrückt Passwort einer IRC auth Nachricht (Nachricht welche vom Server empfangen wird,
+  nachdem der User den Befehl verschickt hat).
+
+| server_pass | modifier |
+  unterdrückt Passwort bei den Befehlen `/server` und `/connect`.
+|===
+
 [[trigger_anatomy]]
 ==== Aufbau eines Triggers

@@ -3581,8 +3619,8 @@ Ein Trigger hat folgende Optionen (Benennung ist
 | enabled | `on`, `off` |
  Wenn die Option auf `off` gesetzt ist, dann ist der Trigger deaktiviert und die Ausführung ist gestoppt.

-| hook | `signal`, `hsignal`, `modifier`, `print`, `command`, `command_run`,
-  `timer`, `config`, `focus` |
+| hook | `signal`, `hsignal`, `modifier`, `line`, `print`, `command`,
+  `command_run`, `timer`, `config`, `focus` |
  Der hook welcher durch Trigger genutzt werden soll. Für weitere Informationen siehe
  link:weechat_plugin_api.en.html#hooks[Anleitung für API Erweiterung / Hooks] (Englisch).

@@ -3619,7 +3657,7 @@ folgende Optionen besitzt:
 trigger.trigger.beep.enabled = on
 trigger.trigger.beep.hook = print
 trigger.trigger.beep.arguments = ""
-trigger.trigger.beep.conditions = "${tg_highlight} || ${tg_msg_pv}"
+trigger.trigger.beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
 trigger.trigger.beep.regex = ""
 trigger.trigger.beep.command = "/print -beep"
 trigger.trigger.beep.return_code = ok
@@ -3672,6 +3710,17 @@ ein Semikolon getrennt.
  `+5000\|input_text_display;5000\|history_add+` |
  link:weechat_plugin_api.en.html#_hook_modifier[hook_modifier] (Englisch)

+| line |
+  1. Buffertyp +
+  2. Buffername +
+  3. Tags |
+  `+formatted+` +
+  `+free+` +
+  `+*;irc.freenode.*+` +
+  `+*;irc.freenode.#weechat+` +
+  `+formatted;irc.freenode.#weechat;irc_notice+` |
+  link:weechat_plugin_api.en.html#_hook_line[hook_line]
+
 | print |
  1. Buffername +
  2. Tags +
@@ -3738,7 +3787,7 @@ um ausschließlich bei einer privaten Nachricht oder einem Highlight ausgeführt
 zu werden:

 ----
-${tg_highlight} || ${tg_msg_pv}
+${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})
 ----

 [[trigger_regex]]
@@ -3747,24 +3796,34 @@ ${tg_highlight} || ${tg_msg_pv}
 Reguläre Ausdrücke werden verwendet um Variablen in einem Callback Hashtable zu ändern.

 Das Format ist: "/regex/replace" oder "/regex/replace/var" (wobei _var_ eine
-Variable eines Hashtable darstellt). +
+Variable eines Hashtable darstellt).
+
+Falls _var_ in der Hashtabelle nicht existieren sollte, wird diese automatisch mit einem
+leeren Wert angelegt. Damit kann man temporär benutzerspezifische Variablen erstellen.
+
 Sollte _var_ nicht näher spezifiziert sein, wird die Standard-Variable genutzt,
 welche abhängig von dem genutzten Hook ist:

-[width="50%",cols="4,5m",options="header"]
+[width="100%",cols="2,3,7",options="header"]
 |===
-| Hook        | Standard-Variable
-| signal      | tg_signal_data
-| hsignal     |
-| modifier    | tg_string
-| print       | tg_message
-| command     | tg_argv_eol1
-| command_run | tg_command
-| timer       | tg_remaining_calls
-| config      | tg_value
-| focus       |
+| Hook        | Standard-Variable  | Update allowed ^(1)^
+| signal      | tg_signal_data     |
+| hsignal     |                    |
+| modifier    | tg_string          | tg_string
+| line        | message            | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message
+| print       | tg_message         |
+| command     | tg_argv_eol1       |
+| command_run | tg_command         |
+| timer       | tg_remaining_calls |
+| config      | tg_value           |
+| focus       |                    |
 |===

+[NOTE]
+^(1)^ Alle Variablen können im Trigger upgedated werden, aber nur diese Variablen
+haben einen Einfluss auf den Wert der vom Trigger zurückgegeben wird und dann von
+WeeChat genutzt wird.
+
 Mehrere reguläre Ausdrücke können durch ein Leerzeichen voneinander
 getrennt werden, zum Beispiel:
 "/regex1/replace1/var1 /regex2/replace2/var2".
@@ -3924,6 +3983,45 @@ vorhanden sind (siehe <<trigger_data_print,hook print>> weiter unten), und nachf
 Sollte das Signal eine IRC Nachricht beinhalten, wird die Nachricht analysiert
 und die Daten in einer Hashtable gesichert (siehe <<trigger_data_signal,hook signal>>).

+[[trigger_data_line]]
+===== Line
+
+Der Callback von "line" legt folgende Variablen in der Hashtable an:
+
+[width="100%",cols="3m,2,14",options="header"]
+|===
+| Variable           | Typ     | Beschreibung
+| buffer             | pointer | Buffer.
+| buffer_name        | string  | Buffername.
+| buffer_type        | string  | Buffertyp ("formatted" oder "free").
+| y                  | string  | Zeilennummer bei einem Buffer mit freier Einteilung (≥ 0), -1 für einen Buffer mit formatiertem Inhalt.
+| date               | string  | Datum der Zeile (Zeitstempel).
+| date_printed       | string  | Datum wann die Zeile dargestellt wurde (Zeitstempel).
+| str_time           | string  | Datum für Darstellung. Kann Farbkodierungen erhalten.
+| tags               | string  | Tags einer Nachricht (Komma wird automatisch zu Beginn und Ende den Tags hinzugefügt).
+| displayed          | string  | "1" wenn Zeile dargestellt wird, "0" wenn Zeile gefiltert wird.
+| notify_level       | string  | "0" = low level, "1" = Nachricht, "2" = private Nachricht, "3" = Highlight
+| highlight          | string  | "1" wenn Highlight, andernfalls "0".
+| prefix             | string  | Prefix.
+| tg_prefix_nocolor  | string  | Prefix, ohne Farbkodierung.
+| message            | string  | Nachricht.
+| tg_message_nocolor | string  | Nachricht, ohne Farbkodierung.
+|===
+
+Variablen die mittels Tags in der Nachricht gesetzt werden:
+
+[width="100%",cols="3m,2,14",options="header"]
+|===
+| Variable           | Typ    | Beschreibung
+| tg_tags_count      | string | Anzahl an Tags der Nachricht.
+| tg_tag_nick        | string | Nick (extrahiert aus Tag "nick_xxx").
+| tg_tag_prefix_nick | string | Nickfarbe für Präfix (extrahier aus Tag "prefix_nick_ccc").
+| tg_tag_host        | string | Username und Host, Format: username@host (extrahiert aus Tag "host_xxx").
+| tg_tag_notify      | string | Benachrichtigungsstufe (_none_, _message_, _private_, _highlight_).
+| tg_notify          | string | Benachrichtigungsstufe, falls von _none_ abweichend.
+| tg_msg_pv          | string | "1" für eine private Nachricht, andernfalls "0".
+|===
+
 [[trigger_data_print]]
 ===== Print

@@ -3942,8 +4040,7 @@ Der Callback von "print" legt folgende Variablen in der Hashtable an:
 | tg_message_nocolor | string  | Nachricht ohne Farbcodes.
 |===

-Variablen welche gesetzt werden, aufgrund der Nutzung von Tags in einer Nachricht
-(_weechat_print_ nutzt ebenso diese Tag-Variablen):
+Variablen die mittels Tags in der Nachricht gesetzt werden:

 [width="100%",cols="3m,2,14",options="header"]
 |===
@@ -4158,4 +4255,4 @@ Unterstützung im IRC findet man auf dem Server _chat.freenode.net_:
 ** _#weechat-de_ (deutsch)
 ** _#weechat-fi_ (finnisch)

-Weitere Möglichkeiten, um mit den Entwicklern in Kontakt zu treten, siehe: https://weechat.org/dev/support
+Weitere Möglichkeiten, um mit den Entwicklern in Kontakt zu treten, siehe: https://weechat.org/about/support
@@ -51,6 +51,7 @@ try:
    import hashlib
    import os
    import re
+    import sys
    from collections import defaultdict
    from operator import itemgetter
 except ImportError as message:
@@ -158,22 +159,27 @@ class AutogenDoc(object):
        """Write a line in auto-generated doc file."""
        self._file.write(string)

+    @staticmethod
+    def sha256_file(filename, default):
+        """
+        Return SHA256 checksum of a file, "default" if file is not found.
+        """
+        try:
+            with open(filename, 'r') as _file:
+                content = _file.read()
+                if sys.version_info >= (3, ):
+                    content = content.encode('utf-8')
+                checksum = hashlib.sha256(content).hexdigest()
+        except IOError:
+            checksum = default
+        return checksum
+
    def update(self, obj_name, num_files, num_files_updated):
        """Update doc file if needed (if content has changed)."""
        # close temp file
        self._file.close()
-        # compute checksum on old file
-        try:
-            with open(self.filename, 'r') as _file:
-                shaold = hashlib.sha256(_file.read()).hexdigest()
-        except IOError:
-            shaold = ''
-        # compute checksum on new (temp) file
-        try:
-            with open(self.filename_tmp, 'r') as _file:
-                shanew = hashlib.sha256(_file.read()).hexdigest()
-        except IOError:
-            shanew = ''
+        shaold = AutogenDoc.sha256_file(self.filename, 'old')
+        shanew = AutogenDoc.sha256_file(self.filename_tmp, 'new')
        # compare checksums
        if shaold != shanew:
            # update doc file
@@ -720,8 +726,9 @@ def docgen_cmd_cb(data, buf, args):
        doc.write('[width="100%",cols="2,^1,7",options="header"]\n')
        doc.write('|===\n')
        doc.write('| {0} | {1} | {2}\n\n'
-                  ''.format(_('Option'), _('Type'),
-                            _('Constants') + ' ^(1)^'))
+                  ''.format(_('Option'),
+                            _('Type') + ' ^(1)^',
+                            _('Constants') + ' ^(2)^'))
        for option in url_options:
            constants = option['constants']
            if constants:
@@ -18,29 +18,34 @@
 #

 if(ENABLE_MAN)
-  # man page
+  # man page: weechat
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.en.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat.1 (en)"
  )
  add_custom_target(doc-man-weechat-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/man1)

-  # symbolic link weechat-headless.1 -> weechat.1
+  # man page: weechat-headless
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-    COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-headless.1"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat.1" "weechat-headless.1"
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
    DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_files.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.en.adoc
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMENT "Creating symbolic link weechat-headless.1 (en)"
+    COMMENT "Building weechat-headless.1 (en)"
  )
  add_custom_target(doc-man-weechat-headless-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/man1)
@@ -48,6 +53,9 @@ endif()

 if(ENABLE_DOC)

+  file(GLOB AUTOGEN_USER "${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc")
+  file(GLOB AUTOGEN_PLUGIN "${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc")
+
  # user's guide
  add_custom_command(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
@@ -56,7 +64,7 @@ if(ENABLE_DOC)
    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.adoc
    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
+    ${AUTOGEN_USER}
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat_user.en.html"
  )
@@ -70,7 +78,7 @@ if(ENABLE_DOC)
    DEPENDS
    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
+    ${AUTOGEN_PLUGIN}
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    COMMENT "Building weechat_plugin_api.en.html"
  )
@@ -30,6 +30,10 @@

 | irc | irc_ignores_numbers | numbers for defined ignores

+| irc | irc_modelist_masks | modelist masks of current IRC channel; required argument: modelist mode
+
+| irc | irc_modelist_numbers | modelist numbers of current IRC channel; required argument: modelist mode
+
 | irc | irc_msg_kick | default kick message

 | irc | irc_msg_part | default part message for IRC channel
@@ -74,6 +74,8 @@ _last_nick_   (pointer, hdata: "irc_nick") +
 _nicks_speaking_   (pointer) +
 _nicks_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
 _last_nick_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
+_modelists_   (pointer, hdata: "irc_modelist") +
+_last_modelist_   (pointer, hdata: "irc_modelist") +
 _join_smart_filtered_   (hashtable) +
 _buffer_   (pointer, hdata: "buffer") +
 _buffer_as_string_   (string) +
@@ -106,6 +108,30 @@ _prev_ignore_   (pointer, hdata: "irc_ignore") +
 _next_ignore_   (pointer, hdata: "irc_ignore") +


+| irc
+| [[hdata_irc_modelist]]<<hdata_irc_modelist,irc_modelist>>
+| irc modelist
+| -
+| _type_   (char) +
+_state_   (integer) +
+_items_   (pointer, hdata: "irc_modelist_item") +
+_last_item_   (pointer, hdata: "irc_modelist_item") +
+_prev_modelist_   (pointer, hdata: "irc_modelist") +
+_next_modelist_   (pointer, hdata: "irc_modelist") +
+
+
+| irc
+| [[hdata_irc_modelist_item]]<<hdata_irc_modelist_item,irc_modelist_item>>
+| irc modelist item
+| -
+| _number_   (integer) +
+_mask_   (string) +
+_setter_   (string) +
+_datetime_   (time) +
+_prev_item_   (pointer, hdata: "irc_modelist_item") +
+_next_item_   (pointer, hdata: "irc_modelist_item") +
+
+
 | irc
 | [[hdata_irc_nick]]<<hdata_irc_nick,irc_nick>>
 | irc nick
@@ -217,9 +243,10 @@ _nick_first_tried_   (integer) +
 _nick_alternate_number_   (integer) +
 _nick_   (string) +
 _nick_modes_   (string) +
-_cap_away_notify_   (integer) +
-_cap_account_notify_   (integer) +
-_cap_extended_join_   (integer) +
+_checking_cap_ls_   (integer) +
+_cap_ls_   (hashtable) +
+_checking_cap_list_   (integer) +
+_cap_list_   (hashtable) +
 _isupport_   (string) +
 _prefix_modes_   (string) +
 _prefix_chars_   (string) +
@@ -864,6 +891,7 @@ _str_time_   (string) +
 _tags_count_   (integer) +
 _tags_array_   (shared_string, array_size: "tags_count") +
 _displayed_   (char) +
+_notify_level_   (char) +
 _highlight_   (char) +
 _refresh_needed_   (char) +
 _prefix_   (shared_string) +
@@ -20,6 +20,10 @@

 | irc | irc_ignore | list of IRC ignores | ignore pointer (optional) | -

+| irc | irc_modelist | list of channel mode lists for an IRC channel | mode list pointer (optional) | server,channel,type (type is optional)
+
+| irc | irc_modelist_item | list of items in a channel mode list | mode list item pointer (optional) | server,channel,type,number (number is optional)
+
 | irc | irc_nick | list of nicks for an IRC channel | nick pointer (optional) | server,channel,nick (nick is optional)

 | irc | irc_notify | list of notify | notify pointer (optional) | server name (wildcard "*" is allowed) (optional)
@@ -66,7 +66,7 @@

 | python | python_version | version of the interpreter used | -

-| relay | relay_client_count | number of clients for relay | status name (optional): connecting, waiting_auth, connected, auth_failed, disconnected
+| relay | relay_client_count | number of clients for relay | protocol,status (both are optional, for each argument "*" means all; protocols: irc, weechat; statuses: connecting, waiting_auth, connected, auth_failed, disconnected)

 | ruby | ruby_eval | evaluation of source code | source code to execute

@@ -4,7 +4,7 @@
 //
 [width="100%",cols="2,^1,7",options="header"]
 |===
-| Option | Type | Constants ^(1)^
+| Option | Type ^(1)^ | Constants ^(2)^

 | verbose | long |

@@ -114,10 +114,14 @@

 | postfields | string |

+| httppost | list |
+
 | referer | string |

 | useragent | string |

+| httpheader | list |
+
 | cookie | string |

 | cookiefile | string |
@@ -134,6 +138,8 @@

 | cookiesession | long |

+| http200aliases | list |
+
 | unrestricted_auth | long |

 | postfieldsize_large | long long |
@@ -158,12 +164,16 @@

 | headeropt | mask | unified, separate

+| proxyheader | list |
+
 | pipewait | long |

 | stream_weight | long |

 | mail_from | string |

+| mail_rcpt | list |
+
 | mail_auth | string |

 | tftp_blksize | long |
@@ -172,8 +182,14 @@

 | ftpport | string |

+| quote | list |
+
+| postquote | list |
+
 | ftp_use_epsv | long |

+| prequote | list |
+
 | ftp_use_eprt | long |

 | ftp_create_missing_dirs | long |
@@ -270,6 +286,8 @@

 | use_ssl | long | none, try, control, all

+| resolve | list |
+
 | dns_servers | string |

 | accepttimeout_ms | long |
@@ -280,6 +298,8 @@

 | dns_local_ip6 | string |

+| connect_to | list |
+
 | sslcert | string |

 | sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3
@@ -354,6 +374,8 @@

 | proxy_sslversion | long | default, tlsv1, sslv2, sslv3, tlsv1_0, tlsv1_1, tlsv1_2, tlsv1_3

+| proxy_ssl_cipher_list | list |
+
 | proxy_ssl_options | long | allow_beast, no_revoke

 | proxy_ssl_verifyhost | long |
@@ -380,4 +402,6 @@

 | new_directory_perms | long |

+| telnetoptions | list |
+
 |===
@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 * [[option_buflist.format.buffer]] *buflist.format.buffer*
-** description: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist)]
+** description: pass:none[format of each line with a buffer (note: content is evaluated, see /help buflist); example: standard format for bar item "buflist" and only the buffer number between square brackets for other bar items ("buflist2" and "buflist3"): "${if:${bar_item.name}==buflist?${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}:[${number}\]}"]
 ** type: string
 ** values: any string
 ** default value: `+"${format_number}${indent}${format_nick_prefix}${color_hotlist}${format_name}"+`
@@ -111,7 +111,7 @@ Without argument, this command displays the ban list for current channel.

 Without argument, "ls" and "list" are sent.

-Capabilities supported by WeeChat are: account-notify, away-notify, cap-notify, extended-join, multi-prefix, server-time, userhost-in-names.
+Capabilities supported by WeeChat are: account-notify, away-notify, cap-notify, chghost, extended-join, invite-notify, multi-prefix, server-time, userhost-in-names.

 The capabilities to automatically enable on servers can be set in option irc.server_default.capabilities (or by server in option irc.server.xxx.capabilities).

@@ -376,9 +376,9 @@ reason: reason
 * `+links+`: list all servernames which are known by the server answering the query

 ----
-/links  [[<server>] <server_mask>]
+/links  [[<target>] <server_mask>]

-     server: this server should answer the query
+     target: this remote server should answer the query
 server_mask: list of servers must match this mask
 ----

@@ -386,11 +386,12 @@ server_mask: list of servers must match this mask
 * `+list+`: list channels and their topic

 ----
-/list  [<channel>[,<channel>...]] [<server>] [-re <regex>]
+/list  [-server <server>] [-re <regex>] [<channel>[,<channel>...]] [<target>]

-channel: channel to list
- server: server name
+ server: send to this server (internal name)
  regex: POSIX extended regular expression used to filter results (case insensitive, can start by "(?-i)" to become case sensitive)
+channel: channel to list
+ target: server name

 Examples:
  list all channels on server (can be very slow on large networks):
@@ -573,10 +574,10 @@ message: part message (displayed to other users)
 * `+ping+`: send a ping to server

 ----
-/ping  <server1> [<server2>]
+/ping  <target1> [<target2>]

-server1: server
-server2: forward ping to this server
+target1: server
+target2: forward ping to this server
 ----

 [[command_irc_pong]]
@@ -719,18 +720,18 @@ reason: reason
 * `+server+`: list, add or remove IRC servers

 ----
-/server  list|listfull [<server>]
-         add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
-         copy|rename <server> <new_name>
-         reorder <server> [<server>...]
-         open <server>|-all [<server>...]
-         del|keep <server>
+/server  list|listfull [<name>]
+         add <name> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
+         copy|rename <name> <new_name>
+         reorder <name> [<name>...]
+         open <name>|-all [<name>...]
+         del|keep <name>
         deloutq|jump|raw

    list: list servers (without argument, this list is displayed)
 listfull: list servers with detailed info for each server
     add: add a new server
-  server: server name, for internal and display use
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
 hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
   -temp: add a temporary server (not saved)
  option: set option for server (for boolean option, value can be omitted)
@@ -791,9 +792,9 @@ service: name of service
 * `+squit+`: disconnect server links

 ----
-/squit  <server> <comment>
+/squit  <target> <comment>

- server: server name
+ target: server name
 comment: comment
 ----

@@ -801,10 +802,10 @@ comment: comment
 * `+stats+`: query statistics about server

 ----
-/stats  [<query> [<server>]]
+/stats  [<query> [<target>]]

 query: c/h/i/k/l/m/o/y/u (see RFC1459)
-server: server name
+target: server name
 ----

 [[command_irc_summon]]
@@ -851,20 +852,22 @@ target: server name
 * `+unban+`: unban nicks or hosts

 ----
-/unban  [<channel>] <nick> [<nick>...]
+/unban  [<channel>] <nick>|<number> [<nick>|<number>...]

 channel: channel name
   nick: nick or host
+ number: ban number (as displayed by command /ban)
 ----

 [[command_irc_unquiet]]
 * `+unquiet+`: unquiet nicks or hosts

 ----
-/unquiet  [<channel>] <nick> [<nick>...]
+/unquiet  [<channel>] <nick>|<number> [<nick>|<number>...]

 channel: channel name
   nick: nick or host
+ number: quiet number (as displayed by command /quiet)
 ----

 [[command_irc_userhost]]
@@ -889,9 +892,9 @@ target: server name
 * `+version+`: give the version info of nick or server (current or specified)

 ----
-/version  [<server>|<nick>]
+/version  [<target>|<nick>]

-server: server name
+target: server name
  nick: nick
 ----

@@ -938,9 +941,9 @@ mask: only information which match this mask
 * `+whois+`: query information about user(s)

 ----
-/whois  [<server>] [<nick>[,<nick>...]]
+/whois  [<target>] [<nick>[,<nick>...]]

-server: server name
+target: server name
  nick: nick (may be a mask)

 Without argument, this command will do a whois on:
@@ -32,6 +32,12 @@
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** default value: `+default+`

+* [[option_irc.color.message_chghost]] *irc.color.message_chghost*
+** description: pass:none[color for text in chghost messages]
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
+** default value: `+brown+`
+
 * [[option_irc.color.message_join]] *irc.color.message_join*
 ** description: pass:none[color for text in join messages]
 ** type: color
@@ -45,7 +51,7 @@
 ** default value: `+red+`

 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** description: pass:none[remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=gray, 15=white]
+** description: pass:none[remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray]
 ** type: string
 ** values: any string
 ** default value: `+"1,-1:darkgray"+`
@@ -368,6 +374,12 @@
 ** values: on, off
 ** default value: `+on+`

+* [[option_irc.look.smart_filter_chghost]] *irc.look.smart_filter_chghost*
+** description: pass:none[enable smart filter for "chghost" messages]
+** type: boolean
+** values: on, off
+** default value: `+on+`
+
 * [[option_irc.look.smart_filter_delay]] *irc.look.smart_filter_delay*
 ** description: pass:none[delay for filtering join/part/quit messages (in minutes): if the nick did not speak during the last N minutes, the join/part/quit is filtered]
 ** type: integer
@@ -20,7 +20,7 @@ disable: disable logging on current buffer (set level to 0)
 Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name.

 Log levels used by IRC plugin:
-  1: user message, notice, private
+  1: user message (channel and private), notice (server and channel)
  2: nick change
  3: server message
  4: join/part/quit
@@ -34,7 +34,7 @@ protocol.name: protocol and name to relay:
                 - protocol "weechat" (name is not used)

 The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
-The "weechat" protocol allows a remote interface to connect on the port, see the list here: https://weechat.org/download/
+The "weechat" protocol allows a remote interface to connect on the port, see the list here: https://weechat.org/about/interfaces

 Without argument, this command opens buffer with list of relay clients.

@@ -27,11 +27,12 @@ listdefault: list default triggers
     addoff: add a trigger (disabled)
 addreplace: add or replace an existing trigger
       name: name of trigger
-       hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
+       hook: signal, hsignal, modifier, line, print, command, command_run, timer, config, focus
  arguments: arguments for the hook, depending on hook (separated by semicolons):
             signal: name(s) of signal (required)
             hsignal: name(s) of hsignal (required)
             modifier: name(s) of modifier (required)
+             line: buffer type ("formatted", "free" or "*"), list of buffer masks, tags
             print: buffer, tags, message, strip colors
             command: command (required), description, arguments, description of arguments, completion
             command_run: command(s) (required)
@@ -69,7 +70,7 @@ When a trigger callback is called, following actions are performed, in this orde
  1. check conditions; if false, exit
  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
  3. execute command(s) (if defined in trigger)
-  4. exit with a return code (except for modifiers and focus)
+  4. exit with a return code (except for modifier, line and focus)
  5. perform post action

 Examples (you can also look at default triggers with /trigger listdefault):
@@ -74,14 +74,14 @@ Examples:
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
         renumber [<number1> [<number2> [<start>]]]
-         close [<n1>[-<n2>]|<name>]
+         close [<n1>[-<n2>]|<name>...]
         notify <level>
-         localvar
+         localvar [<number>|<name>]
         set <property> [<value>]
         get <property>
         <number>|-|+|<name>
@@ -105,7 +105,7 @@ renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumb
            message: for messages from users + highlights
                all: all messages
              reset: reset to default value (all)
-localvar: display local variables for current buffer
+localvar: display local variables for the buffer
     set: set a property for current buffer
     get: display a property of current buffer
  number: jump to buffer by number, possible prefix:
@@ -129,6 +129,8 @@ Examples:
    /buffer cycle #chan1 #chan2 #chan3
  merge with core buffer:
    /buffer merge 1
+  merge with #weechat buffer:
+    /buffer merge #weechat
  unmerge buffer:
    /buffer unmerge
  close current buffer:
@@ -294,14 +296,16 @@ Some variables are replaced in expression, using the format ${variable}, variabl
  3. a string with chars to hide (format: "hide:char,string")
  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")
-  9. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  10. an option (format: "file.section.option")
-  11. a local variable in buffer
-  12. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  5. a reversed string (format: "rev:xxx")
+  6. a repeated string (format: "repeat:count,string")
+  7. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  8. an info (format: "info:name,arguments", arguments are optional)
+  9. current date/time (format: "date" or "date:format")
+  10. an environment variable (format: "env:XXX")
+  11. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  12. an option (format: "file.section.option")
+  13. a local variable in buffer
+  14. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
 Format for hdata can be one of following:
  hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
  hdata[list].var1.var2...: start with a hdata using a list, for example:
@@ -315,6 +319,7 @@ Examples (simple strings):
  /eval -n ${info:version}                       ==> 0.4.3
  /eval -n ${env:HOME}                           ==> /home/user
  /eval -n ${weechat.look.scroll_amount}         ==> 3
+  /eval -n ${sec.data.freenode_password}         ==> secret
  /eval -n ${window}                             ==> 0x2549aa0
  /eval -n ${window.buffer}                      ==> 0x2549320
  /eval -n ${window.buffer.full_name}            ==> core.weechat
@@ -325,6 +330,8 @@ Examples (simple strings):
  /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
+  /eval -n ${rev:Hello}                          ==> olleH
+  /eval -n ${repeat:5,-}                         ==> -----

 Examples (conditions):
  /eval -n -c ${window.buffer.number} > 2 ==> 0
@@ -372,7 +379,7 @@ disable: disable filters
         - two regular expressions are created: one for prefix and one for message
         - regex are case insensitive, they can start by "(?-i)" to become case sensitive

-The default key alt+'=' toggles filtering on/off.
+The default key alt+'=' toggles filtering on/off globally and alt+'-' toggles filtering on/off in the current buffer.

 Tags most commonly used:
  no_filter, no_highlight, no_log, log0..log9 (log level),
@@ -435,7 +435,7 @@
 ** default value: `+"[]`_-^"+`

 * [[option_weechat.completion.partial_completion_alert]] *weechat.completion.partial_completion_alert*
-** description: pass:none[alert user when a partial completion occurs]
+** description: pass:none[send alert (BEL) when a partial completion occurs]
 ** type: boolean
 ** values: on, off
 ** default value: `+on+`
@@ -729,10 +729,10 @@
 ** default value: `+""+`

 * [[option_weechat.look.hotlist_add_conditions]] *weechat.look.hotlist_add_conditions*
-** description: pass:none[conditions to add a buffer in hotlist (if notify level is OK for the buffer); you can use in these conditions: "window" (current window pointer), "buffer" (buffer pointer to add in hotlist), "priority" (0 = low, 1 = message, 2 = private, 3 = highlight); by default a buffer is added to hotlist if you are away, or if the buffer is not visible on screen (not displayed in any window)]
+** description: pass:none[conditions to add a buffer in hotlist (if notify level is OK for the buffer); you can use in these conditions: "window" (current window pointer), "buffer" (buffer pointer to add in hotlist), "priority" (0 = low, 1 = message, 2 = private, 3 = highlight); by default a buffer is added to hotlist if you are away, or if the buffer is not visible on screen (not displayed in any window), or if at least one relay client is connected via the weechat protocol]
 ** type: string
 ** values: any string
-** default value: `+"${away} || ${buffer.num_displayed} == 0"+`
+** default value: `+"${away} || ${buffer.num_displayed} == 0 || ${info:relay_client_count,weechat,connected} > 0"+`

 * [[option_weechat.look.hotlist_buffer_separator]] *weechat.look.hotlist_buffer_separator*
 ** description: pass:none[string displayed between buffers in hotlist]
@@ -741,7 +741,7 @@
 ** default value: `+", "+`

 * [[option_weechat.look.hotlist_count_max]] *weechat.look.hotlist_count_max*
-** description: pass:none[max number of messages count to display in hotlist for a buffer (0 = never display messages count)]
+** description: pass:none[max number of messages count to display in hotlist for a buffer: 0 = never display messages count, other number = display max N messages count (from the highest to lowest priority)]
 ** type: integer
 ** values: 0 .. 4
 ** default value: `+2+`
@@ -1179,10 +1179,10 @@
 ** default value: `+on+`

 * [[option_weechat.look.window_title]] *weechat.look.window_title*
-** description: pass:none[title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval)]
+** description: pass:none[title for window (terminal for Curses GUI), set on startup; an empty string will keep title unchanged (note: content is evaluated, see /help eval); example: "WeeChat ${info:version}"]
 ** type: string
 ** values: any string
-** default value: `+"WeeChat ${info:version}"+`
+** default value: `+""+`

 * [[option_weechat.look.word_chars_highlight]] *weechat.look.word_chars_highlight*
 ** description: pass:none[comma-separated list of chars (or range of chars) that are considered part or words for highlights; each item can be a single char, a range of chars (format: a-z), a class of wide character (for example "alnum", see man wctype); a "!" before the item makes it negative (ie the char is NOT considered part of words); the value "*" matches any char; unicode chars are allowed with the format \u1234, for example \u00A0 for unbreakable space (see /help print for supported formats)]
@@ -158,6 +158,12 @@
 ** values: any string
 ** default value: `+""+`

+* [[option_xfer.network.send_ack]] *xfer.network.send_ack*
+** description: pass:none[send acks when receiving files; if disabled, the transfer may freeze if the sender is waiting for acks (for example a WeeChat sending a file with option xfer.network.fast_send set to off); on the other hand, disabling send of acks may prevent a freeze if the acks are not sent immediately to the sender]
+** type: boolean
+** values: on, off
+** default value: `+on+`
+
 * [[option_xfer.network.speed_limit]] *xfer.network.speed_limit*
 ** description: pass:none[speed limit for sending files, in kilo-bytes by second (0 means no limit)]
 ** type: integer
@@ -24,8 +24,13 @@
 *-p*, *--no-plugin*::
    Disable plugins auto-load.

+*-P*, *--plugins* _<plugins>_::
+    Load only these plugins at startup (see /help weechat.plugin.autoload).
+    If this option is given, the option weechat.plugin.autoload is not used.
+
 *-r*, *--run-command* _<command>_::
-    Run command(s) after startup (many commands can be separated by semicolons).
+    Run command(s) after startup; many commands can be separated by semicolons,
+    this option can be given multiple times.

 *-s*, *--no-script*::
    Disable scripts auto-load.
@@ -0,0 +1,13 @@
+WeeChat is written by Sébastien Helleu and contributors (complete list is in
+the AUTHORS.adoc file).
+
+Copyright (C) 2003-2018 {author}
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Please read the COPYING file for more information.
+
+Web: https://weechat.org/
@@ -0,0 +1,74 @@
+$HOME/.weechat/weechat.conf::
+    main WeeChat configuration file
+
+$HOME/.weechat/plugins.conf::
+    plugins configuration file
+
+$HOME/.weechat/sec.conf::
+    configuration file with secured data
+
+$HOME/.weechat/alias.conf::
+    configuration file for _alias_ plugin
+
+$HOME/.weechat/aspell.conf::
+    configuration file for _aspell_ plugin
+
+$HOME/.weechat/buflist.conf::
+    configuration file for _buflist_ plugin
+
+$HOME/.weechat/charset.conf::
+    configuration file for _charset_ plugin
+
+$HOME/.weechat/exec.conf::
+    configuration file for _exec_ plugin
+
+$HOME/.weechat/fifo.conf::
+    configuration file for _fifo_ plugin
+
+$HOME/.weechat/fset.conf::
+    configuration file for _fset_ plugin
+
+$HOME/.weechat/guile.conf::
+    configuration file for _guile_ plugin
+
+$HOME/.weechat/irc.conf::
+    configuration file for _irc_ plugin
+
+$HOME/.weechat/javascript.conf::
+    configuration file for _javascript_ plugin
+
+$HOME/.weechat/logger.conf::
+    configuration file for _logger_ plugin
+
+$HOME/.weechat/lua.conf::
+    configuration file for _lua_ plugin
+
+$HOME/.weechat/perl.conf::
+    configuration file for _perl_ plugin
+
+$HOME/.weechat/php.conf::
+    configuration file for _php_ plugin
+
+$HOME/.weechat/python.conf::
+    configuration file for _python_ plugin
+
+$HOME/.weechat/relay.conf::
+    configuration file for _relay_ plugin
+
+$HOME/.weechat/ruby.conf::
+    configuration file for _ruby_ plugin
+
+$HOME/.weechat/script.conf::
+    configuration file for _script_ plugin
+
+$HOME/.weechat/tcl.conf::
+    configuration file for _tcl_ plugin
+
+$HOME/.weechat/trigger.conf::
+    configuration file for _trigger_ plugin
+
+$HOME/.weechat/xfer.conf::
+    configuration file for _xfer_ plugin
+
+$HOME/.weechat/weechat.log::
+    WeeChat log file
@@ -0,0 +1,15 @@
+For complete doc on plugin options, please look at plugins documentation in
+https://weechat.org/doc[WeeChat user's guide].
+
+With irc plugin, you can connect to temporary server with an URL like:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+To join WeeChat IRC channel support with nick "mynick":
+
+    irc://mynick@chat.freenode.net/#weechat
+
+IPv6 address can be enclosed in brackets to add a port after address, for
+example:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
@@ -0,0 +1,57 @@
+= weechat-headless(1)
+:doctype: manpage
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
+:lang: en
+:man manual: WeeChat Manual
+:man source: WeeChat {revnumber}
+
+== NAME
+
+weechat-headless - the extensible chat client (headless version)
+
+== SYNOPSIS
+
+[verse]
+*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat-headless* [-c|--colors]
+*weechat-headless* [-h|--help]
+*weechat-headless* [-l|--license]
+*weechat-headless* [-v|--version]
+
+== DESCRIPTION
+
+WeeChat (Wee Enhanced Environment for Chat) is a free chat client, fast and
+light, designed for many operating systems.
+It is highly customizable and extensible with scripts.
+
+The command *weechat-headless* runs WeeChat in a headless mode (no interface).
+It can be used for tests or to daemonize WeeChat with the option "--daemon".
+
+== OPTIONS
+
+include::cmdline_options.en.adoc[]
+
+== PLUGIN OPTIONS
+
+include::man_plugin_options.en.adoc[]
+
+== FILES
+
+include::man_files.en.adoc[]
+
+== SEE ALSO
+
+*weechat*(1)
+
+== AUTHORS
+
+This manpage was written by {author}.
+
+== COPYRIGHT
+
+include::man_copyright.en.adoc[]
+
+== SUPPORT / REPORTING BUGS
+
+For help or a bug report: https://weechat.org/about/support
@@ -13,121 +13,33 @@ weechat - the extensible chat client
 == SYNOPSIS

 [verse]
-*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+*weechat* [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-P|--plugins <plugins>] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
 *weechat* [-c|--colors]
 *weechat* [-h|--help]
 *weechat* [-l|--license]
 *weechat* [-v|--version]

-*weechat-headless* [-a|--no-connect] [--daemon] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
-
 == DESCRIPTION

 WeeChat (Wee Enhanced Environment for Chat) is a free chat client, fast and
 light, designed for many operating systems.
 It is highly customizable and extensible with scripts.

-The command *weechat-headless* runs WeeChat in a headless mode (no interface).
-It can be used for tests or to daemonize WeeChat with the option "--daemon".
-
 == OPTIONS

 include::cmdline_options.en.adoc[]

 == PLUGIN OPTIONS

-For complete doc on plugin options, please look at plugins documentation in
-https://weechat.org/doc[WeeChat user's guide].
-
-With irc plugin, you can connect to temporary server with an URL like:
-
-    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
-
-To join WeeChat IRC channel support with nick "mynick":
-
-    irc://mynick@chat.freenode.net/#weechat
-
-IPv6 address can be enclosed in brackets to add a port after address, for
-example:
-
-    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+include::man_plugin_options.en.adoc[]

 == FILES

-$HOME/.weechat/weechat.conf::
-    main WeeChat configuration file
+include::man_files.en.adoc[]

-$HOME/.weechat/plugins.conf::
-    plugins configuration file
+== SEE ALSO

-$HOME/.weechat/sec.conf::
-    configuration file with secured data
-
-$HOME/.weechat/alias.conf::
-    configuration file for _alias_ plugin
-
-$HOME/.weechat/aspell.conf::
-    configuration file for _aspell_ plugin
-
-$HOME/.weechat/buflist.conf::
-    configuration file for _buflist_ plugin
-
-$HOME/.weechat/charset.conf::
-    configuration file for _charset_ plugin
-
-$HOME/.weechat/exec.conf::
-    configuration file for _exec_ plugin
-
-$HOME/.weechat/fifo.conf::
-    configuration file for _fifo_ plugin
-
-$HOME/.weechat/fset.conf::
-    configuration file for _fset_ plugin
-
-$HOME/.weechat/guile.conf::
-    configuration file for _guile_ plugin
-
-$HOME/.weechat/irc.conf::
-    configuration file for _irc_ plugin
-
-$HOME/.weechat/javascript.conf::
-    configuration file for _javascript_ plugin
-
-$HOME/.weechat/logger.conf::
-    configuration file for _logger_ plugin
-
-$HOME/.weechat/lua.conf::
-    configuration file for _lua_ plugin
-
-$HOME/.weechat/perl.conf::
-    configuration file for _perl_ plugin
-
-$HOME/.weechat/php.conf::
-    configuration file for _php_ plugin
-
-$HOME/.weechat/python.conf::
-    configuration file for _python_ plugin
-
-$HOME/.weechat/relay.conf::
-    configuration file for _relay_ plugin
-
-$HOME/.weechat/ruby.conf::
-    configuration file for _ruby_ plugin
-
-$HOME/.weechat/script.conf::
-    configuration file for _script_ plugin
-
-$HOME/.weechat/tcl.conf::
-    configuration file for _tcl_ plugin
-
-$HOME/.weechat/trigger.conf::
-    configuration file for _trigger_ plugin
-
-$HOME/.weechat/xfer.conf::
-    configuration file for _xfer_ plugin
-
-$HOME/.weechat/weechat.log::
-    WeeChat log file
+*weechat-headless*(1)

 == AUTHORS

@@ -135,20 +47,8 @@ This manpage was written by {author}.

 == COPYRIGHT

-WeeChat is written by Sébastien Helleu and contributors (complete list is in
-the AUTHORS.adoc file).
-
-Copyright (C) 2003-2018 {author}
-
-WeeChat is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-Please read the COPYING file for more information.
-
-Web: https://weechat.org/
+include::man_copyright.en.adoc[]

 == SUPPORT / REPORTING BUGS

-For help or a bug report: https://weechat.org/dev/support
+For help or a bug report: https://weechat.org/about/support
@@ -63,6 +63,7 @@ The main WeeChat directories are:
 | Directory          | Description
 | src/               | Root of sources.
 |    core/           | Core functions: entry point, internal structures.
+|       hook/        | Hook functions.
 |    gui/            | Functions for buffers, windows, ... (used by all interfaces).
 |       curses/      | Curses interface.
 |          headless/ | Headless mode (no interface).
@@ -112,69 +113,88 @@ WeeChat "core" is located in following directories:

 [width="100%",cols="1m,3",options="header"]
 |===
-| Path/file                     | Description
-| core/                         | Core functions: entry point, internal structures.
-|    wee-arraylist.c            | Array lists.
-|    wee-backtrace.c            | Display a backtrace after a crash.
-|    wee-command.c              | WeeChat core commands.
-|    wee-completion.c           | Default completions.
-|    wee-config-file.c          | Configuration file management.
-|    wee-config.c               | Configuration options for WeeChat core (file weechat.conf).
-|    wee-debug.c                | Some debug functions.
-|    wee-eval.c                 | Evaluation of expressions with references to internal vars.
-|    wee-hashtable.c            | Hashtables.
-|    wee-hdata.c                | Hdata (direct access to data using hashtables).
-|    wee-hook.c                 | Hooks.
-|    wee-infolist.c             | Infolists (lists with objects data).
-|    wee-input.c                | Input of commands/text.
-|    wee-list.c                 | Sorted lists.
-|    wee-log.c                  | Write to WeeChat log file (weechat.log).
-|    wee-network.c              | Network functions (connection to servers/proxies).
-|    wee-proxy.c                | Proxy management.
-|    wee-secure.c               | Secured data options (file sec.conf).
-|    wee-string.c               | Functions on strings.
-|    wee-upgrade-file.c         | Internal upgrade system.
-|    wee-upgrade.c              | Upgrade for WeeChat core (buffers, lines, history, ...).
-|    wee-url.c                  | URL transfer (using libcurl).
-|    wee-utf8.c                 | UTF-8 functions.
-|    wee-util.c                 | Some other functions.
-|    wee-version.c              | Functions for WeeChat version.
-|    weechat.c                  | Main functions: command line options, startup.
-| gui/                          | Functions for buffers, windows, ... (used by all interfaces).
-|    gui-bar-item.c             | Bar items.
-|    gui-bar-window.c           | Bar windows.
-|    gui-bar.c                  | Bars.
-|    gui-buffer.c               | Buffers.
-|    gui-chat.c                 | Chat functions (display message, ...).
-|    gui-color.c                | Color functions.
-|    gui-completion.c           | Completion on command line.
-|    gui-cursor.c               | Cursor mode (free movement of cursor).
-|    gui-filter.c               | Filters.
-|    gui-focus.c                | Functions about focus (for cursor mode and mouse).
-|    gui-history.c              | Commands/text saved in buffers.
-|    gui-hotlist.c              | Hotlist management (list of buffers with activity).
-|    gui-input.c                | Input functions (input bar).
-|    gui-key.c                  | Keyboard functions.
-|    gui-layout.c               | Layout.
-|    gui-line.c                 | Lines in buffers.
-|    gui-mouse.c                | Mouse.
-|    gui-nick.c                 | Nick functions.
-|    gui-nicklist.c             | Nicklist in buffers.
-|    gui-window.c               | Windows.
-|    curses/                    | Curses interface.
-|       gui-curses-bar-window.c | Display in bar windows.
-|       gui-curses-chat.c       | Display in chat area (messages).
-|       gui-curses-color.c      | Color functions.
-|       gui-curses-key.c        | Keyboard functions (default keys, read of input).
-|       gui-curses-main.c       | WeeChat main loop (waiting for keyboard/network events).
-|       gui-curses-mouse.c      | Mouse.
-|       gui-curses-term.c       | Functions about terminal.
-|       gui-curses-window.c     | Windows.
-|       headless/               | Headless mode (no interface).
-|          main.c               | Entry point for headless mode.
-|          ncurses-fake.c       | Fake ncurses library.
-|       normal/                 | Curses interface.
-|          main.c               | Entry point for Curses interface.
+| Path/file                       | Description
+| core/                           | Core functions: entry point, internal structures.
+|    wee-arraylist.c              | Array lists.
+|    wee-backtrace.c              | Display a backtrace after a crash.
+|    wee-command.c                | WeeChat core commands.
+|    wee-completion.c             | Default completions.
+|    wee-config-file.c            | Configuration file management.
+|    wee-config.c                 | Configuration options for WeeChat core (file weechat.conf).
+|    wee-debug.c                  | Some debug functions.
+|    wee-eval.c                   | Evaluation of expressions with references to internal vars.
+|    wee-hashtable.c              | Hashtables.
+|    wee-hdata.c                  | Hdata (direct access to data using hashtables).
+|    wee-hook.c                   | Hooks.
+|    wee-infolist.c               | Infolists (lists with objects data).
+|    wee-input.c                  | Input of commands/text.
+|    wee-list.c                   | Sorted lists.
+|    wee-log.c                    | Write to WeeChat log file (weechat.log).
+|    wee-network.c                | Network functions (connection to servers/proxies).
+|    wee-proxy.c                  | Proxy management.
+|    wee-secure.c                 | Secured data options (file sec.conf).
+|    wee-string.c                 | Functions on strings.
+|    wee-upgrade-file.c           | Internal upgrade system.
+|    wee-upgrade.c                | Upgrade for WeeChat core (buffers, lines, history, ...).
+|    wee-url.c                    | URL transfer (using libcurl).
+|    wee-utf8.c                   | UTF-8 functions.
+|    wee-util.c                   | Some other functions.
+|    wee-version.c                | Functions for WeeChat version.
+|    weechat.c                    | Main functions: command line options, startup.
+|    hook/                        | Hook functions.
+|       wee-hook-command-run.c    | Hook "command_run".
+|       wee-hook-command.c        | Hook "command".
+|       wee-hook-completion.c     | Hook "completion".
+|       wee-hook-config.c         | Hook "config".
+|       wee-hook-connect.c        | Hook "connect".
+|       wee-hook-fd.c             | Hook "fd".
+|       wee-hook-focus.c          | Hook "focus".
+|       wee-hook-hdata.c          | Hook "hdata".
+|       wee-hook-hsignal.c        | Hook "hsignal".
+|       wee-hook-info-hashtable.c | Hook "info_hashtable".
+|       wee-hook-info.c           | Hook "info".
+|       wee-hook-infolist.c       | Hook "infolist".
+|       wee-hook-line.c           | Hook "line".
+|       wee-hook-modifier.c       | Hook "modifier".
+|       wee-hook-print.c          | Hook "print".
+|       wee-hook-process.c        | Hook "process".
+|       wee-hook-signal.c         | Hook "signal".
+|       wee-hook-timer.c          | Hook "timer".
+| gui/                            | Functions for buffers, windows, ... (used by all interfaces).
+|    gui-bar-item.c               | Bar items.
+|    gui-bar-window.c             | Bar windows.
+|    gui-bar.c                    | Bars.
+|    gui-buffer.c                 | Buffers.
+|    gui-chat.c                   | Chat functions (display message, ...).
+|    gui-color.c                  | Color functions.
+|    gui-completion.c             | Completion on command line.
+|    gui-cursor.c                 | Cursor mode (free movement of cursor).
+|    gui-filter.c                 | Filters.
+|    gui-focus.c                  | Functions about focus (for cursor mode and mouse).
+|    gui-history.c                | Commands/text saved in buffers.
+|    gui-hotlist.c                | Hotlist management (list of buffers with activity).
+|    gui-input.c                  | Input functions (input bar).
+|    gui-key.c                    | Keyboard functions.
+|    gui-layout.c                 | Layout.
+|    gui-line.c                   | Lines in buffers.
+|    gui-mouse.c                  | Mouse.
+|    gui-nick.c                   | Nick functions.
+|    gui-nicklist.c               | Nicklist in buffers.
+|    gui-window.c                 | Windows.
+|    curses/                      | Curses interface.
+|       gui-curses-bar-window.c   | Display in bar windows.
+|       gui-curses-chat.c         | Display in chat area (messages).
+|       gui-curses-color.c        | Color functions.
+|       gui-curses-key.c          | Keyboard functions (default keys, read of input).
+|       gui-curses-main.c         | WeeChat main loop (waiting for keyboard/network events).
+|       gui-curses-mouse.c        | Mouse.
+|       gui-curses-term.c         | Functions about terminal.
+|       gui-curses-window.c       | Windows.
+|       headless/                 | Headless mode (no interface).
+|          main.c                 | Entry point for headless mode.
+|          ncurses-fake.c         | Fake ncurses library.
+|       normal/                   | Curses interface.
+|          main.c                 | Entry point for Curses interface.
 |===

 [[sources_plugins]]
@@ -253,6 +273,7 @@ WeeChat "core" is located in following directories:
 |       irc-input.c                 | Input of commands/text.
 |       irc-message.c               | Functions to manipulate IRC messages.
 |       irc-mode.c                  | Functions about channel/nick modes.
+|       irc-modelist.c              | IRC channel mode lists (+b, +e, +I, ...).
 |       irc-msgbuffer.c             | Target buffer for IRC messages.
 |       irc-nick.c                  | IRC nicks.
 |       irc-notify.c                | IRC notify lists.
@@ -269,6 +290,7 @@ WeeChat "core" is located in following directories:
 |    logger/                        | Logger plugin.
 |       logger.c                    | Main logger functions.
 |       logger-buffer.c             | Logger buffer list management.
+|       logger-command.c            | Logger commands.
 |       logger-config.c             | Logger config options (file logger.conf).
 |       logger-info.c               | Logger info/infolists/hdata.
 |       logger-tail.c               | Functions to get last lines of a file.
@@ -40,8 +40,8 @@ More info on this page: https://weechat.org/about/features
 [[gui]]
 === I heard about many GUIs for WeeChat. How can I compile/use them?

-Some remote GUIs are available, see the links on features page:
-https://weechat.org/about/features
+Some remote GUIs are available, see the remote interfaces page:
+https://weechat.org/about/interfaces

 [[compile_git]]
 === I can't compile WeeChat after cloning git repository, why?
@@ -145,13 +145,15 @@ If needed, fix your TERM variable: `export TERM="xxx"`.
 === When I'm using weechat under screen/tmux, I have weird random chars, how do I fix that?

 This may be caused by bad value of the TERM variable in your shell (look at
-output of `echo $TERM` in your terminal, *outside screen/tmux*).
-
+output of `echo $TERM` in your terminal, *outside screen/tmux*). +
 For example, _xterm-color_ may display such weird chars, you can use _xterm_
-which is OK (like many other values).
-
+which is OK (like many other values). +
 If needed, fix your TERM variable: `export TERM="xxx"`.

+If you are using gnome-terminal, check that the option
+"Ambiguous-width characters" in menu Preferences/Profile/Compatibility
+is set to `narrow`.
+
 [[osx_display_broken]]
 === I compiled WeeChat under OS X, and I see "(null)" everywhere on screen, what's wrong?

@@ -486,7 +488,7 @@ UXTerm*metaSendsEscape: true
 And then reload resources (`xrdb -override ~/.Xresources`) or restart X.

 If you are using the Mac OS X Terminal app, enable the option
-"Use option as meta key" in menu Settings / Keyboard. And then you can use the
+"Use option as meta key" in menu Settings/Keyboard. And then you can use the
 kbd:[Option] key as meta key.

 [[customize_key_bindings]]
@@ -511,6 +513,13 @@ You can bind a key, for example:
 List of default keys is in
 link:weechat_user.en.html#key_bindings[User's guide / Key bindings].

+To jump to buffers with number ≥ 100, you could define a trigger and then use
+commands like `/123` to jump to buffer #123:
+
+----
+/trigger add numberjump modifier "2000|input_text_for_buffer" "${tg_string} =~ ^/[0-9]+$" "=\/([0-9]+)=/buffer *${re:1}=" "" "" "none"
+----
+
 [[global_history]]
 === How to use global history (instead of buffer history) with up and down keys?

@@ -871,6 +880,15 @@ $ cd ~/.weechat/script
 $ curl -O https://weechat.org/files/plugins.xml.gz
 ----

+[[aspell_dictionaries]]
+=== I installed aspell dictionaries on my system, how can I use them without restarting WeeChat?
+
+You have to reload the aspell plugin:
+
+----
+/plugin reload aspell
+----
+
 [[settings]]
 == Settings

@@ -985,7 +1003,7 @@ for more information about configuration files.
 [[bug_task_patch]]
 === How should I report bugs, ask for new features or send patches?

-See: https://weechat.org/dev/support
+See: https://weechat.org/about/support

 [[gdb_error_threads]]
 === When I run WeeChat under gdb, there is error about threads, what can I do?
@@ -1021,10 +1039,10 @@ some OS' we don't have, to test WeeChat.
 There's many tasks to do (testing, code, documentation, ...)

 Please contact us via IRC or mail, look at support page:
-https://weechat.org/dev/support
+https://weechat.org/about/support

 [[donate]]
 === Can I give money or other things to WeeChat developers?

 You can give us money to help development.
-Details on https://weechat.org/about/donate
+Details on https://weechat.org/donate
@@ -1718,8 +1718,16 @@ char *str = weechat_string_format_size (2097152);  /* str == "2.10 MB" */
 free (str);
 ----

-[NOTE]
-This function is not available in scripting API.
+Script (Python), _WeeChat ≥ 2.2_:
+
+[source,python]
+----
+# prototype
+str = weechat.string_format_size(size)
+
+# example
+str = weechat.string_format_size(15200)  # == "15.2 KB"
+----

 ==== string_remove_color

@@ -2280,6 +2288,18 @@ expanded to last):
  `+thi…+` +
  `+こ>>+`

+| `+${rev:xxx}+` +
+  (_WeeChat ≥ 2.2_) |
+  Reversed string. |
+  `+${rev:Hello, world!}+` |
+  `+!dlrow ,olleH+`
+
+| `+${repeat:count,string}+` +
+  (_WeeChat ≥ 2.3_) |
+  Repeated string. |
+  `+${repeat:5,-}+` |
+  `+-----+`
+
 | `+${re:N}+` +
  (_WeeChat ≥ 1.1_) |
  Regex captured group: `0` = whole string matching, `1` to `99` = group
@@ -4879,6 +4899,51 @@ weechat_hashtable_add_to_infolist (hashtable, infolist_item, "testhash");
 [NOTE]
 This function is not available in scripting API.

+==== hashtable_add_from_infolist
+
+_WeeChat ≥ 2.2._
+
+Add infolist items in a hashtable.
+
+Prototype:
+
+[source,C]
+----
+int weechat_hashtable_add_from_infolist (struct t_hashtable *hashtable,
+                                         struct t_infolist *infolist,
+                                         const char *prefix);
+----
+
+Arguments:
+
+* _hashtable_: hashtable pointer
+* _infolist_: infolist pointer
+* _prefix_: string used as prefix for names in infolist
+
+Return value:
+
+* 1 if OK, 0 if error
+
+C example:
+
+[source,C]
+----
+weechat_hashtable_add_from_infolist (hashtable, infolist, "testhash");
+
+/* if infolist contains:
+     "testhash_name_00000"  = "key1"
+     "testhash_value_00000" = "value 1"
+     "testhash_name_00001"  = "key2"
+     "testhash_value_00001" = "value 2"
+   then following variables will be added to hashtable:
+     "key1" => "value 1"
+     "key2" => "value 2"
+*/
+----
+
+[NOTE]
+This function is not available in scripting API.
+
 ==== hashtable_remove

 _WeeChat ≥ 0.3.3._
@@ -4988,7 +5053,7 @@ Arguments:

 * _name_: name of configuration file (without path or extension)
 * _callback_reload_: function called when configuration file is reloaded with
-  `/reload` (optional, can be NULL), arguments and return value:
+  `/reload` (optional, can be NULL, see below), arguments and return value:
 ** _const void *pointer_: pointer
 ** _void *data_: pointer
 ** _struct t_config_file *config_file_: configuration file pointer
@@ -5002,6 +5067,15 @@ Arguments:
  WeeChat; if not NULL, it must have been allocated with malloc (or similar
  function) and it is automatically freed when the configuration file is freed

+Reload callback:
+
+* The callback must only call the function <<_config_reload,config_reload>>,
+  it must not remove the configuration file.
+* A callback is needed only if it does some things before and/or after the
+  call to the function <<_config_reload,config_reload>>. +
+  If no callback is given, WeeChat will call its internal reload function,
+  so the configuration file will be reloaded in all cases.
+
 Return value:

 * pointer to new configuration file, NULL if an error occurred
@@ -5593,7 +5667,7 @@ option3 = weechat.config_new_option(config_file, section, "option3", "integer",
 option4 = weechat.config_new_option(config_file, section, "option4", "string",
    "My option, type string",
    "", 0, 0, "test", "test", 1,
-    "option4_check_value_cb", ""
+    "option4_check_value_cb", "",
    "option4_change_cb", "",
    "option4_delete_cb", "")

@@ -8689,8 +8763,10 @@ For command "url:...", following options are available (see
 include::autogen/plugin_api/url_options.adoc[]

 [NOTE]
-^(1)^ When constants are available they must be used as value for option. For
-options with type "mask", format is: "value1+value2+value3".
+^(1)^ For options with type "mask", format is: "value1+value2+value3";
+for options with type "list", the list items must be separated by a newline
+(`\n`). +
+^(2)^ When constants are available they must be used as value for option.

 For URL, two extra options (strings) are allowed for input/output file:

@@ -8735,22 +8811,40 @@ my_process_cb (const void *pointer, void *data, const char *command,
 }

 /* example 1: download URL */
-struct t_hashtable *options = weechat_hashtable_new (8,
-                                                     WEECHAT_HASHTABLE_STRING,
-                                                     WEECHAT_HASHTABLE_STRING,
-                                                     NULL,
-                                                     NULL);
-if (options)
+struct t_hashtable *options_url1 = weechat_hashtable_new (8,
+                                                          WEECHAT_HASHTABLE_STRING,
+                                                          WEECHAT_HASHTABLE_STRING,
+                                                          NULL,
+                                                          NULL);
+if (options_url1)
 {
    weechat_hashtable_set (options, "file_out", "/tmp/weechat.org.html");
    struct t_hook *my_process_hook = weechat_hook_process_hashtable ("url:https://weechat.org/",
-                                                                     options,
+                                                                     options_url1,
                                                                     20000,
                                                                     &my_process_cb, NULL, NULL);
-    weechat_hashtable_free (options);
+    weechat_hashtable_free (options_url1);
 }

-/* example 2: execute a notify program with a message from someone */
+/* example 2: open URL with custom HTTP headers */
+struct t_hashtable *options_url2 = weechat_hashtable_new (8,
+                                                          WEECHAT_HASHTABLE_STRING,
+                                                          WEECHAT_HASHTABLE_STRING,
+                                                          NULL,
+                                                          NULL);
+if (options_url2)
+{
+    weechat_hashtable_set (options, "httpheader",
+                           "Header1: value1\n"
+                           "Header2: value2");
+    struct t_hook *my_process_hook = weechat_hook_process_hashtable ("url:http://localhost:8080/",
+                                                                     options_url2,
+                                                                     20000,
+                                                                     &my_process_cb, NULL, NULL);
+    weechat_hashtable_free (options_url2);
+}
+
+/* example 3: execute a notify program with a message from someone */
 struct t_hashtable *options_cmd1 = weechat_hashtable_new (8,
                                                          WEECHAT_HASHTABLE_STRING,
                                                          WEECHAT_HASHTABLE_STRING,
@@ -8769,7 +8863,7 @@ if (options_cmd1)
    weechat_hashtable_free (options_cmd1);
 }

-/* example 3: call shell to execute a command (command must be SAFE) */
+/* example 4: call shell to execute a command (command must be SAFE) */
 struct t_hashtable *options_cmd2 = weechat_hashtable_new (8,
                                                          WEECHAT_HASHTABLE_STRING,
                                                          WEECHAT_HASHTABLE_STRING,
@@ -8812,16 +8906,27 @@ hook1 = weechat.hook_process_hashtable("url:https://weechat.org/",
                                       {"file_out": "/tmp/weechat.org.html"},
                                       20000, "my_process_cb", "")

-# example 2: execute a notify program with a message from someone
-hook2 = weechat.hook_process_hashtable("my-notify-command",
+# example 2: open URL with custom HTTP headers
+options = {
+    "httpheader": "\n".join([
+        "Header1: value1",
+        "Header2: value2",
+    ]),
+}
+hook2 = weechat.hook_process_hashtable("url:http://localhost:8080/",
+                                       options,
+                                       20000, "my_process_cb", "")
+
+# example 3: execute a notify program with a message from someone
+hook3 = weechat.hook_process_hashtable("my-notify-command",
                                       {"arg1": "-from",
                                        "arg2": nick,
                                        "arg3": "-msg",
                                        "arg4": message},  # untrusted argument
                                       20000, "my_process_cb", "")

-# example 3: call shell to execute a command (command must be SAFE)
-hook3 = weechat.hook_process_hashtable("sh",
+# example 4: call shell to execute a command (command must be SAFE)
+hook4 = weechat.hook_process_hashtable("sh",
                                       {"arg1": "-c",
                                        "arg2": "ls -l /tmp | grep something"},
                                       20000, "my_process_cb", "")
@@ -9011,11 +9116,287 @@ hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
                            "my_connect_cb", "")
 ----

+==== hook_line
+
+_WeeChat ≥ 2.3._
+
+Hook a line to be printed in a buffer.
+
+When a line is printed in a buffer, hooks are called in this order:
+
+* <<_hook_line,hook line>> (this hook): it can change the buffer, prefix,
+  message, tags, notify level, … (see below)
+* <<_hook_modifier,hook modifier>> "<<hook_modifier_weechat_print,weechat_print>>":
+  it can change the prefix and message on a buffer with formatted content
+* <<_hook_print,hook print>>: called when the line has been added in a buffer
+  with formatted content (nothing can be changed directly with this hook).
+
+[NOTE]
+The "line" hook is the only one among these three hooks that can work on
+buffers with free content.
+
+Prototype:
+
+[source,C]
+----
+struct t_hook *weechat_hook_line (const char *buffer_type,
+                                  const char *buffer_name,
+                                  const char *tags,
+                                  struct t_hashtable *(*callback)(const void *pointer,
+                                                                  void *data,
+                                                                  struct t_hashtable *line),
+                                  const void *callback_pointer,
+                                  void *callback_data);
+----
+
+Arguments:
+
+* _buffer_type_: catch lines on the given buffer type (if NULL or empty string,
+  _formatted_ is the default):
+** _formatted_: catch lines on formatted buffers only (default)
+** _free_: catch lines on buffers with free content only
+** _*_: catch lines on all buffer types
+* _buffer_name_: comma-separated list of buffer masks
+  (see <<_buffer_match_list,buffer_match_list>>); NULL, empty string or "*"
+  matches any buffer
+* _tags_: catch only messages with these tags (optional): comma-separated list
+   of tags that must be in message (logical "or"); it is possible to combine
+   many tags as a logical "and" with separator `+++`; wildcard `+*+` is allowed
+   in tags
+* _callback_: function called when a line is added in a buffer, arguments and
+  return value:
+** _const void *pointer_: pointer
+** _void *data_: pointer
+** _struct t_hashtable *line_: hashtable with the line info, keys and values are
+   strings (see table below)
+** return value: hashtable with new values (see table below)
+* _callback_pointer_: pointer given to callback when it is called by WeeChat
+* _callback_data_: pointer given to callback when it is called by WeeChat;
+  if not NULL, it must have been allocated with malloc (or similar function)
+  and it is automatically freed when the hook is deleted
+
+Return value:
+
+* pointer to new hook, NULL if error occurred
+
+Line data sent to the callback is a hashtable, with following values
+(keys and values are strings):
+
+[width="100%",cols="^1,3,3,2",options="header"]
+|===
+| Key | Value (formatted buffer) | Value (free buffer) | Examples
+
+| buffer |
+  Buffer pointer. |
+  Buffer pointer. |
+  `+0x12345678+`
+
+| buffer_name |
+  Buffer name. |
+  Buffer name. |
+  `+core.weechat+` +
+  `+irc.server.freenode+` +
+  `+irc.freenode.#weechat+`
+
+| buffer_type |
+  "formatted" |
+  "free" |
+  `+formatted+` +
+  `+free+`
+
+| y |
+  N/A ("-1"). |
+  Line number (≥ "0"). |
+  `+-1+` +
+  `+8+`
+
+| date |
+  Line date (timestamp). |
+  N/A ("0"). |
+  `+1533792000+`
+
+| date_printed |
+  Date when line was displayed (timestamp). |
+  N/A ("0"). |
+  `+1533792012+`
+
+| str_time |
+  Date for display (possible color codes inside). |
+  N/A (empty string). |
+  `+09:07:20+`
+
+| tags_count |
+  Number of tags in the line (≥ "0"). |
+  N/A ("0"). |
+  `+2+`
+
+| tags |
+  Comma-separated list of tags. |
+  N/A (empty string). |
+  `+irc_join,nick_test+`
+
+| displayed |
+  "0" = line is filtered (hidden) +
+  "1" = line is not filtered (displayed). |
+  "0" = line is filtered (hidden) +
+  "1" = line is not filtered (displayed). |
+  `+0+` +
+  `+1+`
+
+| notify_level |
+  "0" = low level +
+  "1" = message +
+  "2" = private message +
+  "3" = highlight |
+  N/A ("0"). |
+  `+2+`
+
+| highlight |
+  "0" = no highlight +
+  "1" = line has highlight. |
+  N/A ("0"). |
+  `+0+` +
+  `+1+`
+
+| prefix |
+  Prefix of the line. |
+  N/A (empty string). |
+  `+-->+`
+
+| message |
+  Message of the line. |
+  Message of the line. |
+  `+test (~test@example.com) has joined #channel+`
+|===
+
+The callback can return a hashtable with some fields to update the line.
+Any invalid value in a field is silently ignored by WeeChat.
+
+The following keys can be set in the hashtable (keys and values are strings
+in this hashtable):
+
+[width="100%",cols="^1,2,2,5",options="header"]
+|===
+| Key | Allowed value (formatted buffer) | Allowed value (free buffer) | Result
+
+| buffer |
+  Pointer of a buffer with formatted content. |
+  Pointer of a buffer with free content. |
+  The line is displayed on this buffer. +
+  If the value is empty, the line is deleted (anything else in the hashtable
+  is then ignored); the next hooks of type "line" are not called.
+
+| buffer_name |
+  Name of a buffer with formatted content. |
+  Name of a buffer with free content. |
+  The line is displayed on this buffer. +
+  If `buffer` is also set, the value of `buffer_name` has higher priority and is used. +
+  If the value is empty, the line is deleted (anything else in the hashtable
+  is then ignored); the next hooks of type "line" are not called.
+
+| y |
+  N/A. |
+  Integer (≥ "0"). |
+  The line number is set to this value.
+
+| date |
+  Timestamp. |
+  N/A. |
+  The date is set to this value. +
+  The value of `str_time` is updated accordingly.
+
+| date_printed |
+  Timestamp. |
+  N/A. |
+  The printed date is set to this timestamp (not displayed).
+
+| str_time |
+  String. |
+  N/A. |
+  This string is used to display the date line. +
+  If `date` is also set, the value of `str_time` has higher priority and is used.
+
+| tags |
+  String. |
+  N/A. |
+  The line tags are replaced with this comma-separated list of tags. +
+  The values of `notify_level` and `highlight` are updated accordingly.
+
+| notify_level |
+  Integer ("0" to "3"). |
+  N/A. |
+  The notify level is set to this value. The hotlist will be updated
+  accordingly once the line is added in the buffer. +
+  The value of `highlight` is updated accordingly. +
+  If `tags` is also set, the value of `notify_level` has higher priority and is used.
+
+| highlight |
+  Integer ("0" or "1"). |
+  N/A. |
+  "0" disables highlight on the line, "1" forces a highlight on the line. +
+  If `tags` or `notify_level` are set, the value of `highlight` has higher
+  priority and is used.
+
+| prefix |
+  String. |
+  N/A. |
+  The line prefix is set to this value.
+
+| message |
+  String. |
+  String. |
+  The line message is set to this value.
+|===
+
+C example:
+
+[source,C]
+----
+int
+my_line_cb (const void *pointer, void *data, struct t_hasbtable *line)
+{
+    struct t_hashtable *hashtable;
+
+    hashtable = weechat_hashtable_new (8,
+                                       WEECHAT_HASHTABLE_STRING,
+                                       WEECHAT_HASHTABLE_STRING,
+                                       NULL,
+                                       NULL);
+    /* force a highlight on the line */
+    weechat_hashtable_set (hashtable, "highlight", "1");
+    return hashtable;
+}
+
+/* catch lines with tag "irc_join" */
+struct t_hook *my_line_hook =
+    weechat_hook_line ("", "", "irc_join", &my_line_cb, NULL, NULL);
+----
+
+Script (Python):
+
+[source,python]
+----
+# prototype
+hook = weechat.hook_line(buffer_type, buffer_name, tags, callback, callback_data)
+
+# example
+def my_line_cb(data, line):
+    # force a highlight on the line
+    return {"highlight": "1"}
+
+# catch lines with tag "irc_join"
+hook = weechat.hook_line("", "", "irc_join", "my_line_cb", "")
+----
+
 ==== hook_print

 _Updated in 0.4.3, 1.0, 1.5._

-Hook a message printed.
+Hook a message printed. It is called when a line has been added in a buffer
+with formatted content.
+
+For more information on the hooks called when a line is printed, see
+<<_hook_line,hook_line>>.

 Prototype:

@@ -9201,24 +9582,28 @@ List of signals sent by WeeChat and plugins:
 | irc | xxx,irc_in_yyy ^(1)^ |
  String: message. |
  IRC message from server (before irc plugin uses it,
-  signal sent only if message is *not* ignored).
+  signal sent only if message is *not* ignored). +
+  Since version 2.2, the whole IRC message is sent, including tags.

 | irc | xxx,irc_in2_yyy ^(1)^ |
  String: message. |
  IRC message from server (after irc plugin uses it,
-  signal sent only if message is *not* ignored).
+  signal sent only if message is *not* ignored). +
+  Since version 2.2, the whole IRC message is sent, including tags.

 | irc | xxx,irc_raw_in_yyy ^(1)^ +
  _(WeeChat ≥ 0.3.2)_ |
  String: message. |
  IRC message from server (before irc plugin uses it,
-  signal sent even if message is ignored).
+  signal sent even if message is ignored). +
+  Since version 2.2, the whole IRC message is sent, including tags.

 | irc | xxx,irc_raw_in2_yyy ^(1)^ +
  _(WeeChat ≥ 0.3.2)_ |
  String: message. |
  IRC message from server (after irc plugin uses it,
-  signal sent even if message is ignored).
+  signal sent even if message is ignored). +
+  Since version 2.2, the whole IRC message is sent, including tags.

 | irc | xxx,irc_out1_yyy ^(1)^ +
  _(WeeChat ≥ 0.3.7)_ |
@@ -9620,7 +10005,7 @@ List of signals sent by WeeChat and plugins:
  Filters disabled.

 | weechat | hotlist_changed |
-  - |
+  Pointer: buffer (can be NULL). |
  Hotlist changed.

 | weechat | input_paste_pending |
@@ -10565,110 +10950,68 @@ List of modifiers used by WeeChat and plugins:
 |===
 | Modifier | Modifier data | String | Output

-| charset_decode |
-  plugin.buffer_name |
-  Any string. |
-  String decoded from charset found for plugin/buffer to UTF-8.
-
-| charset_encode |
-  plugin.buffer_name |
-  Any string. |
-  String encoded from UTF-8 to charset found for plugin/buffer.
-
-| irc_color_decode |
-  "1" to keep colors, "0" to remove colors |
-  Any string. |
-  String with IRC colors converted to WeeChat colors (or IRC colors removed).
-
-| irc_color_encode |
-  "1" to keep colors, "0" to remove colors |
-  Any string. |
-  String with IRC colors (or IRC colors removed).
-
-| irc_color_decode_ansi +
-  _(WeeChat ≥ 1.0)_ |
-  "1" to keep colors, "0" to remove colors |
-  Any string. |
-  String with ANSI colors converted to IRC colors (or ANSI colors removed).
-
-| irc_command_auth +
-  _(WeeChat ≥ 0.4.1)_ |
-  Server name |
-  Authentication command (for example: `+/msg nickserv identify password+`). |
-  command with hidden password (for example: `+/msg nickserv identify ********+`).
-
-| irc_message_auth +
-  _(WeeChat ≥ 0.4.1)_ |
-  Server name |
-  Message displayed after `/msg` sent to nickserv. |
-  Message with hidden password.
-
-| irc_in_xxx ^(1)^ |
+| [[hook_modifier_irc_in_xxx]] irc_in_xxx ^(1)^ |
  Server name |
  Content of message received from IRC server (before charset decoding). |
  New content of message.

-| irc_in2_xxx ^(1)^ +
+| [[hook_modifier_irc_in2_xxx]] irc_in2_xxx ^(1)^ +
  _(WeeChat ≥ 0.3.5)_ |
  Server name |
  Content of message received from IRC server (after charset decoding). |
  New content of message.

-| irc_out1_xxx ^(1)^ +
+| [[hook_modifier_irc_out1_xxx]] irc_out1_xxx ^(1)^ +
  _(WeeChat ≥ 0.3.7)_ |
  Server name |
  Content of message about to be sent to IRC server before automatic split
  (to fit in 512 bytes by default). |
  New content of message.

-| irc_out_xxx ^(1)^ |
+| [[hook_modifier_irc_out_xxx]] irc_out_xxx ^(1)^ |
  Server name |
  Content of message about to be sent to IRC server after automatic split
  (to fit in 512 bytes by default). |
  New content of message.

-| color_decode_ansi +
-  _(WeeChat ≥ 1.0)_ |
-  "1" to keep colors, "0" to remove colors |
-  Any string. |
-  String with ANSI colors converted to WeeChat colors (or ANSI colors removed).
-
-| bar_condition_yyy ^(2)^ |
+| [[hook_modifier_bar_condition_yyy]] bar_condition_yyy ^(2)^ |
  String with window pointer ("0x123..") |
  Empty string. |
  "1" to display bar, "0" to hide it.

-| history_add +
+| [[hook_modifier_history_add]] history_add +
  _(WeeChat ≥ 0.3.2)_ |
  String with buffer pointer ("0x123..") |
  Content of command line to add in command history (buffer and global). |
  String added to command history.

-| input_text_content |
+| [[hook_modifier_input_text_content]] input_text_content |
  String with buffer pointer ("0x123..") |
  Content of command line. |
  New content of command line.

-| input_text_display |
+| [[hook_modifier_input_text_display]] input_text_display |
  String with buffer pointer ("0x123..") |
  Content of command line, without cursor tag. |
  New string, for display only (command line is not changed).

-| input_text_display_with_cursor |
+| [[hook_modifier_input_text_display_with_cursor]] input_text_display_with_cursor |
  String with buffer pointer ("0x123..") |
  Content of command line, with cursor tag. |
  New string, for display only (command line is not changed).

-| input_text_for_buffer +
+| [[hook_modifier_input_text_for_buffer]] input_text_for_buffer +
  _(WeeChat ≥ 0.3.7)_ |
  String with buffer pointer ("0x123..") |
  Content of command line sent to buffer (text or command). |
  New content of command line sent to buffer.

-| weechat_print |
+| [[hook_modifier_weechat_print]] weechat_print |
  plugin + ";" + buffer_name + ";" + tags |
  Message printed. |
-  New message printed.
+  New message printed. +
+  For more information on the hooks called when a line is printed, see
+  <<_hook_line,hook_line>>.
 |===

 [NOTE]
@@ -10742,6 +11085,57 @@ Return value:

 * string modified, NULL if error occurred

+List of modifiers defined by WeeChat and plugins that can be used:
+
+[width="100%",cols="^2,3,4,4",options="header"]
+|===
+| Modifier | Modifier data | String | Output
+
+| [[hook_modifier_charset_decode]] charset_decode |
+  plugin.buffer_name |
+  Any string. |
+  String decoded from charset found for plugin/buffer to UTF-8.
+
+| [[hook_modifier_charset_encode]] charset_encode |
+  plugin.buffer_name |
+  Any string. |
+  String encoded from UTF-8 to charset found for plugin/buffer.
+
+| [[hook_modifier_irc_color_decode]] irc_color_decode |
+  "1" to keep colors, "0" to remove colors |
+  Any string. |
+  String with IRC colors converted to WeeChat colors (or IRC colors removed).
+
+| [[hook_modifier_irc_color_encode]] irc_color_encode |
+  "1" to keep colors, "0" to remove colors |
+  Any string. |
+  String with IRC colors (or IRC colors removed).
+
+| [[hook_modifier_irc_color_decode_ansi]] irc_color_decode_ansi +
+  _(WeeChat ≥ 1.0)_ |
+  "1" to keep colors, "0" to remove colors |
+  Any string. |
+  String with ANSI colors converted to IRC colors (or ANSI colors removed).
+
+| [[hook_modifier_irc_command_auth]] irc_command_auth +
+  _(WeeChat ≥ 0.4.1)_ |
+  Server name |
+  Authentication command (for example: `+/msg nickserv identify password+`). |
+  command with hidden password (for example: `+/msg nickserv identify ********+`).
+
+| [[hook_modifier_irc_message_auth]] irc_message_auth +
+  _(WeeChat ≥ 0.4.1)_ |
+  Server name |
+  Message displayed after `/msg` sent to nickserv. |
+  Message with hidden password.
+
+| [[hook_modifier_color_decode_ansi]] color_decode_ansi +
+  _(WeeChat ≥ 1.0)_ |
+  "1" to keep colors, "0" to remove colors |
+  Any string. |
+  String with ANSI colors converted to WeeChat colors (or ANSI colors removed).
+|===
+
 C example:

 [source,C]
@@ -47,34 +47,6 @@ option name).
 WeeChat immediately uses the new value (you *never* need to restart WeeChat
 after changes to configuration).

-You can use `/set` option with partial name and wildcard "*" at the beginning
-or end to display all options containing letters.
-For example:
-
-* Display all options (WeeChat and plugins):
-
----
-/set
----
-
-* Display WeeChat options:
-
----
-/set weechat.*
----
-
-* Display IRC plugin options:
-
----
-/set irc.*
----
-
-You can display help for an option with `/help`, for example:
-
----
-/help weechat.look.highlight
----
-
 All settings are saved when WeeChat ends (or with `/save` command to force
 a write of the options).

@@ -86,6 +58,32 @@ that were not yet saved with `/save`). +
 You can use the command `/set`, which checks the value and applies immediately
 the changes.

+Help is available for options:
+
+----
+/help config.section.option
+----
+
+The plugin _fset_ allows you to easily browse options and change them.
+
+For example to display WeeChat options:
+
+----
+/fset weechat.*
+----
+
+IRC options:
+
+----
+/fset irc.*
+----
+
+The `/fset` command has completion on part of option names, so for example if
+you type `/fset hot` and press kbd:[Tab] this is completed as `/fset hotlist`.
+If you press kbd:[Enter], options about the hotlist are displayed.
+
+For more information about `/fset` command and keys, see `/help fset`.
+
 [[core_vs_plugins]]
 == Core vs plugins

@@ -107,6 +105,10 @@ You can add an IRC server with `/server` command, for example:
 /server add freenode chat.freenode.net
 ----

+In this command, `freenode` is the internal server name used by WeeChat:
+you'll be able to connect with `/connect freenode` and the server options
+are _irc.server.freenode.xxx_.
+
 As usual, help is available if you're lost:

 ----
@@ -205,7 +207,7 @@ To remove a value of a server option, and use the default value instead,
 for example to use default nicks (irc.server_default.nicks):

 ----
-/set irc.server.freenode.nicks null
+/unset irc.server.freenode.nicks
 ----

 Other options: you can setup other options with following command ("xxx" is
@@ -224,8 +226,7 @@ option name):

 [NOTE]
 This command can be used to create and connect to a new server without using
-`/server` command (should I repeat you can see help for this command with
-`/help connect` ?).
+`/server` command (see `/help connect`).

 By default, server buffers are merged with WeeChat _core_ buffer. To switch
 between _core_ buffer and server buffers, you can use kbd:[Ctrl+x].
@@ -301,8 +302,6 @@ Commands to manage buffers and windows:
 /window
 ----

-(I'll not repeat here that you can get help with /help on these commands)
-
 For example, to vertically split your screen into a small window (1/3 width),
 and a large window (2/3), use command:

@@ -324,6 +323,7 @@ but you should know at least some vital keys:

 - kbd:[Alt+←] / kbd:[Alt+→] or kbd:[F5] / kbd:[F6]: switch to previous/next
  buffer
+- kbd:[F1] / kbd:[F2]: scroll bar with list of buffers ("buflist")
 - kbd:[F7] / kbd:[F8]: switch to previous/next window (when screen is split)
 - kbd:[F9] / kbd:[F10]: scroll title bar
 - kbd:[F11] / kbd:[F12]: scroll nicklist
@@ -489,23 +489,23 @@ quit
 Messages are sent as binary data, using following format (with size in bytes):

 ....
-┌────────╥─────────────╥────╥────────┬──────────╥───────╥────────┬──────────┐
-│ length ║ compression ║ id ║ type 1 │ object 1 ║  ...  ║ type N │ object N │
-└────────╨─────────────╨────╨────────┴──────────╨───────╨────────┴──────────┘
- └──────┘ └───────────┘ └──┘ └──────┘ └────────┘         └──────┘ └────────┘
-     4          1        ??      3        ??                 3        ??
- └────────────────────┘ └──────────────────────────────────────────────────┘
-       header (5)                        compressed data (??)
- └─────────────────────────────────────────────────────────────────────────┘
-                               _length_ bytes
+┌────────╥─────────────╥─────────╥────────┬──────────╥───────╥────────┬──────────┐
+│ length ║ compression ║   id    ║ type 1 │ object 1 ║  ...  ║ type N │ object N │
+└────────╨─────────────╨─────────╨────────┴──────────╨───────╨────────┴──────────┘
+ └──────┘ └───────────┘ └───────┘ └──────┘ └────────┘         └──────┘ └────────┘
+     4          1        4 + str      3        ??                 3        ??
+ └────────────────────┘ └───────────────────────────────────────────────────────┘
+       header (5)                          compressed data (??)
+ └──────────────────────────────────────────────────────────────────────────────┘
+                               'length' bytes
 ....

-* _length_ (unsigned integer): number of bytes of whole message (including
-  this field)
+* _length_ (unsigned integer, 4 bytes): number of bytes of whole message
+  (including this field)
 * _compression_ (byte): flag:
 ** _0x00_: following data is not compressed
 ** _0x01_: following data is compressed with _zlib_
-* _id_ (string): identifier sent by client (before command name); it can be
+* _id_ (string, 4 bytes + content): identifier sent by client (before command name); it can be
  empty (string with zero length and no content) if no identifier was given in
  command
 * _type_ (3 chars): a type: 3 letters (see table below)
@@ -1569,13 +1569,13 @@ hdata buffer:gui_buffers(*)/lines/first_line(*)/data
 └───────────────────────────┘ └───┘ └──┘
      h-path (hdata names)     keys  count

-   ──╥───────────┬───────────┬───────────┬───────╥──
- ... ║ 0x23cf970 │ 0x23cfb60 │ 0x23d5f40 │ ..... ║ ...
-   ──╨───────────┴───────────┴───────────┴───────╨──
-      └─────────────────────────────────┘ └─────┘
-               p-path (pointers)          objects
-      └─────────────────────────────────────────┘
-                         line 1
+   ──╥───────────┬───────────┬───────────┬───────────┬───────╥──
+ ... ║ 0x23cf970 │ 0x23cfb60 │ 0x23d5f40 │ 0x23d8a10 │ ..... ║ ...
+   ──╨───────────┴───────────┴───────────┴───────────┴───────╨──
+      └─────────────────────────────────────────────┘ └─────┘
+                    p-path (pointers)                 objects
+      └─────────────────────────────────────────────────────┘
+                              line 1

   ──╥───────────┬───────────┬───────────┬───────╥──────────────┐
 ... ║ 0x23cf970 │ 0x23cfb60 │ 0x23d6110 │ ..... ║ ............ │
@@ -430,6 +430,7 @@ List of functions in script API:
  string_has_highlight +
  string_has_highlight_regex +
  string_mask_to_regex +
+  string_format_size +
  string_remove_color +
  string_is_command_char +
  string_input_for_buffer +
@@ -516,6 +517,7 @@ List of functions in script API:
  hook_process +
  hook_process_hashtable +
  hook_connect +
+  hook_line +
  hook_print +
  hook_signal +
  hook_signal_send +
@@ -94,34 +94,34 @@ compile WeeChat.

 [width="100%",cols="6,^3,^3,.^13",options="header"]
 |===
-| Package ^(1)^               | Version       | Required | Feature
+| Package ^(1)^          | Version       | Required | Feature
 | C compiler
-  (gcc, clang, ...)           |               | *yes*    | Build.
-| C++ compiler                |               |          | Build and run tests, JavaScript plugin.
-| cmake                       |               | *yes*    | Build (autotools still possible, but cmake is recommended).
-| pkg-config                  |               | *yes*    | Detect installed libraries.
-| libncursesw5-dev ^(2)^      |               | *yes*    | Ncurses interface.
-| libcurl4-gnutls-dev         |               | *yes*    | URL transfer.
-| zlib1g-dev                  |               | *yes*    | Compression of packets in relay plugin (weechat protocol), script plugin.
-| libgcrypt20-dev             |               | *yes*    | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin.
-| libgnutls28-dev             | ≥ 2.2.0 ^(3)^ |          | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
-| gettext                     |               |          | Internationalization (translation of messages; base language is English).
-| ca-certificates             |               |          | Certificates for SSL connections.
+  (gcc, clang, ...)      |               | *yes*    | Build.
+| C++ compiler           |               |          | Build and run tests, JavaScript plugin.
+| cmake                  |               | *yes*    | Build (autotools still possible, but cmake is recommended).
+| pkg-config             |               | *yes*    | Detect installed libraries.
+| libncursesw5-dev ^(2)^ |               | *yes*    | Ncurses interface.
+| libcurl4-gnutls-dev    |               | *yes*    | URL transfer.
+| zlib1g-dev             |               | *yes*    | Compression of packets in relay plugin (weechat protocol), script plugin.
+| libgcrypt20-dev        |               | *yes*    | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin.
+| libgnutls28-dev        | ≥ 2.2.0 ^(3)^ |          | SSL connection to IRC server, support of SSL in relay plugin, IRC SASL authentication (ECDSA-NIST256P-CHALLENGE).
+| gettext                |               |          | Internationalization (translation of messages; base language is English).
+| ca-certificates        |               |          | Certificates for SSL connections.
 | libaspell-dev
-  ∥ libenchant-dev            |               |          | Aspell plugin.
-| python-dev                  | ≥ 2.6 ^(4)^   |          | Python plugin.
-| libperl-dev                 |               |          | Perl plugin.
-| ruby-2.3, ruby2.3-dev       | ≥ 1.8         |          | Ruby plugin.
-| liblua5.3-dev               |               |          | Lua plugin.
-| tcl-dev                     | ≥ 8.5         |          | Tcl plugin.
-| guile-2.0-dev               | ≥ 2.0         |          | Guile (scheme) plugin.
-| libv8-dev                   | ≤ 3.24.3      |          | JavaScript plugin.
-| php7.2-dev, libphp7.2-embed | ≥ 7.0         |          | PHP plugin.
-| libxml2-dev                 |               |          | PHP plugin.
-| libargon2-0-dev             |               |          | PHP plugin (if PHP ≥ 7.2).
-| libsodium-dev               |               |          | PHP plugin (if PHP ≥ 7.2).
-| asciidoctor                 | ≥ 1.5.4       |          | Build man page and documentation.
-| libcpputest-dev             | ≥ 3.4         |          | Build and run tests.
+  ∥ libenchant-dev       |               |          | Aspell plugin.
+| python-dev             | ≥ 2.6 ^(4)^   |          | Python plugin.
+| libperl-dev            |               |          | Perl plugin.
+| ruby2.5, ruby2.5-dev   | ≥ 1.8         |          | Ruby plugin.
+| liblua5.3-dev          |               |          | Lua plugin.
+| tcl-dev                | ≥ 8.5         |          | Tcl plugin.
+| guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) plugin.
+| libv8-dev              | ≤ 3.24.3      |          | JavaScript plugin.
+| php-dev, libphp-embed  | ≥ 7.0         |          | PHP plugin.
+| libxml2-dev            |               |          | PHP plugin.
+| libargon2-0-dev        |               |          | PHP plugin (if PHP ≥ 7.2).
+| libsodium-dev          |               |          | PHP plugin (if PHP ≥ 7.2).
+| asciidoctor            | ≥ 1.5.4       |          | Build man page and documentation.
+| libcpputest-dev        | ≥ 3.4         |          | Build and run tests.
 |===

 [NOTE]
@@ -423,7 +423,7 @@ ulimit -c 200000
 ==== Get backtrace with gdb

 When WeeChat crashes, your system will create a file _core_ or _core.12345_
-(_12345_ is process id).
+(_12345_ is process id) if the <<core_files,option is enabled>>.
 This file is created in directory where you have run WeeChat (this is *not*
 directory where WeeChat is installed!).

@@ -2629,7 +2629,7 @@ ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
 You can generate the key with this command:

 ----
-$ openssl ecparam -genkey -name prime256v1 >~/.weechat/ecdsa.pem
+$ openssl ecparam -genkey -name prime256v1 -out ~/.weechat/ecdsa.pem
 ----

 Get the public key (encoded as base64) with this command:
@@ -3488,6 +3488,43 @@ Using triggers require you to know how the signals, modifiers, ... are working.
 So you might consider reading the
 link:weechat_plugin_api.en.html#hooks[WeeChat plugin API reference / Hooks].

+[[trigger_default]]
+==== Default triggers
+
+WeeChat creates 5 triggers by default, which can be disabled, updated or
+deleted:
+
+* a _beep_ trigger for notifications
+* four other triggers to hide passwords on screen
+
+List of default triggers:
+
+[width="100%",cols="5m,3,22",options="header"]
+|===
+| Name | Hook | Description
+
+| beep | print |
+  Beep on highlight/private message.
+
+| cmd_pass | modifier |
+  Hide password in commands:
+  `pass:[/msg nickserv id\|identify\|set password\|ghost\|release\|regain\|recover]`,
+  `pass:[/oper]`,
+  `pass:[/quote pass]`,
+  `pass:[/set *password*]`,
+  `pass:[/secure passphrase\|decrypt\|set]`.
+
+| cmd_pass_register | modifier |
+  Hide password in command `pass:[/msg nickserv register]`.
+
+| msg_auth | modifier |
+  Hide password in IRC auth message displayed (message received from server
+  after the user issued the command).
+
+| server_pass | modifier |
+  Hide server password in commands `/server` and `/connect`.
+|===
+
 [[trigger_anatomy]]
 ==== Anatomy of a trigger

@@ -3502,8 +3539,8 @@ A trigger has the following options (names are
  When option is `off`, the trigger is disabled and actions are not executed
  any more.

-| hook | `signal`, `hsignal`, `modifier`, `print`, `command`, `command_run`,
-  `timer`, `config`, `focus` |
+| hook | `signal`, `hsignal`, `modifier`, `line`, `print`, `command`,
+  `command_run`, `timer`, `config`, `focus` |
  The hook used in trigger. For more information, see
  link:weechat_plugin_api.en.html#hooks[WeeChat plugin API reference / Hooks].

@@ -3538,7 +3575,7 @@ For example, the default _beep_ trigger has following options:
 trigger.trigger.beep.enabled = on
 trigger.trigger.beep.hook = print
 trigger.trigger.beep.arguments = ""
-trigger.trigger.beep.conditions = "${tg_highlight} || ${tg_msg_pv}"
+trigger.trigger.beep.conditions = "${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})"
 trigger.trigger.beep.regex = ""
 trigger.trigger.beep.command = "/print -beep"
 trigger.trigger.beep.return_code = ok
@@ -3590,6 +3627,17 @@ The arguments depend on the hook used. They are separated by semicolons.
  `+5000\|input_text_display;5000\|history_add+` |
  link:weechat_plugin_api.en.html#_hook_modifier[hook_modifier]

+| line |
+  1. buffer type +
+  2. buffer name +
+  3. tags |
+  `+formatted+` +
+  `+free+` +
+  `+*;irc.freenode.*+` +
+  `+*;irc.freenode.#weechat+` +
+  `+formatted;irc.freenode.#weechat;irc_notice+` |
+  link:weechat_plugin_api.en.html#_hook_line[hook_line]
+
 | print |
  1. buffer name +
  2. tags +
@@ -3654,7 +3702,7 @@ Example: the default _beep_ trigger uses this condition to make a beep only on
 highlight or private message:

 ----
-${tg_highlight} || ${tg_msg_pv}
+${tg_displayed} && (${tg_highlight} || ${tg_msg_pv})
 ----

 [[trigger_regex]]
@@ -3663,24 +3711,33 @@ ${tg_highlight} || ${tg_msg_pv}
 The regular expression is used to change variables in callback hashtable.

 The format is: "/regex/replace" or "/regex/replace/var" (where _var_ is a
-variable of the hashtable). +
+variable of the hashtable).
+
+If _var_ does not exist in the hashtable, it is created automatically with an
+empty value. This allows to create custom temporary variables.
+
 If _var_ is not specified, the default variable is used, it depends on hook
 type:

-[width="50%",cols="4,5m",options="header"]
+[width="100%",cols="2,3,7",options="header"]
 |===
-| Hook        | Default variable
-| signal      | tg_signal_data
-| hsignal     |
-| modifier    | tg_string
-| print       | tg_message
-| command     | tg_argv_eol1
-| command_run | tg_command
-| timer       | tg_remaining_calls
-| config      | tg_value
-| focus       |
+| Hook        | Default variable   | Update allowed ^(1)^
+| signal      | tg_signal_data     |
+| hsignal     |                    |
+| modifier    | tg_string          | tg_string
+| line        | message            | buffer, buffer_name, y, date, date_printed, str_time, tags, notify_level, highlight, prefix, message
+| print       | tg_message         |
+| command     | tg_argv_eol1       |
+| command_run | tg_command         |
+| timer       | tg_remaining_calls |
+| config      | tg_value           |
+| focus       |                    |
 |===

+[NOTE]
+^(1)^ All variables can be updated in the trigger, but only these variables
+have an effect on the value returned by the trigger and used by WeeChat.
+
 Many regular expressions can be separated by a space, for example:
 "/regex1/replace1/var1 /regex2/replace2/var2".

@@ -3835,6 +3892,45 @@ For the _weechat_print_ modifier, variables using message tags are added (see
 If the modifier contains an IRC message, the message is parsed and extra data is
 added in hashtable (see <<trigger_data_signal,hook signal>>).

+[[trigger_data_line]]
+===== Line
+
+The "line" callback sets following variables in hashtable:
+
+[width="100%",cols="3m,2,14",options="header"]
+|===
+| Variable           | Type    | Description
+| buffer             | pointer | Buffer.
+| buffer_name        | string  | Buffer name.
+| buffer_type        | string  | Buffer type ("formatted" or "free").
+| y                  | string  | Line number for a buffer with free content (≥ 0), -1 for a buffer with formatted content.
+| date               | string  | Line date (timestamp).
+| date_printed       | string  | Date when line was displayed (timestamp).
+| str_time           | string  | Date for display. It may contain color codes.
+| tags               | string  | Tags of message (with comma added at beginning/end of string).
+| displayed          | string  | "1" if displayed, "0" if line filtered.
+| notify_level       | string  | "0" = low level, "1" = message, "2" = private message, "3" = highlight
+| highlight          | string  | "1" if highlight, otherwise "0".
+| prefix             | string  | Prefix.
+| tg_prefix_nocolor  | string  | Prefix without color codes.
+| message            | string  | Message.
+| tg_message_nocolor | string  | Message without color codes.
+|===
+
+Variables set using tags in message:
+
+[width="100%",cols="3m,2,14",options="header"]
+|===
+| Variable           | Type   | Description
+| tg_tags_count      | string | Number of tags in message.
+| tg_tag_nick        | string | Nick (from tag "nick_xxx").
+| tg_tag_prefix_nick | string | Color of nick in prefix (from tag "prefix_nick_ccc").
+| tg_tag_host        | string | User name and host, format: username@host (from tag "host_xxx").
+| tg_tag_notify      | string | Notify level (_none_, _message_, _private_, _highlight_).
+| tg_notify          | string | Notify level, if different from _none_.
+| tg_msg_pv          | string | "1" for a private message, otherwise "0".
+|===
+
 [[trigger_data_print]]
 ===== Print

@@ -3853,8 +3949,7 @@ The "print" callback sets following variables in hashtable:
 | tg_message_nocolor | string  | Message without color codes.
 |===

-Variables set using tags in message (they are set in modifier _weechat_print_
-too):
+Variables set using tags in message:

 [width="100%",cols="3m,2,14",options="header"]
 |===
@@ -4069,4 +4164,4 @@ For support with IRC, on server _chat.freenode.net_:
 ** _#weechat-de_ (German)
 ** _#weechat-fi_ (Finnish)

-For other ways of support, see: https://weechat.org/dev/support
+For other ways of support, see: https://weechat.org/about/support
--- a/Show More
+++ b/Show More