Version 0.4.0-rc1

xfer: fix memory leak when refreshing xfer buffer
script: add missing close of file in case of error when computing MD5 checksum of a file
2026-06-25 04:16:38 +02:00 · 2012-12-26 16:41:55 +01:00 · 2012-12-25 17:02:11 +01:00 · 2012-12-25 17:00:58 +01:00 · 2012-12-25 16:59:46 +01:00 · 2012-12-25 16:58:58 +01:00
461 changed files with 65412 additions and 28474 deletions
@@ -18,7 +18,9 @@ ABOUT-NLS
 autom4te*
 build*/*
 config.guess
-config.h*
+config.h
+config.h.in*
+config-git.h
 config.log
 config.rpath
 config.status
@@ -40,9 +42,6 @@ POTFILES
 remove-potcdate.sed
 Rules-quot
 weechat.pc
-doc/de/build/*
-doc/en/build/*
-doc/fr/build/*

 *stamp
 stamp*
@@ -6,48 +6,60 @@ Developers

 * General code

-** Sébastien Helleu <flashcode@flashtux.org>
-*** Web: http://www.weechat.org/
-*** IRC: 'FlashCode' on irc.freenode.net
-
+** Sébastien Helleu (FlashCode) <flashcode@flashtux.org>

 * Scripts plugins, debian packager

-** Emmanuel Bouthenot <kolter@openics.org>
-*** IRC: 'kolter' on irc.freenode.net
+** Emmanuel Bouthenot (kolter) <kolter@openics.org>


 Contributors
 ------------

-* Julien Louis <ptitlouis@sysif.net>, IRC: 'ptitlouis'
-* Rudolf Polzer <rpolzer-rp@durchnull.de>, IRC: 'divVerent'
-* Jiri Golembiovsky <golemj@gmail.com>, IRC: 'GolemJ'
-* Jim Ramsay <i.am@jimramsay.com>, IRC: 'lack'
-* Odin <odin@dtdm.org>, IRC: 'Odin'
-* Pistos, IRC: 'pistos'
-* Gwenn, IRC: 'gwenn'
-* Voroskoi, IRC: 'voroskoi'
-* Frank Zacharias
-* Pavel Shevchuk, IRC: 'Stalwart'
-* soltys
-* Nils Görs
-* rettub
-* Elián Hanisch, IRC: 'm4v'
-* Marco Paolone
+Alphabetically:
+
+* Ailin Nemui (Nei)
+* Aleksey V Zapparov
+* Arvydas Sidorenko
+* Benoit Papillault (benoit)
 * Dmitry Kobylin
 * Dominik Honnef
-* JD Horelick, IRC: 'jdhore'
-* Stefano Pigozzi
-* Ivan Sichmann Freitas
+* Elián Hanisch (m4v)
+* Frank Zacharias
 * Gu1ll4um3r0m41n
+* gwenn
+* Ivan Sichmann Freitas
+* JD Horelick (jdhore)
+* Jim Ramsay (lack)
+* Jiri Golembiovsky (GolemJ)
+* Julien Louis (ptitlouis)
+* Krzysztof Koroscik (soltys)
+* Kyle Fuller (kylef)
+* Lázaro A.
+* Marco Paolone
+* Mateusz Poszwa
+* Nicolas Cavigneaux
+* Nils Görs (nils_2)
+* Odin
+* Pavel Shevchuk (Stalwart)
+* Peter Boström (pbos)
+* pistos
+* Quentin Glidic (SardemFF7)
+* Quico Noizeux
+* rettub
+* Rudolf Polzer (divVerent)
+* Ryuunosuke Ayanokouzi
+* Sergio Durigan Junior
+* Simon Arlott
+* Simon Kuhnle
+* Stefano Pigozzi
+* voroskoi


 Contact
 -------

-Whole team is connected to IRC:
-server: 'irc.freenode.net', channels: '#weechat' (english) and '#weechat-fr' (french)
+Developers are connected to IRC:

-
-See README file for license detail.
+* server: 'irc.freenode.net'
+* channels: '#weechat' (english) and '#weechat-fr' (french)
@@ -32,8 +32,8 @@ IF(PREFIX)
 ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "8")
+SET(VERSION_MINOR "4")
+SET(VERSION_PATCH "0-rc1")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -49,6 +49,10 @@ IF(NOT DEFINED SHAREDIR)
  SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
 ENDIF(NOT DEFINED SHAREDIR)

+IF(NOT DEFINED MANDIR)
+  SET(MANDIR ${SHAREDIR}/man)
+ENDIF(NOT DEFINED MANDIR)
+
 IF(NOT DEFINED LOCALEDIR)
  SET(LOCALEDIR ${SHAREDIR}/locale)
 ENDIF(NOT DEFINED LOCALEDIR)
@@ -59,31 +63,30 @@ ELSE(DEFINED INCLUDEDIR)
  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 ENDIF(DEFINED INCLUDEDIR)

-OPTION(ENABLE_NCURSES   "Enable Ncurses interface"                 ON)
-OPTION(ENABLE_GTK       "Enable GTK interface"                     OFF)
-OPTION(ENABLE_NLS       "Enable Native Language Support"           ON)
-OPTION(ENABLE_GCRYPT    "Enable libgcrypt support"                 ON)
-OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"                 ON)
-OPTION(ENABLE_LARGEFILE "Enable Large File Support"                ON)
-OPTION(ENABLE_ZLIB      "Enable Zlib support"                      ON)
-OPTION(ENABLE_ALIAS     "Enable Alias plugin"                      ON)
-OPTION(ENABLE_ASPELL    "Enable Aspell plugin"                     ON)
-OPTION(ENABLE_CHARSET   "Enable Charset plugin"                    ON)
-OPTION(ENABLE_DEMO      "Enable Demo plugin"                       OFF)
-OPTION(ENABLE_FIFO      "Enable FIFO plugin"                       ON)
-OPTION(ENABLE_IRC       "Enable IRC plugin"                        ON)
-OPTION(ENABLE_LOGGER    "Enable Logger plugin"                     ON)
-OPTION(ENABLE_RELAY     "Enable Relay plugin"                      ON)
-OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin"                  ON)
-OPTION(ENABLE_SCRIPTS   "Enable script plugins"                    ON)
-OPTION(ENABLE_PERL      "Enable Perl scripting language"           ON)
-OPTION(ENABLE_PYTHON    "Enable Python scripting language"         ON)
-OPTION(ENABLE_RUBY      "Enable Ruby scripting language"           ON)
-OPTION(ENABLE_LUA       "Enable Lua scripting language"            ON)
-OPTION(ENABLE_TCL       "Enable Tcl scripting language"            ON)
-OPTION(ENABLE_GUILE     "Enable Scheme (guile) scripting language" ON)
-OPTION(ENABLE_XFER      "Enable Xfer plugin"                       ON)
-OPTION(ENABLE_DOC       "Enable Documentation"                     ON)
+OPTION(ENABLE_NCURSES   "Enable Ncurses interface"                  ON)
+OPTION(ENABLE_GTK       "Enable GTK interface"                      OFF)
+OPTION(ENABLE_NLS       "Enable Native Language Support"            ON)
+OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"                  ON)
+OPTION(ENABLE_LARGEFILE "Enable Large File Support"                 ON)
+OPTION(ENABLE_ALIAS     "Enable Alias plugin"                       ON)
+OPTION(ENABLE_ASPELL    "Enable Aspell plugin"                      ON)
+OPTION(ENABLE_CHARSET   "Enable Charset plugin"                     ON)
+OPTION(ENABLE_DEMO      "Enable Demo plugin"                        OFF)
+OPTION(ENABLE_FIFO      "Enable FIFO plugin"                        ON)
+OPTION(ENABLE_IRC       "Enable IRC plugin"                         ON)
+OPTION(ENABLE_LOGGER    "Enable Logger plugin"                      ON)
+OPTION(ENABLE_RELAY     "Enable Relay plugin"                       ON)
+OPTION(ENABLE_RMODIFIER "Enable Rmodifier plugin"                   ON)
+OPTION(ENABLE_SCRIPT    "Enable Script plugin (scripts manager)"    ON)
+OPTION(ENABLE_SCRIPTS   "Enable script plugins (perl, python, ...)" ON)
+OPTION(ENABLE_PERL      "Enable Perl scripting language"            ON)
+OPTION(ENABLE_PYTHON    "Enable Python scripting language"          ON)
+OPTION(ENABLE_RUBY      "Enable Ruby scripting language"            ON)
+OPTION(ENABLE_LUA       "Enable Lua scripting language"             ON)
+OPTION(ENABLE_TCL       "Enable Tcl scripting language"             ON)
+OPTION(ENABLE_GUILE     "Enable Scheme (guile) scripting language"  ON)
+OPTION(ENABLE_XFER      "Enable Xfer plugin"                        ON)
+OPTION(ENABLE_DOC       "Enable Documentation"                      ON)

 IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
  SET(WEECHAT_HOME "~/.weechat")
@@ -103,10 +106,10 @@ ADD_SUBDIRECTORY( doc )

 CONFIGURE_FILE(config.h.cmake config.h @ONLY)

-CONFIGURE_FILE(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
-  @ONLY)
+# set the git version in "config-git.h"
+ADD_CUSTOM_TARGET(version_git ALL
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")

 CONFIGURE_FILE(
  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
@@ -117,9 +120,8 @@ ADD_CUSTOM_TARGET(uninstall
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

 ADD_CUSTOM_TARGET(dist
-  "${CMAKE_BINARY_DIR}/makedist.sh"
-  DEPENDS doc
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD"
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

 # pkgconfig file
 SET(PACKAGE "${PROJECT_NAME}")
@@ -1,9 +1,241 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8, 2012-06-03
+v0.4.0-rc1, 2012-12-26


+Version 0.4.0 (under dev!)
+--------------------------
+
+* core: fix memory leak in case of error when building content of bar item for
+  display
+* core: fix detection of command in input: a single command char is considered
+  as a command (API function "string_input_for_bufer")
+* core: search for a fallback template when a no template is matching command
+  arguments
+* core: add option "diff" for command /set (list options with changed value)
+* core: fix refresh of windows after split (fix bug with horizontal separator
+  between windows) (bug #37874)
+* core: fix stuck mouse (bug #36533)
+* core: fix default mouse buttons actions for script buffer (focus the window
+  before executing action)
+* core: add git version in build, display it in "weechat-curses --help" and
+  /version
+* core: fix scroll of one page down when weechat.look.scroll_page_percent is
+  less than 100 (bug #37875)
+* core: disable paste detection and confirmation if bar item "input_paste" is
+  not used in a visible bar (task #12327)
+* core: use high priority (50000) for commands /command and /input so that an
+  alias will not take precedence over these commands (bug #36353)
+* core: execute command with higher priority when many commands with same name
+  are found with different priorities
+* core: add color support in options
+  weechat.look.prefix_{action|error|join|network|quit} (task #9555)
+* core: fix display of combining chars (bug #37775)
+* core: display default values for changed config options in output of /set
+* core: stop cmake if gcrypt lib is not found (bug #37671)
+* core: add incomplete mouse events "event-down" and "event-drag" (task #11840)
+* core: add command /eval, use expression in conditions for bars
+* core: add option "-quit" for command /upgrade (save session and quit without
+  restarting WeeChat, for delayed restoration)
+* core: fix display of zoomed/merged buffer (with number >= 2) after switching
+  to it (bug #37593)
+* core: fix display problem when option weechat.look.prefix_same_nick is set
+  (problem with nick displayed in first line of screen) (bug #37556)
+* core: fix wrapping of words with wide chars (the break was made before the
+  correct position)
+* api: allow creation of structure with hdata_update (allowed for hdata
+  "history")
+* api: use hashtable "options" for command arguments in function
+  hook_process_hashtable (optional, default is a split of string with command)
+* api: do not call shell to execute command in hook_process (fix security
+  problem when a plugin/script gives untrusted command) (bug #37764)
+* api: add new function "string_eval_expression"
+* api: connect with IPv6 by default in hook_connect (with fallback to IPv4),
+  shuffle list of hosts for a same address, add argument "retry" for
+  hook_connect, move "sock" from hook_connect arguments to callback of
+  hook_connect (task #11205)
+* alias: give higher priority to aliases (2000) so that they take precedence
+  over an existing command
+* aspell: add bar items "aspell_dict" (dictionary used on current buffer) and
+  "aspell_suggest" (suggestions for misspelled word at cursor), add option
+  aspell.check.suggestions (task #12061)
+* aspell: fix creation of spellers when number of dictionaries is different
+  between two buffers
+* irc: fix memory leak when updating modes of channel
+* irc: add tags "irc_nick1_xxx" and "irc_nick2_yyy" in message displayed for
+  command "NICK"
+* irc: return git version in CTCP VERSION and FINGER by default, add "$git"
+  and "$versiongit" in format of CTCP replies
+* irc: read local variable "autorejoin" in buffer to override server option
+  "autorejoin" (task #12256)
+* irc: add option "-auto" for command /connect (task #9340)
+* irc: add support of "server-time" capability (task #12255)
+* irc: add support of tags in messages
+* irc: fix crash on /upgrade (free channels before server data when a server
+  is destroyed) (bug #37736)
+* irc: fix crash when decoding IRC colors in strings (bug #37704)
+* irc: fix refresh of bar item "away" after command /away or /disconnect
+* irc: add command /quiet, fix display of messages 728/729 (quiet list, end of
+  quiet list) (task #12278)
+* 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: send whois on self nick when /whois is done without argument on a channel
+  (task #12273)
+* irc: remove local variable "away" in server/channels buffers after server
+  disconnection (bug #37582)
+* irc: add option "-noswitch" for command /join (task #12275)
+* irc: fix crash when message 352 has too few arguments (bug #37513)
+* irc: remove unneeded server disconnect when server buffer is closed and server
+  is already disconnected
+* relay: fix memory leak when adding hdata to a message (weechat protocol)
+* 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: fix crash after /upgrade when a client is connected
+* 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)
+* relay: add missing "ssl." in output of /relay listrelay
+* script: fix scroll with mouse when window with script buffer is not the
+  current window (do not force a switch to script buffer in current window)
+* script: fix compilation on OS X
+* xfer: fix memory leak when refreshing xfer buffer
+* xfer: add missing tags in DCC chat messages: nick_xxx, prefix_nick_ccc, logN
+* xfer: display remote IP address for DCC chat/file (task #12289)
+* xfer: limit bytes received to file size (for DCC file received), fix crash
+  when displaying a xfer file with pos greater than size
+
+Version 0.3.9.2 (2012-11-18)
+----------------------------
+
+* core: do not call shell to execute command in hook_process (fix security
+  problem when a plugin/script gives untrusted command) (bug #37764)
+
+Version 0.3.9.1 (2012-11-09)
+----------------------------
+
+* irc: fix crash when decoding IRC colors in strings (bug #37704)
+
+Version 0.3.9 (2012-09-29)
+--------------------------
+
+* core: move the set of cmake policy CMP0003 in directory src (so it applies to
+  all plugins) (bug #37311)
+* core: add signals for plugins loaded/unloaded
+* core: add default key alt+"x" (zoom on merged buffer) (task #11029)
+* 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)
+* core: fix IP address returned by hook_connect (return IP really used, not
+  first IP for hostname)
+* core: display spaces at the end of messages in chat area (bug #37024)
+* core: fix infinite loop in display when chat area has width of 1 with
+  a bar displayed on the right (nicklist by default) (bug #37089)
+* core: fix display of "bar more down" char when text is truncated by size_max
+  in bars with vertical filling (bug #37054)
+* core: fix color of long lines (displayed on more than one line on screen)
+  under FreeBSD (bug #36999)
+* core: add mouse bindings ctrl+wheel up/down to scroll horizontally buffers
+  with free content
+* core: return error string to callback of hook_connect if getaddrinfo fails in
+  child process
+* core: add option weechat.startup.sys_rlimit to set system resource limits for
+  WeeChat process
+* core: add option "swap" for command /buffer (task #11373)
+* core: fix names of cache variables in configure.in (bug #36971)
+* core: scroll to bottom of window after reaching first or last highlight with
+  keys alt+"p" / alt+"n"
+* core: add hdata "hotlist"
+* core: add support of arrays in hdata variables
+* core: add command line option "-r" (or "--run-command") to run command(s)
+  after startup of WeeChat
+* core: fix refresh of bar items when switching window
+* core: fix refresh of bar items "buffer_filter" and "scroll" in root bars
+  (bug #36816)
+* core: add function "hook_set" in plugin API, add "subplugin" in hooks (set by
+  script plugins), display subplugin in /help on commands (task #12049)
+* core: add option weechat.look.jump_smart_back_to_buffer (jump back to initial
+  buffer after reaching end of hotlist, on by default, which is old behaviour)
+* core: add default key alt+"s" (toggle aspell)
+* core: add cmake option "MANDIR" (bug #36776)
+* core: add callback "nickcmp" in buffers
+* core: add horizontal separator between windows, new options
+  weechat.look.window_separator_{horizontal|vertical}
+* core: add options weechat.look.color_nick_offline and
+  weechat.color.chat_nick_offline{_highlight|_highlight_bg} to use different
+  color for offline nicks in prefix (task #11109)
+* core: reallow names beginning with "#" for bars, proxies and filters
+* core: escape special chars (`#[\`) in configuration files for name of options
+  (bug #36584)
+* doc: add japanese user's guide (patch #7827), scripting guide and tester's
+  guide
+* api: allow update for some variables of hdata, add new functions hdata_update
+  and hdata_set
+* api: add info "locale" for info_get (locale used to translate messages)
+* api: add new function util_version_number
+* aspell: add option aspell.check.enabled, add options enable/disable/toggle for
+  command /aspell (rename options enable/disable/dictlist to
+  setdict/deldict/listdict), display aspell status with /aspell (task #11988)
+* aspell: add missing dictionaries (ast/grc/hus/kn/ky)
+* charset: do not allow "UTF-8" in charset decoding options (useless because
+  UTF-8 is the internal WeeChat charset)
+* fifo: ignore read failing with error EAGAIN (bug #37019)
+* guile: fix crash when unloading a script without pointer to interpreter
+* guile: fix path of guile include dirs in cmake build (patch #7790)
+* irc: fix rejoin of channels with a key, ignore value "*" sent by server for
+  key (bug #24131)
+* irc: fix SASL mechanism "external" (bug #37274)
+* irc: fix parsing of message 346 when no nick/time are given (bug #37266)
+* irc: switch to next address after a timeout when connecting to server
+  (bug #37216)
+* irc: fix bug when changing server option "addresses" with less addresses
+  (bug #37215)
+* irc: add network prefix in irc (dis)connection messages
+* irc: generate alternate nicks dynamically when all nicks are already in use
+  (task #12209)
+* irc: fix split of received IRC message: keep spaces at the end of message
+* 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
+* irc: fix bug with prefix chars which are in chanmodes with a type different
+  from "B" (bug #36996)
+* irc: fix format of message "USER" (according to RFC 2812) (bug #36825)
+* irc: add bar item "buffer_modes", remove option irc.look.item_channel_modes
+  (task #12022)
+* irc: fix parsing of user modes (ignore everything after first space)
+  (bug #36756)
+* irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME
+  (task #12150)
+* irc: fix freeze when reading on socket with SSL enabled (use non-blocking
+  sockets) (bug #35097)
+* irc: reallow names beginning with "#" for servers
+* logger: add tags in backlog lines displayed when opening buffer
+* logger: add messages "Day changed to" in backlog (task #12187)
+* lua: support of lua 5.2
+* lua: fix crash when unloading a script without pointer to interpreter
+* python: fix detection of python (first try "python2.x" and then "python")
+  (bug #36835)
+* python: fix crash when unloading a script without pointer to interpreter
+* relay: add support of SSL (for irc and weechat protocols), new option
+  relay.network.ssl_cert_key (task #12044)
+* relay: add option relay.color.client
+* relay: add object type "arr" (array) in WeeChat protocol
+* relay: fix freeze when writing on relay socket (use non-blocking sockets in
+  relay for irc and weechat protocols) (bug #36655)
+* ruby: detect ruby version 1.9.3 in cmake and autotools
+* script: new plugin "script" (scripts manager, replacing scripts weeget.py and
+  script.pl)
+* scripts: add signals for scripts loaded/unloaded/installed/removed
+* scripts: add hdata with list of scripts for each language
+* scripts: fix deletion of configuration files when script is unloaded
+  (bug #36977)
+* scripts: fix function unhook_all: delete only callbacks of hooks and add
+  missing call to unhook
+* scripts: ignore call to "register" (with a warning) if script is already
+  registered
+* xfer: fix DCC transfer error (bug #37432)
+
 Version 0.3.8 (2012-06-03)
 --------------------------

@@ -1,11 +1,39 @@
 WeeChat Installation instructions
 =================================

-You can build WeeChat with cmake (recommended way) or autotools.
+WeeChat can be built with cmake (recommended) or autotools.
+
+[NOTE]
+Only cmake is officially supported to build WeeChat. You should use autotools
+only if you are not able to use cmake. +
+Build with autotools requires more dependencies and is slower than with cmake.


-With cmake
----------
+Dependencies
+------------
+
+Following packages are *required*:
+
+* cmake
+* ncurses
+* curl
+* zlib
+* gcrypt
+
+Following packages are all optional:
+
+* for i18n: gettext
+* for SSL: gnutls, ca-certificates
+* for spell checking: aspell
+* for scripting: python, perl, ruby, lua, tcl, guile
+* for building doc: asciidoc, source-highlight
+
+For a complete list of dependencies and versions recommended, please look at
+'User's guide'.
+
+
+Installation With cmake
+-----------------------

 ------------------------------------------------------------------
 mkdir build
@@ -15,22 +43,5 @@ make
 make install     (as root for installation in system directories)
 ------------------------------------------------------------------

-
-With autotools
--------------
-
----------------------------------------------------------------------
-./autogen.sh     (for cloned git repository only, not .tar.XX package)
-./configure --prefix=/where/you/want/install
-make
-make install     (as root for installation in system directories)
----------------------------------------------------------------------
-
-
-If you want to report bugs/crashes to developers, please:
-
- compile with debug info (type "Debug" for cmake build, default for autotools),
- enable core files (for bash shell, add "ulimit -c unlimited" to your ~/.bashrc).
-
-
-See AUTHORS for support, feel free to contact us for any problem.
+For more information or installation with autotools, please look at
+'User's guide': http://www.weechat.org/doc
@@ -19,6 +19,12 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #

+# This target will update file config-git.h with output of command "git describe"
+# (if needed, and only for a devel/rc version).
+BUILT_SOURCES = build-config-git.h
+build-config-git.h:
+	-$(abs_top_srcdir)/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+
 if DOC
 doc_dir = doc
 endif
@@ -28,29 +34,32 @@ SUBDIRS = po $(doc_dir) intl src
 EXTRA_DIST = CMakeLists.txt \
             config.rpath \
             config.h.cmake \
-             cmake/cmake_uninstall.cmake.in \
+             git-version.sh \
+             makedist.sh \
+             cmake/CMakeParseArguments.cmake \
             cmake/FindAsciidoc.cmake \
             cmake/FindAspell.cmake \
-             cmake/FindGcrypt.cmake \
+             cmake/FindGCRYPT.cmake \
             cmake/FindGettext.cmake \
             cmake/FindGnuTLS.cmake \
+             cmake/FindGuile.cmake \
             cmake/FindIconv.cmake \
             cmake/FindLua.cmake \
             cmake/FindNcurses.cmake \
+             cmake/FindPackageHandleStandardArgs.cmake \
             cmake/FindPerl.cmake \
             cmake/FindPkgConfig.cmake \
             cmake/FindPython.cmake \
             cmake/FindRuby.cmake \
             cmake/FindSourcehighlight.cmake \
             cmake/FindTCL.cmake \
-             cmake/FindGuile.cmake \
-             cmake/makedist.sh.in \
+             cmake/FindZLIB.cmake \
+             cmake/cmake_uninstall.cmake.in \
             po/CMakeLists.txt \
             po/srcfiles.cmake \
             weechat.spec \
             weechat_icon_32.png \
-             weechat.pc.in \
-             UPGRADE_0.3
+             weechat.pc.in

 ACLOCAL_AMFLAGS = -I m4

@@ -1,24 +1,85 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8, 2012-06-03
+v0.4.0-rc1, 2012-12-26


+Version 0.4.0 (under dev!)
+--------------------------
+
+Important release notes:
+
+* conditions in bars have changed, and now an expression is evaluated.
+  If you have a value with many conditions in a bar, like: `nicklist,active`,
+  you must now use an expression like: `${nicklist} && ${active}` (see
+  the chapter about bars in the 'WeeChat User's guide').
+* IPv6 is now used by default to connect to IRC servers, with fallback to IPv4.
+  The option irc.server_default.ipv6 is now "on" by default. If IPv6 is not
+  enabled or fails, IPv4 will be used. The "ipv6" option in server is now used
+  to disable IPv6 and force IPv4 (if option is turned "off").
+* relay is now listening by default on an IPv6 socket (new option
+  relay.network.ipv6, on by default), so connections with IPv4 will have
+  IPv4-mapped IPv6 addresses, like: "::ffff:127.0.0.1" (for "127.0.0.1");
+  check that value of option relay.network.allowed_ips supports this mapping,
+  or disable IPv6 in relay if you don't plan to use it at all:
+** `/set relay.network.ipv6 off`
+
+Version 0.3.9.2 (2012-11-18)
+----------------------------
+
+This version fixes a security vulnerability when a plugin/script gives untrusted
+command to API function "hook_process".
+
+Version 0.3.9.1 (2012-11-09)
+----------------------------
+
+This version fixes crash when decoding IRC colors in strings.
+
+Version 0.3.9 (2012-09-29)
+--------------------------
+
+Important release notes:
+
+* options moved from core (weechat.conf) to irc plugin (irc.conf):
+** 'weechat.look.nickmode' moved to 'irc.look.nick_mode' (new type: integer
+   with values: none/prefix/action/both)
+** 'weechat.look.nickmode_empty' moved to 'irc.look.nick_mode_empty'
+* new bar item has been added: 'buffer_modes' and irc option
+  'irc.look.item_channel_modes' has been removed; to display irc channel modes
+  in status bar (after channel name), you have to manually add the new item
+  'buffer_modes' (this is now used by default in status bar items), default
+  value for status bar items becomes:
+** `/set weechat.bar.status.items "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_filter,[lag],[hotlist],completion,scroll"`
+* changes in options for command `/aspell`:
+** new option `enable`: enable aspell
+** new option `disable`: disable aspell
+** new option `toggle`: toggle aspell (new default key: alt+"s")
+** option `enable` renamed to `setdict` (set dictionary for current buffer)
+** option `disable` renamed to `deldict` (delete dictionary used on current buffer)
+** option `dictlist` renamed to `listdict` (show installed dictionaries)
+* an horizontal separator has been added between split windows, and two options
+  have been added to toggle separators (both are enabled by default):
+** 'weechat.look.window_separator_horizontal'
+** 'weechat.look.window_separator_vertical'
+* new keys were added, use command `/key missing` to add them or `/key listdiff`
+  to see differences between your current keys and WeeChat default keys
+
 Version 0.3.8 (2012-06-03)
 --------------------------

 Important release notes:

-* options weechat.look.prefix_align_more and weechat.look.prefix_buffer_align_more
-  have been converted from type boolean to string:
+* options 'weechat.look.prefix_align_more' and
+  'weechat.look.prefix_buffer_align_more' have been converted from type boolean
+  to string:
 ** if the value was on (default), new value is "+" and you can now customize
   this char
 ** if the value was off, you have to set " " (string with one space)
-* option weechat.look.paste_max_lines can now be used with value 0 to detect
+* option 'weechat.look.paste_max_lines' can now be used with value 0 to detect
  paste with one line (only if terminal "bracketed paste mode" is enabled when
  option 'weechat.look.paste_bracketed' is on); so now the value -1 is used
  to disable paste detection: if your value was 0, you should set it to -1:
-** `weechat.look.paste_max_lines -1`
+** `/set weechat.look.paste_max_lines -1`
 * rmodifier "nickserv" has a new default regex which includes option "release"
  for command "/msg nickserv". If you never added/changed rmodifiers, you can
  just reset all rmodifiers (command: `/rmodifier default -yes`).
@@ -32,8 +93,8 @@ Version 0.3.7 (2012-02-26)
 Important release notes:

 * option `scroll_unread` has been moved from command `/input` to `/window`,
-  therefore default command of key alt-u has been updated. To bind key with new
-  default value:
+  therefore default command of key alt+"u" has been updated. To bind key with
+  new default value:
 ** `/key bind meta-u /window scroll_unread`
 * extended regex is used in filters and irc ignore, so some chars that
  needed escape in past do not need any more (for example `[0-9]\+` becomes
@@ -117,6 +178,8 @@ Important release notes:

 * if you are using `/upgrade` from a previous release, then you must reconnect
  to IRC servers in order to use new command /wallchops.
+* option 'irc.look.show_away_once' has been renamed to
+  'irc.look.display_pv_away_once'
 * option 'irc.network.lag_min_show' is now in milliseconds, you should set new
  value: your current value multiplied by 1000 (new default value is 500).

@@ -133,7 +196,7 @@ Version 0.3.1.1 (2010-01-31)

 This version fixes crashs with SSL connection and purge of old DCC chats.

-All users of version 0.2.2 should upgrade to this version.
+All users of version 0.3.1 should upgrade to this version.

 Version 0.3.1 (2010-01-23)
 --------------------------
@@ -149,9 +212,24 @@ Version 0.3.0 (2009-09-06)
 --------------------------

 This version brings major changes, especially for configuration files and plugin
-API.
+API and it not compatible with previous versions.

-For more information about this version, please read file 'UPGRADE_0.3'.
+Major differences:
+
+* it is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x;
+  you have to quit your old WeeChat, then run new version.
+* new configuration files (`*.conf`) are not compatible with old files (`*.rc`).
+* name of options is similar to old versions, but there is now one configuration
+  file by plugin, and one file for WeeChat core; there is
+  *no automatic conversion* for your old options to new configuration files,
+  so you'll have to setup again your IRC servers and all other options.
+* plugin API has been rewritten and is not compatible with previous versions;
+  accordingly, scripts and plugins must have been designed for version 0.3.x to
+  be loaded into WeeChat.
+
+More information about new API is available on wiki:
+http://wiki.flashtux.org/wiki/WeeChat_0.3.0
+and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API

 Version 0.2.6.3 (2009-06-13)
 ----------------------------
@@ -211,7 +289,7 @@ Important release notes:
 ** new keys for scrolling topic: F9/F10
 ** key F10 was used for `infobar_clear` in previous WeeChat versions,
   you have to manually rebind this key (except for new WeeChat users):
-*** `/key <press alt-k then F10> scroll_topic_right` (which gives something
+*** `/key <press alt+"k" then F10> scroll_topic_right` (which gives something
    like: `/key meta2-21~ scroll_topic_right`).

 Version 0.2.1 (2006-10-01)
@@ -254,12 +332,12 @@ Important release notes:
   '%h' is replaced by WeeChat home (default: '~/.weechat', may be overriden
   by new command line arg `--dir`).
 * after installing 0.1.8 (or with `/upgrade`), issue both commands (if you
-  didn't redefine these keys (alt-home/end):
+  didn't redefine these keys (alt+{home|end}):
 ** `/key unbind meta-meta2-1~`
 ** `/key unbind meta-meta2-4~`
 ** then launch again WeeChat (or issue `/upgrade`).
-* Keys alt-home/end were used for nicklist scroll, they're now replaced by
-  alt-F11/F12.
+* Keys alt+{home|end} were used for nicklist scroll, they're now replaced by
+  alt+{F11|F12}.

 Version 0.1.7 (2006-01-14)
 --------------------------
@@ -1,83 +0,0 @@
-WeeChat Upgrade to 0.3.x
-========================
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.0, 2009-09-06
-
-
-This document lists major changes introduced in version 0.3.0 and not compatible
-with versions 0.2.x.
-
-
-Upgrade to version 0.3.x
------------------------
-
-It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
-You have to quit your old WeeChat, then run new version.
-
-Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
-upgrade to another 0.3.x (unless this command is broken again, please look
-at release notes (file 'NEWS') for version you're currently installing).
-
-
-Configuration files
-------------------
-
-Changes with previous versions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
-
-Name of options is similar to old versions, but there is now one configuration
-file by plugin, and one file for WeeChat core.
-
-There is *no automatic conversion* for your old options to new configuration files,
-so you'll have to setup again your IRC servers and all other options.
-
-In WeeChat, option names are now with format: `plugin.section.option` (for
-WeeChat core, `plugin` is `weechat`).
-
-Examples:
-
-* WeeChat options: `weechat.xxx.yyy`
-* IRC options: `irc.xxx.yyy`
-
-You should read quickstart guide to be familiar with basic commands and syntax
-(some commands like `/server` have changed): http://www.weechat.org/doc
-
-
-List of configuration files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Old configuration files:
-** weechat.rc
-** plugins.rc
-* New configuration files are now (with default plugins):
-** weechat.conf
-** alias.conf
-** aspell.conf
-** charset.conf
-** irc.conf
-** jabber.conf
-** logger.conf
-** plugins.conf
-** relay.conf
-** xfer.conf
-
-
-Plugin API
----------
-
-Plugin API has been rewritten and is not compatible with previous versions.
-Accordingly, scripts and plugins must have been designed for version 0.3.x to
-be loaded into WeeChat.
-
-There is no migration script today to convert old script to new API.
-Therefore, if you plan to use old script, you'll have to wait for new version
-or you can convert script yourself and send us new version ;)
-
-You can download scripts for new API on plugins page:
-http://www.weechat.org/plugins
-
-More information about new API is available on wiki:
-http://wiki.flashtux.org/wiki/WeeChat_0.3.0
-and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API
@@ -23,8 +23,6 @@
 ###
 ### common stuff
 ###
-OK="\\033[70G[\\033[1;32mOK\\033[1;00m]"
-FAIL="\\033[70G[\\033[1;31mFAILED\\033[1;00m]"

 AUTOGEN_LOG=autogen.log

@@ -40,12 +38,12 @@ err ()

 run ()
 {
-    echo -n "Running \"$@\""
+    echo -n "Running \"$@\"..."
    eval $@ >$AUTOGEN_LOG 2>&1
    if [ $? = 0 ] ; then
-        echo -e $OK
+        echo " OK"
    else
-        echo -e $FAIL
+        echo " FAILED"
        err
    fi
 }
@@ -41,10 +41,13 @@ IF(LIBGCRYPT_CONFIG_EXECUTABLE)
      SET(GCRYPT_CFLAGS " ")
   ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")

-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-
 ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)

-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
+
+IF(GCRYPT_FOUND)
+  MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+ENDIF(GCRYPT_FOUND)
@@ -24,7 +24,7 @@ ENDIF(NCURSES_FOUND)
 FIND_PATH(NCURSES_INCLUDE_PATH
  NAMES ncurses.h curses.h
  PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include
-  /usr/local/include/ncursesw /usr/local/include/ncuses /usr/local/include
+  /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include
  /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include
 )

@@ -34,43 +34,50 @@ IF(PYTHON_FOUND)
 ENDIF(PYTHON_FOUND)

 FIND_PROGRAM(PYTHON_EXECUTABLE
-  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+  NAMES python2.7 python2.6 python2.5 python
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

 IF(PYTHON_EXECUTABLE)
  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('CONFINCLUDEPY'))"
    OUTPUT_VARIABLE PYTHON_INC_DIR
    )

  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print(get_config_var('LIBPL'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LIBPL'))"
    OUTPUT_VARIABLE PYTHON_POSSIBLE_LIB_PATH
    )

  EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print(get_config_var('LINKFORSHARED'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('LINKFORSHARED'))"
    OUTPUT_VARIABLE PYTHON_LFLAGS
    )

-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" PYTHON_INC_DIR "${PYTHON_INC_DIR}")
-  STRING(REPLACE "\n" "" PYTHON_POSSIBLE_LIB_PATH "${PYTHON_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" PYTHON_LFLAGS "${PYTHON_LFLAGS}")
-
  FIND_PATH(PYTHON_INCLUDE_PATH
    NAMES Python.h
    PATHS ${PYTHON_INC_DIR}
    )

  FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+    NAMES python2.7 python2.6 python2.5 python
    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
    )

  IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
-    SET(PYTHON_FOUND TRUE)
+    EXECUTE_PROCESS(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])"
+      OUTPUT_VARIABLE PYTHON_VERSION
+      )
+    EXECUTE_PROCESS(
+      COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"
+      OUTPUT_VARIABLE PYTHON_OLD_VERSION
+      )
+    IF(${PYTHON_OLD_VERSION} STREQUAL "True")
+      MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}")
+    ELSE()
+      SET(PYTHON_FOUND TRUE)
+    ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True")
  ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)

  MARK_AS_ADVANCED(
@@ -32,43 +32,36 @@ IF(RUBY_FOUND)
 ENDIF(RUBY_FOUND)

 FIND_PROGRAM(RUBY_EXECUTABLE
-  NAMES ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+  NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
  )

 IF(RUBY_EXECUTABLE)
  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
    OUTPUT_VARIABLE RUBY_ARCH_DIR
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['arch']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
    OUTPUT_VARIABLE RUBY_ARCH
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
    )

  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['ruby_version']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_version']"
    OUTPUT_VARIABLE RUBY_VERSION
    )

-  # remove the new lines from the output by replacing them with empty strings
-  STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
-  STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
-  STRING(REPLACE "\n" "" RUBY_ARCH "${RUBY_ARCH}")
-  STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
-
  FIND_PATH(RUBY_INCLUDE_PATH
    NAMES ruby.h
    PATHS ${RUBY_ARCH_DIR}
@@ -78,7 +71,7 @@ IF(RUBY_EXECUTABLE)
    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")

  FIND_LIBRARY(RUBY_LIBRARY
-    NAMES ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+    NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
    )

@@ -15,6 +15,7 @@
 #cmakedefine HAVE_REGEX_H
 #cmakedefine HAVE_WCHAR_H
 #cmakedefine HAVE_SYS_FILE_H
+#cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET
 #cmakedefine HAVE_STRNDUP
@@ -24,10 +24,10 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.8, flashcode@flashtux.org)
-AC_CONFIG_SRCDIR([src/core/weechat.c])
+AC_INIT(WeeChat, 0.4.0-rc1, flashcode@flashtux.org)
+AC_CONFIG_SRCDIR([configure.in])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.8])
+AM_INIT_AUTOMAKE
 LICENSE="GPL3"

 # Checks for programs
@@ -68,7 +68,7 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)

 # Checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h regex.h wchar.h sys/file.h])
+AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h regex.h wchar.h sys/file.h sys/resource.h])

 # Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
@@ -98,11 +98,9 @@ AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa mem
 AH_VERBATIM([PREFIX],                  [#undef PREFIX])
 AH_VERBATIM([WEECHAT_LIBDIR],          [#undef WEECHAT_LIBDIR])
 AH_VERBATIM([WEECHAT_SHAREDIR],        [#undef WEECHAT_SHAREDIR])
-AH_VERBATIM([HAVE_GCRYPT],             [#undef HAVE_GCRYPT])
 AH_VERBATIM([HAVE_GNUTLS],             [#undef HAVE_GNUTLS])
 AH_VERBATIM([HAVE_FLOCK],              [#undef HAVE_FLOCK])
 AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
-AH_VERBATIM([HAVE_ZLIB],               [#undef HAVE_ZLIB])
 AH_VERBATIM([PLUGIN_ALIAS],            [#undef PLUGIN_ALIAS])
 AH_VERBATIM([PLUGIN_ASPELL],           [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_CHARSET],          [#undef PLUGIN_CHARSET])
@@ -112,6 +110,7 @@ AH_VERBATIM([PLUGIN_IRC],              [#undef PLUGIN_IRC])
 AH_VERBATIM([PLUGIN_LOGGER],           [#undef PLUGIN_LOGGER])
 AH_VERBATIM([PLUGIN_RELAY],            [#undef PLUGIN_RELAY])
 AH_VERBATIM([PLUGIN_RMODIFIER],        [#undef PLUGIN_RMODIFIER])
+AH_VERBATIM([PLUGIN_SCRIPT],           [#undef PLUGIN_SCRIPT])
 AH_VERBATIM([PLUGIN_PERL],             [#undef PLUGIN_PERL])
 AH_VERBATIM([PLUGIN_PYTHON],           [#undef PLUGIN_PYTHON])
 AH_VERBATIM([PLUGIN_RUBY],             [#undef PLUGIN_RUBY])
@@ -126,9 +125,7 @@ AH_VERBATIM([WEECHAT_HOME],            [#define WEECHAT_HOME "~/.weechat"])

 AC_ARG_ENABLE(ncurses,      [  --disable-ncurses       turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
 AC_ARG_ENABLE(gtk,          [  --enable-gtk            turn on Gtk interface (default=off)],enable_gtk=$enableval,enable_gtk=no)
-AC_ARG_ENABLE(gcrypt,       [  --disable-gcrypt        turn off gcrypt support (default=compiled if found)],enable_gcrypt=$enableval,enable_gcrypt=yes)
 AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
-AC_ARG_ENABLE(zlib,         [  --disable-zlib          turn off zlib support (default=compiled if found)],enable_zlib=$enableval,enable_zlib=yes)
 AC_ARG_ENABLE(largefile,    [  --disable-largefile     turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
 AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
 AC_ARG_ENABLE(aspell,       [  --disable-aspell        turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
@@ -139,7 +136,8 @@ AC_ARG_ENABLE(irc,          [  --disable-irc           turn off IRC plugin (defa
 AC_ARG_ENABLE(logger,       [  --disable-logger        turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes)
 AC_ARG_ENABLE(relay,        [  --disable-relay         turn off Relay plugin (default=compiled)],enable_relay=$enableval,enable_relay=yes)
 AC_ARG_ENABLE(rmodifier,    [  --disable-rmodifier     turn off Rmodifier plugin (default=compiled)],enable_rmodifier=$enableval,enable_rmodifier=yes)
-AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
+AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (default=compiled)],enable_script=$enableval,enable_script=yes)
+AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
@@ -400,6 +398,14 @@ else
    not_asked="$not_asked rmodifier"
 fi

+# --------------------------------- script -------------------------------------
+
+if test "x$enable_script" = "xyes" ; then
+    AC_DEFINE(PLUGIN_SCRIPT)
+else
+    not_asked="$not_asked script"
+fi
+
 # ---------------------------------- perl --------------------------------------

 PERL_VERSION=
@@ -459,7 +465,7 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    AC_PATH_PROGS(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2)
+    AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
    if test -z $PYTHON ; then
        AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
@@ -468,41 +474,49 @@ if test "x$enable_python" = "xyes" ; then
        enable_python="no"
        not_found="$not_found python"
    else
-        PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; print "%s" % sys.prefix'`
-        PYTHON_VERSION=`$PYTHON -c 'import sys ; print sys.version[[:3]]'`
-        PYTHON_INCLUDE=`$PYTHON -c "import distutils.sysconfig,string; print distutils.sysconfig.get_config_var('CONFINCLUDEPY')"`
-
-        AC_MSG_CHECKING(for Python header files)
-        if test -r "$PYTHON_INCLUDE/Python.h"; then
-            PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
-            AC_MSG_RESULT(found)
-            PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
-            PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
-            AC_MSG_CHECKING(for Python library)
-            if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
-               PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
-               PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
-               PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
-               AC_MSG_RESULT(found)
-            else
-                AC_MSG_WARN([
+        PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; sys.stdout.write("%s" % sys.prefix)'`
+        PYTHON_VERSION=`$PYTHON -c 'import sys; sys.stdout.write(sys.version[[:3]])'`
+        PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('CONFINCLUDEPY'))"`
+        PYTHON_OLD_VERSION=`$PYTHON -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"`
+        if test "x$PYTHON_OLD_VERSION" = "xTrue" ; then
+            AC_MSG_WARN([
+*** Python >= 2.5 is needed to build Python plugin, version found: $PYTHON_VERSION.
+*** WeeChat will be built without Python support.])
+            enable_python="no"
+            not_found="$not_found python"
+        else
+            AC_MSG_CHECKING(for Python header files)
+            if test -r "$PYTHON_INCLUDE/Python.h"; then
+                PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
+                AC_MSG_RESULT(found)
+                PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
+                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
+                AC_MSG_CHECKING(for Python library)
+                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
+                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
+                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
+                   PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
+                else
+                    AC_MSG_WARN([
 *** Python library couldn't be found on your system.
 *** Try to install it with your software package manager.
+*** WeeChat will be built without Python support.])
+                    enable_python="no"
+                    not_found="$not_found python"
+                fi
+            else
+                AC_MSG_WARN([
+*** Python header files couldn't be found on your system.
+*** Try to install them with your software package manager.
 *** WeeChat will be built without Python support.])
                enable_python="no"
                not_found="$not_found python"
            fi
-        else
-            AC_MSG_WARN([
-*** Python header files couldn't be found on your system.
-*** Try to install them with your software package manager.
-*** WeeChat will be built without Python support.])
-            enable_python="no"
-            not_found="$not_found python"
        fi
    fi
 else
@@ -520,7 +534,7 @@ fi
 RUBY_VERSION=

 if test "x$enable_ruby" = "xyes" ; then
-    AC_PATH_PROGS(RUBY, ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
+    AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
    if test -z $RUBY ; then
        AC_MSG_WARN([
 *** Ruby must be installed on your system but ruby interpreter couldn't be found in path.
@@ -777,30 +791,21 @@ fi
 #                                   gcrypt
 # ------------------------------------------------------------------------------

-if test "x$enable_gcrypt" = "xyes" ; then
-    AC_CHECK_HEADER(gcrypt.h,ac_found_gcrypt_header="yes",ac_found_gcrypt_header="no")
-    AC_CHECK_LIB(gcrypt,gcry_check_version,ac_found_gcrypt_lib="yes",ac_found_gcrypt_lib="no")
+AC_CHECK_HEADER(gcrypt.h,ac_found_gcrypt_header="yes",ac_found_gcrypt_header="no")
+AC_CHECK_LIB(gcrypt,gcry_check_version,ac_found_gcrypt_lib="yes",ac_found_gcrypt_lib="no")

-    AC_MSG_CHECKING(for gcrypt headers and librairies)
-    if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([
+AC_MSG_CHECKING(for gcrypt headers and librairies)
+if test "x$ac_found_gcrypt_header" = "xno" -o "x$ac_found_gcrypt_lib" = "xno" ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([
 *** libgcrypt was not found. You may want to get it from ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-*** WeeChat will be built without gcrypt support.
-*** Some features like SASL authentication with IRC server using mechanism DH-BLOWFISH will be disabled.])
-        enable_gcrypt="no"
-        not_found="$not_found gcrypt"
-    else
-        AC_MSG_RESULT(yes)
-        GCRYPT_CFLAGS=`libgcrypt-config --cflags`
-        GCRYPT_LFLAGS=`libgcrypt-config --libs`
-        AC_SUBST(GCRYPT_CFLAGS)
-        AC_SUBST(GCRYPT_LFLAGS)
-        AC_DEFINE(HAVE_GCRYPT)
-        CFLAGS="$CFLAGS -DHAVE_GCRYPT"
-    fi
+*** or try to install libgcrypt-dev with your software package manager.])
 else
-    not_asked="$not_asked gcrypt"
+    AC_MSG_RESULT(yes)
+    GCRYPT_CFLAGS=`libgcrypt-config --cflags`
+    GCRYPT_LFLAGS=`libgcrypt-config --libs`
+    AC_SUBST(GCRYPT_CFLAGS)
+    AC_SUBST(GCRYPT_LFLAGS)
 fi

 # ------------------------------------------------------------------------------
@@ -837,7 +842,7 @@ fi
 # ------------------------------------------------------------------------------

 enable_flock="no"
-AC_CACHE_CHECK([for flock() support], ac_have_flock, [
+AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [
 AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[ #include <sys/file.h>]],
 [[ flock(0, LOCK_SH); ]])],
@@ -855,7 +860,7 @@ fi
 #                               large file support
 # ------------------------------------------------------------------------------
 if test "x$enable_largefile" = "xyes" ; then
-   CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+   CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_LARGE_FILES"
 else
   not_asked="$not_asked largefile"
 fi
@@ -866,7 +871,7 @@ fi

 enable_backtrace="no"
 if test "x$debug" != "x0" ; then
-    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_have_backtrace, [
+    AC_CACHE_CHECK([for execinfo.h and backtrace], ac_cv_have_backtrace, [
        AC_LINK_IFELSE([AC_LANG_PROGRAM(
            [[ #include <execinfo.h> ]],
            [[ void *trace[128]; int n = backtrace(trace, 128); ]])],
@@ -885,7 +890,7 @@ fi
 # ------------------------------------------------------------------------------

 enable_eatnewlineglitch="no"
-AC_CACHE_CHECK([for eat_newline_glitch support], ac_have_eatnewlineglitch, [
+AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[ #include <term.h> ]],
 [[ eat_newline_glitch = 0; ]])],
@@ -903,30 +908,21 @@ fi
 #                                     zlib
 # ------------------------------------------------------------------------------

-if test "x$enable_zlib" = "xyes" ; then
-    AC_CHECK_HEADER(zlib.h,ac_found_zlib_header="yes",ac_found_zlib_header="no")
-    AC_CHECK_LIB(z,compress2,ac_found_zlib_lib="yes",ac_found_zlib_lib="no")
+AC_CHECK_HEADER(zlib.h,ac_found_zlib_header="yes",ac_found_zlib_header="no")
+AC_CHECK_LIB(z,compress2,ac_found_zlib_lib="yes",ac_found_zlib_lib="no")

-    AC_MSG_CHECKING(for zlib headers and librairies)
-    if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
-        AC_MSG_RESULT(no)
-        AC_MSG_WARN([
+AC_MSG_CHECKING(for zlib headers and librairies)
+if test "x$ac_found_zlib_header" = "xno" -o "x$ac_found_zlib_lib" = "xno" ; then
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([
 *** zlib was not found. You may want to get it from http://zlib.net/
-*** WeeChat will be built without zlib support.
-*** Compression of packets in Relay plugin will be disabled (for WeeChat protocol).])
-        enable_zlib="no"
-        not_found="$not_found zlib"
-    else
-        AC_MSG_RESULT(yes)
-        ZLIB_CFLAGS=`pkg-config zlib --cflags`
-        ZLIB_LFLAGS=`pkg-config zlib --libs`
-        AC_SUBST(ZLIB_CFLAGS)
-        AC_SUBST(ZLIB_LFLAGS)
-        AC_DEFINE(HAVE_ZLIB)
-        CFLAGS="$CFLAGS -DHAVE_ZLIB"
-    fi
+*** or try to install libcurl-dev with your software package manager.])
 else
-    not_asked="$not_asked zlib"
+    AC_MSG_RESULT(yes)
+    ZLIB_CFLAGS=`pkg-config zlib --cflags`
+    ZLIB_LFLAGS=`pkg-config zlib --libs`
+    AC_SUBST(ZLIB_CFLAGS)
+    AC_SUBST(ZLIB_LFLAGS)
 fi

 # ------------------------------------------------------------------------------
@@ -1061,8 +1057,6 @@ CFLAGS="$CFLAGS -DWEECHAT_VERSION=\\\"$VERSION\\\" -DWEECHAT_LICENSE=\\\"$LICENS
 #                                output Makefiles
 # ------------------------------------------------------------------------------

-AM_CONDITIONAL(HAVE_GCRYPT,             test "$enable_gcrypt" = "yes")
-AM_CONDITIONAL(HAVE_ZLIB,               test "$enable_zlib" = "yes")
 AM_CONDITIONAL(HAVE_GNUTLS,             test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,              test "$enable_flock" = "yes")
 AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
@@ -1077,6 +1071,7 @@ AM_CONDITIONAL(PLUGIN_IRC,              test "$enable_irc" = "yes")
 AM_CONDITIONAL(PLUGIN_LOGGER,           test "$enable_logger" = "yes")
 AM_CONDITIONAL(PLUGIN_RELAY,            test "$enable_relay" = "yes")
 AM_CONDITIONAL(PLUGIN_RMODIFIER,        test "$enable_rmodifier" = "yes")
+AM_CONDITIONAL(PLUGIN_SCRIPT,           test "$enable_script" = "yes")
 AM_CONDITIONAL(PLUGIN_PERL,             test "$enable_perl" = "yes")
 AM_CONDITIONAL(PLUGIN_PYTHON,           test "$enable_python" = "yes")
 AM_CONDITIONAL(PLUGIN_RUBY,             test "$enable_ruby" = "yes")
@@ -1108,13 +1103,13 @@ AC_OUTPUT([Makefile
           src/plugins/logger/Makefile
           src/plugins/relay/Makefile
           src/plugins/rmodifier/Makefile
-           src/plugins/scripts/Makefile
-           src/plugins/scripts/perl/Makefile
-           src/plugins/scripts/python/Makefile
-           src/plugins/scripts/ruby/Makefile
-           src/plugins/scripts/lua/Makefile
-           src/plugins/scripts/tcl/Makefile
-           src/plugins/scripts/guile/Makefile
+           src/plugins/script/Makefile
+           src/plugins/perl/Makefile
+           src/plugins/python/Makefile
+           src/plugins/ruby/Makefile
+           src/plugins/lua/Makefile
+           src/plugins/tcl/Makefile
+           src/plugins/guile/Makefile
           src/plugins/xfer/Makefile
           src/gui/Makefile
           src/gui/curses/Makefile
@@ -1168,6 +1163,9 @@ fi
 if test "x$enable_rmodifier" = "xyes"; then
    listplugins="$listplugins rmodifier"
 fi
+if test "x$enable_script" = "xyes"; then
+    listplugins="$listplugins script"
+fi
 if test "x$enable_perl" = "xyes"; then
    listplugins="$listplugins perl($PERL_VERSION)"
 fi
@@ -1191,12 +1189,6 @@ if test "x$enable_xfer" = "xyes"; then
 fi

 listoptional=""
-if test "x$enable_gcrypt" = "xyes"; then
-    listoptional="$listoptional gcrypt"
-fi
-if test "x$enable_zlib" = "xyes"; then
-    listoptional="$listoptional zlib"
-fi
 if test "x$enable_gnutls" = "xyes"; then
    listoptional="$listoptional gnutls"
 fi
@@ -1,3 +1,29 @@
+weechat (0.3.9.1-1) unstable; urgency=low
+
+  * New upstream release
+    - fix crash when decoding IRC colors in strings
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 09 Nov 2012 23:11:09 +0000
+
+weechat (0.3.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Add the new 'script' plugin and update the long descriptions accordingly
+  * Add new doc-base files:
+    - Testers guide in Japanese
+    - Users guide in Japanese
+    - Scripting guide in Japanese
+  * Fix wrong Vcs-Browser URL (Closes: #689203)
+  * Update lintian override on weechat-curses
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 30 Sep 2012 21:14:22 +0000
+
+weechat (0.3.8-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 03 Jun 2012 07:54:52 +0000
+
 weechat (0.3.7-1) unstable; urgency=low

  * New upstream release
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
 Standards-Version: 3.9.3
 Homepage: http://weechat.org/
 Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git

 Package: weechat
 Architecture: all
@@ -29,6 +29,7 @@ Description: Fast, light and extensible chat client
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -53,6 +54,7 @@ Description: Fast, light and extensible chat client - console client
  - incremental text search
  - dynamic filtering of buffer content
  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - spell checking
  - highly customizable and extensible
  - and much more!
@@ -83,6 +85,7 @@ Description: Fast, light and extensible chat client - plugins
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
  - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
+  - scripts manager
  - Spell checking (thanks to aspell)
  - FIFO pipe for remote control
  - IRC proxy
@@ -8,25 +8,20 @@ LDFLAGS = -Wl,-Bsymbolic-functions
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk

-builddir/Makefile:
-	mkdir -p builddir
-	cd builddir && \
+BUILDDIR = builddir
+
+$(BUILDDIR)/Makefile:
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS)" \
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
 		-DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

-#build: build-stamp
-#build-stamp: builddir/Makefile
-#	dh_testdir
-#	$(MAKE) -C builddir VERBOSE=1
-#	touch $@
-
-override_dh_auto_build: builddir/Makefile
-	$(MAKE) -C builddir
+override_dh_auto_build: $(BUILDDIR)/Makefile
 	dh_auto_build

 override_dh_auto_configure:
@@ -34,16 +29,8 @@ override_dh_auto_configure:
 	# debhelper try to use it but that's not needed
 	echo

-override_dh_install:
-	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install
-
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg

-clean:
-	rm -rf builddir
-	dh $@
-
 %:
-	dh $@
+	dh $@ --parallel --builddirectory=$(BUILDDIR)
@@ -1,4 +1,3 @@
 AUTHORS
 NEWS
 README
-UPGRADE_0.3
@@ -1 +1 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: cannot adjust line
+weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 65: warning [p 1, 9.7i]: cannot adjust line
@@ -0,0 +1,10 @@
+Document: weechat-scripting-ja
+Title: WeeChat Scripting Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_scripting.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_scripting.ja.html
@@ -0,0 +1,10 @@
+Document: weechat-tester-ja
+Title: WeeChat Tester's Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_tester.ja.html
@@ -0,0 +1,10 @@
+Document: weechat-user-ja
+Title: WeeChat User's Guide (Japanese)
+Author: Sebastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_user.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.ja.html
@@ -6,5 +6,6 @@ usr/lib/weechat/plugins/python.so
 usr/lib/weechat/plugins/ruby.so
 usr/lib/weechat/plugins/lua.so
 usr/lib/weechat/plugins/tcl.so
+usr/lib/weechat/plugins/script.so
 usr/lib/weechat/plugins/relay.so
 usr/lib/weechat/plugins/rmodifier.so
@@ -35,4 +35,4 @@ IF(ENABLE_DOC)

 ENDIF(ENABLE_DOC)

-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/man1)
@@ -56,6 +56,14 @@

 | ruby | ruby_script | Liste der Skripten

+| script | script_files | Dateien die sich in den Skript-Verzeichnissen befinden
+
+| script | script_scripts | Liste der Skripten im Repositorium
+
+| script | script_scripts_installed | Auflistung der installierten Skripten (vom Repositorium)
+
+| script | script_tags | Schlagwortliste für Skripten im Repositorium
+
 | tcl | tcl_script | Liste der Skripten

 | weechat | bars_names | Namen der Infobars
@@ -1,6 +1,24 @@
-[width="100%",cols="^1,^2,5,5,5",options="header"]
+[width="100%",cols="^1,^2,5,5,5,5",options="header"]
 |========================================
-| Erweiterung | Name | Beschreibung | Variablen | Listen
+| Erweiterung | Name | Beschreibung | Variablen | Update erlaubt | Listen
+
+| guile | guile_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "guile_script") +
+  'next_script' (pointer, hdata: "guile_script") |
+ |
+  'last_script' +
+  'scripts'

 | irc | irc_channel | IRC-Channel |
  'type' (integer) +
@@ -19,22 +37,24 @@
  'pv_remote_nick_color' (string) +
  'hook_autorejoin' (pointer) +
  'nicks_count' (integer) +
-  'nicks' (pointer, hdata: 'irc_nick') +
-  'last_nick' (pointer, hdata: 'irc_nick') +
+  'nicks' (pointer, hdata: "irc_nick") +
+  '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') +
-  'buffer' (pointer, hdata: 'buffer') +
+  'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'prev_channel' (pointer, hdata: 'irc_channel') +
-  'next_channel' (pointer, hdata: 'irc_channel') |
+  'prev_channel' (pointer, hdata: "irc_channel") +
+  'next_channel' (pointer, hdata: "irc_channel") |
+ |
  -

 | irc | irc_channel_speaking | IRC channel_speaking |
  'nick' (string) +
  'time_last_message' (time) +
-  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
-  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
+  'prev_nick' (pointer, hdata: "irc_channel_speaking") +
+  'next_nick' (pointer, hdata: "irc_channel_speaking") |
+ |
  -

 | irc | irc_ignore | IRC ignorieren |
@@ -43,8 +63,9 @@
  'regex_mask' (pointer) +
  'server' (string) +
  'channel' (string) +
-  'prev_ignore' (pointer, hdata: 'irc_ignore') +
-  'next_ignore' (pointer, hdata: 'irc_ignore') |
+  'prev_ignore' (pointer, hdata: "irc_ignore") +
+  'next_ignore' (pointer, hdata: "irc_ignore") |
+ |
  'irc_ignore_list' +
  'last_irc_ignore'

@@ -55,23 +76,25 @@
  'prefix' (string) +
  'away' (integer) +
  'color' (string) +
-  'prev_nick' (pointer, hdata: 'irc_nick') +
-  'next_nick' (pointer, hdata: 'irc_nick') |
+  'prev_nick' (pointer, hdata: "irc_nick") +
+  'next_nick' (pointer, hdata: "irc_nick") |
+ |
  -

 | irc | irc_notify | IRC-Benachrichtigungen |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'nick' (string) +
  'check_away' (integer) +
  'is_on_server' (integer) +
  'away_message' (string) +
  'ison_received' (integer) +
-  'prev_notify' (pointer, hdata: 'irc_notify') +
-  'next_notify' (pointer, hdata: 'irc_notify') |
+  'prev_notify' (pointer, hdata: "irc_notify") +
+  'next_notify' (pointer, hdata: "irc_notify") |
+ |
  -

 | irc | irc_redirect | IRC Umlenkung |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'pattern' (string) +
  'signal' (string) +
  'count' (integer) +
@@ -89,8 +112,9 @@
  'cmd_filter' (hashtable) +
  'output' (string) +
  'output_size' (integer) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect') +
-  'next_redirect' (pointer, hdata: 'irc_redirect') |
+  'prev_redirect' (pointer, hdata: "irc_redirect") +
+  'next_redirect' (pointer, hdata: "irc_redirect") |
+ |
  -

 | irc | irc_redirect_pattern | Muster für IRC Umlenkung |
@@ -100,8 +124,9 @@
  'cmd_start' (string) +
  'cmd_stop' (string) +
  'cmd_extra' (string) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
-  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
+  'prev_redirect' (pointer, hdata: "irc_redirect_pattern") +
+  'next_redirect' (pointer, hdata: "irc_redirect_pattern") |
+ |
  'irc_redirect_patterns' +
  'last_irc_redirect_pattern'

@@ -112,26 +137,30 @@
  'reloading_from_config' (integer) +
  'reloaded_from_config' (integer) +
  'addresses_count' (integer) +
-  'addresses_array' (pointer) +
-  'ports_array' (pointer) +
+  'addresses_array' (string, array_size: "addresses_count") +
+  'ports_array' (integer, array_size: "addresses_count") +
+  'retry_array' (integer, array_size: "addresses_count") +
  'index_current_address' (integer) +
  'current_address' (string) +
  'current_ip' (string) +
  'current_port' (integer) +
+  'current_retry' (integer) +
  'sock' (integer) +
-  'hook_connect' (pointer, hdata: 'hook') +
-  'hook_fd' (pointer, hdata: 'hook') +
-  'hook_timer_connection' (pointer, hdata: 'hook') +
-  'hook_timer_sasl' (pointer, hdata: 'hook') +
+  'hook_connect' (pointer, hdata: "hook") +
+  'hook_fd' (pointer, hdata: "hook") +
+  'hook_timer_connection' (pointer, hdata: "hook") +
+  'hook_timer_sasl' (pointer, hdata: "hook") +
  'is_connected' (integer) +
  'ssl_connected' (integer) +
+  'disconnected' (integer) +
  'gnutls_sess' (other) +
  'tls_cert' (other) +
  'tls_cert_key' (other) +
  'unterminated_message' (string) +
  'nicks_count' (integer) +
-  'nicks_array' (pointer) +
+  'nicks_array' (string, array_size: "nicks_count") +
  'nick_first_tried' (integer) +
+  'nick_alternate_number' (integer) +
  'nick' (string) +
  'nick_modes' (string) +
  'isupport' (string) +
@@ -158,50 +187,171 @@
  'last_away_check' (time) +
  'outqueue' (pointer) +
  'last_outqueue' (pointer) +
-  'redirects' (pointer, hdata: 'irc_redirect') +
-  'last_redirect' (pointer, hdata: 'irc_redirect') +
-  'notify_list' (pointer, hdata: 'irc_notify') +
-  'last_notify' (pointer, hdata: 'irc_notify') +
-  'manual_joins' (hashtable) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'redirects' (pointer, hdata: "irc_redirect") +
+  'last_redirect' (pointer, hdata: "irc_redirect") +
+  'notify_list' (pointer, hdata: "irc_notify") +
+  'last_notify' (pointer, hdata: "irc_notify") +
+  'join_manual' (hashtable) +
+  'join_channel_key' (hashtable) +
+  'join_noswitch' (hashtable) +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'channels' (pointer, hdata: 'irc_channel') +
-  'last_channel' (pointer, hdata: 'irc_channel') +
-  'prev_server' (pointer, hdata: 'irc_server') +
-  'next_server' (pointer, hdata: 'irc_server') |
+  'channels' (pointer, hdata: "irc_channel") +
+  'last_channel' (pointer, hdata: "irc_channel") +
+  'prev_server' (pointer, hdata: "irc_server") +
+  'next_server' (pointer, hdata: "irc_server") |
+ |
  'irc_servers' +
  'last_irc_server'

+| lua | lua_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "lua_script") +
+  'next_script' (pointer, hdata: "lua_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| perl | perl_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "perl_script") +
+  'next_script' (pointer, hdata: "perl_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| python | python_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "python_script") +
+  'next_script' (pointer, hdata: "python_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| ruby | ruby_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "ruby_script") +
+  'next_script' (pointer, hdata: "ruby_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| script | script_script | Skripten aus dem Repositorium |
+  'name' (string) +
+  'name_with_extension' (string) +
+  'language' (integer) +
+  'author' (string) +
+  'mail' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'tags' (string) +
+  'requirements' (string) +
+  'min_weechat' (string) +
+  'max_weechat' (string) +
+  'md5sum' (string) +
+  'url' (string) +
+  'popularity' (integer) +
+  'date_added' (time) +
+  'date_updated' (time) +
+  'status' (integer) +
+  'version_loaded' (string) +
+  'displayed' (integer) +
+  'install_order' (integer) +
+  'prev_script' (pointer, hdata: "script_script") +
+  'next_script' (pointer, hdata: "script_script") |
+ |
+  'last_script_repo' +
+  'scripts_repo'
+
+| tcl | tcl_script | Liste der Skripten |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "tcl_script") +
+  'next_script' (pointer, hdata: "tcl_script") |
+ |
+  'last_script' +
+  'scripts'
+
 | weechat | bar | Bar |
  'name' (string) +
  'options' (pointer) +
-  'conditions_count' (integer) +
-  'conditions_array' (pointer) +
  'items_count' (integer) +
  'items_subcount' (pointer) +
  'items_array' (pointer) +
  'items_prefix' (pointer) +
  'items_name' (pointer) +
  'items_suffix' (pointer) +
-  'bar_window' (pointer, hdata: 'bar_window') +
+  'bar_window' (pointer, hdata: "bar_window") +
  'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer, hdata: 'bar') +
-  'next_bar' (pointer, hdata: 'bar') |
+  'prev_bar' (pointer, hdata: "bar") +
+  'next_bar' (pointer, hdata: "bar") |
+ |
  'gui_bars' +
  'last_gui_bar'

 | weechat | bar_item | Bar-Item |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'build_callback' (pointer) +
  'build_callback_data' (pointer) +
-  'prev_item' (pointer, hdata: 'bar_item') +
-  'next_item' (pointer, hdata: 'bar_item') |
+  'prev_item' (pointer, hdata: "bar_item") +
+  'next_item' (pointer, hdata: "bar_item") |
+ |
  'gui_bar_items' +
  'last_gui_bar_item'

 | weechat | bar_window | Bar-Fenster |
-  'bar' (pointer, hdata: 'bar') +
+  'bar' (pointer, hdata: "bar") +
  'x' (integer) +
  'y' (integer) +
  'width' (integer) +
@@ -220,12 +370,13 @@
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
-  'prev_bar_window' (pointer, hdata: 'bar_window') +
-  'next_bar_window' (pointer, hdata: 'bar_window') |
+  'prev_bar_window' (pointer, hdata: "bar_window") +
+  'next_bar_window' (pointer, hdata: "bar_window") |
+ |
  -

 | weechat | buffer | Buffer |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'plugin_name_for_upgrade' (string) +
  'number' (integer) +
  'layout_number' (integer) +
@@ -241,17 +392,19 @@
  'close_callback' (pointer) +
  'close_callback_data' (pointer) +
  'title' (string) +
-  'own_lines' (pointer, hdata: 'lines') +
-  'mixed_lines' (pointer, hdata: 'lines') +
-  'lines' (pointer, hdata: 'lines') +
+  'own_lines' (pointer, hdata: "lines") +
+  'mixed_lines' (pointer, hdata: "lines") +
+  'lines' (pointer, hdata: "lines") +
  'time_for_each_line' (integer) +
  'chat_refresh_needed' (integer) +
  'nicklist' (integer) +
  'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer, hdata: 'nick_group') +
+  'nicklist_root' (pointer, hdata: "nick_group") +
  'nicklist_max_length' (integer) +
  'nicklist_display_groups' (integer) +
  'nicklist_visible_count' (integer) +
+  'nickcmp_callback' (pointer) +
+  'nickcmp_callback_data' (pointer) +
  'input' (integer) +
  'input_callback' (pointer) +
  'input_callback_data' (pointer) +
@@ -262,15 +415,15 @@
  'input_buffer_length' (integer) +
  'input_buffer_pos' (integer) +
  'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer, hdata: 'input_undo') +
-  'input_undo' (pointer, hdata: 'input_undo') +
-  'last_input_undo' (pointer, hdata: 'input_undo') +
-  'ptr_input_undo' (pointer, hdata: 'input_undo') +
+  'input_undo_snap' (pointer, hdata: "input_undo") +
+  'input_undo' (pointer, hdata: "input_undo") +
+  'last_input_undo' (pointer, hdata: "input_undo") +
+  'ptr_input_undo' (pointer, hdata: "input_undo") +
  'input_undo_count' (integer) +
-  'completion' (pointer, hdata: 'completion') +
-  'history' (pointer, hdata: 'history') +
-  'last_history' (pointer, hdata: 'history') +
-  'ptr_history' (pointer, hdata: 'history') +
+  'completion' (pointer, hdata: "completion") +
+  'history' (pointer, hdata: "history") +
+  'last_history' (pointer, hdata: "history") +
+  'ptr_history' (pointer, hdata: "history") +
  'num_history' (integer) +
  'text_search' (integer) +
  'text_search_exact' (integer) +
@@ -281,20 +434,21 @@
  'highlight_regex_compiled' (pointer) +
  'highlight_tags' (string) +
  'highlight_tags_count' (integer) +
-  'highlight_tags_array' (pointer) +
+  'highlight_tags_array' (string, array_size: "highlight_tags_count") +
  'hotlist_max_level_nicks' (hashtable) +
-  'keys' (pointer, hdata: 'key') +
-  'last_key' (pointer, hdata: 'key') +
+  'keys' (pointer, hdata: "key") +
+  'last_key' (pointer, hdata: "key") +
  'keys_count' (integer) +
  'local_variables' (hashtable) +
-  'prev_buffer' (pointer, hdata: 'buffer') +
-  'next_buffer' (pointer, hdata: 'buffer') |
+  'prev_buffer' (pointer, hdata: "buffer") +
+  'next_buffer' (pointer, hdata: "buffer") |
+ |
  'gui_buffer_last_displayed' +
  'gui_buffers' +
  'last_gui_buffer'

 | weechat | completion | Struktur mit Vervollständigung |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'context' (integer) +
  'base_command' (string) +
  'base_command_arg_index' (integer) +
@@ -311,38 +465,41 @@
  'position_replace' (integer) +
  'diff_size' (integer) +
  'diff_length' (integer) +
-  'partial_completion_list' (pointer, hdata: 'completion_partial') +
-  'last_partial_completion' (pointer, hdata: 'completion_partial') |
+  'partial_completion_list' (pointer, hdata: "completion_partial") +
+  'last_partial_completion' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | completion_partial | Struktur mit teilweise Vervollständigung |
  'word' (string) +
  'count' (integer) +
-  'prev_item' (pointer, hdata: 'completion_partial') +
-  'next_item' (pointer, hdata: 'completion_partial') |
+  'prev_item' (pointer, hdata: "completion_partial") +
+  'next_item' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | config_file | Konfigurationsdatei |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'filename' (string) +
  'file' (pointer) +
  'callback_reload' (pointer) +
  'callback_reload_data' (pointer) +
-  'sections' (pointer, hdata: 'config_section') +
-  'last_section' (pointer, hdata: 'config_section') +
-  'prev_config' (pointer, hdata: 'config_file') +
-  'next_config' (pointer, hdata: 'config_file') |
+  'sections' (pointer, hdata: "config_section") +
+  'last_section' (pointer, hdata: "config_section") +
+  'prev_config' (pointer, hdata: "config_file") +
+  'next_config' (pointer, hdata: "config_file") |
+ |
  'config_files' +
  'last_config_file'

 | weechat | config_option | Konfigurationsoptionen |
-  'config_file' (pointer, hdata: 'config_file') +
-  'section' (pointer, hdata: 'config_section') +
+  'config_file' (pointer, hdata: "config_file") +
+  'section' (pointer, hdata: "config_section") +
  'name' (string) +
  'type' (integer) +
  'description' (string) +
-  'string_values' (pointer) +
+  'string_values' (string, array_size: "*") +
  'min' (integer) +
  'max' (integer) +
  'default_value' (pointer) +
@@ -355,12 +512,13 @@
  'callback_delete' (pointer) +
  'callback_delete_data' (pointer) +
  'loaded' (integer) +
-  'prev_option' (pointer, hdata: 'config_option') +
-  'next_option' (pointer, hdata: 'config_option') |
+  'prev_option' (pointer, hdata: "config_option") +
+  'next_option' (pointer, hdata: "config_option") |
+ |
  -

 | weechat | config_section | Konfigurationssektion |
-  'config_file' (pointer, hdata: 'config_file') +
+  'config_file' (pointer, hdata: "config_file") +
  'name' (string) +
  'user_can_add_options' (integer) +
  'user_can_delete_options' (integer) +
@@ -374,10 +532,11 @@
  'callback_create_option_data' (pointer) +
  'callback_delete_option' (pointer) +
  'callback_delete_option_data' (pointer) +
-  'options' (pointer, hdata: 'config_option') +
-  'last_option' (pointer, hdata: 'config_option') +
-  'prev_section' (pointer, hdata: 'config_section') +
-  'next_section' (pointer, hdata: 'config_section') |
+  'options' (pointer, hdata: "config_option") +
+  'last_option' (pointer, hdata: "config_option") +
+  'prev_section' (pointer, hdata: "config_section") +
+  'next_section' (pointer, hdata: "config_section") |
+ |
  -

 | weechat | filter | Filter |
@@ -388,26 +547,43 @@
  'buffers' (pointer) +
  'tags' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'regex' (string) +
  'regex_prefix' (pointer) +
  'regex_message' (pointer) +
-  'prev_filter' (pointer, hdata: 'filter') +
-  'next_filter' (pointer, hdata: 'filter') |
+  'prev_filter' (pointer, hdata: "filter") +
+  'next_filter' (pointer, hdata: "filter") |
+ |
  'gui_filters' +
  'last_gui_filter'

 | weechat | history | Verlaufspeicher von Befehlen in einem Buffer |
  'text' (string) +
-  'next_history' (pointer, hdata: 'history') +
-  'prev_history' (pointer, hdata: 'history') |
-  -
+  'next_history' (pointer, hdata: "history") +
+  'prev_history' (pointer, hdata: "history") |
+  `__create` +
+  `__delete` |
+  'gui_history' +
+  'last_gui_history'
+
+| weechat | hotlist | Hotliste |
+  'priority' (integer) +
+  'creation_time.tv_sec' (time) +
+  'creation_time.tv_usec' (long) +
+  'buffer' (pointer) +
+  'count' (integer, array_size: "4") +
+  'prev_hotlist' (pointer, hdata: "hotlist") +
+  'next_hotlist' (pointer, hdata: "hotlist") |
+ |
+  'gui_hotlist' +
+  'last_gui_hotlist'

 | weechat | input_undo | Struktur der Rücknahmen für die Befehlszeile |
  'data' (string) +
  'pos' (integer) +
-  'prev_undo' (pointer, hdata: 'input_undo') +
-  'next_undo' (pointer, hdata: 'input_undo') |
+  'prev_undo' (pointer, hdata: "input_undo") +
+  'next_undo' (pointer, hdata: "input_undo") |
+ |
  -

 | weechat | key | Tastenbelegung (Tastaturkurzbefehl) |
@@ -417,8 +593,9 @@
  'area_key' (string) +
  'command' (string) +
  'score' (integer) +
-  'prev_key' (pointer, hdata: 'key') +
-  'next_key' (pointer, hdata: 'key') |
+  'prev_key' (pointer, hdata: "key") +
+  'next_key' (pointer, hdata: "key") |
+ |
  'gui_default_keys' +
  'gui_default_keys_cursor' +
  'gui_default_keys_mouse' +
@@ -437,47 +614,55 @@
  'last_gui_key_search'

 | weechat | line | Struktur mit einer Zeile |
-  'data' (pointer, hdata: 'line_data') +
-  'prev_line' (pointer, hdata: 'line') +
-  'next_line' (pointer, hdata: 'line') |
+  'data' (pointer, hdata: "line_data") +
+  'prev_line' (pointer, hdata: "line") +
+  'next_line' (pointer, hdata: "line") |
+ |
  -

 | weechat | line_data | Struktur mit einzeiligen Daten |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'y' (integer) +
  'date' (time) +
  'date_printed' (time) +
  'str_time' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'displayed' (char) +
  'highlight' (char) +
  'refresh_needed' (char) +
  'prefix' (string) +
  'prefix_length' (integer) +
  'message' (string) |
+  'date' (time) +
+  'date_printed' (time) +
+  'tags_array' (string) +
+  'prefix' (string) +
+  'message' (string) |
  -

 | weechat | lines | Struktur mit Zeilen |
-  'first_line' (pointer, hdata: 'line') +
-  'last_line' (pointer, hdata: 'line') +
-  'last_read_line' (pointer, hdata: 'line') +
+  'first_line' (pointer, hdata: "line") +
+  'last_line' (pointer, hdata: "line") +
+  'last_read_line' (pointer, hdata: "line") +
  'lines_count' (integer) +
  'first_line_not_read' (integer) +
  'lines_hidden' (integer) +
  'buffer_max_length' (integer) +
  'prefix_max_length' (integer) |
+ |
  -

 | weechat | nick | Nick in Nickliste |
-  'group' (pointer, hdata: 'nick_group') +
+  'group' (pointer, hdata: "nick_group") +
  'name' (string) +
  'color' (string) +
  'prefix' (string) +
  'prefix_color' (string) +
  'visible' (integer) +
-  'prev_nick' (pointer, hdata: 'nick') +
-  'next_nick' (pointer, hdata: 'nick') |
+  'prev_nick' (pointer, hdata: "nick") +
+  'next_nick' (pointer, hdata: "nick") |
+ |
  -

 | weechat | nick_group | Gruppen in Nickliste |
@@ -485,13 +670,14 @@
  'color' (string) +
  'visible' (integer) +
  'level' (integer) +
-  'parent' (pointer, hdata: 'nick_group') +
-  'children' (pointer, hdata: 'nick_group') +
-  'last_child' (pointer, hdata: 'nick_group') +
-  'nicks' (pointer, hdata: 'nick') +
-  'last_nick' (pointer, hdata: 'nick') +
-  'prev_group' (pointer, hdata: 'nick_group') +
-  'next_group' (pointer, hdata: 'nick_group') |
+  'parent' (pointer, hdata: "nick_group") +
+  'children' (pointer, hdata: "nick_group") +
+  'last_child' (pointer, hdata: "nick_group") +
+  'nicks' (pointer, hdata: "nick") +
+  'last_nick' (pointer, hdata: "nick") +
+  'prev_group' (pointer, hdata: "nick_group") +
+  'next_group' (pointer, hdata: "nick_group") |
+ |
  -

 | weechat | plugin | Erweiterung |
@@ -504,8 +690,9 @@
  'license' (string) +
  'charset' (string) +
  'debug' (integer) +
-  'prev_plugin' (pointer, hdata: 'plugin') +
-  'next_plugin' (pointer, hdata: 'plugin') |
+  'prev_plugin' (pointer, hdata: "plugin") +
+  'next_plugin' (pointer, hdata: "plugin") |
+ |
  'last_weechat_plugin' +
  'weechat_plugins'

@@ -523,41 +710,44 @@
  'win_chat_height' (integer) +
  'win_chat_cursor_x' (integer) +
  'win_chat_cursor_y' (integer) +
-  'bar_windows' (pointer, hdata: 'bar_window') +
-  'last_bar_window' (pointer, hdata: 'bar_window') +
+  'bar_windows' (pointer, hdata: "bar_window") +
+  'last_bar_window' (pointer, hdata: "bar_window") +
  'refresh_needed' (integer) +
  'gui_objects' (pointer) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'layout_plugin_name' (string) +
  'layout_buffer_name' (string) +
-  'scroll' (pointer, hdata: 'window_scroll') +
-  'ptr_tree' (pointer, hdata: 'window_tree') +
-  'prev_window' (pointer, hdata: 'window') +
-  'next_window' (pointer, hdata: 'window') |
+  'scroll' (pointer, hdata: "window_scroll") +
+  'ptr_tree' (pointer, hdata: "window_tree") +
+  'prev_window' (pointer, hdata: "window") +
+  'next_window' (pointer, hdata: "window") |
+ |
  'gui_current_window' +
  'gui_windows' +
  'last_gui_window'

 | weechat | window_scroll | Scroll-Info in Fenstern |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'first_line_displayed' (integer) +
-  'start_line' (pointer, hdata: 'line') +
+  'start_line' (pointer, hdata: "line") +
  'start_line_pos' (integer) +
  'scrolling' (integer) +
  'start_col' (integer) +
  'lines_after' (integer) +
  'reset_allowed' (integer) +
-  'prev_scroll' (pointer, hdata: 'window_scroll') +
-  'next_scroll' (pointer, hdata: 'window_scroll') |
+  'prev_scroll' (pointer, hdata: "window_scroll") +
+  'next_scroll' (pointer, hdata: "window_scroll") |
+ |
  -

 | weechat | window_tree | Baumstruktur der Fenster |
-  'parent_node' (pointer, hdata: 'window_tree') +
+  'parent_node' (pointer, hdata: "window_tree") +
  'split_pct' (integer) +
  'split_horizontal' (integer) +
-  'child1' (pointer, hdata: 'window_tree') +
-  'child2' (pointer, hdata: 'window_tree') +
-  'window' (pointer, hdata: 'window') |
+  'child1' (pointer, hdata: "window_tree") +
+  'child2' (pointer, hdata: "window_tree") +
+  'window' (pointer, hdata: "window") |
+ |
  'gui_windows_tree'

 |========================================
@@ -30,6 +30,8 @@

 | ruby | ruby_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

+| script | script_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes, mit Dateierweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+
 | tcl | tcl_script | Liste der Skripten | Skript Pointer (optional) | Name des Skriptes (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)

 | weechat | bar | Auflistung der Bars | Bar Pointer (optional) | Bar Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
@@ -38,8 +38,12 @@

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

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

+| weechat | version_git | WeeChat git version (output of command "git describe" for a development version only, empty for a stable release) | -
+
 | weechat | version_number | WeeChat Version (als Nummer) | -

 | weechat | weechat_dir | WeeChat Verzeichnis | -
@@ -2,7 +2,7 @@
 |========================================
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)

-| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (beinhaltet Channel)
+| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel)

 | irc | irc_message_split | dient zum Aufteilen einer überlangen IRC Nachricht (in maximal 512 Bytes große Nachrichten) | "message": IRC Nachricht, "server": Servername (optional) | "msg1" ... "msgN": Nachrichten die versendet werden sollen (ohne abschließendes "\r\n"), "args1" ... "argsN": Argumente für Nachrichten, "count": Anzahl der Nachrichten

@@ -1,19 +1,26 @@
 [[command_aspell_aspell]]
 [command]*`aspell`* Konfiguration für Aspell-Erweiterung::
 ........................................
-/aspell  dictlist
-         enable <lang>
-         disable
+/aspell  enable|disable|toggle
+         listdict
+         setdict <lang>
+         deldict
         addword [<lang>] <word>

-dictlist: listet installierte Wörterbücher auf
-  enable: aktiviert Aspell in aktuellem Buffer [lang = Wörterbuch)
- disable: deaktiviert Aspell in aktuellem Buffer
+  enable: Aspell wird aktiviert
+ disable: Aspell wird deaktiviert
+  toggle: Aspell Funktionalität umschalten
+listdict: die, auf dem System, installierten Wörterbücher werden aufgelistet
+ setdict: Wörterbuch für den aktuellen Buffer einstellen
+ deldict: Wörterbuch für den aktuellen Buffer entfernen
 addword: fügt ein Wort in das persönliche Wörterbuch von Aspell hinzu

 Eingaben die mit '/' beginnen werden nicht überprüft, davon ausgenommen sind einige Befehle (siehe /set aspell.check.commands).

-Um in allen Buffern Aspell anzuwenden sollte man die Option "default_dict" nutzen , als Beispiel:
+Um Aspell auf alle Buffer anzuwenden sollte die Option "default_dict" genutzt und Aspell aktiviert werden:
  /set aspell.check.default_dict "de_DE-neu"
+  /aspell enable
+
+Die Standardtastaturbelegung zum Umschalten der Aspell Funktionalität lautet alt-s.
 ........................................

@@ -13,11 +13,21 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** Beschreibung: `Aspell wird für die Eingabezeile aktiviert`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
 * [[option_aspell.check.real_time]] *aspell.check.real_time*
 ** Beschreibung: `Eine Korrektur findet während der Texteingabe statt (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft sobald ein Leerzeichen dem vorangegangenen Wort folgt)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** Beschreibung: `bestimmt die Anzahl an Vorschlägen, für die Rechtschreibkorrektur bei einem falsch geschriebenes Wort. Die Vorschläge werden in der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), im Buffer, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge an, für alle eingestellten Sprachen)`
+** Typ: integer
+** Werte: -1 .. 2147483647 (Standardwert: `-1`)
+
 * [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
 ** Beschreibung: `Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)`
 ** Typ: integer
@@ -1,10 +1,10 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** Beschreibung: `globaler Zeichensatz zum dekodieren`
+** Beschreibung: `globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll (sollte keine Zeichendekodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Dekodierung nutzt)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"iso-8859-1"`)

 * [[option_charset.default.encode]] *charset.default.encode*
-** Beschreibung: `globaler Zeichensatz zum kodieren`
+** Beschreibung: `globale Zeichenkodierung: Zeichenkodierung die für ausgehende Nachrichten genutzt werden soll (sollte keine Zeichenkodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Kodierung nutzt)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -2,9 +2,9 @@
 [command]*`guile`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /guile  list|listfull [<name>]
-        load <filename>
+        load [-q] <filename>
        autoload
-        reload|unload [<name>]
+        reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -56,20 +56,21 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei
 [command]*`connect`* Mit IRC-Server(n) verbinden::
 ........................................
 /connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
-          -all|-open [-nojoin] [-switch]
+          -all|-auto|-open [-nojoin] [-switch]

-    server:  Name des Servers (folgende Möglichkeiten bestehen):
-            - intern genutzter Servername mit dem verbunden werden soll (Der Server sollte zuerst mittels "/server add" angelegt werden)
-            - Hostname/Port oder IP/Port (damit wird lediglich ein TEMPORÄRER Server erstellt), Port 6667 wird standardmäßig verwendet
-            - URL mit folgendem Format: irc[6][s]://[nickname[:password]@]irc.example.org[:port][/#channel1][,#channel2[...]]
-    option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
-  nooption: stellt die Boolean Option auf "off" (Beispiel: -nossl)
-      -all: Verbindung wird mit allen Servern hergestellt
-     -open: stellt eine Verbindung zu allen geöffneten Servern her, zu denen aktuell keine Verbindung besteht
-   -nojoin: Channel(s) werden nicht betreten (auch falls die Funktion "autojoin" aktiviert sein sollte)
-   -switch: wechselt zur nächsten Server-Adresse
+    server: server name, which can be:
+            - internal server name (created by /server add, recommended usage)
+            - hostname/port or IP/port (this will create a TEMPORARY server), port is 6667 by default
+            - URL with format: irc[6][s]://[nickname[:password]@]irc.example.org[:port][/#channel1][,#channel2[...]]
+    option: set option for server (for boolean option, value can be omitted)
+  nooption: set boolean option to 'off' (for example: -nossl)
+      -all: connect to all servers defined in configuration
+     -auto: connect to servers with autoconnect enabled
+     -open: connect to all opened servers that are not currently connected
+   -nojoin: do not join any channel (even if autojoin is enabled on server)
+   -switch: switch to next server address

-Beispiele:
+Examples:
  /connect freenode
  /connect irc.oftc.net/6667
  /connect irc6.oftc.net/6667 -ipv6
@@ -212,16 +213,18 @@ nick: Nickname
 [[command_irc_join]]
 [command]*`join`* einen Channel betreten::
 ........................................
-/join  [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]
+/join  [-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]

- server: Verbindung zu diesem Server (interner Name)
-channel: Name des Channels der betreten werden soll
-    key: Zugriffsschlüssel für einen Channel (Channels die einen Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden)
+-noswitch: es wird nicht zu dem angegebenen Channel gewechselt
+   server: an angegebenen Server (interner Name) senden
+  channel: Name des Channels, der betreten werden soll
+      key: Zugriffsschlüssel für einen Channel (Channel, die einen Zugriffsschlüssel benötigen, müssen zuerst aufgeführt werden)

 Beispiele:
  /join #weechat
  /join #geschützter_Channel,#weechat Zugriffsschlüssel
  /join -server freenode #weechat
+  /join -noswitch #weechat
 ........................................

 [[command_irc_kick]]
@@ -287,7 +290,7 @@ Beispiele:
 ........................................

 [[command_irc_lusers]]
-[command]*`lusers`* Statistik über die Größe dieses IRC-Netzwerks abfragen::
+[command]*`lusers`* Statistik über die Größe des IRC-Netzwerks abfragen::
 ........................................
 /lusers  [<mask> [<target>]]

@@ -465,6 +468,17 @@ server: an diesen Server senden (interner Name)
  text: Text der gesendet werden soll
 ........................................

+[[command_irc_quiet]]
+[command]*`quiet`* Nicks oder Hosts das Wort entziehen (User können nicht in den Channel schreiben, solange sich nicht +v oder höher haben)::
+........................................
+/quiet  [<channel>] [<nick> [<nick>...]]
+
+channel: Channel in dem der Quiet-Bann ausgeführt werden soll
+   nick: User oder Host dem das Wort entzogen werden soll
+
+Ohne Angabe von Argumenten wird, für den aktuellen Channel, eine Liste ausgegeben mit den User/Hosts denen das Wort entzogen worden ist.
+........................................
+
 [[command_irc_quote]]
 [command]*`quote`* Daten direkt an Server senden (siehe RFC 2812)::
 ........................................
@@ -487,7 +501,7 @@ data: unbearbeitete (RAW) Daten die gesendet werden sollen
 ........................................

 [[command_irc_rehash]]
-[command]*`rehash`* Den Server dazu bringen seine Konfigurationsdatei neu zu laden::
+[command]*`rehash`* Den Server auffordern seine Konfigurationsdatei neu zu laden::
 ........................................
 /rehash  [<option>]

@@ -723,7 +737,7 @@ text: Text der gesendet werden soll
 ........................................

 [[command_irc_who]]
-[command]*`who`* Erstellung einer Anfrage die eine Anzahl von Informationen zurück gibt.::
+[command]*`who`* Sendet eine Anfrage die eine Anzahl von Informationen zurück gibt.::
 ........................................
 /who  [<mask> [o]]

@@ -734,10 +748,14 @@ mask: nur Information über betreffende Nicknamen abfragen
 [[command_irc_whois]]
 [command]*`whois`* Information über User abfragen::
 ........................................
-/whois  [<server>] <nick>[,<nick>...]
+/whois  [<server>] [<nick>[,<nick>...]]

-server: Servername
-  nick: Nickname (oder eine Maske)
+server: Name des Servers (interner Servername)
+  nick: Nick, welcher abgefragt werden soll (kann auch eine Maske sein)
+
+Ohne Angabe von Argumenten, nutzt /whois folgende Nicks:
+- 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.
 ........................................

 [[command_irc_whowas]]
@@ -34,7 +34,7 @@
 ** 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 unterstrichen (Standardwert: `red`)

 * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap*
-** Beschreibung: `ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht angegeben) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format ist: "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 Stardard-IRC-Farben von WeeChat: 0:weiß, 1:schwarz, 2:blau, 3:grün, 4:hellrot, 5:rot, 6:violett, 7:braun, 8:gelb, 9: hell-grün, 10:türkis, 11:hell-türkis, 12:hellblau, 13:hell-violett, 14:grau, 15:weiß`
+** Beschreibung: `ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht angegeben) 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 Stardard-IRC-Farben von WeeChat: 0:weiß, 1:schwarz, 2:blau, 3:grün, 4:hellrot, 5:rot, 6:violett, 7:braun, 8:gelb, 9: hell-grün, 10:türkis, 11:hell-türkis, 12:hellblau, 13:hell-violett, 14:grau, 15:weiß`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"1,-1:darkgray"`)

@@ -44,7 +44,7 @@
 ** 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 unterstrichen (Standardwert: `green`)

 * [[option_irc.color.nick_prefixes]] *irc.color.nick_prefixes*
-** Beschreibung: `Farben für Nick Präfix für das Modus-Symbol (o=op, h=halfop, v=voice, ..), Format ist: "o:color1;h:color2;v:color3" (falls ein Modus nicht gefunden wird versucht WeeChat die nächsten Modi die der Server sendet ("PREFIX"); ein spezieller Modus "*" kann als Standardfarbe genutzt werden falls kein Modus in der Liste gefunden wurde)`
+** Beschreibung: `Farben für Nick Präfix für das Modus-Symbol (o=op, h=halfop, v=voice, ..), Format: "o:color1;h:color2;v:color3" (falls ein Modus nicht gefunden wird versucht WeeChat die nächsten Modi die der Server sendet ("PREFIX"); ein spezieller Modus "*" kann als Standardfarbe genutzt werden falls kein Modus in der Liste gefunden wurde)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"`)

@@ -103,8 +103,13 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

+* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
+** Beschreibung: `Format für die Zeitanzeige die bei einer CTCP TIME Anfrage zurückgesendet wird (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T %z"`)
+
 * [[option_irc.look.display_away]] *irc.look.display_away*
-** Beschreibung: `bei Abwesenheit und Rückkehr eine Nachricht anzeigen`
+** Beschreibung: `zeigt eine Nachricht an, sobald der Abwesenheitsstatus ein- bzw. ausgeschaltet wird (off: zeigt/sendet keine Nachricht, local: eine Nachricht wird lokal angezeigt, channel: sendet eine Nachricht an die Channels)`
 ** Typ: integer
 ** Werte: off, local, channel (Standardwert: `local`)

@@ -183,13 +188,8 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

-* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes*
-** Beschreibung: `zeigt die Channel-Modi mittels "buffer_name" in der Bar-Item an`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
-
 * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key*
-** Beschreibung: `unterdrückt Channel-Key falls die Modi in der Bar-Item mittels "buffer_name" dargestellt werden (diese Option unterdrückt alle Channel-Modi falls der Modus für den Channel auf +k gesetzt wurde)`
+** Beschreibung: `der Channel-Schlüssel wird nicht im Channel Modus angezeigt (diese Option unterdrückt alle Channel-Modi falls der Modus für den Channel auf +k gesetzt wurde)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

@@ -234,10 +234,20 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"_|["`)

 * [[option_irc.look.nick_completion_smart]] *irc.look.nick_completion_smart*
-** Beschreibung: `intelligente Vervollständigung von Nicknamen (vervollständigt zuerst den letzten Nick, mit dem gesprochen wurde)`
+** Beschreibung: `intelligente Vervollständigung für Nicks (es wird zuerst mit den letzten Rednern vervollständigt): speakers = alle Redner (einschließlich Highlights), speakers_highlight = nur Redner die eine Highlight Nachricht geschrieben haben`
 ** Typ: integer
 ** Werte: off, speakers, speakers_highlights (Standardwert: `speakers`)

+* [[option_irc.look.nick_mode]] *irc.look.nick_mode*
+** Beschreibung: `vor dem Nick wird der entsprechende Nickmodus (op, voice,...) angezeigt (none = Funktion ist deaktiviert, prefix = wird nur im Präfix angezeigt (Standardeinstellung), action = wird nur in action Nachrichten angezeigt, both = im Präfix und in action Nachrichten)`
+** Typ: integer
+** Werte: none, prefix, action, both (Standardwert: `prefix`)
+
+* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty*
+** Beschreibung: `es wird ein Leerzeichen anstelle eines Nickmodus verwendet, falls kein Nickmodus ((half)op/voice [@%+]) vorhanden ist`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
 * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix*
 ** Beschreibung: `Text, der im Chatfenster vor dem Nickname erscheinen soll`
 ** Typ: Zeichenkette
@@ -289,17 +299,17 @@
 ** Werte: 1 .. 10080 (Standardwert: `5`)

 * [[option_irc.look.smart_filter_join]] *irc.look.smart_filter_join*
-** Beschreibung: `aktiviert einen Filter für "join" Nachrichten`
+** Beschreibung: `aktiviert einen intelligenten Filter für "join" Nachrichten`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

 * [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
-** Beschreibung: `aktiviert einen Filter für Nachrichten von einem "Nick"`
+** Beschreibung: `aktiviert einen intelligenten Filter für Nachrichten von einem "Nick"`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

 * [[option_irc.look.smart_filter_quit]] *irc.look.smart_filter_quit*
-** Beschreibung: `aktiviert einen Filter für "part" und "quit" Nachrichten`
+** Beschreibung: `aktiviert einen intelligenten Filter für "part" und "quit" Nachrichten`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -308,6 +318,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

+* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick*
+** Beschreibung: `bezieht einen alternativen Nick, sofern alle voreingestellten Nicks am Server schon genutzt werden. Dazu wird das Zeichen "_" an den Nick an gehangen, sofern der Nick nicht mehr als neun Zeichen besitzt. Andernfalls wird das letzte bzw. vorletzte Zeichen durch eine Zahl zwischen 1 und 99 ersetzt, bis ein freier Nick für den Server gefunden wird`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing*
 ** Beschreibung: `Multiplikator für die Verzögerung bei der automatischen Wiederverbindung zum Server (1 = immer die selbe Verzögerung nutzen, 2 = Verzögerung*2 für jeden weiteren Versuch, ..)`
 ** Typ: integer
@@ -363,6 +378,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

+* [[option_irc.network.whois_double_nick]] *irc.network.whois_double_nick*
+** Beschreibung: `dupliziert den Nick, für den /whois Befehl (falls nur ein Nick angegeben wird), um die Idle-Zeit zu erhalten. Zum Beispiel: "/whois nick" wird als "whois nick nick" verschickt`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_irc.server_default.addresses]] *irc.server_default.addresses*
 ** Beschreibung: `Liste der Hostnamen/Ports oder IP/Ports des Servers (durch Komma getrennt)`
 ** Typ: Zeichenkette
@@ -399,7 +419,7 @@
 ** Werte: 1 .. 65535 (Standardwert: `10`)

 * [[option_irc.server_default.autorejoin]] *irc.server_default.autorejoin*
-** Beschreibung: `Channels automatisch betreten, falls man rausgeworfen wurde`
+** Beschreibung: `automatically rejoin channels after kick; you can define a buffer local variable on a channel to override this value (name of variable: "autorejoin", value: "on" or "off")`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

@@ -449,9 +469,9 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"WeeChat %v"`)

 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
-** Beschreibung: `Server über IPv6 ansprechen`
+** Beschreibung: `bei der Kommunikation mit dem Server wird das IPv6 Protokoll genutzt (sollte IPv6 nicht genutzt werden können, wird automatisch auf IPv4 zurückgegriffen); wird die Funktion deaktiviert, dann wird ausschließlich IPv4 genutzt.`
 ** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
+** Werte: on, off (Standardwert: `on`)

 * [[option_irc.server_default.local_hostname]] *irc.server_default.local_hostname*
 ** Beschreibung: `benutzerdefinierter lokaler Hostname bzw. IP-Adresse für den entsprechenden Server (optional). Falls kein Eintrag vorhanden sein sollte wird der lokale Hostname verwendet`
@@ -509,7 +529,7 @@
 ** Werte: on, off (Standardwert: `off`)

 * [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** Beschreibung: `Datei für ssl Zertifikat um automatisch den eigenen Nick zu identifizieren ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")`
+** Beschreibung: `Datei für SSL Zertifikat um automatisch den eigenen Nick zu identifizieren ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -524,7 +544,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"NORMAL"`)

 * [[option_irc.server_default.ssl_verify]] *irc.server_default.ssl_verify*
-** Beschreibung: `Überprüfe ob die SSL-Verbindung vertrauenswürdig ist`
+** Beschreibung: `Überprüft ob die SSL-Verbindung vertrauenswürdig ist`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -44,7 +44,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"_"`)

 * [[option_logger.file.time_format]] *logger.file.time_format*
-** Beschreibung: `Zeitstempel in Protokoll-Datei nutzen (bitte dazu die Anleitung zu "strftime" (man strftime) durchlesen)`
+** Beschreibung: `Zeitstempel in Protokoll-Datei nutzen (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%Y-%m-%d %H:%M:%S"`)

@@ -2,9 +2,9 @@
 [command]*`lua`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /lua  list|listfull [<name>]
-      load <filename>
+      load [-q] <filename>
      autoload
-      reload|unload [<name>]
+      reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`perl`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /perl  list|listfull [<name>]
-       load <filename>
+       load [-q] <filename>
       autoload
-       reload|unload [<name>]
+       reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`python`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /python  list|listfull [<name>]
-         load <filename>
+         load [-q] <filename>
         autoload
-         reload|unload [<name>]
+         reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -2,27 +2,42 @@
 [command]*`relay`* Relay-Kontrolle::
 ........................................
 /relay  list|listfull|listrelay
-        add <protocol.name> <port>
-        del <protocol.name>
+        add [ipv4.][ipv6.][ssl.]<protocol.name> <port>
+        del [ipv4.][ipv6.][ssl.]<protocol.name>
        raw
+        sslcertkey

         list: Auflistung der Relay-Clients (nur aktive Relays)
     listfull: detaillierte Auflistung der Relay-Clients (alle Relays)
    listrelay: Auflistung der Relays (Name und Port)
          add: fügt ein Relay, für ein Protokoll + Name, hinzu
          del: entfernt Relay für ein Protokoll + Name
+         ipv4: erzwingt die Nutzung von IPv4
+         ipv6: erzwingt die Nutzung von IPv6
+          ssl: aktiviert SSL
 protocol.name: Protokoll und Name des Relay:
                 - Protokoll "irc": und der Name des Servers welcher geteilt werden soll
                 - Protokoll "weechat" (Name wird nicht unterstützt)
         port: Port den das Relay nutzen soll
          raw: öffnet Buffer mit RAW-Relay Daten
+   sslcertkey: setzt SSL Zertifikat/Schlüssel mittels Eintrag in Option relay.network.ssl_cert_key

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

-Beispiel:
+Beispiele:
  IRC Proxy für Server "freenode":
    /relay add irc.freenode 8000
-  weechat protocol:
-    /relay add weechat 8001
+  IRC Proxy, für Server "freenode", mit SSL:
+    /relay add ssl.irc.freenode 8001
+  WeeChat Protokoll:
+    /relay add weechat 9000
+  WeeChat Protokoll, mit SSL:
+    /relay add ssl.weechat 9001
+  WeeChat Protokoll, mit SSL, nur IPv4 nutzen:
+    /relay add ipv4.ssl.weechat 9001
+  WeeChat Protokoll, mit SSL, nur IPv6 nutzen:
+    /relay add ipv6.ssl.weechat 9001
+  WeeChat Protokoll, mit SSL, mit IPv4 + IPv6:
+    /relay add ipv4.ipv6.ssl.weechat 9001
 ........................................

@@ -1,3 +1,8 @@
+* [[option_relay.color.client]] *relay.color.client*
+** Beschreibung: `Textfarbe für Client-Beschreibung`
+** 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 unterstrichen (Standardwert: `cyan`)
+
 * [[option_relay.color.status_active]] *relay.color.status_active*
 ** Beschreibung: `Textfarbe für Status: "Verbindung hergestellt"`
 ** Typ: Farbe
@@ -24,20 +29,45 @@
 ** 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 unterstrichen (Standardwert: `brown`)

 * [[option_relay.color.text]] *relay.color.text*
-** Beschreibung: `Textfarbe`
+** Beschreibung: `Textfarbe in Relay-Buffer`
 ** 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 unterstrichen (Standardwert: `default`)

 * [[option_relay.color.text_bg]] *relay.color.text_bg*
-** Beschreibung: `Hintergrundfarbe`
+** Beschreibung: `Hintergrundfarbe in Relay-Buffer`
 ** 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 unterstrichen (Standardwert: `default`)

 * [[option_relay.color.text_selected]] *relay.color.text_selected*
-** Beschreibung: `Textfarbe für selektierten Client-Linie`
+** Beschreibung: `Textfarbe für selektierte Zeile in Relay-Buffer`
 ** 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 unterstrichen (Standardwert: `white`)

+* [[option_relay.irc.backlog_max_minutes]] *relay.irc.backlog_max_minutes*
+** Beschreibung: `maximum number of minutes in backlog per IRC channel (0 = unlimited, examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)`
+** Typ: integer
+** Werte: 0 .. 2147483647 (Standardwert: `1440`)
+
+* [[option_relay.irc.backlog_max_number]] *relay.irc.backlog_max_number*
+** Beschreibung: `maximum number of lines in backlog per IRC channel (0 = unlimited)`
+** Typ: integer
+** Werte: 0 .. 2147483647 (Standardwert: `256`)
+
+* [[option_relay.irc.backlog_since_last_disconnect]] *relay.irc.backlog_since_last_disconnect*
+** Beschreibung: `display backlog starting from last client disconnect`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags*
+** Beschreibung: `tags of messages which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"irc_privmsg"`)
+
+* [[option_relay.irc.backlog_time_format]] *relay.irc.backlog_time_format*
+** Beschreibung: `format for time in backlog messages (see man strftime for format) (not used if server capability "server-time" was enabled by client, because time is sent as irc tag); empty string = disable time in backlog messages`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"[%H:%M] "`)
+
 * [[option_relay.look.auto_open_buffer]] *relay.look.auto_open_buffer*
 ** Beschreibung: `öffnet automatisch einen Relay-Buffer, falls eine Verbindung zu einem neuen Client hergestellt wird`
 ** Typ: boolesch
@@ -49,7 +79,7 @@
 ** Werte: 0 .. 65535 (Standardwert: `256`)

 * [[option_relay.network.allowed_ips]] *relay.network.allowed_ips*
-** Beschreibung: `regulärer Ausdruck für IP Adressen die auf das Relay zugreifen dürfen (zwischen Groß- und Kleinschreibung nicht dabei nicht unterschieden. Um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden) , Beispiel: "^(123.45.67.89|192.160.*)$"`
+** Beschreibung: `regulärer Ausdruck für IP Adressen die auf das Relay zugreifen dürfen (zwischen Groß- und Kleinschreibung nicht dabei nicht unterschieden. Um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden) . Sollte IPv6 aktiviert sein und es wird eine IPv4 Verbindung aufgebaut, werden die IPv6 Adressen nach IPv4 gewandelt  (siehe: "::ffff:127.0.0.1"), Beispiele: "^((::ffff:)?123.45.67.89|192.160.*)$"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

@@ -63,6 +93,11 @@
 ** Typ: integer
 ** Werte: 0 .. 9 (Standardwert: `6`)

+* [[option_relay.network.ipv6]] *relay.network.ipv6*
+** Beschreibung: `lauscht standardmäßig am IPv6 Socket (zusätzlich zu IPv4, welches als Standardprotokoll genutzt wird); mittels des Protokollnamens kann das IPv4 und IPv6 Protokoll, einzeln oder gemeinsam, erzwungen werden (siehe /help relay)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_relay.network.max_clients]] *relay.network.max_clients*
 ** Beschreibung: `maximale Anzahl an Clients die mit einem Port verbunden sein dürfen`
 ** Typ: integer
@@ -73,3 +108,8 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

+* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
+** Beschreibung: `Datei mit SSL Zertifikat und privatem Schlüssel (zur Nutzung von Clients mit SSL)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"%h/ssl/relay.pem"`)
+
@@ -2,9 +2,9 @@
 [command]*`ruby`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /ruby  list|listfull [<name>]
-       load <filename>
+       load [-q] <filename>
       autoload
-       reload|unload [<name>]
+       reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -0,0 +1,71 @@
+[[command_script_script]]
+[command]*`script`* WeeChat Skripten-Manager::
+........................................
+/script  list [-o|-i]
+         search <text>
+         show <script>
+         load|unload|reload <script> [<script>...]
+         install|remove|installremove|hold [-q] <script> [<script>...]
+         upgrade
+         update
+
+    list: gibt alle geladenen Skripten im Buffer aus (unabhängig der Programmiersprache)
+           -o: gibt eine Liste der gestarteten Skripten im Buffer aus
+           -i: eine Liste der gestarteten Skripten wird in die Eingabezeile kopiert (um sie dann manuell in einen Buffer zu senden)
+  search: sucht Skripten nach Schlagwörtern oder beliebigem Text. Das Ergebnis wird im Skripten-Buffer dargestellt
+    show: zeigt detailliert Informationen zu einem Skript an
+    load: startet Skript(en)
+  unload: beendet Skript(en)
+  reload: Skript(en) werden neu geladen
+ install: installiert/aktualisiert Skript(en) (physikalisch, auf dem Datenträger)
+  remove: deinstalliert Skript(en) (physikalisch, vom Datenträger)
+installremove: installiert oder deinstalliert Skript(en), abhängig davon welcher Status vorliegt
+    hold: halten/freigeben von Skript(en) (ein Skript welches gehalten wird, kann weder aktualisiert noch entfernt werden)
+           -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
+ upgrade: aktualisiert alle installierten Skripten, die obsolet sind (wenn eine neue Version verfügbar ist)
+  update: aktualisiert den lokalen Cache für die Skripten
+
+Ohne Angaben von Argumenten öffnet dieser Befehl einen Buffer in welchem eine Liste der Skripten dargestellt wird.
+
+Im Skript-Buffer, werden folgende Statusangaben zu einem Skript angezeigt:
+  * i a H r N
+  | | | | | |
+  | | | | | obsolete (neue Version verfügbar)
+  | | | | Skript wird ausgeführt (geladen)
+  | | | gehalten
+  | | Skript wird beim Start, von Weechat, automatisch gestartet
+  | Skript ist installiert (wird aber nicht ausgeführt)
+  es wird empfohlen dieses Skript zu installieren
+
+Tastenbefehle die im Skript-Buffer genutzt werden können:
+  alt+i  installiert Skript (physikalisch)
+  alt+r  deinstalliert Skript (physikalisch
+  alt+l  startet ein Skript (Skript wird ausgeführt)
+  alt+L  Skript wird neu gestartet
+  alt+u  beendet ein Skript
+  alt+h  Skript wird gehalten bzw. freigegeben
+  alt+v  Skript anzeigen
+
+Befehle die in der Eingabezeile des Skript-Buffers eingegeben werden können:
+  i/r/l/L/u/h  Aktionen die für ein Skript ausgeführt werden können (siehe Tastenbefehle, weiter oben)
+  q            schließt den Buffer
+  $            Buffer wird aktualisiert
+  s:x,y        Buffer wird nach den Vorgaben x und y  sortiert (siehe /help script.look.sort)
+  s:           die Sortierung des Buffers wird zurückgesetzt (Standardwerte werden genutzt)
+  word(s)      Skripten werden gefiltert: sucht nach einem oder mehreren Wörtern in den Skripten (der Beschreibung, in den Schlagwörtern, ...)
+  *            Filter wird zurückgesetzt
+
+Mausbefehle innerhalb des Skripten-Buffer:
+  Mausrad            in der Liste scrollen
+  linker Mausknopf   Skript anwählen
+  rechter Mausknopf  Skript installieren/entfernen
+
+Beispiele:
+  /script search url
+  /script install iset.pl buffers.pl
+  /script remove iset.pl
+  /script hold urlserver.py
+  /script reload urlserver
+  /script upgrade
+........................................
+
@@ -0,0 +1,190 @@
+* [[option_script.color.status_autoloaded]] *script.color.status_autoloaded*
+** Beschreibung: `Farbe in der der Status "autoloaded" ("a") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `cyan`)
+
+* [[option_script.color.status_held]] *script.color.status_held*
+** Beschreibung: `Farbe in der der Status "halten" ("H") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.status_installed]] *script.color.status_installed*
+** Beschreibung: `Farbe in der der Status "installiert" ("i") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `lightcyan`)
+
+* [[option_script.color.status_obsolete]] *script.color.status_obsolete*
+** Beschreibung: `Farbe in der der Status "obsolete" ("N") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `lightmagenta`)
+
+* [[option_script.color.status_popular]] *script.color.status_popular*
+** Beschreibung: `Farbe in der der Status "empfohlen" ("*") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `yellow`)
+
+* [[option_script.color.status_running]] *script.color.status_running*
+** Beschreibung: `Farbe in der der Status "laufend" ("r") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `lightgreen`)
+
+* [[option_script.color.status_unknown]] *script.color.status_unknown*
+** Beschreibung: `Farbe in der der Status "unbekannt" ("?") dargestellt werden soll`
+** 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 unterstrichen (Standardwert: `lightred`)
+
+* [[option_script.color.text]] *script.color.text*
+** Beschreibung: `Textfarbe im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_bg]] *script.color.text_bg*
+** Beschreibung: `Hintergrundfarbe im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_bg_selected]] *script.color.text_bg_selected*
+** Beschreibung: `Hintergrundfarbe`
+** 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 unterstrichen (Standardwert: `red`)
+
+* [[option_script.color.text_date]] *script.color.text_date*
+** Beschreibung: `Textfarbe für das Datum im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_date_selected]] *script.color.text_date_selected*
+** Beschreibung: `Textfarbe für das Datum, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.text_delimiters]] *script.color.text_delimiters*
+** Beschreibung: `Textfarbe für das Trennzeichen im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `darkgray`)
+
+* [[option_script.color.text_description]] *script.color.text_description*
+** Beschreibung: `Textfarbe für die Beschreibung im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_description_selected]] *script.color.text_description_selected*
+** Beschreibung: `Textfarbe für die Beschreibung des Skriptes, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.text_extension]] *script.color.text_extension*
+** Beschreibung: `Textfarbe für die Erweiterung im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_extension_selected]] *script.color.text_extension_selected*
+** Beschreibung: `Textfarbe für die Dateierweiterung, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.text_name]] *script.color.text_name*
+** Beschreibung: `Textfarbe für den Namen des Skriptes im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `cyan`)
+
+* [[option_script.color.text_name_selected]] *script.color.text_name_selected*
+** Beschreibung: `Textfarbe für den Namen des Skriptes, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `lightcyan`)
+
+* [[option_script.color.text_selected]] *script.color.text_selected*
+** Beschreibung: `Textfarbe für den Auswahlbalken im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.text_tags]] *script.color.text_tags*
+** Beschreibung: `Textfarbe für die Schlagwörter im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `brown`)
+
+* [[option_script.color.text_tags_selected]] *script.color.text_tags_selected*
+** Beschreibung: `Textfarbe für die Schlagwörter, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `yellow`)
+
+* [[option_script.color.text_version]] *script.color.text_version*
+** Beschreibung: `Textfarbe für die Version im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `magenta`)
+
+* [[option_script.color.text_version_loaded]] *script.color.text_version_loaded*
+** Beschreibung: `Textfarbe für die geladene Version im Skript-Buffer`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_script.color.text_version_loaded_selected]] *script.color.text_version_loaded_selected*
+** Beschreibung: `Textfarbe für die Versionsanzeige des geladenen Skriptes, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `white`)
+
+* [[option_script.color.text_version_selected]] *script.color.text_version_selected*
+** Beschreibung: `Textfarbe für die Version des Skriptes, im Skript Buffer, wenn die Zeile angewählt wird`
+** 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 unterstrichen (Standardwert: `lightmagenta`)
+
+* [[option_script.look.columns]] *script.look.columns*
+** Beschreibung: `Format in welchem die Spalten im Skript Buffer dargestellt werden sollen. Es können folgende Spaltenbezeichnungen genutzt werden: %a=Autor, %d=Beschreibung, %D=hinzugefügt, %e=Dateierweiterung, %l=Programmiersprache, %L=Lizenz, %n=Skriptname, mit Dateierweiterung, %N=Skriptname, %r=Voraussetzungen, %s=Status, %t=Schlagwörter, %u=Datum der letzten Überarbeitung, %v=Version, %V=installierte Version, %w=min_WeeChat_Version, %W=max_WeeChat_Version)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"%s %n %V %v %u | %d | %t"`)
+
+* [[option_script.look.diff_color]] *script.look.diff_color*
+** Beschreibung: `Unterschiede in den zwei Skripten werden farblich hervorgehoben`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_script.look.diff_command]] *script.look.diff_command*
+** Beschreibung: `Befehl der genutzt werden soll um die Unterschiede zwischen dem installierten Skript und dem Skript, welches im offiziellem Bereich der Homepage bereitgestellt wird, darzustellen ("auto" = automatische Erkennung des Diff-Befehls (git oder diff), leerer Wert = Diff ist deaktiviert, externer Befehl = Name des Befehls, zum Beispiel "diff")`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"auto"`)
+
+* [[option_script.look.display_source]] *script.look.display_source*
+** Beschreibung: `Zeigt den Quellcode des Skriptes, mit weiteren Informationen zu dem Skript, im Buffer an (Skript wird dazu temporär in eine Datei gesichert)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_script.look.quiet_actions]] *script.look.quiet_actions*
+** Beschreibung: `diese Option stellt einen stummen Modus für den Skripten-Buffer zu Verfügung: Es werden keine Nachrichten im Core-Buffer ausgegeben, wenn Skripten installiert/entfernt/gestartet/beendet werden (lediglich Fehler werden ausgegeben)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_script.look.sort]] *script.look.sort*
+** Beschreibung: `Standardsortierung für Skripten im Skript Buffer: durch Kommata getrennte Liste von Bezeichnern: a=Autor, A=automatisch geladen, d=Datum wann das Skript hinzugefügt wurde, e=Dateierweiterung, i=installiert, l=Programmiersprache, n=Skriptname, o=obsolete, p=empfohlen, r=Skript wird ausgeführt, u=Datum der letzten Überarbeitung; mit Hilfe des Zeichens "-", vor dem entsprechenden Bezeichner, kann die Darstellung umgekehrt werden. Beispiel: "i,u": installierte Skripten werden zuerst dargestellt, sortiert nach dem Datum ihrer letzten Überarbeitung`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"p,n"`)
+
+* [[option_script.look.translate_description]] *script.look.translate_description*
+** Beschreibung: `Für die Beschreibung der Skripten wird die Muttersprache verwendet (sollte keine Übersetzung in der eigenen Sprache verfügbar sein, wird auf die englische Beschreibung zurückgegriffen)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_script.look.use_keys]] *script.look.use_keys*
+** Beschreibung: `Um Tastenkurzbefehle im Skript-Buffer direkt nutzen zu können (zum Beispiel: alt+i = installieren, alt+r = entfernen, ...), muss diese Option aktiviert werden. Andernfalls können Aktionen nur über die Eingabezeile durchgeführt werden: i,r...`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
+** Beschreibung: `Ablaufdatum des lokalen Caches, in Minuten (-1 = ohne Ablaufdatum, 0 = umgehend)`
+** Typ: integer
+** Werte: -1 .. 525600 (Standardwert: `60`)
+
+* [[option_script.scripts.dir]] *script.scripts.dir*
+** Beschreibung: `lokales Cache-Verzeichnis für Skripten`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"%h/script"`)
+
+* [[option_script.scripts.hold]] *script.scripts.hold*
+** Beschreibung: `Skripten welche "gehalten" werden sollen. Dies ist eine durch Kommata getrennte Liste von Skripten die nicht aktualisiert werden und nicht entfernt werden können. Zum Beispiel: "buffers.pl,iset.pl"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_script.scripts.url]] *script.scripts.url*
+** Beschreibung: `URL für Datei mit Inhalt der unterstützten Skripten`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"http://www.weechat.org/files/plugins.xml.gz"`)
+
@@ -2,9 +2,9 @@
 [command]*`tcl`* auflisten/installieren/deinstallieren von Skripten::
 ........................................
 /tcl  list|listfull [<name>]
-      load <filename>
+      load [-q] <filename>
      autoload
-      reload|unload [<name>]
+      reload|unload [-q] [<name>]

    list: installierte Skripten werden aufgelistet
 listfull: detaillierte Auflistung aller installierten Skripten
@@ -14,6 +14,7 @@ autoload: installiert automatisch alle Skripten aus dem "autoload" Verzeichnis
  unload: deinstalliert ein Skript (wird kein Name angegeben, dann werden alle Skripten deinstalliert)
 filename: Skript (Datei) welches geladen werden soll
    name: Name eines Skriptes (der Name der in der "register" Funktion der Skript-API genutzt wird)
+      -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben

 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
 ........................................
@@ -11,28 +11,29 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand
 [command]*`bar`* Infobars verwalten::
 ........................................
 /bar  list|listfull|listitems
-      add <name> <type>[,<cond1>[,<cond2>...]] <position> <size> <separator> <item1>[,<item2>...]
+      add <name> <type>[,<condition>] <position> <size> <separator> <item1>[,<item2>...]
      default [input|title|status|nicklist]
      del <name>|-all
      set <name> <option> <value>
      hide|show|toggle <name>
      scroll <name> <window> <scroll_value>

-         list: listet alle Infobars auf
-     listfull: listet alle Infobars detailliert auf (Standardaufruf)
-    listitems: listet alle Items auf, die in den Infobars genutzt werden
+         list: zeigt alle Infobars an
+     listfull: zeigt eine detaillierte Liste aller Infobars an (ausführlich)
+    listitems: zeigt alle Items an, die in den Infobars genutzt werden
          add: füge eine neue Infobar hinzu
         name: Name der Infobar (muss einmalig sein)
-         type:   root: außerhalb des Fensters,
-               window: innerhalb des Fensters, mit optionalen Merkmalen (siehe unten)
-    cond1,...: Merkmal(e) für eine Infobar (nur nutzbar mit der Type-Option "window"):
+         type:   root: außerhalb eines Fensters,
+               window: innerhalb eines Fensters, mit optionalen Merkmalen (siehe unten)
+    condition: Merkmal(e) für eine Infobar (nur nutzbar mit der Type-Option "window"):
                 active: in einem aktiven Fenster
               inactive: in einem inaktiven Fenster
               nicklist: in Fenstern mit einer Nickliste
-               werden keine Merkmale angegeben, ist die Infobar immer sichtbar
+               weitere Merkmale: siehe /help weechat.bar.xxx.conditions und /help eval
+               ohne Angabe von Merkmalen wird die Infobar immer angezeigt
     position: bottom (unten), top (oben), left (links) oder right (rechts)
         size: Größe der Infobar (in Zeichen)
-    separator: 1 um eine Trennlinien zu zeichnen, bei 0 oder ohne eine Angabe wird keine Trennlinien gezeichnet
+    separator: 1 um eine Trennlinien zu zeichnen, bei 0 oder ohne eine Angabe, wird keine Trennlinien gezeichnet
    item1,...: Items die in der Infobar genutzt werden sollen (Items können durch Kommata oder Leerzeichen getrennt werden ("+" (verbindet Items))
      default: erstellt standardisierte Infobars
          del: entfernt eine Infobar (alle Infobars können mit der Option "-all" entfernt werden).
@@ -44,7 +45,7 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand
       toggle: zeigt/versteckt eine Infobar
       scroll: scrollt Infobar hoch/runter
       window: Nummer des Fensters (nutze '*' für aktuelles Fenster oder für die Root-Bars)
- scroll_value: Werte für Scroll-Funktion: 'x' oder 'y', gefolgt von '+', '-', 'b' (Beginn) oder 'e' (Ende), Wert (für +/-), und optional % (zum scrollen der Breite/Höhe in %, ansonsten wird dieser Wert als Anzahl der Zeichen interpretiert um die gescrollt werden soll)
+ scroll_value: Werte für Scroll-Funktion: 'x' oder 'y' (optional), gefolgt von '+', '-', 'b' (Beginn) oder 'e' (Ende), Wert (für +/-), und optional % (zum scrollen der Breite/Höhe in %, ansonsten wird dieser Wert als Anzahl der Zeichen interpretiert um die gescrollt werden soll)

 Beispiele:
  erstellt eine Infobar mit den Items: time, buffer number + name, und Vervollständigung:
@@ -63,6 +64,7 @@ Beispiele:
 /buffer  list
         clear [<number>|<name>|-merged|-all]
         move|merge <number>
+         swap <number1>|<name1> [<number2>|<name2>]
         unmerge [<number>|-all]
         close [<n1>[-<n2>]|<name>]
         notify <level>
@@ -74,6 +76,7 @@ Beispiele:
    list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
   clear: leert den Inhalt des Buffers (entweder durch Angabe der entsprechenden Nummer des Buffers oder "-merged " für zusammengefügte Buffer oder "-all" für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht)
    move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1)
+    swap: tauscht zwei Buffer miteinander aus (bei Angabe von nur einem Buffer (Buffernummer/-name), wird der aktuelle Buffer mit dem angegebenen Buffer getauscht)
   merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht ein Mix aus beiden Buffern
         (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden)
 unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen
@@ -98,6 +101,10 @@ Beispiele:
    /buffer clear
  verschiebt Buffer auf Position 5:
    /buffer move 5
+  tauscht Buffer 1 und 3:
+    /buffer swap 1 3
+  tauscht Buffer #weechat und den aktuellen Buffer:
+    /buffer swap #weechat
  verbindet Buffer mit dem Core-Buffer:
    /buffer merge 1
  trennt Buffer voneinander:
@@ -144,7 +151,7 @@ command: auszuführender Befehl (es wird automatisch ein '/' vorangestellt, fall
 ........................................

 [[command_weechat_cursor]]
-[command]*`cursor`* Cursor kann frei auf dem Bildschirm bewegt werden um Aktionen in bestimmten Bildschirmbereichen auszuführen::
+[command]*`cursor`* Cursor kann frei auf dem Bildschirm bewegt werden, um Aktionen in bestimmten Bildschirmbereichen auszuführen::
 ........................................
 /cursor  go chat|<bar>|<x>,<y>
         move up|down|left|right|area_up|area_down|area_left|area_right
@@ -156,7 +163,7 @@ stop: beendet den Cursor-Modus

 Ohne Angabe von Argumenten wird der Cursor-Modus umgeschaltet.

-Ist die Mausfunktion aktiviert (siehe /help mouse), startet man den Cursor-Modus mit der mittleren Maustaste und positioniert den Cursor an diesen Punkt.
+Ist die Mausfunktion aktiviert (siehe /help mouse), startet man den Cursor-Modus mit der mittleren Maustaste und positioniert den Cursor auf diesen Punkt.

 Beispiele:
  gehe zur Nickliste:
@@ -193,6 +200,61 @@ infolists: zeigt Information über die Infolists an
  windows: zeigt die Fensterstruktur an
 ........................................

+[[command_weechat_eval]]
+[command]*`eval`* wertet einen Ausdruck aus und gibt das Resultat im Buffer aus::
+........................................
+/eval  [-n] <expression>
+       [-n] <expression1> <operator> <expression2>
+
+        -n: zeigt das Ergebnis an, ohne dieses in den Buffer zu schreiben (debug Modus)
+expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${variable} werden ersetzt (siehe unten)
+  operator: ein logischer oder vergleichender Operand:
+            - logische Operanden:
+                &&  boolean "und"
+                ||  boolean "oder"
+            - vergleichende Operanden:
+                ==  gleichl
+                !=  nicht gleich
+                <=  kleiner oder gleich
+                <   kleiner
+                >=  größer oder gleich
+                >   größer
+                =~  stimmt mit regulärem Ausdruck überein
+                !~  stimmt NICHT mit regulärem Ausdruck überein
+
+Ein Ausdruck gilt als "wahr", sofern das Ergebnis nicht NULL, nicht leer und von "0" abweichend ist.
+Der Vergleich findet zwischen zwei Integer statt, sofern die beiden Ausdrücke gültige Integer-Werte sind.
+Um einen Vergleich zwischen zwei Zeichenketten zu erzwingen, müssen die Ausdrücke in Anführungszeichen gesetzt werden, zum Beispiel:
+  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:
+  1. der Name einer Option (file.section.option)
+  2. der Name der lokalen Variablen für Buffer
+  3. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette konvertiert), Standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
+Das Format für hdata:
+  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:
+    ${buffer[gui_buffers].full_name}: der vollständige Name des ersten Buffers, in der verknüpften Liste aller Buffer
+    ${plugin[weechat_plugins].name}: Name der ersten Erweiterung, in der verknüpften Liste aller Erweiterungen
+Die vorhandenen Namen für hdata und Variablen sind in der "Anleitung für API Erweiterung", Bereich "weechat_hdata_get". beschrieben
+
+Beispiele:
+  /eval -n ${weechat.look.scroll_amount}  ==> 3
+  /eval -n ${window}                      ==> 0x2549aa0
+  /eval -n ${window.buffer}               ==> 0x2549320
+  /eval -n ${window.buffer.full_name}     ==> core.weechat
+  /eval -n ${window.buffer.number}        ==> 1
+  /eval -n ${window.buffer.number} > 2    ==> 0
+  /eval -n ${window.win_width} > 100      ==> 1
+  /eval -n (8 > 12) || (5 > 2)            ==> 1
+  /eval -n (8 > 12) && (5 > 2)            ==> 0
+  /eval -n abcd =~ ^ABC                   ==> 1
+  /eval -n abcd =~ (?-i)^ABC              ==> 0
+  /eval -n abcd =~ (?-i)^abc              ==> 1
+  /eval -n abcd !~ abc                    ==> 0
+........................................
+
 [[command_weechat_filter]]
 [command]*`filter`* Filterfunktion um Nachrichten in Buffern aus- oder einzublenden, dazu können Schlagwörter oder reguläre Ausdrücke verwendet werden::
 ........................................
@@ -319,6 +381,7 @@ Auflistung der möglichen Funktionen:
  set_unread_current_buffer: setzt nur für den aktuellen Buffer eine Markierung der ungelesen Nachrichten
  switch_active_buffer: springt zum nächsten zusammengefügten Buffer
  switch_active_buffer_previous: springt zum vorherigen zusammengefügten Buffer
+  zoom_merged_buffer: zoomt in zusammengefügte Buffer
  insert: fügt einen Text in die Eingabezeile ein
  paste_start: Einfügen wird gestartet (bracketed paste mode)
  paste_stop: Einfügen wird beendet (bracketed paste mode)
@@ -484,7 +547,7 @@ Beispiele:
  erstellt einen HTTP-Proxy, der auf einem lokalen Host läuft und den Port 8888 nutzt:
    /proxy add local http 127.0.0.1 8888
  erstellt einen HTTP-Proxy der das IPv6 Protokoll nutzt:
-    /proxy add local http 127.0.0.1 8888
+    /proxy add local http ::1 8888
    /proxy set local ipv6 on
  erstellt einen socks5-Proxy, mit Username und Passwort:
    /proxy add myproxy socks5 sample.host.org 3128 myuser mypass
@@ -542,23 +605,29 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite
 [command]*`set`* Konfigurationsparameter setzen::
 ........................................
 /set  [<option> [<value>]]
+      diff [<option> [<option>...]]

-option: Name der zu ändernden Option (darf mit einem Joker '*' beginnen oder enden um mehrere Optionen anzuzeigen)
- value: neuer Wert, den die Option erhalten soll
+option: name of an option (can start or end with '*' to list many options)
+ value: new value for option
+  diff: display only changed options

-Abhängig von der ausgewählten Option, kann die Variable folgenden Inhalt haben:
-  boolean: on, off oder toggle
-  integer: Anzahl, ++Anzahl oder --Anzahl
-  string : jede Zeichenkette ("" für eine leere Zeichenkette)
-  color  : Name einer Farbe, ++Anzahl oder --Anzahl
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number

-Für alle Typen von Variablen kann die Zeichenkette "null" (ohne "")  genutzt werden um den Wert der Option zu löschen (undefinierter Wert). Dies  kann nur bei einigen Erweiterungen genutzt werden.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.

-Beispiele:
-  Zeigt alle Optionen an die etwas mit highlight zu tun haben:
+Examples:
+  display options about highlight:
    /set *highlight*
-  Fügt ein highlight-Wort hinzu:
+  add a word to highlight:
    /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................

 [[command_weechat_unset]]
@@ -580,19 +649,30 @@ Beispiele:
 [[command_weechat_upgrade]]
 [command]*`upgrade`* Aktualisiert WeeChat ohne die Verbindung zum Server zu trennen::
 ........................................
-/upgrade  [<path_to_binary>]
+/upgrade  [<path_to_binary>|-quit]

 path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei)
+         -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe unten)

-Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Die neue Version von WeeChat muss deshalb vorab kompiliert oder mit einem Paketmanager installiert worden sein, bevor der Befehl ausgeführt werden kann.
+Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein.

-Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da solche Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt.
+Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt.

 Der Upgrade Vorgang besteht aus vier Schritten:
-  1. Speicherung der Session in Dateien für Core und Erweiterungen (buffers, history, ..)
+  1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, history, ..)
  2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert)
-  3. Speicherung der WeeChat Konfiguration (weechat.conf)
-  4. ausführen einer neuen WeeChat Session.
+  3. Sicherung der WeeChat Konfiguration (weechat.conf)
+  4. ausführen der neuen Version von WeeChat und wiederherstellen der Sitzung.
+
+Nutzt man die "-quit" Funktion ist die Abfolge geringfügig anders:
+  1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...)
+  2. die Sitzung wird in Dateien gesichert (*.upgrade)
+  3. alle Erweiterungen werden ausgeschaltet
+  4. die WeeChat Konfiguration wird gesichert
+  5. WeeChat wird beendet
+Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat-curses --upgrade
+WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien wiederhergestellt werden (*.conf)
+Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen, sofern man den Inhalt des "~/.weechat" Verzeichnisses dorthin kopiert.
 ........................................

 [[command_weechat_uptime]]
@@ -63,6 +63,21 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

+* [[option_weechat.color.chat_nick_offline]] *weechat.color.chat_nick_offline*
+** Beschreibung: `Textfarbe für Nicks im Buffer die Offline sind (dies betrifft Nicks, die nicht in der Nickliste vorhanden sind!)`
+** 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 unterstrichen (Standardwert: `darkgray`)
+
+* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight*
+** Beschreibung: `Textfarbe für Highlight Nachrichten von Nicks die nicht mehr Online sind`
+** 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 unterstrichen (Standardwert: `default`)
+
+* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg*
+** Beschreibung: `Hintergrundfarbe für Highlight Nachrichten von Nicks die nicht mehr Online sind`
+** 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 unterstrichen (Standardwert: `darkgray`)
+
 * [[option_weechat.color.chat_nick_other]] *weechat.color.chat_nick_other*
 ** Beschreibung: `Farbe des anderen Nicknamens in einem privaten Buffer`
 ** Typ: Farbe
@@ -374,7 +389,7 @@
 ** Werte: none, highlight, message, all (Standardwert: `all`)

 * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** Beschreibung: `Format für die Zeitanzeige welche in jeder Zeile eines Buffers dargestellt wird (siehe man strftime für Datum/Zeit Platzhalter). Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine französische Uhr: "${lightblue}%H${white}%M${lightred}%S"`
+** Beschreibung: `Format für die Zeitanzeige welche in jeder Zeile eines Buffers dargestellt wird (siehe man strftime für Platzhalter für das Datum und die Uhrzeit). Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine französische Uhr: "${lightblue}%H${white}%M${lightred}%S"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)

@@ -413,6 +428,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

+* [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline*
+** Beschreibung: `Nicks die Offline sind werden im Buffer in einer anderen Farbe dargestellt (dies betrifft Nicks, die nicht in der Nickliste vorhanden sind!)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `off`)
+
 * [[option_weechat.look.color_pairs_auto_reset]] *weechat.look.color_pairs_auto_reset*
 ** Beschreibung: `automatischer Reset der Farbpaarungen sobald die verfügbare Anzahl an Paaren kleiner oder gleich der hier angegebenen Anzahl ist (-1 = deaktiviert den automatischen Reset, dann ist ein manueller Reset mittels "/color reset" notwendig falls alle Farbpaarungen belegt sind)`
 ** Typ: integer
@@ -474,7 +494,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `", "`)

 * [[option_weechat.look.hotlist_count_max]] *weechat.look.hotlist_count_max*
-** Beschreibung: `maximale Anzahl an Nachrichten für den Nachrichtenzähler in der Hotlist, pro Buffer (0 = der Nachrichtenzähler wird nicht dargestellt)`
+** Beschreibung: `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)`
 ** Typ: integer
 ** Werte: 0 .. 4 (Standardwert: `2`)

@@ -544,7 +564,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)

 * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format*
-** Beschreibung: `Format für die Zeitanzeige, "time", in der Bar-Item (siehe man strftime für Datum/Zeit Platzhalter)`
+** Beschreibung: `Format für die Zeitanzeige, "time", in der Bar-Item (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M"`)

@@ -558,6 +578,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** Beschreibung: `springt zurück zum Ausgangsbuffer, falls keine weiteren Einträge in der Hotlist vorhanden sind`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_weechat.look.mouse]] *weechat.look.mouse*
 ** Beschreibung: `Mausunterstützung einschalten`
 ** Typ: boolesch
@@ -568,18 +593,8 @@
 ** Typ: integer
 ** Werte: 1 .. 10000 (Standardwert: `100`)

-* [[option_weechat.look.nickmode]] *weechat.look.nickmode*
-** Beschreibung: `vor dem Nicknamen wird der entsprechende Nickmode ((half)op/voice [@%+]) angezeigt`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
-
-* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty*
-** Beschreibung: `Leerzeichen statt des Nickmode nutzen, wenn kein Nickmode ((half)op/voice [@%+]) vorhanden ist`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
-
 * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
-** Beschreibung: `aktiviert den "bracketed paste mode" des Terminals (wird nicht durch alle Terminals/Multiplexer unterstützt): Dieser Modus erlaubt das Einfügen von Steuersequenzen die in Klammern gesetzt sind. WeeChat kann dadurch ermitteln ob ein Text eingefügt oder geschrieben wurde ("ESC[200~", followed by the pasted text, followed by "ESC[201~")`
+** Beschreibung: `aktiviert den "bracketed paste mode" des Terminals (wird nicht durch alle Terminals/Multiplexer unterstützt): Dieser Modus erlaubt das Einfügen von Steuersequenzen die in Klammern gesetzt sind. WeeChat kann dadurch ermitteln ob ein Text eingefügt oder geschrieben wurde ("ESC[200~", gefolgt von dem einzufügenden Text und einem abschließenden "ESC[201~")`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)

@@ -594,7 +609,7 @@
 ** Werte: -1 .. 2147483647 (Standardwert: `1`)

 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** Beschreibung: `Präfix für Action-Nachrichten`
+** Beschreibung: `prefix for action messages, colors are allowed with format "${color}"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `" *"`)

@@ -634,22 +649,22 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"+"`)

 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** Beschreibung: `Präfix für Fehlermeldungen`
+** Beschreibung: `prefix for error messages, colors are allowed with format "${color}"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"=!="`)

 * [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** Beschreibung: `Präfix für Join-Nachrichten`
+** Beschreibung: `prefix for join messages, colors are allowed with format "${color}"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-->"`)

 * [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** Beschreibung: `Präfix für Netzwerkmeldungen`
+** Beschreibung: `prefix for network messages, colors are allowed with format "${color}"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"--"`)

 * [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** Beschreibung: `Präfix für Quit-Nachrichten`
+** Beschreibung: `prefix for quit messages, colors are allowed with format "${color}"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"<--"`)

@@ -709,17 +724,17 @@
 ** Werte: on, off (Standardwert: `on`)

 * [[option_weechat.look.separator_horizontal]] *weechat.look.separator_horizontal*
-** Beschreibung: `das genutzte Zeichen wird verwendet um damit die horizontalen Linien zu zeichnen. Wird kein Zeichen angegeben dann zeichnet ncurses eine durchgezogene Linie. Dies kann allerdings bei einigen Terminals zu Fehlern führen, falls die URL Auswahl genutzt wird. Wide Chars sind für diese Option NICHT erlaubt.`
+** Beschreibung: `das angegebene Zeichen wird verwendet um die horizontalen Linien zu zeichnen. Wird kein Zeichen angegeben, dann zeichnet ncurses eine durchgängige Linie. Dies kann allerdings bei einigen Terminals zu Problemen führen, falls die URL Auswahl genutzt wird. Wide Chars sind für diese Option NICHT erlaubt.`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-"`)

 * [[option_weechat.look.separator_vertical]] *weechat.look.separator_vertical*
-** Beschreibung: `das genutzte Zeichen wird verwendet um damit die vertikale Linien zu zeichnen. Wird kein Zeichen angegeben dann zeichnet ncurses eine durchgezogene Linie. Wide Chars sind für diese Option NICHT erlaubt.`
+** Beschreibung: `das angegebene Zeichen wird verwendet um die vertikale Linien zu zeichnen. Wird kein Zeichen angegeben, dann zeichnet ncurses eine durchgängige Linie. Wide Chars sind für diese Option NICHT erlaubt.`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)

 * [[option_weechat.look.set_title]] *weechat.look.set_title*
-** Beschreibung: `setzt den Fenstertitels (oder Terminal-Titel im Curses-GUI), mit Name und Version`
+** Beschreibung: `setzt den Fenstertitel (oder Terminal-Titel im Curses-GUI), mit Name und Version`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

@@ -728,6 +743,16 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T"`)

+* [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
+** Beschreibung: `ist die Option aktiviert dann wird eine horizontale Trennlinie zwischen Fenstern gezeichnet`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
+* [[option_weechat.look.window_separator_vertical]] *weechat.look.window_separator_vertical*
+** Beschreibung: `ist die Option aktiviert dann wird eine vertikale Trennlinie zwischen Fenstern gezeichnet`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
 ** Beschreibung: `Zeitüberschreitung (in Sekunden) für eine Verbindung zu einem entfernten Rechner (mittels einem Kindprozess)`
 ** Typ: integer
@@ -788,3 +813,8 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)

+* [[option_weechat.startup.sys_rlimit]] *weechat.startup.sys_rlimit*
+** Beschreibung: `setzt Ressourcenbeschränkungen für den WeeChat Prozess. (Format: "res1:limit1,res2:limit2"; Ressourcenname ist das Ende der Konstanten (RLIMIT_XXX) in Kleinbuchstaben (siehe man setrlimit für Werte); limit -1 bedeutet "unbegrenzt"; Beispiele: für die Core-Datei wird eine unbegrenzte Dateigröße bestimmt und die virtuelle Speicherkapazität auf maximal 1GB festgelegt: "core:-1,as:1000000000"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
@@ -29,17 +29,17 @@
 ** 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 unterstrichen (Standardwert: `lightcyan`)

 * [[option_xfer.color.text]] *xfer.color.text*
-** Beschreibung: `Textfarbe`
+** Beschreibung: `Textfarbe in xfer Buffer`
 ** 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 unterstrichen (Standardwert: `default`)

 * [[option_xfer.color.text_bg]] *xfer.color.text_bg*
-** Beschreibung: `Hintergrundfarbe`
+** Beschreibung: `Hintergrundfarbe des xfer Buffer`
 ** 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 unterstrichen (Standardwert: `default`)

 * [[option_xfer.color.text_selected]] *xfer.color.text_selected*
-** Beschreibung: `Farbe der ausgewählten Transfer-Zeile`
+** Beschreibung: `Textfarbe für selektierte Zeile in xfer Buffer`
 ** 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 unterstrichen (Standardwert: `white`)

@@ -4,14 +4,14 @@ Sébastien Helleu <flashcode@flashtux.org>


 [NOTE]
-Diese Dokumentation beschreibt ausschließlich WeeChat Versionen ≥ 0.3.0.
+Diese Dokumentation bezieht sich auf die WeeChat Version ≥ 0.3.0. Es sollte aber
+vorzugsweise immer die aktuell veröffentlichte Version von WeeChat genutzt werden.


 [[general]]
 Allgemein
 ---------

-
 [[weechat_name]]
 Woher kommt eigentlich der Name "WeeChat"?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -22,7 +22,6 @@ Somit lautet der vollständige Name "Wee Enhanced Environment for Chat".
 "Wee" bedeutet außerdem "sehr klein" (und ja, es gibt noch eine andere Bedeutung des Wortes.
 Aber dieses trifft nicht auf WeeChat zu!)

-
 [[why_choose_weechat]]
 Weshalb sollte man WeeChat nutzen? - X-Chat und Irssi sind doch auch sehr gut...
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -54,12 +53,10 @@ Einige Funktionen (Version ≥ 0.3.x):
 Weitere Informationen gibt es auf der folgenden Internetseite:
 http://www.weechat.org/features

-
 [[compilation_install]]
 Kompilierung / Installation
 ---------------------------

-
 [[gui]]
 Ich habe gehört es gibt mehrere GUIs für WeeChat. Wie kann ich diese kompilieren bzw. nutzen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -69,7 +66,6 @@ Zur Zeit ist nur eine GUI, für Curses, verfügbar.
 Andere GUIs (zur Zeit in der Entwicklung) werden als Remote Clients verfügbar
 sein.

-
 [[compile_git]]
 Ich kann WeeChat nach Cloning des git Repository nicht kompilieren - weshalb?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,7 +82,6 @@ Beachte, dass dieses Paket nicht immer exakt mit dem git Repository übereinstim
 und daher auch weniger brauchbar sein kann. Im Gegensatz zu der Möglichkeit, dass man selbst
 das Repository klont und daraus Updates installiert.

-
 [[lost]]
 Ich habe WeeChat gestartet, komme aber nicht mehr weiter - was kann ich tun?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -100,12 +95,10 @@ in den Buffern blättern)
 Neue Benutzer sollten unbedingt die 'quickstart'-Anleitung lesen (siehe
 Dokumentation auf der Internetseite).

-
 [[display]]
 Anzeige
 -------

-
 [[charset]]
 Teilweise fehlen den Zeichen die Akzente. Wie kann ich das korrigieren?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -136,7 +129,6 @@ Für Weechat wird die Nutzung von UTF-8 locale empfohlen. Nutzt Du jedoch ISO
 oder andere locale, bitte vergewissere Dich, dass *alle* Deine Einstellungen
 (Terminal, screen, ...) sich auch auf ISO beziehen und *nicht* auf UTF-8.

-
 [[bars_background]]
 Weshalb haben Bars, z.B. Titel und Status, keine Hintergrundfarbe bzw. diese endet direkt nach dem Text?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -152,7 +144,6 @@ Abhängig davon von wo WeeChat gestartet wird, solltest Du folgenden Wert haben:

 Falls nötig korrigiere den Wert Deiner Variablen TERM: `export TERM="xxx"`.

-
 [[screen_weird_chars]]
 Wenn ich Weechat mit screen/tmux nutze habe ich merkwürdige Zeichen, wie kann ich dies beheben?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -165,7 +156,6 @@ Nutzte stattdessen lieber 'xterm'.

 Falls notwendig korrigiere den Wert Deiner TERM-Variable: `export TERM="xxx"`.

-
 [[osx_display_broken]]
 Ich habe WeeChat unter OS X kompiliert und erhalte nur "(null)" als Textausgabe. Was läuft da schief?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -175,13 +165,12 @@ mit dem System ausgeliefert wird.

 Darüber hinaus ist es unter OS X ratsam WeeChat mittels des Homebrew package manager zu installieren.

-
 [[buffer_vs_window]]
 Ich habe von "Buffern" und "Fenstern" gehört - Worin besteht der Unterschied?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Ein 'Buffer' besteht aus einer Nummer, besitzt einem Namen, hat Zeilen die angezeigt
-werden (und noch anderen Daten).
+Ein 'Buffer' besitzt einen Namen und es wird ihm eine 'Buffer'-Nummer zugeordnet.
+In einem 'Buffer' werden Textzeilen angezeigt (und noch anderen Daten).

 Ein 'Fenster' ist ein Bildschirmbereich der Buffer darstellt. Es ist möglich
 den Bildschirm in mehrere Fenster aufzuteilen.
@@ -190,7 +179,6 @@ Jedes Fenster stellt einen Buffer dar. Ein Buffer kann unsichtbar sein (er wird
 in einem Fenster nicht angezeigt). Oder ein Buffer wird durch ein oder mehrere Fenster
 angezeigt.

-
 [[buffers_list]]
 Wie kann ich eine Liste mit den Buffern z.B. auf der linken Seite anzeigen lassen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -209,7 +197,6 @@ Um die Bar nach oben zu verschieben:
 /set weechat.bar.buffers.position bottom
 ----------------------------------------

-
 [[customize_prefix]]
 Wie kann ich die Länge eines Nicknamens begrenzen oder die Ausrichtung des Nicks im Chatbereich entfernen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -226,6 +213,27 @@ um die Ausrichtung für Nicks zu entfernen:
 /set weechat.look.prefix_align none
 ----------------------------------------

+[[input_bar_size]]
+Wie kann man eine mehrzeilige Eingabezeile einstellen?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mit der Option 'size' kann man angeben aus wie vielen Zeilen die Eingabezeile
+bestehen soll (der Standardwert für die Eingabezeile ist 1), oder man nutzt den
+Wert 0 um die Anzahl der Zeilen, für die Eingabezeile, dynamisch zu verwalten.
+Nutzt man zusätzlich die Option 'size_max' kann man angeben wie viele Zeilen,
+für die Eingabezeile, maximal genutzt werden dürfen (0 = keine Begrenzung)
+
+Beispiele um eine dynamische Größe zu nutzen:
+
+----------------------------------------
+/set weechat.bar.input.size 0
+----------------------------------------
+
+maximal zwei Zeilen:
+
+----------------------------------------
+/set weechat.bar.input.size_max 2
+----------------------------------------

 [[one_input_root_bar]]
 Ist es möglich nur eine Eingabezeile für alle Fenster zu nutzen (auch falls diese geteilt sind)?
@@ -249,7 +257,6 @@ werden sollte:
 /bar del rootinput
 ----------------------------------------

-
 [[terminal_copy_paste]]
 Wie kann ich einen Text kopieren und einfügen ohne das die Nickliste mit eingefügt wird?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -264,7 +271,6 @@ Eine weitere Möglichkeit besteht darin die Nickliste nach oben oder unten zu ve
 /set weechat.bar.nicklist.position top
 ----------------------------------------

-
 [[urls]]
 Wie kann ich eine URL aufrufen die einen Zeilenumbruch besitzt?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -310,7 +316,6 @@ shortenurl.py::

 Hier findet man eine Auflistung von Skripten die sich mit URLs befassen: http://www.weechat.org/scripts/stable/tag/url

-
 [[change_locale_without_quit]]
 Ich möchte die Meldungen von Weechat in einer anderen Sprache ausgeben lassen, ohne WeeChat zu beenden. Ist dies möglich?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -327,7 +332,6 @@ Hierdurch erhält man für das Terminal deutsche, UTF-8 kodierte Meldungen.
 Benutzer von ISO-Kodierungen können folgendes eingeben:
 `/shell setenv LANG=de_DE`.

-
 [[256_colors]]
 Wie kann ich 256 Farben in WeeChat nutzen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -368,7 +372,6 @@ eine Farbe definieren).

 Weiterführende Informationen zum Farbmanagement erhält man in der Benutzeranleitung.

-
 [[search_text]]
 Wie kann ich in einem Buffer nach einem Text suchen (vergleichbar /lastlog in irssi)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -378,12 +381,10 @@ und um zu Highlight-Nachrichten zu springen: @k(A-)@k(p)/@k(n).

 Siehe Benutzeranleitung für weitere Informationen zu dieser Funktion (Standardtastenbelegung).

-
 [[key_bindings]]
 Tastaturbelegung
 ----------------

-
 [[meta_keys]]
 Aus welchem Grund funktionieren manche Meta-Tasten (alt + Taste) nicht?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -405,7 +406,6 @@ UXTerm*metaSendsEscape: true
 Danach muss resources neu geladen werden (`xrdb -override ~/.Xresources`) oder
 man startet X neu.

-
 [[customize_key_bindings]]
 Wie kann ich die Tastaturbelegung anpassen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -415,7 +415,6 @@ Die Tasten werden mit dem Befehl `/key` belegt.
 Mit der voreingestellten Tastenkombination @k(A-)@k(k) kann man sich den
 Code der jeweiligen Taste anzeigen lassen und in die Eingabezeile einfügen.

-
 [[jump_to_buffer_11_or_higher]]
 Mit welcher Tastenkombination kann ich zum Buffer 11 (oder höher) wechseln?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -431,7 +430,6 @@ Es kann auch eine neue Taste eingebunden werden um zu einem Buffer zu wechseln:

 Eine Auflistung der Standardtastenbelegung findet man in der Benutzeranleitung.

-
 [[global_history]]
 Wie kann ich den globalen Verlaufsspeicher (anstelle des Buffer eigenen) mit den Up-/Down-Tasten nutzen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -450,12 +448,10 @@ Beispiele:
 Die Tasten "meta2-A" und "meta2-B" können nach dem jeweils genutzten Terminal variieren. Um die
 korrekten Tasten zu finden sollte man @k(A-)@k(k) und dann (Up- oder die Down-Taste) drücken.

-
 [[mouse]]
 Mausunterstützung
 -----------------

-
 [[mouse_not_working]]
 Die Mausunterstützung funktioniert nicht, was kann ich tun?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -488,7 +484,6 @@ Um die Mausunterstützung im Terminal zu beenden:
 $ printf '\033[?1002l'
 ----------------------------------------

-
 [[mouse_coords]]
 Mausunterstützung funktioniert nicht falls x/y Koordinaten größer 94 Pixel sind, weshalb?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -499,11 +494,92 @@ Nutzung über 94 Pixel hinausgehend, sowohl in den x- wie auch den y-Koordinaten
 Dann muss man einen Terminl nutzen der eine Unterstützung von UTF-8 Koordinaten für die Maus
 bietet, zum Beispiel rxvt-unicode.

+[[mouse_select_paste]]
+Wie kann ich bei aktivierter Mausunterstützung im Terminal einen Text markieren oder einfügen?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ist die Mausunterstützung aktiviert kann man mittels gedrückter @k(-S-)-Taste (Umschalttaste)
+einen Text im Terminal markieren oder einfügen, als sei die Mausunterstützung deaktiviert.
+(bei einigen Terminals muss die @k(-A-)-Taste anstelle der @k(-S-)-Taste gedrückt werden).

 [[irc]]
 IRC
 ---

+[[irc_ssl_connection]]
+Es treten Probleme bei einer Serververbindung mittels SSL auf. Was kann ich tun?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Falls Fehlermeldungen auftreten sollten die besagen, dass der gnutls Handshake
+nicht geklappt hat, sollte ein kleinerer Diffie-Hellman-Schlüssel verwendet
+werden (Standardgröße: 2048):
+
+----------------------------------------
+/set irc.server.freenode.ssl_dhkey_size 1024
+----------------------------------------
+
+Erscheint eine Fehlermeldung, dass etwas mit dem Zertifikat nicht stimmen sollte dann
+kann eine "ssl_verify" Überprüfung deaktiviert werden (die Verbindung ist in diesem
+Fall weniger sicher):
+
+----------------------------------------
+/set irc.server.freenode.ssl_verify off
+----------------------------------------
+
+[[irc_ssl_handshake_error]]
+Bei einem Verbindungsaufbau zum Server, via SSL, erhalte ich "TLS Handshake fehlgeschlagen". Wie kann ich das beheben?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Man sollte versuchen eine andere Priorität zu nutzen (nur WeeChat ≥ 0.3.5); Im Beispiel
+muss "xxx" durch den internen Servernamen ersetzt werden:
+
+----------------------------------------
+/set irc.server.xxx.ssl_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+----------------------------------------
+
+[[irc_ssl_freenode]]
+Wie kann ich eine SSL gesicherte Verbindung zum freenode Server herstellen?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Die Option 'weechat.network.gnutls_ca_file' sollte auf die Zertifikationsdatei zeigen:
+
+----------------------------------------
+/set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
+----------------------------------------
+
+[NOTE]
+Überprüfe, ob die Zertifikationsdatei auf Deinem System installiert wurde (üblicherweise wird
+diese Datei durch das Paket "ca-certificates" bereitgestellt)
+
+Konfiguration des Servers, Port, SSL, dhkey_size und dann einen
+Connect durchführen:
+
+----------------------------------------
+/set irc.server.freenode.addresses "chat.freenode.net/7000"
+/set irc.server.freenode.ssl on
+/set irc.server.freenode.ssl_dhkey_size 1024
+/connect freenode
+----------------------------------------
+
+[[irc_sasl]]
+Wie kann ich mich, vor dem Betreten von Channels, identifizieren?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sollte der Server SASL unterstützen, ist es ratsam auf diese Funktion zurückzugreifen
+und sich nicht mittels "nickserv" zu authentifizieren. Zum Beispiel:
+
+----------------------------------------
+/set irc.server_default.sasl_mechanism dh-blowfish
+/set irc.server.freenode.sasl_username "meinNick"
+/set irc.server.freenode.sasl_password "xxxxxxx"
+----------------------------------------
+
+Unterstützt der Server keine SASL Authentifizierung, kann eine Verzögerung aktiviert
+werden um sich, vor dem Betreten von Channels, bei "nickserv" zu identifizieren:
+
+----------------------------------------
+/set irc.server.freenode.command_delay 5
+----------------------------------------

 [[ignore_vs_filter]]
 Was ist der Unterschied zwischen dem Befehl /ignore und /filter?
@@ -524,7 +600,6 @@ Die Zeilen werden dabei nicht gelöscht, lediglich die Darstellung im Buffer wir
 Die gefilterten Zeilen können zu jeder Zeit dargestellt werden indem man den Filter deaktiviert
 (Voreinstellung zum aktivieren/deaktivieren der Filter: @k(A-)@k(=)).

-
 [[filter_irc_join_part_quit]]
 Wie kann ich join/part/quit Meldungen in den IRC Channels filtern (A.d.ü.: unterdrücken)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -540,13 +615,12 @@ noch etwas geschrieben haben):
 zum anderen mit einer globalen Filterung (*alle* join/part/quit Nachrichten werden unterdrückt):

 ----------------------------------------
-/filter add jpk * irc_join,irc_part,irc_quit *
+/filter add joinquit * irc_join,irc_part,irc_quit *
 ----------------------------------------

 [NOTE]
 Für weitere Hilfe: `/help filter` und `/help irc.look.smart_filter`

-
 [[filter_irc_join_channel_messages]]
 Wie kann ich Nachrichten filtern wenn ich einen IRC Channel betrete?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -571,7 +645,6 @@ Beispiele:
 /filter add irc_join_topic_date * irc_332,irc_333 *
 ----------------------------------------

-
 [[filter_voice_messages]]
 Wie kann ich voice Nachrichten filtern (z.B. auf Bitlbee Servern)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -607,7 +680,6 @@ der Voice Modus aufgeführt sein muss):
 /filter add hidevoices * irc_mode (\+|\-)v
 ----------------------------------------

-
 [[color_away_nicks]]
 Wie kann ich Nicks in der Nickliste anzeigen lassen die abwesend sind?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -634,7 +706,6 @@ Teilnehmer haben:
 Für Weechat ≤ 0.3.3, lauten die Optionen 'irc.network.away_check' und
 'irc.network.away_check_max_nicks'.

-
 [[highlight_notification]]
 Wie kann ich mich darüber informieren lassen falls mich jemand in einem Channel highlighted
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -649,77 +720,16 @@ Beim Skript 'launcher.pl' müssen noch die Befehle angepasst werden:

 andere Skripten die auch zu diesem Thema passen: http://www.weechat.org/scripts/stable/tag/notify/

-
-[[irc_ssl_connection]]
-Es treten Probleme bei einer Serververbindung mittels SSL auf. Was kann ich tun?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Falls Fehlermeldungen auftreten sollten die besagen, dass der gnutls Handshake
-nicht geklappt hat, sollte ein kleinerer Diffie-Hellman-Schlüssel verwendet
-werden (Standardgröße: 2048):
-
----------------------------------------
-/set irc.server.freenode.ssl_dhkey_size 1024
----------------------------------------
-
-Erscheint eine Fehlermeldung, dass etwas mit dem Zertifikat nicht stimmen sollte dann
-kann eine "ssl_verify" Überprüfung deaktiviert werden (die Verbindung ist in diesem
-Fall weniger sicher):
-
----------------------------------------
-/set irc.server.freenode.ssl_verify off
----------------------------------------
-
-
-[[irc_ssl_handshake_error]]
-Bei einem Verbindungsaufbau zum Server, via SSL, erhalte ich "TLS Handshake fehlgeschlagen". Wie kann ich das beheben?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Man sollte versuchen eine andere Priorität zu nutzen (nur WeeChat ≥ 0.3.5); Im Beispiel
-muss "xxx" durch den internen Servernamen ersetzt werden:
-
----------------------------------------
-/set irc.server.xxx.ssl_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
----------------------------------------
-
-
-[[irc_ssl_freenode]]
-Wie kann ich eine SSL gesicherte Verbindung zum freenode Server herstellen?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Die Option 'weechat.network.gnutls_ca_file' sollte auf die Zertifikationsdatei zeigen:
-
----------------------------------------
-/set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
----------------------------------------
-
-[NOTE]
-Überprüfe, ob die Zertifikationsdatei auf Deinem System installiert wurde (üblicherweise wird
-diese Datei durch das Paket "ca-certificates" bereitgestellt)
-
-Konfiguration des Servers, Port, SSL, dhkey_size und dann einen
-Connect durchführen:
-
----------------------------------------
-/set irc.server.freenode.addresses "chat.freenode.net/7000"
-/set irc.server.freenode.ssl on
-/set irc.server.freenode.ssl_dhkey_size 1024
-/connect freenode
----------------------------------------
-
-
 [[irc_target_buffer]]
 Wie kann ich bei zusammengefügten Buffern den Zielbuffer ändern (z.B. bei einem Server-Buffer)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Die Standardtastenkombination lautet @k(C-)@k(x) (der dazugehörige Befehl: `/input switch_active_buffer`).

-
 [[plugins_scripts]]
 Erweiterungen / Skripten
 ------------------------

-
 [[openbsd_plugins]]
 Ich benutze OpenBSD aber WeeChat lädt keine Erweiterungen - weshalb?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -733,7 +743,6 @@ Um dies zu beheben muss folgendes konfiguriert werden:
 /plugin autoload
 ----------------------------------------

-
 [[load_scripts]]
 Wie kann ich Perl/Python/Ruby/Lua/Tcl Skripten laden und sind Skripten von anderen IRC-Clients kompatibel?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -743,7 +752,6 @@ Die Skripten für WeeChat sind mit anderer IRC-Clients nicht kompatibel und vice
 Um Skripten zu laden nutze den Befehl für die jeweilige Skriptsprache:
 `/perl`, `/python`, `/ruby`, `/lua` und `/tcl`

-
 Anmerkung:

 * Voreingestellter Pfad der Skripten: '~/.weechat/<Skriptsprache>/'
@@ -751,12 +759,10 @@ Anmerkung:
  beim Start von WeeChat automatisch geladen.
 * Eine 'tcl' Erweiterung ist ab Version ≥ 0.3.0 verfügbar.

-
 [[settings]]
 Einstellungen
 -------------

-
 [[memory_usage]]
 Wie kann ich WeeChat dazu bringen weniger Speicher zu verbrauchen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -766,19 +772,20 @@ Damit WeeChat weniger Speicher benötigt, solltest Du folgende Tipps umsetzen:
 * nutze die aktuelle Version (man kann davon ausgehen das eine aktuelle Version
  weniger Speicherlecks besitzt, als eine vorherige Version)
 * lade keine Erweiterungen die Du nicht benötigst. Zum Beispiel: ASpell, Fifo,
-  Logger, Perl, Python, Ruby, Lua, Tcl, Xfer (wird für DCC benötigst)
-* lade nur Skripten die Du auch benutzt
-* nutze einen kleineren Wert für die Option 'weechat.history.max_lines' (Anzahl
-  der Zeilen die für jeden Buffer im Speicher gehalten werden soll)
-* nutze einen kleineren Wert für die Option 'weechat.history.max_commands' (Anzahl
-  des Verlaufsspeichers, für Befehle, die im Speicher gehalten werden sollen)
-
+  Logger, Perl, Python, Ruby, Lua, Tcl, Guile, Xfer (wird für DCC benötigst)
+* installiere ausschließlich Skripten die Du auch nutzt
+// TRANSLATION MISSING
+* do not load certificates if SSL is *NOT* used: set empty string in option
+  'weechat.network.gnutls_ca_file'
+* der Wert der Option 'weechat.history.max_buffer_lines_number' sollte möglichst
+  niedrig eingestellt werden oder die Option 'weechat.history.max_buffer_lines_minutes'
+  verwendet werden.
+* nutze einen kleineren Wert für die Option 'weechat.history.max_commands'

 [[development]]
 Entwicklung
 -----------

-
 [[bug_task_patch]]
 Was kann ich machen falls ich einen Fehler gefunden habe, nach neuen Funktionen fragen oder Patches einsenden möchte?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -794,7 +801,6 @@ Es gibt drei Möglichkeiten:
  http://www.weechat.org/about
  (Um emails an die "support" Mailing-Liste zu schicken, kannst Du diese abonnieren)

-
 [[gdb_error_threads]]
 Wenn man WeeChat in gdb startet kann ein Thread-Fehler auftreten. Was beudeutet das?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -816,7 +822,6 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses
 (gdb) run
 ----------------------------------------

-
 [[supported_os]]
 Auf welchen Plattformen läuft WeeChat und wird es noch auf andere Betriebssystemen portiert?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -827,7 +832,6 @@ Wir geben unser Bestes um WeeChat auf möglichst viele Plattformen zu portieren.
 Aber um WeeChat auf fremden Betriebssystemen zu testen, zu denen wir keinen Zugang haben,
 ist Hilfe gerne gesehen.

-
 [[help_developers]]
 Ich möchte den Entwicklern von WeeChat helfen. Was kann ich tun?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -837,7 +841,6 @@ Es gibt einiges zu tun z.B. testen, programmieren, Dokumentation, ...
 Bitte kontaktiere uns via IRC oder email, schaue auf die Support-Seite:
 http://www.weechat.org/support

-
 [[donate]]
 Kann ich Geld oder anderes an die WeeChat Entwickler spenden?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -27,25 +27,25 @@ Um Optionen zu setzen benutzt man `/set config.section.option value`.
 oder der Name einer Erweiterung), 'section' ein Abschnitt dieser Konfiguration und 'option'
 der Name der betreffenden Option).

-WeeChat benutzt den neu eingestellten Wert umgehend (WeeChat muss also *niemals* neu gestartet
+WeeChat benutzt einen neu eingestellten Wert umgehend (WeeChat muss also *niemals* neu gestartet
 werden, nach dem die Konfiguration verändert wurde).

 Du kannst die Option `/set` mit teilweise ausgeschriebenen Namen und dem
-Platzhalter "*" am Beginn oder Ende verwenden um alle Optionen anzuzeigen die
-diese Zeichenkette enthalten.
+Platzhalter "*", am Beginn oder Ende, verwenden um alle Optionen anzuzeigen die
+dieser Zeichenkette entsprechen.

 Zum Beispiel:

 `/set`::
-    Anzeige aller Optionen (WeeChat und Erweiterungen)
+    zeit alle Optionen an (WeeChat und Erweiterungen)

 `/set weechat.*`::
-    Anzeige der WeeChat Optionen
+    zeit alle WeeChat Optionen an

 `/set irc.*`::
-    Anzeige der Optionen des IRC-Erweiterung
+    zeit alle Optionen der IRC-Erweiterung an

-Du kannst mit `/help` Hilfe für Optionen auflisten lassen, z.B.:
+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 `/save`
@@ -60,8 +60,8 @@ verwenden möchte).
 Kern (Core) vs Erweiterungen
 ----------------------------

-Der Kern (core) von WeeChat ist ausschließlich dazu da Daten auf dem Bildschirm
-darzustellen um mit dem Benutzer zu interagieren. Dies bedeutet, WeeChat an sich
+Der Kern (core) von WeeChat ist ausschließlich dazu da, Daten auf dem Bildschirm
+darzustellen, um mit dem Benutzer zu interagieren. Dies bedeutet, WeeChat an sich
 -also nur WeeChat core- ohne jegliche Erweiterung ist unbrauchbar.
 (an die treuen User: IRC war ein Teil des Kerns bei Versionen ≤ 0.2.6)

@@ -87,19 +87,19 @@ Wie bei jedem Befehl kannst Du Dir, falls Du nicht mehr weiter kommst, mit
 Setzen eigener IRC-Server Optionen
 ----------------------------------

-WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs") falls
+WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs"), falls
 Du keine eigenen Werte für entsprechende Server-Optionen bestimmt haben solltest.
-Diese Vorgabeoptionen sind "irc.server_default.*".
+Diese Vorgabewerte sind in "irc.server_default.*" beschrieben.

 Für jede Server-Option benutzt WeeChat den entsprechend gesetzten Wert - falls
 definiert (nicht "null"). Andernfalls verwendet WeeChat Vorgabewerte
 ("irc.server_default.xxx").

-Als Beispiel erwähnt ist die Vorgabe (default) nicks, die auf dem Un*x Login
+Als Beispiel erwähnt ist die Vorgabe (default) für Nicks, die auf dem Un*x Login
 basiert. Diese Vorgabe kann nun für den oftc-Server mittels folgendem Befehl
 überschrieben werden:

-  /set irc.server.oftc.nicks "mynick1,mynick2,mynick3,mynick4,mynick5"
+  /set irc.server.oftc.nicks "mynick,mynick2,mynick3,mynick4,mynick5"

 Um einen User- und realen Namen zu setzen:

@@ -111,12 +111,20 @@ herzustellen:

  /set irc.server.oftc.autoconnect on

-Um einen Befehl nach der Verbindung zum Server auszuführen, z.B. identifizieren
-beim nickserv:
+Sollte der Server SASL unterstützen, kann man sich damit Authentifizieren
+(dadurch identifiziert man sich beim Server, bevor man Channels (Chaträume) betritt):

-  /set irc.server.oftc.command "/msg nickserv identify xxxxxx"
+  /set irc.server_default.sasl_mechanism dh-blowfish
+  /set irc.server.oftc.sasl_username "mynick"
+  /set irc.server.oftc.sasl_password "xxxxxxx"

-Hinweis: Mehrere Befehle können mittels ';' (Semikolon) getrennt werden.
+Unterstützt der Server keine SASL Authentifizierung, muss man sich bei "nickserv"
+identifizieren:
+
+  /set irc.server.oftc.command "/msg nickserv identify xxxxxxx"
+
+[NOTE]
+Mehrere Befehle können mittels ';' (Semikolon) getrennt werden.

 Um ein auto-join (automatisches 'betreten') von Channels (Räumen) nach der
 Verbindung zum Server zu erreichen:
@@ -124,12 +132,12 @@ Verbindung zum Server zu erreichen:
  /set irc.server.oftc.autojoin "#channel1,#channel2"

 Um einen Wert der Server-Optionen zu entfernen und stattdessen wieder den
-Vorgabewert (default) zu nutzen, z.B. Nutzung der Vorgabe-Nicks
+Vorgabewert (default) zu nutzen, z.B. Nutzung der vorgegebenen Nicks
 (irc.server_default.nicks):

  /set irc.server.oftc.nicks null

-Andere Optionen: Du kannst andere Optionen mit folgendem Befehl setzen ("xxx"
+Andere Optionen: Du kannst andere Optionen mit folgendem Befehl festlegen ("xxx"
 ist der Optionsname):

  /set irc.server.oftc.xxx value
@@ -143,16 +151,16 @@ Verbinden mit dem IRC-Server und auto-join der Channel

 [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 (sollte ich
+sich mit ihm zu verbinden, ohne den Befehl `/server` zu benutzen (sollte ich
 wiederholen, dass Du die Hilfe zu diesem Befehl mit `/help connect` aufrufen
 kannst?).

 Standardmäßig werden die Server-Buffer und der Buffer des Kerns von WeeChat -der
 core-Buffer- zusammengelegt. Um zwischen dem core-Buffer und den Server-Buffern
-umzuschalten kannst Du ctrl-X benutzen.
+zu wechseln, kannst Du ctrl-X benutzen.

-Es ist möglich das automatische Zusammenlegen der Server-Buffer zu deaktivieren
-um eigenständige Buffer zu haben:
+Es ist möglich das automatische Zusammenlegen der Server-Buffer zu deaktivieren,
+um eigenständige Server-Buffer zu nutzen:

  /set irc.look.server_buffer independent

@@ -167,7 +175,7 @@ Betreten/verlassen der IRC-Channel
 `/part [quit message]`::
    Einen Channel verlassen (der Buffer bleibt geöffnet)

-`/close [quit message]`::
+`/close`::
    Schließen eines Server- oder Channel-Buffers (`/close` ist ein Alias für `/buffer close`)


@@ -175,12 +183,12 @@ Betreten/verlassen der IRC-Channel
 Buffer/Fenster Verwaltung
 -------------------------

-Ein Buffer ist eine, Erweiterung mit einer Nummer, einer Kategorie und einem
+Ein Buffer ist eine Erweiterung mit einer Nummer, einer Kategorie und einem
 Namen, verbundene Komponente. Ein Buffer beinhaltet die auf dem Bildschirm
 dargestellten Daten.

 Ein Fenster ist die Ansicht eines Buffers. Standard ist ein Fenster, das einen
-Buffer darstellt. Wenn Du den Bildschirm aufteilst wirst Du mehrere Fenster mit
+Buffer darstellt. Wenn Du den Bildschirm aufteilst, wirst Du mehrere Fenster mit
 mehreren Buffer gleichzeitig sehen.

 Befehle, welche Buffer und Fenster verwalten:
@@ -239,28 +247,20 @@ Erweiterungen/Skripten
 Bei einigen Distributionen wie z.B. Debian, sind die Erweiterungen über separate Pakete
 erhältlich (z.B. weechat-plugins).
 Erweiterungen werden -sofern welche gefunden worden sind- automatisch geladen (Bitte beachte
-die Dokumentation zum Laden/Entladen von Erweiterungen oder Skripten).
+die Dokumentation zum installieren/entfernen von Erweiterungen und/oder Skripten).

-Einige Erweiterungen ermöglichen die Verwendung von Skripten in WeeChat (unterstützte
-Sprachen sind Perl, Python, Ruby, Lua und TCL). Diese Erweiterungen müssen mit dem
-Befehl `/plugin` geladen werden und verfügen ihrerseits über Befehle wie z.B.
-`/perl` um Perl-Skripten zu laden.
+Viele externe Skripten (der Mitarbeitenden) sind für WeeChat verfügbar, siehe:
+http://www.weechat.org/scripts

-Viele externe Erweiterungen/Skripten (der Mitarbeitenden) sind für WeeChat verfügbar,
-siehe: http://www.weechat.org/scripts
-
-Der einfachste Weg um Skripten zu installieren ist die Verwendung von 'weeget.py':
-werden
-. herunterladen und kopieren von 'weeget.py' nach ~/.weechat/python/autoload/
-. laden des  Skript: `/python autoload`
-. Liste der Skripten: `/weeget list` (Hilfe mit: `/help weeget`)
+Skripten können mit dem Befehl `/script` verwaltet werden (siehe `/help script` für
+weitere Informationen zur Bedienung).


 [[more_doc]]
 Weitere Dokumentation
 ---------------------

-Nun kannst Du WeeChat nutzen, für weitere Fragen lese die FAQ/Dokumentation:
+Nun kannst Du WeeChat nutzen, für weitere Fragen lese die FAQ und/oder Dokumentation:
 http://www.weechat.org/doc

 Viel Spass mit WeeChat!
@@ -99,8 +99,10 @@ Argumente:
 * 'version': Version des Skripts (String)
 * 'license': Lizenz für das Skripts (String)
 * 'description': kurze Beschreibung des Skripts (String)
-* 'shutdown_function': Name der Funktion die beim Beenden des Skripts aufgerufen werden soll (String, optional)
-* 'charset': Skript Zeichensatz (optional, liegt das Skript im UTF-8 Format vor kann dieser Wert
+// TRANSLATION MISSING
+* 'shutdown_function': Name der Funktion die beim Beenden des Skripts aufgerufen werden soll
+  (String, can be empty string)
+* 'charset': Skript Zeichensatz (liegt das Skript im UTF-8 Format vor kann dieser Wert
  leer bleiben. UTF-8 ist der Standardzeichensatz) (String)

 Beispielskripten, für jede Sprache:
@@ -391,7 +393,8 @@ Liste der Konstanten in Skript API:
  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+  WEECHAT_HOOK_CONNECT_SOCKET_ERROR
 | hook Signal         |
  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================
@@ -69,7 +69,7 @@ except ImportError as message:
 DEFAULT_PATH = '~/src/weechat/doc'

 # list of locales for which we want to build doc files to include
-locale_list = ('en_US', 'fr_FR', 'it_IT', 'de_DE')
+locale_list = ('en_US', 'fr_FR', 'it_IT', 'de_DE', 'ja_JP')

 # all commands/options/.. of following plugins will produce a file
 # non-listed plugins will be ignored
@@ -88,6 +88,7 @@ plugin_list = { 'weechat'  : 'co',
                'logger'   : 'co',
                'relay'    : 'co',
                'rmodifier': 'co',
+                'script'   : 'co',
                'perl'     : '',
                'python'   : '',
                'ruby'     : '',
@@ -200,6 +201,7 @@ def get_hdata():
        plugin = weechat.infolist_string(infolist, 'plugin_name') or 'weechat'
        hdata[plugin][hdata_name]['description'] = weechat.infolist_string(infolist, 'description')
        variables = ''
+        variables_update = ''
        lists = ''
        ptr_hdata = weechat.hdata_get(hdata_name)
        if ptr_hdata:
@@ -207,22 +209,38 @@ def get_hdata():
            string = weechat.hdata_get_string(ptr_hdata, 'var_keys_values')
            if string:
                for item in string.split(','):
-                    (key, value) = item.split(':')
-                    var_type = int(value) >> 16
-                    var_offset = int(value) & 0xFFFF
+                    key = item.split(':')[0]
+                    var_offset = weechat.hdata_get_var_offset(ptr_hdata, key)
+                    var_array_size = weechat.hdata_get_var_array_size_string(ptr_hdata, '', key)
+                    if var_array_size:
+                        var_array_size = ', array_size: "%s"' % var_array_size
                    var_hdata = weechat.hdata_get_var_hdata(ptr_hdata, key)
                    if var_hdata:
-                        var_hdata = ', hdata: \'%s\'' % var_hdata
+                        var_hdata = ', hdata: "%s"' % var_hdata
+                    type_string = weechat.hdata_get_var_type_string(ptr_hdata, key)
                    hdata2.append({'offset': var_offset,
-                                   'text': '\'%s\' (%s%s)' % (key,
-                                                              weechat.hdata_get_var_type_string(ptr_hdata, key),
-                                                              var_hdata)})
+                                   'text': '\'%s\' (%s)' % (key, type_string),
+                                   'textlong': '\'%s\' (%s%s%s)' % (key, type_string, var_array_size, var_hdata),
+                                   'update': weechat.hdata_update(ptr_hdata, '', { '__update_allowed': key })})
                hdata2 = sorted(hdata2, key=itemgetter('offset'))
                for item in hdata2:
                    if variables:
                        variables += ' +\n'
-                    variables += '  %s' % item['text']
+                    variables += '  %s' % item['textlong']
+                    if item['update']:
+                        if variables_update:
+                            variables_update += ' +\n'
+                        variables_update += '  %s' % item['text']
+                if weechat.hdata_update(ptr_hdata, '', { '__create_allowed' : '' }):
+                    if variables_update:
+                        variables_update += ' +\n'
+                    variables_update += '  `__create`'
+                if weechat.hdata_update(ptr_hdata, '', { '__delete_allowed' : '' }):
+                    if variables_update:
+                        variables_update += ' +\n'
+                    variables_update += '  `__delete`'
            hdata[plugin][hdata_name]['vars'] = '\n%s' % variables
+            hdata[plugin][hdata_name]['vars_update'] = '\n%s' % variables_update

            string = weechat.hdata_get_string(ptr_hdata, 'list_keys')
            if string:
@@ -475,20 +493,23 @@ def docgen_cmd_cb(data, buffer, args):
        filename = '%s/plugin_api/hdata.txt' % directory
        tmpfilename = '%s.tmp' % filename
        f = open(tmpfilename, 'w')
-        f.write('[width="100%",cols="^1,^2,5,5,5",options="header"]\n')
+        f.write('[width="100%",cols="^1,^2,5,5,5,5",options="header"]\n')
        f.write('|========================================\n')
-        f.write('| %s | %s | %s | %s | %s\n\n' % (_('Plugin'), _('Name'), _('Description'),
-                                                  _('Variables'), _('Lists')))
+        f.write('| %s | %s | %s | %s | %s | %s\n\n' % (_('Plugin'), _('Name'), _('Description'),
+                                                       _('Variables'), _('Update allowed'),
+                                                       _('Lists')))
        for plugin in sorted(hdata):
            for hdata_name in sorted(hdata[plugin]):
                description = translate(hdata[plugin][hdata_name]['description'])
                variables = hdata[plugin][hdata_name]['vars']
+                variables_update = hdata[plugin][hdata_name]['vars_update']
                lists = hdata[plugin][hdata_name]['lists']
-                f.write('| %s | %s | %s |%s |%s\n\n' % (escape(plugin),
-                                                        escape(hdata_name),
-                                                        escape(description),
-                                                        escape(variables),
-                                                        escape(lists)))
+                f.write('| %s | %s | %s |%s |%s |%s\n\n' % (escape(plugin),
+                                                            escape(hdata_name),
+                                                            escape(description),
+                                                            escape(variables),
+                                                            escape(variables_update),
+                                                            escape(lists)))
        f.write('|========================================\n')
        f.close()
        update_file(filename, tmpfilename, num_files, num_files_updated, 'hdata')
@@ -56,6 +56,14 @@

 | ruby | ruby_script | list of scripts

+| script | script_files | files in script directories
+
+| script | script_scripts | list of scripts in repository
+
+| script | script_scripts_installed | list of scripts installed (from repository)
+
+| script | script_tags | tags of scripts in repository
+
 | tcl | tcl_script | list of scripts

 | weechat | bars_names | names of bars
@@ -1,6 +1,24 @@
-[width="100%",cols="^1,^2,5,5,5",options="header"]
+[width="100%",cols="^1,^2,5,5,5,5",options="header"]
 |========================================
-| Plugin | Name | Description | Variables | Lists
+| Plugin | Name | Description | Variables | Update allowed | Lists
+
+| guile | guile_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "guile_script") +
+  'next_script' (pointer, hdata: "guile_script") |
+ |
+  'last_script' +
+  'scripts'

 | irc | irc_channel | irc channel |
  'type' (integer) +
@@ -19,22 +37,24 @@
  'pv_remote_nick_color' (string) +
  'hook_autorejoin' (pointer) +
  'nicks_count' (integer) +
-  'nicks' (pointer, hdata: 'irc_nick') +
-  'last_nick' (pointer, hdata: 'irc_nick') +
+  'nicks' (pointer, hdata: "irc_nick") +
+  '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') +
-  'buffer' (pointer, hdata: 'buffer') +
+  'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'prev_channel' (pointer, hdata: 'irc_channel') +
-  'next_channel' (pointer, hdata: 'irc_channel') |
+  'prev_channel' (pointer, hdata: "irc_channel") +
+  'next_channel' (pointer, hdata: "irc_channel") |
+ |
  -

 | irc | irc_channel_speaking | irc channel_speaking |
  'nick' (string) +
  'time_last_message' (time) +
-  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
-  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
+  'prev_nick' (pointer, hdata: "irc_channel_speaking") +
+  'next_nick' (pointer, hdata: "irc_channel_speaking") |
+ |
  -

 | irc | irc_ignore | irc ignore |
@@ -43,8 +63,9 @@
  'regex_mask' (pointer) +
  'server' (string) +
  'channel' (string) +
-  'prev_ignore' (pointer, hdata: 'irc_ignore') +
-  'next_ignore' (pointer, hdata: 'irc_ignore') |
+  'prev_ignore' (pointer, hdata: "irc_ignore") +
+  'next_ignore' (pointer, hdata: "irc_ignore") |
+ |
  'irc_ignore_list' +
  'last_irc_ignore'

@@ -55,23 +76,25 @@
  'prefix' (string) +
  'away' (integer) +
  'color' (string) +
-  'prev_nick' (pointer, hdata: 'irc_nick') +
-  'next_nick' (pointer, hdata: 'irc_nick') |
+  'prev_nick' (pointer, hdata: "irc_nick") +
+  'next_nick' (pointer, hdata: "irc_nick") |
+ |
  -

 | irc | irc_notify | irc notify |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'nick' (string) +
  'check_away' (integer) +
  'is_on_server' (integer) +
  'away_message' (string) +
  'ison_received' (integer) +
-  'prev_notify' (pointer, hdata: 'irc_notify') +
-  'next_notify' (pointer, hdata: 'irc_notify') |
+  'prev_notify' (pointer, hdata: "irc_notify") +
+  'next_notify' (pointer, hdata: "irc_notify") |
+ |
  -

 | irc | irc_redirect | irc redirect |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'pattern' (string) +
  'signal' (string) +
  'count' (integer) +
@@ -89,8 +112,9 @@
  'cmd_filter' (hashtable) +
  'output' (string) +
  'output_size' (integer) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect') +
-  'next_redirect' (pointer, hdata: 'irc_redirect') |
+  'prev_redirect' (pointer, hdata: "irc_redirect") +
+  'next_redirect' (pointer, hdata: "irc_redirect") |
+ |
  -

 | irc | irc_redirect_pattern | pattern for irc redirect |
@@ -100,8 +124,9 @@
  'cmd_start' (string) +
  'cmd_stop' (string) +
  'cmd_extra' (string) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
-  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
+  'prev_redirect' (pointer, hdata: "irc_redirect_pattern") +
+  'next_redirect' (pointer, hdata: "irc_redirect_pattern") |
+ |
  'irc_redirect_patterns' +
  'last_irc_redirect_pattern'

@@ -112,26 +137,30 @@
  'reloading_from_config' (integer) +
  'reloaded_from_config' (integer) +
  'addresses_count' (integer) +
-  'addresses_array' (pointer) +
-  'ports_array' (pointer) +
+  'addresses_array' (string, array_size: "addresses_count") +
+  'ports_array' (integer, array_size: "addresses_count") +
+  'retry_array' (integer, array_size: "addresses_count") +
  'index_current_address' (integer) +
  'current_address' (string) +
  'current_ip' (string) +
  'current_port' (integer) +
+  'current_retry' (integer) +
  'sock' (integer) +
-  'hook_connect' (pointer, hdata: 'hook') +
-  'hook_fd' (pointer, hdata: 'hook') +
-  'hook_timer_connection' (pointer, hdata: 'hook') +
-  'hook_timer_sasl' (pointer, hdata: 'hook') +
+  'hook_connect' (pointer, hdata: "hook") +
+  'hook_fd' (pointer, hdata: "hook") +
+  'hook_timer_connection' (pointer, hdata: "hook") +
+  'hook_timer_sasl' (pointer, hdata: "hook") +
  'is_connected' (integer) +
  'ssl_connected' (integer) +
+  'disconnected' (integer) +
  'gnutls_sess' (other) +
  'tls_cert' (other) +
  'tls_cert_key' (other) +
  'unterminated_message' (string) +
  'nicks_count' (integer) +
-  'nicks_array' (pointer) +
+  'nicks_array' (string, array_size: "nicks_count") +
  'nick_first_tried' (integer) +
+  'nick_alternate_number' (integer) +
  'nick' (string) +
  'nick_modes' (string) +
  'isupport' (string) +
@@ -158,50 +187,171 @@
  'last_away_check' (time) +
  'outqueue' (pointer) +
  'last_outqueue' (pointer) +
-  'redirects' (pointer, hdata: 'irc_redirect') +
-  'last_redirect' (pointer, hdata: 'irc_redirect') +
-  'notify_list' (pointer, hdata: 'irc_notify') +
-  'last_notify' (pointer, hdata: 'irc_notify') +
-  'manual_joins' (hashtable) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'redirects' (pointer, hdata: "irc_redirect") +
+  'last_redirect' (pointer, hdata: "irc_redirect") +
+  'notify_list' (pointer, hdata: "irc_notify") +
+  'last_notify' (pointer, hdata: "irc_notify") +
+  'join_manual' (hashtable) +
+  'join_channel_key' (hashtable) +
+  'join_noswitch' (hashtable) +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'channels' (pointer, hdata: 'irc_channel') +
-  'last_channel' (pointer, hdata: 'irc_channel') +
-  'prev_server' (pointer, hdata: 'irc_server') +
-  'next_server' (pointer, hdata: 'irc_server') |
+  'channels' (pointer, hdata: "irc_channel") +
+  'last_channel' (pointer, hdata: "irc_channel") +
+  'prev_server' (pointer, hdata: "irc_server") +
+  'next_server' (pointer, hdata: "irc_server") |
+ |
  'irc_servers' +
  'last_irc_server'

+| lua | lua_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "lua_script") +
+  'next_script' (pointer, hdata: "lua_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| perl | perl_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "perl_script") +
+  'next_script' (pointer, hdata: "perl_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| python | python_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "python_script") +
+  'next_script' (pointer, hdata: "python_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| ruby | ruby_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "ruby_script") +
+  'next_script' (pointer, hdata: "ruby_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| script | script_script | scripts from repository |
+  'name' (string) +
+  'name_with_extension' (string) +
+  'language' (integer) +
+  'author' (string) +
+  'mail' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'tags' (string) +
+  'requirements' (string) +
+  'min_weechat' (string) +
+  'max_weechat' (string) +
+  'md5sum' (string) +
+  'url' (string) +
+  'popularity' (integer) +
+  'date_added' (time) +
+  'date_updated' (time) +
+  'status' (integer) +
+  'version_loaded' (string) +
+  'displayed' (integer) +
+  'install_order' (integer) +
+  'prev_script' (pointer, hdata: "script_script") +
+  'next_script' (pointer, hdata: "script_script") |
+ |
+  'last_script_repo' +
+  'scripts_repo'
+
+| tcl | tcl_script | list of scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "tcl_script") +
+  'next_script' (pointer, hdata: "tcl_script") |
+ |
+  'last_script' +
+  'scripts'
+
 | weechat | bar | bar |
  'name' (string) +
  'options' (pointer) +
-  'conditions_count' (integer) +
-  'conditions_array' (pointer) +
  'items_count' (integer) +
  'items_subcount' (pointer) +
  'items_array' (pointer) +
  'items_prefix' (pointer) +
  'items_name' (pointer) +
  'items_suffix' (pointer) +
-  'bar_window' (pointer, hdata: 'bar_window') +
+  'bar_window' (pointer, hdata: "bar_window") +
  'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer, hdata: 'bar') +
-  'next_bar' (pointer, hdata: 'bar') |
+  'prev_bar' (pointer, hdata: "bar") +
+  'next_bar' (pointer, hdata: "bar") |
+ |
  'gui_bars' +
  'last_gui_bar'

 | weechat | bar_item | bar item |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'build_callback' (pointer) +
  'build_callback_data' (pointer) +
-  'prev_item' (pointer, hdata: 'bar_item') +
-  'next_item' (pointer, hdata: 'bar_item') |
+  'prev_item' (pointer, hdata: "bar_item") +
+  'next_item' (pointer, hdata: "bar_item") |
+ |
  'gui_bar_items' +
  'last_gui_bar_item'

 | weechat | bar_window | bar window |
-  'bar' (pointer, hdata: 'bar') +
+  'bar' (pointer, hdata: "bar") +
  'x' (integer) +
  'y' (integer) +
  'width' (integer) +
@@ -220,12 +370,13 @@
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
-  'prev_bar_window' (pointer, hdata: 'bar_window') +
-  'next_bar_window' (pointer, hdata: 'bar_window') |
+  'prev_bar_window' (pointer, hdata: "bar_window") +
+  'next_bar_window' (pointer, hdata: "bar_window") |
+ |
  -

 | weechat | buffer | buffer |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'plugin_name_for_upgrade' (string) +
  'number' (integer) +
  'layout_number' (integer) +
@@ -241,17 +392,19 @@
  'close_callback' (pointer) +
  'close_callback_data' (pointer) +
  'title' (string) +
-  'own_lines' (pointer, hdata: 'lines') +
-  'mixed_lines' (pointer, hdata: 'lines') +
-  'lines' (pointer, hdata: 'lines') +
+  'own_lines' (pointer, hdata: "lines") +
+  'mixed_lines' (pointer, hdata: "lines") +
+  'lines' (pointer, hdata: "lines") +
  'time_for_each_line' (integer) +
  'chat_refresh_needed' (integer) +
  'nicklist' (integer) +
  'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer, hdata: 'nick_group') +
+  'nicklist_root' (pointer, hdata: "nick_group") +
  'nicklist_max_length' (integer) +
  'nicklist_display_groups' (integer) +
  'nicklist_visible_count' (integer) +
+  'nickcmp_callback' (pointer) +
+  'nickcmp_callback_data' (pointer) +
  'input' (integer) +
  'input_callback' (pointer) +
  'input_callback_data' (pointer) +
@@ -262,15 +415,15 @@
  'input_buffer_length' (integer) +
  'input_buffer_pos' (integer) +
  'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer, hdata: 'input_undo') +
-  'input_undo' (pointer, hdata: 'input_undo') +
-  'last_input_undo' (pointer, hdata: 'input_undo') +
-  'ptr_input_undo' (pointer, hdata: 'input_undo') +
+  'input_undo_snap' (pointer, hdata: "input_undo") +
+  'input_undo' (pointer, hdata: "input_undo") +
+  'last_input_undo' (pointer, hdata: "input_undo") +
+  'ptr_input_undo' (pointer, hdata: "input_undo") +
  'input_undo_count' (integer) +
-  'completion' (pointer, hdata: 'completion') +
-  'history' (pointer, hdata: 'history') +
-  'last_history' (pointer, hdata: 'history') +
-  'ptr_history' (pointer, hdata: 'history') +
+  'completion' (pointer, hdata: "completion") +
+  'history' (pointer, hdata: "history") +
+  'last_history' (pointer, hdata: "history") +
+  'ptr_history' (pointer, hdata: "history") +
  'num_history' (integer) +
  'text_search' (integer) +
  'text_search_exact' (integer) +
@@ -281,20 +434,21 @@
  'highlight_regex_compiled' (pointer) +
  'highlight_tags' (string) +
  'highlight_tags_count' (integer) +
-  'highlight_tags_array' (pointer) +
+  'highlight_tags_array' (string, array_size: "highlight_tags_count") +
  'hotlist_max_level_nicks' (hashtable) +
-  'keys' (pointer, hdata: 'key') +
-  'last_key' (pointer, hdata: 'key') +
+  'keys' (pointer, hdata: "key") +
+  'last_key' (pointer, hdata: "key") +
  'keys_count' (integer) +
  'local_variables' (hashtable) +
-  'prev_buffer' (pointer, hdata: 'buffer') +
-  'next_buffer' (pointer, hdata: 'buffer') |
+  'prev_buffer' (pointer, hdata: "buffer") +
+  'next_buffer' (pointer, hdata: "buffer") |
+ |
  'gui_buffer_last_displayed' +
  'gui_buffers' +
  'last_gui_buffer'

 | weechat | completion | structure with completion |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'context' (integer) +
  'base_command' (string) +
  'base_command_arg_index' (integer) +
@@ -311,38 +465,41 @@
  'position_replace' (integer) +
  'diff_size' (integer) +
  'diff_length' (integer) +
-  'partial_completion_list' (pointer, hdata: 'completion_partial') +
-  'last_partial_completion' (pointer, hdata: 'completion_partial') |
+  'partial_completion_list' (pointer, hdata: "completion_partial") +
+  'last_partial_completion' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | completion_partial | structure with partial completion |
  'word' (string) +
  'count' (integer) +
-  'prev_item' (pointer, hdata: 'completion_partial') +
-  'next_item' (pointer, hdata: 'completion_partial') |
+  'prev_item' (pointer, hdata: "completion_partial") +
+  'next_item' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | config_file | config file |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'filename' (string) +
  'file' (pointer) +
  'callback_reload' (pointer) +
  'callback_reload_data' (pointer) +
-  'sections' (pointer, hdata: 'config_section') +
-  'last_section' (pointer, hdata: 'config_section') +
-  'prev_config' (pointer, hdata: 'config_file') +
-  'next_config' (pointer, hdata: 'config_file') |
+  'sections' (pointer, hdata: "config_section") +
+  'last_section' (pointer, hdata: "config_section") +
+  'prev_config' (pointer, hdata: "config_file") +
+  'next_config' (pointer, hdata: "config_file") |
+ |
  'config_files' +
  'last_config_file'

 | weechat | config_option | config option |
-  'config_file' (pointer, hdata: 'config_file') +
-  'section' (pointer, hdata: 'config_section') +
+  'config_file' (pointer, hdata: "config_file") +
+  'section' (pointer, hdata: "config_section") +
  'name' (string) +
  'type' (integer) +
  'description' (string) +
-  'string_values' (pointer) +
+  'string_values' (string, array_size: "*") +
  'min' (integer) +
  'max' (integer) +
  'default_value' (pointer) +
@@ -355,12 +512,13 @@
  'callback_delete' (pointer) +
  'callback_delete_data' (pointer) +
  'loaded' (integer) +
-  'prev_option' (pointer, hdata: 'config_option') +
-  'next_option' (pointer, hdata: 'config_option') |
+  'prev_option' (pointer, hdata: "config_option") +
+  'next_option' (pointer, hdata: "config_option") |
+ |
  -

 | weechat | config_section | config section |
-  'config_file' (pointer, hdata: 'config_file') +
+  'config_file' (pointer, hdata: "config_file") +
  'name' (string) +
  'user_can_add_options' (integer) +
  'user_can_delete_options' (integer) +
@@ -374,10 +532,11 @@
  'callback_create_option_data' (pointer) +
  'callback_delete_option' (pointer) +
  'callback_delete_option_data' (pointer) +
-  'options' (pointer, hdata: 'config_option') +
-  'last_option' (pointer, hdata: 'config_option') +
-  'prev_section' (pointer, hdata: 'config_section') +
-  'next_section' (pointer, hdata: 'config_section') |
+  'options' (pointer, hdata: "config_option") +
+  'last_option' (pointer, hdata: "config_option") +
+  'prev_section' (pointer, hdata: "config_section") +
+  'next_section' (pointer, hdata: "config_section") |
+ |
  -

 | weechat | filter | filter |
@@ -388,26 +547,43 @@
  'buffers' (pointer) +
  'tags' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'regex' (string) +
  'regex_prefix' (pointer) +
  'regex_message' (pointer) +
-  'prev_filter' (pointer, hdata: 'filter') +
-  'next_filter' (pointer, hdata: 'filter') |
+  'prev_filter' (pointer, hdata: "filter") +
+  'next_filter' (pointer, hdata: "filter") |
+ |
  'gui_filters' +
  'last_gui_filter'

 | weechat | history | history of commands in buffer |
  'text' (string) +
-  'next_history' (pointer, hdata: 'history') +
-  'prev_history' (pointer, hdata: 'history') |
-  -
+  'next_history' (pointer, hdata: "history") +
+  'prev_history' (pointer, hdata: "history") |
+  `__create` +
+  `__delete` |
+  'gui_history' +
+  'last_gui_history'
+
+| weechat | hotlist | hotlist |
+  'priority' (integer) +
+  'creation_time.tv_sec' (time) +
+  'creation_time.tv_usec' (long) +
+  'buffer' (pointer) +
+  'count' (integer, array_size: "4") +
+  'prev_hotlist' (pointer, hdata: "hotlist") +
+  'next_hotlist' (pointer, hdata: "hotlist") |
+ |
+  'gui_hotlist' +
+  'last_gui_hotlist'

 | weechat | input_undo | structure with undo for input line |
  'data' (string) +
  'pos' (integer) +
-  'prev_undo' (pointer, hdata: 'input_undo') +
-  'next_undo' (pointer, hdata: 'input_undo') |
+  'prev_undo' (pointer, hdata: "input_undo") +
+  'next_undo' (pointer, hdata: "input_undo") |
+ |
  -

 | weechat | key | a key (keyboard shortcut) |
@@ -417,8 +593,9 @@
  'area_key' (string) +
  'command' (string) +
  'score' (integer) +
-  'prev_key' (pointer, hdata: 'key') +
-  'next_key' (pointer, hdata: 'key') |
+  'prev_key' (pointer, hdata: "key") +
+  'next_key' (pointer, hdata: "key") |
+ |
  'gui_default_keys' +
  'gui_default_keys_cursor' +
  'gui_default_keys_mouse' +
@@ -437,47 +614,55 @@
  'last_gui_key_search'

 | weechat | line | structure with one line |
-  'data' (pointer, hdata: 'line_data') +
-  'prev_line' (pointer, hdata: 'line') +
-  'next_line' (pointer, hdata: 'line') |
+  'data' (pointer, hdata: "line_data") +
+  'prev_line' (pointer, hdata: "line") +
+  'next_line' (pointer, hdata: "line") |
+ |
  -

 | weechat | line_data | structure with one line data |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'y' (integer) +
  'date' (time) +
  'date_printed' (time) +
  'str_time' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'displayed' (char) +
  'highlight' (char) +
  'refresh_needed' (char) +
  'prefix' (string) +
  'prefix_length' (integer) +
  'message' (string) |
+  'date' (time) +
+  'date_printed' (time) +
+  'tags_array' (string) +
+  'prefix' (string) +
+  'message' (string) |
  -

 | weechat | lines | structure with lines |
-  'first_line' (pointer, hdata: 'line') +
-  'last_line' (pointer, hdata: 'line') +
-  'last_read_line' (pointer, hdata: 'line') +
+  'first_line' (pointer, hdata: "line") +
+  'last_line' (pointer, hdata: "line") +
+  'last_read_line' (pointer, hdata: "line") +
  'lines_count' (integer) +
  'first_line_not_read' (integer) +
  'lines_hidden' (integer) +
  'buffer_max_length' (integer) +
  'prefix_max_length' (integer) |
+ |
  -

 | weechat | nick | nick in nicklist |
-  'group' (pointer, hdata: 'nick_group') +
+  'group' (pointer, hdata: "nick_group") +
  'name' (string) +
  'color' (string) +
  'prefix' (string) +
  'prefix_color' (string) +
  'visible' (integer) +
-  'prev_nick' (pointer, hdata: 'nick') +
-  'next_nick' (pointer, hdata: 'nick') |
+  'prev_nick' (pointer, hdata: "nick") +
+  'next_nick' (pointer, hdata: "nick") |
+ |
  -

 | weechat | nick_group | group in nicklist |
@@ -485,13 +670,14 @@
  'color' (string) +
  'visible' (integer) +
  'level' (integer) +
-  'parent' (pointer, hdata: 'nick_group') +
-  'children' (pointer, hdata: 'nick_group') +
-  'last_child' (pointer, hdata: 'nick_group') +
-  'nicks' (pointer, hdata: 'nick') +
-  'last_nick' (pointer, hdata: 'nick') +
-  'prev_group' (pointer, hdata: 'nick_group') +
-  'next_group' (pointer, hdata: 'nick_group') |
+  'parent' (pointer, hdata: "nick_group") +
+  'children' (pointer, hdata: "nick_group") +
+  'last_child' (pointer, hdata: "nick_group") +
+  'nicks' (pointer, hdata: "nick") +
+  'last_nick' (pointer, hdata: "nick") +
+  'prev_group' (pointer, hdata: "nick_group") +
+  'next_group' (pointer, hdata: "nick_group") |
+ |
  -

 | weechat | plugin | plugin |
@@ -504,8 +690,9 @@
  'license' (string) +
  'charset' (string) +
  'debug' (integer) +
-  'prev_plugin' (pointer, hdata: 'plugin') +
-  'next_plugin' (pointer, hdata: 'plugin') |
+  'prev_plugin' (pointer, hdata: "plugin") +
+  'next_plugin' (pointer, hdata: "plugin") |
+ |
  'last_weechat_plugin' +
  'weechat_plugins'

@@ -523,41 +710,44 @@
  'win_chat_height' (integer) +
  'win_chat_cursor_x' (integer) +
  'win_chat_cursor_y' (integer) +
-  'bar_windows' (pointer, hdata: 'bar_window') +
-  'last_bar_window' (pointer, hdata: 'bar_window') +
+  'bar_windows' (pointer, hdata: "bar_window") +
+  'last_bar_window' (pointer, hdata: "bar_window") +
  'refresh_needed' (integer) +
  'gui_objects' (pointer) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'layout_plugin_name' (string) +
  'layout_buffer_name' (string) +
-  'scroll' (pointer, hdata: 'window_scroll') +
-  'ptr_tree' (pointer, hdata: 'window_tree') +
-  'prev_window' (pointer, hdata: 'window') +
-  'next_window' (pointer, hdata: 'window') |
+  'scroll' (pointer, hdata: "window_scroll") +
+  'ptr_tree' (pointer, hdata: "window_tree") +
+  'prev_window' (pointer, hdata: "window") +
+  'next_window' (pointer, hdata: "window") |
+ |
  'gui_current_window' +
  'gui_windows' +
  'last_gui_window'

 | weechat | window_scroll | scroll info in window |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'first_line_displayed' (integer) +
-  'start_line' (pointer, hdata: 'line') +
+  'start_line' (pointer, hdata: "line") +
  'start_line_pos' (integer) +
  'scrolling' (integer) +
  'start_col' (integer) +
  'lines_after' (integer) +
  'reset_allowed' (integer) +
-  'prev_scroll' (pointer, hdata: 'window_scroll') +
-  'next_scroll' (pointer, hdata: 'window_scroll') |
+  'prev_scroll' (pointer, hdata: "window_scroll") +
+  'next_scroll' (pointer, hdata: "window_scroll") |
+ |
  -

 | weechat | window_tree | tree of windows |
-  'parent_node' (pointer, hdata: 'window_tree') +
+  'parent_node' (pointer, hdata: "window_tree") +
  'split_pct' (integer) +
  'split_horizontal' (integer) +
-  'child1' (pointer, hdata: 'window_tree') +
-  'child2' (pointer, hdata: 'window_tree') +
-  'window' (pointer, hdata: 'window') |
+  'child1' (pointer, hdata: "window_tree") +
+  'child2' (pointer, hdata: "window_tree") +
+  'window' (pointer, hdata: "window") |
+ |
  'gui_windows_tree'

 |========================================
@@ -30,6 +30,8 @@

 | ruby | ruby_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)

+| script | script_script | list of scripts | script pointer (optional) | script name with extension (can start or end with "*" as wildcard) (optional)
+
 | tcl | tcl_script | list of scripts | script pointer (optional) | script name (can start or end with "*" as wildcard) (optional)

 | weechat | bar | list of bars | bar pointer (optional) | bar name (can start or end with "*" as wildcard) (optional)
@@ -38,8 +38,12 @@

 | weechat | inactivity | keyboard inactivity (seconds) | -

+| weechat | locale | locale used for translating messages | -
+
 | weechat | version | WeeChat version | -

+| weechat | version_git | WeeChat git version (output of command "git describe" for a development version only, empty for a stable release) | -
+
 | weechat | version_number | WeeChat version (as number) | -

 | weechat | weechat_dir | WeeChat directory | -
@@ -2,7 +2,7 @@
 |========================================
 | Plugin | Name | Description | Hashtable (input) | Hashtable (output)

-| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel)
+| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel)

 | irc | irc_message_split | split an IRC message (to fit in 512 bytes) | "message": IRC message, "server": server name (optional) | "msg1" ... "msgN": messages to send (without final "\r\n"), "args1" ... "argsN": arguments of messages, "count": number of messages

@@ -1,19 +1,26 @@
 [[command_aspell_aspell]]
 [command]*`aspell`* aspell plugin configuration::
 ........................................
-/aspell  dictlist
-         enable <lang>
-         disable
+/aspell  enable|disable|toggle
+         listdict
+         setdict <lang>
+         deldict
         addword [<lang>] <word>

-dictlist: show installed dictionaries
-  enable: enable aspell on current buffer
- disable: disable aspell on current buffer
- addword: add a word in your personal aspell dictionary
+  enable: enable aspell
+ disable: disable aspell
+  toggle: toggle aspell
+listdict: show installed dictionaries
+ setdict: set dictionary for current buffer
+ deldict: delete dictionary used on current buffer
+ addword: add a word in personal aspell dictionary

 Input line beginning with a '/' is not checked, except for some commands (see /set aspell.check.commands).

-To enable aspell on all buffers, use option "default_dict", for example:
+To enable aspell on all buffers, use option "default_dict", then enable aspell, for example:
  /set aspell.check.default_dict "en"
+  /aspell enable
+
+Default key to toggle aspell is alt-s.
 ........................................

@@ -13,11 +13,21 @@
 ** type: boolean
 ** values: on, off (default value: `off`)

+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** description: `enable aspell check for command line`
+** type: boolean
+** values: on, off (default value: `off`)
+
 * [[option_aspell.check.real_time]] *aspell.check.real_time*
 ** description: `real-time spell checking of words (slower, disabled by default: words are checked only if there's delimiter after)`
 ** type: boolean
 ** values: on, off (default value: `off`)

+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** description: `number of suggestions to display in bar item "aspell_suggest" for each dictionary set in buffer (-1 = disable suggestions, 0 = display all possible suggestions in all languages)`
+** type: integer
+** values: -1 .. 2147483647 (default value: `-1`)
+
 * [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
 ** description: `minimum length for a word to be spell checked (use 0 to check all words)`
 ** type: integer
@@ -1,10 +1,10 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** description: `global decoding charset`
+** description: `global decoding charset: charset used to decode incoming messages (if decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)`
 ** type: string
 ** values: any string (default value: `"iso-8859-1"`)

 * [[option_charset.default.encode]] *charset.default.encode*
-** description: `global encoding charset`
+** description: `global encoding charset: charset used to encode outgoing messages (if empty, default is UTF-8 because it is the WeeChat internal charset)`
 ** type: string
 ** values: any string (default value: `""`)

@@ -2,9 +2,9 @@
 [command]*`guile`* list/load/unload scripts::
 ........................................
 /guile  list|listfull [<name>]
-        load <filename>
+        load [-q] <filename>
        autoload
-        reload|unload [<name>]
+        reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -56,7 +56,7 @@ Without argument, this command display ban list for current channel.
 [command]*`connect`* connect to IRC server(s)::
 ........................................
 /connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
-          -all|-open [-nojoin] [-switch]
+          -all|-auto|-open [-nojoin] [-switch]

    server: server name, which can be:
            - internal server name (created by /server add, recommended usage)
@@ -65,6 +65,7 @@ Without argument, this command display ban list for current channel.
    option: set option for server (for boolean option, value can be omitted)
  nooption: set boolean option to 'off' (for example: -nossl)
      -all: connect to all servers defined in configuration
+     -auto: connect to servers with autoconnect enabled
     -open: connect to all opened servers that are not currently connected
   -nojoin: do not join any channel (even if autojoin is enabled on server)
   -switch: switch to next server address
@@ -212,16 +213,18 @@ nick: nick
 [[command_irc_join]]
 [command]*`join`* join a channel::
 ........................................
-/join  [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]
+/join  [-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]

- server: send to this server (internal name)
-channel: channel name to join
-    key: key to join the channel (channels with a key must be the first in list)
+-noswitch: do not switch to new buffer
+   server: send to this server (internal name)
+  channel: channel name to join
+      key: key to join the channel (channels with a key must be the first in list)

 Examples:
  /join #weechat
  /join #protectedchan,#weechat key
  /join -server freenode #weechat
+  /join -noswitch #weechat
 ........................................

 [[command_irc_kick]]
@@ -465,6 +468,17 @@ server: send to this server (internal name)
  text: text to send
 ........................................

+[[command_irc_quiet]]
+[command]*`quiet`* quiet nicks or hosts::
+........................................
+/quiet  [<channel>] [<nick> [<nick>...]]
+
+channel: channel for quiet
+   nick: user or host to quiet
+
+Without argument, this command display quiet list for current channel.
+........................................
+
 [[command_irc_quote]]
 [command]*`quote`* send raw data to server without parsing::
 ........................................
@@ -734,10 +748,14 @@ mask: only information which match this mask
 [[command_irc_whois]]
 [command]*`whois`* query information about user(s)::
 ........................................
-/whois  [<server>] <nick>[,<nick>...]
+/whois  [<server>] [<nick>[,<nick>...]]

 server: server name
  nick: nick (may be a mask)
+
+Without argument, this command will do a whois on:
+- your own nick if buffer is a server/channel
+- remote nick if buffer is a private.
 ........................................

 [[command_irc_whowas]]
@@ -103,8 +103,13 @@
 ** type: boolean
 ** values: on, off (default value: `on`)

+* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
+** description: `time format used in answer to message CTCP TIME (see man strftime for date/time specifiers)`
+** type: string
+** values: any string (default value: `"%a, %d %b %Y %T %z"`)
+
 * [[option_irc.look.display_away]] *irc.look.display_away*
-** description: `display message when (un)marking as away`
+** description: `display message when (un)marking as away (off: do not display/send anything, local: display locally, channel: send action to channels)`
 ** type: integer
 ** values: off, local, channel (default value: `local`)

@@ -183,13 +188,8 @@
 ** type: boolean
 ** values: on, off (default value: `on`)

-* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes*
-** description: `display channel modes in "buffer_name" bar item`
-** type: boolean
-** values: on, off (default value: `on`)
-
 * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key*
-** description: `hide channel key if modes are displayed in "buffer_name" bar item (this will hide all channel modes arguments if mode +k is set on channel)`
+** description: `hide channel key in channel modes (this will hide all channel modes arguments if mode +k is set on channel)`
 ** type: boolean
 ** values: on, off (default value: `off`)

@@ -234,10 +234,20 @@
 ** values: any string (default value: `"_|["`)

 * [[option_irc.look.nick_completion_smart]] *irc.look.nick_completion_smart*
-** description: `smart completion for nicks (completes first with last speakers)`
+** description: `smart completion for nicks (completes first with last speakers): speakers = all speakers (including highlights), speakers_highlights = only speakers with highlight`
 ** type: integer
 ** values: off, speakers, speakers_highlights (default value: `speakers`)

+* [[option_irc.look.nick_mode]] *irc.look.nick_mode*
+** description: `display nick mode (op, voice, ...) before nick (none = never, prefix = in prefix only (default), action = in action messages only, both = prefix + action messages)`
+** type: integer
+** values: none, prefix, action, both (default value: `prefix`)
+
+* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty*
+** description: `display a space if nick mode is enabled but nick has no mode (not op, voice, ...)`
+** type: boolean
+** values: on, off (default value: `off`)
+
 * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix*
 ** description: `text to display before nick in chat window`
 ** type: string
@@ -308,6 +318,11 @@
 ** type: boolean
 ** values: on, off (default value: `off`)

+* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick*
+** description: `get an alternate nick when the nick is already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing*
 ** description: `growing factor for autoreconnect delay to server (1 = always same delay, 2 = delay*2 for each retry, ..)`
 ** type: integer
@@ -363,6 +378,11 @@
 ** type: boolean
 ** values: on, off (default value: `off`)

+* [[option_irc.network.whois_double_nick]] *irc.network.whois_double_nick*
+** description: `double the nick in /whois command (if only one nick is given), to get idle time in answer; for example: "/whois nick" will send "whois nick nick"`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_irc.server_default.addresses]] *irc.server_default.addresses*
 ** description: `list of hostname/port or IP/port for server (separated by comma)`
 ** type: string
@@ -399,7 +419,7 @@
 ** values: 1 .. 65535 (default value: `10`)

 * [[option_irc.server_default.autorejoin]] *irc.server_default.autorejoin*
-** description: `automatically rejoin channels after kick`
+** description: `automatically rejoin channels after kick; you can define a buffer local variable on a channel to override this value (name of variable: "autorejoin", value: "on" or "off")`
 ** type: boolean
 ** values: on, off (default value: `off`)

@@ -449,9 +469,9 @@
 ** values: any string (default value: `"WeeChat %v"`)

 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
-** description: `use IPv6 protocol for server communication`
+** description: `use IPv6 protocol for server communication (try IPv6 then fallback to IPv4); if disabled, only IPv4 is used`
 ** type: boolean
-** values: on, off (default value: `off`)
+** values: on, off (default value: `on`)

 * [[option_irc.server_default.local_hostname]] *irc.server_default.local_hostname*
 ** description: `custom local hostname/IP for server (optional, if empty local hostname is used)`
@@ -509,7 +529,7 @@
 ** values: on, off (default value: `off`)

 * [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** description: `ssl certificate file used to automatically identify your nick ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
+** description: `SSL certificate file used to automatically identify your nick ("%h" will be replaced by WeeChat home, "~/.weechat" by default)`
 ** type: string
 ** values: any string (default value: `""`)

@@ -524,7 +544,7 @@
 ** values: any string (default value: `"NORMAL"`)

 * [[option_irc.server_default.ssl_verify]] *irc.server_default.ssl_verify*
-** description: `check that the ssl connection is fully trusted`
+** description: `check that the SSL connection is fully trusted`
 ** type: boolean
 ** values: on, off (default value: `on`)

@@ -2,9 +2,9 @@
 [command]*`lua`* list/load/unload scripts::
 ........................................
 /lua  list|listfull [<name>]
-      load <filename>
+      load [-q] <filename>
      autoload
-      reload|unload [<name>]
+      reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`perl`* list/load/unload scripts::
 ........................................
 /perl  list|listfull [<name>]
-       load <filename>
+       load [-q] <filename>
       autoload
-       reload|unload [<name>]
+       reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`python`* list/load/unload scripts::
 ........................................
 /python  list|listfull [<name>]
-         load <filename>
+         load [-q] <filename>
         autoload
-         reload|unload [<name>]
+         reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -2,27 +2,42 @@
 [command]*`relay`* relay control::
 ........................................
 /relay  list|listfull|listrelay
-        add <protocol.name> <port>
-        del <protocol.name>
+        add [ipv4.][ipv6.][ssl.]<protocol.name> <port>
+        del [ipv4.][ipv6.][ssl.]<protocol.name>
        raw
+        sslcertkey

         list: list relay clients (only active relays)
     listfull: list relay clients (verbose, all relays)
    listrelay: list relays (name and port)
          add: add relay for a protocol + name
          del: remove relay for a protocol + name
+         ipv4: force use of IPv4
+         ipv6: force use of IPv6
+          ssl: enable SSL
 protocol.name: protocol and name to relay:
                 - protocol "irc": name is the server to share
                 - protocol "weechat" (name is not used)
         port: port used for relay
          raw: open buffer with raw Relay data
+   sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key

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

 Examples:
  irc proxy, for server "freenode":
    /relay add irc.freenode 8000
+  irc proxy, for server "freenode", with SSL:
+    /relay add ssl.irc.freenode 8001
  weechat protocol:
-    /relay add weechat 8001
+    /relay add weechat 9000
+  weechat protocol with SSL:
+    /relay add ssl.weechat 9001
+  weechat protocol with SSL, using only IPv4:
+    /relay add ipv4.ssl.weechat 9001
+  weechat protocol with SSL, using only IPv6:
+    /relay add ipv6.ssl.weechat 9001
+  weechat protocol with SSL, using IPv4 + IPv6:
+    /relay add ipv4.ipv6.ssl.weechat 9001
 ........................................

@@ -1,3 +1,8 @@
+* [[option_relay.color.client]] *relay.color.client*
+** description: `text color for client description`
+** 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 underline (default value: `cyan`)
+
 * [[option_relay.color.status_active]] *relay.color.status_active*
 ** description: `text color for "connected" status`
 ** type: color
@@ -24,20 +29,45 @@
 ** 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 underline (default value: `brown`)

 * [[option_relay.color.text]] *relay.color.text*
-** description: `text color`
+** description: `text color in relay buffer`
 ** 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 underline (default value: `default`)

 * [[option_relay.color.text_bg]] *relay.color.text_bg*
-** description: `background color`
+** description: `background color in relay buffer`
 ** 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 underline (default value: `default`)

 * [[option_relay.color.text_selected]] *relay.color.text_selected*
-** description: `text color of selected client line`
+** description: `text color of selected line in relay buffer`
 ** 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 underline (default value: `white`)

+* [[option_relay.irc.backlog_max_minutes]] *relay.irc.backlog_max_minutes*
+** description: `maximum number of minutes in backlog per IRC channel (0 = unlimited, examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)`
+** type: integer
+** values: 0 .. 2147483647 (default value: `1440`)
+
+* [[option_relay.irc.backlog_max_number]] *relay.irc.backlog_max_number*
+** description: `maximum number of lines in backlog per IRC channel (0 = unlimited)`
+** type: integer
+** values: 0 .. 2147483647 (default value: `256`)
+
+* [[option_relay.irc.backlog_since_last_disconnect]] *relay.irc.backlog_since_last_disconnect*
+** description: `display backlog starting from last client disconnect`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags*
+** description: `tags of messages which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags`
+** type: string
+** values: any string (default value: `"irc_privmsg"`)
+
+* [[option_relay.irc.backlog_time_format]] *relay.irc.backlog_time_format*
+** description: `format for time in backlog messages (see man strftime for format) (not used if server capability "server-time" was enabled by client, because time is sent as irc tag); empty string = disable time in backlog messages`
+** type: string
+** values: any string (default value: `"[%H:%M] "`)
+
 * [[option_relay.look.auto_open_buffer]] *relay.look.auto_open_buffer*
 ** description: `auto open relay buffer when a new client is connecting`
 ** type: boolean
@@ -49,7 +79,7 @@
 ** values: 0 .. 65535 (default value: `256`)

 * [[option_relay.network.allowed_ips]] *relay.network.allowed_ips*
-** description: `regular expression with IPs allowed to use relay (case insensitive, use "(?-i)" at beginning to make it case sensitive), example: "^(123.45.67.89|192.160.*)$"`
+** description: `regular expression with IPs allowed to use relay (case insensitive, use "(?-i)" at beginning to make it case sensitive); if IPv6 is enabled and that connection is made using IPv4, it will be IPv4-mapped IPv6 address (like: "::ffff:127.0.0.1"), example: "^((::ffff:)?123.45.67.89|192.160.*)$"`
 ** type: string
 ** values: any string (default value: `""`)

@@ -63,6 +93,11 @@
 ** type: integer
 ** values: 0 .. 9 (default value: `6`)

+* [[option_relay.network.ipv6]] *relay.network.ipv6*
+** description: `listen on IPv6 socket by default (in addition to IPv4 which is default); protocols IPv4 and IPv6 can be forced (individually or together) in the protocol name (see /help relay)`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_relay.network.max_clients]] *relay.network.max_clients*
 ** description: `maximum number of clients connecting to a port`
 ** type: integer
@@ -73,3 +108,8 @@
 ** type: string
 ** values: any string (default value: `""`)

+* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
+** description: `file with SSL certificate and private key (for serving clients with SSL)`
+** type: string
+** values: any string (default value: `"%h/ssl/relay.pem"`)
+
@@ -2,9 +2,9 @@
 [command]*`ruby`* list/load/unload scripts::
 ........................................
 /ruby  list|listfull [<name>]
-       load <filename>
+       load [-q] <filename>
       autoload
-       reload|unload [<name>]
+       reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -0,0 +1,71 @@
+[[command_script_script]]
+[command]*`script`* WeeChat scripts manager::
+........................................
+/script  list [-o|-i]
+         search <text>
+         show <script>
+         load|unload|reload <script> [<script>...]
+         install|remove|installremove|hold [-q] <script> [<script>...]
+         upgrade
+         update
+
+         list: list loaded scripts (all languages)
+           -o: send list of loaded scripts to buffer
+           -i: copy list of loaded scripts in command line (for sending to buffer)
+       search: search scripts by tags or text and display result on scripts buffer
+         show: show detailed info about a script
+         load: load script(s)
+       unload: unload script(s)
+       reload: reload script(s)
+      install: install/upgrade script(s)
+       remove: remove script(s)
+installremove: install or remove script(s), depending on current state
+         hold: hold/unhold script(s) (a script held will not be upgraded any more and cannot be removed)
+           -q: quiet mode: do not display messages
+      upgrade: upgrade all installed scripts which are obsolete (new version available)
+       update: update local scripts cache
+
+Without argument, this command opens a buffer with list of scripts.
+
+On script buffer, the possible status for each script are:
+  * i a H r N
+  | | | | | |
+  | | | | | obsolete (new version available)
+  | | | | running (loaded)
+  | | | held
+  | | autoloaded
+  | installed
+  popular script
+
+Keys on script buffer:
+  alt+i  install script
+  alt+r  remove script
+  alt+l  load script
+  alt+L  reload script
+  alt+u  unload script
+  alt+h  (un)hold script
+  alt+v  view script
+
+Input allowed on script buffer:
+  i/r/l/L/u/h  action on script (same as keys above)
+  q            close buffer
+  $            refresh buffer
+  s:x,y        sort buffer using keys x and y (see /help script.look.sort)
+  s:           reset sort (use default sort)
+  word(s)      filter scripts: search word(s) in scripts (description, tags, ...)
+  *            remove filter
+
+Mouse actions on script buffer:
+  wheel         scroll list
+  left button   select script
+  right button  install/remove script
+
+Examples:
+  /script search url
+  /script install iset.pl buffers.pl
+  /script remove iset.pl
+  /script hold urlserver.py
+  /script reload urlserver
+  /script upgrade
+........................................
+
@@ -0,0 +1,190 @@
+* [[option_script.color.status_autoloaded]] *script.color.status_autoloaded*
+** description: `color for status "autoloaded" ("a")`
+** 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 underline (default value: `cyan`)
+
+* [[option_script.color.status_held]] *script.color.status_held*
+** description: `color for status "held" ("H")`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.status_installed]] *script.color.status_installed*
+** description: `color for status "installed" ("i")`
+** 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 underline (default value: `lightcyan`)
+
+* [[option_script.color.status_obsolete]] *script.color.status_obsolete*
+** description: `color for status "obsolete" ("N")`
+** 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 underline (default value: `lightmagenta`)
+
+* [[option_script.color.status_popular]] *script.color.status_popular*
+** description: `color for status "popular" ("*")`
+** 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 underline (default value: `yellow`)
+
+* [[option_script.color.status_running]] *script.color.status_running*
+** description: `color for status "running" ("r")`
+** 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 underline (default value: `lightgreen`)
+
+* [[option_script.color.status_unknown]] *script.color.status_unknown*
+** description: `color for status "unknown" ("?")`
+** 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 underline (default value: `lightred`)
+
+* [[option_script.color.text]] *script.color.text*
+** description: `text color in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_bg]] *script.color.text_bg*
+** description: `background color in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_bg_selected]] *script.color.text_bg_selected*
+** description: `background color for selected line in script buffer`
+** 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 underline (default value: `red`)
+
+* [[option_script.color.text_date]] *script.color.text_date*
+** description: `text color of dates in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_date_selected]] *script.color.text_date_selected*
+** description: `text color of dates for selected line in script buffer`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.text_delimiters]] *script.color.text_delimiters*
+** description: `text color of delimiters in script buffer`
+** 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 underline (default value: `darkgray`)
+
+* [[option_script.color.text_description]] *script.color.text_description*
+** description: `text color of description in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_description_selected]] *script.color.text_description_selected*
+** description: `text color of description for selected line in script buffer`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.text_extension]] *script.color.text_extension*
+** description: `text color of extension in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_extension_selected]] *script.color.text_extension_selected*
+** description: `text color of extension for selected line in script buffer`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.text_name]] *script.color.text_name*
+** description: `text color of script name in script buffer`
+** 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 underline (default value: `cyan`)
+
+* [[option_script.color.text_name_selected]] *script.color.text_name_selected*
+** description: `text color of script name for selected line in script buffer`
+** 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 underline (default value: `lightcyan`)
+
+* [[option_script.color.text_selected]] *script.color.text_selected*
+** description: `text color for selected line in script buffer`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.text_tags]] *script.color.text_tags*
+** description: `text color of tags in script buffer`
+** 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 underline (default value: `brown`)
+
+* [[option_script.color.text_tags_selected]] *script.color.text_tags_selected*
+** description: `text color of tags for selected line in script buffer`
+** 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 underline (default value: `yellow`)
+
+* [[option_script.color.text_version]] *script.color.text_version*
+** description: `text color of version in script buffer`
+** 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 underline (default value: `magenta`)
+
+* [[option_script.color.text_version_loaded]] *script.color.text_version_loaded*
+** description: `text color of version loaded in script buffer`
+** 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 underline (default value: `default`)
+
+* [[option_script.color.text_version_loaded_selected]] *script.color.text_version_loaded_selected*
+** description: `text color of version loaded for selected line in script buffer`
+** 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 underline (default value: `white`)
+
+* [[option_script.color.text_version_selected]] *script.color.text_version_selected*
+** description: `text color of version for selected line in script buffer`
+** 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 underline (default value: `lightmagenta`)
+
+* [[option_script.look.columns]] *script.look.columns*
+** description: `format of columns displayed in script buffer: following column identifiers are replaced by their value: %a=author, %d=description, %D=date added, %e=extension, %l=language, %L=license, %n=name with extension, %N=name, %r=requirements, %s=status, %t=tags, %u=date updated, %v=version, %V=version loaded, %w=min_weechat, %W=max_weechat)`
+** type: string
+** values: any string (default value: `"%s %n %V %v %u | %d | %t"`)
+
+* [[option_script.look.diff_color]] *script.look.diff_color*
+** description: `colorize output of diff`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_script.look.diff_command]] *script.look.diff_command*
+** description: `command used to show differences between script installed and the new version in repository ("auto" = auto detect diff command (git or diff), empty value = disable diff, other string = name of command, for example "diff")`
+** type: string
+** values: any string (default value: `"auto"`)
+
+* [[option_script.look.display_source]] *script.look.display_source*
+** description: `display source code of script on buffer with detail on a script (script is downloaded in a temporary file when detail on script is displayed)`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_script.look.quiet_actions]] *script.look.quiet_actions*
+** description: `quiet actions on script buffer: do not display messages on core buffer when scripts are installed/removed/loaded/unloaded (only errors are displayed)`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_script.look.sort]] *script.look.sort*
+** description: `default sort keys for scripts: comma-separated list of identifiers: a=author, A=autoloaded, d=date added, e=extension, i=installed, l=language, n=name, o=obsolete, p=popularity, r=running, u=date updated; char "-" can be used before identifier to reverse order; example: "i,u": installed scripts first, sorted by update date`
+** type: string
+** values: any string (default value: `"p,n"`)
+
+* [[option_script.look.translate_description]] *script.look.translate_description*
+** description: `translate description of scripts (if translation is available in your language, otherwise english version is used)`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_script.look.use_keys]] *script.look.use_keys*
+** description: `use keys alt+X in script buffer to do actions on scripts (alt+i = install, alt+r = remove, ...); if disabled, only the input is allowed: i, r, ...`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_script.scripts.cache_expire]] *script.scripts.cache_expire*
+** description: `local cache expiration time, in minutes (-1 = never expires, 0 = always expire)`
+** type: integer
+** values: -1 .. 525600 (default value: `60`)
+
+* [[option_script.scripts.dir]] *script.scripts.dir*
+** description: `local cache directory for scripts`
+** type: string
+** values: any string (default value: `"%h/script"`)
+
+* [[option_script.scripts.hold]] *script.scripts.hold*
+** description: `scripts to "hold": comma-separated list of scripts which will never been upgraded and can not be removed, for example: "buffers.pl,iset.pl"`
+** type: string
+** values: any string (default value: `""`)
+
+* [[option_script.scripts.url]] *script.scripts.url*
+** description: `URL for file with list of scripts`
+** type: string
+** values: any string (default value: `"http://www.weechat.org/files/plugins.xml.gz"`)
+
@@ -2,9 +2,9 @@
 [command]*`tcl`* list/load/unload scripts::
 ........................................
 /tcl  list|listfull [<name>]
-      load <filename>
+      load [-q] <filename>
      autoload
-      reload|unload [<name>]
+      reload|unload [-q] [<name>]

    list: list loaded scripts
 listfull: list loaded scripts (verbose)
@@ -14,6 +14,7 @@ autoload: load all scripts in "autoload" directory
  unload: unload a script (if no name given, unload all scripts)
 filename: script (file) to load
    name: a script name (name used in call to "register" function)
+      -q: quiet mode: do not display messages

 Without argument, this command lists all loaded scripts.
 ........................................
@@ -11,7 +11,7 @@ message: message for away (if no message is given, away status is removed)
 [command]*`bar`* manage bars::
 ........................................
 /bar  list|listfull|listitems
-      add <name> <type>[,<cond1>[,<cond2>...]] <position> <size> <separator> <item1>[,<item2>...]
+      add <name> <type>[,<condition>] <position> <size> <separator> <item1>[,<item2>...]
      default [input|title|status|nicklist]
      del <name>|-all
      set <name> <option> <value>
@@ -25,11 +25,12 @@ message: message for away (if no message is given, away status is removed)
         name: name of bar (must be unique)
         type:   root: outside windows,
               window: inside windows, with optional conditions (see below)
-    cond1,...: condition(s) for displaying bar (only for type "window"):
+    condition: condition(s) for displaying bar (only for type "window"):
                 active: on active window
               inactive: on inactive windows
               nicklist: on windows with nicklist
-               without condition, bar is always displayed
+               other condition: see /help weechat.bar.xxx.conditions and /help eval
+               without condition, the bar is always displayed
     position: bottom, top, left or right
         size: size of bar (in chars)
    separator: 1 for using separator (line), 0 or nothing means no separator
@@ -63,6 +64,7 @@ Examples:
 /buffer  list
         clear [<number>|<name>|-merged|-all]
         move|merge <number>
+         swap <number1>|<name1> [<number2>|<name2>]
         unmerge [<number>|-all]
         close [<n1>[-<n2>]|<name>]
         notify <level>
@@ -74,6 +76,7 @@ Examples:
    list: list buffers (without argument, this list is displayed)
   clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer)
    move: move buffer in the list (may be relative, for example -1)
+    swap: swap two buffers (swap with current buffer if only one number/name given)
   merge: merge current buffer to another buffer (chat area will be mix of both buffers)
          (by default ctrl-x switches between merged buffers)
 unmerge: unmerge buffer from other buffers which have same number
@@ -98,6 +101,10 @@ Examples:
    /buffer clear
  move buffer to number 5:
    /buffer move 5
+  swap buffer 1 with 3:
+    /buffer swap 1 3
+  swap buffer #weechat with current buffer:
+    /buffer swap #weechat
  merge with core buffer:
    /buffer merge 1
  unmerge buffer:
@@ -193,6 +200,61 @@ infolists: display infos about infolists
  windows: display windows tree
 ........................................

+[[command_weechat_eval]]
+[command]*`eval`* evaluate expression and send result to buffer::
+........................................
+/eval  [-n] <expression>
+       [-n] <expression1> <operator> <expression2>
+
+        -n: display result without sending it to buffer (debug mode)
+expression: expression to evaluate, variables with format ${variable} are replaced (see below)
+  operator: a logical or comparison operator:
+            - logical operators:
+                &&  boolean "and"
+                ||  boolean "or"
+            - comparison operators:
+                ==  equal
+                !=  not equal
+                <=  less or equal
+                <   less
+                >=  greater or equal
+                >   greater
+                =~  is matching regex
+                !~  is NOT matching regex
+
+An expression is considered as "true" if it is not NULL, not empty, and different from "0".
+The comparison is made using integers if the two expressions are valid integers.
+To force a string comparison, add double quotes around each expression, for example:
+  50 > 100      ==> 0
+  "50" > "100"  ==> 1
+
+Some variables are replaced in expression, using the format ${variable}, variable can be, by order of prioity :
+  1. the name of an option (file.section.option)
+  2. the name of a local variable in buffer
+  3. 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:
+    ${buffer[gui_buffers].full_name}: full name of first buffer in linked list of buffers
+    ${plugin[weechat_plugins].name}: name of first plugin in linked list of plugins
+For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get".
+
+Examples:
+  /eval -n ${weechat.look.scroll_amount}  ==> 3
+  /eval -n ${window}                      ==> 0x2549aa0
+  /eval -n ${window.buffer}               ==> 0x2549320
+  /eval -n ${window.buffer.full_name}     ==> core.weechat
+  /eval -n ${window.buffer.number}        ==> 1
+  /eval -n ${window.buffer.number} > 2    ==> 0
+  /eval -n ${window.win_width} > 100      ==> 1
+  /eval -n (8 > 12) || (5 > 2)            ==> 1
+  /eval -n (8 > 12) && (5 > 2)            ==> 0
+  /eval -n abcd =~ ^ABC                   ==> 1
+  /eval -n abcd =~ (?-i)^ABC              ==> 0
+  /eval -n abcd =~ (?-i)^abc              ==> 1
+  /eval -n abcd !~ abc                    ==> 0
+........................................
+
 [[command_weechat_filter]]
 [command]*`filter`* filter messages in buffers, to hide/show them according to tags or regex::
 ........................................
@@ -319,6 +381,7 @@ list of actions:
  set_unread_current_buffer: set unread marker for current buffer
  switch_active_buffer: switch to next merged buffer
  switch_active_buffer_previous: switch to previous merged buffer
+  zoom_merged_buffer: zoom on merged buffer
  insert: insert text in command line
  paste_start: start paste (bracketed paste mode)
  paste_stop: stop paste (bracketed paste mode)
@@ -484,7 +547,7 @@ Examples:
  create a http proxy, running on local host, port 8888:
    /proxy add local http 127.0.0.1 8888
  create a http proxy using IPv6 protocol:
-    /proxy add local http 127.0.0.1 8888
+    /proxy add local http ::1 8888
    /proxy set local ipv6 on
  create a socks5 proxy with username/password:
    /proxy add myproxy socks5 sample.host.org 3128 myuser mypass
@@ -542,15 +605,17 @@ Without argument, all files (WeeChat and plugins) are saved.
 [command]*`set`* set config options::
 ........................................
 /set  [<option> [<value>]]
+      diff [<option> [<option>...]]

 option: name of an option (can start or end with '*' to list many options)
 value: new value for option
+  diff: display only changed options

 New value can be, according to variable type:
  boolean: on, off or toggle
  integer: number, ++number or --number
-  string : any string ("" for empty string)
-  color  : color name, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number

 For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.

@@ -559,6 +624,10 @@ Examples:
    /set *highlight*
  add a word to highlight:
    /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................

 [[command_weechat_unset]]
@@ -580,9 +649,10 @@ Examples:
 [[command_weechat_upgrade]]
 [command]*`upgrade`* upgrade WeeChat without disconnecting from servers::
 ........................................
-/upgrade  [<path_to_binary>]
+/upgrade  [<path_to_binary>|-quit]

 path_to_binary: path to WeeChat binary (default is current binary)
+         -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)

 This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.

@@ -593,6 +663,16 @@ Upgrade process has 4 steps:
  2. unload all plugins (configuration files (*.conf) are written on disk)
  3. save WeeChat configuration (weechat.conf)
  4. execute new WeeChat binary and reload session.
+
+With option "-quit", the process is slightly different:
+  1. close *ALL* connections (irc, xfer, relay, ...)
+  2. save session into files (*.upgrade)
+  3. unload all plugins
+  4. save WeeChat configuration
+  5. quit WeeChat
+Then later you can restore session with command: weechat-curses --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat"
 ........................................

 [[command_weechat_uptime]]
@@ -63,6 +63,21 @@
 ** type: string
 ** values: any string (default value: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)

+* [[option_weechat.color.chat_nick_offline]] *weechat.color.chat_nick_offline*
+** description: `text color for offline nick (not in nicklist any more)`
+** 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 underline (default value: `darkgray`)
+
+* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight*
+** description: `text color for offline nick with highlight`
+** 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 underline (default value: `default`)
+
+* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg*
+** description: `background color for offline nick with highlight`
+** 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 underline (default value: `darkgray`)
+
 * [[option_weechat.color.chat_nick_other]] *weechat.color.chat_nick_other*
 ** description: `text color for other nick in private buffer`
 ** type: color
@@ -413,6 +428,11 @@
 ** type: boolean
 ** values: on, off (default value: `off`)

+* [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline*
+** description: `use a different color for offline nicks (not in nicklist any more)`
+** type: boolean
+** values: on, off (default value: `off`)
+
 * [[option_weechat.look.color_pairs_auto_reset]] *weechat.look.color_pairs_auto_reset*
 ** description: `automatically reset table of color pairs when number of available pairs is lower or equal to this number (-1 = disable automatic reset, and then a manual "/color reset" is needed when table is full)`
 ** type: integer
@@ -558,6 +578,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)

+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** description: `jump back to initial buffer after reaching end of hotlist`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_weechat.look.mouse]] *weechat.look.mouse*
 ** description: `enable mouse support`
 ** type: boolean
@@ -568,16 +593,6 @@
 ** type: integer
 ** values: 1 .. 10000 (default value: `100`)

-* [[option_weechat.look.nickmode]] *weechat.look.nickmode*
-** description: `display nick mode ((half)op/voice) before each nick`
-** type: boolean
-** values: on, off (default value: `on`)
-
-* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty*
-** description: `display space if nick mode is not (half)op/voice`
-** type: boolean
-** values: on, off (default value: `off`)
-
 * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed*
 ** description: `enable terminal "bracketed paste mode" (not supported in all terminals/multiplexers): in this mode, pasted text is bracketed with control sequences so that WeeChat can differentiate pasted text from typed-in text ("ESC[200~", followed by the pasted text, followed by "ESC[201~")`
 ** type: boolean
@@ -594,7 +609,7 @@
 ** values: -1 .. 2147483647 (default value: `1`)

 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** description: `prefix for action messages`
+** description: `prefix for action messages, colors are allowed with format "${color}"`
 ** type: string
 ** values: any string (default value: `" *"`)

@@ -634,22 +649,22 @@
 ** values: any string (default value: `"+"`)

 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `prefix for error messages`
+** description: `prefix for error messages, colors are allowed with format "${color}"`
 ** type: string
 ** values: any string (default value: `"=!="`)

 * [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** description: `prefix for join messages`
+** description: `prefix for join messages, colors are allowed with format "${color}"`
 ** type: string
 ** values: any string (default value: `"-->"`)

 * [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** description: `prefix for network messages`
+** description: `prefix for network messages, colors are allowed with format "${color}"`
 ** type: string
 ** values: any string (default value: `"--"`)

 * [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** description: `prefix for quit messages`
+** description: `prefix for quit messages, colors are allowed with format "${color}"`
 ** type: string
 ** values: any string (default value: `"<--"`)

@@ -709,12 +724,12 @@
 ** values: on, off (default value: `on`)

 * [[option_weechat.look.separator_horizontal]] *weechat.look.separator_horizontal*
-** description: `char used to draw horizontal separators around bars (empty value will draw a real line with ncurses, but may cause bugs with URL selection under some terminals), wide chars are NOT allowed here`
+** description: `char used to draw horizontal separators around bars and windows (empty value will draw a real line with ncurses, but may cause bugs with URL selection under some terminals), wide chars are NOT allowed here`
 ** type: string
 ** values: any string (default value: `"-"`)

 * [[option_weechat.look.separator_vertical]] *weechat.look.separator_vertical*
-** description: `char used to draw vertical separators around bars (empty value will draw a real line with ncurses), wide chars are NOT allowed here`
+** description: `char used to draw vertical separators around bars and windows (empty value will draw a real line with ncurses), wide chars are NOT allowed here`
 ** type: string
 ** values: any string (default value: `""`)

@@ -728,6 +743,16 @@
 ** type: string
 ** values: any string (default value: `"%a, %d %b %Y %T"`)

+* [[option_weechat.look.window_separator_horizontal]] *weechat.look.window_separator_horizontal*
+** description: `display an horizontal separator between windows`
+** type: boolean
+** values: on, off (default value: `on`)
+
+* [[option_weechat.look.window_separator_vertical]] *weechat.look.window_separator_vertical*
+** description: `display a vertical separator between windows`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_weechat.network.connection_timeout]] *weechat.network.connection_timeout*
 ** description: `timeout (in seconds) for connection to a remote host (made in a child process)`
 ** type: integer
@@ -788,3 +813,8 @@
 ** type: boolean
 ** values: on, off (default value: `on`)

+* [[option_weechat.startup.sys_rlimit]] *weechat.startup.sys_rlimit*
+** description: `set resource limits for WeeChat process, format is: "res1:limit1,res2:limit2"; resource name is the end of constant (RLIMIT_XXX) in lower case (see man setrlimit for values); limit -1 means "unlimited"; example: set unlimited size for core file and max 1GB of virtual memory: "core:-1,as:1000000000"`
+** type: string
+** values: any string (default value: `""`)
+
@@ -29,17 +29,17 @@
 ** 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 underline (default value: `lightcyan`)

 * [[option_xfer.color.text]] *xfer.color.text*
-** description: `text color`
+** description: `text color in xfer buffer`
 ** 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 underline (default value: `default`)

 * [[option_xfer.color.text_bg]] *xfer.color.text_bg*
-** description: `background color`
+** description: `background color in xfer buffer`
 ** 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 underline (default value: `default`)

 * [[option_xfer.color.text_selected]] *xfer.color.text_selected*
-** description: `text color of selected xfer line`
+** description: `text color of selected line in xfer buffer`
 ** 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 underline (default value: `white`)

@@ -52,7 +52,7 @@ The main WeeChat directories are:
 |    gui/          | Functions for buffers, windows, ... (used by all interfaces)
 |       curses/    | Curses interface
 |       gtk/       | Gtk interface (not working)
-|    plugins/      | Plugin API
+|    plugins/      | Plugin and scripting API
 |       alias/     | Alias plugin
 |       aspell/    | Aspell plugin
 |       charset/   | Charset plugin
@@ -62,13 +62,13 @@ The main WeeChat directories are:
 |       logger/    | Logger plugin (write messages displayed to files)
 |       relay/     | Relay plugin (irc proxy + relay for remote interfaces)
 |       rmodifier/ | Rmodifier plugin (alter modifier strings with regular expressions)
-|       scripts/   | Script plugins
-|          python/ | Python scripting API
-|          perl/   | Perl scripting API
-|          ruby/   | Ruby scripting API
-|          lua/    | Lua scripting API
-|          tcl/    | Tcl scripting API
-|          guile/  | Guile (scheme) scripting API
+|       script/    | Scripts manager
+|       python/    | Python scripting API
+|       perl/      | Perl scripting API
+|       ruby/      | Ruby scripting API
+|       lua/       | Lua scripting API
+|       tcl/       | Tcl scripting API
+|       guile/     | Guile (scheme) scripting API
 |       xfer/      | Xfer (IRC DCC file/chat)
 | doc/             | Documentation
 | po/              | Translations files (gettext)
@@ -85,8 +85,8 @@ Core

 WeeChat "core" reside in following directories:

-* 'src/core': core functions (for data manipulation)
-* 'src/gui': functions about interface (buffers, windows, ...)
+* 'src/core/': core functions (for data manipulation)
+* 'src/gui/': functions about interface (buffers, windows, ...)

 [width="100%",cols="1l,5",options="header"]
 |========================================
@@ -99,6 +99,7 @@ WeeChat "core" reside in following directories:
 |    wee-config-file.c          | Configuration file management
 |    wee-config.c               | Configuration options for WeeChat core (options weechat.*)
 |    wee-debug.c                | Some debug functions
+|    wee-eval.c                 | Evaluate expressions with references to internal vars
 |    wee-hashtable.c            | Hashtables
 |    wee-hdata.c                | Hdata (direct access to data using hashtables)
 |    wee-hook.c                 | Hooks
@@ -114,6 +115,7 @@ WeeChat "core" reside in following directories:
 |    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
 | gui/                          | Functions for buffers, windows, ... (used by all interfaces)
 |    gui-bar-item.c             | Bar items
 |    gui-bar-window.c           | Bar windows
@@ -165,6 +167,9 @@ Plugins
 |    plugin.c                       | Plugins management (load/unload dynamic C libraries)
 |    plugin-api.c                   | Extra functions for plugin API (wrapper around WeeChat core functions)
 |    plugin-config.c                | Plugin configuration options (file plugins.conf)
+|    plugin-script.c                | Common functions used by script plugins
+|    plugin-script-api.c            | Script API functions: wrappers around some plugin API functions
+|    plugin-script-callback.c       | Callback management for scripts
 |    weechat-plugin.h               | Header designed to be distributed with WeeChat plugins, in order to compile them
 |    alias/                         | Alias plugin
 |       alias.c                     | Main alias functions
@@ -172,6 +177,7 @@ Plugins
 |       alias-info.c                | Info and infolists from alias plugin
 |    aspell/                        | Aspell plugin
 |       weechat-aspell.c            | Main aspell functions
+|       weechat-aspell-bar-item.c   | Aspell bar items
 |       weechat-aspell-config.c     | Aspell config options
 |       weechat-aspell-speller.c    | Spellers management
 |    charset/                       | Charset plugin
@@ -181,6 +187,9 @@ Plugins
 |    fifo/                          | Fifo plugin
 |       fifo.c                      | Main fifo functions
 |       fifo-info.c                 | Info and infolists from fifo plugin
+|    guile/                         | Guile (scheme) plugin
+|       weechat-guile.c             | Main guile functions (load/unload scripts, execute guile code)
+|       weechat-guile-api.c         | Guile scripting API functions
 |    irc/                           | IRC (Internet Relay Chat) plugin
 |       irc.c                       | Main IRC functions
 |       irc-bar-item.c              | IRC bar items
@@ -213,6 +222,15 @@ Plugins
 |       logger-config.c             | Logger config options
 |       logger-info.c               | Info and infolists from logger plugin
 |       logger-tail.c               | Return last lines of a file
+|    lua/                           | Lua plugin
+|       weechat-lua.c               | Main lua functions (load/unload scripts, execute lua code)
+|       weechat-lua-api.c           | Lua scripting API functions
+|    perl/                          | Perl plugin
+|       weechat-perl.c              | Main perl functions (load/unload scripts, execute perl code)
+|       weechat-perl-api.c          | Perl scripting API functions
+|    python/                        | Python plugin
+|       weechat-python.c            | Main python functions (load/unload scripts, execute python code)
+|       weechat-python-api.c        | Python scripting API functions
 |    relay/                         | Relay plugin (IRC proxy and relay for remote interfaces)
 |       relay.c                     | Main relay functions
 |       relay-buffer.c              | Relay buffer
@@ -221,6 +239,7 @@ Plugins
 |       relay-completion.c          | Relay completions
 |       relay-config.c              | Relay config options
 |       relay-info.c                | Info and infolists from relay plugin
+|       relay-network.c             | Network functions for relay
 |       relay-raw.c                 | Relay raw buffer
 |       relay-server.c              | Relay server
 |       relay-upgrade.c             | Save/restore relay data when upgrading WeeChat
@@ -237,28 +256,21 @@ Plugins
 |       rmodifier-config.c          | Rmodifier config options
 |       rmodifier-debug.c           | Rmodifier debug functions
 |       rmodifier-info.c            | Info and infolists from rmodifier plugin
-|    scripts/                       | Scripting API
-|       script.c                    | Common functions used by script plugins
-|       script-api.c                | Script API functions: wrappers around some plugin API functions
-|       script-callback.c           | Callback management for scripts
-|       python/                     | Python plugin
-|          weechat-python.c         | Main python functions (load/unload scripts, execute python code)
-|          weechat-python-api.c     | Python scripting API functions
-|       perl/                       | Perl plugin
-|          weechat-perl.c           | Main perl functions (load/unload scripts, execute perl code)
-|          weechat-perl-api.c       | Perl scripting API functions
-|       ruby/                       | Ruby plugin
-|          weechat-ruby.c           | Main ruby functions (load/unload scripts, execute ruby code)
-|          weechat-ruby-api.c       | Ruby scripting API functions
-|       lua/                        | Lua plugin
-|          weechat-lua.c            | Main lua functions (load/unload scripts, execute lua code)
-|          weechat-lua-api.c        | Lua scripting API functions
-|       tcl/                        | Tcl plugin
-|          weechat-tcl.c            | Main tcl functions (load/unload scripts, execute tcl code)
-|          weechat-tcl-api.c        | Tcl scripting API functions
-|       guile/                      | Guile (scheme) plugin
-|          weechat-guile.c          | Main guile functions (load/unload scripts, execute guile code)
-|          weechat-guile-api.c      | Guile scripting API functions
+|    ruby/                          | Ruby plugin
+|       weechat-ruby.c              | Main ruby functions (load/unload scripts, execute ruby code)
+|       weechat-ruby-api.c          | Ruby scripting API functions
+|    script/                        | Scripts manager
+|       script.c                    | Main functions for scripts manager
+|       script-action.c             | Actions on scripts (load/unload, install/remove, hold, ...)
+|       script-buffer.c             | Buffer for scripts manager
+|       script-command.c            | Commands for scripts manager
+|       script-completion.c         | Completions for scripts manager
+|       script-config.c             | Config options for scripts manager
+|       script-info.c               | Info and infolists from scripts manager plugin
+|       script-repo.c               | Download and read repository file
+|    tcl/                           | Tcl plugin
+|       weechat-tcl.c               | Main tcl functions (load/unload scripts, execute tcl code)
+|       weechat-tcl-api.c           | Tcl scripting API functions
 |    xfer/                          | Xfer plugin (IRC DCC file/chat)
 |       xfer.c                      | Main xfer functions
 |       xfer-buffer.c               | Xfer buffer
@@ -273,9 +285,11 @@ Plugins
 |       xfer-upgrade.c              | Save/restore xfer data when upgrading WeeChat
 |========================================

-[[documentation]]
-Documentation
-~~~~~~~~~~~~~
+[[documentation_translations]]
+Documentation / translations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Documentation files:

 [width="100%",cols="1l,5",options="header"]
 |========================================
@@ -299,10 +313,6 @@ Documentation
 |          plugin_api/                | Files auto-built for plugin API
 |========================================

-[[translations]]
-Translations
-~~~~~~~~~~~~
-
 Translations for WeeChat and plugins are done with gettext, files are in 'po/' directory:

 [width="100%",cols="1l,5",options="header"]
@@ -361,16 +371,23 @@ Some basic rules you *must* follow when you write C code:
 * Use 4 spaces for indentation. Don't use tabs, they are evil.
 * Try to not exceed 80 chars by line, except if this is needed to increase
  readability.
-* Use comments `/* comment */` (not C99-style comments like `// comment`), and
-  format them like this:
+* Use comments `/* comment */` (not C99-style comments like `// comment`).
+* Add a comment before any function, to explain what does the function (always
+  use a multi-line comment, even if description is very short).
+
+Example:

 [source,C]
 ----------------------------------------
 /*
- * foo: this is the description of the function
+ * Checks if a string with boolean value is valid.
+ *
+ * Returns:
+ *   1: boolean value is valid
+ *   0: boolean value is NOT valid
 */

-void
+int
 foo ()
 {
    int i;
@@ -379,8 +396,8 @@ foo ()
    i = 1;

    /*
-     * multi-line comment: this is a very long
-     * description about next block of code
+     * multi-line comment: this is a very long description about next block
+     * of code
     */
    i = 2;
    printf ("%d\n", i);
@@ -417,34 +434,13 @@ if (nicks_count == 1)
 }
 ----------------------------------------

-* Add a comment before any function, to explain what does the function, and
-  indent it like this (note that return type of function is on a line alone):
-
-[source,C]
----------------------------------------
-/*
- * foo: this is the description of the function
- */
-
-void
-foo ()
-{
-    int i;
-
-    for (i = 0; i < 10; i++)
-    {
-        bar (i);
-    }
-}
----------------------------------------
-
 * Use empty lines to separate many different blocks inside functions, and if
  possible add a comment for each one, like this:

 [source,C]
 ----------------------------------------
 /*
- * irc_server_outqueue_send: send a message from outqueue
+ * Sends a message from out queue.
 */

 void
@@ -588,14 +584,13 @@ Examples:

 [width="100%",cols="1l,5",options="header"]
 |========================================
-| Directory                   | Files
-| src/core/                   | weechat.c, wee-backtrace.c, wee-command.c, ...
-| src/gui/                    | gui-bar.c, gui-bar-item.c, gui-bar-window.c, ...
-| src/gui/curses/             | gui-curses-bar.c, gui-curses-bar-window.c, gui-curses-chat.c, ...
-| src/plugins/                | plugin.c, plugin-api.c, plugin-config.c, ...
-| src/plugins/irc/            | irc.c, irc-bar-item.c, irc-buffer.c, ...
-| src/plugins/scripts/        | script.c, script-api.c, script-callback.c, ...
-| src/plugins/scripts/python/ | weechat-python.c, weechat-python-api.c, ...
+| Directory           | Files
+| src/core/           | weechat.c, wee-backtrace.c, wee-command.c, ...
+| src/gui/            | gui-bar.c, gui-bar-item.c, gui-bar-window.c, ...
+| src/gui/curses/     | gui-curses-bar.c, gui-curses-bar-window.c, gui-curses-chat.c, ...
+| src/plugins/        | plugin.c, plugin-api.c, plugin-config.c, plugin-script.c, ...
+| src/plugins/irc/    | irc.c, irc-bar-item.c, irc-buffer.c, ...
+| src/plugins/python/ | weechat-python.c, weechat-python-api.c, ...
 |========================================

 The headers of C files have same name as file, for example 'wee-command.h' for
@@ -668,7 +663,9 @@ Example: creation of a new window (from 'src/gui/gui-window.c'):
 [source,C]
 ----------------------------------------
 /*
- * gui_window_new: create a new window
+ * Creates a new window.
+ *
+ * Returns pointer to new window, NULL if error.
 */

 struct t_gui_window *
@@ -790,7 +787,7 @@ All combinations are summarized in this table:

 Color codes using options (see 't_gui_color_enum', in file 'src/gui/gui-color.h'):

-[width="40%",cols="^1m,5",options="header"]
+[width="60%",cols="^1m,10",options="header"]
 |========================================
 | Code | Option
 | 00   | weechat.color.separator
@@ -827,15 +824,17 @@ Color codes using options (see 't_gui_color_enum', in file 'src/gui/gui-color.h'
 | 31   | weechat.color.chat_text_found
 | 32   | weechat.color.chat_value
 | 33   | weechat.color.chat_prefix_buffer
-| 34   | weechat.color.chat_tags
-| 35   | weechat.color.chat_inactive_window
-| 36   | weechat.color.chat_inactive_buffer
-| 37   | weechat.color.chat_prefix_buffer_inactive_buffer
+| 34   | weechat.color.chat_tags _(new in version 0.3.6)_
+| 35   | weechat.color.chat_inactive_window _(new in version 0.3.6)_
+| 36   | weechat.color.chat_inactive_buffer _(new in version 0.3.6)_
+| 37   | weechat.color.chat_prefix_buffer_inactive_buffer _(new in version 0.3.6)_
+| 38   | weechat.color.chat_nick_offline _(new in version 0.3.9)_
+| 39   | weechat.color.chat_nick_offline_highlight _(new in version 0.3.9)_
 |========================================

 WeeChat colors are:

-[width="40%",cols="^1m,5",options="header"]
+[width="40%",cols="^1m,6",options="header"]
 |========================================
 | Code | Color
 | 00   | default (terminal foreground/background)
@@ -930,7 +929,36 @@ Git repository
 Git repository is at this URL: http://git.savannah.gnu.org/gitweb/?p=weechat.git

 Any patch for bug or new feature must be done on master branch, preferred format
-is a patch made with `git diff` or `git-format-patch`, sent by e-mail.
+is a patch made with `git diff` or `git format-patch`, sent by e-mail.
+
+Format of commit message is the following:
+
+----------------------------------------
+component: fix a problem (bug #12345)
+----------------------------------------
+
+Where 'component' is one of following:
+
+* WeeChat core: 'core' (files in directory 'src/' except doc and plugins)
+* documentation files: 'doc' (files in directory 'doc/')
+* name of a plugin: 'irc', 'python', 'relay', ... (files in directory 'src/plugins/')
+
+Some rules to follow:
+
+* use only english
+* use infinitive form of verb
+* if commit is related to something in tracker (bug, task, patch), write it
+  in parenthesis after the message (format: bug #12345, task #12345, patch #12345)
+
+Examples of commit messages:
+
+----------------------------------------
+core: add callback "nickcmp" for nick comparison in buffers
+irc: fix freeze when reading on socket with SSL enabled (bug #35097)
+ruby: add detection of ruby version 1.9.3 in cmake
+python: fix crash when unloading a script without pointer to interpreter
+core: update japanese translations (patch #7783)
+----------------------------------------

 [[translations]]
 Translations
@@ -962,7 +990,7 @@ $ msg_check_lines.py xx.po
 The `msgfmt` will perform checks on message catalog and display errors, like bad
 use of format specifiers in strings.

-The scripts msg_check_lines.py (http://www.weechat.org/files/temp/po/msg_check_lines.py)
+The script msg_check_lines.py (http://www.weechat.org/files/temp/po/msg_check_lines.py)
 will check number of lines in translated strings (which must be the same as
 string in english).

@@ -4,14 +4,14 @@ Sébastien Helleu <flashcode@flashtux.org>


 [NOTE]
-This document is written for WeeChat versions ≥ 0.3.0.
+This document is written for WeeChat versions ≥ 0.3.0 but should preferably be
+used with latest stable version of WeeChat.


 [[general]]
 General
 -------

-
 [[weechat_name]]
 Where does the name "WeeChat" come from?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -22,7 +22,6 @@ So complete name is "Wee Enhanced Environment for Chat".
 "Wee" also means "very small" (and yes, there is other meaning, but it does not
 apply to WeeChat!).

-
 [[why_choose_weechat]]
 Why choose WeeChat? X-Chat and Irssi are so good...
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -53,12 +52,10 @@ Some features (version ≥ 0.3.x):

 More info on this page: http://www.weechat.org/features

-
 [[compilation_install]]
 Compilation / install
 ---------------------

-
 [[gui]]
 I heard about many GUI's for WeeChat. How can I compile/use them?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,7 +64,6 @@ Today only a Curses GUI is available.

 Other GUI's will be available as remote clients (currently under development).

-
 [[compile_git]]
 I can't compile WeeChat after cloning git repository, why?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -82,7 +78,6 @@ This package is built almost every day using git repository. Note that this
 package may not correspond exactly to git base and that it's less convenient
 than git cloning for installing updates.

-
 [[lost]]
 I've launched WeeChat, but I'm lost, what can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,12 +88,10 @@ Keys and commands are listed in documentation.
 It's recommended for new users to read the quickstart guide (see the doc page
 on the website).

-
 [[display]]
 Display
 -------

-
 [[charset]]
 I don't see some chars with accents, what can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -125,7 +118,6 @@ UTF-8 locale is recommended for WeeChat. If you're using ISO or other
 locale, please check that *all* your settings (terminal, screen, ..) are ISO
 and *not* UTF-8.

-
 [[bars_background]]
 Bars like title and status are not filled, background color stops after text, why?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -142,7 +134,6 @@ Depending on where you launch WeeChat, you should have:

 If needed, fix your TERM variable: `export TERM="xxx"`.

-
 [[screen_weird_chars]]
 When I'm using weechat under screen/tmux, I have weird random chars, how do I fix that?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -155,7 +146,6 @@ which is ok (like many other values).

 If needed, fix your TERM variable: `export TERM="xxx"`.

-
 [[osx_display_broken]]
 I compiled WeeChat under OS X, and I see "(null)" everywhere on screen, what's wrong?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -166,7 +156,6 @@ system).
 Moreover, under OS X, it is recommended to install WeeChat with Homebrew package
 manager.

-
 [[buffer_vs_window]]
 I heard about "buffers" and "windows", what's the difference?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -180,7 +169,6 @@ your screen into many windows.
 Each window displays one buffer. A buffer can be hidden (not displayed by a
 window) or displayed by one or more windows.

-
 [[buffers_list]]
 How to display the buffers list on the left side?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -199,7 +187,6 @@ To move bar to bottom:
 /set weechat.bar.buffers.position bottom
 ----------------------------------------

-
 [[customize_prefix]]
 How can I reduce length of nicks or remove nick alignment in chat area?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -216,6 +203,25 @@ To remove nick alignment:
 /set weechat.look.prefix_align none
 ----------------------------------------

+[[input_bar_size]]
+How to use command line with more than one line?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The option 'size' in input bar can be set to a value higher than 1 (for fixed
+size, default size is 1) or 0 for dynamic size, and then option 'size_max' will
+set the max size (0 = no limit).
+
+Example with dynamic size:
+
+----------------------------------------
+/set weechat.bar.input.size 0
+----------------------------------------
+
+Max size of 2:
+
+----------------------------------------
+/set weechat.bar.input.size_max 2
+----------------------------------------

 [[one_input_root_bar]]
 Is it possible to display only one input bar for all windows (after split)?
@@ -239,7 +245,6 @@ any bar:
 /bar del rootinput
 ----------------------------------------

-
 [[terminal_copy_paste]]
 How can I copy/paste text without pasting nicklist?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -253,7 +258,6 @@ Another solution is to move nicklist to top or bottom, for example:
 /set weechat.bar.nicklist.position top
 ----------------------------------------

-
 [[urls]]
 How can I click on long URLs (more than one line)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -298,7 +302,6 @@ shortenurl.py::

 List of scripts about URLs: http://www.weechat.org/scripts/stable/tag/url

-
 [[change_locale_without_quit]]
 I want to change the language used by WeeChat for messages, but without exiting WeeChat, is it possible?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -314,7 +317,6 @@ and issue these commands when script is loaded:
 To have english messages with UTF-8 encoding for terminal, for ISO users, you
 can issue: `/shell setenv LANG=en_US`.

-
 [[256_colors]]
 How can I use 256 colors in WeeChat?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -352,7 +354,6 @@ can add color aliases with command `/color`).

 Please read user's guide for more information about colors management.

-
 [[search_text]]
 How can I search text in buffer (like /lastlog in irssi)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -362,12 +363,10 @@ And jump to highlights: @k(A-)@k(p)/@k(n).

 See user's guide for more info about this feature (default key bindings).

-
 [[key_bindings]]
 Key bindings
 ------------

-
 [[meta_keys]]
 Some meta keys (alt + key) are not working, why?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -386,7 +385,6 @@ UXTerm*metaSendsEscape: true

 And then reload resources (`xrdb -override ~/.Xresources`) or restart X.

-
 [[customize_key_bindings]]
 How can I customize key bindings?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -395,7 +393,6 @@ Key bindings are customizable with `/key` command.

 Default key @k(A-)@k(k) lets you grab key code and insert it in command line.

-
 [[jump_to_buffer_11_or_higher]]
 What is the key to jump to buffer 11 (or higher number)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -411,7 +408,6 @@ You can bind a key, for example:

 List of default keys is in User's guide.

-
 [[global_history]]
 How to use global history (instead of buffer history) with up and down keys?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -430,12 +426,10 @@ Example:
 Keys "meta2-A" and "meta2-B" may be different in your terminal. To find key
 code press @k(A-)@k(k) then key (up or down).

-
 [[mouse]]
 Mouse
 -----

-
 [[mouse_not_working]]
 Mouse is not working at all, what can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -466,7 +460,6 @@ To disable mouse in terminal:
 $ printf '\033[?1002l'
 ----------------------------------------

-
 [[mouse_coords]]
 Mouse does nothing for X or Y greater than 94, why?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -477,11 +470,89 @@ work for X/Y greater than 94.
 You should use a terminal that supports UTF-8 coordinates for mouse, like
 rxvt-unicode.

+[[mouse_select_paste]]
+How can I select or paste text in terminal when mouse is enabled in WeeChat?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When mouse is enabled in WeeChat, you can use @k(-S-) modifier to select or
+click in terminal, as if the mouse was disabled (on some terminals like iTerm,
+you have to use @k(-A-) instead of @k(-S-)).

 [[irc]]
 IRC
 ---

+[[irc_ssl_connection]]
+I have some problems when connecting to a server using SSL, what can I do?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you see errors about gnutls handshake, you can try to use a smaller
+Diffie-Hellman key (default is 2048):
+
+----------------------------------------
+/set irc.server.freenode.ssl_dhkey_size 1024
+----------------------------------------
+
+If you see errors about certificate, you can disable "ssl_verify" (be careful,
+connection will be less secure by doing that):
+
+----------------------------------------
+/set irc.server.freenode.ssl_verify off
+----------------------------------------
+
+[[irc_ssl_handshake_error]]
+When connecting to server with SSL, I see only error "TLS handshake failed", what can I do?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can try a different priority string (WeeChat ≥ 0.3.5 only), replace "xxx"
+by your server name:
+
+----------------------------------------
+/set irc.server.xxx.ssl_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+----------------------------------------
+
+[[irc_ssl_freenode]]
+How can I connect to freenode server using SSL?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Set option 'weechat.network.gnutls_ca_file' to file with certificates:
+
+----------------------------------------
+/set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
+----------------------------------------
+
+[NOTE]
+Check that you have this file on your system (commonly brought by package
+"ca-certificates").
+
+Setup server port, SSL, dhkey_size, then connect:
+
+----------------------------------------
+/set irc.server.freenode.addresses "chat.freenode.net/7000"
+/set irc.server.freenode.ssl on
+/set irc.server.freenode.ssl_dhkey_size 1024
+/connect freenode
+----------------------------------------
+
+[[irc_sasl]]
+How can I be identified before joining channels?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If server supports SASL, you should use that instead of sending command for
+nickserv authentication, for example:
+
+----------------------------------------
+/set irc.server_default.sasl_mechanism dh-blowfish
+/set irc.server.freenode.sasl_username "mynick"
+/set irc.server.freenode.sasl_password "xxxxxxx"
+----------------------------------------
+
+If server does not support SASL, you can add a delay (between command and join
+of channels):
+
+----------------------------------------
+/set irc.server.freenode.command_delay 5
+----------------------------------------

 [[ignore_vs_filter]]
 What is the difference between the /ignore and /filter commands?
@@ -500,7 +571,6 @@ prefix and content of line.
 Filtered lines are only hidden, not deleted, and you can see them if you
 disable filters (by default, the key @k(A-)@k(=) toggles filters).

-
 [[filter_irc_join_part_quit]]
 How can I filter join/part/quit messages on IRC channels?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -515,13 +585,12 @@ With smart filter (keep join/part/quit from users who spoke recently):
 With a global filter (hide *all* join/part/quit):

 ----------------------------------------
-/filter add jpk * irc_join,irc_part,irc_quit *
+/filter add joinquit * irc_join,irc_part,irc_quit *
 ----------------------------------------

 [NOTE]
 For help: `/help filter` and `/help irc.look.smart_filter`

-
 [[filter_irc_join_channel_messages]]
 How can I filter some messages displayed when I join an IRC channel?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -546,7 +615,6 @@ Examples:
 /filter add irc_join_topic_date * irc_332,irc_333 *
 ----------------------------------------

-
 [[filter_voice_messages]]
 How can I filter voice messages (eg on Bitlbee server)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -580,7 +648,6 @@ is not perfect (will work only if first mode changed is voice):
 /filter add hidevoices * irc_mode (\+|\-)v
 ----------------------------------------

-
 [[color_away_nicks]]
 How can I see away nicks in nicklist?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -603,7 +670,6 @@ nicks:
 For WeeChat ≤ 0.3.3, options are 'irc.network.away_check' and
 'irc.network.away_check_max_nicks'.

-
 [[highlight_notification]]
 How can I be warned when someone highlights me on a channel?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -618,74 +684,16 @@ For 'launcher.pl', you have to setup command:

 Other scripts on this subject: http://www.weechat.org/scripts/stable/tag/notify/

-
-[[irc_ssl_connection]]
-I have some problems when connecting to a server using SSL, what can I do?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you see errors about gnutls handshake, you can try to use a smaller
-Diffie-Hellman key (default is 2048):
-
----------------------------------------
-/set irc.server.freenode.ssl_dhkey_size 1024
----------------------------------------
-
-If you see errors about certificate, you can disable "ssl_verify" (be careful,
-connection will be less secure by doing that):
-
----------------------------------------
-/set irc.server.freenode.ssl_verify off
----------------------------------------
-
-
-[[irc_ssl_handshake_error]]
-When connecting to server with SSL, I see only error "TLS handshake failed", what can I do?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can try a different priority string (WeeChat ≥ 0.3.5 only), replace "xxx"
-by your server name:
-
----------------------------------------
-/set irc.server.xxx.ssl_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
----------------------------------------
-
-
-[[irc_ssl_freenode]]
-How can I connect to freenode server using SSL?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Set option 'weechat.network.gnutls_ca_file' to file with certificates:
-
----------------------------------------
-/set weechat.network.gnutls_ca_file "/etc/ssl/certs/ca-certificates.crt"
----------------------------------------
-
-[NOTE]
-Check that you have this file on your system (commonly brought by package
-"ca-certificates").
-
-Setup server port, SSL, dhkey_size, then connect:
-
----------------------------------------
-/set irc.server.freenode.addresses "chat.freenode.net/7000"
-/set irc.server.freenode.ssl on
-/set irc.server.freenode.ssl_dhkey_size 1024
-/connect freenode
----------------------------------------
-
-
 [[irc_target_buffer]]
 How can I change target buffer for commands on merged buffers (like buffer with servers)?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 The default key is @k(C-)@k(x) (command is: `/input switch_active_buffer`).

-
 [[plugins_scripts]]
 Plugins / scripts
 -----------------

-
 [[openbsd_plugins]]
 I'm using OpenBSD and WeeChat does not load any plugins, what's wrong?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -699,7 +707,6 @@ You must set that up:
 /plugin autoload
 ----------------------------------------

-
 [[load_scripts]]
 How can I load Perl/Python/Ruby/Lua/Tcl scripts? Are scripts compatible with other IRC clients?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -715,12 +722,10 @@ Notes:
  WeeChat is starting up.
 * a 'tcl' plugin is available with version ≥ 0.3.0.

-
 [[settings]]
 Settings
 --------

-
 [[memory_usage]]
 How can I tweak WeeChat to consume less memory?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,19 +735,18 @@ You can try following tips to consume less memory:
 * use the latest stable version (it is supposed to have less memory leaks than
  older versions)
 * do not load some plugins if you don't use them, for example: aspell, fifo,
-  logger, perl, python, ruby, lua, tcl, xfer (used for DCC)
+  logger, perl, python, ruby, lua, tcl, guile, xfer (used for DCC)
 * load only scripts that you really need
-* reduce value of option 'weechat.history.max_lines' (number of lines saved in
-  memory for each buffer)
-* reduce value of option 'weechat.history.max_commands' (number of user commands
-  saved in memory)
-
+* do not load certificates if SSL is *NOT* used: set empty string in option
+  'weechat.network.gnutls_ca_file'
+* reduce value of option 'weechat.history.max_buffer_lines_number' or set value
+  of option 'weechat.history.max_buffer_lines_minutes'
+* reduce value of option 'weechat.history.max_commands'

 [[development]]
 Development
 -----------

-
 [[bug_task_patch]]
 How should I report bugs, ask for new features or send patches?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -758,7 +762,6 @@ There are 3 ways:
  http://www.weechat.org/about
  (you can subscribe and send to "support" mailing list)

-
 [[gdb_error_threads]]
 When I run WeeChat under gdb, there is error about threads, what can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -780,7 +783,6 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
 (gdb) run
 ----------------------------------------

-
 [[supported_os]]
 What is the list of supported platforms for WeeChat? Will it be ported to other operating systems?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -790,7 +792,6 @@ The full list is on this page: http://www.weechat.org/download
 We do our best to run on as many platforms as possible. Help is welcome for
 some OS' we don't have, to test WeeChat.

-
 [[help_developers]]
 I want to help WeeChat developers. What can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -800,7 +801,6 @@ There's many tasks to do (testing, code, documentation, ...)
 Please contact us via IRC or mail, look at support page:
 http://www.weechat.org/support

-
 [[donate]]
 Can I give money or other things to WeeChat developers?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -90,7 +90,7 @@ For each server option, WeeChat uses its value if it is defined (not
 For example there's default nicks (based on your un*x login), and you can
 override them for oftc server with following command:

-  /set irc.server.oftc.nicks "mynick1,mynick2,mynick3,mynick4,mynick5"
+  /set irc.server.oftc.nicks "mynick,mynick2,mynick3,mynick4,mynick5"

 To set username and realname:

@@ -101,12 +101,20 @@ To enable auto-connect to server at startup:

  /set irc.server.oftc.autoconnect on

-To run a command after connection to server, for example to identify
-with nickserv:
+If SASL is available on server, you can use it for authentication (you will be
+identified before you join channels):

-  /set irc.server.oftc.command "/msg nickserv identify xxxxxx"
+  /set irc.server_default.sasl_mechanism dh-blowfish
+  /set irc.server.oftc.sasl_username "mynick"
+  /set irc.server.oftc.sasl_password "xxxxxxx"

-Note: many commands can be separated by ';' (semi-colon)
+To run a command after connection to server, for example to authenticate
+with nickserv (only if you don't use SASL for authentication):
+
+  /set irc.server.oftc.command "/msg nickserv identify xxxxxxx"
+
+[NOTE]
+Many commands can be separated by ';' (semi-colon).

 To auto-join some channels when connecting to server:

@@ -153,7 +161,7 @@ Join/part IRC channels
 `/part [quit message]`::
    part a channel (keeping buffer open)

-`/close [quit message]`::
+`/close`::
    close server or channel buffer (`/close` is an alias for `/buffer close`)


@@ -222,18 +230,11 @@ On some distros like Debian, plugins are available via a separate package
 Plugins are automatically loaded when found (please look at the WeeChat
 documentation to load/unload plugins or scripts).

-Some plugins let you use scripts in WeeChat (in many languages like Perl,
-Python, Ruby, Lua and Tcl). These plugins must be loaded with the `/plugin`
-command and they provide commands like `/perl`, used to load scripts.
+Many external scripts (from contributors) are available for WeeChat:
+http://www.weechat.org/scripts

-Many external plugins/scripts (from contributors) are available for
-WeeChat: http://www.weechat.org/scripts
-
-Easiest way to install scripts is to use script 'weeget.py':
-
-. download and copy 'weeget.py' to ~/.weechat/python/autoload/
-. load script: `/python autoload`
-. scripts list: `/weeget list` (for help: `/help weeget`)
+You can manage scripts in WeeChat with command `/script` (see `/help script`
+for more info).


 [[more_doc]]
@@ -6,10 +6,6 @@ Sébastien Helleu <flashcode@flashtux.org>
 This document is the specification of WeeChat relay protocol: the protocol used
 to relay WeeChat data to clients, which are mostly remote interfaces.

-[WARNING]
-This document is a *DRAFT*. +
-The protocol is under heavy development and is *NOT READY* for usage. Stay tuned!
-

 [[introduction]]
 Introduction
@@ -478,7 +474,8 @@ WeeChat reserved identifiers:

 | _buffer_line_added       | Line added in buffer    | line |
  'buffer' (pointer), 'date' (time), 'date_printed' (time), 'displayed' (char),
-  'highlight' (char), 'prefix' (string), 'message' (string) |
+  'highlight' (char), 'tags_array' (array of strings), 'prefix' (string),
+  'message' (string) |
  Display line in buffer

 | _buffer_closing          | Buffer closing          | buffer |
@@ -523,6 +520,7 @@ available:
 | hda  | Hdata content        | Variable
 | inf  | Info: name + content | Variable
 | inl  | Infolist content     | Variable
+| arr  | Array of values      | 3 bytes (type) + number of items + data
 |=====================================================

 [[object_char]]
@@ -835,6 +833,42 @@ infolist buffer
   name  count              item 1                               item 2
 .......................................

+[[object_array]]
+Array
+^^^^^
+
+An array is a type (3 bytes) + number of items (integer on 4 bytes) + data.
+
+Example of array with 2 strings:
+
+.......................................
+┌─────╥────┬────┬────┬────╥────┬────┬────┬────╥────┬────┬────╥────┬────┬────┬────╥────┬────┐
+│ str ║ 00 │ 00 │ 00 │ 02 ║ 00 │ 00 │ 00 │ 03 ║ 61 │ 62 │ 63 ║ 00 │ 00 │ 00 │ 02 ║ 64 │ 65 │ ────► { "abc", "de" }
+└─────╨────┴────┴────┴────╨────┴────┴────┴────╨────┴────┴────╨────┴────┴────┴────╨────┴────┘
+ └───┘ └─────────────────┘ └─────────────────┘ └────────────┘ └─────────────────┘ └───────┘
+ type   number of strings        length         'a'  'b'  'c'       length         'd'  'e'
+.......................................
+
+Example of array with 3 integers:
+
+.......................................
+┌─────╥────┬────┬────┬────╥────┬────┬────┬────╥────┬────┬────┬────╥────┬────┬────┬────┐
+│ int ║ 00 │ 00 │ 00 │ 03 ║ 00 │ 00 │ 00 │ 7B ║ 00 │ 00 │ 01 │ C8 ║ 00 │ 00 │ 03 │ 15 │ ────► { 123, 456, 789 }
+└─────╨────┴────┴────┴────╨────┴────┴────┴────╨────┴────┴────┴────╨────┴────┴────┴────┘
+ └───┘ └─────────────────┘ └─────────────────┘ └─────────────────┘ └─────────────────┘
+ type   number of integers      123 (0x7B)         456 (0x1C8)         789 (0x315)
+.......................................
+
+A 'NULL' array:
+
+.......................................
+┌─────╥────┬────┬────┬────┐
+│ str ║ 00 │ 00 │ 00 │ 00 │ ────► NULL
+└─────╨────┴────┴────┴────┘
+ └───┘ └─────────────────┘
+ type   number of strings
+.......................................
+
 [[typical_session]]
 Typical session
 ---------------
@@ -99,9 +99,10 @@ Arguments:
 * 'version': string, script version
 * 'license': string, script license
 * 'description': string, short description of script
-* 'shutdown_function': string, name of function called when script is unloaded (optional)
-* 'charset': string, script charset (optional, if your script is UTF-8, you
-  can use blank value here, because UTF-8 is default charset)
+* 'shutdown_function': string, name of function called when script is unloaded
+  (can be empty string)
+* 'charset': string, script charset (if your script is UTF-8, you can use blank
+  value here, because UTF-8 is default charset)

 Example of script, for each language:

@@ -385,7 +386,8 @@ List of constants in script API:
  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+  WEECHAT_HOOK_CONNECT_SOCKET_ERROR
 | hook signal         |
  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
 |========================================
@@ -47,7 +47,6 @@ In order to install WeeChat, you need:
 * 'root' privileges (to install WeeChat in a system directory)
 * ncurses library

-
 [[install]]
 Installation
 ------------
@@ -91,14 +90,15 @@ compile WeeChat.
 | cmake                  |             | *yes*    | build (autotools still possible, but cmake is recommended)
 | 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
+| libgcrypt11-dev        |             | *yes*    | SASL authentication with IRC server using DH-BLOWFISH mechanism, script plugin
+| libgnutls-dev          | ≥ 2.2.0     |          | SSL connection to IRC server, support of SSL in relay plugin
 | gettext                |             |          | internationalization (translation of messages; base language is english)
-| libgcrypt11-dev        |             |          | SASL authentication with IRC server using DH-BLOWFISH mechanism
-| libgnutls-dev          | ≥ 2.2.0     |          | SSL connection to IRC server
 | ca-certificates        |             |          | certificates for SSL connections
 | libaspell-dev          |             |          | aspell plugin
 | python-dev             | ≥ 2.5 ^(3)^ |          | python plugin
 | libperl-dev            |             |          | perl plugin
-| ruby1.8-dev            |             |          | ruby plugin
+| ruby1.9.1-dev          | ≥ 1.8       |          | ruby plugin
 | liblua5.1-0-dev        |             |          | lua plugin
 | tcl-dev                | ≥ 8.5       |          | tcl plugin
 | guile-1.8-dev          |             |          | guile (scheme) plugin
@@ -142,9 +142,15 @@ $ make install
 Compile with autotools
 ^^^^^^^^^^^^^^^^^^^^^^

+[WARNING]
+Only cmake is officially supported to build WeeChat. You should use autotools
+only if you are not able to use cmake. +
+Build with autotools requires more dependencies and is slower than with cmake.
+
 * Installation in system directories (requires 'root' privileges):

 ----------------------------------------
+$ ./autogen.sh
 $ ./configure
 $ make
 % make install    (as root)
@@ -153,6 +159,7 @@ $ make
 * Installation in custom directory:

 ----------------------------------------
+$ ./autogen.sh
 $ ./configure --prefix=/path/to/directory
 $ make
 $ make install
@@ -162,21 +169,15 @@ $ make install
 Git sources
 ~~~~~~~~~~~

-Warning: GIT sources are for advanced users: it may not compile or not be
+Warning: git sources are for advanced users: it may not compile or not be
 stable. You're warned!

-To get GIT sources, issue this command:
+To get git sources, issue this command:

 ----------------------------------------
 $ git clone git://git.sv.gnu.org/weechat.git
 ----------------------------------------

-If you're using autotools (and not cmake), execute this script:
-
----------------------------------------
-$ ./autogen.sh
----------------------------------------
-
 Then follow instructions for source package (see
 <<source_package,source package>>).

@@ -209,7 +210,15 @@ If you installed a binary package, then install package 'weechat-dbg'.
 Core files
 ^^^^^^^^^^

-To enable 'core' files, you have to use `ulimit` command.
+To enable 'core' files, you can use option
+<<option_weechat.startup.sys_rlimit,weechat.startup.sys_rlimit>>:
+
+----------------------------------------
+/set weechat.startup.sys_rlimit "core:-1"
+----------------------------------------
+
+For WeeChat ≤ 0.3.8 or if you want to enable core files even before WeeChat
+starts, you can use `ulimit` command.

 For example under Linux with 'bash' shell, add this line to your `~/.bashrc`:

@@ -294,7 +303,6 @@ Then like for a crash, use command `bt full`:
 (gdb) bt full
 ----------------------------------------

-
 [[usage]]
 Usage
 -----
@@ -306,36 +314,39 @@ Running WeeChat
 Command line arguments:

 -a, --no-connect::
-    Disable auto-connect to servers when WeeChat is starting
+    Disable auto-connect to servers when WeeChat is starting.

 -c, --colors::
-    Display default colors in terminal
+    Display default colors in terminal.

 -d, --dir 'path'::
    Set path as home for WeeChat (used for configuration files, logs, user
    plugins and scripts), default value is '~/.weechat' (note: directory is
-    created if not found by WeeChat)
+    created if not found by WeeChat).

 -h, --help::
-    Display help
+    Display help.

 -k, --keys::
-    Display WeeChat default keys
+    Display WeeChat default keys.

 -l, --license::
-    Display WeeChat license
+    Display WeeChat license.

 -p, --no-plugin::
-    Disable plugins auto-load
+    Disable plugins auto-load.
+
+-r, --run-command::
+    Run command(s) after startup (many commands can be separated by semicolons).

 -s, --no-script::
-    Disable scripts auto-load
+    Disable scripts auto-load.

 -v, --version::
-    Display WeeChat version
+    Display WeeChat version.

 plugin:option::
-    Option for plugin (see doc for each plugin)
+    Option for plugin (see doc for each plugin).

 To start WeeChat, issue this command:

@@ -359,28 +370,29 @@ Example of terminal with WeeChat:

 ........................................
 ┌─────────────────────────────────────────────────────────────────────────────────────────┐
-│Welcome to #test, this is a test channel                                                 │
-│12:52:27    --> | flashy (n=flashcod@hellix.flashtux.org) has joined #test    │@ChanServ │
-│12:52:27     -- | Nicks #test: [@ChanServ @flashy +_FlashB0t joe mike]        │@flashy   │
-│12:52:27     -- | Channel #test: 5 nicks (2 ops, 0 halfop, 1 voice, 2 normal) │+_FlashB0t│
-│12:52:27     -- | Channel created on Tue Jan 27 06:30:17 2009                 │joe       │
-│12:54:15 flashy | hey!                                                        │mike      │
-│12:55:01    joe | hi flashy!                                                  │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│                                                                              │          │
-│[12:55] [6] [irc/freenode] 3:#test(+n){5}* [Act: 4:#abc(2,5), 6]                         │
-│[flashy] hi joe!█                                                                        │
+│Welcome to #test, this is a test channel                                                 │ ◀ bar "title"
+│12:52:27   --> | Flashy (flashcode@weechat.org) has joined #test                 │@Flashy│
+│12:52:27    -- | Nicks #test: [@Flashy @joe +weebot]                             │@joe   │
+│12:52:27    -- | Channel #test: 4 nicks (2 ops, 0 halfop, 1 voice, 1 normal)     │+weebot│
+│12:52:27    -- | Channel created on Tue Jan 27 06:30:17 2009                     │peter  │
+│12:54:15 peter | hey!                                                            │       │
+│12:55:01  @joe | hello                                                           │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │ ◀ chat + bar "nicklist"
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│                                                                                 │       │
+│[12:55] [6] [irc/freenode] 3:#test(+n){4}* [Act: 4:#abc(2,5), 6]                         │ ◀ bar "status"
+│[@Flashy] hi peter!█                                                                     │ ◀ bar "input"
 └─────────────────────────────────────────────────────────────────────────────────────────┘
 ........................................

@@ -405,8 +417,9 @@ Bar 'status' has following default items:
 | buffer_count          | [6]                   | number of opened buffers
 | buffer_plugin         | [irc/freenode]        | plugin of current buffer (irc plugin can add IRC server name used by buffer)
 | buffer_number         | 3                     | current buffer number
-| buffer_name           | #test(+n)             | current buffer name (with channel modes for irc channels)
-| buffer_nicklist_count | {5}                   | number of nicks in nicklist
+| buffer_name           | #test                 | current buffer name
+| buffer_modes          | +n                    | IRC channel modes
+| buffer_nicklist_count | {4}                   | number of nicks in nicklist
 | buffer_filter         | *                     | filtering indicator: `*` means some lines are filtered (hidden), empty value means all lines are displayed
 | lag                   | [Lag: 2.5]            | lag indicator, in seconds (hidden if lag is low)
 | hotlist               | [Act: 4:#abc(2,5), 6] | list of buffers with activity (unread messages) (in example, 2 highlights and 5 unread messages on '#abc', one unread message on buffer #6)
@@ -418,14 +431,386 @@ Bar 'input' has following default items:

 [width="100%",cols="^3,^6l,8",options="header"]
 |========================================
-| Item             | Example                                    | Description
-| input_paste      | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] | question to user for pasting lines
-| input_prompt     | [flashy]                                   | input prompt (nick for irc plugin)
-| away             | (away)                                     | away indicator
-| input_search     | [Text search]                              | text search indicator
-| input_text       | hi joe!                                    | input text
+| Item         | Example                                    | Description
+| input_paste  | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] | question to user for pasting lines
+| input_prompt | [@Flashy]                                  | input prompt (nick for irc plugin)
+| away         | (away)                                     | away indicator
+| input_search | [Text search]                              | text search indicator
+| input_text   | hi peter!                                  | input text
 |========================================

+[[buffers_and_windows]]
+Buffers and windows
+~~~~~~~~~~~~~~~~~~~
+
+A 'buffer' is composed by a number, a name, lines displayed (and some other
+data).
+
+Examples of buffers:
+
+* core buffer (created by WeeChat on startup, can not be closed)
+* irc server (displays messages from server)
+* irc channel
+* irc private
+
+A 'window' is a screen area which displays a buffer. It is possible to split
+your screen into many windows.
+
+Each window displays one buffer. A buffer can be hidden (not displayed by a
+window) or displayed by one or more windows.
+
+Example of horizontal split (`/window splith`):
+
+........................................
+┌─────────────────────────────────────────────────────────────────────────────────────────┐
+│Welcome to #abc, channel about nothing!                                                  │
+│12:55:12     Max | hi                                                            │@Flashy│
+│12:55:20 @Flashy | hi Max!                                                       │Max    │
+│12:55:32     Max | how are you?                                                  │       │
+│                                                                                 │       │
+│                                                                                 │       │ ◀ window #2
+│                                                                                 │       │   (buffer #4)
+│                                                                                 │       │
+│                                                                                 │       │
+│[12:55] [6] [irc/freenode] 4:#abc(+n){2}                                                 │
+│[@Flashy]                                                                                │
+│─────────────────────────────────────────────────────────────────────────────────────────│
+│Welcome to #test, this is a test channel                                                 │
+│12:54:15 peter | hey!                                                            │@Flashy│
+│12:55:01  @joe | hello                                                           │@joe   │
+│                                                                                 │+weebot│
+│                                                                                 │peter  │
+│                                                                                 │       │ ◀ window #1
+│                                                                                 │       │   (buffer #3)
+│                                                                                 │       │
+│                                                                                 │       │
+│[12:55] [6] [irc/freenode] 3:#test(+n){4}                                                │
+│[@Flashy] hi peter!█                                                                     │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+........................................
+
+Example of vertical split (`/window splitv`):
+
+........................................
+┌─────────────────────────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel    │Welcome to #abc, channel about nothing!     │
+│12:54:15 peter | hey!               │@Flashy│12:55:12     Max | hi               │@Flashy│
+│12:55:01  @joe | hello              │@joe   │12:55:20 @Flashy | hi Max!          │Max    │
+│                                    │+weebot│12:55:32     Max | how are you?     │       │
+│                                    │peter  │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│[12:55] [6] [irc/freenode] 3:#test(+n){4}   │[12:55] [6] [irc/freenode] 4:#abc(+n){2}    │
+│[@Flashy] hi peter!█                        │[@Flashy]                                   │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+                ▲ window #1                                   ▲ window #2
+                  (buffer #3)                                   (buffer #4)
+........................................
+
+Example of vertical + horizontal splits:
+
+........................................
+┌─────────────────────────────────────────────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel    │Welcome to #def, another channel            │
+│12:54:15 peter | hey!               │@Flashy│12:55:42 @Flashy | hello world      │@Flashy│
+│12:55:01  @joe | hello              │@joe   │12:55:56    alex | hi Flashy        │alex   │
+│                                    │+weebot│                                    │       │
+│                                    │peter  │                                    │       │ ◀ window #3
+│                                    │       │                                    │       │   (buffer #5)
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│                                    │       │[12:55] [6] [irc/freenode] 5:#def(+n){2}    │
+│                                    │       │[@Flashy]                                   │
+│                                    │       │────────────────────────────────────────────│
+│                                    │       │Welcome to #abc, channel about nothing!     │
+│                                    │       │12:55:12     Max | hi               │@Flashy│
+│                                    │       │12:55:20 @Flashy | hi Max!          │Max    │
+│                                    │       │12:55:32     Max | how are you?     │       │
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │ ◀ window #2
+│                                    │       │                                    │       │   (buffer #4)
+│                                    │       │                                    │       │
+│                                    │       │                                    │       │
+│[12:55] [6] [irc/freenode] 3:#test(+n){4}   │ [12:55] [6] [irc/freenode] 4:#abc(+n){2}   │
+│[@Flashy] hi peter!█                        │ [@Flashy]                                  │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+                ▲ window #1
+                  (buffer #3)
+........................................
+
+[[bars]]
+Bars
+~~~~
+
+A 'bar' is an area beside the chat that can contain any type of text.
+
+The bar options can be set with options `weechat.bar.name.option` where `name`
+is the name of the bar and `option` the option for this bar.
+
+List of bar options:
+
+[width="100%",cols="2m,2,10",options="header"]
+|========================================
+| Option | Values | Description
+
+| type | `root`, `window` |
+  A bar with type `root` is displayed exactly one time on screen, outside all
+  windows. There is no root bar by default, but an example is the bar 'buffers'
+  created by script 'buffers.pl' (sidebar with list of buffers). +
+  A bar with type `window` is displayed in each window, for example if you
+  split one time the screen (with `/window splith` or `/window splitv`), you
+  will have one bar in each window. The four default bars ('title', 'status',
+  'input', 'nicklist') have type `window`.
+
+| position | `top`, `bottom`, `left`, `right` |
+  Position of the bar: above/below chat, on the left/right.
+
+| priority | integer ≥ 0 |
+  Priority for display of bar: this is used for ordering the bars on screen when
+  many bars have same type and position. +
+  The bars are displayed from the edge of the screen to the center. A higher
+  priority will display bar at the beginning, so closer to the edge. +
+  Example: 'input' bar has priority 1000, so it is displayed before the 'status'
+  bar, which has priority 500.
+
+| size | integer ≥ 0 |
+  The size of the bar: number of columns for position left/right, number
+  of lines for position top/tobbom. A size of `0` means automatic, so the size
+  will be computed according to content displayed in bar.
+
+| size_max | integer ≥ 0 |
+  The maximum size for a bar, `0` = no limit (this option is used only if
+  `size` = `0`).
+
+| color_bg | color |
+  The default background color for the bar.
+
+| color_fg | color |
+  The default text color for the bar.
+
+| color_delim | color |
+  The color for delimiters in bar.
+
+| hidden | `on`, `off` |
+  When option is `on`, the bar is hidden. +
+  Note: instead of changing this option, the command `/bar` is preferred, for
+  example: `/bar toggle nicklist` (see command <<command_weechat_bar,/bar>>).
+
+| separator | `on`, `off` |
+  When option is `on`, a separator (line) is displayed between this bar and
+  other bars (or chat).
+
+| items | string |
+  A list of 'items' (see <<bar_items,items>> for more info).
+
+| filling_left_right | `horizontal`, `vertical`, `columns_horizontal`, `columns_vertical` |
+  Type of filling for a bar which has position `left` or `right` (see
+  <<bar_filling,filling>> for more info).
+
+| filling_top_bottom | `horizontal`, `vertical`, `columns_horizontal`, `columns_vertical` |
+  Type of filling for a bar which has position `top` or `bottom` (see
+  <<bar_filling,filling>> for more info).
+
+| conditions | string |
+  The conditions to display the bar (see <<bar_conditions,conditions>> for more
+  info).
+|========================================
+
+[[bar_items]]
+Items
+^^^^^
+
+The option 'items' is a string with a list of bar items, separated by a comma
+(space between items on screen) or "+" (glued items).
+
+The list of bar items is displayed with command `/bar listitems`.
+
+Example of bar with items "[time],buffer_number+:+buffer_plugin+.+buffer_name":
+
+........................................
+┌─────────────────────────────────────────────────────────────────────────────────────────┐
+│[12:55] 3:irc/freenode.#weechat                                                          │
+└─────────────────────────────────────────────────────────────────────────────────────────┘
+........................................
+
+[[bar_filling]]
+Filling
+^^^^^^^
+
+There are four types of filling:
+
+* `horizontal`: the items are displayed horizontally, from left to right. If
+  there are new lines in items, a space is used to separate lines.
+* `vertical`: the items are displayed from top to bottom. If there are new
+  lines in items, a new line is used to separate lines.
+* `columns_horizontal`: items are displayed using columns, where text is
+  aligned on the left. The first item is on top left, the second is on same
+  line, on the right.
+* `columns_vertical`: items are displayed using columns, where text is aligned
+  on the left. The first item is on top left, the second is one line below.
+
+Default bars 'title', 'status' and 'input' have 'horizontal' filling, and
+default bar 'nicklist' has 'vertical' filling.
+
+Some examples of filling for bar 'nicklist':
+
+........................................
+┌──────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel          │
+│12:54:15 peter | hey!                    │@carl   │
+│12:55:01  +Max | hello                   │@jessika│
+│                                         │@maddy  │
+│                                         │%Diego  │
+│                                         │%Melody │
+│                                         │+Max    │
+│                                         │ celia  │
+│                                         │ Eva    │
+│                                         │ freddy │
+│                                         │ Harold^│
+│                                         │ henry4 │
+│                                         │ jimmy17│
+│                                         │ jodie ▼│
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
+└──────────────────────────────────────────────────┘
+                filling_left_right = vertical ▲
+
+┌──────────────────────────────────────────────────┐
+│Welcome to #test, this is a test channel          │
+│12:54:15 peter | hey!           │@carl     lee    │
+│12:55:01  +Max | hello          │@jessika  louise │
+│                                │@maddy    mario  │
+│                                │%Diego    mark   │
+│                                │%Melody   peter  │
+│                                │+Max      Rachel │
+│                                │ celia    richard│
+│                                │ Eva      sheryl │
+│                                │ freddy   Vince  │
+│                                │ Harold^  warren │
+│                                │ henry4   zack   │
+│                                │ jimmy17         │
+│                                │ jodie           │
+│[12:55] [6] [irc/freenode] 3:#test(+n){24}        │
+└──────────────────────────────────────────────────┘
+        filling_left_right = columns_vertical ▲
+
+┌───────────────────────────────────────────────────────────────────────┐
+│@carl    %Diego    celia    Harold^  jodie    mario    Rachel   Vince  │
+│@jessika %Melody   Eva      henry4   lee      mark     richard  warren │
+│@maddy   +Max      freddy   jimmy17  louise   peter    sheryl   zack   │
+│───────────────────────────────────────────────────────────────────────│
+│                                                                       │
+        filling_top_bottom = columns_vertical ▲
+
+┌───────────────────────────────────────────────────────────────────────┐
+│@carl    @jessika @maddy   %Diego   %Melody  +Max      celia    Eva    │
+│ freddy   Harold^  henry4   jimmy17  jodie    lee      louise   mario  │
+│ mark     peter    Rachel   richard  sheryl   Vince    warren   zack   │
+│───────────────────────────────────────────────────────────────────────│
+│                                                                       │
+      filling_top_bottom = columns_horizontal ▲
+........................................
+
+[[bar_conditions]]
+Conditions
+^^^^^^^^^^
+
+The option 'conditions' is a string evaluated to know if the bar is displayed
+or not in the window (it is used only for bars with type 'window').
+
+The string can be:
+
+* 'active': the window must be active
+* 'inactive': the window must be inactive
+* 'nicklist': the buffer displayed in window must have a nicklist
+* an expression: it is evaluated as boolean (see command
+  <<command_weechat_eval,/eval>>)
+
+For the expression, following variables are available:
+
+* `${active}`: true if window is active
+* `${inactive}`: true if window is inactive
+* `$[nicklist}`: true if buffer displayed in window has a nicklist
+
+Following pointers are available:
+
+* `${window}`: the window where condition is evaluated
+* `${buffer}`: the buffer of window where condition is evaluated
+
+Example to display nicklist bar in all buffers with a nicklist, and only if
+width of window is > 100 :
+
+----------------------------------------
+/set weechat.bar.nicklist.conditions "${nicklist} && ${window.win_width} > 100"
+----------------------------------------
+
+Same condition, but always display nicklist on buffer '&bitlbee' (even if window
+is small):
+
+----------------------------------------
+/set weechat.bar.nicklist.conditions "${nicklist} && (${window.win_width} > 100 || ${buffer.full_name} == irc.bitlbee.&bitlbee)"
+----------------------------------------
+
+[[notify_levels]]
+Notify levels
+~~~~~~~~~~~~~
+
+Four levels are possible in messages displayed in buffers, from lower to higher:
+
+* 'low': message with low importance (for example irc join/part/quit)
+* 'message': message from a user
+* 'private': message in a private buffer
+* 'highlight': message with highlight
+
+Each buffer has a notify level, which is used to decide what messages will add
+buffer in hotlist.
+
+The default notify level can be set using option
+<<option_weechat.look.buffer_notify_default,weechat.look.buffer_notify_default>>,
+default is 'all'.
+
+[width="50%",cols="3m,10",options="header"]
+|========================================
+| Notify level | Level of messages added to hotlist
+| none         | (none)
+| highlight    | 'highlight' + 'private'
+| message      | 'highlight' + 'private' + 'message'
+| all          | 'highlight' + 'private' + 'message' + 'low'
+|========================================
+
+Notify level can be defined for a set of buffers, for example all buffers of
+irc server "freenode":
+
+----------------------------------------
+/set weechat.notify.irc.freenode message
+----------------------------------------
+
+Set notify level 'highlight' on channel "#weechat" only:
+
+----------------------------------------
+/set weechat.notify.irc.freenode.#weechat highlight
+----------------------------------------
+
+The notify level for a buffer can be set with command `/buffer`:
+
+----------------------------------------
+/buffer notify highlight
+----------------------------------------
+
 [[key_bindings]]
 Default key bindings
 ~~~~~~~~~~~~~~~~~~~~
@@ -481,6 +866,7 @@ Keys for command line
 | @k(A-)@k(d)         | Delete next word in command line (deleted string is copied to clipboard) | /input delete_next_word
 | @k(A-)@k(k)         | Grab a key and insert its code (and command bound if key exists) in command line | /input grab_key_command
 | @k(A-)@k(r)         | Delete entire command line | /input delete_line
+| @k(A-)@k(s)         | Toggle aspell | /mute aspell toggle
 |========================================

 [[key_bindings_buffers_windows]]
@@ -493,6 +879,7 @@ Keys for buffers / windows
 | @k(C-)@k(l)               | Redraw whole window | /window refresh
 | @k(C-)@k(s) , @k(C-)@k(u) | Set unread marker on all buffers | /input set_unread
 | @k(C-)@k(x)               | Switch current buffer if buffers are attached with same number | /input switch_active_buffer
+| @k(A-)@k(x)               | Zoom on merged buffer (@k(A-)@k(x) again: display all merged buffers) | /input zoom_merged_buffer
 | @k(PgUp)                  | Scroll up one page in buffer history | /window page_up
 | @k(PgDn)                  | Scroll down one page in buffer history | /window page_down
 | @k(A-)@k(PgUp)            | Scroll up a few lines in buffer history | /window scroll_up
@@ -595,29 +982,38 @@ These keys are used in context "mouse", namely when a mouse event occurs.

 [width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"]
 |========================================
-| Button  | Gesture      | Area     | Description | Command
-| ◾◽◽     | -            | chat     | Switch to window | /window ${_window_number}
-| ◾◽◽     | left         | chat     | Switch to previous buffer | /window ${_window_number};/buffer +1
-| ◾◽◽     | right        | chat     | Switch to next buffer | /window ${_window_number};/buffer +1
-| ◾◽◽     | left (long)  | chat     | Switch to first buffer | /window ${_window_number};/buffer 1
-| ◾◽◽     | right (long) | chat     | Switch to last buffer | /window ${_window_number};/input jump_last_buffer
-| wheel ⇑ | -            | chat     | Scroll up a few lines in buffer history | /window scroll_up -window ${_window_number}
-| wheel ⇓ | -            | chat     | Scroll down a few lines in buffer history | /window scroll_down -window ${_window_number}
-| ◾◽◽     | up           | nicklist | Scroll up one page in nicklist | /bar scroll nicklist ${_window_number} -100%
-| ◾◽◽     | down         | nicklist | Scroll down one page in nicklist | /bar scroll nicklist ${_window_number} +100%
-| ◾◽◽     | up (long)    | nicklist | Go to the beginning of nicklist | /bar scroll nicklist ${_window_number} b
-| ◾◽◽     | down (long)  | nicklist | Go to the end of nicklist | /bar scroll nicklist ${_window_number} e
-| ◾◽◽     | -            | nicklist | Open query with nick | /window ${_window_number};/query ${nick}
-| ◽◽◾     | -            | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick}
-| ◾◽◽     | left         | nicklist | Kick nick | /window ${_window_number};/kick ${nick}
-| ◾◽◽     | left (long)  | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick}
-| ◽◽◾     | left         | nicklist | Ban nick | /window ${_window_number};/ban ${nick}
-| ◽◽◾     | -            | input    | Grab a mouse event and insert its code in command line | /input grab_mouse_area
-| wheel ⇑ | -            | any bar  | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -20%
-| wheel ⇓ | -            | any bar  | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +20%
-| ◽◾◽     | -            | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y}
+| Button ^(1)^ | Gesture | Area | Description | Command
+| ◾◽◽     | -            | chat                 | Switch to window | /window ${_window_number}
+| ◾◽◽     | left         | chat                 | Switch to previous buffer | /window ${_window_number};/buffer +1
+| ◾◽◽     | right        | chat                 | Switch to next buffer | /window ${_window_number};/buffer +1
+| ◾◽◽     | left (long)  | chat                 | Switch to first buffer | /window ${_window_number};/buffer 1
+| ◾◽◽     | right (long) | chat                 | Switch to last buffer | /window ${_window_number};/input jump_last_buffer
+| ◾◽◽     | -            | chat (script buffer) | Select line in script buffer | /script go ${_chat_line_y}
+| ◽◽◾     | -            | chat (script buffer) | Install/remove script | /script go ${_chat_line_y};/script installremove -q ${script_name_with_extension}
+| ⇑       | -            | chat                 | Scroll up a few lines in buffer history | /window scroll_up -window ${_window_number}
+| ⇓       | -            | chat                 | Scroll down a few lines in buffer history | /window scroll_down -window ${_window_number}
+| ⇑       | -            | chat (script buffer) | Move 5 lines up in script buffer | /script up 5
+| ⇓       | -            | chat (script buffer) | Move 5 lines down in script buffer | /script down 5
+| @k(C-)⇑ | -            | chat                 | Scroll horizontally to the left | /window scroll_horiz -window ${_window_number} -10%
+| @k(C-)⇓ | -            | chat                 | Scroll horizontally to the right | /window scroll_horiz -window ${_window_number} +10%
+| ◾◽◽     | up           | nicklist             | Scroll up one page in nicklist | /bar scroll nicklist ${_window_number} -100%
+| ◾◽◽     | down         | nicklist             | Scroll down one page in nicklist | /bar scroll nicklist ${_window_number} +100%
+| ◾◽◽     | up (long)    | nicklist             | Go to the beginning of nicklist | /bar scroll nicklist ${_window_number} b
+| ◾◽◽     | down (long)  | nicklist             | Go to the end of nicklist | /bar scroll nicklist ${_window_number} e
+| ◾◽◽     | -            | nicklist             | Open query with nick | /window ${_window_number};/query ${nick}
+| ◽◽◾     | -            | nicklist             | Do a whois on nick | /window ${_window_number};/whois ${nick}
+| ◾◽◽     | left         | nicklist             | Kick nick | /window ${_window_number};/kick ${nick}
+| ◾◽◽     | left (long)  | nicklist             | Kick and ban nick | /window ${_window_number};/kickban ${nick}
+| ◽◽◾     | left         | nicklist             | Ban nick | /window ${_window_number};/ban ${nick}
+| ◽◽◾     | -            | input                | Grab a mouse event and insert its code in command line | /input grab_mouse_area
+| ⇑       | -            | any bar              | Scroll bar by -20% | /bar scroll ${_bar_name} ${_window_number} -20%
+| ⇓       | -            | any bar              | Scroll bar by +20% | /bar scroll ${_bar_name} ${_window_number} +20%
+| ◽◾◽     | -            | anywhere             | Start cursor mode at this point | /cursor go ${_x},${_y}
 |========================================

+[NOTE]
+^(1)^ "⇑" and "⇓" are wheel up and down.
+
 [[mouse]]
 Mouse support
 ~~~~~~~~~~~~~
@@ -648,9 +1044,9 @@ key @k(A-)@k(x) to disable mouse for 10 seconds:
 /key bind meta-x /mouse toggle 10
 ----------------------------------------

-When mouse is enabled in WeeChat, you can use "shift" modifier to select or
+When mouse is enabled in WeeChat, you can use @k(-S-) modifier to select or
 click in terminal, as if the mouse was disabled (on some terminals like iTerm,
-you have to use "alt" instead of "shift").
+you have to use @k(-A-) instead of @k(-S-)).

 [NOTE]
 For any problem with mouse, please look at 'WeeChat FAQ'.
@@ -706,11 +1102,22 @@ List of gestures (only for buttons, not wheel):
 | gesture-right-long | ≥ 40
 |========================================

+List of incomplete events (only for buttons, useful for plugins/scripts):
+
+[width="50%",cols="3m,4",options="header"]
+|========================================
+| Event      | Description
+| event-down | button was pressed but not released yet
+| event-drag | mouse was moved with button pressed down
+|========================================
+
 Example of events:

 * `button1`
 * `ctrl-button1`
 * `button1-gesture-right`
+* `button1-event-down`
+* `button1-event-drag`
 * `alt-button2-gesture-down-long`
 * `wheelup`
 * `ctrl-alt-wheeldown`
@@ -982,7 +1389,6 @@ WeeChat commands

 include::autogen/user/weechat_commands.txt[]

-
 [[plugins]]
 Plugins
 -------
@@ -1094,6 +1500,31 @@ For example, to enable option "ignore-case":
 /set aspell.option.ignore-case "true"
 ----------------------------------------

+[[aspell_suggestions]]
+Suggestions
+^^^^^^^^^^^
+
+Suggestions are displayed in a bar item called "aspell_suggest". The number of
+suggestions is set in option 'aspell.check.suggestions'.
+
+To enable suggestions you must set option 'aspell.check.suggestions' to an
+integer ≥ 0 and add the bar item "aspell_suggest" to a bar, like 'status'.
+
+Example of suggestions with english dictionary (`en`):
+
+........................................
+│[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune]                    │
+│[@Flashy] prinr █                                                                │
+└─────────────────────────────────────────────────────────────────────────────────┘
+........................................
+
+Example of suggestions with english and french dictionaries (`en,fr`):
+
+........................................
+│[12:55] [6] [irc/freenode] 3:#test(+n){4} [print,prone,prune/prime,primer,primé] │
+│[@Flashy] prinr █                                                                │
+└─────────────────────────────────────────────────────────────────────────────────┘
+........................................

 [[charset_plugin]]
 Charset plugin
@@ -1331,7 +1762,7 @@ First example: connect to oftc and check certificate
 * Import certificate in shell:

 ----------------------------------------
-$ mkdir ~/.weechat/ssl
+$ mkdir -p ~/.weechat/ssl
 $ wget -O ~/.weechat/ssl/CAs.pem http://www.spi-inc.org/ca/spi-cacert.crt
 ----------------------------------------

@@ -1350,8 +1781,9 @@ Second example: connect to oftc using CertFP
 * Create certificate in shell:

 ----------------------------------------
-$ openssl req -nodes -newkey rsa:2048 -keyout nick.key -x509 -days 365 -out nick.cer
-$ cat nick.cer nick.key > ~/.weechat/ssl/nick.pem
+$ mkdir -p ~/.weechat/ssl
+$ cd ~/.weechat/ssl
+$ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
 ----------------------------------------

 * In WeeChat, with "oftc" server already created:
@@ -1525,29 +1957,35 @@ when replying to CTCP:

 [width="100%",cols="^2l,4,8l",options="header"]
 |========================================
-| Code         | Description                 | Value/example
-| $clientinfo  | list of supported CTCP      | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
-| $version     | WeeChat version             | 0.3.0
-| $compilation | WeeChat compilation date    | Sep 13 2009
-| $osinfo      | info about OS               | Linux 2.6.31 / i686
-| $site        | WeeChat site                | http://www.weechat.org
-| $download    | WeeChat site, download page | http://www.weechat.org/download
-| $time        | current date/time           | Sun Sep 13 15:48:31 2009
-| $username    | user name on IRC server     | nick
-| $realname    | real name on IRC server     | My name
+| Code         | Description                   | Value/example
+| $clientinfo  | list of supported CTCP        | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
+| $version     | WeeChat version               | 0.4.0-dev
+| $versiongit  | WeeChat version + git version | 0.4.0-dev (git: v0.3.9-104-g7eb5cc4)
+| $git         | git version                   | v0.3.9-104-g7eb5cc4
+| $compilation | WeeChat compilation date      | Dec 16 2012
+| $osinfo      | info about OS                 | Linux 2.6.32-5-amd64 / x86_64
+| $site        | WeeChat site                  | http://www.weechat.org/
+| $download    | WeeChat site, download page   | http://www.weechat.org/download
+| $time        | current date/time             | Sun, 16 Dec 2012 10:40:48 +0100
+| $username    | user name on IRC server       | name
+| $realname    | real name on IRC server       | John Doe
 |========================================

+[NOTE]
+The git version is the output of command `git describe`. It is known only if
+WeeChat has been compiled inside the git repository and if git was installed.
+
 If CTCP options are not defined (by default), CTCP replies are:

 [width="100%",cols="^2,4l,8l",options="header"]
 |========================================
-| CTCP         | Reply format                    | Example
-| CLIENTINFO   | $clientinfo                     | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
-| FINGER       | WeeChat $version                | WeeChat 0.3.0
-| SOURCE       | $download                       | http://www.weechat.org/download
-| TIME         | $time                           | Sun Sep 13 15:48:31 2009
-| USERINFO     | $username ($realname)           | nick (My name)
-| VERSION      | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009)
+| CTCP       | Reply format                       | Example
+| CLIENTINFO | $clientinfo                        | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
+| FINGER     | WeeChat $versiongit                | WeeChat 0.4.0-dev (git: v0.3.9-104-g7eb5cc4)
+| SOURCE     | $download                          | http://www.weechat.org/download
+| TIME       | $time                              | Sun, 16 Dec 2012 10:40:48 +0100
+| USERINFO   | $username ($realname)              | name (John Doe)
+| VERSION    | WeeChat $versiongit ($compilation) | WeeChat 0.4.0-dev (git: v0.3.9-104-g7eb5cc4) (Dec 16 2012)
 |========================================

 [[irc_target_buffer]]
@@ -1643,6 +2081,8 @@ Non-comprehensive list of IRC messages or alias that you can customize:
 | 433     |               | nickname already in use
 | 438     |               | not authorized to change nickname
 | 671     | whois         | whois (secure connection)
+| 728     | quietlist     | quiet list
+| 729     | quietlist     | end of quiet list
 | 901     |               | you are now logged in
 |========================================

@@ -1882,6 +2322,38 @@ For example:
 Now you can connect on port 9000 with a remote interface (like QWeeChat),
 using password "mypass".

+[[relay_ssl]]
+Relay with SSL
+^^^^^^^^^^^^^^
+
+You can use SSL by creating a certificate and private key, and by using prefix
+"ssl." in the name of protocol.
+
+The default file for certificate/key is '~/.weechat/ssl/relay.pem'
+(option <<option_relay.network.ssl_cert_key,relay.network.ssl_cert_key>>).
+
+You can create a certificate and private key with following commands:
+
+----------------------------------------
+$ mkdir -p ~/.weechat/ssl
+$ cd ~/.weechat/ssl
+$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
+----------------------------------------
+
+If WeeChat is already running, you can reload the certificate and private key
+with command:
+
+----------------------------------------
+/relay sslcertkey
+----------------------------------------
+
+And then add relay with SSL, for example:
+
+----------------------------------------
+/relay add ssl.irc.freenode 8001
+/relay add ssl.weechat 9001
+----------------------------------------
+
 [[rmodifier_plugin]]
 Rmodifier plugin
 ~~~~~~~~~~~~~~~~
@@ -1950,10 +2422,24 @@ WeeChat provides 6 scripting plugins: Python, Perl, Ruby, Lua, Tcl and Guile
 (scheme).
 These plugins can load, execute and unload scripts for these languages.

+Another plugin called "script" is a scripts manager and is used to load/unload
+scripts of any language, and install/remove scripts of WeeChat scripts
+repository, which are visible at this URL: http://www.weechat.org/scripts
+
 For more information about how to write scripts, or WeeChat API for
 scripts, please read 'WeeChat Scripting Guide'.

-You can find some scripts for WeeChat here: http://www.weechat.org/scripts
+[[script_options]]
+Script options (script.conf)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+include::autogen/user/script_options.txt[]
+
+[[script_commands]]
+Script commands
+^^^^^^^^^^^^^^^
+
+include::autogen/user/script_commands.txt[]

 [[python_commands]]
 Python commands
@@ -2013,37 +2499,6 @@ Commands

 include::autogen/user/xfer_commands.txt[]

-
-[[authors]]
-Authors
-------
-
-[[developers]]
-Developers
-~~~~~~~~~~
-
-Main developer::
-    Sébastien Helleu (FlashCode)
-
-[[contributors]]
-Contributors
-~~~~~~~~~~~~
-
-Packagers::
-    Emmanuel Bouthenot (kolter), Julien Louis (ptitlouis), Odin
-
-Translations::
-    Jiri Golembiovsky (GolemJ), soltys, Nils Görs (nils_2), rettub,
-    Frank Zacharias, Pavel Shevchuk, Elián Hanisch (m4v), Voroskoi,
-    Marco Paolone, Ivan Sichmann Freitas, Lázaro A., Ryuunosuke Ayanokouzi,
-    Quico Noizeux
-
-Patches::
-    Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
-    JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
-    Quentin Glidic (SardemFF7), Simon Kuhnle, Mateusz Poszwa
-
-
 [[support]]
 Support
 -------
@@ -2056,7 +2511,6 @@ Ways to get support:

 * IRC: server 'irc.freenode.net', channels '#weechat' (english) and
  '#weechat-fr' (french)
-* WeeChat forum: http://forums.flashtux.org/
 * Mailing list:
 ** subscribe: http://mail.nongnu.org/mailman/listinfo/weechat-support
 ** send mail to weechat-support@nongnu.org
@@ -99,7 +99,7 @@ Por ejemplo, tenemos el nick por defecto (que se basa en su login) pero
 usted puedes sobreescribirlo para el servidor identificado como oftc
 de la siguiente manera:

-  /set irc.server.oftc.nicks "nick1,nick2,nick3,nick4,nick5"
+  /set irc.server.oftc.nicks "nick,nick2,nick3,nick4,nick5"

 También para configurar el nombre de usuario y el nombre real:

@@ -110,12 +110,22 @@ Para que el servidor se conecte cuando WeeChat inicie:

  /set irc.server.oftc.autoconnect on

-Para correr un comando después de establecer la conexión, por
-ejemplo, una identificación con el nickserv:
+// TRANSLATION MISSING
+If SASL is available on server, you can use it for authentication (you will be
+identified before you join channels):

-  /set irc.server.oftc.command "/msg nickserv identify xxxxxx"
+  /set irc.server_default.sasl_mechanism dh-blowfish
+  /set irc.server.oftc.sasl_username "nick"
+  /set irc.server.oftc.sasl_password "xxxxxxx"

-Nota: varios comandos pueden ser escritos separados por ';' (punto y coma)
+// TRANSLATION MISSING
+To run a command after connection to server, for example to authenticate
+with nickserv (only if you don't use SASL for authentication):
+
+  /set irc.server.oftc.command "/msg nickserv identify xxxxxxx"
+
+[NOTE]
+Varios comandos pueden ser escritos separados por ';' (punto y coma).

 Para unirse automáticamente a canales cuando el servidor se conecte:

@@ -164,7 +174,7 @@ join/part y canales IRC
 `/part [mensaje de partida]`::
    sale de un canal (mantiene el buffer abierto)

-`/close [mensaje de partida]`::
+`/close`::
    cierra un servidor o el buffer de un canal
     (`/close` es un alias de `/buffer close`)

@@ -240,20 +250,12 @@ Los plugins se cargan de manera automática cuando son encontrados por WeeChat
 (por favor, refierase a la documentación de WeeChat para ver como cargar/descargar
 plugins y scripts).

-Algunos plugins, permiten usar scripts en WeeChat (en muchos lenguajes
-como Perl, Python, Ruby, Lua y Tcl). Estos plugins deben ser cargados con
-el comando `/plugin` los mismos proveen comandos como `/perl`, usados
-para cargar scripts en este lenguaje.
+Muchos scripts externos (de contribuidores) están disponibles para WeeChat en:
+http://www.weechat.org/scripts

-Muchos plugins/scripts externos (de contribuidores) están disponibles
-para WeeChat en: http://www.weechat.org/scripts
-
-Una manera fácil de instalar scripts es usar un script llamado
-'weeget.py'
-
-. descarga y copia 'weeget.py' en ~/.weechat/python/autoload/
-. carga script: `/python autoload`
-. lista los scripts: `/weeget list` (ayuda: `/help weeget`)
+// TRANSLATION MISSING
+You can manage scripts in WeeChat with command `/script` (see `/help script`
+for more info).


 [[more_doc]]
@@ -56,6 +56,14 @@

 | ruby | ruby_script | liste des scripts

+| script | script_files | fichiers dans les répertoires de script
+
+| script | script_scripts | liste des scripts du repository
+
+| script | script_scripts_installed | liste des scripts installés (du repository)
+
+| script | script_tags | étiquettes des scripts dans le repository
+
 | tcl | tcl_script | liste des scripts

 | weechat | bars_names | noms des barres
@@ -1,6 +1,24 @@
-[width="100%",cols="^1,^2,5,5,5",options="header"]
+[width="100%",cols="^1,^2,5,5,5,5",options="header"]
 |========================================
-| Extension | Nom | Description | Variables | Listes
+| Extension | Nom | Description | Variables | Mise à jour autorisée | Listes
+
+| guile | guile_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "guile_script") +
+  'next_script' (pointer, hdata: "guile_script") |
+ |
+  'last_script' +
+  'scripts'

 | irc | irc_channel | canal irc |
  'type' (integer) +
@@ -19,22 +37,24 @@
  'pv_remote_nick_color' (string) +
  'hook_autorejoin' (pointer) +
  'nicks_count' (integer) +
-  'nicks' (pointer, hdata: 'irc_nick') +
-  'last_nick' (pointer, hdata: 'irc_nick') +
+  'nicks' (pointer, hdata: "irc_nick") +
+  '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') +
-  'buffer' (pointer, hdata: 'buffer') +
+  'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'prev_channel' (pointer, hdata: 'irc_channel') +
-  'next_channel' (pointer, hdata: 'irc_channel') |
+  'prev_channel' (pointer, hdata: "irc_channel") +
+  'next_channel' (pointer, hdata: "irc_channel") |
+ |
  -

 | irc | irc_channel_speaking | channel_speaking irc |
  'nick' (string) +
  'time_last_message' (time) +
-  'prev_nick' (pointer, hdata: 'irc_channel_speaking') +
-  'next_nick' (pointer, hdata: 'irc_channel_speaking') |
+  'prev_nick' (pointer, hdata: "irc_channel_speaking") +
+  'next_nick' (pointer, hdata: "irc_channel_speaking") |
+ |
  -

 | irc | irc_ignore | ignore irc |
@@ -43,8 +63,9 @@
  'regex_mask' (pointer) +
  'server' (string) +
  'channel' (string) +
-  'prev_ignore' (pointer, hdata: 'irc_ignore') +
-  'next_ignore' (pointer, hdata: 'irc_ignore') |
+  'prev_ignore' (pointer, hdata: "irc_ignore") +
+  'next_ignore' (pointer, hdata: "irc_ignore") |
+ |
  'irc_ignore_list' +
  'last_irc_ignore'

@@ -55,23 +76,25 @@
  'prefix' (string) +
  'away' (integer) +
  'color' (string) +
-  'prev_nick' (pointer, hdata: 'irc_nick') +
-  'next_nick' (pointer, hdata: 'irc_nick') |
+  'prev_nick' (pointer, hdata: "irc_nick") +
+  'next_nick' (pointer, hdata: "irc_nick") |
+ |
  -

 | irc | irc_notify | notify irc |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'nick' (string) +
  'check_away' (integer) +
  'is_on_server' (integer) +
  'away_message' (string) +
  'ison_received' (integer) +
-  'prev_notify' (pointer, hdata: 'irc_notify') +
-  'next_notify' (pointer, hdata: 'irc_notify') |
+  'prev_notify' (pointer, hdata: "irc_notify") +
+  'next_notify' (pointer, hdata: "irc_notify") |
+ |
  -

 | irc | irc_redirect | redirection irc |
-  'server' (pointer, hdata: 'irc_server') +
+  'server' (pointer, hdata: "irc_server") +
  'pattern' (string) +
  'signal' (string) +
  'count' (integer) +
@@ -89,8 +112,9 @@
  'cmd_filter' (hashtable) +
  'output' (string) +
  'output_size' (integer) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect') +
-  'next_redirect' (pointer, hdata: 'irc_redirect') |
+  'prev_redirect' (pointer, hdata: "irc_redirect") +
+  'next_redirect' (pointer, hdata: "irc_redirect") |
+ |
  -

 | irc | irc_redirect_pattern | modèle pour une redirection irc |
@@ -100,8 +124,9 @@
  'cmd_start' (string) +
  'cmd_stop' (string) +
  'cmd_extra' (string) +
-  'prev_redirect' (pointer, hdata: 'irc_redirect_pattern') +
-  'next_redirect' (pointer, hdata: 'irc_redirect_pattern') |
+  'prev_redirect' (pointer, hdata: "irc_redirect_pattern") +
+  'next_redirect' (pointer, hdata: "irc_redirect_pattern") |
+ |
  'irc_redirect_patterns' +
  'last_irc_redirect_pattern'

@@ -112,26 +137,30 @@
  'reloading_from_config' (integer) +
  'reloaded_from_config' (integer) +
  'addresses_count' (integer) +
-  'addresses_array' (pointer) +
-  'ports_array' (pointer) +
+  'addresses_array' (string, array_size: "addresses_count") +
+  'ports_array' (integer, array_size: "addresses_count") +
+  'retry_array' (integer, array_size: "addresses_count") +
  'index_current_address' (integer) +
  'current_address' (string) +
  'current_ip' (string) +
  'current_port' (integer) +
+  'current_retry' (integer) +
  'sock' (integer) +
-  'hook_connect' (pointer, hdata: 'hook') +
-  'hook_fd' (pointer, hdata: 'hook') +
-  'hook_timer_connection' (pointer, hdata: 'hook') +
-  'hook_timer_sasl' (pointer, hdata: 'hook') +
+  'hook_connect' (pointer, hdata: "hook") +
+  'hook_fd' (pointer, hdata: "hook") +
+  'hook_timer_connection' (pointer, hdata: "hook") +
+  'hook_timer_sasl' (pointer, hdata: "hook") +
  'is_connected' (integer) +
  'ssl_connected' (integer) +
+  'disconnected' (integer) +
  'gnutls_sess' (other) +
  'tls_cert' (other) +
  'tls_cert_key' (other) +
  'unterminated_message' (string) +
  'nicks_count' (integer) +
-  'nicks_array' (pointer) +
+  'nicks_array' (string, array_size: "nicks_count") +
  'nick_first_tried' (integer) +
+  'nick_alternate_number' (integer) +
  'nick' (string) +
  'nick_modes' (string) +
  'isupport' (string) +
@@ -158,50 +187,171 @@
  'last_away_check' (time) +
  'outqueue' (pointer) +
  'last_outqueue' (pointer) +
-  'redirects' (pointer, hdata: 'irc_redirect') +
-  'last_redirect' (pointer, hdata: 'irc_redirect') +
-  'notify_list' (pointer, hdata: 'irc_notify') +
-  'last_notify' (pointer, hdata: 'irc_notify') +
-  'manual_joins' (hashtable) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'redirects' (pointer, hdata: "irc_redirect") +
+  'last_redirect' (pointer, hdata: "irc_redirect") +
+  'notify_list' (pointer, hdata: "irc_notify") +
+  'last_notify' (pointer, hdata: "irc_notify") +
+  'join_manual' (hashtable) +
+  'join_channel_key' (hashtable) +
+  'join_noswitch' (hashtable) +
+  'buffer' (pointer, hdata: "buffer") +
  'buffer_as_string' (string) +
-  'channels' (pointer, hdata: 'irc_channel') +
-  'last_channel' (pointer, hdata: 'irc_channel') +
-  'prev_server' (pointer, hdata: 'irc_server') +
-  'next_server' (pointer, hdata: 'irc_server') |
+  'channels' (pointer, hdata: "irc_channel") +
+  'last_channel' (pointer, hdata: "irc_channel") +
+  'prev_server' (pointer, hdata: "irc_server") +
+  'next_server' (pointer, hdata: "irc_server") |
+ |
  'irc_servers' +
  'last_irc_server'

+| lua | lua_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "lua_script") +
+  'next_script' (pointer, hdata: "lua_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| perl | perl_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "perl_script") +
+  'next_script' (pointer, hdata: "perl_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| python | python_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "python_script") +
+  'next_script' (pointer, hdata: "python_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| ruby | ruby_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "ruby_script") +
+  'next_script' (pointer, hdata: "ruby_script") |
+ |
+  'last_script' +
+  'scripts'
+
+| script | script_script | scripts du repository |
+  'name' (string) +
+  'name_with_extension' (string) +
+  'language' (integer) +
+  'author' (string) +
+  'mail' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'tags' (string) +
+  'requirements' (string) +
+  'min_weechat' (string) +
+  'max_weechat' (string) +
+  'md5sum' (string) +
+  'url' (string) +
+  'popularity' (integer) +
+  'date_added' (time) +
+  'date_updated' (time) +
+  'status' (integer) +
+  'version_loaded' (string) +
+  'displayed' (integer) +
+  'install_order' (integer) +
+  'prev_script' (pointer, hdata: "script_script") +
+  'next_script' (pointer, hdata: "script_script") |
+ |
+  'last_script_repo' +
+  'scripts_repo'
+
+| tcl | tcl_script | liste des scripts |
+  'filename' (string) +
+  'interpreter' (pointer) +
+  'name' (string) +
+  'author' (string) +
+  'version' (string) +
+  'license' (string) +
+  'description' (string) +
+  'shutdown_func' (string) +
+  'charset' (string) +
+  'callbacks' (pointer) +
+  'unloading' (integer) +
+  'prev_script' (pointer, hdata: "tcl_script") +
+  'next_script' (pointer, hdata: "tcl_script") |
+ |
+  'last_script' +
+  'scripts'
+
 | weechat | bar | barre |
  'name' (string) +
  'options' (pointer) +
-  'conditions_count' (integer) +
-  'conditions_array' (pointer) +
  'items_count' (integer) +
  'items_subcount' (pointer) +
  'items_array' (pointer) +
  'items_prefix' (pointer) +
  'items_name' (pointer) +
  'items_suffix' (pointer) +
-  'bar_window' (pointer, hdata: 'bar_window') +
+  'bar_window' (pointer, hdata: "bar_window") +
  'bar_refresh_needed' (integer) +
-  'prev_bar' (pointer, hdata: 'bar') +
-  'next_bar' (pointer, hdata: 'bar') |
+  'prev_bar' (pointer, hdata: "bar") +
+  'next_bar' (pointer, hdata: "bar") |
+ |
  'gui_bars' +
  'last_gui_bar'

 | weechat | bar_item | objet de barre |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'build_callback' (pointer) +
  'build_callback_data' (pointer) +
-  'prev_item' (pointer, hdata: 'bar_item') +
-  'next_item' (pointer, hdata: 'bar_item') |
+  'prev_item' (pointer, hdata: "bar_item") +
+  'next_item' (pointer, hdata: "bar_item") |
+ |
  'gui_bar_items' +
  'last_gui_bar_item'

 | weechat | bar_window | fenêtre de barre |
-  'bar' (pointer, hdata: 'bar') +
+  'bar' (pointer, hdata: "bar") +
  'x' (integer) +
  'y' (integer) +
  'width' (integer) +
@@ -220,12 +370,13 @@
  'coords_count' (integer) +
  'coords' (pointer) +
  'gui_objects' (pointer) +
-  'prev_bar_window' (pointer, hdata: 'bar_window') +
-  'next_bar_window' (pointer, hdata: 'bar_window') |
+  'prev_bar_window' (pointer, hdata: "bar_window") +
+  'next_bar_window' (pointer, hdata: "bar_window") |
+ |
  -

 | weechat | buffer | tampon |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'plugin_name_for_upgrade' (string) +
  'number' (integer) +
  'layout_number' (integer) +
@@ -241,17 +392,19 @@
  'close_callback' (pointer) +
  'close_callback_data' (pointer) +
  'title' (string) +
-  'own_lines' (pointer, hdata: 'lines') +
-  'mixed_lines' (pointer, hdata: 'lines') +
-  'lines' (pointer, hdata: 'lines') +
+  'own_lines' (pointer, hdata: "lines") +
+  'mixed_lines' (pointer, hdata: "lines") +
+  'lines' (pointer, hdata: "lines") +
  'time_for_each_line' (integer) +
  'chat_refresh_needed' (integer) +
  'nicklist' (integer) +
  'nicklist_case_sensitive' (integer) +
-  'nicklist_root' (pointer, hdata: 'nick_group') +
+  'nicklist_root' (pointer, hdata: "nick_group") +
  'nicklist_max_length' (integer) +
  'nicklist_display_groups' (integer) +
  'nicklist_visible_count' (integer) +
+  'nickcmp_callback' (pointer) +
+  'nickcmp_callback_data' (pointer) +
  'input' (integer) +
  'input_callback' (pointer) +
  'input_callback_data' (pointer) +
@@ -262,15 +415,15 @@
  'input_buffer_length' (integer) +
  'input_buffer_pos' (integer) +
  'input_buffer_1st_display' (integer) +
-  'input_undo_snap' (pointer, hdata: 'input_undo') +
-  'input_undo' (pointer, hdata: 'input_undo') +
-  'last_input_undo' (pointer, hdata: 'input_undo') +
-  'ptr_input_undo' (pointer, hdata: 'input_undo') +
+  'input_undo_snap' (pointer, hdata: "input_undo") +
+  'input_undo' (pointer, hdata: "input_undo") +
+  'last_input_undo' (pointer, hdata: "input_undo") +
+  'ptr_input_undo' (pointer, hdata: "input_undo") +
  'input_undo_count' (integer) +
-  'completion' (pointer, hdata: 'completion') +
-  'history' (pointer, hdata: 'history') +
-  'last_history' (pointer, hdata: 'history') +
-  'ptr_history' (pointer, hdata: 'history') +
+  'completion' (pointer, hdata: "completion") +
+  'history' (pointer, hdata: "history") +
+  'last_history' (pointer, hdata: "history") +
+  'ptr_history' (pointer, hdata: "history") +
  'num_history' (integer) +
  'text_search' (integer) +
  'text_search_exact' (integer) +
@@ -281,20 +434,21 @@
  'highlight_regex_compiled' (pointer) +
  'highlight_tags' (string) +
  'highlight_tags_count' (integer) +
-  'highlight_tags_array' (pointer) +
+  'highlight_tags_array' (string, array_size: "highlight_tags_count") +
  'hotlist_max_level_nicks' (hashtable) +
-  'keys' (pointer, hdata: 'key') +
-  'last_key' (pointer, hdata: 'key') +
+  'keys' (pointer, hdata: "key") +
+  'last_key' (pointer, hdata: "key") +
  'keys_count' (integer) +
  'local_variables' (hashtable) +
-  'prev_buffer' (pointer, hdata: 'buffer') +
-  'next_buffer' (pointer, hdata: 'buffer') |
+  'prev_buffer' (pointer, hdata: "buffer") +
+  'next_buffer' (pointer, hdata: "buffer") |
+ |
  'gui_buffer_last_displayed' +
  'gui_buffers' +
  'last_gui_buffer'

 | weechat | completion | structure avec une complétion |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'context' (integer) +
  'base_command' (string) +
  'base_command_arg_index' (integer) +
@@ -311,38 +465,41 @@
  'position_replace' (integer) +
  'diff_size' (integer) +
  'diff_length' (integer) +
-  'partial_completion_list' (pointer, hdata: 'completion_partial') +
-  'last_partial_completion' (pointer, hdata: 'completion_partial') |
+  'partial_completion_list' (pointer, hdata: "completion_partial") +
+  'last_partial_completion' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | completion_partial | structure avec une complétion partielle |
  'word' (string) +
  'count' (integer) +
-  'prev_item' (pointer, hdata: 'completion_partial') +
-  'next_item' (pointer, hdata: 'completion_partial') |
+  'prev_item' (pointer, hdata: "completion_partial") +
+  'next_item' (pointer, hdata: "completion_partial") |
+ |
  -

 | weechat | config_file | fichier de configuration |
-  'plugin' (pointer, hdata: 'plugin') +
+  'plugin' (pointer, hdata: "plugin") +
  'name' (string) +
  'filename' (string) +
  'file' (pointer) +
  'callback_reload' (pointer) +
  'callback_reload_data' (pointer) +
-  'sections' (pointer, hdata: 'config_section') +
-  'last_section' (pointer, hdata: 'config_section') +
-  'prev_config' (pointer, hdata: 'config_file') +
-  'next_config' (pointer, hdata: 'config_file') |
+  'sections' (pointer, hdata: "config_section") +
+  'last_section' (pointer, hdata: "config_section") +
+  'prev_config' (pointer, hdata: "config_file") +
+  'next_config' (pointer, hdata: "config_file") |
+ |
  'config_files' +
  'last_config_file'

 | weechat | config_option | option de configuration |
-  'config_file' (pointer, hdata: 'config_file') +
-  'section' (pointer, hdata: 'config_section') +
+  'config_file' (pointer, hdata: "config_file") +
+  'section' (pointer, hdata: "config_section") +
  'name' (string) +
  'type' (integer) +
  'description' (string) +
-  'string_values' (pointer) +
+  'string_values' (string, array_size: "*") +
  'min' (integer) +
  'max' (integer) +
  'default_value' (pointer) +
@@ -355,12 +512,13 @@
  'callback_delete' (pointer) +
  'callback_delete_data' (pointer) +
  'loaded' (integer) +
-  'prev_option' (pointer, hdata: 'config_option') +
-  'next_option' (pointer, hdata: 'config_option') |
+  'prev_option' (pointer, hdata: "config_option") +
+  'next_option' (pointer, hdata: "config_option") |
+ |
  -

 | weechat | config_section | section de configuration |
-  'config_file' (pointer, hdata: 'config_file') +
+  'config_file' (pointer, hdata: "config_file") +
  'name' (string) +
  'user_can_add_options' (integer) +
  'user_can_delete_options' (integer) +
@@ -374,10 +532,11 @@
  'callback_create_option_data' (pointer) +
  'callback_delete_option' (pointer) +
  'callback_delete_option_data' (pointer) +
-  'options' (pointer, hdata: 'config_option') +
-  'last_option' (pointer, hdata: 'config_option') +
-  'prev_section' (pointer, hdata: 'config_section') +
-  'next_section' (pointer, hdata: 'config_section') |
+  'options' (pointer, hdata: "config_option") +
+  'last_option' (pointer, hdata: "config_option") +
+  'prev_section' (pointer, hdata: "config_section") +
+  'next_section' (pointer, hdata: "config_section") |
+ |
  -

 | weechat | filter | filtre |
@@ -388,26 +547,43 @@
  'buffers' (pointer) +
  'tags' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'regex' (string) +
  'regex_prefix' (pointer) +
  'regex_message' (pointer) +
-  'prev_filter' (pointer, hdata: 'filter') +
-  'next_filter' (pointer, hdata: 'filter') |
+  'prev_filter' (pointer, hdata: "filter") +
+  'next_filter' (pointer, hdata: "filter") |
+ |
  'gui_filters' +
  'last_gui_filter'

 | weechat | history | historique des commandes dans le tampon |
  'text' (string) +
-  'next_history' (pointer, hdata: 'history') +
-  'prev_history' (pointer, hdata: 'history') |
-  -
+  'next_history' (pointer, hdata: "history") +
+  'prev_history' (pointer, hdata: "history") |
+  `__create` +
+  `__delete` |
+  'gui_history' +
+  'last_gui_history'
+
+| weechat | hotlist | hotlist |
+  'priority' (integer) +
+  'creation_time.tv_sec' (time) +
+  'creation_time.tv_usec' (long) +
+  'buffer' (pointer) +
+  'count' (integer, array_size: "4") +
+  'prev_hotlist' (pointer, hdata: "hotlist") +
+  'next_hotlist' (pointer, hdata: "hotlist") |
+ |
+  'gui_hotlist' +
+  'last_gui_hotlist'

 | weechat | input_undo | structure avec le "undo" pour la ligne de commande |
  'data' (string) +
  'pos' (integer) +
-  'prev_undo' (pointer, hdata: 'input_undo') +
-  'next_undo' (pointer, hdata: 'input_undo') |
+  'prev_undo' (pointer, hdata: "input_undo") +
+  'next_undo' (pointer, hdata: "input_undo") |
+ |
  -

 | weechat | key | une touche (un raccourci clavier) |
@@ -417,8 +593,9 @@
  'area_key' (string) +
  'command' (string) +
  'score' (integer) +
-  'prev_key' (pointer, hdata: 'key') +
-  'next_key' (pointer, hdata: 'key') |
+  'prev_key' (pointer, hdata: "key") +
+  'next_key' (pointer, hdata: "key") |
+ |
  'gui_default_keys' +
  'gui_default_keys_cursor' +
  'gui_default_keys_mouse' +
@@ -437,47 +614,55 @@
  'last_gui_key_search'

 | weechat | line | structure avec une ligne |
-  'data' (pointer, hdata: 'line_data') +
-  'prev_line' (pointer, hdata: 'line') +
-  'next_line' (pointer, hdata: 'line') |
+  'data' (pointer, hdata: "line_data") +
+  'prev_line' (pointer, hdata: "line") +
+  'next_line' (pointer, hdata: "line") |
+ |
  -

 | weechat | line_data | structure avec les données d'une ligne |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'y' (integer) +
  'date' (time) +
  'date_printed' (time) +
  'str_time' (string) +
  'tags_count' (integer) +
-  'tags_array' (pointer) +
+  'tags_array' (string, array_size: "tags_count") +
  'displayed' (char) +
  'highlight' (char) +
  'refresh_needed' (char) +
  'prefix' (string) +
  'prefix_length' (integer) +
  'message' (string) |
+  'date' (time) +
+  'date_printed' (time) +
+  'tags_array' (string) +
+  'prefix' (string) +
+  'message' (string) |
  -

 | weechat | lines | structure avec des lignes |
-  'first_line' (pointer, hdata: 'line') +
-  'last_line' (pointer, hdata: 'line') +
-  'last_read_line' (pointer, hdata: 'line') +
+  'first_line' (pointer, hdata: "line") +
+  'last_line' (pointer, hdata: "line") +
+  'last_read_line' (pointer, hdata: "line") +
  'lines_count' (integer) +
  'first_line_not_read' (integer) +
  'lines_hidden' (integer) +
  'buffer_max_length' (integer) +
  'prefix_max_length' (integer) |
+ |
  -

 | weechat | nick | pseudo dans la liste de pseudos |
-  'group' (pointer, hdata: 'nick_group') +
+  'group' (pointer, hdata: "nick_group") +
  'name' (string) +
  'color' (string) +
  'prefix' (string) +
  'prefix_color' (string) +
  'visible' (integer) +
-  'prev_nick' (pointer, hdata: 'nick') +
-  'next_nick' (pointer, hdata: 'nick') |
+  'prev_nick' (pointer, hdata: "nick") +
+  'next_nick' (pointer, hdata: "nick") |
+ |
  -

 | weechat | nick_group | groupe dans la liste de pseudos |
@@ -485,13 +670,14 @@
  'color' (string) +
  'visible' (integer) +
  'level' (integer) +
-  'parent' (pointer, hdata: 'nick_group') +
-  'children' (pointer, hdata: 'nick_group') +
-  'last_child' (pointer, hdata: 'nick_group') +
-  'nicks' (pointer, hdata: 'nick') +
-  'last_nick' (pointer, hdata: 'nick') +
-  'prev_group' (pointer, hdata: 'nick_group') +
-  'next_group' (pointer, hdata: 'nick_group') |
+  'parent' (pointer, hdata: "nick_group") +
+  'children' (pointer, hdata: "nick_group") +
+  'last_child' (pointer, hdata: "nick_group") +
+  'nicks' (pointer, hdata: "nick") +
+  'last_nick' (pointer, hdata: "nick") +
+  'prev_group' (pointer, hdata: "nick_group") +
+  'next_group' (pointer, hdata: "nick_group") |
+ |
  -

 | weechat | plugin | extension |
@@ -504,8 +690,9 @@
  'license' (string) +
  'charset' (string) +
  'debug' (integer) +
-  'prev_plugin' (pointer, hdata: 'plugin') +
-  'next_plugin' (pointer, hdata: 'plugin') |
+  'prev_plugin' (pointer, hdata: "plugin") +
+  'next_plugin' (pointer, hdata: "plugin") |
+ |
  'last_weechat_plugin' +
  'weechat_plugins'

@@ -523,41 +710,44 @@
  'win_chat_height' (integer) +
  'win_chat_cursor_x' (integer) +
  'win_chat_cursor_y' (integer) +
-  'bar_windows' (pointer, hdata: 'bar_window') +
-  'last_bar_window' (pointer, hdata: 'bar_window') +
+  'bar_windows' (pointer, hdata: "bar_window") +
+  'last_bar_window' (pointer, hdata: "bar_window") +
  'refresh_needed' (integer) +
  'gui_objects' (pointer) +
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'layout_plugin_name' (string) +
  'layout_buffer_name' (string) +
-  'scroll' (pointer, hdata: 'window_scroll') +
-  'ptr_tree' (pointer, hdata: 'window_tree') +
-  'prev_window' (pointer, hdata: 'window') +
-  'next_window' (pointer, hdata: 'window') |
+  'scroll' (pointer, hdata: "window_scroll") +
+  'ptr_tree' (pointer, hdata: "window_tree") +
+  'prev_window' (pointer, hdata: "window") +
+  'next_window' (pointer, hdata: "window") |
+ |
  'gui_current_window' +
  'gui_windows' +
  'last_gui_window'

 | weechat | window_scroll | info de défilement dans la fenêtre |
-  'buffer' (pointer, hdata: 'buffer') +
+  'buffer' (pointer, hdata: "buffer") +
  'first_line_displayed' (integer) +
-  'start_line' (pointer, hdata: 'line') +
+  'start_line' (pointer, hdata: "line") +
  'start_line_pos' (integer) +
  'scrolling' (integer) +
  'start_col' (integer) +
  'lines_after' (integer) +
  'reset_allowed' (integer) +
-  'prev_scroll' (pointer, hdata: 'window_scroll') +
-  'next_scroll' (pointer, hdata: 'window_scroll') |
+  'prev_scroll' (pointer, hdata: "window_scroll") +
+  'next_scroll' (pointer, hdata: "window_scroll") |
+ |
  -

 | weechat | window_tree | arbre des fenêtres |
-  'parent_node' (pointer, hdata: 'window_tree') +
+  'parent_node' (pointer, hdata: "window_tree") +
  'split_pct' (integer) +
  'split_horizontal' (integer) +
-  'child1' (pointer, hdata: 'window_tree') +
-  'child2' (pointer, hdata: 'window_tree') +
-  'window' (pointer, hdata: 'window') |
+  'child1' (pointer, hdata: "window_tree") +
+  'child2' (pointer, hdata: "window_tree") +
+  'window' (pointer, hdata: "window") |
+ |
  'gui_windows_tree'

 |========================================
@@ -30,6 +30,8 @@

 | ruby | ruby_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)

+| script | script_script | liste des scripts | pointeur vers le script (optionnel) | nom du script avec extension (peut démarrer ou se terminer par "*" comme joker) (optionnel)
+
 | tcl | tcl_script | liste des scripts | pointeur vers le script (optionnel) | nom de script (peut démarrer ou se terminer par "*" comme joker) (optionnel)

 | weechat | bar | liste des barres | pointeur vers la barre (optionnel) | nom de barre (peut démarrer ou se terminer par "*" comme joker) (optionnel)
@@ -38,8 +38,12 @@

 | weechat | inactivity | inactivité du clavier (secondes) | -

+| weechat | locale | locale utilisée pour la traduction des messages | -
+
 | weechat | version | version de WeeChat | -

+| weechat | version_git | version git de WeeChat (sortie de la commande "git describe" pour une version de développement seulement, vide pour une version stable) | -
+
 | weechat | version_number | version de WeeChat (sous forme de nombre) | -

 | weechat | weechat_dir | répertoire de WeeChat | -
@@ -2,7 +2,7 @@
 |========================================
 | Extension | Nom | Description | Hashtable (entrée) | Hashtable (sortie)

-| irc | irc_message_parse | analyse un message IRC | "message": message IRC, "server": nom du serveur (optionnel) | "nick": pseudo, "host": nom d'hôte, "command": commande, "channel": canal, "arguments": paramètres (inclut le canal)
+| irc | irc_message_parse | analyse un message IRC | "message": message IRC, "server": nom du serveur (optionnel) | "tags": étiquettes, "message_without_tags": message sans les étiquettes, "nick": pseudo, "host": nom d'hôte, "command": commande, "channel": canal, "arguments": paramètres (inclut le canal)

 | irc | irc_message_split | découper un message IRC (pour tenir dans les 512 octets) | "message": message IRC, "server": nom du serveur (optionnel) | "msg1" ... "msgN": messages à envoyer (sans le "\r\n" final), "args1" ... "argsN": paramètres des messages, "count": nombre de messages

@@ -1,19 +1,26 @@
 [[command_aspell_aspell]]
 [command]*`aspell`* configuration de l'extension aspell::
 ........................................
-/aspell  dictlist
-         enable <langue>
-         disable
+/aspell  enable|disable|toggle
+         listdict
+         setdict <langue>
+         deldict
         addword [<langue>] <mot>

-dictlist: afficher les dictionnaires installés
-  enable: activer aspell sur le tampon courant
- disable: désactiver aspell sur le tampon courant
+  enable: activer aspell
+ disable: désactiver aspell
+  toggle: activer/désactiver aspell
+listdict: afficher les dictionnaires installés
+ setdict: définir le dictionnaire pour le tampon courant
+ deldict: supprimer le dictionnaire utilisé sur le tampon courant
 addword: ajouter un mot dans le dictionnaire personnel aspell

 Les lignes d'entrée commençant par '/' ne sont pas vérifiées, sauf pour certaines commandes (voir /set aspell.check.commands).

 Pour activer aspell sur tous les tampons, utilisez l'option "default_dict", par exemple :
  /set aspell.check.default_dict "en"
+  /aspell enable
+
+La touche par défaut pour activer/désactiver aspell est alt-s.
 ........................................

@@ -13,11 +13,21 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** description: `activer la vérification aspell pour la ligne de commande`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `off`)
+
 * [[option_aspell.check.real_time]] *aspell.check.real_time*
 ** description: `vérification orthographique des mots en temps réel (plus lent, désactivé par défaut: les mots sont vérifiés seulement s'il y a un délimiteur après)`
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** description: `nombre de suggestions à afficher dans l'objet de barre "aspell_suggest" pour chaque dictionnaire du tampon (-1 = désactiver les suggestions, 0 = afficher toutes les suggestions possibles dans toutes les langues)`
+** type: entier
+** valeurs: -1 .. 2147483647 (valeur par défaut: `-1`)
+
 * [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
 ** description: `longueur minimum d'un mot pour que l'otrhographe soit vérifiée (utilisez 0 pour vérifier tous les mots)`
 ** type: entier
@@ -1,10 +1,10 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** description: `charset de décodage global`
+** description: `charset de décodage global: charset utilisé pour décoder les messages entrants (si le décodage échoue, par défaut UTF-8 sera utilisé car c'est le charset interne de WeeChat)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"iso-8859-1"`)

 * [[option_charset.default.encode]] *charset.default.encode*
-** description: `charset d'encodage global`
+** description: `charset d'encodage global: charset utilisé pour encoder les messages sortants (si vide, le défaut est UTF-8 car c'est le charset interne de WeeChat)`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)

@@ -2,9 +2,9 @@
 [command]*`guile`* lister/charger/décharger des scripts::
 ........................................
 /guile  list|listfull [<nom>]
-        load <fichier>
+        load [-q] <fichier>
        autoload
-        reload|unload [<nom>]
+        reload|unload [-q] [<nom>]

    list: lister les scripts chargés
 listfull: lister les scripts chargés (verbeux)
@@ -14,6 +14,7 @@ autoload: charger tous les scripts dans le répertoire "autoload"
  unload: décharger un script (si pas de nom donné, décharger tous les scripts)
 fichier: script (fichier) à charger
     nom: nom de script (nom utilisé dans l'appel à la fonction "register")
+      -q: mode silencieux: ne pas afficher de messages

 Sans paramètre, cette commande liste les scripts chargés.
 ........................................
@@ -56,7 +56,7 @@ Sans paramètre, cette commande affiche la liste des bans pour le canal courant.
 [command]*`connect`* se connecter à un/plusieurs serveur(s) IRC::
 ........................................
 /connect  [<serveur> [<serveur>...] [-<option>[=<valeur>]] [-no<option>] [-nojoin] [-switch]
-          -all|-open [-nojoin] [-switch]
+          -all|-auto|-open [-nojoin] [-switch]

 serveur: nom du serveur, qui peut être :
          - nom interne de serveur (créé par /server add, usage recommandé)
@@ -65,6 +65,7 @@ Sans paramètre, cette commande affiche la liste des bans pour le canal courant.
  option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
 nooption: définir l'option booléenne à 'off' (par exemple: -nossl)
    -all: se connecter à tous les serveurs définis dans la configuration
+   -auto: se connecter aux serveurs qui ont "autoconnect" activé
   -open: se connecter à tous les serveurs ouverts qui ne sont pas actuellement connectés
 -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
 -switch: basculer vers l'adresse suivante du serveur
@@ -212,16 +213,18 @@ pseudo: pseudo
 [[command_irc_join]]
 [command]*`join`* rejoindre un canal::
 ........................................
-/join  [-server <serveur>] [<canal1>[,<canal2>...]] [<clé1>[,<clé2>...]]
+/join  [-noswitch] [-server <serveur>] [<canal1>[,<canal2>...]] [<clé1>[,<clé2>...]]

-serveur: envoyer à ce serveur (nom interne)
-  canal: nom du canal à rejoindre
-    clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les premiers dans la liste)
+-noswitch: ne pas basculer sur le nouveau tampon
+  serveur: envoyer à ce serveur (nom interne)
+    canal: nom du canal à rejoindre
+      clé: clé pour rejoindre le canal (les canaux avec une clé doivent être les premiers dans la liste)

 Exemples:
  /join #weechat
  /join #protectedchan,#weechat key
  /join -server freenode #weechat
+  /join -noswitch #weechat
 ........................................

 [[command_irc_kick]]
@@ -465,6 +468,17 @@ serveur: envoyer à ce serveur (nom interne)
  texte: texte à envoyer
 ........................................

+[[command_irc_quiet]]
+[command]*`quiet`* faire taire des pseudos ou hôtes::
+........................................
+/quiet  [<canal>] [<pseudo> [<pseudo>...]]
+
+ canal: nom du canal pour faire taire
+pseudo: pseudo ou hôte à faire taire
+
+Sans paramètre, cette commande affiche la liste des "quiet" pour le canal courant.
+........................................
+
 [[command_irc_quote]]
 [command]*`quote`* envoyer des données brutes au serveur sans analyse::
 ........................................
@@ -734,10 +748,14 @@ masque: information qui correspond à ce masque uniquement
 [[command_irc_whois]]
 [command]*`whois`* demander les informations sur le(s) utilisateur(s)::
 ........................................
-/whois  [<serveur>] <pseudo>[,<pseudo>...]
+/whois  [<serveur>] [<pseudo>[,<pseudo>...]]

-serveur: nom du serveur
+serveur: nom de serveur
 pseudo: pseudo (peut être un masque)
+
+Sans paramètre, cette commande effectuera un whois sur :
+- votre propre pseudo si le tampon est un serveur/canal
+- le pseudo distant si le tampon est un privé.
 ........................................

 [[command_irc_whowas]]
@@ -103,8 +103,13 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)

+* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
+** description: `format de date/heure utilisé pour la réponse au message CTCP TIME (voir man strftime pour le format de date/heure)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"%a, %d %b %Y %T %z"`)
+
 * [[option_irc.look.display_away]] *irc.look.display_away*
-** description: `affiche un message pour l'absence/le retour`
+** description: `afficher un message pour l'absence/retour (off: ne rien afficher/envoyer, local: afficher en local, channel: envoyer l'action aux canaux)`
 ** type: entier
 ** valeurs: off, local, channel (valeur par défaut: `local`)

@@ -183,13 +188,8 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)

-* [[option_irc.look.item_channel_modes]] *irc.look.item_channel_modes*
-** description: `affiche les modes du canal dans l'objet de barre "buffer_name"`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
-
 * [[option_irc.look.item_channel_modes_hide_key]] *irc.look.item_channel_modes_hide_key*
-** description: `cacher la clé du canal si les modes sont affichés dans l'objet de barre "buffer_name" (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal)`
+** description: `cacher la clé du canal (cela cachera tous les paramètres des modes du canal si le mode +k est défini sur le canal)`
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

@@ -234,10 +234,20 @@
 ** valeurs: toute chaîne (valeur par défaut: `"_|["`)

 * [[option_irc.look.nick_completion_smart]] *irc.look.nick_completion_smart*
-** description: `complétion intelligente pour les pseudos (complète d'abord avec les personnes qui ont parlé récemment)`
+** description: `complétion intelligente pour les pseudos (complète d'abord avec les personnes qui ont parlé récemment): speakers = tous ceux qui ont parlé (incluant les highlights), speakers_highlights = seulement ceux qui ont parlé avec un highlight`
 ** type: entier
 ** valeurs: off, speakers, speakers_highlights (valeur par défaut: `speakers`)

+* [[option_irc.look.nick_mode]] *irc.look.nick_mode*
+** description: `afficher le mode du pseudo (op, voice, ...) avant le pseudo (none = jamais, prefix = dans le préfixe seulement, action = dans les messages d'action seulement, both = préfixe + messages d'actions)`
+** type: entier
+** valeurs: none, prefix, action, both (valeur par défaut: `prefix`)
+
+* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty*
+** description: `afficher un espace si le mode du pseudo est activé mais que le pseudo n'a pas de mode (pas op, voice, ...)`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `off`)
+
 * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix*
 ** description: `texte à afficher avant le pseudo dans la fenêtre de discussion`
 ** type: chaîne
@@ -308,6 +318,11 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

+* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick*
+** description: `obtenir un pseudo alternatif lorsque le pseudo est déjà utilisé sur le serveur: ajouter des "_" jusqu'à ce que le pseudo ait une longeur de 9, puis remplacer le dernier caractère (ou les deux derniers) par un nombre de 1 à 99, jusqu'à trouver un pseudo non utilisé sur le serveur`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
 * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing*
 ** description: `facteur de croissance du délai d'autoreconnection au serveur (1 = toujours le même délai, 2 = délai*2 pour chaque tentative, etc...)`
 ** type: entier
@@ -363,6 +378,11 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

+* [[option_irc.network.whois_double_nick]] *irc.network.whois_double_nick*
+** description: `doubler le pseudo dans la commande /whois (si un seul pseudo est donné), pour avoir le temps d'inactivité; par exemple: "/whois pseudo" enverra "whois pseudo pseudo"`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
 * [[option_irc.server_default.addresses]] *irc.server_default.addresses*
 ** description: `liste de nom/port ou IP/port pour le serveur (séparés par des virgules)`
 ** type: chaîne
@@ -399,7 +419,7 @@
 ** valeurs: 1 .. 65535 (valeur par défaut: `10`)

 * [[option_irc.server_default.autorejoin]] *irc.server_default.autorejoin*
-** description: `rejoindre automatiquement les canaux après un "kick"`
+** description: `rejoindre automatiquement les canaux après un "kick"; vous pouvez définir une variable locale de tampon sur un canal pour remplacer cette valeur (nom de la variable: "autorejoin", valeur: "on" ou "off")`
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `off`)

@@ -449,9 +469,9 @@
 ** valeurs: toute chaîne (valeur par défaut: `"WeeChat %v"`)

 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
-** description: `utiliser le protocole IPv6 pour la communication avec le serveur`
+** description: `utiliser le protocole IPv6 pour la communication avec le serveur (essayer IPv6 puis repli sur l'IPv4); si désactivé, seulemenent l'IPv4 est utilisé`
 ** type: booléen
-** valeurs: on, off (valeur par défaut: `off`)
+** valeurs: on, off (valeur par défaut: `on`)

 * [[option_irc.server_default.local_hostname]] *irc.server_default.local_hostname*
 ** description: `nom local de machine/IP personnalisé pour le serveur (optionnel, si non renseigné, le nom de machine local est utilisé)`
@@ -509,7 +529,7 @@
 ** valeurs: on, off (valeur par défaut: `off`)

 * [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** description: `fichier de certificat ssl utilisé pour identifier automatiquement votre pseudo ("%h" sera remplacé par le répertoire de base WeeChat, par défaut: "~/.weechat")`
+** description: `fichier de certificat SSL utilisé pour identifier automatiquement votre pseudo ("%h" sera remplacé par le répertoire de base WeeChat, par défaut: "~/.weechat")`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)

@@ -524,7 +544,7 @@
 ** valeurs: toute chaîne (valeur par défaut: `"NORMAL"`)

 * [[option_irc.server_default.ssl_verify]] *irc.server_default.ssl_verify*
-** description: `vérifier que la connexion ssl est entièrement de confiance`
+** description: `vérifier que la connexion SSL est entièrement de confiance`
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)

@@ -2,9 +2,9 @@
 [command]*`lua`* lister/charger/décharger des scripts::
 ........................................
 /lua  list|listfull [<nom>]
-      load <fichier>
+      load [-q] <fichier>
      autoload
-      reload|unload [<nom>]
+      reload|unload [-q] [<nom>]

    list: lister les scripts chargés
 listfull: lister les scripts chargés (verbeux)
@@ -14,6 +14,7 @@ autoload: charger tous les scripts dans le répertoire "autoload"
  unload: décharger un script (si pas de nom donné, décharger tous les scripts)
 fichier: script (fichier) à charger
     nom: nom de script (nom utilisé dans l'appel à la fonction "register")
+      -q: mode silencieux: ne pas afficher de messages

 Sans paramètre, cette commande liste les scripts chargés.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`perl`* lister/charger/décharger des scripts::
 ........................................
 /perl  list|listfull [<nom>]
-       load <fichier>
+       load [-q] <fichier>
       autoload
-       reload|unload [<nom>]
+       reload|unload [-q] [<nom>]

    list: lister les scripts chargés
 listfull: lister les scripts chargés (verbeux)
@@ -14,6 +14,7 @@ autoload: charger tous les scripts dans le répertoire "autoload"
  unload: décharger un script (si pas de nom donné, décharger tous les scripts)
 fichier: script (fichier) à charger
     nom: nom de script (nom utilisé dans l'appel à la fonction "register")
+      -q: mode silencieux: ne pas afficher de messages

 Sans paramètre, cette commande liste les scripts chargés.
 ........................................
@@ -2,9 +2,9 @@
 [command]*`python`* lister/charger/décharger des scripts::
 ........................................
 /python  list|listfull [<nom>]
-         load <fichier>
+         load [-q] <fichier>
         autoload
-         reload|unload [<nom>]
+         reload|unload [-q] [<nom>]

    list: lister les scripts chargés
 listfull: lister les scripts chargés (verbeux)
@@ -14,6 +14,7 @@ autoload: charger tous les scripts dans le répertoire "autoload"
  unload: décharger un script (si pas de nom donné, décharger tous les scripts)
 fichier: script (fichier) à charger
     nom: nom de script (nom utilisé dans l'appel à la fonction "register")
+      -q: mode silencieux: ne pas afficher de messages

 Sans paramètre, cette commande liste les scripts chargés.
 ........................................
@@ -2,27 +2,42 @@
 [command]*`relay`* contrôle du relai::
 ........................................
 /relay  list|listfull|listrelay
-        add <protocole.nom> <port>
-        del <protocole.nom>
+        add [ipv4.][ipv6.][ssl.]<protocole.nom> <port>
+        [ipv4.][ipv6.][ssl.]del <protocole.nom>
        raw
+        sslcertkey

         list: lister les clients pour le relai
     listfull: lister les clients pour le relai (verbeux)
    listrelay: lister les relais (nom et port)
          add: ajouter un relai pour un protocole + nom
          del: supprimer un relai pour un protocole + nom
+         ipv4: forcer l'utilisation d'IPv4
+         ipv6: forcer l'utilisation d'IPv6
+          ssl: activer SSL
 protocole.nom: protocole et nom à relayer:
                 - protocole "irc": le nom est le serveur à partager
                 - protocole "weechat" (le nom n'est pas utilisé)
         port: port utilisé pour le relai
          raw: ouvrir le tampon avec les données brutes Relay
+   sslcertkey: définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key

 Sans paramètre, cette commande ouvre le tampon avec la liste des clients pour le relai.

 Exemples:
  proxy irc, pour le serveur "freenode":
    /relay add irc.freenode 8000
+  proxy irc, pour le serveur "freenode", avec SSL:
+    /relay add ssl.irc.freenode 8001
  protocole weechat:
-    /relay add weechat 8001
+    /relay add weechat 9000
+  protocole weechat avec SSL:
+    /relay add ssl.weechat 9001
+  protocole weechat avec SSL, en utilisant seulement IPv4:
+    /relay add ipv4.ssl.weechat 9001
+  protocole weechat avec SSL, en utilisant seulement IPv6:
+    /relay add ipv6.ssl.weechat 9001
+  protocole weechat avec SSL, en utilisant IPv4 + IPv6:
+    /relay add ipv4.ipv6.ssl.weechat 9001
 ........................................

--- a/Show More
+++ b/Show More