Version 0.4.2-rc1

The new option weechat.look.day_change_message2 is used to display day change
between two messages, with two dates: the new one, and the old one.

Example:

-- Mon, 02 Sep 2013 (Thu, 22 Aug 2013) --

.gitattributes

@@ -0,0 +1,5 @@
+# files/directories excluded from tarballs
+
+.git*         export-ignore
+debian        export-ignore
+weechat.spec  export-ignore

.gitignore

@@ -13,6 +13,7 @@
 *.so
 *.so.0
 *.so.0.0.0
+*.1
 
 ABOUT-NLS
 autom4te*
@@ -46,5 +47,4 @@ weechat.pc
 *stamp
 stamp*
 
-src/gui/curses/weechat-curses
-src/gui/gtk/weechat-gtk
+src/gui/curses/weechat

AUTHORS

@@ -20,14 +20,19 @@ Alphabetically:
 
 * Ailin Nemui (Nei)
 * Aleksey V Zapparov
+* Andrew Potter
+* Antoine Pietri (seirl)
 * Arvydas Sidorenko
 * Benoit Papillault (benoit)
 * Dmitry Kobylin
 * Dominik Honnef
 * Elián Hanisch (m4v)
+* Elizabeth Myers (Elizacat)
+* Esteban I. Ruiz Moreno (Exio)
 * Frank Zacharias
 * Gu1ll4um3r0m41n
 * gwenn
+* Hasan Kiran (turgay)
 * Ivan Sichmann Freitas
 * JD Horelick (jdhore)
 * Jim Ramsay (lack)
@@ -37,6 +42,7 @@ Alphabetically:
 * Kyle Fuller (kylef)
 * Lázaro A.
 * Marco Paolone
+* Mantas Mikulėnas (grawity)
 * Mateusz Poszwa
 * Nicolas Cavigneaux
 * Nils Görs (nils_2)

CMakeLists.txt

@@ -33,7 +33,7 @@ ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "0-rc3")
+SET(VERSION_PATCH "2-rc1")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -64,14 +64,13 @@ ELSE(DEFINED INCLUDEDIR)
 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_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_ENCHANT   "Enable Enchant lib for Aspell plugin"      OFF)
 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)
@@ -87,17 +86,27 @@ 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_MAN       "Enable build of man page"                  OFF)
+OPTION(ENABLE_DOC       "Enable build of documentation"             OFF)
 
+# option WEECHAT_HOME
 IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
   SET(WEECHAT_HOME "~/.weechat")
 ENDIF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
-
 SET(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
   STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
   FORCE)
 MARK_AS_ADVANCED(CLEAR WEECHAT_HOME)
 
+# option CA_FILE
+IF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+  SET(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
+ENDIF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+SET(CA_FILE "${CA_FILE}" CACHE
+  STRING "File containing the certificate authorities (default is \"/etc/ssl/certs/ca-certificates.crt\"). This is the default value of option \"weechat.network.gnutls_ca_file\"."
+  FORCE)
+MARK_AS_ADVANCED(CLEAR CA_FILE)
+
 IF(ENABLE_NLS)
   ADD_SUBDIRECTORY( po )
 ENDIF(ENABLE_NLS)
@@ -133,6 +142,9 @@ SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
 
+# icon
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 SET(CPACK_PACKAGE_VENDOR "Sebastien Helleu")
@@ -156,8 +168,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
   "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/"
   "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
   "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
-  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
-  "/weechat-gtk$"
+  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$"
 )
 
 INCLUDE(CPack)

ChangeLog

@@ -1,12 +1,251 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-rc3, 2013-01-14
+v0.4.2-rc1, 2013-09-02
 
 
-Version 0.4.0 (under dev!)
+This document lists all changes for each version.
+
+For a list of important changes that require manual action, please look at
+http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
+(file 'NEWS' in sources).
+
+
+Version 0.4.2 (under dev!)
 --------------------------
 
+* core: fix computation of columns in output of /help (take care about size of
+  time/buffer/prefix)
+* core: display day change message dynamically (do not store it as a line in
+  buffer), rename option weechat.look.day_change_time_format to
+  weechat.look.day_change_message, new options weechat.look.day_change_message2
+  and weechat.color.chat_day_change (task #12775)
+* core: add syntax "@buffer:item" in bar items to force the buffer used when
+  displaying the bar item (task #12717)
+* core: add search of regular expression in buffer, don't reset search type on
+  a new search, select where to search (messages/prefixes), add keys in search
+  context: alt+"c" (case (in)sensitive search), tab (search in
+  messages/prefixes)
+* core: add text emphasis in messages when searching text in buffer, new
+  options: weechat.look.emphasized_attributes, weechat.color.emphasized,
+  weechat.color.emphasized_bg
+* core: fix random crash on "/buffer close" with a buffer number (or a range of
+  buffers)
+* core: optimize the removal of lines in buffers (a lot faster to clear/close
+  buffers with lot of lines)
+* core: change color format for options weechat.look.buffer_time_format and
+  weechat.look.prefix_{action|error|join|network|quit} from `${xxx}` to
+  `${color:xxx}`
+* core: add secured data (encryption of passwords or private data): add new
+  command /secure and new file sec.conf (task #7395)
+* core: rename binary and man page from "weechat-curses" to "weechat"
+  (task #11027)
+* core: disable build of doc by default, add cmake option ENABLE_MAN to compile
+  man page (off by default)
+* core: add option "-o" for command /color
+* core: fix priority of logical operators in evaluation of expression
+  (AND takes precedence over the OR) and first evaluate sub-expressions between
+  parentheses
+* core: remove gap after read marker line when there is no bar on the right
+  (bug #39548)
+* core: add CA_FILE option in cmake and configure to setup default
+  value of option weechat.network.gnutls_ca_file (default is
+  "/etc/ssl/certs/ca-certificates.crt") (task #12725)
+* core: use "/dev/null" for stdin in hook_process instead of closing stdin
+  (bug #39538)
+* core: add option "scroll_beyond_end" for command /window (task #6745)
+* core: add options weechat.look.hotlist_prefix and weechat.look.hotlist_suffix
+  (task #12730)
+* core: add option weechat.look.key_bind_safe
+* core: fix char displayed at the intersection of three windows (bug #39331)
+* core: fix crash in evaluation of expression when reading a string in hdata
+  with a NULL value (bug #39419)
+* core: fix display bugs with some UTF-8 chars that truncates messages displayed
+  (for example U+26C4) (bug #39201)
+* core: update man page and add translations (in french, german, italian, and
+  japanese)
+* core: remove extra space after empty prefix (when prefix for action, error,
+  join, network or quit is set to empty string) (bug #39218)
+* core: add option weechat.network.proxy_curl (task #12651)
+* core: add "proxy" infolist and hdata
+* core: fix random crash on mouse actions (bug #39094)
+* core: set options weechat.look.color_inactive_{buffer|window} to "on" by
+  default
+* core: add infolist "layout" and hdata "layout", "layout_buffer" and
+  "layout_window"
+* core: fix line alignment when option weechat.look.buffer_time_format is set
+  to empty string
+* api: return hashtable item pointer in functions hashtable_set and
+  hashtable_set_with_size
+* api: change type of hashtable key hash to unsigned long
+* api: add "callback_free_key" in hashtable
+* api: add support of colors with format `${color:xxx}` in function
+  string_eval_expression and command /eval
+* api: add argument "options" in function string_eval_expression, add option
+  "-c" for command /eval (to evaluate a condition)
+* api: use pointer for infolist "hook" to return only one hook
+* api: add new function strlen_screen
+* plugins: remove the demo plugin
+* aspell: rename option aspell.look.color to aspell.color.misspelled, add option
+  aspell.color.suggestions
+* aspell: add support of enchant library (patch #6858)
+* irc: add option irc.look.notice_welcome_redirect to automatically redirect
+  channel welcome notices to the channel buffer
+* irc: replace default prefix modes "qaohvu" by the standard ones "ov" when
+  PREFIX is not sent by server (bug #39802)
+* irc: use 6697 as default port for SSL servers created with URL "ircs://"
+  (bug #39621)
+* irc: display number of ops/halfops/voices on channel join only for supported
+  modes on server (bug #39582)
+* irc: fix self nick color in server messages after nick is changed with /nick
+  (bug #39415)
+* irc: add support of wildcards in commands (de)op/halfop/voice, split IRC
+  message sent if number of nicks is greater than server MODES (from message
+  005) (task #9221)
+* irc: add option irc.look.pv_tags
+* irc: fix error message on /invite without arguments (bug #39272)
+* irc: add support of special variables $nick/$channel/$server in commands
+  /allchan and /allserv
+* irc: add option irc.look.nick_color_hash: hash algorithm to find nick color
+  (patch #8062)
+* irc: fix multiple nicks in command /query (separated by commas): open one
+  buffer per nick
+* logger: add option "flush" for command /logger
+* lua: fix interpreter used in API functions (bug #39470)
+* relay: add command "ping" in weechat protocol (task #12689)
+* relay: fix binding to an IP address (bug #39119)
+* rmodifier: add option "missing" for command /rmodifier
+* script: add info about things defined by script (like commands, options, ...)
+  in the detailed view of script (/script show)
+* scripts: add hdata with script callback
+* xfer: add option xfer.look.pv_tags
+* xfer: fix compilation on OpenBSD (bug #39071)
+
+Version 0.4.1 (2013-05-20)
+--------------------------
+
+* core: fix display of long lines without time (message beginning with two tabs)
+* core: make nick prefix/suffix dynamic (not stored in the line): move options
+  irc.look.nick_{prefix|suffix} to weechat.look.nick_{prefix|suffix} and options
+  irc.color.nick_{prefix|suffix} to weechat.color.chat_nick_{prefix|suffix},
+  add new options weechat.look.prefix_align_more_after,
+  weechat.look.prefix_buffer_align_more_after, logger.file.nick_{prefix|suffix}
+  (bug #37531)
+* core: reset scroll in window before zooming on a merged buffer (bug #38207)
+* core: install icon file (patch #7972)
+* core: fix refresh of item "completion": clear it after any action that is
+  changing content of command line and after switch of buffer (bug #38214)
+* core: add support of multiple layouts (task #11274)
+* core: add signals nicklist_{group|nick}_removing and hsignals
+  nicklist_{group|nick}_{added|removing|changed}
+* core: add count for groups, nicks, and total in nicklist
+* core: allow read of array in hdata without using index
+* core: add option "dirs" for command /debug
+* core: fix detection of iconv with cmake on OS X (bug #38321)
+* core: add signal "window_opened" (task #12464)
+* core: fix structures before buffer data when a buffer is closed
+* core: fix refresh of line after changes with hdata_update (update flag
+  "displayed" according to filters)
+* core: fix detection of python on Ubuntu Raring
+* core: fix hidden lines for messages without date when option
+  weechat.history.max_buffer_lines_minutes is set (bug #38197)
+* core: use default hash/comparison callback for keys of type
+  integer/pointer/time in hashtable
+* api: do not display a warning by default when loading a script with a license
+  different from GPL
+* api: add new function hdata_search
+* api: add property "completion_freeze" for function buffer_set: do not stop
+  completion when command line is updated
+* api: fix connection to servers with hook_connect on OS X (bug #38496)
+* api: fix bug in string_match when mask begins and ends with "*"
+* api: allow hashtable with keys that are not strings in function
+  hashtable_add_to_infolist
+* api: fix function string_mask_to_regex: escape all special chars used in regex
+  (bug #38398)
+* aspell: add completion "aspell_dicts" (list of aspell installed dictionaries)
+* aspell: add info "aspell_dict" (dictionaries used on a buffer)
+* aspell: optimization on spellers to improve speed (save state by buffer)
+* guile: fix crash in function hdata_move
+* guile: fix arguments given to callbacks (separate arguments instead of one
+  list with arguments inside), guile >= 2.0 is now required (bug #38350)
+* guile: fix crash on calls to callbacks during load of script (bug #38343)
+* guile: fix compilation with guile 2.0
+* irc: fix name of server buffer after /server rename (set name "server.name"
+  instead of "name")
+* irc: fix uncontrolled format string when sending unknown irc commands
+  (if option irc.network.send_unknown_commands is on)
+* irc: fix uncontrolled format string when sending ison command (for nicks
+  monitored by /notify)
+* irc: fix refresh of nick in input bar when joining a new channel with op
+  status (bug #38969)
+* irc: fix display of CTCP messages that contain bold attribute (bug #38895)
+* irc: add support of "dh-aes" SASL mechanism (patch #8020)
+* irc: fix duplicate nick completion when someone rejoins the channel with same
+  nick but a different case (bug #38841)
+* irc: add support of UHNAMES (capability "userhost-in-names") (task #9353)
+* irc: add tag "irc_nick_back" for messages displayed in private buffer when a
+  nick is back on server (task #12576)
+* irc: fix crash on command "/allchan /close"
+* irc: add option irc.look.display_join_message (task #10895)
+* irc: fix default completion (like nicks) in commands /msg, /notice, /query and
+  /topic
+* irc: fix prefix color for nick when the prefix is not in
+  irc.color.nick_prefixes: use default color (key "*")
+* irc: add option irc.look.pv_buffer: automatically merge private buffers
+  (optionally by server) (task #11924)
+* irc: rename option irc.network.lag_disconnect to irc.network.lag_reconnect,
+  value is now a number of seconds
+* irc: hide passwords in commands or messages sent to nickserv (/msg nickserv)
+  with new modifiers "irc_command_auth" and "irc_message_auth", remove option
+  irc.look.hide_nickserv_pwd, add option irc.look.nicks_hide_password
+  (bug #38346)
+* irc: fix display of malformed CTCP (without closing char) (bug #38347)
+* irc: unmask smart filtered join if nick speaks in channel some minutes after
+  the join, new option irc.look.smart_filter_join_unmask (task #12405)
+* irc: fix memory leak in purge of hashtables with joins (it was done only for
+  the first server in the list)
+* irc: add color in output of /names when result is on server buffer (channel
+  not joined) (bug #38070)
+* lua: remove use of functions for API constants
+* lua: fix crash on stack overflow: call lua_pop() for values returned by lua
+  functions (bug #38510)
+* perl: simplify code to load scripts
+* python: fix crash when loading scripts with Python 3.x (patch #8044)
+* relay: fix uncontrolled format string in redirection of irc commands
+* relay: rename compression "gzip" to "zlib" (compression is zlib, not gzip)
+* relay: add message "_nicklist_diff" (differences between old and current
+  nicklist)
+* relay: add support of multiple servers on same port for irc protocol (the
+  client must send the server in the "PASS" command)
+* relay: add WebSocket server support (RFC 6455) for irc and weechat protocols,
+  new option relay.network.websocket_allowed_origins
+* relay: add options "buffers" and "upgrade" for commands sync/desync in weechat
+  protocol
+* relay: fix commands sync/desync in weechat protocol (bug #38215)
+* rmodifier: rename default rmodifier "nickserv" to "command_auth" (with new
+  modifier "irc_command_auth"), add default rmodifier "message_auth" (modifier
+  "irc_message_auth")
+* ruby: fix crash in function hdata_move
+* ruby: fix crash with Ruby 2.0: use one array for the last 6 arguments of
+  function config_new_option (bug #31050)
+* script: fix compilation on GNU/Hurd (patch #7977)
+* script: create "script" directory on each action, just in case it has been
+  removed (bug #38472)
+* script: add option script.scripts.autoload, add options "autoload",
+  "noautoload" and "toggleautoload" for command /script, add action "A" (meta-A)
+  on script buffer (toggle autoload) (task #12393)
+* scripts: create directories (language and language/autoload) on each action
+  (install/remove/autoload), just in case they have been removed (bug #38473)
+* scripts: do not allow empty script name in function "register"
+* xfer: add option xfer.file.auto_accept_nicks (patch #7962)
+* xfer: fix freeze of DCC file received: use non-blocking socket after
+  connection to sender and ensure the ACK is properly sent (bug #38340)
+
+Version 0.4.0 (2013-01-20)
+--------------------------
+
+* core: fix infinite loop when a regex gives an empty match (bug #38112)
+* core: fix detection of guile in configure
 * core: fix click in item "buffer_nicklist" when nicklist is a root bar
   (bug #38080)
 * core: fix line returned when clicking on a bar (according to position and
@@ -21,7 +260,7 @@ 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")
+  as a command (API function "string_input_for_buffer")
 * 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)
@@ -189,10 +428,10 @@ Version 0.3.9 (2012-09-29)
 * 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: allow again 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
+* 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
@@ -233,7 +472,7 @@ Version 0.3.9 (2012-09-29)
   (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
+* irc: allow again 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
@@ -267,7 +506,7 @@ Version 0.3.8 (2012-06-03)
 * core: fix crash in focus hook for nicklist (bug #36271)
 * core: fix truncated configuration files (zero-length) after system crash
   (bug #36383)
-* core: fix display bugs and crashs with small windows (bug #36107)
+* core: fix display bugs and crashes with small windows (bug #36107)
 * core: convert options weechat.look.prefix_align_more and
   weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
 * core: fix display bug with prefix when length is greater than max and prefix
@@ -283,7 +522,7 @@ Version 0.3.8 (2012-06-03)
   weechat.look.paste_bracketed and weechat.look.paste_bracketed_timer_delay
   (task #11316)
 * core: fix display of wide chars on last column of chat area (patch #7733)
-* doc: add japanese FAQ (patch #7781)
+* doc: add Japanese FAQ (patch #7781)
 * api: display warning in scripts when invalid pointers (malformed strings) are
   given to plugin API functions (warning displayed if debug for plugin is >= 1)
 * api: add list "gui_buffer_last_displayed" in hdata "buffer"
@@ -348,9 +587,9 @@ Version 0.3.8 (2012-06-03)
 Version 0.3.7 (2012-02-26)
 --------------------------
 
-* core: add japanese translations
+* core: add Japanese translations
 * core: fix expand of path `~` to home of user in function string_expand_home
-  (`~/xxx` was ok, but not `~`)
+  (`~/xxx` was OK, but not `~`)
 * core: fix memory leak when closing buffer
 * core: fix memory leak in function util_search_full_lib_name
 * core: automatically add newline char after last pasted line (when pasting many
@@ -377,7 +616,7 @@ Version 0.3.7 (2012-02-26)
 * core: apply filters after full reload of configuration files (with /reload)
   (bug #31182)
 * core: allow list for option weechat.plugin.extension (makes weechat.conf
-  portable accross Un*x and Windows) (task #11479)
+  portable across Un*x and Windows) (task #11479)
 * core: fix compilation under OpenBSD 5.0 (lib utf8 not needed any more)
   (bug #34727)
 * core: add new option weechat.completion.base_word_until_cursor: allow
@@ -471,7 +710,7 @@ Version 0.3.6 (2011-10-22)
 * core: fix paste detection (problem with end of lines)
 * core: add new option weechat.look.color_basic_force_bold, off by default: bold
   is used only if terminal has less than 16 colors (patch #7621)
-* core: add default key "meta2-[E" (F5) for linux console
+* core: add default key "meta2-[E" (F5) for Linux console
 * core: fix display of paste multi-line prompt with a root input bar
   (bug #34305)
 * core: add "inactive" colors for inactive windows and lines in merged buffers,
@@ -727,7 +966,7 @@ Version 0.3.4 (2011-01-16)
   nicklist_nick_get_integer, nicklist_nick_get_string, nicklist_nick_get_pointer,
   nicklist_nick_set
 * alias: complete with alias value for second argument of command /alias
-* irc: differenciate notices from messages in private buffer (bug #31980)
+* irc: differentiate notices from messages in private buffer (bug #31980)
 * irc: update nick modes with message 221 (bug #32038)
 * irc: add option "-server" to command /join (task #10837)
 * irc: fix bug with charset decoding on private buffers (decoding was made for
@@ -801,7 +1040,7 @@ Version 0.3.3 (2010-08-07)
 * irc: fix bug in parser when no argument is received after command, no
   callback was called, and message was silently ignored (bug #30640)
 * irc: add new option irc.look.nick_color_stop_chars
-* irc: fix import of certificates created by openssl >= 1.0.0 (bug #30316)
+* irc: fix import of certificates created by OpenSSL >= 1.0.0 (bug #30316)
 * irc: fix display of local SSL certificate when it is sent to server
   (patch #7218)
 * irc: improve lag indicator: two colors (counting and finished), update item
@@ -996,7 +1235,7 @@ Version 0.3.0 (2009-09-06)
 
 * irc: add irc plugin (replaces old IRC code in core) (task #6217)
 * irc: add smart join/part/quit message filter (task #8503)
-* irc: use of many addresses for servers (auto-switch when a connexion fails),
+* irc: use of many addresses for servers (auto-switch when a connection fails),
   nicks are now set with one option "nicks" (task #6088)
 * irc: add some colors in messages from server (for text and nicks)
   (task #8926)
@@ -1005,7 +1244,7 @@ Version 0.3.0 (2009-09-06)
   disconnecting during connection problem (bug #17584)
 * irc: command /whois is now authorized in private without argument
   (task #7482)
-* irc: fix private buffer name with irssi proxy (bug #26589)
+* irc: fix private buffer name with Irssi proxy (bug #26589)
 * irc: remove kernel info in CTCP VERSION reply (task #7494)
 * irc: add missing commands (328, 369)
 * irc: fix mode parsing when receiving modes with arguments (bug #26793)
@@ -1053,9 +1292,9 @@ Version 0.3.0 (2009-09-06)
 * network: fix network connection for hostnames resolving to several IPs: try
   all IPs in list until one succeeds (bug #21473, debian #498610)
 * core: add group support in nicklist
-* core: improve main loop: higher timout in select(), less CPU usage
+* core: improve main loop: higher timeout in select(), less CPU usage
 * core: add /reload command to reload WeeChat and plugins config files (signal
-  SIGHUP is catched to reload config files)
+  SIGHUP is caught to reload config files)
 * core: add new /layout command and save_layout_on_exit config option, to
   save/restore windows and buffers order (task #5453)
 * core: add new options for completion, optional stop instead of cycling with
@@ -1107,7 +1346,7 @@ Version 0.2.6 (2007-09-06)
 * add paste detection, new options look_paste_max_lines and col_input_actions
   (task #5442)
 * fix bug with highlight and UTF-8 chars around word (bug #20753)
-* add swedish quickstart guide
+* add Swedish quickstart guide
 * add support of channel mode +u (channel user) (bug #20717)
 * improve /connect command to connect to a host by creating a temporary server,
   add option to /server to create temporary server (task #7095)
@@ -1144,8 +1383,8 @@ Version 0.2.6 (2007-09-06)
 Version 0.2.5 (2007-06-07)
 --------------------------
 
-* fix QUOTE command: now allowed when socket is ok (even if IRC connection to
-  server is not ok) (bug #20113)
+* fix QUOTE command: now allowed when socket is OK (even if IRC connection to
+  server is not OK) (bug #20113)
 * add missing IRC commands (327, 378, 379) (bug #20091)
 * fix hotlist when exiting search mode: current buffer is removed from hotlist
 * add "%M" for completion with nicks of current server (nicks on open channels)
@@ -1171,7 +1410,7 @@ Version 0.2.5 (2007-06-07)
 * add protocol priority for gnutls (patch #5915)
 * add channel admin mode "!" for some IRC servers
 * fix bug with iso2022jp locale (bug #18719)
-* fix string format bug when displaying string thru plugin script API
+* fix string format bug when displaying string through plugin script API
 * add /reconnect command (task #5448)
 * add "-all" option for /connect and /disconnect commands (task #6232)
 * improve nick completion: completion with last speakers first and self nick at
@@ -1209,7 +1448,7 @@ Version 0.2.4 (2007-03-29)
   text on command line (task #6468)
 * fix permissions on "dcc" and "logs" directories (bug #18978)
 * add event handler to plugin API
-* add scots quickstart guide
+* add Scots quickstart guide
 * add numeric argument for /clear command (buffer number) (patch #5372)
 * fix crash when /away command is issued with no server connection (bug #18839)
 * fix crash when closing a buffer opened on many windows
@@ -1234,7 +1473,7 @@ Version 0.2.2 (2007-01-06)
 * fix bug with use of first buffer for a channel if not connected to server
   (now allowed only for a server buffer)
 * fix refresh bug with private buffer title
-* fix bug with nick completion in command args (now uses option
+* fix bug with nick completion in command arguments (now uses option
   look_nick_completion_ignore)
 * fix display bug with color for first line on screen (bug #17719)
 * add anti-flood option (irc_anti_flood) (task #5442)
@@ -1242,7 +1481,7 @@ Version 0.2.2 (2007-01-06)
 * plugins: "add_message_handler" now accepts "*" for all IRC messages
 * add keys (F9/F10) to scroll topic (task #6030)
 * add auto completion with channels and filenames (task #5423)
-* fix memleak in keyboard input
+* fix memory leak in keyboard input
 * fix refresh bug when changing config options if window is split
 * add space between chat and nicklist when position is "right" (bug #17852)
 * add option "look_nicklist_separator" (task #5437)
@@ -1284,13 +1523,13 @@ Version 0.2.1 (2006-10-01)
 * new signals handled: SIGTERM and SIGHUP (received when terminal is closed):
   clean WeeChat quit (send quit to irc servers then quit WeeChat)
 * add some new default key bindings for existing keys (for some OS)
-* command /key now ok with one arg (key name): display key if found
+* command /key now OK with one argument (key name): display key if found
 * fix bug with CTCP VERSION sent on channels (bug #17547)
 * add current channel completion for /ctcp command
 * fix bugs in get_buffer_data() which breaks the retrieval of buffer content
   (perl, lua)
 * fix nicklist display bug when top/bottom (not enough lines) (bug #17537)
-* fix bug with auto-rejoin of keyed chans (bug #17534)
+* fix bug with auto-rejoin of keyed channels (bug #17534)
 * add default nick completion when line starts with "//" (bug #17535)
 * values yes/no accepted (as on/off) for config boolean values (task #5454)
 * add server default notify level (set by /buffer notify on server buffer)
@@ -1341,7 +1580,7 @@ Version 0.2.0 (2006-08-19)
 * fix crash when setting look_one_server_buffer to ON (bug #16932)
 * add new functions in plugin/script API: get window info, get buffer info, get
   buffer content
-* add polish, russian and czech quickstart guide
+* add polish, Russian and Czech quickstart guide
 * fix display bug with special char (bug #16732)
 * add color encoding for some commands like /me
 * add aspell plugin
@@ -1356,7 +1595,8 @@ Version 0.2.0 (2006-08-19)
 Version 0.1.9 (2006-05-25)
 --------------------------
 
-* fix /squery command (message sent to server, now ok with # args > 2)
+* fix /squery command (message sent to server, now OK with more than two
+  arguments)
 * fix /alias command (with an alias name, display content)
 * improve lua plugin detection (bug #16574)
 * add backtrace when WeeChat crashes, log file automatically renamed
@@ -1370,11 +1610,11 @@ Version 0.1.9 (2006-05-25)
 * fix Ruby crash when handler does not return OK or KO (bug #16552)
 * fix UTF-8 display bug with chars using more than one cell on screen
   (bug #16356)
-* fix display bug with DCC file size when > 1 Gb
+* fix display bug with DCC file size when > 1 GB
 * fix refresh bug (deadlock in curses) when terminal is resized (bug #16542)
 * fix nicklist sort bug
-* add russian translations (thanks to Pavel Shevchuk)
-* add german doc (thanks to Frank Zacharias)
+* add Russian translations (thanks to Pavel Shevchuk)
+* add German doc (thanks to Frank Zacharias)
 * add missing IRC commands (006, 007, 290, 292, 310, 379, 437, 974)
 * fix crash when multiple pv have same name: now it's forbidden and pv buffer
   is not renamed (when a nick changes) if another exists with same name
@@ -1384,10 +1624,10 @@ Version 0.1.9 (2006-05-25)
 * fix many crashes with DCC chat (bug #16416)
 * add new option to customize input prompt
 * add nick modes
-* fix commands 332, 333 (/topic now ok when channel is not opened)
+* fix commands 332, 333 (/topic now OK when channel is not opened)
 * remove color encoding and charset conversion for commands (only allowed in
   text sent to channel/private)
-* add hostnames associeted to nicks (available for /ban completion)
+* add hostnames associated to nicks (available for /ban completion)
 * add "+p" mode for channels, fix mode display in status bar
 * add nick alignment options
 * fix /names command: now displays result when not on a channel
@@ -1443,20 +1683,20 @@ Version 0.1.8 (2006-03-18)
   (patch from Pistos)
 * add new option "irc_away_check_max_nicks" to disable away check on channels
   with high number of nicks (patch from Gwenn)
-* add new command line argument for setting WeeChat homedir (-d or --dir)
+* add new command line argument for setting WeeChat home dir (-d or --dir)
   (patch from Gwenn)
 * fix bug with charset in infobar highlights
 * fix bug with buffer detection in plugins/scripts commands
 * fix bug with /history command
 * add option "irc_show_away_once", to show away message only once in pv
-* add partial hungarian translation
+* add partial Hungarian translation
 
 Version 0.1.7 (2006-01-14)
 --------------------------
 
 * fix msg command (now allowed in private buffer with "*" as target)
 * remove "irc_default_msg_away" setting, for RFC 2812 conformity (/away command
-  wihtout argument only removes away status), new values for "irc_display_away"
+  without argument only removes away status), new values for "irc_display_away"
   (off, local, channel)
 * fix refresh bug with Solaris when term size is changed
 * replace Texinfo doc by XML Docbook
@@ -1468,13 +1708,13 @@ Version 0.1.7 (2006-01-14)
 * add /upgrade command
 * add ETA (Estimated Time of Arrival) for DCC files
 * /nick command is now allowed when not connected to server
-* add server/channel arg to /buffer command for jumping to buffer
+* add server/channel argument to /buffer command for jumping to buffer
 * fix display bug in chat window when a message length equals to window width
 * add new keys for switching to other windows: alt+"w" followed by alt+{arrow}
 * add new keys for scrolling to previous/next highlight: alt+"p" / alt+"n"
 * add "read marker": an indicator for first unread line in a server or channel
   buffer (new key alt+"u" to scroll to marker)
-* new window maganement: custom size for windows, auto resize when terminal is
+* new window management: custom size for windows, auto resize when terminal is
   resized
 * fix infinite loop when resizing term to small size
 * add /history command
@@ -1520,7 +1760,7 @@ Version 0.1.5 (2005-09-24)
 * fix DCC display bug (now decodes string according to charset)
 * add /ignore and /unignore commands
 * fix bug with strings comparison (str[n]casecmp) and some locales (like
-  turkish), now using ASCII comparison (thanks to roktas)
+  Turkish), now using ASCII comparison (thanks to roktas)
 * signal SIGQUIT is now ignored
 * fix refresh bug when one line is bigger than screen size
 * fix look_nicklist_min_size and look_nicklist_max_size options
@@ -1557,7 +1797,7 @@ Version 0.1.4 (2005-07-30)
 Version 0.1.3 (2005-07-02)
 --------------------------
 
-* proxy support (http, socks4, socks5) with authentification (http, socks5)
+* proxy support (http, socks4, socks5) with authentication (http, socks5)
   and ipv6 support (client to proxy)
 * add completion for config option (with /set command)
 * commands from users outside channel now authorized (if special user or
@@ -1573,7 +1813,7 @@ Version 0.1.3 (2005-07-02)
 * in python scripts, all messages written in stdin and stderr are redirected in
   server buffer
 * fix a filename error while loading a python script manually
-* fix plugins "print" and "prnt" functions: now ok for writing on server
+* fix plugins "print" and "prnt" functions: now OK for writing on server
   buffers
 * fix color problem with new libcurses version
 * fix crash when using alt+"s" or alt+"x" on DCC buffer (alt+"d")
@@ -1589,7 +1829,7 @@ Version 0.1.2 (2005-05-21)
 * add transfer rate for DCC files
 * add "-all" option for /nick command
 * buffers timestamp can now be changed (new option in config file)
-* WeeChat now ok under *BSD and Mac OS X
+* WeeChat now OK under *BSD and Mac OS X
 * fix nicklist sort
 * fix crash when purging old DCC
 * fix crash with 64-bits arch (like AMD64) when converting UTF-8
@@ -1605,7 +1845,7 @@ Version 0.1.1 (2005-03-20)
 * add DCC send and DCC chat
 * add /halfop & /dehalfop commands, fix halfop display bug in nicklist
 * add /ban, /unban and /kickban commands
-* add spanish translation
+* add Spanish translation
 * add --irc-commands and --weechat-commands command line options
 * connection to IRC server is now made by child process (non blocking)
 * add support for UnrealIrcd ("~" for chan owner, "&" for chan admin)
@@ -1615,20 +1855,20 @@ Version 0.1.1 (2005-03-20)
 * plugins messages are logged with new config option (log_plugin_msg)
 * fix /kick command
 * fix /invite command (and now invite requests are displayed)
-* fix /buffer close command (now ok when disconnected from server)
+* fix /buffer close command (now OK when disconnected from server)
 * fix display bugs when many windows are opened
 
 Version 0.1.0 (2005-02-12)
 --------------------------
 
-* improve /window command: now split and merge are ok
+* improve /window command: now split and merge are OK
 * away nicks are now displayed with another color (new option:
   "irc_away_check")
 * add away indicator in status bar
 * add lag indicator (and auto-disconnect after a delay if important lag)
 * improve completion: now completes commands arguments (IRC and internal),
-  when only one completion matches, completion mechanism is stoped (to complete
-  command arg for example)
+  when only one completion matches, completion mechanism is stopped (to complete
+  command argument for example)
 * improve /set command: empty strings are allowed, new colors, server options
   can be changed while WeeChat is running
 * add default away/part/quit messages in config file
@@ -1638,15 +1878,15 @@ Version 0.1.0 (2005-02-12)
 * add new options for charset (UTF-8 support): look_charset_decode,
   look_charset_encode and look_charset_internal
 * fix many memory leaks
-* fix colors bug: remove "gray" color (replaced by "default"), colors are ok
+* fix colors bug: remove "gray" color (replaced by "default"), colors are OK
   when terminal has white (or light) background
 * fix crash when resizing terminal to small size
 * fix crash when multiple servers and big messages received from server
 * fix crash when closing some private buffers
 * fix crash when unknown section with option(s) in config file
-* fix /op, /deop, /voice, /devoice (now ok with many nicks)
-* fix /me command (now ok without parameter)
-* fix /away command (now ok if not away)
+* fix /op, /deop, /voice, /devoice (now OK with many nicks)
+* fix /me command (now OK without parameter)
+* fix /away command (now OK if not away)
 * logs are now disabled by default (server/channel/private)
 
 Version 0.0.9 (2005-01-01)
@@ -1655,7 +1895,7 @@ Version 0.0.9 (2005-01-01)
 * auto-reconnection to server (new options: server_autoreconnect (on/off),
   server_autoreconnect_delay (in seconds))
 * fix major bug when socket is closed by server (100% CPU usage), and
-  disconnections are now ok (all channels are "closed", history is still
+  disconnections are now OK (all channels are "closed", history is still
   visible, and buffer will be used again if reconnection to server)
 * option "look_remove_colors_from_msgs" is now working
 * fix display of nick mode changes
@@ -1670,17 +1910,17 @@ Version 0.0.9 (2005-01-01)
 Version 0.0.8 (2004-10-30)
 --------------------------
 
-* fix /kick command: now ok with many words as reason
+* fix /kick command: now OK with many words as reason
 * nickserv passwords hidden (new config option: log_hide_nickserv_pwd on/off)
 * auto-rejoin channels when kicked (new config option: server_autorejoin on/off)
 * add IRC::command function for Perl scripts
 * fix bug when adding alias with same name as other
 * /buffer command developed (buffers list, move and notify)
-* logging buffers to disk (server/channel/private according to user prefs)
+* logging buffers to disk (server/channel/private according to user preferences)
 * add config option "look_display_away" to announce away in channels
 * fix crash when resizing terminal to very small size
 * "-MORE-" message is now erased when switching to another buffer
-* DCC file receive ok (alt+"d" for DCC view)
+* DCC file receive OK (alt+"d" for DCC view)
 * /query command now reopens private buffer if already opened
 * add key for redrawing terminal (ctrl+"l")
 * add key for clearing hotlist (alt+"r")
@@ -1707,9 +1947,9 @@ Version 0.0.6 (2004-06-05)
 * fix bug when opened private win and remote user changes his nick
 * add command /query (starts private conversation)
 * add IRC messages 476, 477
-* /mode command is now ok and channel flags are displayed in status bar
+* /mode command is now OK and channel flags are displayed in status bar
 * fix display bug (text was blinking when scrolling)
-* CTCP Version reply is now in english only and doesn't show host (security
+* CTCP Version reply is now in English only and doesn't show host (security
   reason)
 
 Version 0.0.5 (2004-02-07)
@@ -1739,7 +1979,7 @@ Version 0.0.4 (2004-01-01)
   switch to this window
 * highlight when our nick is written in a channel/private window
 * catch ctrl+"c" (ignored)
-* debug messages can be enabled via ./configure --enbale-debug option
+* debug messages can be enabled via ./configure --enable-debug option
 
 Version 0.0.3 (2003-11-03)
 --------------------------

INSTALL

@@ -15,10 +15,10 @@ Dependencies
 Following packages are *required*:
 
 * cmake
-* ncurses
-* curl
+* libncurses
+* libcurl
 * zlib
-* gcrypt
+* libgcrypt
 
 Following packages are all optional:
 
@@ -27,6 +27,7 @@ Following packages are all optional:
 * for spell checking: aspell
 * for scripting: python, perl, ruby, lua, tcl, guile
 * for building doc: asciidoc, source-highlight
+  (for man page: xsltproc, docbook-xml, docbook-xsl)
 
 For a complete list of dependencies and versions recommended, please look at
 'User's guide'.
@@ -44,4 +45,4 @@ make install     (as root for installation in system directories)
 ------------------------------------------------------------------
 
 For more information or installation with autotools, please look at
-'User's guide': http://www.weechat.org/doc
+'User's guide': http://weechat.org/doc

Makefile.am

@@ -25,11 +25,7 @@ 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
-
-SUBDIRS = po $(doc_dir) intl src
+SUBDIRS = po doc intl src
 
 EXTRA_DIST = CMakeLists.txt \
              config.rpath \
@@ -39,6 +35,7 @@ EXTRA_DIST = CMakeLists.txt \
              cmake/CMakeParseArguments.cmake \
              cmake/FindAsciidoc.cmake \
              cmake/FindAspell.cmake \
+             cmake/FindENCHANT.cmake \
              cmake/FindGCRYPT.cmake \
              cmake/FindGettext.cmake \
              cmake/FindGnuTLS.cmake \
@@ -57,11 +54,16 @@ EXTRA_DIST = CMakeLists.txt \
              cmake/cmake_uninstall.cmake.in \
              po/CMakeLists.txt \
              po/srcfiles.cmake \
-             weechat.spec \
-             weechat_icon_32.png \
+             weechat.png \
              weechat.pc.in
 
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
+
+icondir   = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png
+
+clean-local:
+	$(RM) config-git.h

NEWS

@@ -1,28 +1,295 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-rc3, 2013-01-14
+v0.4.2-rc1, 2013-09-02
 
 
-Version 0.4.0 (under dev!)
+This document lists important changes for each version, that require manual
+actions. It is recommended to read it when upgrading to a new stable
+version.
+
+For a complete list of changes, please look at
+http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
+(file 'ChangeLog' in sources).
+
+
+Version 0.4.2 (under dev!)
 --------------------------
 
-Important release notes:
+=== Day change message ===
 
-* 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`
+The day change message is now dynamically displayed, and therefore is not stored
+as a line in buffer any more.
+
+Option 'weechat.look.day_change_time_format' has been renamed to
+'weechat.look.day_change_message' (color codes are allowed in this option, see
+`/help eval`).
+
+New options 'weechat.look.day_change_message2' and
+'weechat.color.chat_day_change' have been added.
+
+After `/upgrade` from an old version, you will see two messages for each day
+change. This is a normal behavior and will not happen again with the next day
+changes.
+
+=== Regex search in buffer ===
+
+Search with regular expression has been added, and therefore some keys in search
+context have been changed.
+
+The key ctrl+"r" in search context is now used to switch string/regex search
+(instead of searching exact text).
+
+If you never changed keys in search context, you can reset them all with one
+command:
+
+----------------------------------------
+/key resetall -yes search
+----------------------------------------
+
+Or the manual method:
+
+----------------------------------------
+/key missing search
+/key bindctxt search ctrl-R /input search_switch_regex
+----------------------------------------
+
+To view keys in search context:
+
+----------------------------------------
+/key list search
+----------------------------------------
+
+For more information, see the chapter about keys in the 'WeeChat User's guide'.
+
+=== New rmodifier ===
+
+A new rmodifier "secure" has been added to hide passphrase and passwords
+displayed by command "/secure". Use command `/rmodifier missing` to add it.
+
+=== Color codes in options ===
+
+The format for color codes in some options has changed. The options are
+evaluated with the function "string_eval_expression", which uses the format
+`${color:xxx}`.
+
+Following options are affected:
+
+* 'weechat.look.buffer_time_format'
+* 'weechat.look.prefix_action'
+* 'weechat.look.prefix_error'
+* 'weechat.look.prefix_join'
+* 'weechat.look.prefix_network'
+* 'weechat.look.prefix_quit'
+
+The options using old format `${xxx}` must be changed with new format
+`${color:xxx}` (where xxx is a color name or number, with optional color
+attributes).
+
+Example:
+
+----------------------------------------
+/set weechat.look.buffer_time_format "${color:251}%H${color:243}%M${color:238}%S"
+----------------------------------------
+
+=== Binary and man page ===
+
+WeeChat binary and man page have been renamed from `weechat-curses` to
+`weechat`.
+
+A symbolic link has been added for binary: `weechat-curses` -> `weechat`
+(so that the /upgrade from a old version will still work).
+
+If you upgrade from an old version, it is recommended to force the use of the
+new binary name with the command: `/upgrade /path/to/weechat` (replace the path
+accordingly).
+
+[NOTE]
+For packagers: you should create the link `weechat-curses` -> `weechat` if it's
+not automatically created in the package (both cmake and configure are creating
+this link on make install).
+
+=== Man page / documentation ===
+
+Documentation is not built by default any more, you have to use option
+`-DENABLE_DOC=ON` in cmake to enable it.
+
+The man page is now built with asciidoc and translated in several
+languages. A new cmake option `ENABLE_MAN` has been added to compile man page
+(`OFF` by default).
+
+=== Aspell colors ===
+
+Option 'aspell.look.color' has been renamed to 'aspell.color.misspelled'.
+
+Version 0.4.1 (2013-05-20)
+--------------------------
+
+=== Nicklist diff in relay ===
+
+A new message with identifier "_nicklist_diff" has been added in relay (WeeChat
+protocol). WeeChat may decide to send full nicklist or this nicklist diff at any
+time (depending on size of message, the smaller is sent).
+
+Clients using nicklist must implement it.
+
+For more info about content of message, see document 'WeeChat Relay Protocol'.
+
+=== Dynamic nick prefix/suffix ===
+
+The nick prefix/suffix (for example: "<" and ">") are now dynamic and used on
+display (not stored any more in the line).
+
+Options moved from irc plugin (irc.conf) to core (weechat.conf):
+
+* 'irc.look.nick_prefix' moved to 'weechat.look.nick_prefix'
+* 'irc.look.nick_suffix' moved to 'weechat.look.nick_suffix'
+* 'irc.color.nick_prefix' moved to 'weechat.color.chat_nick_prefix'
+* 'irc.color.nick_suffix' moved to 'weechat.color.chat_nick_suffix'
+
+Types and default values for these four options remain unchanged.
+
+Two new options to customize the truncature char (by default "`+`"):
+
+* 'weechat.look.prefix_align_more_after' (boolean, 'on' by default)
+* 'weechat.look.prefix_buffer_align_more_after' (boolean, 'on' by default)
+
+When these options are enabled (default), the "`+`" is displayed after the
+text, replacing the space that should be displayed there. +
+When turned off, the "`+`" will replace last char of text.
+
+Example for a nicks "FlashCode" and "fc" with different values for options
+'weechat.look.prefix_align_max', 'weechat.look.prefix_align_more_after',
+'weechat.look.nick_prefix' and 'weechat.look.nick_suffix':
+
+----------------------------------------
+                      # align_max, more_after, prefix/suffix
+
+FlashCode │ test      # 0, on
+       fc │ test
+
+FlashCod+│ test       # 8, on
+      fc │ test
+
+FlashCo+ │ test       # 8, off
+      fc │ test
+
+<FlashCode> │ test    # 0, on,  < >
+       <fc> │ test
+
+<FlashC>+│ test       # 8, on,  < >
+    <fc> │ test
+
+<Flash+> │ test       # 8, off, < >
+    <fc> │ test
+----------------------------------------
+
+After `/upgrade`, if you set new options to non-empty strings, and if old
+options were set to non-empty strings too, you will see double prefix/suffix
+on old messages, this is normal behavior (lines displayed before `/upgrade`
+have prefix/suffix saved in prefix, but new lines don't have them any more).
+
+New options in logger plugin (logger.conf):
+
+* 'logger.file.nick_prefix': prefix for nicks in log files (default: empty
+  string)
+* 'logger.file.nick_suffix': suffix for nicks in log files (default: empty
+  string)
+
+=== IRC reconnection on important lag ===
+
+Option 'irc.network.lag_disconnect' has been renamed to
+'irc.network.lag_reconnect' and value is now a number of seconds (instead of
+minutes).
+
+=== IRC passwords hidden ===
+
+IRC plugin is now using modifiers "irc_command_auth" and "irc_message_auth" to
+hide passwords.
+
+The option 'irc.look.hide_nickserv_pwd' has been removed, and a new option
+'irc.look.nicks_hide_password' has been added (by default passwords are hidden
+only for "nickserv").
+
+A new rmodifier "message_auth" has been added to hide passwords displayed by
+command "/msg nickserv identify|register|ghost|release" and the rmodifier
+"nickserv" has been renamed to "command_auth".
+
+If you never added/changed rmodifiers, you can just reset all rmodifiers:
+
+----------------------------------------
+/rmodifier default -yes
+----------------------------------------
+
+If you added/changed some rmodifiers, do it manually with these commands:
+
+----------------------------------------
+/rmodifier del nickserv
+/rmodifier add command_auth history_add,input_text_display,irc_command_auth 1,4* ^(/(msg|quote) +nickserv +(id|identify|register|ghost \S+|release \S+) +)(.*)
+/rmodifier add message_auth irc_message_auth 1,3* ^(.*(id|identify|register|ghost \S+|release \S+) +)(.*)
+----------------------------------------
+
+=== Lua constants ===
+
+For consistency with other supported languages, the API constants in Lua have
+been redefined as constants instead of functions.
+
+Therefore, the use of a constant must be changed: the parentheses must be
+removed.
+
+The old syntax was:
+
+[source,lua]
+----------------------------------------
+return weechat.WEECHAT_RC_OK()
+----------------------------------------
+
+The new syntax is:
+
+[source,lua]
+----------------------------------------
+return weechat.WEECHAT_RC_OK
+----------------------------------------
+
+=== Guile callbacks ===
+
+The way to give arguments for guile callbacks has been fixed: now arguments are
+sent individually (instead of a list with all arguments inside).
+
+Therefore, existing guile scripts must be modified accordingly. Moreover,
+WeeChat now requires Guile ≥ 2.0 to compile.
+
+Version 0.4.0 (2013-01-20)
+--------------------------
+
+=== Conditions in bars ===
+
+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 by default ===
+
+==== IRC ====
+
+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 ====
+
+Relay plugin 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)
 ----------------------------
@@ -38,181 +305,273 @@ This version fixes crash when decoding IRC colors in strings.
 Version 0.3.9 (2012-09-29)
 --------------------------
 
-Important release notes:
+=== Options moved ===
 
-* options moved from core (weechat.conf) to irc plugin (irc.conf):
-** 'weechat.look.nickmode' moved to 'irc.look.nick_mode' (new type: integer
+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
+* 'weechat.look.nickmode_empty' moved to 'irc.look.nick_mode_empty'
+
+=== New bar item buffer_modes ===
+
+A 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"
+----------------------------------------
+
+=== Command /aspell ===
+
+New options in command `/aspell`:
+
+* `enable`: enable aspell
+* `disable`: disable aspell
+* `toggle`: toggle aspell (new default key: alt+"s")
+
+Options renamed in command `/aspell`:
+
+* `enable` renamed to `setdict` (set dictionary for current buffer)
+* `disable` renamed to `deldict` (delete dictionary used on current buffer)
+* `dictlist` renamed to `listdict` (show installed dictionaries)
+
+=== Horizontal separator ===
+
+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 ===
+
+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 ===
 
-* 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
-  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:
-** `/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`).
-  If you added/changed some rmodifiers, do it manually with these two commannds:
-** `/rmodifier del nickserv`
-** `/rmodifier add nickserv history_add,input_text_display 1,4* ^(/(msg|quote) +nickserv +(id|identify|ghost \S+|release \S+) +)(.*)`
+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)
+
+=== Paste detection ===
+
+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
+
+----------------------------------------
+/set weechat.look.paste_max_lines -1
+----------------------------------------
+
+=== Rmodifier ===
+
+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:
+
+----------------------------------------
+/rmodifier default -yes
+----------------------------------------
+
+If you added/changed some rmodifiers, do it manually with these commands:
+
+----------------------------------------
+/rmodifier del nickserv
+/rmodifier add nickserv history_add,input_text_display 1,4* ^(/(msg|quote) +nickserv +(id|identify|ghost \S+|release \S+) +)(.*)
+----------------------------------------
 
 Version 0.3.7 (2012-02-26)
 --------------------------
 
-Important release notes:
+=== Options ===
 
-* 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:
-** `/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
-  `[0-9]+`), filters and ignore have to be manually fixed
-* option 'weechat.look.highlight_regex' becomes case insensitive by default,
-  to make it case sensitive, use "(?-i)" at beginning of string, for example:
-  "(?-i)FlashCode|flashy"
-* option 'weechat.history.max_lines' has been renamed to
-  'weechat.history.max_buffer_lines_number'
-* option 'weechat.plugin.extension' now supports list of extensions, and new
-  default value is ".so,.dll" (with this value, weechat.conf is compatible with
-  Cygwin)
+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:
+
+----------------------------------------
+/key bind meta-u /window scroll_unread
+----------------------------------------
+
+Option 'weechat.history.max_lines' has been renamed to
+'weechat.history.max_buffer_lines_number'.
+
+Option 'weechat.plugin.extension' now supports list of extensions, and new
+default value is ".so,.dll" (with this value, weechat.conf is compatible with
+Cygwin).
+
+=== Extended regex ===
+
+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 `[0-9]+`),
+filters and ignore have to be manually fixed.
+
+Option 'weechat.look.highlight_regex' becomes case insensitive by default, to
+make it case sensitive, use "(?-i)" at beginning of string, for example:
+"(?-i)FlashCode|flashy".
 
 Version 0.3.6 (2011-10-22)
 --------------------------
 
-Important release notes:
+=== Options ===
 
-* bold is not used any more for basic colors (used only if terminal has less
-  than 16 colors), a new option has been added to force bold if needed:
-  'weechat.look.color_basic_force_bold'
-* option 'weechat.look.hline_char' has been renamed to
-  'weechat.look.separator_horizontal'
+Option 'weechat.look.hline_char' has been renamed to
+'weechat.look.separator_horizontal'.
+
+=== Bold in colors ===
+
+Bold is not used any more for basic colors (used only if terminal has less than
+16 colors), a new option has been added to force bold if needed:
+'weechat.look.color_basic_force_bold'.
 
 Version 0.3.5 (2011-05-15)
 --------------------------
 
-Important release notes:
+=== Colors ===
 
-* if you have some colors defined in section "palette" with version 0.3.4, you
-  should remove all colors defined, and add new aliases (it's not needed any
-  more to add colors before using them)
-* colors for nick prefixes (char for op, voice, ..) are defined in a single
-  option 'irc.color.nick_prefixes', therefore following options will be lost:
-  'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
-  'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'
-* count of messages have been added to hotlist by default, if you want to come
-  back to old behavior, do that:
-** `/set weechat.look.hotlist_count_max 0`
-** `/set weechat.look.hotlist_buffer_separator ","`
-* when you are away, all buffers are now added to hotlist by default (even if
-  they are displayed in a window), if you want to come back to old behavior, do
-  that:
-** `/set weechat.look.hotlist_add_buffer_if_away off`
-* 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
+If you have some colors defined in section "palette" with version 0.3.4, you
+should remove all colors defined, and add new aliases (it's not needed any more
+to add colors before using them).
+
+Colors for nick prefixes (char for op, voice, ..) are defined in a single option
+'irc.color.nick_prefixes', therefore following options will be lost:
+'irc.color.nick_prefix_op', 'irc.color.nick_prefix_halfop',
+'irc.color.nick_prefix_voice', 'irc.color.nick_prefix_user'.
+
+=== Hotlist ===
+
+==== Counters ====
+
+Count of messages have been added to hotlist by default, if you want to come
+back to old behavior, do that:
+
+----------------------------------------
+/set weechat.look.hotlist_count_max 0
+/set weechat.look.hotlist_buffer_separator ","
+----------------------------------------
+
+==== Away and current buffer ====
+
+When you are away, all buffers are now added to hotlist by default (even if they
+are displayed in a window), if you want to come back to old behavior, do that:
+
+----------------------------------------
+/set weechat.look.hotlist_add_buffer_if_away off
+----------------------------------------
+
+=== New keys ===
+
+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.4 (2011-01-16)
 --------------------------
 
-Important release notes:
+=== After /upgrade ===
 
-* if you are using `/upgrade` from a previous release:
-** some nick prefixes can be wrong, so it is recommended to do `/allchan names`
-** nick colors are defined with a new option 'weechat.color.chat_nick_colors',
-   therefore old options 'weechat.color.chat_nick_color1..10' will be lost when
-   upgrading
-** nick colors in messages displayed will be wrong if you changed some nick colors
-   (old default colors will be used)
-* some IRC options have been renamed, before upgrading to this version, note
-  value for old options, and set them again with new name:
-** options moved from 'network' section to servers (with global value, and server
-   value, like other server options):
-*** 'irc.network.connection_timeout' moved to 'irc.server_default.connection_timeout'
-*** 'irc.network.anti_flood_prio_high' moved to 'irc.server_default.anti_flood_prio_high'
-*** 'irc.network.anti_flood_prio_low' moved to 'irc.server_default.anti_flood_prio_low'
-*** 'irc.network.away_check' moved to 'irc.server_default.away_check'
-*** 'irc.network.away_check_max_nicks' moved to 'irc.server_default.away_check_max_nicks'
-*** 'irc.network.default_msg_part' moved to 'irc.server_default.default_msg_part'
-*** 'irc.network.default_msg_quit' moved to 'irc.server_default.default_msg_quit'
-** other IRC options renamed:
-*** 'irc.look.open_channel_near_server' moved to 'irc.look.new_channel_position'
-    (old option was boolean, new is integer with value as string)
-*** 'irc.look.open_pv_near_server' moved to 'irc.look.new_pv_position'
-    (old option was boolean, new is integer with value as string)
+If you are using `/upgrade` from a previous release:
+
+* some nick prefixes can be wrong, so it is recommended to do `/allchan names`
+* nick colors are defined with a new option 'weechat.color.chat_nick_colors',
+  therefore old options 'weechat.color.chat_nick_color1..10' will be lost when
+  upgrading
+* nick colors in messages displayed will be wrong if you changed some nick colors
+  (old default colors will be used)
+
+=== Options ===
+
+Some IRC options have been renamed, before upgrading to this version, note
+value for old options, and set them again with new name:
+
+* options moved from 'network' section to servers (with global value, and server
+  value, like other server options):
+** 'irc.network.connection_timeout' moved to
+   'irc.server_default.connection_timeout'
+** 'irc.network.anti_flood_prio_high' moved to
+   'irc.server_default.anti_flood_prio_high'
+** 'irc.network.anti_flood_prio_low' moved to
+   'irc.server_default.anti_flood_prio_low'
+** 'irc.network.away_check' moved to 'irc.server_default.away_check'
+** 'irc.network.away_check_max_nicks' moved to
+   'irc.server_default.away_check_max_nicks'
+** 'irc.network.default_msg_part' moved to 'irc.server_default.default_msg_part'
+** 'irc.network.default_msg_quit' moved to 'irc.server_default.default_msg_quit'
+* other IRC options renamed:
+** 'irc.look.open_channel_near_server' moved to 'irc.look.new_channel_position'
+   (old option was boolean, new is integer with value as string)
+** 'irc.look.open_pv_near_server' moved to 'irc.look.new_pv_position'
+   (old option was boolean, new is integer with value as string)
 
 Version 0.3.3 (2010-08-07)
 --------------------------
 
-Important release notes:
+=== After /upgrade ===
 
-* 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).
+If you are using `/upgrade` from a previous release, then you must reconnect to
+IRC servers in order to use new command /wallchops.
+
+=== Options ===
+
+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).
 
 Version 0.3.2 (2010-04-18)
 --------------------------
 
+=== After /upgrade ===
+
 If you are using `/upgrade` from a previous release, then you must execute this
 command on all IRC servers/channels/private buffers and xfer DCC chats (not
-needed on WeeChat core buffer or buffers from other plugins/scripts): +
-`/buffer set highlight_words $nick`
+needed on WeeChat core buffer or buffers from other plugins/scripts):
+
+----------------------------------------
+/buffer set highlight_words $nick
+----------------------------------------
 
 Version 0.3.1.1 (2010-01-31)
 ----------------------------
 
-This version fixes crashs with SSL connection and purge of old DCC chats.
+This version fixes crashes with SSL connection and purge of old DCC chats.
 
 All users of version 0.3.1 should upgrade to this version.
 
 Version 0.3.1 (2010-01-23)
 --------------------------
 
+=== Aliases ===
+
 IRC commands /ame and /amsg are now aliases, if you are upgrading from version
-0.3.0, you must create aliases with following commands: +
-`/alias aaway allserv /away` +
-`/alias ame allchan /me` +
-`/alias amsg allchan /amsg *` +
-`/alias anick allserv /nick`
+0.3.0, you must create aliases with following commands:
+
+----------------------------------------
+/alias aaway allserv /away
+/alias ame allchan /me
+/alias amsg allchan /amsg *
+/alias anick allserv /nick
+----------------------------------------
 
 Version 0.3.0 (2009-09-06)
 --------------------------
 
-This version brings major changes, especially for configuration files and plugin
-API and it not compatible with previous versions.
+This version brings *MAJOR* changes, especially for configuration files and
+plugin API and it not compatible with previous versions.
 
 Major differences:
 
@@ -271,26 +630,47 @@ All users of version 0.2.2 should upgrade to this version.
 Version 0.2.2 (2007-01-06)
 --------------------------
 
-Important release notes:
+=== Charset plugin ===
 
-* new charset plugin:
-** for users of any previous version, all your charset settings in weechat.rc
-   will be LOST! You should save your weechat.rc to keep your values and set
-   them again with new 'charset' plugin.
-** for ISO users: history of channels may be without accents (after `/upgrade`),
-   this is not recoverable, but this is not a bug. All new messages should be
-   ok.
-** be careful, now default encode is UTF-8 for all channels (before it was
-   terminal charset). If you still want to send messages as 'ISO-8859-1', you
-   should send either global encode or server specific encode to 'ISO-8859-1':
-*** for global encode: `/setp charset.global.encode = "ISO-8859-1"`
-*** for server encode (on server buffer): `/charset encode ISO-8859-1`
-* new keys for topic scroll:
-** 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
-    like: `/key meta2-21~ scroll_topic_right`).
+For users of any previous version, all your charset settings in weechat.rc will
+be LOST! You should save your weechat.rc to keep your values and set them again
+with new 'charset' plugin.
+
+For ISO users: history of channels may be without accents (after `/upgrade`),
+this is not recoverable, but this is not a bug. All new messages should be OK.
+
+Be careful, now default encode is UTF-8 for all channels (before it was terminal
+charset). If you still want to send messages as 'ISO-8859-1', you should set
+either global encode or server specific encode to 'ISO-8859-1'.
+
+For global encode:
+
+----------------------------------------
+/setp charset.global.encode = "ISO-8859-1"
+----------------------------------------
+
+For server encode (on server buffer):
+
+----------------------------------------
+/charset encode ISO-8859-1
+----------------------------------------
+
+=== New keys ===
+
+New keys for topic scroll: 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 like:
+
+----------------------------------------
+/key meta2-21~ scroll_topic_right
+----------------------------------------
 
 Version 0.2.1 (2006-10-01)
 --------------------------
@@ -300,71 +680,98 @@ No release note.
 Version 0.2.0 (2006-08-19)
 --------------------------
 
-Important release notes:
+=== After /upgrade ===
 
-* if you upgraded with `/upgrade` in WeeChat, you should `/disconnect` and then
-  `/reconnect` on each server, to display properly channel/user modes.
-* if you're using plugins, you should remove some old plugins libraries in
-  WeeChat system library directory (commonly '/usr/local/lib/weechat/plugins'):
-  remove `lib*` files (like `libperl.*`, `libpython.*`, ..) and keep only new
-  libraries (`perl.*`, `python.*`, ..).
+If you upgraded with `/upgrade` in WeeChat, you should `/disconnect` and then
+`/reconnect` on each server, to display properly channel/user modes.
+
+=== Plugins ===
+
+If you're using plugins, you should remove some old plugins libraries in WeeChat
+system library directory (commonly '/usr/local/lib/weechat/plugins'): remove
+`lib*` files (like `libperl.*`, `libpython.*`, ..) and keep only new libraries
+(`perl.*`, `python.*`, ..).
 
 Version 0.1.9 (2006-05-25)
 --------------------------
 
-Important release notes:
+=== DCC chat ===
 
-* please close all DCC chat buffers before using /upgrade command, otherwise you
-  may experience problems with DCC chats.
-* some changes in script API: now timer handlers functions takes exactly
-  0 (zero) argument (in version 0.1.8, two arguments were mandatory but not
-  used: server and args).
+Please close all DCC chat buffers before using /upgrade command, otherwise you
+may experience problems with DCC chats.
+
+=== Script API ===
+
+Some changes in script API: now timer handlers functions takes exactly 0 (zero)
+argument (in version 0.1.8, two arguments were mandatory but not used: server
+and arguments).
 
 Version 0.1.8 (2006-03-18)
 --------------------------
 
-Important release notes:
+=== After /upgrade ===
 
-* it is recommended for users of version 0.1.7 (or any older), to
-  replace values in setup file ('~/.weechat/weechat.rc'):
-** option: log_path: replace '~/.weechat/logs' by '%h/logs'
-** option: plugins_path: replace '~/.weechat/plugins' by '%h/plugins' +
-   '%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}):
-** `/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}.
+After installing 0.1.8 (or with `/upgrade`), issue both commands (if you 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`).
+
+=== Configuration files ===
+
+It is recommended for users of version 0.1.7 (or any older), to replace values
+in setup file ('~/.weechat/weechat.rc'):
+
+* option: log_path: replace '~/.weechat/logs' by '%h/logs'
+* option: plugins_path: replace '~/.weechat/plugins' by '%h/plugins'
+
+The string '%h' is replaced by WeeChat home (default: '~/.weechat', may be
+overridden by new command line argument `--dir`).
+
+=== Keys ===
+
+Keys alt+{home|end} were used for nicklist scroll, they're now replaced by
+alt+{F11|F12}.
 
 Version 0.1.7 (2006-01-14)
 --------------------------
 
-Important release notes:
+=== Ruby ===
 
-* Ruby script plugin has been added but is experimental in this release.
-  You're warned!
-* `/away` command was changed to be RFC 2812 compliant. Now argument is required
-  to set away, and no argument means remove away ("back"). Option
-  'irc_default_msg_away' has been removed.
+Ruby script plugin has been added but is experimental in this release. You're
+warned!
+
+=== Command /away ===
+
+Command `/away` was changed to be RFC 2812 compliant. Now argument is required
+to set away, and no argument means remove away ("back").
+
+Option 'irc_default_msg_away' has been removed.
 
 Version 0.1.6 (2005-11-11)
 --------------------------
 
-Important release notes:
+=== Script API ===
 
-* incompatibility with some old scripts: now all handlers have to return a code
-  for completion, and to do some actions about message to ignore (please look at
-  documentation for detail).
-* on OpenBSD, the new option 'plugins_extension' should be set to '.so.0.0'
-  since the plugins names are ending by '.so.0.0' and not '.so'.
-* with new and full UTF-8 support, the option 'look_charset_internal' should be
-  set to blank for most cases. Forces it only if your locale is not properly
-  detected by WeeChat (you can set 'UTF-8' or 'ISO-8859-15' for example,
-  depending on your locale). WeeChat is looking for 'UTF-8' in your locale name
-  at startup.
+Incompatibility with some old scripts: now all handlers have to return a code
+for completion, and to do some actions about message to ignore (please look at
+documentation for detail).
+
+=== OpenBSD ===
+
+On OpenBSD, the new option 'plugins_extension' should be set to '.so.0.0' since
+the plugins names are ending by '.so.0.0' and not '.so'.
+
+=== UTF-8 ===
+
+With new and full UTF-8 support, the option 'look_charset_internal' should be
+set to blank for most cases. Forces it only if your locale is not properly
+detected by WeeChat (you can set 'UTF-8' or 'ISO-8859-15' for example, depending
+on your locale). WeeChat is looking for 'UTF-8' in your locale name at startup.
 
 Version 0.1.5 (2005-09-24)
 --------------------------

cmake/FindAsciidoc.cmake

@@ -30,7 +30,12 @@ FIND_PROGRAM(
   PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )
 
-IF(ASCIIDOC_EXECUTABLE)
+FIND_PROGRAM(
+  A2X_EXECUTABLE a2x
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+IF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
   EXECUTE_PROCESS(
     COMMAND ${ASCIIDOC_EXECUTABLE} --version
     OUTPUT_VARIABLE ASCIIDOC_VERSION
@@ -43,4 +48,4 @@ IF(ASCIIDOC_EXECUTABLE)
   MARK_AS_ADVANCED(
     ASCIIDOC_EXECUTABLE
     )
-ENDIF(ASCIIDOC_EXECUTABLE)
+ENDIF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)

cmake/FindENCHANT.cmake

@@ -0,0 +1,44 @@
+# - Try to find the Enchant spell checker
+# Once done this will define
+#
+#  ENCHANT_FOUND - system has ENCHANT
+#  ENCHANT_INCLUDE_DIR - the ENCHANT include directory
+#  ENCHANT_LIBRARIES - Link these to use ENCHANT
+#  ENCHANT_DEFINITIONS - Compiler switches required for using ENCHANT
+
+# Copyright (c) 2006, Zack Rusin, <zack@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+  # in cache already
+  set(ENCHANT_FOUND TRUE)
+
+else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_ENCHANT enchant)
+    set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(ENCHANT_INCLUDE_DIR
+            NAMES enchant++.h
+            HINTS ${PC_ENCHANT_INCLUDEDIR}
+                  ${PC_ENCHANT_INCLUDE_DIRS}
+            PATH_SUFFIXES enchant )
+
+  find_library(ENCHANT_LIBRARIES NAMES enchant
+               HINTS ${PC_ENCHANT_LIBDIR}
+                      ${PC_ENCHANT_LIBRARY_DIRS} )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )
+
+  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
+
+endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)

cmake/FindGuile.cmake

@@ -31,21 +31,7 @@ IF(GUILE_FOUND)
    SET(GUILE_FIND_QUIETLY TRUE)
 ENDIF(GUILE_FOUND)
 
-FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
-
-FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
-
-IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND TRUE)
-  SET(GUILE_INCLUDE_DIRS ${GUILE_INCLUDE_DIR})
-  SET(GUILE_LIBRARIES ${GUILE_LIBRARY})
-ELSE(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND FALSE)
-  SET(GUILE_INCLUDE_DIRS)
-  SET(GUILE_LIBRARIES)
-ENDIF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-
-MARK_AS_ADVANCED(
-  GUILE_INCLUDE_DIR
-  GUILE_LIBRARY
-  )
+FIND_PACKAGE(PkgConfig)
+IF(PKG_CONFIG_FOUND)
+  pkg_search_module(GUILE guile-2.0)
+ENDIF(PKG_CONFIG_FOUND)

cmake/FindIconv.cmake

@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
 IF(ICONV_INCLUDE_PATH)
   IF(ICONV_LIBRARY)
     STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    IF(NOT ICONV_FOUND)
-      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    ENDIF(NOT ICONV_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
+    IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
+       SET(ICONV_FOUND TRUE)
+    ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
   ELSE(ICONV_LIBRARY)
     CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)

cmake/FindPython.cmake

@@ -47,7 +47,7 @@ ENDIF(ENABLE_PYTHON3)
 
 IF(PYTHON_EXECUTABLE)
   EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('CONFINCLUDEPY'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
     OUTPUT_VARIABLE PYTHON_INC_DIR
     )
 

cmake/cmake_uninstall.cmake.in

@@ -23,18 +23,17 @@ ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 
 FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 STRING(REGEX REPLACE "\n" ";" files "${files}")
+LIST(REVERSE files)
 FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
-  IF(NOT EXISTS "${file}")
-    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
-  ENDIF(NOT EXISTS "${file}")
-  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
-    OUTPUT_VARIABLE rm_out
-    RETURN_VARIABLE rm_retval)
-  IF("${rm_retval}" GREATER 0)
-    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
-  ENDIF("${rm_retval}" GREATER 0)
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+    EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VARIABLE rm_retval)
+    IF("${rm_retval}" GREATER 0)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    ENDIF("${rm_retval}" GREATER 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
-
-
-

config.h.cmake

@@ -1,27 +1,9 @@
-#cmakedefine HAVE_ARPA_INET_H
 #cmakedefine HAVE_LIBINTL_H
-#cmakedefine HAVE_LIMITS_H
-#cmakedefine HAVE_LOCALE_H
-#cmakedefine HAVE_NETDB_H
-#cmakedefine HAVE_NETINET_IN_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_SOCKET_H
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_SYS_TYPES_H
-#cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_PWD_H
-#cmakedefine HAVE_ERRNO_H
-#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
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine ICONV_2ARG_IS_CONST 1
-#cmakedefine HAVE_TCL_CREATE_NS
 #cmakedefine HAVE_MALLINFO
 #cmakedefine HAVE_EAT_NEWLINE_GLITCH
 #define PACKAGE_VERSION "@VERSION@"
@@ -32,4 +14,5 @@
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
+#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1

configure.ac

@@ -24,8 +24,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.4.0-rc3, flashcode@flashtux.org)
-AC_CONFIG_SRCDIR([configure.in])
+AC_INIT(WeeChat, 0.4.2-rc1, flashcode@flashtux.org)
+AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
 LICENSE="GPL3"
@@ -34,6 +34,7 @@ LICENSE="GPL3"
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_GNU_SOURCE
+AC_PROG_LN_S
 AM_PROG_LIBTOOL
 
 # Files to generate
@@ -58,9 +59,9 @@ cygwin*)
 esac
 
 # Gettext
-ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR"
+ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR tr"
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.18])
 
 # Checks for libraries
 AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
@@ -68,7 +69,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 sys/resource.h])
+AC_CHECK_HEADERS([libintl.h sys/resource.h])
 
 # Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
@@ -91,7 +92,7 @@ AC_MSG_RESULT($ac_cv_type_socklen_t)
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strndup strncasecmp strpbrk strrchr strstr regexec mallinfo])
+AC_CHECK_FUNCS([mallinfo])
 
 # Variables in config.h
 
@@ -104,7 +105,6 @@ AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
 AH_VERBATIM([PLUGIN_ALIAS],            [#undef PLUGIN_ALIAS])
 AH_VERBATIM([PLUGIN_ASPELL],           [#undef PLUGIN_ASPELL])
 AH_VERBATIM([PLUGIN_CHARSET],          [#undef PLUGIN_CHARSET])
-AH_VERBATIM([PLUGIN_DEMO],             [#undef PLUGIN_DEMO])
 AH_VERBATIM([PLUGIN_FIFO],             [#undef PLUGIN_FIFO])
 AH_VERBATIM([PLUGIN_IRC],              [#undef PLUGIN_IRC])
 AH_VERBATIM([PLUGIN_LOGGER],           [#undef PLUGIN_LOGGER])
@@ -118,19 +118,20 @@ AH_VERBATIM([PLUGIN_LUA],              [#undef PLUGIN_LUA])
 AH_VERBATIM([PLUGIN_TCL],              [#undef PLUGIN_TCL])
 AH_VERBATIM([PLUGIN_GUILE],            [#undef PLUGIN_GUILE])
 AH_VERBATIM([PLUGIN_XFER],             [#undef PLUGIN_XFER])
+AH_VERBATIM([MAN],                     [#undef MAN])
 AH_VERBATIM([DOC],                     [#undef DOC])
 AH_VERBATIM([WEECHAT_HOME],            [#define WEECHAT_HOME "~/.weechat"])
+AH_VERBATIM([CA_FILE],                 [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
 
 # Arguments for ./configure
 
 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(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=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)
+AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Aspell plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(charset,      [  --disable-charset       turn off Charset plugin (default=compiled if found)],enable_charset=$enableval,enable_charset=yes)
-AC_ARG_ENABLE(demo,         [  --enable-demo           turn on Demo plugin (default=off)],enable_demo=$enableval,enable_demo=no)
 AC_ARG_ENABLE(fifo,         [  --disable-fifo          turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes)
 AC_ARG_ENABLE(irc,          [  --disable-irc           turn off IRC plugin (default=compiled)],enable_irc=$enableval,enable_irc=yes)
 AC_ARG_ENABLE(logger,       [  --disable-logger        turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes)
@@ -150,16 +151,23 @@ AC_ARG_WITH(lua-inc,        [  --with-lua-inc=DIR,     lua include files are in
 AC_ARG_WITH(lua-lib,        [  --with-lua-lib=DIR,     lua library files are in DIR (default=autodetect)],lua_lib=$withval,lua_lib='')
 AC_ARG_WITH(lua-suffix,     [  --with-lua-suffix=ARG   lua is suffixed with ARG (default=autodetect)],lua_suffix=$withval,lua_suffix='')
 AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
-AC_ARG_ENABLE(doc,          [  --disable-doc           turn off documentation (default=built)],enable_doc=$enableval,enable_doc=yes)
+AC_ARG_ENABLE(man,          [  --enable-man            turn on build of man page (default=not built)],enable_man=$enableval,enable_man=no)
+AC_ARG_ENABLE(doc,          [  --enable-doc            turn on build of documentation (default=not built)],enable_doc=$enableval,enable_doc=no)
 AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)
 
 AC_ARG_VAR(WEECHAT_HOME, [WeeChat home directory for config, logs, scripts.. (default is "~/.weechat")])
+AC_ARG_VAR(CA_FILE, [File containing the certificate authorities (default is "/etc/ssl/certs/ca-certificates.crt"). This is the default value of option "weechat.network.gnutls_ca_file".])
 
 if test "x$WEECHAT_HOME" = "x" ; then
     WEECHAT_HOME="~/.weechat"
 fi
 AC_DEFINE_UNQUOTED(WEECHAT_HOME, "$WEECHAT_HOME")
 
+if test "x$CA_FILE" = "x" ; then
+    CA_FILE="/etc/ssl/certs/ca-certificates.crt"
+fi
+AC_DEFINE_UNQUOTED(CA_FILE, "$CA_FILE")
+
 not_asked=""
 not_found=""
 
@@ -207,24 +215,6 @@ else
     not_asked="$not_asked ncurses"
 fi
 
-if test "x$enable_gtk" = "xyes" ; then
-    AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0)
-    if test "$LIBGTK_FOUND" = "0" ; then
-        AC_MSG_WARN([
-*** Gtk library not found!
-*** WeeChat will be built without Gtk support.])
-        enable_gtk="no"
-        not_found="$not_found gtk"
-    else
-        GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
-        GTK_LFLAGS=`pkg-config --libs gtk+-2.0`
-        AC_SUBST(GTK_CFLAGS)
-        AC_SUBST(GTK_LFLAGS)
-    fi
-else
-    not_asked="$not_asked gtk"
-fi
-
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -294,24 +284,35 @@ fi
 # ---------------------------------- aspell ------------------------------------
 
 if test "x$enable_aspell" = "xyes" ; then
-    ASPELL_CFLAGS=""
-    ASPELL_LFLAGS=""
+    ac_found_enchant_lib="no"
+    if test "x$enable_enchant" = "xyes" ; then
+        #PKG_CHECK_MODULES(ENCHANT, [enchant], [CFLAGS="$CFLAGS -DUSE_ENCHANT"],
+        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
+    fi
+    if test "x$ac_found_enchant_lib" = "xyes" ; then
+        CFLAGS="$CFLAGS -DUSE_ENCHANT"
+        ASPELL_LIB_USED="enchant"
+    else
+        ASPELL_CFLAGS=""
+        ASPELL_LFLAGS=""
 
-    AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-    AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
 
-    AC_MSG_CHECKING(for aspell headers and librairies)
-    if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-       AC_MSG_RESULT(no)
-       AC_MSG_WARN([
+        AC_MSG_CHECKING(for aspell headers and librairies)
+        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+            AC_MSG_RESULT(no)
+            AC_MSG_WARN([
 *** Aspell headers and/or libraries couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat will be built without Aspell support.])
-       enable_aspell="no"
-       not_found="$not_found aspell"
-    else
-        AC_MSG_RESULT(yes)
-        ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            enable_aspell="no"
+            not_found="$not_found aspell"
+        else
+            AC_MSG_RESULT(yes)
+            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            ASPELL_LIB_USED="aspell"
+        fi
     fi
 else
     not_asked="$not_asked aspell"
@@ -335,18 +336,6 @@ else
     not_asked="$not_asked charset"
 fi
 
-# ---------------------------------- demo --------------------------------------
-
-if test "x$enable_demo" = "xyes" ; then
-    DEMO_CFLAGS=""
-    DEMO_LFLAGS=""
-    AC_SUBST(DEMO_CFLAGS)
-    AC_SUBST(DEMO_LFLAGS)
-    AC_DEFINE(PLUGIN_DEMO)
-else
-    not_asked="$not_asked demo"
-fi
-
 # ---------------------------------- fifo --------------------------------------
 
 if test "x$enable_fifo" = "xyes" ; then
@@ -481,7 +470,7 @@ if test "x$enable_python" = "xyes" ; then
     else
         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_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
         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([
@@ -754,20 +743,26 @@ if test "x$enable_guile" = "xyes" ; then
     enable_plugins="yes"
 
     guile_found="no"
-    GUILECONFIG=""
-    AC_CHECK_PROGS(GUILECONFIG, guile-config)
-    if test "x$GUILECONFIG" != "x" ; then
-        AC_MSG_CHECKING(for Guile headers and librairies with guile-config)
+    PKGCONFIG=""
+    AC_CHECK_PROGS(PKGCONFIG, pkg-config)
+    if test "x$PKGCONFIG" != "x"; then
+        AC_MSG_CHECKING(for Guile headers and librairies)
         echo
-        GUILE_CFLAGS=`$GUILECONFIG compile`
-        GUILE_LFLAGS=`$GUILECONFIG link`
-        GUILE_VERSION=`$GUILECONFIG info guileversion`
-        tcl_found="yes"
+        for v in "2.0" ; do
+            pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
+            if test "x$?" = "x0" ; then
+                GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
+                GUILE_CFLAGS=`$PKGCONFIG --cflags guile-$v`
+                GUILE_LFLAGS=`$PKGCONFIG --libs guile-$v`
+                guile_found="yes"
+                break
+            fi
+        done
     fi
 
-    if test "x$tcl_found" = "xno" ; then
+    if test "x$guile_found" = "xno" ; then
         AC_MSG_WARN([
-*** Script guile-config couldn't be found on your system.
+*** Guile >= 2.0 couldn't be found on your system.
 *** WeeChat will be built without Guile (scheme) support.])
         enable_guile="no"
         not_found="$not_found guile"
@@ -946,44 +941,68 @@ AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LFLAGS)
 
 # ------------------------------------------------------------------------------
-#                               documentation
+#                           man page / documentation
 # ------------------------------------------------------------------------------
 
+msg_man=""
 msg_doc=""
 
-if test "x$enable_doc" = "xyes" ; then
+if test "x$enable_man" = "xno"; then
+    not_asked="$not_asked man"
+fi
+if test "x$enable_doc" = "xno"; then
+    not_asked="$not_asked doc"
+fi
+
+if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
     DOC_ASCIIDOC8=""
     AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+    AC_CHECK_PROGS(A2X, [a2x])
     AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight])
-    if test -n "$SOURCEHIGHLIGHT" -a -n "$ASCIIDOC"; then
+    if test -z "$A2X"; then
+        not_found="$not_found a2x(from asciidoc)"
+    fi
+    if test -z "$SOURCEHIGHLIGHT"; then
+        not_found="$not_found source-highlight(needed by asciidoc)"
+    fi
+    if test -n "$ASCIIDOC"; then
         AC_MSG_CHECKING([for asciidoc version])
         asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
         case "${asciidoc_version}" in
         asciidoc' '8*)
                 DOC_ASCIIDOC8="yes"
                 AC_MSG_RESULT([${asciidoc_version}])
-                msg_doc="asciidoc(with source-highlight) $msg_doc"
-                AC_DEFINE(DOC)
+                if test "x$enable_man" = "xyes"; then
+                    if test -n "$A2X"; then
+                        msg_man="asciidoc(with a2x) $msg_man"
+                        AC_DEFINE(MAN)
+                    else
+                        enable_man="no"
+                    fi
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    if test -n "$SOURCEHIGHLIGHT"; then
+                        msg_doc="asciidoc(with source-highlight) $msg_doc"
+                        AC_DEFINE(DOC)
+                    else
+                        enable_doc="no"
+                    fi
+                fi
                 ;;
         *)
                 AC_MSG_RESULT([${asciidoc_version} (too old)])
                 not_found="$not_found asciidoc"
+                enable_man="no"
+                enable_doc="no"
                 ;;
         esac
     else
+        not_found="$not_found asciidoc"
+        enable_man="no"
         enable_doc="no"
     fi
-    if test -z "$ASCIIDOC"; then
-        not_found="$not_found asciidoc"
-    fi
-    if test -z "$SOURCEHIGHLIGHT"; then
-        not_found="$not_found source-highlight(needed by asciidoc)"
-    fi
-    AC_SUBST(DOC_ASCIIDOC8)
     AC_SUBST(ASCIIDOC)
-else
-    not_asked="$not_asked doc"
-    msg_doc=""
+    AC_SUBST(A2X)
 fi
 
 # ------------------------------------------------------------------------------
@@ -1066,11 +1085,9 @@ 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")
 AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "yes")
-AM_CONDITIONAL(GUI_GTK,                 test "$enable_gtk" = "yes")
 AM_CONDITIONAL(PLUGIN_ALIAS,            test "$enable_alias" = "yes")
 AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
-AM_CONDITIONAL(PLUGIN_DEMO,             test "$enable_demo" = "yes")
 AM_CONDITIONAL(PLUGIN_FIFO,             test "$enable_fifo" = "yes")
 AM_CONDITIONAL(PLUGIN_IRC,              test "$enable_irc" = "yes")
 AM_CONDITIONAL(PLUGIN_LOGGER,           test "$enable_logger" = "yes")
@@ -1084,6 +1101,7 @@ AM_CONDITIONAL(PLUGIN_LUA,              test "$enable_lua" = "yes")
 AM_CONDITIONAL(PLUGIN_TCL,              test "$enable_tcl" = "yes")
 AM_CONDITIONAL(PLUGIN_GUILE,            test "$enable_guile" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
+AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")
 
 AC_OUTPUT([Makefile
@@ -1102,7 +1120,6 @@ AC_OUTPUT([Makefile
            src/plugins/alias/Makefile
            src/plugins/aspell/Makefile
            src/plugins/charset/Makefile
-           src/plugins/demo/Makefile
            src/plugins/fifo/Makefile
            src/plugins/irc/Makefile
            src/plugins/logger/Makefile
@@ -1118,7 +1135,6 @@ AC_OUTPUT([Makefile
            src/plugins/xfer/Makefile
            src/gui/Makefile
            src/gui/curses/Makefile
-           src/gui/gtk/Makefile
            intl/Makefile
            po/Makefile.in])
 
@@ -1130,14 +1146,11 @@ listgui=""
 if test "x$enable_ncurses" = "xyes" ; then
     listgui="$listgui ncurses"
 fi
-if test "x$enable_gtk" = "xyes" ; then
-    listgui="$listgui gtk"
-fi
 
 if test "x$listgui" = "x" ; then
     AC_MSG_ERROR([
 *** No interface specified...
-*** Please enable at least ncurses or gtk.])
+*** Please enable at least ncurses.])
 fi
 
 listplugins=""
@@ -1145,14 +1158,11 @@ if test "x$enable_alias" = "xyes"; then
     listplugins="$listplugins alias"
 fi
 if test "x$enable_aspell" = "xyes"; then
-    listplugins="$listplugins aspell"
+    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
 fi
 if test "x$enable_charset" = "xyes"; then
     listplugins="$listplugins charset"
 fi
-if test "x$enable_demo" = "xyes"; then
-    listplugins="$listplugins demo"
-fi
 if test "x$enable_fifo" = "xyes"; then
     listplugins="$listplugins fifo"
 fi
@@ -1212,6 +1222,11 @@ if test "x$debug" != "x0"; then
     msg_debug="yes"
 fi
 
+if test "x$msg_man" = "x"; then
+    msg_man="no"
+else
+    msg_man="yes: $msg_man"
+fi
 if test "x$msg_doc" = "x"; then
     msg_doc="no"
 else
@@ -1220,11 +1235,13 @@ fi
 
 echo ""
 echo "Enabled features:"
-echo "   Interfaces........... :$listgui"
-echo "   Plugins.............. :$listplugins"
-echo "   Optional features.... :$listoptional"
-echo "   Compile with debug... : $msg_debug"
-echo "   Documentation........ : $msg_doc"
+echo "   Interfaces............. :$listgui"
+echo "   Plugins................ :$listplugins"
+echo "   Optional features...... :$listoptional"
+echo "   Compile with debug..... : $msg_debug"
+echo "   Man page............... : $msg_man"
+echo "   Documentation.......... : $msg_doc"
+echo "   Certificate authorities : ${CA_FILE}"
 
 if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
     echo ""

debian/changelog

@@ -1,3 +1,29 @@
+weechat (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Move guile build dependency to guile-2.0-dev (previous versions are
+    no longer supported).
+  * Add supported protocols in long description. Thanks to Jonas Smedegaard
+    for the suggestion (Closes: #705216)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 21 May 2013 19:44:31 +0000
+
+weechat (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4
+  * Remove UPGRADE_0.3 from doc (no more included in upstream sources).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Jan 2013 18:44:36 +0000
+
+weechat (0.3.9.2-1) unstable; urgency=low
+
+  * New upstream release
+    - do not call shell to execute command in hook_process (fix security
+    problem when a plugin/script gives untrusted command)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 18 Nov 2012 13:35:21 +0000
+
 weechat (0.3.9.1-1) unstable; urgency=low
 
   * New upstream release

debian/control

@@ -2,12 +2,12 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
-Build-Depends-Indep: asciidoc (>= 8.5), source-highlight
 Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
  ruby1.9.1, ruby1.9.1-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, guile-1.8-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
- zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.9.3
+ tcl8.5-dev, guile-2.0-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
+ zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config, asciidoc (>= 8.5), source-highlight,
+ xsltproc, docbook-xml, docbook-xsl
+Standards-Version: 3.9.4
 Homepage: http://weechat.org/
 Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git
@@ -20,6 +20,8 @@ Description: Fast, light and extensible chat client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
   - nicklist
   - smart hotlist
   - horizontal and vertical split
@@ -45,6 +47,8 @@ Description: Fast, light and extensible chat client - console client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
   - nicklist
   - smart hotlist
   - horizontal and vertical split

debian/rules

@@ -14,6 +14,8 @@ $(BUILDDIR)/Makefile:
 	mkdir -p $(BUILDDIR)
 	cd $(BUILDDIR) && \
 	cmake .. \
+		-DENABLE_MAN:BOOL=ON \
+		-DENABLE_DOC:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
@@ -24,6 +26,13 @@ $(BUILDDIR)/Makefile:
 override_dh_auto_build: $(BUILDDIR)/Makefile
 	dh_auto_build
 
+# Create a symbolic link weechat-curses -> weechat
+# This link is created for compatibility with old versions on /upgrade.
+# It may be removed in future.
+override_dh_auto_install:
+	dh_auto_install
+	ln -s weechat $(CURDIR)/debian/weechat-curses/usr/bin/weechat-curses
+
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed

debian/weechat-curses.install

@@ -1,2 +1,4 @@
-usr/bin/weechat-curses
+usr/bin/weechat
 debian/weechat.xpm usr/share/pixmaps
+usr/share/man/man1/weechat.1
+usr/share/man/*/man1/weechat.1

debian/weechat-curses.lintian-overrides

@@ -1 +0,0 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 65: warning [p 1, 9.7i]: cannot adjust line

debian/weechat-curses.manpages

@@ -1 +0,0 @@
-doc/weechat-curses.1

debian/weechat-curses.menu

@@ -1,4 +1,4 @@
 ?package(weechat-curses):needs="text" section="Applications/Network/Communication" \
-		title="weechat-curses" \
+		title="weechat" \
 		icon="/usr/share/pixmaps/weechat.xpm" \
-		command="/usr/bin/weechat-curses"
+		command="/usr/bin/weechat"

debian/weechat.xpm

@@ -1,295 +1,397 @@
-/* XPM */
-static char *weechat[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 257 2",
-"   c #000000",
-".  c #0A0904",
-"X  c #080813",
-"o  c #080716",
-"O  c #110D08",
-"+  c #150A15",
-"@  c #1A0D1A",
-"#  c #19150C",
-"$  c #151517",
-"%  c #1F1F32",
-"&  c #13132C",
-"*  c #260A26",
-"=  c #351935",
-"-  c #271927",
-";  c #262608",
-":  c #322C0C",
-">  c #36380B",
-",  c #353316",
-"<  c #232516",
-"1  c #242224",
-"2  c #292935",
-"3  c #2D302D",
-"4  c #2D3330",
-"5  c #3B333B",
-"6  c #1D1C4A",
-"7  c #110F7B",
-"8  c #0E0D65",
-"9  c #221F60",
-"0  c #282948",
-"q  c #292855",
-"w  c #333447",
-"e  c #383855",
-"r  c #2A2978",
-"t  c #302F70",
-"y  c #353465",
-"u  c #363574",
-"i  c #2A286E",
-"p  c #2E4110",
-"a  c #39410C",
-"s  c #3E4C11",
-"d  c #3F5220",
-"f  c #394041",
-"g  c #3E4753",
-"h  c #493F11",
-"j  c #4F1050",
-"k  c #4A0F4B",
-"l  c #572657",
-"z  c #4D374D",
-"x  c #403F6F",
-"c  c #640964",
-"v  c #641E64",
-"b  c #701770",
-"n  c #790A79",
-"m  c #683C68",
-"M  c #623662",
-"N  c #6B2B6B",
-"B  c #454A08",
-"V  c #484C15",
-"C  c #554B16",
-"Z  c #58560A",
-"A  c #595B0B",
-"S  c #545715",
-"D  c #4C5712",
-"F  c #4D5034",
-"G  c #504F24",
-"H  c #4E710E",
-"J  c #4D7C1C",
-"K  c #5B6713",
-"L  c #506B11",
-"P  c #546927",
-"I  c #506D2E",
-"U  c #665B14",
-"Y  c #696C0C",
-"T  c #68730D",
-"R  c #6F7010",
-"E  c #707128",
-"W  c #4D504D",
-"Q  c #46456A",
-"!  c #4C4C7B",
-"~  c #434577",
-"^  c #554C69",
-"/  c #5B5A7D",
-"(  c #54547A",
-")  c #535964",
-"_  c #567745",
-"`  c #4D6B57",
-"'  c #5D6C78",
-"]  c #587069",
-"[  c #6A487C",
-"{  c #6D576D",
-"}  c #645475",
-"|  c #76557A",
-" . c #786678",
-".. c #70707D",
-"X. c #676768",
-"o. c #3F3E82",
-"O. c #2D2BAA",
-"+. c #3D3BA4",
-"@. c #3B39B9",
-"#. c #484888",
-"$. c #4A4C96",
-"%. c #585885",
-"&. c #595890",
-"*. c #555494",
-"=. c #4745A6",
-"-. c #4947B5",
-";. c #514FBB",
-":. c #5A58BB",
-">. c #5C5BAF",
-",. c #755581",
-"<. c #605FB6",
-"1. c #6B6883",
-"2. c #68679B",
-"3. c #7A7497",
-"4. c #76698F",
-"5. c #6968A6",
-"6. c #706FB5",
-"7. c #7675BB",
-"8. c #6E6DB6",
-"9. c #4947C3",
-"0. c #5351C2",
-"q. c #5D5BC0",
-"w. c #6B6ACC",
-"e. c #6361C7",
-"r. c #7170C6",
-"t. c #7877D2",
-"y. c #56840C",
-"u. c #6A8814",
-"i. c #63980B",
-"p. c #748614",
-"a. c #7F9C0D",
-"s. c #749218",
-"d. c #698F13",
-"f. c #6C852A",
-"g. c #798C35",
-"h. c #76912B",
-"j. c #76B505",
-"k. c #70A50F",
-"l. c #7EA525",
-"z. c #678946",
-"x. c #A57A5A",
-"c. c #9A1E9A",
-"v. c #861B86",
-"b. c #912B92",
-"n. c #8A298A",
-"m. c #A030A0",
-"M. c #864886",
-"N. c #8F469E",
-"B. c #975897",
-"V. c #8A788A",
-"C. c #936A93",
-"Z. c #987599",
-"A. c #866892",
-"S. c #9470AB",
-"D. c #A25FA2",
-"F. c #B16FB1",
-"G. c #B07FB1",
-"H. c #B776B7",
-"J. c #807FD0",
-"K. c #A37AC2",
-"L. c #87880B",
-"P. c #888513",
-"I. c #869A0A",
-"U. c #8B9B14",
-"Y. c #94970D",
-"T. c #9B9C13",
-"R. c #98961A",
-"E. c #968D16",
-"W. c #929D2F",
-"Q. c #82A90B",
-"!. c #8CAA06",
-"~. c #82B30A",
-"^. c #84B706",
-"/. c #97A913",
-"(. c #96B90A",
-"). c #99B914",
-"_. c #91AB10",
-"`. c #A39A1C",
-"'. c #A09A3D",
-"]. c #A9AE05",
-"[. c #A7AA16",
-"{. c #A7B90B",
-"}. c #ACB712",
-"|. c #BDBA18",
-" X c #B7B711",
-".X c #B0B726",
-"XX c #9A8B4B",
-"oX c #9EC008",
-"OX c #BCC40D",
-"+X c #BCC90E",
-"@X c #B1C707",
-"#X c #AEC90C",
-"$X c #C4AE2A",
-"%X c #C4CB11",
-"&X c #C8D809",
-"*X c #CBD011",
-"=X c #D1CF1A",
-"-X c #D1D50E",
-";X c #D7E803",
-":X c #918197",
-">X c #858494",
-",X c #8987BA",
-"<X c #928BBB",
-"1X c #9B9BA8",
-"2X c #9B98B8",
-"3X c #8784A3",
-"4X c #A787A8",
-"5X c #AE9CAE",
-"6X c #AC99B1",
-"7X c #B988B9",
-"8X c #BB92BC",
-"9X c #B598B8",
-"0X c #A0A0A7",
-"qX c #A6A6B7",
-"wX c #8382C6",
-"eX c #8382D4",
-"rX c #8D8CD4",
-"tX c #9C8CC7",
-"yX c #908FD9",
-"uX c #9493C6",
-"iX c #9A99DB",
-"pX c #9493D3",
-"aX c #A693C8",
-"sX c #A09AD5",
-"dX c #A8A5C9",
-"fX c #A9A6D6",
-"gX c #B7A8C7",
-"hX c #B7B6DA",
-"jX c #B5B1CE",
-"kX c #B7B4E2",
-"lX c #A9A8E2",
-"zX c #C88EC8",
-"xX c #C38BC3",
-"cX c #C695C6",
-"vX c #C2ADC2",
-"bX c #C7A6C7",
-"nX c #C4B5C4",
-"mX c #C6B9D3",
-"MX c #DDB9DD",
-"NX c #D9B4D9",
-"BX c #D3A4D4",
-"VX c #C9C5CA",
-"CX c #CAC9D7",
-"ZX c #D4CBD4",
-"AX c #D9C1D9",
-"SX c #DACEDA",
-"DX c #C4C3E4",
-"FX c #CBC9E6",
-"GX c #D8D7E6",
-"HX c #E7CCE7",
-"JX c #E9CFE9",
-"KX c #EADBEA",
-"LX c #E4DAE4",
-"PX c #EDE2ED",
-"IX c #EAEAF4",
-"UX c #F0E1F0",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXSXLXIXUXCX    YXYXYXYXVXLXPXPXZX.   YXYXYXYXYX",
-"YXYXYXYXYXYXYXnXKXUXUXKXJXSXnX    YXnXKXPXPXPXKXSXnX    YXYXYXYX",
-"YXYXYXYXYXYX9XHXJXMX0XvX:X9XSX     .HXJXAX5XvX>XvXAX.   YXYXYXYX",
-"YXYXYXYXYXYXMXMXkXx.. | 4XNXvX    NXMXMXV.  { 4XNXbX      YXYXYX",
-"YXYXYXYXYXBXBX8XZ.    4X8X8XZ.  { BX8X4X    G.7XcXZ.      YXYXYX",
-"YXYXYXYXLXcXcXC.z     zXxX7X) X.G.G.C.z     zXcX7X5 5 VX    YXYX",
-"YXYX1XIXGXBXCXC.+   H.H.F.6XIXIX8X| B.-   F.H.8X5X0XCXCX      YX",
-"YXYX3 GXmX8XmXZ.M M.D.m | VXCXGX4X| B.M.B.D.m gXqX1XCXW       YX",
-"YXYX  CXgXS.jXA.= + =   2XFXqXFXZ.| n.l @ =   jX>X..GX$       YX",
-"YXYX  hXaXA.jX,.= +     kXFXDXFX3.{ m l *   w hXV.2XdX        YX",
-"YXYX  hXdX,.fX[ v n.j b.kX2XDXhX1.4.v b.m.j S.tX3XkX1.        YX",
-"YXYX  fXdX4.aX^ j v.c.N.fX) kXuX} <X= b c.c.G.tX1.kX%       YXYX",
-"YXYX  <XfXuX<X[ k c c S.uX( fX,X' iXk c n b tX/ 3.uX        YXYX",
-"YXYX  2.iXrX2./ $     pX2.6.rX,XQ iX2     2 iXQ pX/         YXYX",
-"YXYX  e rXrX( %.e   ( rX( 5.7.wXQ J.y     5.yX( yX&       YXYXYX",
-"YXYXYX  t.eXQ 5.~   7.7.2.% 2.eX&.2.&.    J.6.8.5.        YXYXYX",
-"YXYXYX  r.t.y 8.#.o 8.~ *.  x t.r.~ 8.  0 t.! r.0   o $ F YXYXYX",
-"YXYXYX  <.w.~ >.#.d ] #.0   q w.w.y w.o #.e.$.<..   d I I     YX",
-"YXYXYX  =.e.=.#.g z.I t X   q ;.e.u :.y :.o.q.u   < J y.d     YX",
-"YXYXYX  y 0.0.r ] _ I 6     o -.0.-.=.0.;.t 0.o   , I y.p     YX",
-"YXYXYXYX  9.9.i ' _ g X     + +.9.9.@.;.i +.r     y.k.i.y.H     ",
-"YXYXXXW.Q.] =.@.z.J 4 . V s.E o.@.@.-.' d.z.L ; s j.j.j.i.D     ",
-"YXXXW.Q.Q.f.) O.l.f.# D Q.u.u.o O.$.g.g.h.^.^.> s.oX~.~.u.s     ",
-"YX}.oXD a P w 9 ~.f.S T p.p.K   ~ ).g q g j.(.. # k.a.K         ",
-".X#X{.  . ; 7 0 _.!.V O I.U.C . oXg.6 8 4 Y.(.  a /.).T         ",
-"+X#X(.      1 # T.{.,   #X{.C B +XI.    I./.{.  T #XoXA       YX",
-"&X+X}.Y P.%X[.P.+X@X.   &X@XY Z ;X/.A T.OX}.+X; Y.}.[.B     YXYX",
-".X*XOX;X;X XZ T.*XL.    =X%XP.; ;X%X*XT.> `.|., ].`. X:     YXYX",
-". Y.].T.A .   C C ;     $X-Xh   P.].R O   R :    XE.P.O     YXYX",
-"                        E U                     C .         YXYX",
-"YX                    YX. #                               YXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX      YXYXYXYXYXYXYXYXYX    YXYXYXYXYX"
-};
+/* XPM */
+static char * C:\temp\weechat_xpm[] = {
+"32 32 362 2",
+"  	c None",
+". 	c #117529",
+"+ 	c #0E7527",
+"@ 	c #0A7424",
+"# 	c #057323",
+"$ 	c #016F20",
+"% 	c #5DAA58",
+"& 	c #5DB059",
+"* 	c #5AB158",
+"= 	c #57B157",
+"- 	c #54AF55",
+"; 	c #4FAE53",
+"> 	c #4BAE52",
+", 	c #48AD50",
+"' 	c #44AC4E",
+") 	c #3FAB4C",
+"! 	c #3BA849",
+"~ 	c #36A646",
+"{ 	c #30A343",
+"] 	c #2CA040",
+"^ 	c #279D3D",
+"/ 	c #229A3A",
+"( 	c #1D9837",
+"_ 	c #189534",
+": 	c #129232",
+"< 	c #0D8F2E",
+"[ 	c #088D2C",
+"} 	c #03691F",
+"| 	c #64AB5B",
+"1 	c #6FC468",
+"2 	c #6AC265",
+"3 	c #66BF62",
+"4 	c #62BC5F",
+"5 	c #5DBA5D",
+"6 	c #58B85A",
+"7 	c #54B557",
+"8 	c #4FB254",
+"9 	c #4AB052",
+"0 	c #45AD4F",
+"a 	c #40AB4C",
+"b 	c #3CA849",
+"c 	c #37A647",
+"d 	c #32A344",
+"e 	c #2DA041",
+"f 	c #289D3D",
+"g 	c #239A3B",
+"h 	c #1E9838",
+"i 	c #199535",
+"j 	c #139232",
+"k 	c #0F8F2F",
+"l 	c #098B2B",
+"m 	c #035018",
+"n 	c #68AE5E",
+"o 	c #76C96B",
+"p 	c #70C568",
+"q 	c #6CC365",
+"r 	c #67C062",
+"s 	c #62BD60",
+"t 	c #5FBC5E",
+"u 	c #5ABA5B",
+"v 	c #55B859",
+"w 	c #51B656",
+"x 	c #4CB354",
+"y 	c #47B051",
+"z 	c #42AD4E",
+"A 	c #3EAA4B",
+"B 	c #38A647",
+"C 	c #32A243",
+"D 	c #2E9D40",
+"E 	c #28993C",
+"F 	c #239439",
+"G 	c #1E9036",
+"H 	c #188C32",
+"I 	c #13882F",
+"J 	c #0F842C",
+"K 	c #0A7C27",
+"L 	c #629F57",
+"M 	c #7BCC6F",
+"N 	c #76C86B",
+"O 	c #71C569",
+"P 	c #6DC366",
+"Q 	c #69C163",
+"R 	c #65C162",
+"S 	c #57AC56",
+"T 	c #3E803F",
+"U 	c #377539",
+"V 	c #316E34",
+"W 	c #2C6830",
+"X 	c #28602C",
+"Y 	c #225928",
+"Z 	c #1D5124",
+"` 	c #1A4E22",
+" .	c #184C20",
+"..	c #81CF72",
+"+.	c #7CCB6E",
+"@.	c #77C86C",
+"#.	c #72C76A",
+"$.	c #6EC467",
+"%.	c #69C164",
+"&.	c #549F51",
+"*.	c #71B062",
+"=.	c #84D274",
+"-.	c #7FCF71",
+";.	c #7ACD6F",
+">.	c #76CB6C",
+",.	c #72C869",
+"'.	c #6CC465",
+").	c #1F391D",
+"!.	c #558DC1",
+"~.	c #568EC3",
+"{.	c #568FC5",
+"].	c #5790C7",
+"^.	c #5892C8",
+"/.	c #538ABE",
+"(.	c #5B98D0",
+"_.	c #5C99D2",
+":.	c #5E9CD5",
+"<.	c #609FDB",
+"[.	c #61A1DC",
+"}.	c #497440",
+"|.	c #3F6638",
+"1.	c #355930",
+"2.	c #2C4A28",
+"3.	c #213B1F",
+"4.	c #609ED9",
+"5.	c #63A4E2",
+"6.	c #63A4E1",
+"7.	c #5B96CE",
+"8.	c #64A6E4",
+"9.	c #4878A4",
+"0.	c #426E96",
+"a.	c #4F83B3",
+"b.	c #4E82B2",
+"c.	c #62A3DF",
+"d.	c #64A6E3",
+"e.	c #274159",
+"f.	c #44729C",
+"g.	c #5B97CF",
+"h.	c #5B97D0",
+"i.	c #5C98D0",
+"j.	c #5C98D1",
+"k.	c #5B97CE",
+"l.	c #64A5E2",
+"m.	c #36597B",
+"n.	c #64A4E2",
+"o.	c #5A95CD",
+"p.	c #5993CB",
+"q.	c #64A5E3",
+"r.	c #45729C",
+"s.	c #63A4E3",
+"t.	c #62A2E1",
+"u.	c #62A1E1",
+"v.	c #61A1E1",
+"w.	c #609FE0",
+"x.	c #5993D4",
+"y.	c #5D9BDF",
+"z.	c #5D99DF",
+"A.	c #5C99DF",
+"B.	c #5B98DE",
+"C.	c #4878B1",
+"D.	c #63A3E5",
+"E.	c #609EE0",
+"F.	c #5F9DE0",
+"G.	c #5F9DDF",
+"H.	c #5E9BDF",
+"I.	c #5C99DC",
+"J.	c #2B4666",
+"K.	c #4D7FBD",
+"L.	c #5A96DF",
+"M.	c #5A94DE",
+"N.	c #5993DD",
+"O.	c #5992DD",
+"P.	c #5993E1",
+"Q.	c #4069A0",
+"R.	c #365A8E",
+"S.	c #568EDF",
+"T.	c #548ADB",
+"U.	c #5489DB",
+"V.	c #5389DB",
+"W.	c #5287DA",
+"X.	c #2E4D7C",
+"Y.	c #4C7DC1",
+"Z.	c #5891DE",
+"`.	c #568FDC",
+" +	c #568EDC",
+".+	c #568DDC",
+"++	c #558CDC",
+"@+	c #4F82CD",
+"#+	c #4D7ECD",
+"$+	c #5185DA",
+"%+	c #5085DA",
+"&+	c #5084DA",
+"*+	c #4F82D9",
+"=+	c #5185DF",
+"-+	c #121E31",
+";+	c #4370C2",
+">+	c #4C7CD9",
+",+	c #4A7BD7",
+"'+	c #4A7AD7",
+")+	c #4978D7",
+"!+	c #4877D6",
+"~+	c #4E82D9",
+"{+	c #4E81D9",
+"]+	c #4E80D9",
+"^+	c #4E7FD9",
+"/+	c #4D7ED8",
+"(+	c #4C7DDA",
+"_+	c #395FA4",
+":+	c #4775D2",
+"<+	c #4876D6",
+"[+	c #4775D6",
+"}+	c #4773D6",
+"|+	c #4674D7",
+"1+	c #3B62B7",
+"2+	c #436ED6",
+"3+	c #416CD4",
+"4+	c #416AD3",
+"5+	c #4069D3",
+"6+	c #406AD6",
+"7+	c #304FA2",
+"8+	c #375BA8",
+"9+	c #4673D5",
+"0+	c #4572D5",
+"a+	c #4571D5",
+"b+	c #4470D5",
+"c+	c #436FD4",
+"d+	c #4470D9",
+"e+	c #14213E",
+"f+	c #3150A3",
+"g+	c #4069D4",
+"h+	c #3E67D3",
+"i+	c #3E66D2",
+"j+	c #3D64D2",
+"k+	c #3D64D3",
+"l+	c #243C7F",
+"m+	c #2F4DAC",
+"n+	c #395ED1",
+"o+	c #385CD0",
+"p+	c #375AD0",
+"q+	c #365ACF",
+"r+	c #375AD5",
+"s+	c #111C41",
+"t+	c #3558B8",
+"u+	c #3C63D2",
+"v+	c #3C62D2",
+"w+	c #3B61D1",
+"x+	c #3A60D2",
+"y+	c #3658C2",
+"z+	c #3455C4",
+"A+	c #3659CF",
+"B+	c #3557CF",
+"C+	c #3556CF",
+"D+	c #3354CF",
+"E+	c #3151C5",
+"F+	c #101A3E",
+"G+	c #2C49C0",
+"H+	c #2F4DCC",
+"I+	c #2E4CCC",
+"J+	c #2D4ACB",
+"K+	c #2D49CB",
+"L+	c #2741B7",
+"M+	c #3353C6",
+"N+	c #3455CF",
+"O+	c #3454CE",
+"P+	c #3353CE",
+"Q+	c #3252CD",
+"R+	c #3151CE",
+"S+	c #304FCC",
+"T+	c #162467",
+"U+	c #1F318C",
+"V+	c #2E4BCF",
+"W+	c #2C47CB",
+"X+	c #2B47CA",
+"Y+	c #2A45CA",
+"Z+	c #2943C8",
+"`+	c #2841C5",
+" @	c #2942CB",
+".@	c #2841CB",
+"+@	c #273EC9",
+"@@	c #263DC9",
+"#@	c #253BC8",
+"$@	c #243AC7",
+"%@	c #2339C9",
+"&@	c #172583",
+"*@	c #1D2F86",
+"=@	c #2D49CE",
+"-@	c #2B46CB",
+";@	c #2B46CA",
+">@	c #2A44CA",
+",@	c #2943CA",
+"'@	c #2841C9",
+")@	c #2740C9",
+"!@	c #2840CC",
+"~@	c #273FCA",
+"{@	c #263DCA",
+"]@	c #243AC8",
+"^@	c #2339C7",
+"/@	c #2338C7",
+"(@	c #2237C7",
+"_@	c #2135C6",
+":@	c #2034C6",
+"<@	c #2033C6",
+"[@	c #1E31C5",
+"}@	c #1E30C5",
+"|@	c #1D2EC4",
+"1@	c #1C2DC4",
+"2@	c #1B2CC4",
+"3@	c #1A2AC3",
+"4@	c #1928C0",
+"5@	c #0C1258",
+"6@	c #1B2C97",
+"7@	c #233AC9",
+"8@	c #2238C7",
+"9@	c #2136C7",
+"0@	c #1F32C6",
+"a@	c #1D2FC5",
+"b@	c #1C2EC5",
+"c@	c #1B2BC4",
+"d@	c #1A2AC4",
+"e@	c #1929C3",
+"f@	c #1827C3",
+"g@	c #1826C3",
+"h@	c #1724C2",
+"i@	c #1623C2",
+"j@	c #1522C1",
+"k@	c #1420C2",
+"l@	c #141FC2",
+"m@	c #121EC1",
+"n@	c #111CC2",
+"o@	c #111AC1",
+"p@	c #0E17B2",
+"q@	c #1A2AC1",
+"r@	c #1929C4",
+"s@	c #1927C4",
+"t@	c #1724C3",
+"u@	c #1623C3",
+"v@	c #1522C4",
+"w@	c #1520C3",
+"x@	c #131FC3",
+"y@	c #131DC3",
+"z@	c #111CC0",
+"A@	c #111ABB",
+"B@	c #0F19B6",
+"C@	c #0F17B1",
+"D@	c #0D15AD",
+"E@	c #0D14A9",
+"F@	c #0C13A7",
+"G@	c #0B11A4",
+"H@	c #0A1099",
+"I@	c #080D8B",
+"J@	c #070B7A",
+"K@	c #060968",
+"L@	c #0F179E",
+"M@	c #0E16AA",
+"N@	c #0E15AF",
+"O@	c #0C13A9",
+"P@	c #0C129C",
+"Q@	c #0A108F",
+"R@	c #090E80",
+"S@	c #080C72",
+"T@	c #070B63",
+"U@	c #060957",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                    . + @ # $   ",
+"                  % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ }   ",
+"              | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m   ",
+"            n o p q r s t u v w x y z A B C D E F G H I J K     ",
+"          L M N O P Q R S T U V W X Y Z `  .                    ",
+"          ..+.@.#.$.%.&.                                        ",
+"        *.=.-.;.>.,.'.).      !.~.{.].^.      /.(._.:.<.[.      ",
+"          }.|.1.2.3.        4.5.6.6.6.7.      [.6.6.6.8.9.      ",
+"                          0.8.6.6.6.6.a.    b.c.6.6.6.d.e.      ",
+"      f.g.h.i.j._.{.      k.l.6.6.6.l.m.    !.n.6.6.6.o.        ",
+"      p.l.6.6.6.q.r.      s.t.t.u.v.w.      x.y.z.A.B.C.        ",
+"      D.E.F.G.H.I.J.    K.L.M.N.O.P.Q.    R.S.T.U.V.W.X.        ",
+"    Y.Z.`. +.+++@+      #+$+%+&+*+=+-+    ;+>+,+'+)+!+          ",
+"    ~+{+]+^+/+(+_+      :+<+[+}+|+1+      2+3+4+5+6+7+          ",
+"  8+9+0+a+b+c+d+e+    f+g+h+i+j+k+l+    m+n+o+p+q+r+s+          ",
+"  t+j+u+v+w+x+y+      z+A+B+C+D+E+F+    G+H+I+J+K+L+            ",
+"  M+N+O+P+Q+R+S+T+  U+V+K+W+X+Y+Z+`+ @.@+@@@#@$@%@&@            ",
+"*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@            ",
+"6@7@8@9@_@:@0@[@a@b@1@c@d@e@f@g@h@i@j@k@l@m@n@o@p@              ",
+"  q@r@s@g@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@                  ",
+"    L@M@N@O@P@Q@R@S@T@U@                                        ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

doc/CMakeLists.txt

@@ -18,11 +18,11 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-IF(ENABLE_DOC)
+IF(ENABLE_MAN OR ENABLE_DOC)
 
   FIND_PACKAGE(Sourcehighlight)
   FIND_PACKAGE(Asciidoc)
-  IF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  IF(ASCIIDOC_FOUND)
     ADD_SUBDIRECTORY( en )
     ADD_SUBDIRECTORY( fr )
     ADD_SUBDIRECTORY( it )
@@ -31,8 +31,6 @@ IF(ENABLE_DOC)
     ADD_SUBDIRECTORY( es )
     ADD_SUBDIRECTORY( ru )
     ADD_SUBDIRECTORY( ja )
-  ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  ENDIF(ASCIIDOC_FOUND)
 
-ENDIF(ENABLE_DOC)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/man1)
+ENDIF(ENABLE_MAN OR ENABLE_DOC)

doc/Makefile.am

@@ -20,9 +20,7 @@
 
 SUBDIRS = . en fr it de pl es ru ja
 
-man_MANS = weechat-curses.1
-
-EXTRA_DIST = $(man_MANS) docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
+EXTRA_DIST = docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
 
 uninstall-hook:
 	-rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE)

doc/asciidoc.css

@@ -1,79 +1,175 @@
 body {
-    margin: 1em 2em 1em 2em;
+  margin: 1em 2em;
+  font-family: verdana, sans-serif;
+  font-size: 12px;
 }
-div.sectionbody {
-    font-family: serif,Helvetica,arial;
+div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer {
+  font-family: verdana, sans-serif;
 }
-h5 {
-    font-size: 0.95em;
+a, a:visited, a:hover, a:active {
+  color: #00c;
+  text-decoration: none;
+}
+em {
+  color: #252;
+}
+strong {
+  color: #000;
 }
 tt {
-    font-family: monospace;
+  color: #366;
+}
+#author {
+  color: #555;
+}
+#toc {
+  line-height: 1.4em;
+}
+#toctitle {
+  margin-bottom: .6em;
+  color: #555;
+}
+div.toclevel0, div.toclevel1 {
+  font-size: 1.1em;
+}
+div.toclevel2, div.toclevel3, div.toclevel4 {
+  font-size: 1em;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 1.2em 0;
+}
+h1 {
+  padding: 1.2em;
+  border: solid 1px #c0d0ff;
+  border-radius: 8px;
+  box-shadow: 1px 1px 3px #aac;
+  background: #ddeaee;
+  background: -moz-linear-gradient(#bbddff, #eefaff);
+  background: -webkit-linear-gradient(#bbddff, #eefaff);
+  background: linear-gradient(#bbddff, #eefaff);
+  color: #224b8d;
+  font-size: 2.2em;
+  text-align: center;
+}
+h2 {
+  padding: .5em;
+  border: solid 1px #d0d0d0;
+  border-radius: 6px;
+  box-shadow: 1px 1px 2px #bbb;
+  background: #f2f2f2;
+  background: -moz-linear-gradient(#e0e0e0, #f6f6f6);
+  background: -webkit-linear-gradient(#e0e0e0, #f6f6f6);
+  background: linear-gradient(#e0e0e0, #f6f6f6);
+  color: #444;
+  font-size: 1.7em;
+}
+h3 {
+  border: none;
+  margin: .7em 0 1em 0;
+  color: #555;
+  font-size: 1.5em;
+}
+h4 {
+  color: #555;
+  font-size: 1.3em;
+}
+h5 {
+  color: #555;
+  font-size: 1.2em;
 }
 span.command {
-    background: #EEEEFF;
-    border: solid 1px #BBBBDD;
-    padding: 0 8px 0 8px;
-    margin-right: 12px;
+  padding: .2em .5em;
+  border: solid 1px #ccc;
+  margin-right: 12px;
+  background: #eee;
+  font-size: 1.1em;
 }
 p.table {
-    margin-top: 0;
-    margin-bottom: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+div.listingblock > div.content {
+  border: solid 1px #e2e2e2;
+  border-radius: 4px;
+  background: #fbfbfb;
+}
+div.tableblock > table {
+  border: 2px solid #888;
+}
+table th {
+  background: #fbfbfb;
+  color: #000;
+  font-size: 1.1em;
+}
+.tableblock table th, .tableblock table td {
+  border: solid 1px #bbb;
+}
+div.title {
+  color: #525252;
+}
+div.admonitionblock .icon {
+  text-decoration: none;
+}
+dt.hdlist1 {
+  margin-bottom: .5em;
+  color: #252;
 }
 .key {
-    border-top: solid 1px #D5D5E5;
-    border-left: solid 1px #D5D5E5;
-    border-bottom: solid 1px #A5A5B5;
-    border-right: solid 1px #A5A5B5;
-    background-color: #EEEEFF;
-    padding: 0 0.3em 0 0.3em;
-    margin: 0 2px 0 2px;
+  padding: 0 .3em;
+  border-top: solid 1px #d5d5e5;
+  border-left: solid 1px #d5d5e5;
+  border-bottom: solid 1px #a5a5b5;
+  border-right: solid 1px #a5a5b5;
+  margin: 0 2px;
+  background: #eef;
+  font-family: serif, Helvetica, arial;
+  font-size: 1.1em;
+  line-height: 1.5em;
 }
 .key.ctrl {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #DFD0D0;
-    border-left: solid 1px #DFD0D0;
-    border-bottom: solid 1px #AFA0A0;
-    border-right: solid 1px #AFA0A0;
-    background-color: #FFF0F0;
+  border-top: solid 1px #dfd0d0;
+  border-left: solid 1px #dfd0d0;
+  border-bottom: solid 1px #afa0a0;
+  border-right: solid 1px #afa0a0;
+  background: #fff0f0;
+  font-variant: small-caps;
 }
 .key.alt {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #DFBBAB;
-    border-left: solid 1px #DFBBAB;
-    border-bottom: solid 1px #AF8B7B;
-    border-right: solid 1px #AF8B7B;
-    background-color: #FFDBCB;
+  border-top: solid 1px #dfbbab;
+  border-left: solid 1px #dfbbab;
+  border-bottom: solid 1px #af8b7b;
+  border-right: solid 1px #af8b7b;
+  background: #ffdbcb;
+  font-variant: small-caps;
 }
 .key.shift {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #D5D5D5;
-    border-left: solid 1px #D5D5D5;
-    border-bottom: solid 1px #A5A5A5;
-    border-right: solid 1px #A5A5A5;
-    background-color: #F5F5F5;
+  border-top: solid 1px #d5d5d5;
+  border-left: solid 1px #d5d5d5;
+  border-bottom: solid 1px #a5a5a5;
+  border-right: solid 1px #a5a5a5;
+  background: #f5f5f5;
+  font-variant: small-caps;
 }
 .key.other {
-    font-size: 0.75em;
-    font-variant: small-caps;
-    border-top: solid 1px #D0E0D0;
-    border-left: solid 1px #D0E0D0;
-    border-bottom: solid 1px #A0B0A0;
-    border-right: solid 1px #A0B0A0;
-    background-color: #EAFAEA;
+  border-top: solid 1px #d0e0d0;
+  border-left: solid 1px #d0e0d0;
+  border-bottom: solid 1px #a0b0a0;
+  border-right: solid 1px #a0b0a0;
+  background: #eafaea;
+  font-variant: small-caps;
 }
 .keyplus {
-    font-size: 0.8em;
+  font-size: .8em;
 }
 .hexa {
-    color: #000077;
-    font-size: 0.85em;
-    font-family: monospace;
-    font-variant: small-caps;
-    border: solid 1px #8888BB;
-    padding: 0 0.2em 0 0.2em;
-    margin: 0 0.2em 0 0.2em;
+  padding: 0 .2em;
+  border: solid 1px #88b;
+  margin: 0 .2em;
+  color: #007;
+  font-family: monospace;
+  font-size: .85em;
+  font-variant: small-caps;
+}
+#footer {
+  border-top: 1px solid silver;
 }

doc/de/CMakeLists.txt

@@ -17,58 +17,77 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# user's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
-  COMMENT "Building weechat_user.de.html"
-)
-ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF (ENABLE_MAN)
+  # man page
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
+    COMMAND ${A2X_EXECUTABLE} ARGS -a lang=de -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
+    COMMENT "Building weechat.1 (de)"
+  )
+  ADD_CUSTOM_TARGET(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)
+ENDIF (ENABLE_MAN)
 
-# scripting guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  COMMENT "Building weechat_scripting.de.html"
-)
-ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
 
-# FAQ
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  COMMENT "Building weechat_faq.de.html"
-)
-ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # user's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    COMMENT "Building weechat_user.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# quickstart
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
-  COMMENT "Building weechat_quickstart.de.html"
-)
-ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # scripting guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
+    COMMENT "Building weechat_scripting.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# tester's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
-  COMMENT "Building weechat_tester.de.html"
-)
-ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # FAQ
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    COMMENT "Building weechat_faq.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    COMMENT "Building weechat_quickstart.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # tester's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    COMMENT "Building weechat_tester.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

doc/de/Makefile.am

@@ -21,6 +21,8 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
+             weechat.1.de.txt \
+             cmdline_options.de.txt \
              weechat_user.de.txt \
              weechat_scripting.de.txt \
              weechat_faq.de.txt \
@@ -28,14 +30,28 @@ EXTRA_DIST = CMakeLists.txt \
              weechat_tester.de.txt \
              $(wildcard autogen/user/*.txt)
 
-all-local: weechat_user.de.html \
+if MAN
+  man_targets = weechat.1
+  man_install = install-man
+  man_uninstall = uninstall-man
+endif
+if DOC
+  doc_targets = weechat_user.de.html \
 		weechat_scripting.de.html \
 		weechat_faq.de.html \
 		weechat_quickstart.de.html \
 		weechat_tester.de.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
+
+# man page
+weechat.1: weechat.1.de.txt cmdline_options.de.txt
+	$(A2X) -a lang=de -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/de/weechat.1.de.txt
 
 # user's guide
-weechat_user.de.html: weechat_user.de.txt $(wildcard autogen/user/*.txt)
+weechat_user.de.html: weechat_user.de.txt cmdline_options.de.txt $(wildcard autogen/user/*.txt)
 	$(ASCIIDOC) -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.txt
 
 # scripting guide
@@ -54,19 +70,32 @@ weechat_quickstart.de.html: weechat_quickstart.de.txt
 weechat_tester.de.html: weechat_tester.de.txt
 	$(ASCIIDOC) -a lang=de -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.txt
 
-# install docs
+# install man/docs
 
-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/de/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/de/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
 
-# uninstall docs
+# uninstall man/docs
 
-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/de/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.de.html
 	-rmdir $(DESTDIR)$(docdir)
 
 # clean
 
 clean-local:
+	-rm -f weechat.1
 	-rm -f *.html

doc/de/autogen/plugin_api/completions.txt

@@ -6,7 +6,9 @@
 
 | alias | alias_value | Wert von Alias
 
-| aspell | aspell_langs | Liste der zu nutzenden Übersetzungen für Aspell
+| aspell | aspell_dicts | Auflistung der installierten Wörterbücher
+
+| aspell | aspell_langs | Liste aller Sprachen die durch Aspell unterstützt werden
 
 | guile | guile_script | Liste der Skripten
 
@@ -104,6 +106,8 @@
 
 | weechat | keys_contexts | Tastaturkontext
 
+| weechat | layouts_names | Namen der Layouts
+
 | weechat | nicks | Nicks in Nickliste für aktuellen Buffer
 
 | weechat | palette_colors | Farbpalette
@@ -112,9 +116,11 @@
 
 | weechat | plugins_names | Liste der Erweiterungen
 
-| weechat | proxies_names | Namen der Proxies
+| weechat | proxies_names | Namen aller Proxys
 
-| weechat | proxies_options | Optionen für Proxies
+| weechat | proxies_options | Optionen für Proxys
+
+| weechat | secured_data | Namen der geschützten Daten (Datei sec.conf, section data)
 
 | weechat | weechat_commands | WeeChat Befehle
 

doc/de/autogen/plugin_api/hdata.txt

@@ -1,7 +1,23 @@
-[width="100%",cols="^1,^2,5,5,5,5",options="header"]
+[width="100%",cols="^1,^2,4,8,4,4",options="header"]
 |========================================
 | Erweiterung | Name | Beschreibung | Variablen | Update erlaubt | Listen
 
+| guile | guile_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "guile_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "guile_callback") +
+  'next_callback' (pointer, hdata: "guile_callback") |
+ |
+  -
+
 | guile | guile_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -12,7 +28,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "guile_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "guile_script") +
   'next_script' (pointer, hdata: "guile_script") |
@@ -27,7 +43,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
-  'names_received' (integer) +
+  'join_msg_received' (hashtable) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -42,6 +58,7 @@
   'nicks_speaking' (pointer) +
   'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
   'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'join_smart_filtered' (hashtable) +
   'buffer' (pointer, hdata: "buffer") +
   'buffer_as_string' (string) +
   'prev_channel' (pointer, hdata: "irc_channel") +
@@ -93,7 +110,7 @@
  |
   -
 
-| irc | irc_redirect | IRC Umlenkung |
+| irc | irc_redirect | IRC Weiterleitung |
   'server' (pointer, hdata: "irc_server") +
   'pattern' (string) +
   'signal' (string) +
@@ -117,7 +134,7 @@
  |
   -
 
-| irc | irc_redirect_pattern | Muster für IRC Umlenkung |
+| irc | irc_redirect_pattern | Muster für IRC Weiterleitung |
   'name' (string) +
   'temp_pattern' (integer) +
   'timeout' (integer) +
@@ -185,6 +202,7 @@
   'cmd_list_regexp' (pointer) +
   'last_user_message' (time) +
   'last_away_check' (time) +
+  'last_data_purge' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
   'redirects' (pointer, hdata: "irc_redirect") +
@@ -204,6 +222,22 @@
   'irc_servers' +
   'last_irc_server'
 
+| lua | lua_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "lua_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "lua_callback") +
+  'next_callback' (pointer, hdata: "lua_callback") |
+ |
+  -
+
 | lua | lua_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -214,7 +248,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "lua_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "lua_script") +
   'next_script' (pointer, hdata: "lua_script") |
@@ -222,6 +256,22 @@
   'last_script' +
   'scripts'
 
+| perl | perl_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "perl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "perl_callback") +
+  'next_callback' (pointer, hdata: "perl_callback") |
+ |
+  -
+
 | perl | perl_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -232,7 +282,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "perl_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "perl_script") +
   'next_script' (pointer, hdata: "perl_script") |
@@ -240,6 +290,22 @@
   'last_script' +
   'scripts'
 
+| python | python_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "python_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "python_callback") +
+  'next_callback' (pointer, hdata: "python_callback") |
+ |
+  -
+
 | python | python_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -250,7 +316,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "python_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "python_script") +
   'next_script' (pointer, hdata: "python_script") |
@@ -258,6 +324,22 @@
   'last_script' +
   'scripts'
 
+| ruby | ruby_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "ruby_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "ruby_callback") +
+  'next_callback' (pointer, hdata: "ruby_callback") |
+ |
+  -
+
 | ruby | ruby_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -268,7 +350,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "ruby_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "ruby_script") +
   'next_script' (pointer, hdata: "ruby_script") |
@@ -304,6 +386,22 @@
   'last_script_repo' +
   'scripts_repo'
 
+| tcl | tcl_callback | Callback eines Skripts |
+  'script' (pointer, hdata: "tcl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "tcl_callback") +
+  'next_callback' (pointer, hdata: "tcl_callback") |
+ |
+  -
+
 | tcl | tcl_script | Liste der Skripten |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -314,7 +412,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "tcl_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "tcl_script") +
   'next_script' (pointer, hdata: "tcl_script") |
@@ -328,6 +426,7 @@
   'items_count' (integer) +
   'items_subcount' (pointer) +
   'items_array' (pointer) +
+  'items_buffer' (pointer) +
   'items_prefix' (pointer) +
   'items_name' (pointer) +
   'items_suffix' (pointer) +
@@ -403,6 +502,9 @@
   'nicklist_root' (pointer, hdata: "nick_group") +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
+  'nicklist_count' (integer) +
+  'nicklist_groups_count' (integer) +
+  'nicklist_nicks_count' (integer) +
   'nicklist_visible_count' (integer) +
   'nickcmp_callback' (pointer) +
   'nickcmp_callback_data' (pointer) +
@@ -428,6 +530,9 @@
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
+  'text_search_regex' (integer) +
+  'text_search_regex_compiled' (pointer) +
+  'text_search_where' (integer) +
   'text_search_found' (integer) +
   'text_search_input' (string) +
   'highlight_words' (string) +
@@ -614,6 +719,41 @@
   'last_gui_key_mouse' +
   'last_gui_key_search'
 
+| weechat | layout | Layout |
+  'name' (string) +
+  'layout_buffers' (pointer, hdata: "layout_buffer") +
+  'last_layout_buffer' (pointer, hdata: "layout_buffer") +
+  'layout_windows' (pointer, hdata: "layout_window") +
+  'internal_id' (integer) +
+  'internal_id_current_window' (integer) +
+  'prev_layout' (pointer, hdata: "layout") +
+  'next_layout' (pointer, hdata: "layout") |
+ |
+  'gui_layout_current' +
+  'gui_layouts' +
+  'last_gui_layout'
+
+| weechat | layout_buffer | Buffer-Layout |
+  'plugin_name' (string) +
+  'buffer_name' (string) +
+  'number' (integer) +
+  'prev_layout' (pointer, hdata: "layout_buffer") +
+  'next_layout' (pointer, hdata: "layout_buffer") |
+ |
+  -
+
+| weechat | layout_window | Fenster-Layout |
+  'internal_id' (integer) +
+  'parent_node' (pointer, hdata: "layout_window") +
+  'split_pct' (integer) +
+  'split_horiz' (integer) +
+  'child1' (pointer, hdata: "layout_window") +
+  'child2' (pointer, hdata: "layout_window") +
+  'plugin_name' (string) +
+  'buffer_name' (string) |
+ |
+  -
+
 | weechat | line | Struktur mit einer Zeile |
   'data' (pointer, hdata: "line_data") +
   'prev_line' (pointer, hdata: "line") +
@@ -650,7 +790,9 @@
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
   'buffer_max_length' (integer) +
-  'prefix_max_length' (integer) |
+  'buffer_max_length_refresh' (integer) +
+  'prefix_max_length' (integer) +
+  'prefix_max_length_refresh' (integer) |
  |
   -
 
@@ -697,6 +839,15 @@
   'last_weechat_plugin' +
   'weechat_plugins'
 
+| weechat | proxy | Proxy |
+  'name' (string) +
+  'options' (pointer) +
+  'prev_proxy' (pointer, hdata: "proxy") +
+  'next_proxy' (pointer, hdata: "proxy") |
+ |
+  'last_weechat_proxy' +
+  'weechat_proxies'
+
 | weechat | window | Fenster |
   'number' (integer) +
   'win_x' (integer) +
@@ -735,7 +886,6 @@
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
-  'reset_allowed' (integer) +
   'prev_scroll' (pointer, hdata: "window_scroll") +
   'next_scroll' (pointer, hdata: "window_scroll") |
  |

doc/de/autogen/plugin_api/infolists.txt

@@ -48,18 +48,22 @@
 
 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -
 
-| weechat | hook | Auflistung der Hooks | - | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
+| weechat | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
 
 | weechat | hotlist | Liste der Buffer in Hotlist | - | -
 
 | weechat | key | Auflistung der Tastenzuweisungen | - | Kontext ("default", "search", "cursor" oder "mouse") (optional)
 
+| weechat | layout | Auflistung der Layouts | - | -
+
 | weechat | nicklist | Nicks in Nickliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)
 
 | weechat | option | Auflistung der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | Name einer Erweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
+| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+
 | weechat | url_options | Optionen für URL | - | -
 
 | weechat | window | Auflistung der Fenster | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)

doc/de/autogen/plugin_api/infos.txt

@@ -2,6 +2,8 @@
 |========================================
 | Erweiterung | Name | Beschreibung | Argumente
 
+| aspell | aspell_dict | durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer genutzt werden sollen | Buffer-Pointer ("0x12345678") oder der vollständige Buffername ("irc.freenode.#weechat")
+
 | fifo | fifo_filename | Name der FIFO-Pipe | -
 
 | irc | irc_buffer | holt Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)

doc/de/autogen/plugin_api/url_options.txt

@@ -48,6 +48,12 @@
 
 | address_scope | long |
 
+| tcp_keepalive | long |
+
+| tcp_keepidle | long |
+
+| tcp_keepintvl | long |
+
 | netrc | long | ignored, optional, required
 
 | netrc_file | string |
@@ -126,6 +132,8 @@
 
 | mail_from | string |
 
+| mail_auth | string |
+
 | tftp_blksize | long |
 
 | ftpport | string |
@@ -270,6 +278,8 @@
 
 | ssl_sessionid_cache | long |
 
+| ssl_options | long | allow_beast
+
 | krblevel | string |
 
 | gssapi_delegation | long | none, policy_flag, flag

doc/de/autogen/user/alias_commands.txt

@@ -17,9 +17,8 @@ Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entspr
       $n-m: Argumente von 'n' bis 'm'
         $*: alle Argumente
         $~: letztes Argument
-     $nick: aktueller Nick
-  $channel: aktueller Channel
-   $server: aktueller Server
+      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar)
+            Beispiel: $nick, $channel, $server, $plugin, $name
 
 Um ein Alias zu löschen wird der Befehl "/unalias" genutzt.
 

doc/de/autogen/user/aspell_commands.txt

@@ -3,15 +3,15 @@
 ........................................
 /aspell  enable|disable|toggle
          listdict
-         setdict <lang>
+         setdict <dict>[,<dict>...]
          deldict
-         addword [<lang>] <word>
+         addword [<dict>] <word>
 
   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
+ setdict: Wörterbuch für den aktuellen Buffer einstellen (mehrere Wörterbücher müssen durch Kommata getrennt werden)
  deldict: Wörterbuch für den aktuellen Buffer entfernen
  addword: fügt ein Wort in das persönliche Wörterbuch von Aspell hinzu
 

doc/de/autogen/user/aspell_options.txt

@@ -1,5 +1,5 @@
 * [[option_aspell.check.commands]] *aspell.check.commands*
-** Beschreibung: `Durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
+** Beschreibung: `durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"`)
 
@@ -33,8 +33,13 @@
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `2`)
 
-* [[option_aspell.look.color]] *aspell.look.color*
-** Beschreibung: `Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll`
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
+** Beschreibung: `Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll (Eingabezeile)`
 ** 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_aspell.color.suggestions]] *aspell.color.suggestions*
+** Beschreibung: `Textfarbe für die Vorschläge der Rechtsschreibkorrektur (Statusbar)`
+** 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`)
+

doc/de/autogen/user/demo_commands.txt

@@ -1,36 +0,0 @@
-[[command_demo_demo_buffer]]
-[command]*`demo_buffer`* Öffne einen neuen Buffer::
-........................................
-/demo_buffer  <name>
-........................................
-
-[[command_demo_demo_info]]
-[command]*`demo_info`* Hole eine Info und zeige sie an::
-........................................
-/demo_info  <info> [<arguments>]
-
-     info: Information die dargestellt werden soll
-arguments: optionale Argumente für Info
-
-Wird der Befehl ohne Argumente aufgerufen werden alle verfügbaren Informationen angezeigt
-........................................
-
-[[command_demo_demo_infolist]]
-[command]*`demo_infolist`* Hole eine Infolist und zeige sie an::
-........................................
-/demo_infolist  <infolist> [<arguments>]
-
- infolist: Infoliste die dargestellt werden soll
-arguments: optionale Argumente für Infoliste
-
-Wird der Befehl ohne Argumente aufgerufen werden alle verfügbaren Informationen der Infoliste angezeigt
-........................................
-
-[[command_demo_demo_printf]]
-[command]*`demo_printf`* Gibt ein paar Nachrichten im aktuellen Buffer aus::
-........................................
-/demo_printf  <text>
-
-text: schreibt diesen Text
-........................................
-

doc/de/autogen/user/irc_commands.txt

@@ -14,7 +14,7 @@ target: Server
  -current: führt einen Befehl aus der an alle Channels des aktuellen Servers gesendet wird
  -exclude: dient zum Ausschluss ausgewählter Channels ('*' wird zu Beginn oder am Ende des Channel-Namens akzeptiert, um mehrere Channels auszuschließen)
   command: Befehl der ausgeführt werden soll
-arguments: Argumente des Befehls
+arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
 
 Beispiele:
   Führe den Befehl '/me Ich teste gerade etwas...' für alle Channels aus:
@@ -32,13 +32,15 @@ Beispiele:
 
  -exclude: dient zum Ausschluss ausgewählter Server ('*' wird zu Beginn oder am Ende des Servernamens akzeptiert, um mehrere Server auszuschließen)
   command: Befehl der ausgeführt werden soll
-arguments: Argumente des Befehls
+arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
 
 Beispiele:
-  Ändere den Nick auf allen Servern:
+  ändere den Nick auf allen Servern:
     /allserv nick newnick
-  Setzt den Status, auf allen Servern,auf abwesend:
+  setzt den Status, auf allen Servern,auf abwesend:
     /allserv away I'm away
+  führt ein whois mit meinem nick auf allen Servern aus:
+    /allserv whois $nick
 ........................................
 
 [[command_irc_ban]]
@@ -119,18 +121,29 @@ Beispiel:
 [command]*`dehalfop`* halb-Operator-Privilegien einem oder mehreren Nick(s) entziehen::
 ........................................
 /dehalfop  <nick> [<nick>...]
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den half-operator-Status, ausgenommen sich selber
 ........................................
 
 [[command_irc_deop]]
 [command]*`deop`* Operator-Privilegien einem oder mehreren Nicknamen entziehen::
 ........................................
 /deop  <nick> [<nick>...]
+       * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den Operator-Status, ausgenommen sich selber
 ........................................
 
 [[command_irc_devoice]]
 [command]*`devoice`* Voice-Privilegien einem oder mehreren Nicknamen entziehen::
 ........................................
 /devoice  <nick> [<nick>...]
+          * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den voice-Status
 ........................................
 
 [[command_irc_die]]
@@ -156,6 +169,10 @@ reason: Begründung der Trennung
 [command]*`halfop`* halb-Operator Status an Nick(s) vergeben::
 ........................................
 /halfop  <nick> [<nick>...]
+         * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den half-operator-Status
 ........................................
 
 [[command_irc_ignore]]
@@ -420,6 +437,10 @@ Beispiele:
 [command]*`op`* Channel-Operator Status an Nicknamen vergeben::
 ........................................
 /op  <nick> [<nick>...]
+     * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den Operator-Status
 ........................................
 
 [[command_irc_oper]]
@@ -461,7 +482,7 @@ Daemon2: Nachricht an diesen Daemon weiterleiten
 [[command_irc_query]]
 [command]*`query`* Eine private Nachricht an einen Nick schicken::
 ........................................
-/query  [-server <server>] <nick> [<text>]
+/query  [-server <server>] <nick>[,<nick>...] [<text>]
 
 server: an diesen Server senden (interner Name)
   nick: Nickname für privaten Chat
@@ -505,11 +526,11 @@ data: unbearbeitete (RAW) Daten die gesendet werden sollen
 ........................................
 /rehash  [<option>]
 
-option: zusätzliche Option, die von manchen Servern berücksichtigt wird.
+option: zusätzliche Option, die von manchen Servern berücksichtigt wird
 ........................................
 
 [[command_irc_restart]]
-[command]*`restart`* Den Server dazu bringen sich selbst neu zu starten::
+[command]*`restart`* Server dazu bringen sich selbst neu zu starten::
 ........................................
 /restart  [<target>]
 
@@ -517,7 +538,7 @@ target: Servername
 ........................................
 
 [[command_irc_sajoin]]
-[command]*`sajoin`* Zwingt einen User einen oder mehrere Channel zu betreten::
+[command]*`sajoin`* zwingt einen User einen oder mehrere Channel zu betreten::
 ........................................
 /sajoin  <nick> <channel>[,<channel>...]
 
@@ -717,6 +738,9 @@ server: Servername
 [command]*`voice`* Voice an Nick(s) vergeben::
 ........................................
 /voice  <nick> [<nick>...]
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den voice-Status
 ........................................
 
 [[command_irc_wallchops]]
@@ -737,7 +761,7 @@ text: Text der gesendet werden soll
 ........................................
 
 [[command_irc_who]]
-[command]*`who`* Sendet eine 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]]
 

doc/de/autogen/user/irc_options.txt

@@ -38,21 +38,11 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"1,-1:darkgray"`)
 
-* [[option_irc.color.nick_prefix]] *irc.color.nick_prefix*
-** Beschreibung: `Farbe für den Nick Präfix (Präfix ist die editierbare Zeichenkette die vor dem Nick steht)`
-** 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: `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: "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"`)
 
-* [[option_irc.color.nick_suffix]] *irc.color.nick_suffix*
-** Beschreibung: `Farbe für den Nick Suffix (Suffix ist die editierbare Zeichenkette die nach dem Nick steht)`
-** 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: `green`)
-
 * [[option_irc.color.notice]] *irc.color.notice*
 ** Beschreibung: `Farbe des "Notice"-Textes in Notizen`
 ** Typ: Farbe
@@ -104,7 +94,7 @@
 ** 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)`
+** Beschreibung: `Format für die Zeitanzeige die bei einer CTCP TIME Anfrage zurückgesendet wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T %z"`)
 
@@ -143,6 +133,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
+** Beschreibung: `durch Kommata getrennte Liste von Nachrichten die beim betreten eines Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = Topic, 333 = Nick/Datum für Topic, 366 = genutzte Namen im Channel`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333,366"`)
+
 * [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
 ** Beschreibung: `Zeige das alte Thema an, falls das Thema des Channels geändert wurde`
 ** Typ: boolesch
@@ -158,13 +153,8 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
-* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
-** Beschreibung: `Passwörter verstecken die durch NickServ angezeigt werden`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
-
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
-** Beschreibung: `durch Kommata getrennte Liste von Wörtern die im Channel-Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
+** Beschreibung: `durch Kommata getrennte Liste von Wörtern die in Channel-Buffern als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
@@ -174,12 +164,12 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_server]] *irc.look.highlight_server*
-** Beschreibung: `durch Kommata getrennte Liste von Wörtern die im Serverbuffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
+** Beschreibung: `durch Kommata getrennte Liste von Wörtern die in Server-Buffern als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"$nick"`)
 
 * [[option_irc.look.highlight_tags]] *irc.look.highlight_tags*
-** Beschreibung: `eine durch Kommata getrennte Liste von Schlagwörtern welche eine Nachricht hervorheben sollen (Highlight)  (normalerweise trifft dies auf jede Nachricht eines Users zu, ausgenommen Nachrichten vom Server,..)`
+** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern, welche eine Nachricht hervorheben sollen (Highlight) (normalerweise trifft dies auf jede Nachricht eines Users zu, ausgenommen Nachrichten vom Server,..)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"irc_privmsg,irc_notice"`)
 
@@ -224,12 +214,17 @@
 ** Werte: none, next, near_server (Standardwert: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** Beschreibung: `erzwingt für einen Nick eine spezielle Farbe. Die mittels Streuwertfunktion aus dem Nicknamen generierte Nickfarbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2"). Bei der Schreibweise der Nicks wird sowohl nach Groß- und Kleinschreibung unterschieden und ebenso kann man die Nicks nur mit Kleinbuchstaben schreiben.`
+** Beschreibung: `erzwingt für einen Nick eine spezielle Farbe. Die standardmäßig, mittels Streuwertfunktion aus dem Nicknamen, generierte Nickfarbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2"). Zuerst wird beim Nicknamen nach Groß- und Kleinschreibung unterschieden. Sollte der Nick nicht gefunden werden, findet keine Unterscheidung mehr statt. Somit ist es möglich die Nicks, in dieser Option, ausschließlich in Kleinschrift zu schreiben`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
+* [[option_irc.look.nick_color_hash]] *irc.look.nick_color_hash*
+** Beschreibung: `Gibt an welcher Hash-Algorithmus zur Farbauswahl für Nicks genutzt werden soll: djb2 = Variante des djb2 (Position der Buchstaben innerhalb des Nicks werden berücksichtigt: Anagramme eines Nick erhalten eine andere Farbe), sum = hier ist nur die Anzahl der Buchstaben maßgeblich`
+** Typ: integer
+** Werte: djb2, sum (Standardwert: `sum`)
+
 * [[option_irc.look.nick_color_stop_chars]] *irc.look.nick_color_stop_chars*
-** Beschreibung: `Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname lautet "|nick|abwesend" wobei das Zeichen "|" ignoriert werden soll. Die Farbe für den Nicknamen wird nun für "|nick" anstelle von "|nick|abwesend" erstellt).`
+** Beschreibung: `Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname lautet "|nick|abwesend" wobei das Zeichen "|" ignoriert werden soll. Die Farbe für den Nicknamen wird nun für "|nick" anstelle von "|nick|abwesend" erstellt)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"_|["`)
 
@@ -248,28 +243,28 @@
 ** 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`
+* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
+** Beschreibung: `durch Kommata getrennte Liste von Nicks bei denen das Passwort in einer Nachricht unterdrückt werden soll. Zum Beispiel bei einer Nachricht die durch "/msg nickserv identify password" generiert wird. Beispiel: "nickserv,nickbot"`
 ** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `""`)
-
-* [[option_irc.look.nick_suffix]] *irc.look.nick_suffix*
-** Beschreibung: `Text, der im Chatfenster nach dem Nickname erscheinen soll`
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `""`)
+** Werte: beliebige Zeichenkette (Standardwert: `"nickserv"`)
 
 * [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
 ** Beschreibung: `zeigt Notizen als private Nachricht an (wird die "auto" Option verwendet dann wird ein privater Buffer genutzt, falls vorhanden)`
 ** Typ: integer
 ** Werte: auto, never, always (Standardwert: `auto`)
 
+* [[option_irc.look.notice_welcome_redirect]] *irc.look.notice_welcome_redirect*
+** Beschreibung: `automatische Weiterleitung von Willkommen-Nachrichten in den entsprechenden Channel-Buffer. Solche Nachrichten haben den Nick als Empfänger, der Channelnamen wird aber der Nachricht vorangestellt. Eine solche Nachricht sieht auf dem freenode Server wie folgt aus: "[#channel] Herzlich Willkommen zum ..."`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison*
-** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen falls sich ein Nick beim Server an- oder abmeldet (Rückgabe vom Befehl ison), zum Beispiel: "notify_highlight","notify_message" oder "notify_private"`
+** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in notify-Nachrichten genutzt werden sollen, falls ein Nick einen Server betritt oder verlässt (Rückgabe durch Befehl ison), zum Beispiel: "notify_message", "notify_private" oder "notify_highlight"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`)
 
 * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois*
-** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen falls ein Nick den Befehl away nutzt (Rückgabe vom Befehl whois), zum Beispiel: "notify_highlight", "notify_message" oder "notify_private"`
+** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in notify-Nachrichten genutzt werden sollen, falls sich der away-Status eines Nick ändert (Rückgabe durch Befehl whois), zum Beispiel: "notify_message", "notify_private" oder "notify_highlight"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`)
 
@@ -278,6 +273,16 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
+* [[option_irc.look.pv_buffer]] *irc.look.pv_buffer*
+** Beschreibung: `private Buffer zusammenfügen`
+** Typ: integer
+** Werte: independent, merge_by_server, merge_all (Standardwert: `independent`)
+
+* [[option_irc.look.pv_tags]] *irc.look.pv_tags*
+** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die für private Nachrichten genutzt werden sollen. Zum Beispiel: "notify_message", "notify_private" oder "notify_highlight"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"notify_private"`)
+
 * [[option_irc.look.raw_messages]] *irc.look.raw_messages*
 ** Beschreibung: `Anzahl der IRC-RAW-Nachrichten die im Speicher gehalten werden sollen falls der RAW-Daten-Buffer geschlossen ist (die Nachrichten werden umgehend angezeigt sobald der RAW-Daten-Buffer geöffnet wird)`
 ** Typ: integer
@@ -289,7 +294,7 @@
 ** Werte: merge_with_core, merge_without_core, independent (Standardwert: `merge_with_core`)
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** Beschreibung: `filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden.`
+** Beschreibung: `filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -303,8 +308,13 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
+** Beschreibung: `Verzögerung (in Minuten) um Join Mitteilungen rückwirkend anzuzeigen, falls diese mittels "irc_smart_filter" unterdrückt wurden. Sollte ein Nick während der vorgegeben Zeit etwas im Channel schreiben, dann wird seine Join Mitteilung angezeigt. Dies bezieht sich auf Nachrichten, eine Notice, Änderungen am Topic oder falls der Nick gewechselt wird (0 = deaktiviert: join-Mitteilungen bleiben verborgen)`
+** Typ: integer
+** Werte: 0 .. 10080 (Standardwert: `30`)
+
 * [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
-** Beschreibung: `aktiviert einen intelligenten Filter für Nachrichten von einem "Nick"`
+** Beschreibung: `aktiviert einen intelligenten Filter für "nick" Nachrichten (Änderungen des Nick)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -334,7 +344,7 @@
 ** Werte: 0 .. 86400 (Standardwert: `1800`)
 
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
-** Beschreibung: `wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert.`
+** Beschreibung: `wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
@@ -348,16 +358,16 @@
 ** Typ: integer
 ** Werte: 0 .. 604800 (Standardwert: `60`)
 
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** Beschreibung: `maximal Verzögerung (Lag) bis zum Trennen der Verbindung (in Minuten - 0 = niemals trennen)`
-** Typ: integer
-** Werte: 0 .. 10080 (Standardwert: `0`)
-
 * [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
 ** Beschreibung: `geringste Verzögerungszeit (Lag) die angezeigt werden soll (in Millisekunden)`
 ** Typ: integer
 ** Werte: 0 .. 86400000 (Standardwert: `500`)
 
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** Beschreibung: `erneut mit Server verbinden, falls die maximal Verzögerung (Lag) erreicht wurde (Zeit in Sekunden, 0 = keine automatische Neuverbindung, zum Server)`
+** Typ: integer
+** Werte: 0 .. 604800 (Standardwert: `0`)
+
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** Beschreibung: `Intervall zwischen zwei Aktualisierungen der Verzögerungsanzeige (Lag-Item), wenn die Verzögerungszeit sich erhöht (in Sekunden)`
 ** Typ: integer
@@ -404,7 +414,7 @@
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2")`
+** Beschreibung: `durch Kommata getrennte Liste der Channels, die beim Verbinden zum Server betreten werden sollen (Beispiel: "#chan1,#chan2,#chan3 key1,key2") (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -439,12 +449,12 @@
 ** Werte: 0 .. 1000000 (Standardwert: `25`)
 
 * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
-** Beschreibung: `Durch Kommata getrennte Liste von erweiterten Client Fähigkeiten ("client capabilities"), welche vom Server angeboten und genutzt werden sollen (Beispiel: "multi-prefix,extended-join")`
+** Beschreibung: `durch Kommata getrennte Liste von erweiterten Client Fähigkeiten ("client capabilities"), welche vom Server angeboten und genutzt werden sollen. Fähigkeiten die von WeeChat unterstützt werden: multi-prefix, userhost-in-name (Beispiel: "multi-prefix, userhost-in-name")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_irc.server_default.command]] *irc.server_default.command*
-** Beschreibung: `enthält Befehle die nach der Verbindung zum Server ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt`
+** Beschreibung: `enthält Befehle die nach der Verbindung zum Server ausgeführt werden sollen. Mehrere Befehle müssen durch ein ";" getrennt werden. Möchte man ein Semikolon nutzen muss man "\;" verwenden. Die speziellen Variablen $nick, $channel und $server werden dabei durch den jeweiligen Wert ersetzt (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -469,7 +479,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"WeeChat %v"`)
 
 * [[option_irc.server_default.ipv6]] *irc.server_default.ipv6*
-** 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.`
+** 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: `on`)
 
@@ -494,7 +504,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** Beschreibung: `Proxy, der für diesen Server verwendet wird (optional)`
+** Beschreibung: `Name des Proxy für diesen Server (optional, Proxy muss mit dem Befehl /proxy angelegt werden)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -504,12 +514,12 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** Beschreibung: `Verfahren welches bei einer SASL Authentifizierung angewandt werden soll: "plain" Passwort liegt in Klartext vor, "dh-blowfish" Passwort wird verschlüsselt, "external" SSL Zertifikat welches auf Client Seite vorliegt`
+** Beschreibung: `Verfahren welches bei einer SASL Authentifizierung angewandt werden soll: "plain" Passwort wird im Klartext gesendet, "dh-blowfish" Passwort wird mittels blowfish verschlüsselt, "dh-aes" Passwort wird mittels AES verschlüsselt, "external" SSL Zertifikat welches auf Client Seite vorliegt, wird verwendet`
 ** Typ: integer
-** Werte: plain, dh-blowfish, external (Standardwert: `plain`)
+** Werte: plain, dh-blowfish, dh-aes, external (Standardwert: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** Beschreibung: `Passwort für SASL Authentifizierung`
+** Beschreibung: `Passwort für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -519,7 +529,7 @@
 ** Werte: 1 .. 3600 (Standardwert: `15`)
 
 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** Beschreibung: `Username für SASL Authentifizierung`
+** Beschreibung: `Username für SASL Authentifikation (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 

doc/de/autogen/user/logger_commands.txt

@@ -3,11 +3,13 @@
 ........................................
 /logger  list
          set <level>
+         flush
          disable
 
-   list: zeigt, für geöffnete Buffer, den Status der Protokollierung an
+   list: zeigt den Status der Protokollierung aller geöffneten Buffer an
     set: legt den Level fest, nach dem der aktuelle Buffer protokolliert werden soll
-  level: legt fest, welche Nachrichten protokolliert werden sollen (0 = nichts protokollieren, 1 = nur die wichtigsten Nachrichten protokollieren .. 9 = protokolliere alle Nachrichten)
+  level: legt fest, welche Nachrichten protokolliert werden sollen (0 = nichts protokollieren, 1 = nur die wichtigsten Nachrichten protokollieren .. 9 = alle Nachrichten werden protokolliert)
+  flush: sichert alle Protokolle umgehend
 disable: die Protokollierung wird für den aktuellen Buffer ausgeschaltet (der Level wird auf 0 gestellt)
 
 Die Optionen "logger.level.*" und "logger.mask.*" können genutzt werden um den Level der Protokollierung festzulegen und um eine Maske für einen oder mehrere Buffer zu definieren.

doc/de/autogen/user/logger_options.txt

@@ -33,6 +33,16 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_logger.file.nick_prefix]] *logger.file.nick_prefix*
+** Beschreibung: `Zeichenkette die dem Nick vorangestellt werden soll. Beispiel: "<"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_logger.file.nick_suffix]] *logger.file.nick_suffix*
+** Beschreibung: `Zeichenkette die nach dem Nick eingefügt werden soll. Beispiel: ">"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_logger.file.path]] *logger.file.path*
 ** Beschreibung: `Pfad für WeeChat Protokolldateien; "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat"); eine Datumsspezifikation ist zulässig (siehe: man strftime)`
 ** Typ: Zeichenkette
@@ -44,7 +54,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `"_"`)
 
 * [[option_logger.file.time_format]] *logger.file.time_format*
-** Beschreibung: `Zeitstempel in Protokoll-Datei nutzen (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)`
+** Beschreibung: `Zeitstempel in Protokoll-Datei nutzen (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%Y-%m-%d %H:%M:%S"`)
 

doc/de/autogen/user/relay_commands.txt

@@ -16,7 +16,7 @@
          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 "irc": Name des Servers welcher geteilt werden soll (optional). Wird kein Name angegeben, dann muss der Client den Servernamen mittels Befehl "PASS" anfordern. Format: "PASS Server:Passwort")
                  - Protokoll "weechat" (Name wird nicht unterstützt)
          port: Port den das Relay nutzen soll
           raw: öffnet Buffer mit RAW-Relay Daten
@@ -29,6 +29,8 @@ Beispiele:
     /relay add irc.freenode 8000
   IRC Proxy, für Server "freenode", mit SSL:
     /relay add ssl.irc.freenode 8001
+  IRC Proxy für alle Server (Client wählt aus), mit SSL:
+    /relay add ssl.irc 8002
   WeeChat Protokoll:
     /relay add weechat 9000
   WeeChat Protokoll, mit SSL:

doc/de/autogen/user/relay_options.txt

@@ -113,3 +113,8 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%h/ssl/relay.pem"`)
 
+* [[option_relay.network.websocket_allowed_origins]] *relay.network.websocket_allowed_origins*
+** Beschreibung: `erlaubt regulären Ausdruck für Origins in WebSockets (Groß- und Kleinschreibung wird ignoriert, um Groß- und Kleinschreibung zu nutzen muss "(?-i)" dem Origin vorangestellt werden), Beispiele: "^http://(www\.)?example\.(com|org)"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+

doc/de/autogen/user/rmodifier_commands.txt

@@ -1,9 +1,10 @@
 [[command_rmodifier_rmodifier]]
-[command]*`rmodifier`* wandelt Schlüsselwörter mit regulären Ausdrücken (regelt die Sichtbarkeit von Texten in WeeChat)::
+[command]*`rmodifier`* wandelt Schlüsselwörter mit regulären Ausdrücken (regelt die Darstellung von Texten in WeeChat)::
 ........................................
 /rmodifier  list|listdefault
             add <name> <modifiers> <groups> <regex>
             del <name>|-all [<name>...]
+            missing
             default -yes
 
        list: zeigt alle rmodifier an
@@ -11,10 +12,11 @@ listdefault: zeigt die Standardeinstellung für rmodifier an
         add: einen rmodifier hinzufügen
        name: Name des rmodifier
   modifiers: durch Kommata getrennte Liste der modifier
-     groups: Aktion auf Gruppen anwenden: durch Kommata getrennte Liste der Gruppen (von 1 bis 9). Optional kann nach der Nummer für die Gruppe ein "*" gesetzt werden um diese Gruppe auszublenden
-      regex: regulärer Ausdruck  (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
+     groups: Aktion auf Gruppen (groups) anwenden, die durch reguläre Ausdrücke abgefragt werden (innerhalb der runden Klammern): durch Kommata getrennte Liste der Gruppen (von 1 bis 9). Optional kann nach der Nummer für die Gruppe ein "*" gesetzt werden um diese Gruppe auszublenden
+      regex: regulärer Ausdruck (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
         del: löscht einen rmodifier Eintrag
        -all: löscht alle rmodifiers Einträge
+    missing: fügt fehlende rmodifiers hinzu
     default: setzt die rmodifier auf seine Standardwerte zurück
 
 Beispiele:

doc/de/autogen/user/rmodifier_options.txt

@@ -1,5 +1,5 @@
 * [[option_rmodifier.look.hide_char]] *rmodifier.look.hide_char*
-** Beschreibung: `Zeichen dass benutzt werden soll um bei einer Eingabe einer Zeichenkette zu verbergen`
+** Beschreibung: `Zeichen, das anstelle der eigentlichen Eingabe angezeigt wird`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)
 

doc/de/autogen/user/script_commands.txt

@@ -5,29 +5,33 @@
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <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
+          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
+      autoload: das Skript wird in das autoload-Verzeichnis eingebunden
+    noautoload: das Skript wird aus dem autoload-Verzeichnis entfernt
+toggleautoload: autoload für das Skript umschalten
+       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.
+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:
+Im Skript-Buffer, werden folgende Statusangaben für ein Skript angezeigt:
   * i a H r N
   | | | | | |
   | | | | | obsolete (neue Version verfügbar)
@@ -43,6 +47,7 @@ Tastenbefehle die im Skript-Buffer genutzt werden können:
   alt+l  startet ein Skript (Skript wird ausgeführt)
   alt+L  Skript wird neu gestartet
   alt+u  beendet ein Skript
+  alt+A  das Skript wird in das autoload-Verzeichnis eingebunden
   alt+h  Skript wird gehalten bzw. freigegeben
   alt+v  Skript anzeigen
 

doc/de/autogen/user/script_options.txt

@@ -168,6 +168,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** Beschreibung: `autoload Skripten installiert (erstellt einen Link im "autoload" Verzeichnis zum Skript im übergeordneten Verzeichnis)`
+** 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
@@ -179,7 +184,7 @@
 ** 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"`
+** Beschreibung: `Skripten welche "gehalten" werden sollen. Dies ist eine durch Kommata getrennte Liste von Skripten die weder aktualisiert noch entfernt werden können. Zum Beispiel: "buffers.pl,iset.pl"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 

doc/de/autogen/user/sec_options.txt

@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** Beschreibung: `zu nutzendes Chiffre zum Verschlüsseln von Daten (die Zahl hinter dem Algorithmus bestimmt die Größe des Schlüssels, in Bits)`
+** Typ: integer
+** Werte: aes128, aes192, aes256 (Standardwert: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** Beschreibung: `Hash-Algorithmus zur Überprüfung der verschlüsselten Daten`
+** Typ: integer
+** Werte: sha224, sha256, sha384, sha512 (Standardwert: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** Beschreibung: `Pfad zu einer Datei die die Passphrase enthält um damit schutzwürdige Daten zu ver- und entschlüsseln. Diese Option findet nur Anwendung, wenn die Datei sec.conf gelesen wird. Es wird auch nur die erste Zeile eingelesen. Diese Datei wird nur verwendet, falls die Umgebungsvariable "WEECHAT_PASSPHRASE" nicht genutzt wird (die Umgebungsvariable besitzt eine höhere Priorität). Sicherheitshinweis: Es ist anzuraten dieser Datei nur für die eigene Person Leserechte zu gewähren und die Datei nicht im Heimatverzeichnis von WeeChat zu sichern (zum Beispiel im /home/ Order); Beispiel: "~/.weechat-passphrase"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** Beschreibung: `nutzt salt bei der Schlüsselerstellung für die Verschlüsselung (wird für maximale Sicherheit empfohlen); wenn aktiviert, ist der Inhalt der verschlüsselten Daten bei jeder Sicherung in die Datei sec.conf verschieden. Wird die Datei sec.conf in eine Versionsverwaltung eingepflegt kann die Option deaktiviert werden, um immer den selben Dateiinhalt zu erhalten`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+

doc/de/autogen/user/weechat_commands.txt

@@ -1,10 +1,10 @@
 [[command_weechat_away]]
-[command]*`away`* Abwesenheitsstatus ein-/ausschalten::
+[command]*`away`* Abwesenheitsstatus setzen oder entfernen::
 ........................................
 /away  [-all] [<message>]
 
-   -all: Abwesenheitszustand auf allen Servern ändern
-message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand deaktivieren)
+   -all: Abwesenheitsstatus auf allen verbundenen Server setzen oder entfernen
+message: Abwesenheitsnachricht (ohne Angabe einer Nachricht wird der Abwesenheitszustand entfernt)
 ........................................
 
 [[command_weechat_bar]]
@@ -125,12 +125,14 @@ Beispiele:
 /color  alias <color> <name>
         unalias <color>
         reset
+        -o
 
   alias: weist einer Farbzahl einen Namen zu
 unalias: entfernt einen Namen
   color: Farbnummer (>= 0, maximale Anzahl ist abhängig vom Terminal, üblicherweise 63 oder 255 Farben)
    name: Aliasname für eine Farbe (zum Beispiel: "orange")
   reset: setzt alle Farbpaarungen zurück (nützlich falls keine Farbpaarung mehr verfügbar sein sollte und die automatische Reset-Option deaktiviert ist, siehe Option: weechat.look.color_pairs_auto_reset)
+     -o: sendet Terminal-/Farbinformationen in den aktuellen Buffer
 
 Ohne Angabe von Argumenten wird in einem separaten Buffer die darstellbare Farbpalette angezeigt.
 
@@ -185,11 +187,12 @@ Beispiele:
      list: zeigt alle Erweiterungen mit Debuglevel an
       set: setzt den Level der Protokollierung für eine Erweiterung
    plugin: Name der Erweiterung ("core" für den WeeChat Kern)
-    level: Debuglevel der Erweiterung (0 = deaktiviert das Debug)
+    level: Debuglevel der Erweiterung (0 = deaktiviert Debug)
      dump: Speicherabbild in die WeeChat Protokolldatei schreiben (wie bei einem Programmabsturz)
    buffer: speichert den Bufferinhalt als hexadezimale Ausgabe in die Protokolldatei
     color: zeigt Informationen über die aktuellen Farbpaarungen an
    cursor: schaltet den debug-Modus für den Cursor-Modus ein/aus
+     dirs: Verzeichnisse werden angezeigt
     hdata: zeigt Informationen zu hdata an (mittels free werden alle hdata Informationen aus dem Speicher entfernt)
     hooks: zeigt die aktiven Hooks an
 infolists: zeigt Information über die Infolists an
@@ -201,20 +204,21 @@ infolists: zeigt Information über die Infolists an
 ........................................
 
 [[command_weechat_eval]]
-[command]*`eval`* wertet einen Ausdruck aus und gibt das Resultat im Buffer aus::
+[command]*`eval`* wertet eine Expression aus und zeigt das Resultat im Buffer an::
 ........................................
 /eval  [-n] <expression>
-       [-n] <expression1> <operator> <expression2>
+       [-n] -c <expression1> <operator> <expression2>
 
-        -n: zeigt das Ergebnis an, ohne dieses in den Buffer zu schreiben (debug Modus)
+        -n: zeigt das Ergebnis lokal an, ohne das dieses in den Buffer gesendet wird (debug Modus)
+        -c: Auswertung als Bedingung: nutzt Operatoren und runde Klammern, Rückgabewert als Boolean-Wert ("0" oder "1")
 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
+                ==  gleich
+                !=  ungleich
                 <=  kleiner oder gleich
                 <   kleiner
                 >=  größer oder gleich
@@ -223,36 +227,37 @@ expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${vari
                 !~  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.
+Der Vergleich findet zwischen zwei Integer Werten 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:
+  1. eine Farbe (Format: color:xxx)
+  2. der Name einer Option (Format: file.section.option)
+  3. der Name einer lokalen Variablen eines Buffer
+  4. 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 kann wie folgt lauten:
   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:
+  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
+  /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 -c ${window.buffer.number} > 2  ==> 0
+  /eval -n -c ${window.win_width} > 100    ==> 1
+  /eval -n -c (8 > 12) || (5 > 2)          ==> 1
+  /eval -n -c (8 > 12) && (5 > 2)          ==> 0
+  /eval -n -c abcd =~ ^ABC                 ==> 1
+  /eval -n -c abcd =~ (?-i)^ABC            ==> 0
+  /eval -n -c abcd =~ (?-i)^abc            ==> 1
+  /eval -n -c abcd !~ abc                  ==> 0
 ........................................
 
 [[command_weechat_filter]]
@@ -289,7 +294,7 @@ Die am häufigsten gebrauchten Schlagwörter lauten:
   no_filter, no_highlight, no_log, log0..log9 (log Level),
   notify_none, notify_message, notify_private, notify_highlight,
   nick_xxx (xxx ist durch den Nicknamen zu ersetzen), prefix_nick_ccc (ccc ist die Farbe mit der der Nick dargestellt wird),
-  irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw)
+  irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw oder /debug tags)
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
 Mittels "/debug tags" kann man sich die Tags jeder einzelnen Zeile darstellen zu lassen.
 
@@ -343,6 +348,8 @@ Auflistung der möglichen Funktionen:
   complete_previous: vervollständigt Word mit vorheriger Komplettierung
   search_text: sucht nach Text im Buffer
   search_switch_case: schaltet Groß-/Kleinschreibung ein und aus
+  search_switch_regex: Wechsel des Suchmodus: einfache Textsuche/reguläre Ausdrücke
+  search_switch_where: wechselt Suche in Nachricht/Präfix
   search_previous: sucht vorheriger Zeile
   search_next: sucht nächste Zeile
   search_stop: suche stoppen
@@ -446,13 +453,19 @@ Beispiele:
 [[command_weechat_layout]]
 [command]*`layout`* Layout für Buffer und Fenster speichern, anwenden oder zurücksetzen::
 ........................................
-/layout  save [buffers|windows]
-         apply [buffers|windows]
-         reset [buffers|windows]
+/layout  save [<name>] [buffers|windows]
+         apply [<name>] [buffers|windows]
+         leave
+         reset [<name>] [buffers|windows]
+         rename <name> <new_name>
 
    save: speichert das aktuelle Layout
   apply: das gespeicherte Layout anwenden
-  reset: das gespeicherte Layout entfernen
+  leave: belässt das aktuelle Layout (es wird kein Layout aktualisiert)
+  reset: das gespeicherte Layout, mit Buffern und/oder Fenstern, zurücksetzen
+         (falls Buffer und Fenster zurückgesetzt werden, dann wird das Layout entfernt)
+ rename: ein Layout umbenennen
+   name: Name unter welchem das Layout gesichert werden soll (Standardlayout lautet "default")
 buffers: speichert bzw. verwendet nur Buffer (Reihenfolge der Buffer)
 windows: speichert bzw. verwendet nur Fenster (Buffer welche im jeweiligen Fenster dargestellt werden)
 
@@ -523,14 +536,14 @@ Ohne Angabe eines Arguments werden alle installierten Erweiterungen angezeigt.
 ........................................
 
 [[command_weechat_proxy]]
-[command]*`proxy`* Proxies verwalten::
+[command]*`proxy`* Proxys verwalten::
 ........................................
 /proxy  list
         add <name> <type> <address> <port> [<username> [<password>]]
         del <name>|-all
         set <name> <option> <value>
 
-         list: listet alle Proxies auf
+         list: listet alle Proxys auf
           add: fügt neuen Proxy hinzu
     name: Name des neuen Proxy (der Name darf nur einmal genutzt werden)
          type: http, socks4 oder socks5
@@ -538,7 +551,7 @@ Ohne Angabe eines Arguments werden alle installierten Erweiterungen angezeigt.
          port: Port
      username: Username (optional)
      password: Passwort (optional)
-          del: entfernt einen Proxy (-all um alle Proxies zu entfernen)
+          del: entfernt einen Proxy (-all um alle Proxys zu entfernen)
           set: setzt einen Wert für Proxy
        option: Optionen die geändert werden (für eine Liste der möglichen Optionen, bitte folgenden Befehl nutzen: /set weechat.proxy.<proxyname>.*)
         value: neuer Wert für Option
@@ -601,6 +614,45 @@ file: Konfigurationsdatei die gesichert werden soll (ohne Dateinamenserweiterung
 Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweiterungen) gesichert.
 ........................................
 
+[[command_weechat_secure]]
+[command]*`secure`* verwaltet zu schützende Daten (Passwörter oder private Daten werden in der Datei sec.conf verschlüsselt)::
+........................................
+/secure  passphrase <passphrase>|-delete
+         decrypt <passphrase>|-discard
+         set <name> <value>
+         del <name>
+
+passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der Datei sec.conf in Klartext gesichert)
+   -delete: löscht Passphrase
+   decrypt: entschlüsselt Daten nachträglich (dies passiert nur die Passphrase beim Start nicht angegeben wurde)
+  -discard: verwirft alle verschlüsselten Daten
+       set: ändert eine schutzwürdige Information oder fügt eine hinzu
+       del: entfernt eine schutzwürdige Information
+
+Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die geschützten Daten können dort eingesehen werden.
+
+Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start nach der Passphrase.
+Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet).
+
+schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
+  - Argument in der Befehlszeile für "--run-command"
+  - IRC Server Optionen: autojoin, command, password, sasl_{username|password}
+  - Option weechat.startup.command_{before|after}_plugins
+  - Befehl /eval.
+
+Beispiele:
+  setzen einer Passphrase:
+    /secure passphrase Dies ist meine Passphrase
+  verschlüsselt freenode SASL Passwort:
+    /secure set freenode meinPasswort
+    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+  verschlüsselt oftc Passwort für nickserv:
+    /secure set oftc meinPasswort
+    /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+  alias um den eigenen Nick zu ghosten:
+    /alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec.data.freenode}
+........................................
+
 [[command_weechat_set]]
 [command]*`set`* Konfigurationsparameter setzen::
 ........................................
@@ -652,6 +704,7 @@ Beispiele:
 /upgrade  [<path_to_binary>|-quit]
 
 path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei)
+        -dummy: ohne Funktion (dient lediglich dazu, um nicht versehentlich die "-quit" Funktion auszuführen)
          -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. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein.
@@ -670,7 +723,7 @@ Nutzt man die "-quit" Funktion ist die Abfolge geringfügig anders:
   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
+Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat --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.
 ........................................
@@ -731,7 +784,7 @@ Beispiele:
          refresh
          scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
          scroll_horiz [-window <number>] [+/-]<value>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
          swap [-window <number>] [up|down|left|right]
          zoom[-window <number>]
 
@@ -752,12 +805,13 @@ Beispiele:
       page_up: scrollt eine Seite nach oben
     page_down: scrollt eine Seite nach unten
       refresh: Seite wird neu aufgebaut
-       scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
+       scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer angegebenen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre
  scroll_horiz: scrollt horizontal eine Anzahl an Spalten (+/-N) oder prozentual von der Fenstergröße ausgehend (dieses scrolling ist nur in Buffern möglich die über einen freien Inhalt verfügen)
     scroll_up: scrollt ein paar Zeilen nach oben
   scroll_down: scrollt ein paar Zeilen nach unten
    scroll_top: scrollt zum Anfang des Buffers
 scroll_bottom: scrollt zum Ende des  Buffers
+scroll_beyond_end: scrollt über das Ende des Buffers hinaus
 scroll_previous_highlight: scrollt zum vorherigen Hightlight
 scroll_next_highlight: scrollt zum nächsten Highlight
 scroll_unread: springt zur ersten ungelesenen Zeile in einem Buffer

doc/de/autogen/user/weechat_options.txt

@@ -23,6 +23,11 @@
 ** 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_weechat.color.chat_day_change]] *weechat.color.chat_day_change*
+** Beschreibung: `Textfarbe für die Nachricht die beim Datumswechsel angezeigt 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: `cyan`)
+
 * [[option_weechat.color.chat_delimiters]] *weechat.color.chat_delimiters*
 ** Beschreibung: `Farbe der Infobar-Trennzeichen`
 ** Typ: Farbe
@@ -83,11 +88,21 @@
 ** 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_weechat.color.chat_nick_prefix]] *weechat.color.chat_nick_prefix*
+** Beschreibung: `Farbe für den Nick-Präfix (Zeichenkette die vor dem Nick steht)`
+** 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: `green`)
+
 * [[option_weechat.color.chat_nick_self]] *weechat.color.chat_nick_self*
-** Beschreibung: `Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster.`
+** Beschreibung: `Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster`
 ** 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_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
+** Beschreibung: `Farbe für den Nick-Suffix (Zeichenkette die nach dem Nick steht)`
+** 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: `green`)
+
 * [[option_weechat.color.chat_prefix_action]] *weechat.color.chat_prefix_action*
 ** Beschreibung: `Textfarbe für Action-Präfix`
 ** Typ: Farbe
@@ -178,6 +193,16 @@
 ** 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_weechat.color.emphasized]] *weechat.color.emphasized*
+** Beschreibung: `Textfarbe um Text hervorzuheben (zum Beispiel bei der Textsuche); wird ausschließlich dann genutzt, falls die Option weechat.look.emphasized_attributes keinen Eintrag besitzt (Standardwert)`
+** 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_weechat.color.emphasized_bg]] *weechat.color.emphasized_bg*
+** Beschreibung: `Hintergrundfarbe um Textpassagen hervorzuheben (zum Beispiel bei der Textsuche); wird ausschließlich dann genutzt, falls die Option weechat.look.emphasized_attributes keinen Eintrag besitzt (Standardwert)`
+** 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_weechat.color.input_actions]] *weechat.color.input_actions*
 ** Beschreibung: `Textfarbe in der Eingabezeile bei Aktivität (z.B. beim Einfügen von Zeilen)`
 ** Typ: Farbe
@@ -279,12 +304,12 @@
 ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`)
 
 * [[option_weechat.completion.base_word_until_cursor]] *weechat.completion.base_word_until_cursor*
-** Beschreibung: `ist diese Option aktiviert wird ein zu vervollständigendes Wort in den fließenden Text, mit einem Leerzeichen, hinzugefügt. Ist diese  Option deaktiviert, muss in den fließenden Text ein Leerzeichen manuell einfügt werden, um eine Vervollständigung durchführen zu können (Beispiel: In einen schon geschriebenen Text, einen Nick einzufügen)`
+** Beschreibung: `ist diese Option aktiviert wird ein zu vervollständigendes Wort in den fließenden Text, mit einem Leerzeichen, hinzugefügt. Ist diese Option deaktiviert, muss in den fließenden Text ein Leerzeichen manuell einfügt werden, um eine Vervollständigung durchführen zu können (Beispiel: In einen schon geschriebenen Text, einen Nick einzufügen)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.completion.default_template]] *weechat.completion.default_template*
-** Beschreibung: `Standardvorlage für die automatische Vervollständigung (in der Dokumentation finden Sie die vorgegebenen Codes und Werte)`
+** Beschreibung: `Standardvorlage für die automatische Vervollständigung (in der API-Dokumentation findet man die vorgegebenen Codes und Werte, Funktion "weechat_hook_command")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%(nicks)|%(irc_channels)"`)
 
@@ -364,32 +389,32 @@
 ** Werte: time, buffer, prefix, suffix, message (Standardwert: `message`)
 
 * [[option_weechat.look.bar_more_down]] *weechat.look.bar_more_down*
-** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach unten gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist).`
+** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach unten gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"++"`)
 
 * [[option_weechat.look.bar_more_left]] *weechat.look.bar_more_left*
-** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach links gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist).`
+** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach links gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"<<"`)
 
 * [[option_weechat.look.bar_more_right]] *weechat.look.bar_more_right*
-** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach rechts gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist).`
+** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach rechts gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `">>"`)
 
 * [[option_weechat.look.bar_more_up]] *weechat.look.bar_more_up*
-** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach oben gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist).`
+** Beschreibung: `Zeichen welches anzeigt, dass die Bar nach oben gescrollt werden kann (dies trifft nur auf Bars zu bei denen die Option "/set *.filling_*" nicht auf "horizontal" eingestellt ist)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"--"`)
 
 * [[option_weechat.look.buffer_notify_default]] *weechat.look.buffer_notify_default*
-** Beschreibung: `Standardeinstellung der Benachrichtigungsstufe für Buffer (dies wird genutzt um WeeChat mitzuteilen ob der Buffer in der Hotlist angezeigt werden soll oder nicht, entsprechend der Wichtigkeit der Nachricht): all=alle Nachrichten (Standard), message=Nachrichten+Highlights, highlights=nur Highlights, none=Hotlist wird niemals angezeigt.`
+** Beschreibung: `Standardeinstellung der Benachrichtigungsstufe für Buffer (dies wird genutzt um WeeChat mitzuteilen ob der Buffer in der Hotlist angezeigt werden soll oder nicht, entsprechend der Wichtigkeit der Nachricht): all=alle Nachrichten (Standard), message=Nachrichten+Highlights, highlights=nur Highlights, none=Hotlist wird niemals angezeigt`
 ** Typ: integer
 ** 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 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"`
+** Beschreibung: `Format für die Uhrzeit, die in jeder Zeile eines Buffers dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden) (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval). Beispiel: Uhrzeit in Graustufen (Unterstützung von 256 Farben notwendig): "${color:252}%H${color:245}%M${color:240}%S"`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)
 
@@ -401,7 +426,7 @@
 * [[option_weechat.look.color_inactive_buffer]] *weechat.look.color_inactive_buffer*
 ** Beschreibung: `Textfarbe für Zeilen in einem inaktiven Buffer (betrifft Zeilen in einem zusammengefügt Buffer, welcher nicht aktiv ist)`
 ** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
+** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.look.color_inactive_message]] *weechat.look.color_inactive_message*
 ** Beschreibung: `nutzt eine andere Farbe um die inaktiven Nachrichten darzustellen (Fenster ist nicht das aktuelle Fenster oder wenn die Zeile des zusammengefügten Buffers nicht die aktiv Zeile ist)`
@@ -426,7 +451,7 @@
 * [[option_weechat.look.color_inactive_window]] *weechat.look.color_inactive_window*
 ** Beschreibung: `Textfarbe für Zeilen in einem inaktiven Fenster (betrifft das Fenster, welches nicht aktiv ist)`
 ** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
+** Werte: on, off (Standardwert: `on`)
 
 * [[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!)`
@@ -444,7 +469,7 @@
 ** Werte: on, off (Standardwert: `off`)
 
 * [[option_weechat.look.command_chars]] *weechat.look.command_chars*
-** Beschreibung: `Bestimmt ein- oder mehrere Zeichen mit denen man ebenfalls einen Befehl ausführen kann. Zum Beispiel mittels ".$". Der Schrägstrich (slash: "/") ist ein reserviertes Zeichen und kann immer genutzt werden.`
+** Beschreibung: `Bestimmt ein- oder mehrere Zeichen mit denen man ebenfalls einen Befehl ausführen kann. Zum Beispiel mittels ".$". Der Schrägstrich (slash: "/") ist ein reserviertes Zeichen und wird immer genutzt`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -458,16 +483,26 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
-* [[option_weechat.look.day_change_time_format]] *weechat.look.day_change_time_format*
-** Beschreibung: `Format für die Uhrzeit und das Datum, dass beim Datumswechsel angezeigt werden soll`
+* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+** Beschreibung: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y"`)
+** Werte: beliebige Zeichenkette (Standardwert: `"-- %a, %d %b %Y --"`)
+
+* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+** Beschreibung: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
 
 * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch*
 ** Beschreibung: `aktiviert man diese Option, dann wird "eat_newline_glitch" auf 0 gesetzt; dies bedeutet, dass am Ende einer Zeile kein Zeilenumbruch an gehangen wird und somit der Text beim kopieren aus WeeChat und beim einfügen in einer anderen Applikation nicht umgebrochen wird (diese Option ist standardmäßig deaktiviert, da es zu schwerwiegenden Grafikfehlern kommen kann)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
+* [[option_weechat.look.emphasized_attributes]] *weechat.look.emphasized_attributes*
+** Beschreibung: `Attribute um Textpassagen hervorzuheben: Das setzen von ein- oder mehreren Attributen ist möglich ("*" für fett, "!" für invertiert, "_" für unterstrichen); falls die Option weechat.look.emphasized_attributes keinen Eintrag besitzt, werden die Farben genutzt die durch colors weechat.color.emphasized* definiert sind`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_weechat.look.highlight]] *weechat.look.highlight*
 ** Beschreibung: `eine durch Kommata getrennte Liste der hervorzuhebenden Wörter. Groß- und Kleinschreibung wird dabei standardmäßig nicht beachtet (um zwischen Groß-und Kleinschreibung zu unterscheiden muss am Wortanfang "(?-i)" genutzt werden). Schlagwörter können mit "*", als Joker, beginnen oder enden; Beipiel: "test,(?-i)*toto*,flash*"`
 ** Typ: Zeichenkette
@@ -479,7 +514,7 @@
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.look.highlight_tags]] *weechat.look.highlight_tags*
-** Beschreibung: `eine durch Kommata getrennte Liste der hervorzuhebenden Wörter (Groß-/Kleinschreibung wird nicht beachtet. Beispiele: "irc_notice" für IRC Nachrichten, "nick_flashcode" für Nachrichten vom Nick "FlashCode")`
+** Beschreibung: `durch Kommata getrennte Liste der hervorzuhebenden Wörter (Groß-/Kleinschreibung wird nicht beachtet. Beispiele: "irc_notice" für IRC Nachrichten, "nick_flashcode" für Nachrichten vom Nick "FlashCode")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -523,6 +558,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
+* [[option_weechat.look.hotlist_prefix]] *weechat.look.hotlist_prefix*
+** Beschreibung: `Text der am Ende der Hotlist angezeigt werden soll`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"H: "`)
+
 * [[option_weechat.look.hotlist_short_names]] *weechat.look.hotlist_short_names*
 ** Beschreibung: `ist diese Option aktiviert, wird der Kurzname der zusammengefügten Buffer in der Hotlist dargestellt (die Darstellung geschieht nach dem ersten '.' im Namen)`
 ** Typ: boolesch
@@ -533,13 +573,18 @@
 ** Typ: integer
 ** Werte: group_time_asc, group_time_desc, group_number_asc, group_number_desc, number_asc, number_desc (Standardwert: `group_time_asc`)
 
+* [[option_weechat.look.hotlist_suffix]] *weechat.look.hotlist_suffix*
+** Beschreibung: `Text der am Ende der Hotlist angezeigt werden soll`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_weechat.look.hotlist_unique_numbers]] *weechat.look.hotlist_unique_numbers*
 ** Beschreibung: `die Nummer des Buffers wird nur einmal in der Hotlist angezeigt (diese Option kommt nur zum Tragen sofern KEINE Buffernamen angezeigt werden)`
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.look.input_cursor_scroll]] *weechat.look.input_cursor_scroll*
-** Beschreibung: `Anzahl an Zeichen die nach links verschoben werden sollen, falls das Ende der Eingabezeile erreicht wird.`
+** Beschreibung: `Anzahl an Zeichen die nach links verschoben werden sollen, falls das Ende der Eingabezeile erreicht wird`
 ** Typ: integer
 ** Werte: 0 .. 100 (Standardwert: `20`)
 
@@ -559,12 +604,12 @@
 ** Werte: 0 .. 65535 (Standardwert: `32`)
 
 * [[option_weechat.look.item_buffer_filter]] *weechat.look.item_buffer_filter*
-** Beschreibung: `Zeichen mit welchem in der Bar-Item ("buffer_filter") signalisiert wird ob im aktuellen Buffer die Filterfunktion eingeschaltet ist.`
+** Beschreibung: `Zeichen mit welchem in der Bar-Item ("buffer_filter") signalisiert wird ob im aktuellen Buffer die Filterfunktion eingeschaltet ist`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)
 
 * [[option_weechat.look.item_time_format]] *weechat.look.item_time_format*
-** Beschreibung: `Format für die Zeitanzeige des Bar-Items, "time" (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)`
+** Beschreibung: `Format für die Zeitanzeige des Bar-Items, "time" (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M"`)
 
@@ -583,6 +628,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_weechat.look.key_bind_safe]] *weechat.look.key_bind_safe*
+** Beschreibung: `Es dürfen nur "geschützte" Tasten zugeordnet werden (Tasten, die mittels ctrl oder meta verwendet werden)`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_weechat.look.mouse]] *weechat.look.mouse*
 ** Beschreibung: `Mausunterstützung einschalten`
 ** Typ: boolesch
@@ -593,6 +643,16 @@
 ** Typ: integer
 ** Werte: 1 .. 10000 (Standardwert: `100`)
 
+* [[option_weechat.look.nick_prefix]] *weechat.look.nick_prefix*
+** Beschreibung: `Text, der vor dem Nick dargestellt werden soll, Beispiel: "<"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
+* [[option_weechat.look.nick_suffix]] *weechat.look.nick_suffix*
+** Beschreibung: `Text, der nach dem Nick dargestellt werden soll, Beispiel: ">"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[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~", gefolgt von dem einzufügenden Text und einem abschließenden "ESC[201~")`
 ** Typ: boolesch
@@ -609,7 +669,7 @@
 ** Werte: -1 .. 2147483647 (Standardwert: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** Beschreibung: `Präfix, dass bei einer Action-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
+** Beschreibung: `Präfix, dass bei einer Action-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `" *"`)
 
@@ -633,6 +693,11 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** Beschreibung: `Das Zeichen welches zum Verkürzen angezeigt wird (Standardzeichen: "+"), nach dem Nick-Suffix darstellen (das vorhandene Leerzeichen wird ersetzt); wird diese Funktion deaktiviert, dann wird das Zeichen nach dem Nick dargestellt`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** Beschreibung: `Einstellung des Präfix für den Namen des Buffers, falls viele Buffer zu einem Buffer zusammengefügt wurden (keine = none, links = left, rechts = right (Standardwert))`
 ** Typ: integer
@@ -648,28 +713,33 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** Beschreibung: `Das Zeichen welches zum Verkürzen angezeigt wird (Standardzeichen: "+"), nach dem Nick-Suffix darstellen (das vorhandene Leerzeichen wird ersetzt); wird diese Funktion deaktiviert, dann wird das Zeichen nach dem Nick dargestellt`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** Beschreibung: `Präfix, dass bei einer Fehler-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
+** Beschreibung: `Präfix, dass bei einer Fehlernachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"=!="`)
 
 * [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** Beschreibung: `Präfix, dass bei einer Join-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
+** Beschreibung: `Präfix, dass bei einer Join-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"-->"`)
 
 * [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** Beschreibung: `Präfix, dass bei einer Netzwerk-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
+** Beschreibung: `Präfix, dass bei einer Netzwerknachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"--"`)
 
 * [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** Beschreibung: `Präfix, dass bei einer Quit-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
+** Beschreibung: `Präfix, dass bei einer Quit-Nachricht genutzt wird (Hinweis: Inhalt ist evaluiert, somit kann mittels des Formats "${color:xxx} Farben gesetzt werden, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"<--"`)
 
 * [[option_weechat.look.prefix_same_nick]] *weechat.look.prefix_same_nick*
-** Beschreibung: `setzt ein Präfix welches anstelle des Nicks der Nachricht vorangestellt wird, sofern die vorherige Nachricht von dem selben Nick geschrieben wurde. Wird ein Leerzeichen (" ") genutzt, dann wird der Nachricht kein Präfix vorangestellt. Um diese Funktion zu deaktivieren und den Nick als Präfix zu nutzen darf keine Zeichenkette angegeben werden.`
+** Beschreibung: `setzt ein Präfix welches anstelle des Nicks der Nachricht vorangestellt wird, sofern die vorherige Nachricht von dem selben Nick geschrieben wurde. Wird ein Leerzeichen (" ") genutzt, dann wird der Nachricht kein Präfix vorangestellt. Um diese Funktion zu deaktivieren und den Nick als Präfix zu nutzen darf keine Zeichenkette angegeben werden`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
@@ -724,12 +794,12 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.look.separator_horizontal]] *weechat.look.separator_horizontal*
-** 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.`
+** 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 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.`
+** 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: `""`)
 
@@ -739,7 +809,7 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.look.time_format]] *weechat.look.time_format*
-** Beschreibung: `Zeitstempel für das Datum. Der Zeitstempel wird in eine Zeichenkette umgewandelt und in Nachrichten dargestellt.`
+** Beschreibung: `Format für das Datum, wenn dieses in eine Zeichenkette umgewandelt und in Nachrichten dargestellt wird (siehe man strftime, welche Platzhalter für das Datum und die Uhrzeit verwendet werden)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T"`)
 
@@ -768,8 +838,13 @@
 ** Typ: integer
 ** Werte: 1 .. 2147483647 (Standardwert: `30`)
 
+* [[option_weechat.network.proxy_curl]] *weechat.network.proxy_curl*
+** Beschreibung: `Name des Proxy welcher für URL Downloads mittels Curl genutzt werden soll (wird verwendet um das Inhaltsverzeichnis für Script-Erweiterung herunterzuladen oder in Skripten, welche die Funktion hook_process nutzen); der Proxy muss mit dem Befehl /proxy eingerichtet werden`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
-** Beschreibung: `eine durch Kommata getrennte Liste der Erweiterungen, die beim Programmstart automatisch geladen werden sollen; "*" lädt alle vorhandenen Erweiterungen. Beginnt der Name hingegen mit "!" wird die Erweiterung nicht geladen. Suchmuster können mit einem Joker ("*") beginnen oder enden um mehrere Erweiterungen zu laden (Beispiele: "*" oder "*,!lua,!tcl")`
+** Beschreibung: `durch Kommata getrennte Liste der Erweiterungen, die beim Programmstart automatisch geladen werden sollen; "*" lädt alle vorhandenen Erweiterungen. Beginnt der Name hingegen mit "!" wird die Erweiterung nicht geladen. Suchmuster können mit einem Joker ("*") beginnen oder enden um mehrere Erweiterungen zu laden (Beispiele: "*" oder "*,!lua,!tcl")`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"*"`)
 
@@ -794,12 +869,12 @@
 ** Werte: on, off (Standardwert: `on`)
 
 * [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht, nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch ";" zu trennen)`
+** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht nachdem die Erweiterungen geladen worden sind (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
 * [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht, bevor die Erweiterungen geladen werden (mehrere Befehle sind durch ";" zu trennen)`
+** Beschreibung: `Nach dem Start von WeeChat wird dieser Befehl aufgerufen. Dies geschieht bevor die Erweiterungen geladen werden (mehrere Befehle sind durch ";" zu trennen) (Hinweis: Inhalt ist evaluiert, siehe /help eval)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 

doc/de/autogen/user/xfer_options.txt

@@ -53,6 +53,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
+* [[option_xfer.file.auto_accept_nicks]] *xfer.file.auto_accept_nicks*
+** Beschreibung: `durch Kommata getrennte Liste von Nicks deren Chat- und Transferanfragen automatisch akzeptiert werden. Format : "server.nick" (für einen speziellen Server) oder "nick" (global, für alle Server); Beispiel: "freenode.FlashCode,andrew"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `""`)
+
 * [[option_xfer.file.auto_rename]] *xfer.file.auto_rename*
 ** Beschreibung: `eingehende Dateien werden automatisch umbenannt um ein Überschreiben zu vermeiden (dabei wird dem Dateinamen '.1', '.2', ... hinzugefügt)`
 ** Typ: boolesch
@@ -93,6 +98,11 @@
 ** Typ: integer
 ** Werte: 0 .. 256 (Standardwert: `20`)
 
+* [[option_xfer.look.pv_tags]] *xfer.look.pv_tags*
+** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die für private Nachrichten genutzt werden sollen. Zum Beispiel: "notify_message", "notify_private" oder "notify_highlight"`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"notify_private"`)
+
 * [[option_xfer.network.blocksize]] *xfer.network.blocksize*
 ** Beschreibung: `Blockgröße für versendete Pakete (in Bytes)`
 ** Typ: integer

doc/de/cmdline_options.de.txt

@@ -0,0 +1,35 @@
+*-a*, *--no-connect*::
+    deaktiviert das automatische Verbinden mit den Servern beim Start von WeeChat.
+
+*-c*, *--colors*::
+    Zeigt die Standardfarben im Terminal an.
+
+*-d*, *--dir* '<path>'::
+    legt den Konfigurationsordner für WeeChat fest (Voreinstellung: ~/.weechat) in
+    dem die Erweiterungen, Skripten, Protokolldateien etc.pp. gesichert werden.
+    Sollte das Verzeichnis nicht existieren wird es beim Start angelegt.
+
+*-h*, *--help*::
+    zeigt einen Hilfstext an.
+
+*-l*, *--license*::
+    zeigt die Lizenz von WeeChat an.
+
+*-p*, *--no-plugin*::
+    unterbindet das Laden der Erweiterungen beim Programmstart.
+
+*-r*, *--run-command* '<command>'::
+    startet einen oder mehrere Befehle, nachdem WeeChat gestartet wurde
+    (mehrere Befehle müssen durch Kommata voneinander getrennt werden).
+
+*-s*, *--no-script*::
+    Skripten werden beim Programmstart nicht geladen.
+
+*--upgrade*::
+    führt ein WeeChat Upgrade mittels Sitzungsdateien, die mit dem Befehl `/upgrade -quit` erstellt wurden, durch.
+
+*-v*, *--version*::
+    zeigt die Version von WeeChat an.
+
+*plugin:option*::
+    Option für Erweiterung.

doc/de/weechat.1.de.txt

@@ -0,0 +1,116 @@
+WEECHAT(1)
+==========
+:doctype: manpage
+
+NAME
+----
+
+weechat - der erweiterbare Chat Client
+
+SYNOPSIS
+--------
+
+[verse]
+'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+'weechat' [-c|--colors]
+'weechat' [-h|--help]
+'weechat' [-k|--keys]
+'weechat' [-l|--license]
+'weechat' [-v|--version]
+
+BESCHREIBUNG
+------------
+
+WeeChat ist ein schneller, leichter und erweiterbarer Chat Client.
+
+Der Client ist modular aufgebaut (ein kleiner Kern mit nachladbaren Erweiterungen),
+Multiprotokollfähig (IRC und Jabber),erweiterbar mittels C und durch Skripten, wobei
+verschiedenen Sprachen unterstützt werden.
+
+OPTIONEN
+--------
+
+include::cmdline_options.de.txt[]
+
+OPTIONEN von ERWEITERUNGEN
+--------------------------
+
+Um eine vollständige Dokumentation der Optionen zu erhalten, siehe
+http://weechat.org/doc[WeeChat user's guide].
+
+Mittels der IRC Erweiterung kann man sich zu einen temporären Server, mittels einer URL,
+verbinden lassen:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+Um dem WeeChat IRC Support-Channel, mit dem Nick "mynick", beizutreten:
+
+    irc://mynick@irc.freenode.net/#weechat
+
+Um eine IPv6 Adresse zu nutzen, muss diese in eckige Klammern gesetzt werden:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+
+DATEIEN
+-------
+
+$HOME/.weechat/weechat.conf::
+    WeeChats Konfigurationsdatei
+
+$HOME/.weechat/plugins.conf::
+    Konfigurationsdatei für Erweiterungen
+
+$HOME/.weechat/alias.conf::
+    Konfigurationsdatei für 'alias' Erweiterung
+
+$HOME/.weechat/aspell.conf::
+    Konfigurationsdatei für 'aspell' Erweiterung
+
+$HOME/.weechat/charset.conf::
+    Konfigurationsdatei für 'charset' Erweiterung
+
+$HOME/.weechat/irc.conf::
+    Konfigurationsdatei für 'irc' Erweiterung
+
+$HOME/.weechat/logger.conf::
+    Konfigurationsdatei für 'logger' Erweiterung
+
+$HOME/.weechat/relay.conf::
+    Konfigurationsdatei für 'relay' Erweiterung
+
+$HOME/.weechat/rmodifier.conf::
+    Konfigurationsdatei für 'rmodifier' Erweiterung
+
+$HOME/.weechat/script.conf::
+    Konfigurationsdatei für 'script' Erweiterung
+
+$HOME/.weechat/xfer.conf::
+    Konfigurationsdatei für 'xfer' Erweiterung
+
+$HOME/.weechat/weechat.log::
+    WeeChat Protokolldatei
+
+AUTOREN
+-------
+WeeChat ist programmiert von Sébastien Helleu und Beitragenden (eine vollständige Auflistung
+findet man in der AUTHORS Datei).
+
+Copyright (C) 2003-2013 Sébastien Helleu <flashcode@flashtux.org>
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Please read the COPYING file for more information.
+
+Web: <http://weechat.org/>
+
+FEHLER MELDEN
+-------------
+
+Fehlerbeschreibungen oder Vorschläge für neue Funktionen können auf
+der Savannah Webseite hinterlegt werden:
+
+* Fehler: <http://savannah.nongnu.org/bugs/?group=weechat>
+* Feature-Request: <http://savannah.nongnu.org/task/?group=weechat>

doc/de/weechat_faq.de.txt

@@ -26,32 +26,10 @@ Aber dieses trifft nicht auf WeeChat zu!)
 Weshalb sollte man WeeChat nutzen? - X-Chat und Irssi sind doch auch sehr gut...
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Weil WeeChat schlank ist und neue Funktionen besitzt.
-Einige Funktionen (Version ≥ 0.3.x):
-
-* Unterstützung verschiedener Protokolle durch Erweiterungen (IRC, Jabber)
-* mehrere Remote GUIs als Ergänzung zu Curses (in Kürze)
-* Unterstützung von 256 Farben
-* in mehreren Sprachen verfügbar
-* den eigenen Bedürfnissen durch Erweiterungen anpassbar (C, Perl, Python, Ruby, Lua, Tcl)
-* Buffer mit unabhängigem Inhalt
-* Filterung der Anzeige mittels Tags und regulären Ausdrücken
-* horizontale und vertikale Einteilung der Fenster
-* anpassbare und erweiterbare Leisten
-* native Nickliste
-* Auflistung von Buffern (mittels dem Skript buffers.pl)
-* IRC Proxy
-* Umleitung von IRC Befehlen
-* inkrementelle Textsuche in Buffern, zu Highlights springen
-* FIFO Pipe für Fernsteuerung
-* Unterstützung von Aspell
-* Doppelter Zeichensatz (Kodierung/Dekodierung)
-* Neuentwicklung (basiert auf keinem anderen Programm)
-* lauffähig auf einer Vielzahl von Plattformen
-* 100% GPL und Frei
+WeeChat ist sehr Speicher schonend und besticht durch innovative Funktionen.
 
 Weitere Informationen gibt es auf der folgenden Internetseite:
-http://www.weechat.org/features
+http://weechat.org/about/features
 
 [[compilation_install]]
 Kompilierung / Installation
@@ -61,10 +39,12 @@ Kompilierung / Installation
 Ich habe gehört es gibt mehrere GUIs für WeeChat. Wie kann ich diese kompilieren bzw. nutzen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Zur Zeit ist nur eine GUI, für Curses, verfügbar.
+Folgende GUIs sind verfügbar:
 
-Andere GUIs (zur Zeit in der Entwicklung) werden als Remote Clients verfügbar
-sein.
+* http://weechat.org/download/devel[QWeeChat] (Qt)
+* https://github.com/ubergeek42/weechat-android[weechat-android] (Android)
+* https://github.com/the-kenny/weechat.el[weechat.el] (Emacs)
+* https://github.com/eirikb/weecloud[weecloud] (Web)
 
 [[compile_git]]
 Ich kann WeeChat nach Cloning des git Repository nicht kompilieren - weshalb?
@@ -103,26 +83,28 @@ Anzeige
 Teilweise fehlen den Zeichen die Akzente. Wie kann ich das korrigieren?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Dies ist ein bekanntes Problem. Aus diesem Grund sollte der nachfolgende Text
-sorgfältig durchgelesen und *alle* aufgezeigten Lösungsmöglichkeiten durchgeführt
+Dies ist ein bekanntes Problem. Aus diesem Grund sollten die folgenden Punkte
+sorgfältig durchgelesen und *alle* aufgezeigten Lösungsmöglichkeiten überprüft
 werden:
 
-* überprüfe, ob weechat-curses mit libncursesw verlinkt ist (Warnung: Dies ist bei den
-  meisten Distributionen nötig - jedoch nicht bei allen): `ldd /path/to/weechat-curses`
+* überprüfe, ob weechat mit libncursesw verlinkt ist (Warnung: Dies ist bei den
+  meisten Distributionen nötig - jedoch nicht bei allen): `ldd /path/to/weechat`
 * prüfe mit dem Befehl `/plugin`, ob die "Charset" Erweiterung geladen ist (falls
   dies nicht der Fall sein sollte benötigst Du wahrscheinlich noch das Paket "weechat-plugins")
 * überprüfe die Ausgabe des `/charset` Befehls (im Server-Buffer). Du solltest
-  'ISO-XXXXXX' oder 'UTF-8' für den Terminal Zeichensatz als Antwort erhalten. Falls Du
-  'ANSI_X3.4-1968' oder einen anderen Wert angezeigt bekommen solltest, ist Deine Einstellung der
-  locale möglicherweise falsch.
+  'ISO-XXXXXX' oder 'UTF-8' für den Terminal Zeichensatz als Antwort erhalten. Falls
+  'ANSI_X3.4-1968' oder einen anderer Wert angezeigt werden sollte, ist Deine lokale
+  Einstellung möglicherweise falsch.
 * Einstellen des globalen decode Wertes, z.B.:
   `/set charset.default.decode "ISO-8859-15"`
-* Falls Du UTF-8 locale nutzt:
+* Falls Du UTF-8 lokal nutzt:
 ** prüfe, ob Dein Terminal überhaupt UTF-8 fähig ist (der empfohlene Terminal für UTF-8
    ist rxvt-unicode)
-** Solltest Du screen nutzten, prüfe ob dieser im UTF-8 Modus läuft
-   ("`defutf8 on`" in der Datei ~/.screenrc oder `screen -U` zum Starten von
+** Solltest Du screen nutzten, prüfe ob screen im UTF-8 Modus läuft
+   ("`defutf8 on`" in der Datei ~/.screenrc oder `screen -U` zum starten von
    screen)
+* überprüfe die Option 'weechat.look.eat_newline_glitch' (diese Option kann zu
+  Darstellungsfehlern führen, wenn sie aktiviert ist)
 
 [NOTE]
 Für Weechat wird die Nutzung von UTF-8 locale empfohlen. Nutzt Du jedoch ISO
@@ -298,23 +280,7 @@ Zeilen angefügt (dies führt dazu, dass URLs beim Markieren korrekt erkannt wer
 Bei der Nutzung dieser Option kann es zu Darstellungsfehlern kommen. Sollte dies
 auftreten, sollte diese Option wieder deaktiviert werden.
 
-Eine weitere Möglichkeit ist, eines der folgenden Skripten zu nutzen:
-
-urlserver.py::
-    verkürzt lange URLs mittels eigenem HTTP Server
-
-urlbar.py::
-    stellt die URL in einer Bar dar.
-
-urlgrab.py::
-    protokolliert URLs und öffnet diese im Standardbrowser.
-
-url_shorten.rb::
-tinyurl.py::
-shortenurl.py::
-    URLs werden durch einen Internet-Dienst gekürzt.
-
-Hier findet man eine Auflistung von Skripten die sich mit URLs befassen: http://www.weechat.org/scripts/stable/tag/url
+Eine weitere Möglichkeit ist, ein Skript zu nutzen: http://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?
@@ -332,7 +298,7 @@ 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]]
+[[use_256_colors]]
 Wie kann ich 256 Farben in WeeChat nutzen?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -561,6 +527,23 @@ Connect durchführen:
 /connect freenode
 ----------------------------------------
 
+// TRANSLATION MISSING
+[[irc_oauth]]
+How to connect to a server that requires "oauth"?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Some servers like 'twitch' require oauth to connect.
+
+The oauth is simply a password with the value "oauth:XXXX".
+
+You can create such server and connect with following commands (replace name
+and address by appropriate values):
+
+----------------------------------------
+/server add name irc.server.org -password="oauth:XXXX"
+/connect name
+----------------------------------------
+
 [[irc_sasl]]
 Wie kann ich mich, vor dem Betreten von Channels, identifizieren?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -625,13 +608,27 @@ Für weitere Hilfe: `/help filter` und `/help irc.look.smart_filter`
 Wie kann ich Nachrichten filtern wenn ich einen IRC Channel betrete?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Es folgen einige Tags die man zum filtern von Nachrichten nutzen kann:
+Ab WeeChat ≥ 0.4.1 ist es möglich Nachrichten zu deaktivieren. Dazu
+nutzt man die Option:
+'irc.look.display_join_message'.
+
+Zum Beispiel: Um die Auflistung aller Namen im Channel zu unterdrücken
+(IRC Nachricht '366'):
+
+----------------------------------------
+/set irc.look.display_join_message "329,332,333"
+----------------------------------------
+
+[NOTE]
+Für Hilfe: `/help irc.look.display_join_message`
+
+Eine andere Möglichkeit ist das Filtern von Nachrichten, nach Tags:
 
 * 'irc_366': Auflistung der Namen die sich im Channel befinden
 * 'irc_332,irc_333': Channel Topic/Datum
 * 'irc_329': Wann der Channel erstellt wurde
 
-Tags von anderen Server-Mitteilungen kann man im IRC Raw-Server finden
+Die Tags von anderen Server-Mitteilungen werden IRC RAW-Buffer ausgegeben
 (`/server raw`).
 
 Beispiele:
@@ -718,7 +715,7 @@ Beim Skript 'launcher.pl' müssen noch die Befehle angepasst werden:
 /set plugins.var.perl.launcher.signal.weechat_highlight "/Pfad/zum/Befehl Argumente"
 ----------------------------------------
 
-andere Skripten die auch zu diesem Thema passen: http://www.weechat.org/scripts/stable/tag/notify/
+andere Skripten die auch zu diesem Thema passen: http://weechat.org/scripts/stable/tag/notify/
 
 [[irc_target_buffer]]
 Wie kann ich bei zusammengefügten Buffern den Zielbuffer ändern (z.B. bei einem Server-Buffer)?
@@ -798,7 +795,7 @@ Es gibt drei Möglichkeiten:
   * Einen Verbesserungsvorschlag machen: https://savannah.nongnu.org/task/?group=weechat
   * Einen Patch einsenden: https://savannah.nongnu.org/patch/?group=weechat
 . Du kannst den Entwicklern mailen, entsprechende Mail-Adressen auf der Supportseite:
-  http://www.weechat.org/about
+  http://weechat.org/dev/support
   (Um emails an die "support" Mailing-Liste zu schicken, kannst Du diese abonnieren)
 
 [[gdb_error_threads]]
@@ -808,7 +805,7 @@ Wenn man WeeChat in gdb startet kann ein Thread-Fehler auftreten. Was beudeutet
 Falls man WeeChat in gdb ausführt kann folgende Fehlermeldung erscheinen:
 
 ----------------------------------------
-$ gdb /Pfad/zu/weechat-curses
+$ gdb /Pfad/zu/weechat
 (gdb) run
 [Thread debugging using libthread_db enabled]
 Cannot find new threads: generic error
@@ -818,7 +815,7 @@ Um diesen Fehler zu beheben sollte man gdb wie folgt aufrufen (der Pfad zu
 libpthread und WeeChat muss natürlich an das eigene System angepasst werden):
 
 ----------------------------------------
-$ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses
+$ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat
 (gdb) run
 ----------------------------------------
 
@@ -826,7 +823,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses
 Auf welchen Plattformen läuft WeeChat und wird es noch auf andere Betriebssystemen portiert?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Eine vollständige Liste der Portierungen findest Du unter: http://www.weechat.org/download
+Eine vollständige Liste der Portierungen findest Du unter: http://weechat.org/download
 
 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,
@@ -839,11 +836,11 @@ Ich möchte den Entwicklern von WeeChat helfen. Was kann ich tun?
 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
+http://weechat.org/dev/support
 
 [[donate]]
 Kann ich Geld oder anderes an die WeeChat Entwickler spenden?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Du kannst uns Geld zur Unterstützung der weiteren Entwicklung spenden.
-Details hierzu gibt es auf: http://www.weechat.org/donate
+Details hierzu gibt es auf: http://weechat.org/about/donate

doc/de/weechat_quickstart.de.txt

@@ -11,18 +11,36 @@ Die bevorzugte Terminal-Emulation für X (aber nicht obligatorisch) ist
 rxvt-unicode (es besitzt eine gute Unterstützung für UTF-8 und hat keine
 Probleme mit der Standard Tastaturbelegung).
 
-Starte "weechat-curses" aus Deiner shell.
+Starte aus Deiner shell:
+
+----------------------------------------
+$ weechat
+----------------------------------------
 
 
 [[help_options]]
 Online-Hilfe / Optionen
 -----------------------
 
-WeeChat enthält Hilfetexte für alle Befehle. Diese Hilfstexte sind über den Befehl `/help` zu
-erreichen. Um eine Hilfe zu einen bestimmten Befehl zu erhalten kann man einfach `/help Befehl`
-ausführen.
+WeeChat bietet für jeden Befehl eine Hilfe an:
+
+----------------------------------------
+/help
+----------------------------------------
+
+Um sich die Hilfe für einen bestimmten Befehl anzeigen
+zu lassen:
+
+----------------------------------------
+/help Befehl
+----------------------------------------
+
+Um Optionen zu setzen benutzt man:
+
+----------------------------------------
+/set config.section.option value
+----------------------------------------
 
-Um Optionen zu setzen benutzt man `/set config.section.option value`.
 (dabei ist 'config' der Konfigurationsname ('weechat' für den Kern von weechat,
 oder der Name einer Erweiterung), 'section' ein Abschnitt dieser Konfiguration und 'option'
 der Name der betreffenden Option).
@@ -36,17 +54,29 @@ dieser Zeichenkette entsprechen.
 
 Zum Beispiel:
 
-`/set`::
-    zeit alle Optionen an (WeeChat und Erweiterungen)
+Zeit alle Optionen an (WeeChat und Erweiterungen):
 
-`/set weechat.*`::
-    zeit alle WeeChat Optionen an
+----------------------------------------
+/set
+----------------------------------------
 
-`/set irc.*`::
-    zeit alle Optionen der IRC-Erweiterung an
+Zeit alle WeeChat Optionen an:
+
+----------------------------------------
+/set weechat.*
+----------------------------------------
+
+Zeit alle Optionen der IRC-Erweiterung an:
+
+----------------------------------------
+/set irc.*
+----------------------------------------
 
 Du kannst dir mit dem Befehl `/help` eine Hilfe für Optionen anzeigen lassen, z.B.:
-`/help weechat.look.highlight`.
+
+----------------------------------------
+/help weechat.look.highlight
+----------------------------------------
 
 Beim Beenden von WeeChat werden alle Einstellungen gespeichert (mittels `/save`
 kann das Sichern der Optionen erzwungen werden).
@@ -77,10 +107,15 @@ Einen IRC-Server erstellen
 
 Du kannst einen IRC-Server mit dem Befehl `/server` hinzufügen, z.B.:
 
-  /server add oftc irc.oftc.net/6667
+----------------------------------------
+/server add oftc irc.oftc.net/6667
+----------------------------------------
 
-Wie bei jedem Befehl kannst Du Dir, falls Du nicht mehr weiter kommst, mit
-`/help server` einen Hilfstext anzeigen lassen.
+Falls man nicht mehr weiter weiß, einfach die Hilfe aufrufen:
+
+----------------------------------------
+/help server
+----------------------------------------
 
 
 [[irc_server_options]]
@@ -99,29 +134,39 @@ Als Beispiel erwähnt ist die Vorgabe (default) für Nicks, die auf dem Un*x Log
 basiert. Diese Vorgabe kann nun für den oftc-Server mittels folgendem Befehl
 überschrieben werden:
 
-  /set irc.server.oftc.nicks "mynick,mynick2,mynick3,mynick4,mynick5"
+----------------------------------------
+/set irc.server.oftc.nicks "mynick,mynick2,mynick3,mynick4,mynick5"
+----------------------------------------
 
 Um einen User- und realen Namen zu setzen:
 
-  /set irc.server.oftc.username "Mein User-Name"
-  /set irc.server.oftc.realname "Mein wirklicher Name"
+----------------------------------------
+/set irc.server.oftc.username "Mein User-Name"
+/set irc.server.oftc.realname "Mein wirklicher Name"
+----------------------------------------
 
 Um beim Start von WeeChat automatisch eine Verbindung zu einem Server
 herzustellen:
 
-  /set irc.server.oftc.autoconnect on
+----------------------------------------
+/set irc.server.oftc.autoconnect on
+----------------------------------------
 
 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_default.sasl_mechanism dh-blowfish
-  /set irc.server.oftc.sasl_username "mynick"
-  /set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
+/set irc.server_default.sasl_mechanism dh-blowfish
+/set irc.server.oftc.sasl_username "mynick"
+/set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
 
 Unterstützt der Server keine SASL Authentifizierung, muss man sich bei "nickserv"
 identifizieren:
 
-  /set irc.server.oftc.command "/msg nickserv identify xxxxxxx"
+----------------------------------------
+/set irc.server.oftc.command "/msg nickserv identify xxxxxxx"
+----------------------------------------
 
 [NOTE]
 Mehrere Befehle können mittels ';' (Semikolon) getrennt werden.
@@ -129,25 +174,33 @@ 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:
 
-  /set irc.server.oftc.autojoin "#channel1,#channel2"
+----------------------------------------
+/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 vorgegebenen Nicks
 (irc.server_default.nicks):
 
-  /set irc.server.oftc.nicks null
+----------------------------------------
+/set irc.server.oftc.nicks null
+----------------------------------------
 
 Andere Optionen: Du kannst andere Optionen mit folgendem Befehl festlegen ("xxx"
 ist der Optionsname):
 
-  /set irc.server.oftc.xxx value
+----------------------------------------
+/set irc.server.oftc.xxx value
+----------------------------------------
 
 
 [[connect_to_irc_server]]
 Verbinden mit dem IRC-Server und auto-join der Channel
 ------------------------------------------------------
 
-  /connect oftc
+----------------------------------------
+/connect oftc
+----------------------------------------
 
 [NOTE]
 Dieser Befehl kann dazu benutzt werden um einen neuen Server zu erstellen und
@@ -162,21 +215,32 @@ zu wechseln, kannst Du ctrl-X benutzen.
 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
+----------------------------------------
+/set irc.look.server_buffer independent
+----------------------------------------
 
 
 [[join_part_irc_channels]]
 Betreten/verlassen der IRC-Channel
 ----------------------------------
 
-`/join #channel`::
-    Einen Channel betreten
+Einen Channel betreten:
 
-`/part [quit message]`::
-    Einen Channel verlassen (der Buffer bleibt geöffnet)
+----------------------------------------
+/join #channel
+----------------------------------------
 
-`/close`::
-    Schließen eines Server- oder Channel-Buffers (`/close` ist ein Alias für `/buffer close`)
+Einen Channel verlassen (der Buffer bleibt geöffnet):
+
+----------------------------------------
+/part [quit message]
+----------------------------------------
+
+Schließen eines Server- oder Channel-Buffers (`/close` ist ein Alias für `/buffer close`):
+
+----------------------------------------
+/close
+----------------------------------------
 
 
 [[buffer_window]]
@@ -193,8 +257,10 @@ mehreren Buffer gleichzeitig sehen.
 
 Befehle, welche Buffer und Fenster verwalten:
 
-  /buffer
-  /window
+----------------------------------------
+/buffer
+/window
+----------------------------------------
 
 (Ich muss jetzt nicht wiederholen dass Du zu diesen Befehlen eine Hilfe mit /help
 zu erhalten ist)
@@ -202,7 +268,9 @@ zu erhalten ist)
 Ein Beispiel: Um Deinen Bildschirm vertikal in ein kleines Fenster (1/3 Höhe)
 und ein großes Fenster (2/3 Höhe) aufzuteilen, benutze diesen Befehl:
 
-  /window splitv 33
+----------------------------------------
+/window splitv 33
+----------------------------------------
 
 
 [[key_bindings]]
@@ -229,15 +297,21 @@ Eine nützliche Tastenkombination um Tastencodes zu ermitteln ist meta-k (alt-k)
 
 Beispiel: Belegung von meta-y (alt-y) mit dem Befehl `/buffer close`:
 
-  /key bind (drücke meta-k) (drücke meta-y) /buffer close
+----------------------------------------
+/key bind (drücke meta-k) (drücke meta-y) /buffer close
+----------------------------------------
 
 Du wirst folgende Befehlszeile erhalten:
 
-  /key bind meta-y /buffer close
+----------------------------------------
+/key bind meta-y /buffer close
+----------------------------------------
 
 Entfernen der Belegung:
 
-  /key unbind meta-y
+----------------------------------------
+/key unbind meta-y
+----------------------------------------
 
 
 [[plugins_scripts]]
@@ -250,7 +324,7 @@ Erweiterungen werden -sofern welche gefunden worden sind- automatisch geladen (B
 die Dokumentation zum installieren/entfernen von Erweiterungen und/oder Skripten).
 
 Viele externe Skripten (der Mitarbeitenden) sind für WeeChat verfügbar, siehe:
-http://www.weechat.org/scripts
+http://weechat.org/scripts
 
 Skripten können mit dem Befehl `/script` verwaltet werden (siehe `/help script` für
 weitere Informationen zur Bedienung).
@@ -261,6 +335,6 @@ Weitere Dokumentation
 ---------------------
 
 Nun kannst Du WeeChat nutzen, für weitere Fragen lese die FAQ und/oder Dokumentation:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 Viel Spass mit WeeChat!

doc/de/weechat_scripting.de.txt

@@ -6,7 +6,7 @@ Sébastien Helleu <flashcode@flashtux.org>
 Diese Anleitung beschreibt den WeeChat Chat Client und ist Teil von WeeChat.
 
 Die aktuelle Version dieser Anleitung finden Sie auf:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 
 [[introduction]]
@@ -56,6 +56,15 @@ Ruby
 
 * Es muss 'weechat_init' definiert und darin die Funktion 'register' ausgeführt werden
 * Funktionen werden im Format `Weechat.xxx(arg1, arg2, ...)` ausgeführt
+* Aufgrund einer Limitierung, seitens Ruby (maximal 15 Argumente pro Funktion), empfängt
+  die Funktion `Weechat.config_new_option` den Callback in einem Array von 6 Strings
+  (3 Callbacks + 3 Data Strings), somit sieht ein Aufruf der Funktion folgendermaßen aus:
+
+[source,ruby]
+----------------------------------------
+Weechat.config_new_option(config, section, "name", "string", "description of option", "", 0, 0,
+                          "value", "value", 0, ["check_cb", "", "change_cb", "", "delete_cb", ""])
+----------------------------------------
 
 Lua
 ^^^
@@ -163,8 +172,20 @@ weechat::print "" "Hallo, von einem tcl Skript!"
 Laden von Skripten
 ~~~~~~~~~~~~~~~~~~
 
-Der Befehl zum Laden von Skripten ist davon abhängig welche Skriptsprache
-genutzt werden soll:
+Es wird empfohlen die "script" Erweiterung zum Laden von Skripten zu
+nutzen, zum Beispiel:
+
+----------------------------------------
+/script load script.py
+/script load script.pl
+/script load script.rb
+/script load script.lua
+/script load script.tcl
+/script load script.scm
+----------------------------------------
+
+Es besteht natürlich weiterhin die Möglichkeit, individuell für jede
+Skriptsprache, den entsprechenden Befehl zu nutzen:
 
 ----------------------------------------
 /python load python/skript.py
@@ -175,8 +196,8 @@ genutzt werden soll:
 /guile load guile/skript.scm
 ----------------------------------------
 
-Um Skripten automatisch beim Start von WeeChat zu laden kann man einen Link
-in das Verzeichnis 'Skriptsprache/autoload' setzen.
+Um Skripten automatisch beim Start von WeeChat zu laden sollte man einen Link
+anlegen, der in das Verzeichnis 'Skriptsprache/autoload' zeigt.
 
 Ein Beispiel für ein Python-Skript:
 
@@ -185,6 +206,10 @@ $ cd ~/.weechat/python/autoload
 $ ln -s ../script.py
 ----------------------------------------
 
+[NOTE]
+Installiert man mittels `/script install` ein Skript, dann wird automatisch
+ein Link in das entsprechende 'autoload' Verzeichnis erzeugt.
+
 [[differences_with_c_api]]
 Unterschiede zur C API
 ----------------------
@@ -202,18 +227,22 @@ Falls Ihr Skript 'test.py' eine WeeChat API Funktion aufruft wird der Aufruf
 wie folgt abgearbeitet:
 
 ........................................
-       (Skript API)                                (C API)
-            \/                                        \/
-test.py  ------->  python Erweiterung (python.so)  ------->  WeeChat core
+               ┌──────────────────────┐        ╔══════════════════╗
+               │  python Erweiterung  │        ║  WeeChat "core"  ║
+               ├────────────┬─────────┤        ╟─────────┐        ║
+test.py ─────► │ Skript API │  C API  │ ─────► ║  C API  │        ║
+               └────────────┴─────────┘        ╚═════════╧════════╝
 ........................................
 
 Gibt WeeChat einen Rückgabewert an Ihr Skript 'test.py' zurück wird der
 Aufruf in umgekehrter Reihenfolge abgearbeitet:
 
 ........................................
-              (C API)                                 (Skript API)
-                 \/                                        \/
-WeeChat core  ------->  python Erweiterung (python.so)  ------->  test.py
+╔══════════════════╗        ┌──────────────────────┐
+║  WeeChat "core"  ║        │  python Erweiterung  │
+║        ┌─────────╢        ├─────────┬────────────┤
+║        │  C API  ║ ─────► │  C API  │ Skript API │ ─────► test.py
+╚════════╧═════════╝        └─────────┴────────────┘
 ........................................
 
 [[pointers]]
@@ -257,16 +286,78 @@ C Callbacks nutzen ein "Data" Argument welches ein Pointer ist. In der
 Skript API ist "Data" ein String der jeden Wert haben darf (es handelt sich
 nicht um einen Pointer).
 
-Beispiel:
+callback Beispiele, für jede Skriptsprache:
+
+* python:
 
 [source,python]
 ----------------------------------------
-weechat.hook_timer(1000, 0, 1, "mein_timer_cb", "mein data")
-
-def mein_timer_cb(data, verbleibende_aufrufe):
-    # es wird "mein data" angezeigt
-    weechat.prnt("", data)
+def timer_cb(data, remaining_calls):
+    weechat.prnt("", "timer! data=%s" % data)
     return weechat.WEECHAT_RC_OK
+
+weechat.hook_timer(1000, 0, 1, "timer_cb", "test")
+----------------------------------------
+
+* perl:
+
+[source,perl]
+----------------------------------------
+sub timer_cb {
+    my ($data, $remaining_calls) = @_;
+    weechat::print("", "timer! data=$data");
+    return weechat::WEECHAT_RC_OK;
+}
+
+weechat::hook_timer(1000, 0, 1, "timer_cb", "test");
+----------------------------------------
+
+* ruby:
+
+[source,ruby]
+----------------------------------------
+def timer_cb(data, remaining_calls)
+  Weechat.print("", "timer! data=#{data}");
+  return Weechat::WEECHAT_RC_OK
+end
+
+Weechat.hook_timer(1000, 0, 1, "timer_cb", "test");
+----------------------------------------
+
+* lua:
+
+[source,lua]
+----------------------------------------
+function timer_cb(data, remaining_calls)
+    weechat.print("", "timer! data="..data)
+    return weechat.WEECHAT_RC_OK
+end
+
+weechat.hook_timer(1000, 0, 1, "timer_cb", "test")
+----------------------------------------
+
+* tcl:
+
+[source,tcl]
+----------------------------------------
+proc timer_cb { data remaining_calls } {
+    weechat::print {} "timer! data=$data"
+    return $::weechat::WEECHAT_RC_OK
+}
+
+weechat::hook_timer 1000 0 1 timer_cb test
+----------------------------------------
+
+* guile (scheme):
+
+[source,lisp]
+----------------------------------------
+(define (timer_cb data remaining_calls)
+  (weechat:print "" (string-append "timer! data=" data))
+  weechat:WEECHAT_RC_OK
+)
+
+(weechat:hook_timer 1000 0 1 "timer_cb" "test")
 ----------------------------------------
 
 [[script_api]]
@@ -293,7 +384,7 @@ Liste der Skript API Funktionen:
   charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
   string_match, string_has_highlight, string_has_highlight_regex,
   string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer
+  string_input_for_buffer, string_eval_expression
 | Verzeichnisse       |
   mkdir_home, mkdir, mkdir_parents
 | sortierte Listen    |
@@ -354,9 +445,10 @@ Liste der Skript API Funktionen:
   infolist_time, infolist_free
 | hdata               |
   hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
+  hdata_get_var_array_size, hdata_get_var_array_size_string,
   hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_char, hdata_integer, hdata_long, hdata_string, hdata_pointer,
-  hdata_time, hdata_hashtable, hdata_get_string
+  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
+  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
 | Upgrade             |
   upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
 |========================================
@@ -457,15 +549,15 @@ Die print Funktion heißt in Perl/Ruby/Lua/Tcl `print`. In Python lautet die Fun
 Text in einen Buffer senden
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Sie können einen Text oder einen Befehl zu einem Buffer senden. Dies entspricht exakt dem
-Verhalten als ob Sie einen Text oder einen Befehl in der Befehlszeile eingeben und diesen
-mit der [Enter] Taste bestätigen.
+Sie können einen Text oder einen Befehl in einen Buffer senden. Dies entspricht exakt dem
+Verhalten als ob Sie einen Text oder einen Befehl in die Befehlszeile eingeben und selbigen
+mit der [Eingabe] Taste bestätigen.
 
 Beispiele:
 
 [source,python]
 ----------------------------------------
-# führt den Befehl "/help" im Core Buffer aus
+# führt den Befehl "/help" im aktuellen Buffer aus (die Ausgabe erfolgt im Core-Buffer)
 weechat.command("", "/help")
 
 # sendet den Text "Hallo" in den IRC Channel #weechat (die Teilnehmer des Channels sehen diese Nachricht)
@@ -648,21 +740,24 @@ dabei in der Callback-Variable "out" gesichert (Standardausgabe des Prozesses):
 
 [source,python]
 ----------------------------------------
-# Zeigt die Versionen der Linux-Kerne.
-kernel_txt = ""
+# Zeigt die aktuelle stabile Version von WeeChat an.
+weechat_version = ""
 
-def kernel_process_cb(data, command, rc, out, err):
-    global kernel_txt
+def weechat_process_cb(data, command, rc, out, err):
+    global weechat_version
     if out != "":
-        kernel_txt += out
+        weechat_version += out
     if int(rc) >= 0:
-        weechat.prnt("", kernel_txt)
+        weechat.prnt("", "aktuelle stabile WeeChat-Version: %s" % weechat_version)
     return weechat.WEECHAT_RC_OK
 
-weechat.hook_process("url:http://www.kernel.org/kdist/finger_banner",
-                     30 * 1000, "kernel_process_cb", "")
+weechat.hook_process("url:http://weechat.org/dev/info/stable/",
+                     30 * 1000, "weechat_process_cb", "")
 ----------------------------------------
 
+[TIP]
+Alle Informationen die WeeChat betreffen findet man auf: http://weechat.org/dev/info
+
 Beispiel eines URL Transfers, mit zusätzliche Optionen: Es wird das neuste
 WeeChat Entwicklerpaket in die Datei '/tmp/weechat-devel.tar.gz' gesichert:
 

doc/de/weechat_tester.de.txt

@@ -41,7 +41,9 @@ zu lokalisieren.
 Falls Du die 'bash' als shell benutzt, dann ergänze Deine `~/.bashrc` durch folgende
 Zeile:
 
-  ulimit -c unlimited
+----------------------------------------
+ulimit -c unlimited
+----------------------------------------
 
 
 [[download]]
@@ -64,47 +66,47 @@ Beschaffe und baue die Quellen
 
 Erstelle zuerst einen neuen Ordner, z.B. 'weechat-git':
 
----------------------
+----------------------------------------
 $ mkdir ~/weechat-git
 $ cd ~/weechat-git
----------------------
+----------------------------------------
 
 Falls Du git installiert hast, clone das git Repository (empfohlen):
 
---------------------------------------------
+----------------------------------------
 $ git clone git://git.sv.gnu.org/weechat.git
 $ cd weechat
---------------------------------------------
+----------------------------------------
 
 NOTE: Um auf den aktuellen Stand zu kommen verwendest Du z.B. "`git pull`" in
 diesem Ordner.
 
 Ansonsten kannst Du das 'Entwickler-Paket' herunterladen und entpacken:
 
------------------------------------------------------------------
+----------------------------------------
 $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2
 $ tar xvjf weechat-devel.tar.bz2
 $ cd weechat-devel
------------------------------------------------------------------
+----------------------------------------
 
 Um die Quellen zu übersetzen, wird cmake empfohlen:
 
---------------------------------------------------------------
+----------------------------------------
 $ mkdir build
 $ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
 $ make
 $ make install
---------------------------------------------------------------
+----------------------------------------
 
 Falls Du cmake nicht hast, ist es auch möglich die autotools zu nutzen:
 
-----------------------------------------------------------
+----------------------------------------
 $ ./autogen.sh
-$ ./configure --prefix=$HOME/weechat-git
+$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev
 $ make
 $ make install
-----------------------------------------------------------
+----------------------------------------
 
 [[install_binary_package]]
 Installieren des Programm-Paketes
@@ -112,7 +114,7 @@ Installieren des Programm-Paketes
 Abhängig Deiner Linux Distribution:
 
 * Debian: http://debian.flashtux.org/
-* Gentoo: http://www.weechat.org/download
+* Gentoo: http://weechat.org/download
 * ArchLinux: PKGBUILD von http://aur.archlinux.org/
 * andere: Wissen wir nicht! Eheh.
 
@@ -126,7 +128,9 @@ starten (nicht mit dem Ordner der stabilen Version).
 
 Die Befehlszeile lautet:
 
-  ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev
+----------------------------------------
+$ ~/weechat-git/bin/weechat
+----------------------------------------
 
 Immer noch munter? Dann solltest Du jetzt das bekannte Interface sehen und nun
 prahle vor Anderen, dass Du die neueste WeeChat-Version verwendest :)

doc/de/weechat_user.de.txt

@@ -6,7 +6,7 @@ Sébastien Helleu <flashcode@flashtux.org>
 Diese Anleitung beschreibt den WeeChat Chat Client und ist Teil von WeeChat.
 
 Die aktuelle Version dieser Anleitung finden Sie auf:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 
 [[introduction]]
@@ -26,15 +26,15 @@ wesentliche Merkmale:
 * mehrere Server Verbindungen sind möglich (mittels SSL, IPv6, proxy)
 * klein, schnell und schlank
 * den eigenen persönlichen Bedürfnissen anpassbar und durch Erweiterungen und Skripten in der Funktionalität erweiterbar
-* IRC RFCs konform http://www.ietf.org/rfc/rfc1459.txt[1459],
-  http://www.ietf.org/rfc/rfc2810.txt[2810],
-  http://www.ietf.org/rfc/rfc2811.txt[2811],
-  http://www.ietf.org/rfc/rfc2812.txt[2812] and
-  http://www.ietf.org/rfc/rfc2813.txt[2813]
+* IRC RFCs konform http://tools.ietf.org/html/rfc1459[1459],
+  http://tools.ietf.org/html/rfc2810[2810],
+  http://tools.ietf.org/html/rfc2811[2811],
+  http://tools.ietf.org/html/rfc2812[2812] and
+  http://tools.ietf.org/html/rfc2813[2813]
 * Betriebssystemunabhängig (GNU/Linux, *BSD, MacOS X, Windows und weitere)
 * 100% GPL, freie Software
 
-Die WeeChat Homepage findet man unter: http://www.weechat.org/
+Die WeeChat Homepage findet man unter: http://weechat.org/
 
 [[pre-requisites]]
 Vorbereitung
@@ -86,24 +86,26 @@ welche Pakete optional genutzt werden können.
 
 [width="100%",cols="5,^3,^3,13",options="header"]
 |========================================
-| Paket ^(1)^            | Version     | benötigt | Funktion
-| cmake                  |             | *ja*     | zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
-| libncursesw5-dev ^(2)^ |             | *ja*     | ncurses Oberfläche
-| libcurl4-gnutls-dev    |             | *ja*     | URL Transfer
-| zlib1g-dev             |             | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden
-| libgcrypt11-dev        |             | *ja*     | SASL Authentifikation am IRC Server mittels DH-BLOWFISH Methode, Script-Erweiterung
-| libgnutls-dev          | ≥ 2.2.0     |          | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung
-| gettext                |             |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch)
-| ca-certificates        |             |          | Zertifikate für SSL Verbindungen
-| libaspell-dev          |             |          | aspell Erweiterung
-| python-dev             | ≥ 2.5 ^(3)^ |          | python Erweiterung
-| libperl-dev            |             |          | perl Erweiterung
-| ruby1.9.1-dev          | ≥ 1.8       |          | ruby Erweiterung
-| liblua5.1-0-dev        |             |          | lua Erweiterung
-| tcl-dev                | ≥ 8.5       |          | tcl Erweiterung
-| guile-1.8-dev          |             |          | guile (scheme) Erweiterung
-| asciidoc               | ≥ 8.5.0     |          | erstellt Dokumentation (HTML Dateien)
-| source-highlight       |             |          | Syntax Highlight für Quelltext in HTML Dokumentation
+| Paket ^(1)^                       | Version     | benötigt | Funktion
+| cmake                             |             | *ja*     | Zum kompilieren (autotools ist möglich. cmake wird aber empfohlen)
+| libncursesw5-dev ^(2)^            |             | *ja*     | Ncurses Oberfläche
+| libcurl4-gnutls-dev               |             | *ja*     | URL Transfer
+| zlib1g-dev                        |             | *ja*     | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden
+| libgcrypt11-dev                   |             | *ja*     | Geschützte Daten, IRC SASL Authentifikation (DH-BLOWFISH/DH-AES), Skript-Erweiterung
+| libgnutls-dev                     | ≥ 2.2.0     |          | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung
+| gettext                           |             |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch)
+| ca-certificates                   |             |          | Zertifikate für SSL Verbindungen
+| libaspell-dev oder libenchant-dev |             |          | Aspell Erweiterung
+| python-dev                        | ≥ 2.5 ^(3)^ |          | Python Erweiterung
+| libperl-dev                       |             |          | Perl Erweiterung
+| ruby1.9.1-dev                     | ≥ 1.8       |          | Ruby Erweiterung
+| liblua5.1-0-dev                   |             |          | Lua Erweiterung
+| tcl-dev                           | ≥ 8.5       |          | Tcl Erweiterung
+| guile-2.0-dev                     | ≥ 2.0       |          | Guile (scheme) Erweiterung
+| asciidoc                          | ≥ 8.5.0     |          | Zum Erstellen der man page und der Dokumentation
+| source-highlight                  |             |          | Syntax Highlight für Quelltext in Dokumentation
+| xsltproc,
+  docbook-xml, docbook-xsl          |             |          | Erstellt man page
 |========================================
 
 [NOTE]
@@ -138,6 +140,121 @@ $ make
 $ make install
 ----------------------------------------
 
+Optionen für cmake können mit dem Format, "-DOPTION=VALUE", genutzt werden.
+
+Liste von häufig verwendeten Optionen:
+
+[width="100%",cols="2m,2,5m,12",options="header"]
+|========================================
+| Option | Wert | Standardwert | Beschreibung
+
+| CMAKE_BUILD_TYPE | `Debug`, `Release`, `RelWithDebInfo`, `MinSizeRel` | |
+  Art des builds: `Debug` (oder `RelWithDebInfo`) sollte verwendet werden, wenn meine eine Entwicklerversion
+  von WeeChat nutzt.
+
+| PREFIX | Verzeichnis | /usr/local |
+  Verzeichnis in welchem WeeChat installiert wird.
+
+| WEECHAT_HOME | Verzeichnis | ~/.weechat |
+  Standard-Verzeichnis in welchem die Daten liegen.
+
+| CA_FILE | Datei | /etc/ssl/certs/ca-certificates.crt |
+  Datei enthält die Zertifizierungen.
+  This is the default value of option
+  <<option_weechat.network.gnutls_ca_file,weechat.network.gnutls_ca_file>>.
+
+| ENABLE_ALIAS | `ON`, `OFF` | ON |
+  kompiliert <<alias_plugin,Alias Erweiterung>>.
+
+| ENABLE_ASPELL | `ON`, `OFF` | ON |
+  kompiliert <<aspell_plugin,Aspell Erweiterung>>.
+
+| ENABLE_CHARSET | `ON`, `OFF` | ON |
+  kompiliert <<charset_plugin,Charset Erweiterung>>.
+
+| ENABLE_MAN | `ON`, `OFF` | OFF |
+  kompiliert man page.
+
+| ENABLE_DOC | `ON`, `OFF` | OFF |
+  kompiliert Dokumentation (dies ist sehr zeitintensiv und wird nur empfohlen falls
+  Binärpakete erstellt werden, die die Dokumentation beinhalten sollen, oder man die
+  Dokumentation nicht auf der Homepage abrufen kann).
+
+| ENABLE_ENCHANT | `ON`, `OFF` | OFF |
+  kompiliert <<aspell_plugin,Aspell plugin>> mittels Enchant.
+
+| ENABLE_FIFO | `ON`, `OFF` | ON |
+  kompiliert <<fifo_plugin,Fifo Erweiterung>>.
+
+| ENABLE_GNUTLS | `ON`, `OFF` | ON |
+  kompiliert Gnutls (für SSL).
+
+| ENABLE_GUILE | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Guile Erweiterung>> (Scheme).
+
+| ENABLE_IRC | `ON`, `OFF` | ON |
+  kompiliert <<irc_plugin,IRC Erweiterung>>.
+
+| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
+  Unterstützung großer Dateien.
+
+| ENABLE_LOGGER | `ON`, `OFF` | ON |
+  kompiliert <<logger_plugin,Logger Erweiterung>>.
+
+| ENABLE_LUA | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Lua Erweiterung>>.
+
+| ENABLE_NCURSES | `ON`, `OFF` | ON |
+  kompiliert Ncurses Oberfläche.
+
+| ENABLE_NLS | `ON`, `OFF` | ON |
+  aktiviert NLS (Übersetzungen).
+
+| ENABLE_PERL | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Perl Erweiterung>>.
+
+| ENABLE_PYTHON | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Python Erweiterung>>.
+
+| ENABLE_PYTHON3 | `ON`, `OFF` | OFF |
+  kompiliert <<scripts_plugins,Python Erweiterung>> mittels Python 3 (dies wird *NICHT* empfohlen,
+  da viele Skripten nicht kompatible mit Python 3 sind).
+
+| ENABLE_RELAY | `ON`, `OFF` | ON |
+  kompiliert <<relay_plugin,Relay Erweiterung>>.
+
+| ENABLE_RMODIFIER | `ON`, `OFF` | ON |
+  kompiliert <<rmodifier_plugin,Rmodifier Erweiterung>>.
+
+| ENABLE_RUBY | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Ruby Erweiterung>>.
+
+| ENABLE_SCRIPT | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Script Erweiterung>>.
+
+| ENABLE_SCRIPTS | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Skripten-Erweiterungen>> (Python, Perl, Ruby, Lua, Tcl,
+  Guile).
+
+| ENABLE_TCL | `ON`, `OFF` | ON |
+  kompiliert <<scripts_plugins,Tcl Erweiterung>>.
+
+| ENABLE_XFER | `ON`, `OFF` | ON |
+  kompiliert <<xfer_plugin,Xfer Erweiterung>>.
+|========================================
+
+Weitere Optionen können mit folgendem Befehl angezeigt werden:
+
+----------------------------------------
+$ cmake -LA
+----------------------------------------
+
+oder mittels der Curses-Oberfläche:
+
+----------------------------------------
+$ ccmake ..
+----------------------------------------
+
 [[compile_with_autotools]]
 Kompilieren mit autotools
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -166,6 +283,13 @@ $ make
 $ make install
 ----------------------------------------
 
+Die Optionen können auch für das 'configure' Skript verwendet und mittels
+folgendem Befehl angezeigt werden:
+
+----------------------------------------
+$ ./configure --help
+----------------------------------------
+
 [[git_sources]]
 Git Quellen
 ~~~~~~~~~~~
@@ -241,16 +365,16 @@ Falls WeeChat abstürzen sollte wird auf Ihrem System eine 'core' bzw. 'core.123
 Diese Datei wird in dem Verzeichnis erzeugt aus welchem Sie WeeChat gestartet haben (dies
 ist *nicht* das Verzeichnis in welchem sich WeeChat befindet!).
 
-Beispiel: 'weechat-curses' ist installiert in '/usr/bin/' und die 'core' Datei befindet sich
+Beispiel: 'weechat' ist installiert in '/usr/bin/' und die 'core' Datei befindet sich
 in '/home/xxx/'. Nun wird gdb mit folgendem Befehl aufgerufen:
 
 ----------------------------------------
-gdb /usr/bin/weechat-curses /home/xxx/core
+gdb /usr/bin/weechat /home/xxx/core
 ----------------------------------------
 
 [NOTE]
 Ist das Binärpaket 'weechat-dbg' (z.B. Debian) installiert dann sollte dieser Pfad zum
-starten von WeeChat genutzt werden: '/usr/lib/debug/usr/bin/weechat-curses'
+starten von WeeChat genutzt werden: '/usr/lib/debug/usr/bin/weechat'
 
 Nun startet man 'gdb' und führt den Befehl `bt full` innerhalb gdb aus um die Fehlermeldung
 auszugeben. Eine Fehlermeldung von gdb sieht z.B. wie folgt aus:
@@ -291,10 +415,10 @@ Eine laufende Session von WeeChat debuggen
 
 Um eine laufende Session von WeeChat zu debuggen (zum Beispiel wenn WeeChat nicht
 mehr reagieren sollte) sollte man gdb mit der Prozess-ID starten ('12345' muss durch
-die PID des laufenden weechat-curses Prozesses ersetzt werden):
+die PID des laufenden weechat Prozesses ersetzt werden):
 
 ----------------------------------------
-gdb /usr/bin/weechat-curses 12345
+gdb /usr/bin/weechat 12345
 ----------------------------------------
 
 Sollte WeeChat abgestürzt sein, muss der Befehl `bt full` genutzt werden:
@@ -313,46 +437,12 @@ WeeChat starten
 
 Befehlszeile:
 
--a, --no-connect::
-    deaktiviert das automatische Verbinden mit den Servern beim Start von WeeChat.
-
--c, --colors::
-    Zeigt die Standardfarben im Terminal an.
-
--d, --dir 'path'::
-    legt den Konfigurationsordner für WeeChat fest (Voreinstellung: ~/.weechat) in
-    dem die Erweiterungen, Skripten, Protokolldateien etc.pp. gesichert werden.
-    Sollte das Verzeichnis nicht existieren wird es beim Start angelegt.
-
--h, --help::
-    zeigt einen Hilfstext an.
-
--k, --keys::
-    zeigt die Standard-Tastaturbelegung an.
-
--l, --license::
-    zeigt die Lizenz von WeeChat an.
-
--p, --no-plugin::
-    unterbindet das Laden der Erweiterungen beim Programmstart.
-
--r, --run-command::
-    startet einen oder mehrere Befehle, nachdem WeeChat gestartet wurde
-    (mehrere Befehle müssen durch Kommata voneinander getrennt werden).
-
--s, --no-script::
-    Skripten werden beim Programmstart nicht geladen.
-
--v, --version::
-    zeigt die Version von WeeChat an.
-
-plugin:option::
-    Option für Erweiterung (siehe Dokumentation für weitere Einzelheiten).
+include::cmdline_options.de.txt[]
 
 Um WeeChat zu starten muss folgender Befehl ausgeführt werden:
 
 ----------------------------------------
-$ weechat-curses
+$ weechat
 ----------------------------------------
 
 Wird WeeChat zum ersten mal gestartet wird eine Konfigurationsdatei
@@ -417,7 +507,7 @@ Die 'status'-Bar besitzt als Standardeinträge:
 | time                  | [12:55]               | Uhrzeit
 | buffer_count          | [6]                   | Anzahl der geöffneten Buffer
 | buffer_plugin         | [irc/freenode]        | Erweiterung des aktuellen Buffers (IRC Erweiterung setzt den IRC Servername für den Buffer)
-| buffer_number         | 3                     | aktuelle Nummer des Buffers
+| buffer_number         | 3                     | Aktuelle Nummer des Buffers
 | buffer_name           | #test                 | Name des aktuellen Buffers
 | buffer_modes          | +n                    | IRC Channel-Modi
 | buffer_nicklist_count | {4}                   | Anzahl der Nicks in Nickliste
@@ -434,9 +524,9 @@ In der 'input' Bar lautet die Standardeinstellung:
 |========================================
 | Item         | Beispiel                                    | Beschreibung
 | input_paste  | [Paste 7 lines ? [ctrl-Y] Ja [ctrl-N] Nein] | Nachfrage ob sieben Zeilen eingefügt werden sollen
-| input_prompt | [@Flashy]                                   | input prompt (Nickname für den IRC)
+| input_prompt | [@Flashy]                                   | Input prompt (Nickname für den IRC)
 | away         | (away)                                      | Abwesenheitsanzeige
-| input_search | [Text search]                               | Textsuche
+| input_search | [Search (~ str,msg)]                        | Suchindikatoren ("`~`": Groß-und Kleinschreibung ignorieren, "`==`": Groß-und Kleinschreibung berücksichtigen, "`str`": einfache Textsuche, "`regex`": suche mit regulären Ausdrücken, "`msg`": Suche in Nachrichten, "`pre`": Suche in Präfix, "`pre\|msg`": Suche in Präfix und Nachrichten)
 | input_text   | hi peter!                                   | Text der eingegeben wird
 |========================================
 
@@ -644,6 +734,11 @@ angezeigt).
 
 Eine Liste von Bar-Items kann man sich mit dem Befehl `/bar listitems` anzeigen lassen.
 
+// TRANSLATION MISSING
+Before or after item name, you can use chars (that are not alphanumeric, "-" or
+"_"). They will be displayed before/after item with the delimiters color
+defined in bar (option 'color_delim').
+
 Beispiel einer Bar mit den Items, "[time],buffer_number+:+buffer_plugin+.+buffer_name":
 
 ........................................
@@ -652,6 +747,23 @@ Beispiel einer Bar mit den Items, "[time],buffer_number+:+buffer_plugin+.+buffer
 └─────────────────────────────────────────────────────────────────────────────────────────┘
 ........................................
 
+// TRANSLATION MISSING
+A special syntax can be used to force the buffer used when displaying the bar
+item: "@buffer:item" (where "buffer" is the full name of buffer and "item" is
+the name of a bar item).
+
+// TRANSLATION MISSING
+This is useful in root bars, to display item for a specific buffer which is
+not displayed in the current window (or even not displayed at all).
+
+// TRANSLATION MISSING
+Example: nicklist of bitlbee in a root bar (if the bar is called
+'bitlist' and if bitlbee server is called 'bitlbee'):
+
+----------------------------------------
+/set weechat.bar.bitlist.items "@irc.bitlbee.&bitlbee:buffer_nicklist"
+----------------------------------------
+
 [[bar_filling]]
 Darstellung innerhalb einer Bar
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -752,7 +864,7 @@ Für den Ausdruck sind folgende Variablen verfügbar:
 
 * `${active}`: wahr, wenn Fenster aktiv ist
 * `${inactive}`: wahr, wenn Fenster inaktiv ist
-* `$[nicklist}`: wahr, wenn der Buffer im Fenster eine Nicklist anzeigt.
+* `${nicklist}`: wahr, wenn der Buffer im Fenster eine Nicklist anzeigt.
 
 Folgende Zeiger sind verfügbar:
 
@@ -949,7 +1061,9 @@ in einem Buffer nach einem Text zu suchen).
 [width="100%",cols="^.^3,.^10,.^5l",options="header"]
 |========================================
 | Taste        | Beschreibung | Befehl
-| @k(C-)@k(r)  | auf Groß-/Kleinschreibung umschalten | /input search_switch_case
+| @k(C-)@k(r)  | Wechsel des Suchmodus: einfache Textsuche (Standard), reguläre Ausdrücke | /input search_switch_regex
+| @k(A-)@k(c)  | auf Groß-/Kleinschreibung umschalten | /input search_switch_case
+| @k(Tab)      | wechselt Suche in: Nachricht (Standard), im Präfix, Präfix + Nachricht | /input search_switch_where
 | @k(↑)        | sucht vorheriger Zeile | /input search_previous
 | @k(↓)        | sucht nächste Zeile  | /input search_next
 | @k(Enter) .3+| Suche abbrechen .3+| /input search_stop
@@ -1094,10 +1208,10 @@ Liste der Maustasten/Mausrad:
 [width="50%",cols="3m,4",options="header"]
 |========================================
 | Maustaste/-rad      | Beschreibung
-| button1             | linker Mausknopf wird gedrückt
-| button2             | rechter Mausknopf wird gedrückt
-| button3             | mittlerer Mausknopf wird gedrückt (häufig der Druck auf das Mausrad)
-| button4 ... button9 | ein zusätzlicher Mausknopf wird gedrückt
+| button1             | Linker Mausknopf wird gedrückt
+| button2             | Rechter Mausknopf wird gedrückt
+| button3             | Mittlerer Mausknopf wird gedrückt (häufig der Druck auf das Mausrad)
+| button4 ... button9 | Ein zusätzlicher Mausknopf wird gedrückt
 | wheelup             | Mausrad wird nach oben gescrollt
 | wheeldown           | Mausrad wird nach unten gescrollt
 |========================================
@@ -1267,7 +1381,7 @@ was die Farbdarstellung in WeeChat betrifft:
 können lediglich 256 Farbpaare durch WeeChat genutzt werden, dies ist eine Einschränkung
 von ncurses.
 
-Mittels `weechat-curses --colors` oder dem internen WeeChat-Befehl `/color` kann man sich
+Mittels `weechat --colors` oder dem internen WeeChat-Befehl `/color` kann man sich
 die Einschränkungen für die jeweilige Umgebungsvariable anzeigen lassen.
 
 Folgende Werte sind für die 'TERM'-Umgebungsvariable zu empfehlen, sofern man 256 Farben
@@ -1306,22 +1420,22 @@ Basisfarben in WeeChat sind:
 |========================================
 | Name         | Farbe
 | default      | Standard Terminalfarbe (transparent für Hintergrund)
-| black        | schwarz
-| darkgray     | dunkelgrau
-| red          | dunkelrot
-| lightred     | hellrot
-| green        | dunkelgrün
-| lightgreen   | hellgrün
-| brown        | braun
-| yellow       | gelb
-| blue         | dunkelblau
-| lightblue    | hellblau
-| magenta      | dunkel magenta
-| lightmagenta | hell magenta
-| cyan         | dunkel türkis
-| lightcyan    | hell türkis
-| gray         | grau
-| white        | weiß
+| black        | Schwarz
+| darkgray     | Dunkelgrau
+| red          | Dunkelrot
+| lightred     | Hellrot
+| green        | Dunkelgrün
+| lightgreen   | Hellgrün
+| brown        | Braun
+| yellow       | Gelb
+| blue         | Dunkelblau
+| lightblue    | Hellblau
+| magenta      | Dunkel magenta
+| lightmagenta | Hell magenta
+| cyan         | Dunkel türkis
+| lightcyan    | Hell türkis
+| gray         | Grau
+| white        | Weiß
 |========================================
 
 [[colors_extended]]
@@ -1401,15 +1515,66 @@ Um der Vordergrundfarbe des Terminals das Attribut "fett" zuzuordnen:
 /set weechat.color.status_time *99999
 ----------------------------------------
 
+[[options_and_commands]]
+Optionen und Befehle
+~~~~~~~~~~~~~~~~~~~~
+
+[[sec_options]]
+Optionen für schutzwürdige Daten (sec.conf)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| section | Control command                    | Beschreibung
+| crypt   | /set sec.crypt.*                   | Optionen für Verschlüsselung
+| data    | <<command_weechat_secure,/secure>> | geschützte Daten
+|========================================
+
+Optionen:
+
+include::autogen/user/sec_options.txt[]
+
 [[weechat_options]]
 WeeChat Optionen (weechat.conf)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section    | Control command                           | Beschreibung
+| debug      | <<command_weechat_debug,/debug set>>      +
+               /set weechat.debug.*                      | Debug level, for core and plugins (Optionen können in Sektion hinzugefügt/entfernt werden)
+| startup    | /set weechat.startup.*                    | Startup options
+| look       | /set weechat.look.*                       | Look and feel
+| palette    | <<command_weechat_color,/color alias>>    +
+               /set weechat.palette.*                    | Alternativnamen für Farben (Optionen können in Sektion hinzugefügt/entfernt werden)
+| color      | /set weechat.color.*                      | Farben
+| completion | /set weechat.completion.*                 | Optionen für Vervollständigung
+| history    | /set weechat.history.*                    | Optionen für Befehlsverlauf (Befehle und Buffer)
+| proxy      | <<command_weechat_proxy,/proxy>>          +
+               /set weechat.proxy.*                      | Proxy Optionen
+| network    | /set weechat.network.*                    | Netzwerk/SSL Optionen
+| bar        | <<command_weechat_bar,/bar>>              +
+               /set weechat.bar.*                        | Optionen für die Bars
+| layout     | <<command_weechat_layout,/layout>>        | Layouts
+| notify     | <<command_weechat_buffer,/buffer notify>> | Benachrichtigungsstufe für Buffer (Optionen können in Sektion hinzugefügt/entfernt werden)
+| filter     | <<command_weechat_filter,/filter>>        | Filter
+| key        | <<command_weechat_key,/key>>              | Tastenbefehle in default context
+| key_search | <<command_weechat_key,/key>>              | Tastenbefehle in search context
+| key_cursor | <<command_weechat_key,/key>>              | Tastenbefehle in cursor context
+| key_mouse  | <<command_weechat_key,/key>>              | Tastenbefehle in mouse context
+|========================================
+
+Optionen:
 
 include::autogen/user/weechat_options.txt[]
 
 [[weechat_commands]]
 WeeChat Befehle
-~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^
 
 include::autogen/user/weechat_commands.txt[]
 
@@ -1417,13 +1582,6 @@ include::autogen/user/weechat_commands.txt[]
 Erweiterungen
 -------------
 
-Um mehr über Erweiterungen- und Skriptenprogrammierung (mittels API) zu erfahren,
-sollten Sie die 'WeeChat Plugin API Reference' oder 'WeeChat Scripting Guide' lesen.
-
-[[plugins_in_weechat]]
-Erweiterungen in WeeChat
-~~~~~~~~~~~~~~~~~~~~~~~~
-
 Eine WeeChat Erweiterung ist eine dynamische Bibliothek (library), die in C geschrieben
 und kompiliert ist. Unter GNU/Linux besitzt eine Erweiterung als Dateiendung ".so", unter
 Windows ".dll".
@@ -1458,11 +1616,10 @@ Standarderweiterungen:
 | alias       | definiert Alias für Befehle
 | aspell      | Rechtschreibprüfung für Befehlszeile
 | charset     | Zeichensatz (de)-kodierung in Buffern
-| demo        | Demo Erweiterung (nicht standardmäßig kompiliert)
 | fifo        | FIFO Pipe die zur Fernsteuerung von WeeChat genutzt werden kann
 | irc         | IRC Chat-Protokoll
 | logger      | erstellt Protokolldateien von Buffern
-| relay       | Daten via Netzwerk übermitteln (IRC Proxy)
+| relay       | Daten via Netzwerk übermitteln
 | rmodifier   | wandelt Schlüsselwörter mit regulären Ausdrücken
 | python      | Python-Skript API
 | perl        | Perl-Skript API
@@ -1473,6 +1630,9 @@ Standarderweiterungen:
 | xfer        | Datentransfer und Direktchat
 |========================================
 
+Um mehr über Erweiterungen- und Skriptenprogrammierung (mittels API) zu erfahren,
+sollten Sie die 'WeeChat Plugin API Reference' oder 'WeeChat Scripting Guide' lesen.
+
 [[alias_plugin]]
 Alias Erweiterung
 ~~~~~~~~~~~~~~~~~
@@ -1496,6 +1656,20 @@ Dabei ist es möglich mehrere Wörterbücher für einen Buffer zu nutzen.
 Optionen (aspell.conf)
 ^^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section    | Control command                           | Beschreibung
+| color      | /set aspell.color.*                       | Farben
+| check      | /set aspell.check.*                       | Optionen um Einstellungen an der Rechtschreibprüfung vorzunehmen
+| dict       | <<command_aspell_aspell,/aspell setdict>> +
+               /set aspell.dict.*                        | Wörterbücher für Buffer (Optionen können in Sektion hinzugefügt/entfernt werden)
+| option     | /set aspell.option.*                      | <<aspell_speller_options,Optionen für Rechtschreibprüfung>> (Optionen können in Sektion hinzugefügt/entfernt werden)
+|========================================
+
+Optionen:
+
 include::autogen/user/aspell_options.txt[]
 
 [[aspell_commands]]
@@ -1595,6 +1769,20 @@ charset: terminal: ISO-8859-15, internal: UTF-8
 Optionen (charset.conf)
 ^^^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command                             | Beschreibung
+| default | /set charset.default.*                      | Vorgegebener Zeichensatz zum De-/kodieren.
+| decode  | <<command_charset_charset,/charset decode>> +
+            /set charset.decode.*                       | Zeichensatz zum dekodieren (Optionen können in Sektion hinzugefügt/entfernt werden)
+| encode  | <<command_charset_charset,/charset encode>> +
+            /set charset.encode.*                       | Zeichensatz zum kodieren (Optionen können in Sektion hinzugefügt/entfernt werden)
+|========================================
+
+Optionen:
+
 include::autogen/user/charset_options.txt[]
 
 [[charset_commands]]
@@ -1744,13 +1932,31 @@ Beispiel: Anmelden beim Server 'irc.freenode.net' mit dem Nick 'nono' und betret
 der Channels '#weechat' und '#toto' (Standardport (6667) wird genutzt):
 
 ----------------------------------------
-$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto
+$ weechat irc://nono@irc.freenode.net/#weechat,#toto
 ----------------------------------------
 
 [[irc_options]]
 Optionen (irc.conf)
 ^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section        | Control command                | Beschreibung
+| look           | /set irc.look.*                | Erscheinungsbild
+| color          | /set irc.color.*               | Farben
+| network        | /set irc.network.*             | Netzwerkoptionen
+| msgbuffer      | /set irc.msgbuffer.*           | <<irc_target_buffer,Zielbuffer für IRC Nachrichten>> (Optionen können in Sektion hinzugefügt/entfernt werden)
+| ctcp           | /set irc.ctcp.*                | <<irc_ctcp_replies,CTCP Antworten>> (Optionen können in Sektion hinzugefügt/entfernt werden)
+| ignore         | <<command_irc_ignore,/ignore>> | Ignoriert Menschen
+| server_default | /set irc.server_default.*      | Standardwerte für Server (werden genutzt, falls keine Optionen für einen Server gesetzt sind)
+| server         | <<command_irc_server,/server>> +
+                   /set irc.server.*              | Server
+|========================================
+
+Optionen:
+
 include::autogen/user/irc_options.txt[]
 
 [[irc_commands]]
@@ -1834,14 +2040,16 @@ Für weiterreichende Informationen lesen Sie bitte: http://www.oftc.net/oftc/Nic
 SASL Authentifizierung
 ^^^^^^^^^^^^^^^^^^^^^^
 
-WeeChat unterstützt drei mögliche Verfahren bei einer SASL Authentifikation:
-"plain" (Passwort liegt in Klarschrift vor), "dh-blowfish" (Passwort wird verschlüsselt)
-oder "external" (SSL Zertifikat welches auf Client Seite vorliegt)
+WeeChat unterstützt eine SASL Authentifikation, mittels verschiedener Mechanismen:
+
+* 'plain': Passwort liegt in Klarschrift vor
+* 'dh-blowfish': Passwort wird mittels blowfish verschlüsselt
+* 'dh-aes': Passwort wird mittels AES verschlüsselt
+* 'external': SSL Zertifikat welches auf Client Seite vorliegt
 
 Optionen für Server sind:
 
-* 'sasl_mechanism': Mechanismus welcher genutzt werden soll ("plain",
-  "dh-blowfish" oder "external")
+* 'sasl_mechanism': Mechanismus welcher genutzt werden soll (siehe oben)
 * 'sasl_timeout': Zeitüberschreitung für Authentifizierung (in Sekunden)
 * 'sasl_username': Username (Nickname)
 * 'sasl_password': Passwort
@@ -1995,22 +2203,22 @@ mit dem entsprechenden Wert ersetzt:
 
 [width="100%",cols="^2l,4,8l",options="header"]
 |========================================
-| Platzhalter  | Beschreibung                  | Wert/Beispiel
-| $clientinfo  | Liste der CTCP Antworten      | 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 | Datum der Kompilierung        | Dec 16 2012
-| $osinfo      | Info über das genutzte OS     | Linux 2.6.32-5-amd64 / x86_64
-| $site        | WeeChat Seite                 | http://www.weechat.org/
-| $download    | WeeChat, Download Seite       | http://www.weechat.org/download
-| $time        | aktuelle Uhrzeit/Datum        | Sun, 16 Dec 2012 10:40:48 +0100
-| $username    | Username beim IRC Server      | Name
-| $realname    | Realname beim IRC Server      | John Doe
+| Platzhalter  | Beschreibung                        | Wert/Beispiel
+| $clientinfo  | Liste der CTCP Antworten            | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
+| $version     | WeeChat Version                     | 0.4.0-dev
+| $versiongit  | WeeChat Version + Git version ^(1)^ | 0.4.0-dev (git: v0.3.9-104-g7eb5cc4)
+| $git         | Git Version ^(1)^                   | v0.3.9-104-g7eb5cc4
+| $compilation | Datum der Kompilierung              | Dec 16 2012
+| $osinfo      | Info über das genutzte OS           | Linux 2.6.32-5-amd64 / x86_64
+| $site        | WeeChat Seite                       | http://www.weechat.org/
+| $download    | WeeChat, Download Seite             | http://www.weechat.org/download
+| $time        | Aktuelle Uhrzeit/Datum              | Sun, 16 Dec 2012 10:40:48 +0100
+| $username    | Username beim IRC Server            | Name
+| $realname    | Realname beim IRC Server            | John Doe
 |========================================
 
 [NOTE]
-Die Git Version wird durch die Ausgabe des Befehls `git describe` ermittelt.
+^(1)^ Die Git Version wird durch die Ausgabe des Befehls `git describe` ermittelt.
 Dies erfordert, dass WeeChat aus dem Git Repository heraus kompiliert wurde
 und das Git überhaupt installiert ist.
 
@@ -2168,6 +2376,20 @@ gesichert werden soll.
 Optionen (logger.conf)
 ^^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command     | Beschreibung
+| look    | /set logger.look.*  | Erscheinungsbild
+| color   | /set logger.color.* | Farben
+| file    | /set logger.file.*  | Optionen für Protokolldateien
+| level   | /set logger.level.* | Protokollierungslevel pro Buffer (Optionen können in Sektion hinzugefügt/entfernt werden)
+| mask    | /set logger.mask.*  | Dateinamenmaske pro buffer (Optionen können in Sektion hinzugefügt/entfernt werden)
+|========================================
+
+Optionen:
+
 include::autogen/user/logger_options.txt[]
 
 [[logger_commands]]
@@ -2321,6 +2543,21 @@ Die Relay-Erweiterung wird genutzt um Daten, mittels unterschiedlicher Protokoll
 Optionen (relay.conf)
 ^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command                    | Beschreibung
+| look    | /set relay.look.*                  | Erscheinungsbild
+| color   | /set relay.color.*                 | Farben
+| network | /set relay.network.*               | Netzwerkoptionen
+| irc     | /set relay.irc.*                   | für das IRC Protokoll spezifische Optionen (IRC Proxy)
+| port    | <<command_relay_relay,/relay add>> +
+            /set relay.port.*                  | Ports zur Nutzung der Relay-Erweiterung (IRC und weechat Protokolle) (Optionen können in Sektion hinzugefügt/entfernt werden)
+|========================================
+
+Optionen:
+
 include::autogen/user/relay_options.txt[]
 
 [[relay_commands]]
@@ -2329,49 +2566,22 @@ Befehle
 
 include::autogen/user/relay_commands.txt[]
 
-[[relay_irc_proxy]]
-IRC proxy
-^^^^^^^^^
+[[relay_password]]
+Passwort
+^^^^^^^^
 
-Die Relay-Erweiterung verhält sich wie ein IRC Proxy: Es kann ein Port als IRC Server
-definiert und ein Passwort für Clients genutzt werden.
-
-Beispiel:
-
-----------------------------------------
-/set relay.network.password "mein Passwort"
-/relay add irc.freenode 8000
-----------------------------------------
-
-Nun kann mittels eines IRC Clients (WeeChat, XChat, irssi, ...) am Port 8000 und dem
-Server-Passwort "mein Passwort" eine Verbindung hergestellt werden.
-
-Die Anzahl an erlaubten Clients kann limitiert werden:
-
-----------------------------------------
-/set relay.network.max_clients 1
-----------------------------------------
-
-[[relay_weechat_protocol]]
-WeeChat Protokoll
-^^^^^^^^^^^^^^^^^
-
-Die Relay-Erweiterung kann Daten, mittels dem WeeChat Protokoll, an eine
-externe Oberfläche senden.
-
-Zum Beispiel:
+Es wird nachdrücklich Empfohlen ein Passwort für die Relay-Verbindung zu nutzen:
 
 ----------------------------------------
 /set relay.network.password "meinPasswort"
-/relay add weechat 9000
 ----------------------------------------
 
-Nun kann man über den Port 9000 mittels einer Oberfläche (wie QWeeChat)
-und dem Passwort "meinPasswort" eine Verbindung zu WeeChat herstellen.
+Dieses Passwort wird sowohl für das 'irc' als auch für das 'weechat' Protokoll
+verwendet.
 
 [[relay_ssl]]
-Relay-Verbindung mittels SSL
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+SSL
+^^^
 
 Man kann SSL mittels eines selbst erstellten Zertifikates und eines privaten
 Schlüssels nutzen. Um SSL für die Verbindung zu aktivieren stellt man dem
@@ -2396,13 +2606,76 @@ Schlüssel mittels folgendem Befehl nachträglich geladen werden:
 /relay sslcertkey
 ----------------------------------------
 
-um dann die Relay-Verbindung, mit SSL Verschlüsselung, anzulegen:
+[[relay_irc_proxy]]
+IRC Proxy
+^^^^^^^^^
+Die Relay Erweiterung kann wie ein IRC Proxy genutzt werden. Dabei simuliert
+die Erweiterung einen IRC Server und man kann sich mit jedem IRC Client zu WeeChat
+verbinden.
+
+Es kann für jeden IRC Server ein Port definiert werden, oder aber ein Port für
+alle Server.
+
+Wird ein Port für alle Server genutzt, dann muss der Client den internen Namen
+des zu nutzenden Servers mit dem IRC Befehl "PASS" anfordern:
 
 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:meinPasswort
 ----------------------------------------
 
+Beispiel: IRC Proxy mit SSL für einen beliebigen Server (Client wählt aus):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Beispiel: IRC Proxy ohne SSL und nur für "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Nun kann man eine Verbindung zum Port 8000 mit jedem beliebigen IRC Client
+herstellen, indem man das Server Passwort "meinPasswort" nutzt (oder
+"freenode:meinPasswort" sofern kein Server angegeben wurde).
+
+[[relay_weechat_protocol]]
+WeeChat Protokoll
+^^^^^^^^^^^^^^^^^
+
+Die Relay-Erweiterung kann Daten, mittels dem WeeChat Protokoll, an eine
+externe Oberfläche senden.
+
+Zum Beispiel:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Nun kann man über den Port 9000 mittels einer Oberfläche und dem Passwort
+"meinPasswort" eine Verbindung zu WeeChat herstellen.
+
+[[relay_websocket]]
+WebSocket
+^^^^^^^^^
+
+Das WebSocket Protokoll (http://tools.ietf.org/html/rfc6455[RFC 6455]) wird nun
+in der Relay Erweiterung unterstützt.
+
+Der WebSocket Handshake wird automatisch erkannt und der Socket ist sofort
+funktionsfähig, sofern die benötigten Header gefunden werden und die Herkunft
+bestätigt wurde (siehe Option <<option_relay.network.websocket_allowed_origins,relay.network.websocket_allowed_origins>>).
+
+Ein WebSocket kann in HTML5, mit einer JavaScript Zeile, geöffnet werden:
+
+[source,js]
+----------------------------------------
+websocket = new WebSocket("ws://server.com:9000/weechat");
+----------------------------------------
+
+Der Port (im Beispiel: 9000) ist der Port der in der Relay Erweiterung angegeben wurde.
+Die URI muss immer auf "/weechat" enden ('irc' und 'weechat' Protokoll).
+
 [[rmodifier_plugin]]
 Rmodifier Erweiterung
 ~~~~~~~~~~~~~~~~~~~~~
@@ -2417,6 +2690,18 @@ durch das Zeichen `*` zu ersetzen.
 Optionen (rmodifier.conf)
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section  | Control command                                | Beschreibung
+| look     | /set rmodifier.look.*                          | Erscheinungsbild
+| modifier | <<command_rmodifier_rmodifier,/rmodifier add>> +
+             /set rmodifier.modifier.*                      | Rmodifiers
+|========================================
+
+Optionen:
+
 include::autogen/user/rmodifier_options.txt[]
 
 [[rmodifier_commands]]
@@ -2476,7 +2761,7 @@ und entfernt werden.
 Eine weitere Erweiterung ist "script". Dies ist ein Skripten-Manager mit dem es möglich ist,
 unabhängig von der Skript-Sprache, Skripten zu laden und zu entfernen. Des weiteren können
 Skripten, aus dem Skript-Repository, installiert und deinstalliert werden. Das Skript-Repository
-kann unter folgender URL eingesehen werden: http://www.weechat.org/scripts
+kann unter folgender URL eingesehen werden: http://weechat.org/scripts
 
 Sollten wir Ihr Interesse geweckt haben, selber Skripten für WeeChat zu programmieren, dann lesen Sie
 bitte die 'WeeChat Scripting Guide'.
@@ -2485,10 +2770,22 @@ bitte die 'WeeChat Scripting Guide'.
 Script Optionen (script.conf)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command       | Beschreibung
+| look    | /set script.look.*    | Erscheinungsbild
+| color   | /set script.color.*   | Farben
+| scripts | /set script.scripts.* | Optionen für den Download von Skripten
+|========================================
+
+Optionen:
+
 include::autogen/user/script_options.txt[]
 
 [[script_commands]]
-Script Befehle
+Skript Befehle
 ^^^^^^^^^^^^^^
 
 include::autogen/user/script_commands.txt[]
@@ -2543,6 +2840,19 @@ Mit der xfer Erweiterung kann man:
 Optionen (xfer.conf)
 ^^^^^^^^^^^^^^^^^^^^
 
+Sektionen:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command     | Beschreibung
+| look    | /set xfer.look.*    | Erscheinungsbild
+| color   | /set xfer.color.*   | Farben
+| network | /set xfer.network.* | Netzwerkoptionen
+| file    | /set xfer.file.*    | Optionen zum Versenden und Empfangen von Dateien
+|========================================
+
+Optionen:
+
 include::autogen/user/xfer_options.txt[]
 
 [[xfer_commands]]

doc/docgen.py

@@ -78,11 +78,11 @@ locale_list = ('en_US', 'fr_FR', 'it_IT', 'de_DE', 'ja_JP')
 # if plugin is listed without "c", that means plugin has only one command
 # /name (where "name" is name of plugin)
 # Note: we consider core is a plugin called "weechat"
-plugin_list = { 'weechat'  : 'co',
+plugin_list = { 'sec'      : 'o',
+                'weechat'  : 'co',
                 'alias'    : '',
                 'aspell'   : 'o',
                 'charset'  : 'co',
-                'demo'     : 'co',
                 'fifo'     : 'co',
                 'irc'      : 'co',
                 'logger'   : 'co',
@@ -493,7 +493,7 @@ 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,5",options="header"]\n')
+        f.write('[width="100%",cols="^1,^2,4,8,4,4",options="header"]\n')
         f.write('|========================================\n')
         f.write('| %s | %s | %s | %s | %s | %s\n\n' % (_('Plugin'), _('Name'), _('Description'),
                                                        _('Variables'), _('Update allowed'),

doc/en/CMakeLists.txt

@@ -17,92 +17,111 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# user's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
-  COMMENT "Building weechat_user.en.html"
-)
-ADD_CUSTOM_TARGET(doc-user-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_MAN)
+  # man page
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
+    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.txt
+    COMMENT "Building weechat.1 (en)"
+  )
+  ADD_CUSTOM_TARGET(doc-man-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/man1)
+ENDIF(ENABLE_MAN)
 
-# plugin API reference
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt
-  COMMENT "Building weechat_plugin_api.en.html"
-)
-ADD_CUSTOM_TARGET(doc-plugin-api-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
 
-# scripting guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt
-  COMMENT "Building weechat_scripting.en.html"
-)
-ADD_CUSTOM_TARGET(doc-scripting-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # user's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    COMMENT "Building weechat_user.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-user-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# FAQ
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt
-  COMMENT "Building weechat_faq.en.html"
-)
-ADD_CUSTOM_TARGET(doc-faq-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # plugin API reference
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt
+    COMMENT "Building weechat_plugin_api.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-plugin-api-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# quickstart
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt
-  COMMENT "Building weechat_quickstart.en.html"
-)
-ADD_CUSTOM_TARGET(doc-quickstart-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # scripting guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.txt
+    COMMENT "Building weechat_scripting.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-scripting-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# tester's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt
-  COMMENT "Building weechat_tester.en.html"
-)
-ADD_CUSTOM_TARGET(doc-tester-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # FAQ
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.txt
+    COMMENT "Building weechat_faq.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-faq-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# developer's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.txt
-  COMMENT "Building weechat_dev.en.html"
-)
-ADD_CUSTOM_TARGET(doc-dev-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.txt
+    COMMENT "Building weechat_quickstart.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# relay protocol
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.txt
-  COMMENT "Building weechat_relay_protocol.en.html"
-)
-ADD_CUSTOM_TARGET(doc-relay-protocol-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # tester's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.txt
+    COMMENT "Building weechat_tester.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-tester-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # developer's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.txt
+    COMMENT "Building weechat_dev.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-dev-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # relay protocol
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.txt
+    COMMENT "Building weechat_relay_protocol.en.html"
+  )
+  ADD_CUSTOM_TARGET(doc-relay-protocol-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

doc/en/Makefile.am

@@ -21,6 +21,8 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
+             weechat.1.en.txt \
+             cmdline_options.en.txt \
              weechat_user.en.txt \
              weechat_plugin_api.en.txt \
              weechat_scripting.en.txt \
@@ -32,7 +34,13 @@ EXTRA_DIST = CMakeLists.txt \
              $(wildcard autogen/user/*.txt) \
              $(wildcard autogen/plugin_api/*.txt)
 
-all-local: weechat_user.en.html \
+if MAN
+  man_targets = weechat.1
+  man_install = install-man
+  man_uninstall = uninstall-man
+endif
+if DOC
+  doc_targets = weechat_user.en.html \
 		weechat_plugin_api.en.html \
 		weechat_scripting.en.html \
 		weechat_faq.en.html \
@@ -40,9 +48,17 @@ all-local: weechat_user.en.html \
 		weechat_tester.en.html \
 		weechat_dev.en.html \
 		weechat_relay_protocol.en.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
+
+# man page
+weechat.1: weechat.1.en.txt cmdline_options.en.txt
+	$(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/en/weechat.1.en.txt
 
 # user's guide
-weechat_user.en.html: weechat_user.en.txt $(wildcard autogen/user/*.txt)
+weechat_user.en.html: weechat_user.en.txt cmdline_options.en.txt $(wildcard autogen/user/*.txt)
 	$(ASCIIDOC) -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.en.html $(abs_top_srcdir)/doc/en/weechat_user.en.txt
 
 # plugin API reference
@@ -73,19 +89,32 @@ weechat_dev.en.html: weechat_dev.en.txt
 weechat_relay_protocol.en.html: weechat_relay_protocol.en.txt
 	$(ASCIIDOC) -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_relay_protocol.en.html $(abs_top_srcdir)/doc/en/weechat_relay_protocol.en.txt
 
-# install docs
+# install man/docs
 
-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
 
-# uninstall docs
+# uninstall man/docs
 
-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.en.html
 	-rmdir $(DESTDIR)$(docdir)
 
 # clean
 
 clean-local:
+	-rm -f weechat.1
 	-rm -f *.html

doc/en/autogen/plugin_api/completions.txt

@@ -6,7 +6,9 @@
 
 | alias | alias_value | value of alias
 
-| aspell | aspell_langs | list of supported langs for aspell
+| aspell | aspell_dicts | list of aspell installed dictionaries
+
+| aspell | aspell_langs | list of all languages supported by aspell
 
 | guile | guile_script | list of scripts
 
@@ -104,6 +106,8 @@
 
 | weechat | keys_contexts | key contexts
 
+| weechat | layouts_names | names of layouts
+
 | weechat | nicks | nicks in nicklist of current buffer
 
 | weechat | palette_colors | palette colors
@@ -116,6 +120,8 @@
 
 | weechat | proxies_options | options for proxies
 
+| weechat | secured_data | names of secured data (file sec.conf, section data)
+
 | weechat | weechat_commands | weechat commands
 
 | weechat | windows_numbers | numbers of windows

doc/en/autogen/plugin_api/hdata.txt

@@ -1,7 +1,23 @@
-[width="100%",cols="^1,^2,5,5,5,5",options="header"]
+[width="100%",cols="^1,^2,4,8,4,4",options="header"]
 |========================================
 | Plugin | Name | Description | Variables | Update allowed | Lists
 
+| guile | guile_callback | callback of a script |
+  'script' (pointer, hdata: "guile_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "guile_callback") +
+  'next_callback' (pointer, hdata: "guile_callback") |
+ |
+  -
+
 | guile | guile_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -12,7 +28,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "guile_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "guile_script") +
   'next_script' (pointer, hdata: "guile_script") |
@@ -27,7 +43,7 @@
   'modes' (string) +
   'limit' (integer) +
   'key' (string) +
-  'names_received' (integer) +
+  'join_msg_received' (hashtable) +
   'checking_away' (integer) +
   'away_message' (string) +
   'has_quit_server' (integer) +
@@ -42,6 +58,7 @@
   'nicks_speaking' (pointer) +
   'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking") +
   'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking") +
+  'join_smart_filtered' (hashtable) +
   'buffer' (pointer, hdata: "buffer") +
   'buffer_as_string' (string) +
   'prev_channel' (pointer, hdata: "irc_channel") +
@@ -185,6 +202,7 @@
   'cmd_list_regexp' (pointer) +
   'last_user_message' (time) +
   'last_away_check' (time) +
+  'last_data_purge' (time) +
   'outqueue' (pointer) +
   'last_outqueue' (pointer) +
   'redirects' (pointer, hdata: "irc_redirect") +
@@ -204,6 +222,22 @@
   'irc_servers' +
   'last_irc_server'
 
+| lua | lua_callback | callback of a script |
+  'script' (pointer, hdata: "lua_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "lua_callback") +
+  'next_callback' (pointer, hdata: "lua_callback") |
+ |
+  -
+
 | lua | lua_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -214,7 +248,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "lua_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "lua_script") +
   'next_script' (pointer, hdata: "lua_script") |
@@ -222,6 +256,22 @@
   'last_script' +
   'scripts'
 
+| perl | perl_callback | callback of a script |
+  'script' (pointer, hdata: "perl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "perl_callback") +
+  'next_callback' (pointer, hdata: "perl_callback") |
+ |
+  -
+
 | perl | perl_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -232,7 +282,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "perl_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "perl_script") +
   'next_script' (pointer, hdata: "perl_script") |
@@ -240,6 +290,22 @@
   'last_script' +
   'scripts'
 
+| python | python_callback | callback of a script |
+  'script' (pointer, hdata: "python_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "python_callback") +
+  'next_callback' (pointer, hdata: "python_callback") |
+ |
+  -
+
 | python | python_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -250,7 +316,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "python_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "python_script") +
   'next_script' (pointer, hdata: "python_script") |
@@ -258,6 +324,22 @@
   'last_script' +
   'scripts'
 
+| ruby | ruby_callback | callback of a script |
+  'script' (pointer, hdata: "ruby_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "ruby_callback") +
+  'next_callback' (pointer, hdata: "ruby_callback") |
+ |
+  -
+
 | ruby | ruby_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -268,7 +350,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "ruby_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "ruby_script") +
   'next_script' (pointer, hdata: "ruby_script") |
@@ -304,6 +386,22 @@
   'last_script_repo' +
   'scripts_repo'
 
+| tcl | tcl_callback | callback of a script |
+  'script' (pointer, hdata: "tcl_script") +
+  'function' (string) +
+  'data' (string) +
+  'config_file' (pointer, hdata: "config_file") +
+  'config_section' (pointer, hdata: "config_section") +
+  'config_option' (pointer, hdata: "config_option") +
+  'hook' (pointer) +
+  'buffer' (pointer, hdata: "buffer") +
+  'bar_item' (pointer, hdata: "bar_item") +
+  'upgrade_file' (pointer) +
+  'prev_callback' (pointer, hdata: "tcl_callback") +
+  'next_callback' (pointer, hdata: "tcl_callback") |
+ |
+  -
+
 | tcl | tcl_script | list of scripts |
   'filename' (string) +
   'interpreter' (pointer) +
@@ -314,7 +412,7 @@
   'description' (string) +
   'shutdown_func' (string) +
   'charset' (string) +
-  'callbacks' (pointer) +
+  'callbacks' (pointer, hdata: "tcl_callback") +
   'unloading' (integer) +
   'prev_script' (pointer, hdata: "tcl_script") +
   'next_script' (pointer, hdata: "tcl_script") |
@@ -328,6 +426,7 @@
   'items_count' (integer) +
   'items_subcount' (pointer) +
   'items_array' (pointer) +
+  'items_buffer' (pointer) +
   'items_prefix' (pointer) +
   'items_name' (pointer) +
   'items_suffix' (pointer) +
@@ -403,6 +502,9 @@
   'nicklist_root' (pointer, hdata: "nick_group") +
   'nicklist_max_length' (integer) +
   'nicklist_display_groups' (integer) +
+  'nicklist_count' (integer) +
+  'nicklist_groups_count' (integer) +
+  'nicklist_nicks_count' (integer) +
   'nicklist_visible_count' (integer) +
   'nickcmp_callback' (pointer) +
   'nickcmp_callback_data' (pointer) +
@@ -428,6 +530,9 @@
   'num_history' (integer) +
   'text_search' (integer) +
   'text_search_exact' (integer) +
+  'text_search_regex' (integer) +
+  'text_search_regex_compiled' (pointer) +
+  'text_search_where' (integer) +
   'text_search_found' (integer) +
   'text_search_input' (string) +
   'highlight_words' (string) +
@@ -614,6 +719,41 @@
   'last_gui_key_mouse' +
   'last_gui_key_search'
 
+| weechat | layout | layout |
+  'name' (string) +
+  'layout_buffers' (pointer, hdata: "layout_buffer") +
+  'last_layout_buffer' (pointer, hdata: "layout_buffer") +
+  'layout_windows' (pointer, hdata: "layout_window") +
+  'internal_id' (integer) +
+  'internal_id_current_window' (integer) +
+  'prev_layout' (pointer, hdata: "layout") +
+  'next_layout' (pointer, hdata: "layout") |
+ |
+  'gui_layout_current' +
+  'gui_layouts' +
+  'last_gui_layout'
+
+| weechat | layout_buffer | buffer layout |
+  'plugin_name' (string) +
+  'buffer_name' (string) +
+  'number' (integer) +
+  'prev_layout' (pointer, hdata: "layout_buffer") +
+  'next_layout' (pointer, hdata: "layout_buffer") |
+ |
+  -
+
+| weechat | layout_window | window layout |
+  'internal_id' (integer) +
+  'parent_node' (pointer, hdata: "layout_window") +
+  'split_pct' (integer) +
+  'split_horiz' (integer) +
+  'child1' (pointer, hdata: "layout_window") +
+  'child2' (pointer, hdata: "layout_window") +
+  'plugin_name' (string) +
+  'buffer_name' (string) |
+ |
+  -
+
 | weechat | line | structure with one line |
   'data' (pointer, hdata: "line_data") +
   'prev_line' (pointer, hdata: "line") +
@@ -650,7 +790,9 @@
   'first_line_not_read' (integer) +
   'lines_hidden' (integer) +
   'buffer_max_length' (integer) +
-  'prefix_max_length' (integer) |
+  'buffer_max_length_refresh' (integer) +
+  'prefix_max_length' (integer) +
+  'prefix_max_length_refresh' (integer) |
  |
   -
 
@@ -697,6 +839,15 @@
   'last_weechat_plugin' +
   'weechat_plugins'
 
+| weechat | proxy | proxy |
+  'name' (string) +
+  'options' (pointer) +
+  'prev_proxy' (pointer, hdata: "proxy") +
+  'next_proxy' (pointer, hdata: "proxy") |
+ |
+  'last_weechat_proxy' +
+  'weechat_proxies'
+
 | weechat | window | window |
   'number' (integer) +
   'win_x' (integer) +
@@ -735,7 +886,6 @@
   'scrolling' (integer) +
   'start_col' (integer) +
   'lines_after' (integer) +
-  'reset_allowed' (integer) +
   'prev_scroll' (pointer, hdata: "window_scroll") +
   'next_scroll' (pointer, hdata: "window_scroll") |
  |

doc/en/autogen/plugin_api/infolists.txt

@@ -48,18 +48,22 @@
 
 | weechat | history | history of commands | buffer pointer (if not set, return global history) (optional) | -
 
-| weechat | hook | list of hooks | - | type,arguments (type is command/timer/.., arguments to get only some hooks (can start or end with "*" as wildcard), both are optional)
+| weechat | hook | list of hooks | hook pointer (optional) | type,arguments (type is command/timer/.., arguments to get only some hooks (can start or end with "*" as wildcard), both are optional)
 
 | weechat | hotlist | list of buffers in hotlist | - | -
 
 | weechat | key | list of key bindings | - | context ("default", "search", "cursor" or "mouse") (optional)
 
+| weechat | layout | list of layouts | - | -
+
 | weechat | nicklist | nicks in nicklist for a buffer | buffer pointer | nick_xxx or group_xxx to get only nick/group xxx (optional)
 
 | weechat | option | list of options | - | option name (can start or end with "*" as wildcard) (optional)
 
 | weechat | plugin | list of plugins | plugin pointer (optional) | plugin name (can start or end with "*" as wildcard) (optional)
 
+| weechat | proxy | list of proxies | proxy pointer (optional) | proxy name (can start or end with "*" as wildcard) (optional)
+
 | weechat | url_options | options for URL | - | -
 
 | weechat | window | list of windows | window pointer (optional) | "current" for current window or a window number (optional)

doc/en/autogen/plugin_api/infos.txt

@@ -2,6 +2,8 @@
 |========================================
 | Plugin | Name | Description | Arguments
 
+| aspell | aspell_dict | comma-separated list of dictionaries used in buffer | buffer pointer ("0x12345678") or buffer full name ("irc.freenode.#weechat")
+
 | fifo | fifo_filename | name of FIFO pipe | -
 
 | irc | irc_buffer | get buffer pointer for an IRC server/channel/nick | server,channel,nick (channel and nicks are optional)

doc/en/autogen/plugin_api/url_options.txt

@@ -48,6 +48,12 @@
 
 | address_scope | long |
 
+| tcp_keepalive | long |
+
+| tcp_keepidle | long |
+
+| tcp_keepintvl | long |
+
 | netrc | long | ignored, optional, required
 
 | netrc_file | string |
@@ -126,6 +132,8 @@
 
 | mail_from | string |
 
+| mail_auth | string |
+
 | tftp_blksize | long |
 
 | ftpport | string |
@@ -270,6 +278,8 @@
 
 | ssl_sessionid_cache | long |
 
+| ssl_options | long | allow_beast
+
 | krblevel | string |
 
 | gssapi_delegation | long | none, policy_flag, flag

doc/en/autogen/user/alias_commands.txt

@@ -17,9 +17,8 @@ Note: in command, special variables are replaced:
       $n-m: arguments from 'n' to 'm'
         $*: all arguments
         $~: last argument
-     $nick: current nick
-  $channel: current channel
-   $server: current server
+      $var: where "var" is a local variable of buffer (see /buffer localvar)
+            examples: $nick, $channel, $server, $plugin, $name
 
 To remove an alias, use command /unalias.
 

doc/en/autogen/user/aspell_commands.txt

@@ -3,15 +3,15 @@
 ........................................
 /aspell  enable|disable|toggle
          listdict
-         setdict <lang>
+         setdict <dict>[,<dict>...]
          deldict
-         addword [<lang>] <word>
+         addword [<dict>] <word>
 
   enable: enable aspell
  disable: disable aspell
   toggle: toggle aspell
 listdict: show installed dictionaries
- setdict: set dictionary for current buffer
+ setdict: set dictionary for current buffer (multiple dictionaries can be separated by a comma)
  deldict: delete dictionary used on current buffer
  addword: add a word in personal aspell dictionary
 

doc/en/autogen/user/aspell_options.txt

@@ -33,8 +33,13 @@
 ** type: integer
 ** values: 0 .. 2147483647 (default value: `2`)
 
-* [[option_aspell.look.color]] *aspell.look.color*
-** description: `color used for misspelled words`
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
+** description: `text color for misspelled words (input bar)`
 ** 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_aspell.color.suggestions]] *aspell.color.suggestions*
+** description: `text color for suggestions on a misspelled word (status bar)`
+** 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`)
+

doc/en/autogen/user/demo_commands.txt

@@ -1,36 +0,0 @@
-[[command_demo_demo_buffer]]
-[command]*`demo_buffer`* open a new buffer::
-........................................
-/demo_buffer  <name>
-........................................
-
-[[command_demo_demo_info]]
-[command]*`demo_info`* get and display an info::
-........................................
-/demo_info  <info> [<arguments>]
-
-     info: info to display
-arguments: optional arguments for info
-
-Without argument, this command displays list of available infos
-........................................
-
-[[command_demo_demo_infolist]]
-[command]*`demo_infolist`* get and display an infolist::
-........................................
-/demo_infolist  <infolist> [<arguments>]
-
- infolist: infolist to display
-arguments: optional arguments for infolist
-
-Without argument, this command displays list of available infolists
-........................................
-
-[[command_demo_demo_printf]]
-[command]*`demo_printf`* print some messages on current buffer::
-........................................
-/demo_printf  <text>
-
-text: write this text
-........................................
-

doc/en/autogen/user/irc_commands.txt

@@ -14,7 +14,7 @@ target: server
  -current: execute command for channels of current server only
  -exclude: exclude some channels ('*' is allowed at beginning or end of channel name, to exclude many channels)
   command: command to execute
-arguments: arguments for command
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
 Examples:
   execute '/me is testing' on all channels:
@@ -32,13 +32,15 @@ Examples:
 
  -exclude: exclude some servers ('*' is allowed at beginning or end of server name, to exclude many servers)
   command: command to execute
-arguments: arguments for command
+arguments: arguments for command (special variables $nick, $channel and $server are replaced by their value)
 
 Examples:
   change nick on all servers:
     /allserv nick newnick
   set away on all servers:
     /allserv away I'm away
+  do a whois on my nick on all servers:
+    /allserv whois $nick
 ........................................
 
 [[command_irc_ban]]
@@ -119,18 +121,29 @@ Examples:
 [command]*`dehalfop`* remove channel half-operator status from nick(s)::
 ........................................
 /dehalfop  <nick> [<nick>...]
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: remove channel half-operator status from everybody on channel except yourself
 ........................................
 
 [[command_irc_deop]]
 [command]*`deop`* remove channel operator status from nick(s)::
 ........................................
 /deop  <nick> [<nick>...]
+       * -yes
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: remove channel operator status from everybody on channel except yourself
 ........................................
 
 [[command_irc_devoice]]
 [command]*`devoice`* remove voice from nick(s)::
 ........................................
 /devoice  <nick> [<nick>...]
+          * -yes
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: remove voice from everybody on channel
 ........................................
 
 [[command_irc_die]]
@@ -156,6 +169,10 @@ target: server name
 [command]*`halfop`* give channel half-operator status to nick(s)::
 ........................................
 /halfop  <nick> [<nick>...]
+         * -yes
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: give channel half-operator status to everybody on channel
 ........................................
 
 [[command_irc_ignore]]
@@ -420,6 +437,10 @@ Examples:
 [command]*`op`* give channel operator status to nick(s)::
 ........................................
 /op  <nick> [<nick>...]
+     * -yes
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: give channel operator status to everybody on channel
 ........................................
 
 [[command_irc_oper]]
@@ -461,7 +482,7 @@ daemon2: forward message to this daemon
 [[command_irc_query]]
 [command]*`query`* send a private message to a nick::
 ........................................
-/query  [-server <server>] <nick> [<text>]
+/query  [-server <server>] <nick>[,<nick>...] [<text>]
 
 server: send to this server (internal name)
   nick: nick for private conversation
@@ -717,6 +738,9 @@ server: server name
 [command]*`voice`* give voice to nick(s)::
 ........................................
 /voice  <nick> [<nick>...]
+
+nick: nick or mask (can start or end with "*" as wildcard)
+   *: give voice to everybody on channel
 ........................................
 
 [[command_irc_wallchops]]

doc/en/autogen/user/irc_options.txt

@@ -38,21 +38,11 @@
 ** type: string
 ** values: any string (default value: `"1,-1:darkgray"`)
 
-* [[option_irc.color.nick_prefix]] *irc.color.nick_prefix*
-** description: `color for nick prefix (prefix is custom string displayed before nick)`
-** 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: `green`)
-
 * [[option_irc.color.nick_prefixes]] *irc.color.nick_prefixes*
 ** description: `color for nick prefixes using mode char (o=op, h=halfop, v=voice, ..), format is: "o:color1;h:color2;v:color3" (if a mode is not found, WeeChat will try with next modes received from server ("PREFIX"); a special mode "*" can be used as default color if no mode has been found in list)`
 ** type: string
 ** values: any string (default value: `"q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"`)
 
-* [[option_irc.color.nick_suffix]] *irc.color.nick_suffix*
-** description: `color for nick suffix (suffix is custom string displayed after nick)`
-** 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: `green`)
-
 * [[option_irc.color.notice]] *irc.color.notice*
 ** description: `color for text "Notice" in notices`
 ** type: color
@@ -143,6 +133,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
+** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names on channel`
+** type: string
+** values: any string (default value: `"329,332,333,366"`)
+
 * [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
 ** description: `display old topic when channel topic is changed`
 ** type: boolean
@@ -158,11 +153,6 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
-* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
-** description: `hide password displayed by nickserv`
-** type: boolean
-** values: on, off (default value: `on`)
-
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** description: `comma separated list of words to highlight in channel buffers (case insensitive, use "(?-i)" at beginning of words to make them case sensitive; special variables $nick, $channel and $server are replaced by their value), these words are added to buffer local variable "highlight_words" only when buffer is created (it does not affect current buffers), an empty string disables default highlight on nick, examples: "$nick", "(?-i)$nick"`
 ** type: string
@@ -224,10 +214,15 @@
 ** values: none, next, near_server (default value: `none`)
 
 * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force*
-** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); lookup for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option`
+** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); look up for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option`
 ** type: string
 ** values: any string (default value: `""`)
 
+* [[option_irc.look.nick_color_hash]] *irc.look.nick_color_hash*
+** description: `hash algorithm used to find the color for a nick: djb2 = variant of djb2 (position of letters matters: anagrams of a nick have different color), sum = sum of letters`
+** type: integer
+** values: djb2, sum (default value: `sum`)
+
 * [[option_irc.look.nick_color_stop_chars]] *irc.look.nick_color_stop_chars*
 ** description: `chars used to stop in nick when computing color with letters of nick (at least one char outside this list must be in string before stopping) (example: nick "|nick|away" with "|" in chars will return color of nick "|nick")`
 ** type: string
@@ -248,28 +243,28 @@
 ** 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`
+* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
+** description: `comma separated list of nicks for which passwords will be hidden when a message is sent, for example to hide password in message displayed by "/msg nickserv identify password", example: "nickserv,nickbot"`
 ** type: string
-** values: any string (default value: `""`)
-
-* [[option_irc.look.nick_suffix]] *irc.look.nick_suffix*
-** description: `text to display after nick in chat window`
-** type: string
-** values: any string (default value: `""`)
+** values: any string (default value: `"nickserv"`)
 
 * [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
 ** description: `display notices as private messages (if auto, use private buffer if found)`
 ** type: integer
 ** values: auto, never, always (default value: `auto`)
 
+* [[option_irc.look.notice_welcome_redirect]] *irc.look.notice_welcome_redirect*
+** description: `automatically redirect channel welcome notices to the channel buffer; such notices have the nick as target but a channel name in beginning of notice message, for example notices sent by freenode server which look like: "[#channel] Welcome to this channel..."`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison*
-** description: `comma separated list of tags used in messages printed by notify when a nick joins or quits server (result of command ison), for example: "notify_highlight", "notify_message" or "notify_private"`
+** description: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"`
 ** type: string
 ** values: any string (default value: `"notify_message"`)
 
 * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois*
-** description: `comma separated list of tags used in messages printed by notify when a nick away status changes (result of command whois), for example: "notify_highlight", "notify_message" or "notify_private"`
+** description: `comma separated list of tags used in messages displayed by notify when a nick away status changes (result of command whois), for example: "notify_message", "notify_private" or "notify_highlight"`
 ** type: string
 ** values: any string (default value: `"notify_message"`)
 
@@ -278,6 +273,16 @@
 ** type: boolean
 ** values: on, off (default value: `off`)
 
+* [[option_irc.look.pv_buffer]] *irc.look.pv_buffer*
+** description: `merge private buffers`
+** type: integer
+** values: independent, merge_by_server, merge_all (default value: `independent`)
+
+* [[option_irc.look.pv_tags]] *irc.look.pv_tags*
+** description: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"`
+** type: string
+** values: any string (default value: `"notify_private"`)
+
 * [[option_irc.look.raw_messages]] *irc.look.raw_messages*
 ** description: `number of raw messages to save in memory when raw data buffer is closed (messages will be displayed when opening raw data buffer)`
 ** type: integer
@@ -303,8 +308,13 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_irc.look.smart_filter_join_unmask]] *irc.look.smart_filter_join_unmask*
+** description: `delay for unmasking a join message that was filtered with tag "irc_smart_filter" (in minutes): if a nick has joined max N minutes ago and then says something on channel (message, notice or update on topic), the join is unmasked, as well as nick changes after this join (0 = disable: never unmask a join)`
+** type: integer
+** values: 0 .. 10080 (default value: `30`)
+
 * [[option_irc.look.smart_filter_nick]] *irc.look.smart_filter_nick*
-** description: `enable smart filter for "nick" messages`
+** description: `enable smart filter for "nick" messages (nick changes)`
 ** type: boolean
 ** values: on, off (default value: `on`)
 
@@ -348,16 +358,16 @@
 ** type: integer
 ** values: 0 .. 604800 (default value: `60`)
 
-* [[option_irc.network.lag_disconnect]] *irc.network.lag_disconnect*
-** description: `disconnect after important lag (in minutes, 0 = never disconnect)`
-** type: integer
-** values: 0 .. 10080 (default value: `0`)
-
 * [[option_irc.network.lag_min_show]] *irc.network.lag_min_show*
 ** description: `minimum lag to show (in milliseconds)`
 ** type: integer
 ** values: 0 .. 86400000 (default value: `500`)
 
+* [[option_irc.network.lag_reconnect]] *irc.network.lag_reconnect*
+** description: `reconnect to server if lag is greater than this value (in seconds, 0 = never reconnect)`
+** type: integer
+** values: 0 .. 604800 (default value: `0`)
+
 * [[option_irc.network.lag_refresh_interval]] *irc.network.lag_refresh_interval*
 ** description: `interval between two refreshs of lag item, when lag is increasing (in seconds)`
 ** type: integer
@@ -404,7 +414,7 @@
 ** values: on, off (default value: `off`)
 
 * [[option_irc.server_default.autojoin]] *irc.server_default.autojoin*
-** description: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2")`
+** description: `comma separated list of channels to join when connected to server (example: "#chan1,#chan2,#chan3 key1,key2") (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
@@ -439,12 +449,12 @@
 ** values: 0 .. 1000000 (default value: `25`)
 
 * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
-** description: `comma-separated list of client capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
+** description: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: multi-prefix, userhost-in-names (example: "multi-prefix,userhost-in-names")`
 ** type: string
 ** values: any string (default value: `""`)
 
 * [[option_irc.server_default.command]] *irc.server_default.command*
-** description: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value)`
+** description: `command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
@@ -494,7 +504,7 @@
 ** values: any string (default value: `""`)
 
 * [[option_irc.server_default.proxy]] *irc.server_default.proxy*
-** description: `proxy used for this server (optional)`
+** description: `name of proxy used for this server (optional, proxy must be defined with command /proxy)`
 ** type: string
 ** values: any string (default value: `""`)
 
@@ -504,12 +514,12 @@
 ** values: any string (default value: `""`)
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** description: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for crypted password, "external" for authentication using client side SSL cert`
+** description: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for blowfish crypted password, "dh-aes" for AES crypted password, "external" for authentication using client side SSL cert`
 ** type: integer
-** values: plain, dh-blowfish, external (default value: `plain`)
+** values: plain, dh-blowfish, dh-aes, external (default value: `plain`)
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
-** description: `password for SASL authentication`
+** description: `password for SASL authentication (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
@@ -519,7 +529,7 @@
 ** values: 1 .. 3600 (default value: `15`)
 
 * [[option_irc.server_default.sasl_username]] *irc.server_default.sasl_username*
-** description: `username for SASL authentication`
+** description: `username for SASL authentication (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 

doc/en/autogen/user/logger_commands.txt

@@ -3,11 +3,13 @@
 ........................................
 /logger  list
          set <level>
+         flush
          disable
 
    list: show logging status for opened buffers
     set: set logging level on current buffer
   level: level for messages to be logged (0 = logging disabled, 1 = a few messages (most important) .. 9 = all messages)
+  flush: write all log files now
 disable: disable logging on current buffer (set level to 0)
 
 Options "logger.level.*" and "logger.mask.*" can be used to set level or mask for a buffer, or buffers beginning with name.

doc/en/autogen/user/logger_options.txt

@@ -33,6 +33,16 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_logger.file.nick_prefix]] *logger.file.nick_prefix*
+** description: `text to write before nick in prefix of message, example: "<"`
+** type: string
+** values: any string (default value: `""`)
+
+* [[option_logger.file.nick_suffix]] *logger.file.nick_suffix*
+** description: `text to write after nick in prefix of message, example: ">"`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_logger.file.path]] *logger.file.path*
 ** description: `path for WeeChat log files; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default); date specifiers are permitted (see man strftime)`
 ** type: string

doc/en/autogen/user/relay_commands.txt

@@ -16,7 +16,7 @@
          ipv6: force use of IPv6
           ssl: enable SSL
 protocol.name: protocol and name to relay:
-                 - protocol "irc": name is the server to share
+                 - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
                  - protocol "weechat" (name is not used)
          port: port used for relay
           raw: open buffer with raw Relay data
@@ -29,6 +29,8 @@ Examples:
     /relay add irc.freenode 8000
   irc proxy, for server "freenode", with SSL:
     /relay add ssl.irc.freenode 8001
+  irc proxy, for all servers (client will choose), with SSL:
+    /relay add ssl.irc 8002
   weechat protocol:
     /relay add weechat 9000
   weechat protocol with SSL:

doc/en/autogen/user/relay_options.txt

@@ -113,3 +113,8 @@
 ** type: string
 ** values: any string (default value: `"%h/ssl/relay.pem"`)
 
+* [[option_relay.network.websocket_allowed_origins]] *relay.network.websocket_allowed_origins*
+** description: `regular expression with origins allowed in websockets (case insensitive, use "(?-i)" at beginning to make it case sensitive), example: "^http://(www\.)?example\.(com|org)"`
+** type: string
+** values: any string (default value: `""`)
+

doc/en/autogen/user/rmodifier_commands.txt

@@ -4,6 +4,7 @@
 /rmodifier  list|listdefault
             add <name> <modifiers> <groups> <regex>
             del <name>|-all [<name>...]
+            missing
             default -yes
 
        list: list all rmodifiers
@@ -11,10 +12,11 @@ listdefault: list default rmodifiers
         add: add a rmodifier
        name: name of rmodifier
   modifiers: comma separated list of modifiers
-     groups: action on groups found: comma separated list of groups (from 1 to 9) with optional "*" after number to hide group
+     groups: action on groups captured in regular expression (inside parentheses): comma separated list of groups (from 1 to 9) with optional "*" after number to hide the group
       regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive)
         del: delete a rmodifier
        -all: delete all rmodifiers
+    missing: add missing rmodifiers
     default: restore default rmodifiers
 
 Examples:

doc/en/autogen/user/script_commands.txt

@@ -5,25 +5,29 @@
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
+         autoload|noautoload|toggleautoload <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
+          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)
+      autoload: autoload the script
+    noautoload: do not autoload the script
+toggleautoload: toggle autoload
+       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.
 
@@ -43,6 +47,7 @@ Keys on script buffer:
   alt+l  load script
   alt+L  reload script
   alt+u  unload script
+  alt+A  autoload script
   alt+h  (un)hold script
   alt+v  view script
 

doc/en/autogen/user/script_options.txt

@@ -168,6 +168,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_script.scripts.autoload]] *script.scripts.autoload*
+** description: `autoload scripts installed (make a link in "autoload" directory to script in parent directory)`
+** 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

doc/en/autogen/user/sec_options.txt

@@ -0,0 +1,20 @@
+* [[option_sec.crypt.cipher]] *sec.crypt.cipher*
+** description: `cipher used to crypt data (the number after algorithm is the size of the key in bits)`
+** type: integer
+** values: aes128, aes192, aes256 (default value: `aes256`)
+
+* [[option_sec.crypt.hash_algo]] *sec.crypt.hash_algo*
+** description: `hash algorithm used to check the decrypted data`
+** type: integer
+** values: sha224, sha256, sha384, sha512 (default value: `sha256`)
+
+* [[option_sec.crypt.passphrase_file]] *sec.crypt.passphrase_file*
+** description: `path to a file containing the passphrase to encrypt/decrypt secured data; this option is used only when reading file sec.conf; only first line of file is used; this file is used only if the environment variable "WEECHAT_PASSPHRASE" is not set (the environment variable has higher priority); security note: it is recommended to keep this file readable only by you and store it outside WeeChat home (for example in your home); example: "~/.weechat-passphrase"`
+** type: string
+** values: any string (default value: `""`)
+
+* [[option_sec.crypt.salt]] *sec.crypt.salt*
+** description: `use salt when generating key used in encryption (recommended for maximum security); when enabled, the content of crypted data in file sec.conf will be different on each write of the file; if you put the file sec.conf in a version control system, then you can turn off this option to have always same content in file`
+** type: boolean
+** values: on, off (default value: `on`)
+

doc/en/autogen/user/weechat_commands.txt

@@ -1,9 +1,9 @@
 [[command_weechat_away]]
-[command]*`away`* toggle away status::
+[command]*`away`* set or remove away status::
 ........................................
 /away  [-all] [<message>]
 
-   -all: toggle away status on all connected servers
+   -all: set or remove away status on all connected servers
 message: message for away (if no message is given, away status is removed)
 ........................................
 
@@ -125,12 +125,14 @@ Examples:
 /color  alias <color> <name>
         unalias <color>
         reset
+        -o
 
   alias: add an alias for a color
 unalias: delete an alias
   color: color number (greater than or equal to 0, max depends on terminal, commonly 63 or 255)
    name: alias name for color (for example: "orange")
   reset: reset all color pairs (required when no more color pairs are available if automatic reset is disabled, see option weechat.look.color_pairs_auto_reset)
+     -o: send terminal/colors info to current buffer as input
 
 Without argument, this command displays colors in a new buffer.
 
@@ -190,6 +192,7 @@ Examples:
    buffer: dump buffer content with hexadecimal values in log file
     color: display infos about current color pairs
    cursor: toggle debug for cursor mode
+     dirs: display directories
     hdata: display infos about hdata (with free: remove all hdata in memory)
     hooks: display infos about hooks
 infolists: display infos about infolists
@@ -204,9 +207,10 @@ infolists: display infos about infolists
 [command]*`eval`* evaluate expression and send result to buffer::
 ........................................
 /eval  [-n] <expression>
-       [-n] <expression1> <operator> <expression2>
+       [-n] -c <expression1> <operator> <expression2>
 
         -n: display result without sending it to buffer (debug mode)
+        -c: evaluate as condition: use operators and parentheses, return a boolean value ("0" or "1")
 expression: expression to evaluate, variables with format ${variable} are replaced (see below)
   operator: a logical or comparison operator:
             - logical operators:
@@ -228,31 +232,32 @@ To force a string comparison, add double quotes around each expression, for exam
   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.
+Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority :
+  1. a color (format: color:xxx)
+  2. an option (format: file.section.option)
+  3. a local variable in buffer
+  4. 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:
+  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
+  /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 -c ${window.buffer.number} > 2  ==> 0
+  /eval -n -c ${window.win_width} > 100    ==> 1
+  /eval -n -c (8 > 12) || (5 > 2)          ==> 1
+  /eval -n -c (8 > 12) && (5 > 2)          ==> 0
+  /eval -n -c abcd =~ ^ABC                 ==> 1
+  /eval -n -c abcd =~ (?-i)^ABC            ==> 0
+  /eval -n -c abcd =~ (?-i)^abc            ==> 1
+  /eval -n -c abcd !~ abc                  ==> 0
 ........................................
 
 [[command_weechat_filter]]
@@ -289,7 +294,7 @@ Tags most commonly used:
   no_filter, no_highlight, no_log, log0..log9 (log level),
   notify_none, notify_message, notify_private, notify_highlight,
   nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick),
-  irc_xxx (xxx is command name or number, see /server raw),
+  irc_xxx (xxx is command name or number, see /server raw or /debug tags),
   irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info.
 To see tags for lines in buffers: /debug tags
 
@@ -343,6 +348,8 @@ list of actions:
   complete_previous: complete word with previous completion
   search_text: search text in buffer
   search_switch_case: switch exact case for search
+  search_switch_regex: switch search type: string/regular expression
+  search_switch_where: switch search in messages/prefixes
   search_previous: search previous line
   search_next: search next line
   search_stop: stop search
@@ -446,17 +453,23 @@ Examples:
 [[command_weechat_layout]]
 [command]*`layout`* save/apply/reset layout for buffers and windows::
 ........................................
-/layout  save [buffers|windows]
-         apply [buffers|windows]
-         reset [buffers|windows]
+/layout  save [<name>] [buffers|windows]
+         apply [<name>] [buffers|windows]
+         leave
+         reset [<name>] [buffers|windows]
+         rename <name> <new_name>
 
    save: save current layout
   apply: apply saved layout
-  reset: remove saved layout
+  leave: leave current layout (does not update any layout)
+  reset: reset buffers and/or windows in a saved layout
+         (if both buffers and windows are reset, the layout is removed)
+ rename: rename a layout
+   name: name for saved layout (default is "default")
 buffers: save/apply only buffers (order of buffers)
 windows: save/apply only windows (buffer displayed by each window)
 
-Without argument, this command displays saved layout.
+Without argument, this command displays saved layouts.
 ........................................
 
 [[command_weechat_mouse]]
@@ -601,6 +614,45 @@ file: configuration file to save (without extension ".conf")
 Without argument, all files (WeeChat and plugins) are saved.
 ........................................
 
+[[command_weechat_secure]]
+[command]*`secure`* manage secured data (passwords or private data encrypted in file sec.conf)::
+........................................
+/secure  passphrase <passphrase>|-delete
+         decrypt <passphrase>|-discard
+         set <name> <value>
+         del <name>
+
+passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
+   -delete: delete passphrase
+   decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
+  -discard: discard all data still encrypted
+       set: add or change secured data
+       del: delete secured data
+
+Without argument, this command displays secured data in a new buffer.
+
+When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
+It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
+
+Secured data with format ${sec.data.xxx} can be used in:
+  - command line argument "--run-command"
+  - irc server options: autojoin, command, password, sasl_{username|password}
+  - options weechat.startup.command_{before|after}_plugins
+  - command /eval.
+
+Examples:
+  set a passphrase:
+    /secure passphrase this is my passphrase
+  encrypt freenode SASL password:
+    /secure set freenode mypassword
+    /set irc.server.freenode.sasl_password "${sec.data.freenode}"
+  encrypt oftc password for nickserv:
+    /secure set oftc mypassword
+    /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
+  alias to ghost the nick "mynick":
+    /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
+........................................
+
 [[command_weechat_set]]
 [command]*`set`* set config options::
 ........................................
@@ -652,6 +704,7 @@ Examples:
 /upgrade  [<path_to_binary>|-quit]
 
 path_to_binary: path to WeeChat binary (default is current binary)
+        -dummy: do nothing (option used to prevent accidental completion with "-quit")
          -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.
@@ -670,9 +723,9 @@ With option "-quit", the process is slightly different:
   3. unload all plugins
   4. save WeeChat configuration
   5. quit WeeChat
-Then later you can restore session with command: weechat-curses --upgrade
+Then later you can restore session with command: weechat --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"
+It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
 ........................................
 
 [[command_weechat_uptime]]
@@ -731,7 +784,7 @@ Examples:
          refresh
          scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]
          scroll_horiz [-window <number>] [+/-]<value>[%]
-         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
+         scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>]
          swap [-window <number>] [up|down|left|right]
          zoom[-window <number>]
 
@@ -758,6 +811,7 @@ Examples:
   scroll_down: scroll a few lines down
    scroll_top: scroll to top of buffer
 scroll_bottom: scroll to bottom of buffer
+scroll_beyond_end: scroll beyond the end of buffer
 scroll_previous_highlight: scroll to previous highlight
 scroll_next_highlight: scroll to next highlight
 scroll_unread: scroll to unread marker

doc/en/autogen/user/weechat_options.txt

@@ -23,6 +23,11 @@
 ** 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_weechat.color.chat_day_change]] *weechat.color.chat_day_change*
+** description: `text color for message displayed when the day has changed`
+** 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_weechat.color.chat_delimiters]] *weechat.color.chat_delimiters*
 ** description: `text color for delimiters`
 ** type: color
@@ -83,11 +88,21 @@
 ** 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_weechat.color.chat_nick_prefix]] *weechat.color.chat_nick_prefix*
+** description: `color for nick prefix (string displayed before nick in prefix)`
+** 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: `green`)
+
 * [[option_weechat.color.chat_nick_self]] *weechat.color.chat_nick_self*
 ** description: `text color for local nick in chat window`
 ** 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_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
+** description: `color for nick suffix (string displayed after nick in prefix)`
+** 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: `green`)
+
 * [[option_weechat.color.chat_prefix_action]] *weechat.color.chat_prefix_action*
 ** description: `text color for action prefix`
 ** type: color
@@ -178,6 +193,16 @@
 ** 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_weechat.color.emphasized]] *weechat.color.emphasized*
+** description: `text color for emphasized text (for example when searching text); this option is used only if option weechat.look.emphasized_attributes is an empty string (default value)`
+** 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_weechat.color.emphasized_bg]] *weechat.color.emphasized_bg*
+** description: `background color for emphasized text (for example when searching text); used only if option weechat.look.emphasized_attributes is an empty string (default value)`
+** 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_weechat.color.input_actions]] *weechat.color.input_actions*
 ** description: `text color for actions in input line`
 ** type: color
@@ -284,7 +309,7 @@
 ** values: on, off (default value: `on`)
 
 * [[option_weechat.completion.default_template]] *weechat.completion.default_template*
-** description: `default completion template (please see documentation for template codes and values)`
+** description: `default completion template (please see documentation for template codes and values: plugin API reference, function "weechat_hook_command")`
 ** type: string
 ** values: any string (default value: `"%(nicks)|%(irc_channels)"`)
 
@@ -389,7 +414,7 @@
 ** values: none, highlight, message, all (default value: `all`)
 
 * [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** description: `time format for each line displayed in buffers (see man strftime for date/time specifiers), colors are allowed with format "${color}", for example french time: "${lightblue}%H${white}%M${lightred}%S"`
+** description: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:252}%H${color:245}%M${color:240}%S"`
 ** type: string
 ** values: any string (default value: `"%H:%M:%S"`)
 
@@ -401,7 +426,7 @@
 * [[option_weechat.look.color_inactive_buffer]] *weechat.look.color_inactive_buffer*
 ** description: `use a different color for lines in inactive buffer (when line is from a merged buffer not selected)`
 ** type: boolean
-** values: on, off (default value: `off`)
+** values: on, off (default value: `on`)
 
 * [[option_weechat.look.color_inactive_message]] *weechat.look.color_inactive_message*
 ** description: `use a different color for inactive message (when window is not current window, or if line is from a merged buffer not selected)`
@@ -426,7 +451,7 @@
 * [[option_weechat.look.color_inactive_window]] *weechat.look.color_inactive_window*
 ** description: `use a different color for lines in inactive window (when window is not current window)`
 ** type: boolean
-** values: on, off (default value: `off`)
+** values: on, off (default value: `on`)
 
 * [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline*
 ** description: `use a different color for offline nicks (not in nicklist any more)`
@@ -458,16 +483,26 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
-* [[option_weechat.look.day_change_time_format]] *weechat.look.day_change_time_format*
-** description: `time format for date displayed when day changed`
+* [[option_weechat.look.day_change_message]] *weechat.look.day_change_message*
+** description: `message displayed when the day has changed, with one date displayed (for example at beginning of buffer) (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
-** values: any string (default value: `"%a, %d %b %Y"`)
+** values: any string (default value: `"-- %a, %d %b %Y --"`)
+
+* [[option_weechat.look.day_change_message2]] *weechat.look.day_change_message2*
+** description: `message displayed when the day has changed, with two dates displayed (between two messages); the second date specifiers must start with two "%" because strftime is called two times on this string (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
+** type: string
+** values: any string (default value: `"-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"`)
 
 * [[option_weechat.look.eat_newline_glitch]] *weechat.look.eat_newline_glitch*
 ** description: `if set, the eat_newline_glitch will be set to 0; this is used to not add new line char at end of each line, and then not break text when you copy/paste text from WeeChat to another application (this option is disabled by default because it can cause serious display bugs)`
 ** type: boolean
 ** values: on, off (default value: `off`)
 
+* [[option_weechat.look.emphasized_attributes]] *weechat.look.emphasized_attributes*
+** description: `attributes for emphasized text: one or more attribute chars ("*" for bold, "!" for reverse, "_" for underline); if the string is empty, the colors weechat.color.emphasized* are used`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_weechat.look.highlight]] *weechat.look.highlight*
 ** description: `comma separated list of words to highlight; case insensitive comparison (use "(?-i)" at beginning of words to make them case sensitive), words may begin or end with "*" for partial match; example: "test,(?-i)*toto*,flash*"`
 ** type: string
@@ -523,6 +558,11 @@
 ** type: boolean
 ** values: on, off (default value: `off`)
 
+* [[option_weechat.look.hotlist_prefix]] *weechat.look.hotlist_prefix*
+** description: `text displayed at the beginning of the hotlist`
+** type: string
+** values: any string (default value: `"H: "`)
+
 * [[option_weechat.look.hotlist_short_names]] *weechat.look.hotlist_short_names*
 ** description: `if set, uses short names to display buffer names in hotlist (start after first '.' in name)`
 ** type: boolean
@@ -533,6 +573,11 @@
 ** type: integer
 ** values: group_time_asc, group_time_desc, group_number_asc, group_number_desc, number_asc, number_desc (default value: `group_time_asc`)
 
+* [[option_weechat.look.hotlist_suffix]] *weechat.look.hotlist_suffix*
+** description: `text displayed at the end of the hotlist`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_weechat.look.hotlist_unique_numbers]] *weechat.look.hotlist_unique_numbers*
 ** description: `keep only unique numbers in hotlist (this applies only on hotlist items where name is NOT displayed after number)`
 ** type: boolean
@@ -583,6 +628,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_weechat.look.key_bind_safe]] *weechat.look.key_bind_safe*
+** description: `allow only binding of "safe" keys (beginning with a ctrl or meta code)`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_weechat.look.mouse]] *weechat.look.mouse*
 ** description: `enable mouse support`
 ** type: boolean
@@ -593,6 +643,16 @@
 ** type: integer
 ** values: 1 .. 10000 (default value: `100`)
 
+* [[option_weechat.look.nick_prefix]] *weechat.look.nick_prefix*
+** description: `text to display before nick in prefix of message, example: "<"`
+** type: string
+** values: any string (default value: `""`)
+
+* [[option_weechat.look.nick_suffix]] *weechat.look.nick_suffix*
+** description: `text to display after nick in prefix of message, example: ">"`
+** type: string
+** values: any string (default value: `""`)
+
 * [[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
@@ -609,7 +669,7 @@
 ** values: -1 .. 2147483647 (default value: `1`)
 
 * [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** description: `prefix for action messages, colors are allowed with format "${color}"`
+** description: `prefix for action messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `" *"`)
 
@@ -633,6 +693,11 @@
 ** type: string
 ** values: any string (default value: `"+"`)
 
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** description: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** description: `prefix alignment for buffer name, when many buffers are merged with same number (none, left, right (default))`
 ** type: integer
@@ -648,23 +713,28 @@
 ** type: string
 ** values: any string (default value: `"+"`)
 
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** description: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** type: boolean
+** values: on, off (default value: `on`)
+
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `prefix for error messages, colors are allowed with format "${color}"`
+** description: `prefix for error messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"=!="`)
 
 * [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** description: `prefix for join messages, colors are allowed with format "${color}"`
+** description: `prefix for join messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"-->"`)
 
 * [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** description: `prefix for network messages, colors are allowed with format "${color}"`
+** description: `prefix for network messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"--"`)
 
 * [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** description: `prefix for quit messages, colors are allowed with format "${color}"`
+** description: `prefix for quit messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
 ** type: string
 ** values: any string (default value: `"<--"`)
 
@@ -739,7 +809,7 @@
 ** values: on, off (default value: `on`)
 
 * [[option_weechat.look.time_format]] *weechat.look.time_format*
-** description: `time format for dates converted to strings and displayed in messages`
+** description: `time format for dates converted to strings and displayed in messages (see man strftime for date/time specifiers)`
 ** type: string
 ** values: any string (default value: `"%a, %d %b %Y %T"`)
 
@@ -768,6 +838,11 @@
 ** type: integer
 ** values: 1 .. 2147483647 (default value: `30`)
 
+* [[option_weechat.network.proxy_curl]] *weechat.network.proxy_curl*
+** description: `name of proxy used for download of URLs with Curl (used to download list of scripts and in scripts calling function hook_process); the proxy must be defined with command /proxy`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_weechat.plugin.autoload]] *weechat.plugin.autoload*
 ** description: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, names can start or end with "*" to match several plugins (examples: "*" or "*,!lua,!tcl")`
 ** type: string
@@ -794,12 +869,12 @@
 ** values: on, off (default value: `on`)
 
 * [[option_weechat.startup.command_after_plugins]] *weechat.startup.command_after_plugins*
-** description: `command executed when WeeChat starts, after loading plugins`
+** description: `command executed when WeeChat starts, after loading plugins (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 
 * [[option_weechat.startup.command_before_plugins]] *weechat.startup.command_before_plugins*
-** description: `command executed when WeeChat starts, before loading plugins`
+** description: `command executed when WeeChat starts, before loading plugins (note: content is evaluated, see /help eval)`
 ** type: string
 ** values: any string (default value: `""`)
 

doc/en/autogen/user/xfer_options.txt

@@ -53,6 +53,11 @@
 ** type: boolean
 ** values: on, off (default value: `off`)
 
+* [[option_xfer.file.auto_accept_nicks]] *xfer.file.auto_accept_nicks*
+** description: `comma-separated list of nicks for which the incoming files and chats are automatically accepted; format is "server.nick" (for a specific server) or "nick" (for all servers); example: "freenode.FlashCode,andrew"`
+** type: string
+** values: any string (default value: `""`)
+
 * [[option_xfer.file.auto_rename]] *xfer.file.auto_rename*
 ** description: `rename incoming files if already exists (add ".1", ".2", ...)`
 ** type: boolean
@@ -93,6 +98,11 @@
 ** type: integer
 ** values: 0 .. 256 (default value: `20`)
 
+* [[option_xfer.look.pv_tags]] *xfer.look.pv_tags*
+** description: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"`
+** type: string
+** values: any string (default value: `"notify_private"`)
+
 * [[option_xfer.network.blocksize]] *xfer.network.blocksize*
 ** description: `block size for sending packets, in bytes`
 ** type: integer

doc/en/cmdline_options.en.txt

@@ -0,0 +1,34 @@
+*-a*, *--no-connect*::
+    Disable auto-connect to servers when WeeChat is starting.
+
+*-c*, *--colors*::
+    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).
+
+*-h*, *--help*::
+    Display help.
+
+*-l*, *--license*::
+    Display WeeChat license.
+
+*-p*, *--no-plugin*::
+    Disable plugins auto-load.
+
+*-r*, *--run-command* '<command>'::
+    Run command(s) after startup (many commands can be separated by semicolons).
+
+*-s*, *--no-script*::
+    Disable scripts auto-load.
+
+*--upgrade*::
+    Upgrade WeeChat using session files generated with command `/upgrade -quit`.
+
+*-v*, *--version*::
+    Display WeeChat version.
+
+*plugin:option*::
+    Option for a plugin.

doc/en/weechat.1.en.txt

@@ -0,0 +1,115 @@
+WEECHAT(1)
+==========
+:doctype: manpage
+
+NAME
+----
+
+weechat - the extensible chat client
+
+SYNOPSIS
+--------
+
+[verse]
+'weechat' [-a|--no-connect] [-d|--dir <path>] [-p|--no-plugin] [-r|--run-command <command>] [-s|--no-script] [--upgrade] [plugin:option...]
+'weechat' [-c|--colors]
+'weechat' [-h|--help]
+'weechat' [-k|--keys]
+'weechat' [-l|--license]
+'weechat' [-v|--version]
+
+DESCRIPTION
+-----------
+
+WeeChat is a fast, light and extensible chat client.
+
+It is modular (lightweight core with plugins), multi-protocols (IRC and Jabber),
+extensible with C and scripts written in several languages.
+
+OPTIONS
+-------
+
+include::cmdline_options.en.txt[]
+
+PLUGIN OPTIONS
+--------------
+
+For complete doc on plugin options, please look at plugins documentation in
+http://weechat.org/doc[WeeChat user's guide].
+
+With irc plugin, you can connect to temporary server with an URL like:
+
+    irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]]
+
+To join WeeChat IRC channel support with nick "mynick":
+
+    irc://mynick@irc.freenode.net/#weechat
+
+IPv6 address can be enclosed in brackets to add a port after address, for
+example:
+
+    irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test
+
+FILES
+-----
+
+$HOME/.weechat/weechat.conf::
+    main WeeChat configuration file
+
+$HOME/.weechat/plugins.conf::
+    plugins configuration file
+
+$HOME/.weechat/alias.conf::
+    configuration file for 'alias' plugin
+
+$HOME/.weechat/aspell.conf::
+    configuration file for 'aspell' plugin
+
+$HOME/.weechat/charset.conf::
+    configuration file for 'charset' plugin
+
+$HOME/.weechat/irc.conf::
+    configuration file for 'irc' plugin
+
+$HOME/.weechat/logger.conf::
+    configuration file for 'logger' plugin
+
+$HOME/.weechat/relay.conf::
+    configuration file for 'relay' plugin
+
+$HOME/.weechat/rmodifier.conf::
+    configuration file for 'rmodifier' plugin
+
+$HOME/.weechat/script.conf::
+    configuration file for 'script' plugin
+
+$HOME/.weechat/xfer.conf::
+    configuration file for 'xfer' plugin
+
+$HOME/.weechat/weechat.log::
+    WeeChat log file
+
+AUTHORS
+-------
+
+WeeChat is written by Sébastien Helleu and contributors (complete list is in
+the AUTHORS file).
+
+Copyright (C) 2003-2013 Sébastien Helleu <flashcode@flashtux.org>
+
+WeeChat is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+Please read the COPYING file for more information.
+
+Web: <http://weechat.org/>
+
+REPORTING BUGS
+--------------
+
+Please report bugs or feature requests at Savannah website:
+
+* bugs: <http://savannah.nongnu.org/bugs/?group=weechat>
+* feature requests: <http://savannah.nongnu.org/task/?group=weechat>

doc/en/weechat_dev.en.txt

@@ -6,7 +6,7 @@ Sébastien Helleu <flashcode@flashtux.org>
 This manual documents WeeChat chat client, it is part of WeeChat.
 
 Latest version of this document can be found on this page:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 
 [[introduction]]
@@ -51,12 +51,10 @@ The main WeeChat directories are:
 |    core/         | Core functions: entry point, internal structures
 |    gui/          | Functions for buffers, windows, ... (used by all interfaces)
 |       curses/    | Curses interface
-|       gtk/       | Gtk interface (not working)
 |    plugins/      | Plugin and scripting API
 |       alias/     | Alias plugin
 |       aspell/    | Aspell plugin
 |       charset/   | Charset plugin
-|       demo/      | Demo plugin
 |       fifo/      | Fifo plugin (FIFO pipe used to remotely send commands to WeeChat)
 |       irc/       | IRC plugin
 |       logger/    | Logger plugin (write messages displayed to files)
@@ -97,7 +95,7 @@ WeeChat "core" reside in following directories:
 |    wee-command.c              | WeeChat core commands
 |    wee-completion.c           | Completion on command line
 |    wee-config-file.c          | Configuration file management
-|    wee-config.c               | Configuration options for WeeChat core (options weechat.*)
+|    wee-config.c               | Configuration options for WeeChat core (file weechat.conf)
 |    wee-debug.c                | Some debug functions
 |    wee-eval.c                 | Evaluate expressions with references to internal vars
 |    wee-hashtable.c            | Hashtables
@@ -109,6 +107,7 @@ WeeChat "core" reside in following directories:
 |    wee-log.c                  | Write to WeeChat log file (weechat.log)
 |    wee-network.c              | Network functions (connection to servers, proxy)
 |    wee-proxy.c                | Proxy management
+|    wee-secure.c               | Secured data options (file sec.conf)
 |    wee-string.c               | Functions on strings
 |    wee-upgrade-file.c         | Internal upgrade system
 |    wee-upgrade.c              | Upgrade for WeeChat core (buffers, lines, history, ...)
@@ -145,15 +144,6 @@ WeeChat "core" reside in following directories:
 |       gui-curses-mouse.c      | Mouse
 |       gui-curses-term.c       | Functions about terminal
 |       gui-curses-window.c     | Windows
-|    gtk/                       | Gtk interface (not working)
-|       gui-gtk-bar-window.c    | Display in bar windows
-|       gui-gtk-chat.c          | Display in chat area (messages)
-|       gui-gtk-color.c         | Color functions
-|       gui-gtk-key.c           | Keyboard functions
-|       gui-gtk-main.c          | WeeChat main loop (waiting for keyboard/network events)
-|       gui-gtk-mouse.c         | Mouse
-|       gui-gtk-term.c          | Functions about terminal
-|       gui-gtk-window.c        | Windows
 |========================================
 
 [[sources_plugins]]
@@ -173,20 +163,21 @@ Plugins
 |    weechat-plugin.h               | Header designed to be distributed with WeeChat plugins, in order to compile them
 |    alias/                         | Alias plugin
 |       alias.c                     | Main alias functions
-|       alias-config.c              | Alias config options
-|       alias-info.c                | Info and infolists from alias plugin
+|       alias-config.c              | Alias config options (file alias.conf)
+|       alias-info.c                | Alias info/infolists/hdata
 |    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-command.c    | Aspell commands
+|       weechat-aspell-completion.c | Aspell completions
+|       weechat-aspell-config.c     | Aspell config options (file aspell.conf)
+|       weechat-aspell-info.c       | Aspell info/infolists/hdata
 |       weechat-aspell-speller.c    | Spellers management
 |    charset/                       | Charset plugin
 |       charset.c                   | Charset functions
-|    demo/                          | Demo plugin
-|       demo.c                      | Demo functions
 |    fifo/                          | Fifo plugin
 |       fifo.c                      | Main fifo functions
-|       fifo-info.c                 | Info and infolists from fifo plugin
+|       fifo-info.c                 | Fifo info/infolists/hdata
 |    guile/                         | Guile (scheme) plugin
 |       weechat-guile.c             | Main guile functions (load/unload scripts, execute guile code)
 |       weechat-guile-api.c         | Guile scripting API functions
@@ -198,19 +189,18 @@ Plugins
 |       irc-color.c                 | Color functions
 |       irc-command.c               | IRC commands
 |       irc-completion.c            | IRC completions
-|       irc-config.c                | IRC config options
+|       irc-config.c                | IRC config options (file irc.conf)
 |       irc-ctcp.c                  | IRC CTCP
 |       irc-debug.c                 | IRC debug functions
-|       irc-display.c               | IRC display functions
 |       irc-ignore.c                | IRC Ignore
-|       irc-info.c                  | Info and infolists from IRC plugin
+|       irc-info.c                  | IRC info/infolists/hdata
 |       irc-input.c                 | Input of commands/text
 |       irc-message.c               | Functions to manipulate IRC messages
 |       irc-mode.c                  | Functions about channel/nick modes
 |       irc-msgbuffer.c             | Target buffer for IRC messages
 |       irc-nick.c                  | IRC nicks
 |       irc-notify.c                | IRC notify lists
-|       irc-protocol.c              | IRC protocol
+|       irc-protocol.c              | IRC protocol (RFCs 1459/2810/2811/2812/2813)
 |       irc-raw.c                   | IRC raw buffer
 |       irc-redirect.c              | Redirection of IRC command output
 |       irc-sasl.c                  | SASL authentication with IRC server
@@ -219,8 +209,8 @@ Plugins
 |    logger/                        | Logger plugin
 |       logger.c                    | Main logger functions
 |       logger-buffer.c             | Logger buffer list management
-|       logger-config.c             | Logger config options
-|       logger-info.c               | Info and infolists from logger plugin
+|       logger-config.c             | Logger config options (file logger.conf)
+|       logger-info.c               | Logger info/infolists/hdata
 |       logger-tail.c               | Return last lines of a file
 |    lua/                           | Lua plugin
 |       weechat-lua.c               | Main lua functions (load/unload scripts, execute lua code)
@@ -237,25 +227,27 @@ Plugins
 |       relay-client.c              | Clients of relay
 |       relay-command.c             | Relay commands
 |       relay-completion.c          | Relay completions
-|       relay-config.c              | Relay config options
-|       relay-info.c                | Info and infolists from relay plugin
+|       relay-config.c              | Relay config options (file relay.conf)
+|       relay-info.c                | Relay info/infolists/hdata
 |       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
+|       relay-websocket.c           | Websocket server functions for relay (RFC 6455)
 |       irc/                        | IRC proxy
 |          relay-irc.c              | Main IRC proxy functions
 |       weechat/                    | Relay for remote interface
 |          relay-weechat.c          | Relay for remote interface (main functions)
 |          relay-weechat-msg.c      | Send binary messages to clients
+|          relay-weechat-nicklist.c | Nicklist functions
 |          relay-weechat-protocol.c | Read commands from clients
 |    rmodifier/                     | Rmodifier plugin
 |       rmodifier.c                 | Main rmodifier functions
 |       rmodifier-command.c         | Rmodifier commands
 |       rmodifier-completion.c      | Rmodifier completions
-|       rmodifier-config.c          | Rmodifier config options
+|       rmodifier-config.c          | Rmodifier config options (file rmodifier.conf)
 |       rmodifier-debug.c           | Rmodifier debug functions
-|       rmodifier-info.c            | Info and infolists from rmodifier plugin
+|       rmodifier-info.c            | Rmodifier info/infolists/hdata
 |    ruby/                          | Ruby plugin
 |       weechat-ruby.c              | Main ruby functions (load/unload scripts, execute ruby code)
 |       weechat-ruby-api.c          | Ruby scripting API functions
@@ -265,8 +257,8 @@ Plugins
 |       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-config.c             | Config options for scripts manager (file script.conf)
+|       script-info.c               | Script manager info/infolists/hdata
 |       script-repo.c               | Download and read repository file
 |    tcl/                           | Tcl plugin
 |       weechat-tcl.c               | Main tcl functions (load/unload scripts, execute tcl code)
@@ -277,10 +269,10 @@ Plugins
 |       xfer-chat.c                 | Xfer DCC chat
 |       xfer-command.c              | Xfer commands
 |       xfer-completion.c           | Xfer completions
-|       xfer-config.c               | Xfer config options
+|       xfer-config.c               | Xfer config options (file xfer.conf)
 |       xfer-dcc.c                  | Xfer DCC file
 |       xfer-file.c                 | File functions for xfer
-|       xfer-info.c                 | Info and infolists from xfer plugin
+|       xfer-info.c                 | Xfer info/infolists/hdata
 |       xfer-network.c              | Network functions for xfer
 |       xfer-upgrade.c              | Save/restore xfer data when upgrading WeeChat
 |========================================
@@ -298,8 +290,8 @@ Documentation files:
 |    asciidoc.conf                    | Asciidoc configuration file (some macros)
 |    asciidoc.css                     | Asciidoc style
 |    docgen.py                        | Python script to build files in "autogen/" directory (see below)
-|    weechat-curses.1                 | Weechat man page
 |    XX/                              | Documentation for language XX (languages: en, fr, de, it, ...)
+|       weechat.1.XX.txt              | Man page
 |       weechat_quickstart.XX.txt     | Quickstart guide
 |       weechat_user.XX.txt           | User's guide
 |       weechat_faq.XX.txt            | FAQ
@@ -307,10 +299,11 @@ Documentation files:
 |       weechat_scripting.XX.txt      | Scripting guide
 |       weechat_tester.XX.txt         | Tester's guide
 |       weechat_dev.XX.txt            | Developer's guide (this document)
-|       weechat_relay_protocol.en.txt | Relay protocol
+|       weechat_relay_protocol.XX.txt | Relay protocol
+|       cmdline_options.XX.txt        | Command-line options (file included in man page and user's guide)
 |       autogen/                      | Files auto-built with script docgen.py (do *NEVER* update manually!)
-|          user/                      | Files auto-built for user's guide
-|          plugin_api/                | Files auto-built for plugin API
+|          user/                      | Files auto-built for user's guide (do *NEVER* update manually!)
+|          plugin_api/                | Files auto-built for plugin API (do *NEVER* update manually!)
 |========================================
 
 Translations for WeeChat and plugins are done with gettext, files are in 'po/' directory:
@@ -779,6 +772,7 @@ All combinations are summarized in this table:
 | @h(19) + "b" + "#"                   | @h(19)`b#`             | input bar   | Move cursor char char (used only in item "input_text")
 | @h(19) + "b" + "i"                   | @h(19)`bi`             | bars        | Start item
 | @h(19) + "b" + "l" (lower L)         | @h(19)`bl`             | bars        | Start line item
+| @h(19) + "E"                         | @h(19)`E`              | chat + bars | Emphasize text _(new in version 0.4.2)_
 | @h(19) + @h(1C)                      | @h(19)@h(1C)           | chat + bars | Reset color (keep attributes)
 | @h(1A) + ATTR                        | @h(1A)`*`              | chat + bars | Set attribute
 | @h(1B) + ATTR                        | @h(1B)`*`              | chat + bars | Remove attribute
@@ -830,6 +824,10 @@ Color codes using options (see 't_gui_color_enum', in file 'src/gui/gui-color.h'
 | 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)_
+| 40   | weechat.color.chat_nick_prefix _(new in version 0.4.1)_
+| 41   | weechat.color.chat_nick_suffix _(new in version 0.4.1)_
+| 42   | weechat.color.emphasis _(new in version 0.4.2)_
+| 43   | weechat.color.chat_day_change _(new in version 0.4.2)_
 |========================================
 
 WeeChat colors are:
@@ -837,23 +835,23 @@ WeeChat colors are:
 [width="40%",cols="^1m,6",options="header"]
 |========================================
 | Code | Color
-| 00   | default (terminal foreground/background)
-| 01   | black
-| 02   | dark gray
-| 03   | dark red
-| 04   | light red
-| 05   | dark green
-| 06   | light green
-| 07   | brown
-| 08   | yellow
-| 09   | dark blue
-| 10   | light blue
-| 11   | dark magenta
-| 12   | light magenta
-| 13   | dark cyan
-| 14   | light cyan
-| 15   | gray
-| 16   | white
+| 00   | Default (terminal foreground/background)
+| 01   | Black
+| 02   | Dark gray
+| 03   | Dark red
+| 04   | Light red
+| 05   | Dark green
+| 06   | Light green
+| 07   | Brown
+| 08   | Yellow
+| 09   | Dark blue
+| 10   | Light blue
+| 11   | Dark magenta
+| 12   | Light magenta
+| 13   | Dark cyan
+| 14   | Light cyan
+| 15   | Gray
+| 16   | White
 |========================================
 
 Examples of color codes:
@@ -861,13 +859,13 @@ Examples of color codes:
 [width="50%",cols="1,2",options="header"]
 |========================================
 | Code                     | Description
-| @h(19)`01`               | color of option "01" (chat text)
-| @h(19)`*08,03`           | yellow on red
-| @h(19)`*@00214`          | orange (extended color 214)
-| @h(19)`*@*_00214,@00017` | bold underlined orange (214) on dark blue (17)
-| @h(1A)`_`                | set underline
-| @h(1B)`_`                | remove underline
-| @h(1C)`bD`               | reset attributes and color
+| @h(19)`01`               | Color of option "01" (chat text)
+| @h(19)`*08,03`           | Yellow on red
+| @h(19)`*@00214`          | Orange (extended color 214)
+| @h(19)`*@*_00214,@00017` | Bold underlined orange (214) on dark blue (17)
+| @h(1A)`_`                | Set underline
+| @h(1B)`_`                | Remove underline
+| @h(1C)`bD`               | Reset attributes and color
 |========================================
 
 [[plugin_internals]]

doc/en/weechat_faq.en.txt

@@ -26,43 +26,24 @@ apply to WeeChat!).
 Why choose WeeChat? X-Chat and Irssi are so good...
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Because WeeChat is very light and has new features.
-Some features (version ≥ 0.3.x):
+Because WeeChat is very light and brings innovating features.
 
-* multi-protocol support via plugins (IRC, Jabber)
-* many remote GUI's in addition to Curses (coming soon)
-* 256 colors support
-* available in many languages
-* extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl)
-* buffers with free content
-* display filtering by tags and regular expressions
-* horizontal and vertical window split
-* customizable and extensible bars
-* native nicklist
-* list of buffers (script buffers.pl)
-* IRC proxy
-* redirection of IRC commands
-* incremental text search in buffers, jump to highlights
-* FIFO pipe for remote control
-* aspell support
-* double charset (encoding/decoding)
-* developed from scratch (not based on any other client)
-* multi-platform
-* 100% GPL and free
-
-More info on this page: http://www.weechat.org/features
+More info on this page: http://weechat.org/about/features
 
 [[compilation_install]]
 Compilation / install
 ---------------------
 
 [[gui]]
-I heard about many GUI's for WeeChat. How can I compile/use them?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+I heard about many GUIs for WeeChat. How can I compile/use them?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Today only a Curses GUI is available.
+Some remote GUIs are available:
 
-Other GUI's will be available as remote clients (currently under development).
+* http://weechat.org/download/devel[QWeeChat] (Qt)
+* https://github.com/ubergeek42/weechat-android[weechat-android] (Android)
+* https://github.com/the-kenny/weechat.el[weechat.el] (Emacs)
+* https://github.com/eirikb/weecloud[weecloud] (Web)
 
 [[compile_git]]
 I can't compile WeeChat after cloning git repository, why?
@@ -98,8 +79,8 @@ I don't see some chars with accents, what can I do?
 
 It's common issue, please read carefully and check *ALL* solutions below:
 
-* check that weechat-curses is linked to libncursesw (warning: needed on most
-  distributions but not all): `ldd /path/to/weechat-curses`
+* check that weechat is linked to libncursesw (warning: needed on most
+  distributions but not all): `ldd /path/to/weechat`
 * check that the "Charset" plugin is loaded with `/plugin` command (if it is
   not, then you probably need the "weechat-plugins" package)
 * check the output of command `/charset` (on core buffer). You should see
@@ -112,6 +93,8 @@ It's common issue, please read carefully and check *ALL* solutions below:
    rxvt-unicode)
 ** if you are using screen, check that it is run with UTF-8 mode
    ("`defutf8 on`" in ~/.screenrc or `screen -U` to run screen)
+* check that option 'weechat.look.eat_newline_glitch' is off (this option may
+  cause display bugs)
 
 [NOTE]
 UTF-8 locale is recommended for WeeChat. If you're using ISO or other
@@ -284,23 +267,7 @@ URL selection):
 This option may cause display bugs. If you experience such problem, you must
 turn off this option.
 
-Other solution is to use one of following scripts:
-
-urlserver.py::
-    shorten URLs with HTTP server in script
-
-urlbar.py::
-    display URLs in a bar
-
-urlgrab.py::
-    logs URLs and open them in browser
-
-url_shorten.rb::
-tinyurl.py::
-shortenurl.py::
-    shorten long URLs
-
-List of scripts about URLs: http://www.weechat.org/scripts/stable/tag/url
+Other solution is to use a script: http://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?
@@ -317,7 +284,7 @@ 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]]
+[[use_256_colors]]
 How can I use 256 colors in WeeChat?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -534,6 +501,22 @@ Setup server port, SSL, dhkey_size, then connect:
 /connect freenode
 ----------------------------------------
 
+[[irc_oauth]]
+How to connect to a server that requires "oauth"?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Some servers like 'twitch' require oauth to connect.
+
+The oauth is simply a password with the value "oauth:XXXX".
+
+You can create such server and connect with following commands (replace name
+and address by appropriate values):
+
+----------------------------------------
+/server add name irc.server.org -password="oauth:XXXX"
+/connect name
+----------------------------------------
+
 [[irc_sasl]]
 How can I be identified before joining channels?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -595,7 +578,19 @@ For help: `/help filter` and `/help irc.look.smart_filter`
 How can I filter some messages displayed when I join an IRC channel?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Some tags you can use to filter messages:
+With WeeChat ≥ 0.4.1, you can disable some messages with option
+'irc.look.display_join_message'.
+
+For example, to disable names (which is IRC message '366'):
+
+----------------------------------------
+/set irc.look.display_join_message "329,332,333"
+----------------------------------------
+
+[NOTE]
+For help: `/help irc.look.display_join_message`
+
+Another solution is to filter messages on tag:
 
 * 'irc_366': names on channel
 * 'irc_332,irc_333': channel topic/date
@@ -682,7 +677,7 @@ For 'launcher.pl', you have to setup command:
 /set plugins.var.perl.launcher.signal.weechat_highlight "/path/to/command arguments"
 ----------------------------------------
 
-Other scripts on this subject: http://www.weechat.org/scripts/stable/tag/notify/
+Other scripts on this subject: http://weechat.org/scripts/stable/tag/notify/
 
 [[irc_target_buffer]]
 How can I change target buffer for commands on merged buffers (like buffer with servers)?
@@ -759,7 +754,7 @@ There are 3 ways:
   * request a new feature: https://savannah.nongnu.org/task/?group=weechat
   * send a patch: https://savannah.nongnu.org/patch/?group=weechat
 . you can mail developers, look at support page for developer's mails:
-  http://www.weechat.org/about
+  http://weechat.org/dev/support
   (you can subscribe and send to "support" mailing list)
 
 [[gdb_error_threads]]
@@ -769,7 +764,7 @@ When I run WeeChat under gdb, there is error about threads, what can I do?
 When you run WeeChat under gdb, you may have this error:
 
 ----------------------------------------
-$ gdb /path/to/weechat-curses
+$ gdb /path/to/weechat
 (gdb) run
 [Thread debugging using libthread_db enabled]
 Cannot find new threads: generic error
@@ -779,7 +774,7 @@ To fix that, you can run gdb with this command (replace path to libpthread and
 WeeChat with paths on your system):
 
 ----------------------------------------
-$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
+$ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 (gdb) run
 ----------------------------------------
 
@@ -787,7 +782,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses
 What is the list of supported platforms for WeeChat? Will it be ported to other operating systems?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The full list is on this page: http://www.weechat.org/download
+The full list is on this page: http://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.
@@ -799,11 +794,11 @@ I want to help WeeChat developers. What can I do?
 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
+http://weechat.org/dev/support
 
 [[donate]]
 Can I give money or other things to WeeChat developers?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can give us money to help development.
-Details on http://www.weechat.org/donate
+Details on http://weechat.org/about/donate

doc/en/weechat_quickstart.en.txt

@@ -10,17 +10,35 @@ Start WeeChat
 A recommended terminal emulator for X (but not mandatory) is rxvt-unicode
 (it has good UTF-8 support, and no problem with default keyboard bindings).
 
-Run "weechat-curses" from your shell.
+Run from your shell:
+
+----------------------------------------
+$ weechat
+----------------------------------------
 
 
 [[help_options]]
 Online help / options
 ---------------------
 
-WeeChat has help for all commands, just issue /help
-To get help on a specific command, issue `/help command`
+WeeChat has help for all commands, just issue:
+
+----------------------------------------
+/help
+----------------------------------------
+
+To get help on a specific command, issue:
+
+----------------------------------------
+/help command
+----------------------------------------
+
+To set options, issue:
+
+----------------------------------------
+/set config.section.option value
+----------------------------------------
 
-To set options, use `/set config.section.option value`
 (where `config` is configuration name (`weechat` for core, or a plugin
 name), `section` the section of this configuration and `option` the
 option name).
@@ -32,17 +50,29 @@ You can use `/set` option with partial name and wildcard "*" at the beginning
 or end to display all options containing letters.
 For example:
 
-`/set`::
-    display all options (WeeChat and plugins)
+* display all options (WeeChat and plugins):
 
-`/set weechat.*`::
-    display WeeChat options
+----------------------------------------
+/set
+----------------------------------------
 
-`/set irc.*`::
-    display IRC plugin options
+* display WeeChat options:
+
+----------------------------------------
+/set weechat.*
+----------------------------------------
+
+* display IRC plugin options:
+
+----------------------------------------
+/set irc.*
+----------------------------------------
 
 You can display help for an option with `/help`, for example:
-`/help weechat.look.highlight`.
+
+----------------------------------------
+/help weechat.look.highlight
+----------------------------------------
 
 All settings are saved when WeeChat ends (or with `/save` command to force
 a write of the options).
@@ -71,9 +101,15 @@ Create an IRC server
 
 You can add an IRC server with `/server` command, for example:
 
-  /server add oftc irc.oftc.net/6667
+----------------------------------------
+/server add oftc irc.oftc.net/6667
+----------------------------------------
 
-As usual, help is available if you're lost: `/help server`
+As usual, help is available if you're lost:
+
+----------------------------------------
+/help server
+----------------------------------------
 
 
 [[irc_server_options]]
@@ -90,52 +126,70 @@ 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 "mynick,mynick2,mynick3,mynick4,mynick5"
+----------------------------------------
+/set irc.server.oftc.nicks "mynick,mynick2,mynick3,mynick4,mynick5"
+----------------------------------------
 
 To set username and realname:
 
-  /set irc.server.oftc.username "My user name"
-  /set irc.server.oftc.realname "My real name"
+----------------------------------------
+/set irc.server.oftc.username "My user name"
+/set irc.server.oftc.realname "My real name"
+----------------------------------------
 
 To enable auto-connect to server at startup:
 
-  /set irc.server.oftc.autoconnect on
+----------------------------------------
+/set irc.server.oftc.autoconnect on
+----------------------------------------
 
 If SASL is available on server, you can use it for authentication (you will be
 identified before you join channels):
 
-  /set irc.server_default.sasl_mechanism dh-blowfish
-  /set irc.server.oftc.sasl_username "mynick"
-  /set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
+/set irc.server_default.sasl_mechanism dh-blowfish
+/set irc.server.oftc.sasl_username "mynick"
+/set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
 
 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"
+----------------------------------------
+/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:
 
-  /set irc.server.oftc.autojoin "#channel1,#channel2"
+----------------------------------------
+/set irc.server.oftc.autojoin "#channel1,#channel2"
+----------------------------------------
 
 To remove a value of a server option, and use the default value instead,
 for example to use default nicks (irc.server_default.nicks):
 
-  /set irc.server.oftc.nicks null
+----------------------------------------
+/set irc.server.oftc.nicks null
+----------------------------------------
 
 Other options: you can setup other options with following command ("xxx" is
 option name):
 
-  /set irc.server.oftc.xxx value
+----------------------------------------
+/set irc.server.oftc.xxx value
+----------------------------------------
 
 
 [[connect_to_irc_server]]
 Connect to IRC server and auto-join channels
 --------------------------------------------
 
-  /connect oftc
+----------------------------------------
+/connect oftc
+----------------------------------------
 
 [NOTE]
 This command can be used to create and connect to a new server without using
@@ -148,21 +202,32 @@ between 'core' buffer and server buffers, you can use ctrl-X.
 It is possible to disable auto merge of server buffers to have independent
 server buffers:
 
-  /set irc.look.server_buffer independent
+----------------------------------------
+/set irc.look.server_buffer independent
+----------------------------------------
 
 
 [[join_part_irc_channels]]
 Join/part IRC channels
 ----------------------
 
-`/join #channel`::
-    join a channel
+Join a channel:
 
-`/part [quit message]`::
-    part a channel (keeping buffer open)
+----------------------------------------
+/join #channel
+----------------------------------------
 
-`/close`::
-    close server or channel buffer (`/close` is an alias for `/buffer close`)
+Part a channel (keeping buffer open):
+
+----------------------------------------
+/part [quit message]
+----------------------------------------
+
+Close server or channel buffer (`/close` is an alias for `/buffer close`):
+
+----------------------------------------
+/close
+----------------------------------------
 
 
 [[buffer_window]]
@@ -178,15 +243,19 @@ with many buffers at same time.
 
 Commands to manage buffers and windows:
 
-  /buffer
-  /window
+----------------------------------------
+/buffer
+/window
+----------------------------------------
 
 (I'll not repeat here that you can get help with /help on these commands)
 
 For example, to vertically split your screen into a small window (1/3 width),
 and a large window (2/3), use command:
 
-  /window splitv 33
+----------------------------------------
+/window splitv 33
+----------------------------------------
 
 
 [[key_bindings]]
@@ -210,15 +279,21 @@ A useful key is meta-k (alt-k) to find key codes.
 
 For example, to bind meta-y (alt-y) to command `/buffer close`:
 
-  /key bind (press meta-k) (press meta-y) /buffer close
+----------------------------------------
+/key bind (press meta-k) (press meta-y) /buffer close
+----------------------------------------
 
 You'll have a command line like:
 
-  /key bind meta-y /buffer close
+----------------------------------------
+/key bind meta-y /buffer close
+----------------------------------------
 
 To remove key:
 
-  /key unbind meta-y
+----------------------------------------
+/key unbind meta-y
+----------------------------------------
 
 
 [[plugins_scripts]]
@@ -231,7 +306,7 @@ Plugins are automatically loaded when found (please look at the WeeChat
 documentation to load/unload plugins or scripts).
 
 Many external scripts (from contributors) are available for WeeChat:
-http://www.weechat.org/scripts
+http://weechat.org/scripts
 
 You can manage scripts in WeeChat with command `/script` (see `/help script`
 for more info).
@@ -242,6 +317,6 @@ More documentation
 ------------------
 
 You can now use WeeChat and read FAQ/documentation for any other questions:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 Enjoy using WeeChat!

doc/en/weechat_scripting.en.txt

@@ -6,7 +6,7 @@ Sébastien Helleu <flashcode@flashtux.org>
 This manual documents WeeChat chat client, it is part of WeeChat.
 
 Latest version of this document can be found on this page:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 
 [[introduction]]
@@ -56,6 +56,15 @@ Ruby
 
 * You have to define 'weechat_init' and call 'register' inside
 * Functions are called with `Weechat.xxx(arg1, arg2, ...)`
+* Due to a limitation of Ruby (15 arguments max by function), the function
+  `Weechat.config_new_option` receives the callbacks in an array of 6 strings
+  (3 callbacks + 3 data strings), so a call to this function looks like:
+
+[source,ruby]
+----------------------------------------
+Weechat.config_new_option(config, section, "name", "string", "description of option", "", 0, 0,
+                          "value", "value", 0, ["check_cb", "", "change_cb", "", "delete_cb", ""])
+----------------------------------------
 
 Lua
 ^^^
@@ -163,7 +172,18 @@ weechat::print "" "Hello, from tcl script!"
 Load script
 ~~~~~~~~~~~
 
-You have to use command, depending on language:
+It is recommended to use the "script" plugin to load scripts, for example:
+
+----------------------------------------
+/script load script.py
+/script load script.pl
+/script load script.rb
+/script load script.lua
+/script load script.tcl
+/script load script.scm
+----------------------------------------
+
+Each language has also its own command:
 
 ----------------------------------------
 /python load python/script.py
@@ -184,6 +204,10 @@ $ cd ~/.weechat/python/autoload
 $ ln -s ../script.py
 ----------------------------------------
 
+[NOTE]
+When installing a script with command `/script install` the link in 'autoload'
+directory is automatically created.
+
 [[differences_with_c_api]]
 Differences with C API
 ----------------------
@@ -200,18 +224,22 @@ a 'script' is a text file loaded with a plugin like 'python' with command
 When your script 'test.py' calls a WeeChat API function, path is like that:
 
 ........................................
-       (script API)                           (C API)
-            \/                                   \/
-test.py  ------->  python plugin (python.so)  ------->  WeeChat core
+               ┌──────────────────────┐        ╔══════════════════╗
+               │     python plugin    │        ║  WeeChat "core"  ║
+               ├────────────┬─────────┤        ╟─────────┐        ║
+test.py ─────► │ script API │  C API  │ ─────► ║  C API  │        ║
+               └────────────┴─────────┘        ╚═════════╧════════╝
 ........................................
 
 When WeeChat calls a callback in your script 'test.py', it's reverse of
 previous path:
 
 ........................................
-              (C API)                            (script API)
-                 \/                                   \/
-WeeChat core  ------->  python plugin (python.so)  ------->  test.py
+╔══════════════════╗        ┌──────────────────────┐
+║  WeeChat "core"  ║        │     python plugin    │
+║        ┌─────────╢        ├─────────┬────────────┤
+║        │  C API  ║ ─────► │  C API  │ script API │ ─────► test.py
+╚════════╧═════════╝        └─────────┴────────────┘
 ........................................
 
 [[pointers]]
@@ -251,16 +279,78 @@ Almost all WeeChat callbacks must return WEECHAT_RC_OK or WEECHAT_RC_ERROR
 C callbacks are using a "data" argument, which is a pointer. In script API,
 this "data" is a string with a any value (it's not a pointer).
 
-For example:
+Example of callback, for each language:
+
+* python:
 
 [source,python]
 ----------------------------------------
-weechat.hook_timer(1000, 0, 1, "my_timer_cb", "my data")
-
-def my_timer_cb(data, remaining_calls):
-    # this will display: "my data"
-    weechat.prnt("", data)
+def timer_cb(data, remaining_calls):
+    weechat.prnt("", "timer! data=%s" % data)
     return weechat.WEECHAT_RC_OK
+
+weechat.hook_timer(1000, 0, 1, "timer_cb", "test")
+----------------------------------------
+
+* perl:
+
+[source,perl]
+----------------------------------------
+sub timer_cb {
+    my ($data, $remaining_calls) = @_;
+    weechat::print("", "timer! data=$data");
+    return weechat::WEECHAT_RC_OK;
+}
+
+weechat::hook_timer(1000, 0, 1, "timer_cb", "test");
+----------------------------------------
+
+* ruby:
+
+[source,ruby]
+----------------------------------------
+def timer_cb(data, remaining_calls)
+  Weechat.print("", "timer! data=#{data}");
+  return Weechat::WEECHAT_RC_OK
+end
+
+Weechat.hook_timer(1000, 0, 1, "timer_cb", "test");
+----------------------------------------
+
+* lua:
+
+[source,lua]
+----------------------------------------
+function timer_cb(data, remaining_calls)
+    weechat.print("", "timer! data="..data)
+    return weechat.WEECHAT_RC_OK
+end
+
+weechat.hook_timer(1000, 0, 1, "timer_cb", "test")
+----------------------------------------
+
+* tcl:
+
+[source,tcl]
+----------------------------------------
+proc timer_cb { data remaining_calls } {
+    weechat::print {} "timer! data=$data"
+    return $::weechat::WEECHAT_RC_OK
+}
+
+weechat::hook_timer 1000 0 1 timer_cb test
+----------------------------------------
+
+* guile (scheme):
+
+[source,lisp]
+----------------------------------------
+(define (timer_cb data remaining_calls)
+  (weechat:print "" (string-append "timer! data=" data))
+  weechat:WEECHAT_RC_OK
+)
+
+(weechat:hook_timer 1000 0 1 "timer_cb" "test")
 ----------------------------------------
 
 [[script_api]]
@@ -287,7 +377,7 @@ List of functions in script API:
   charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
   string_match, string_has_highlight, string_has_highlight_regex,
   string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer
+  string_input_for_buffer, string_eval_expression
 | directories         |
   mkdir_home, mkdir, mkdir_parents
 | sorted lists        |
@@ -348,9 +438,10 @@ List of functions in script API:
   infolist_time, infolist_free
 | hdata               |
   hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
+  hdata_get_var_array_size, hdata_get_var_array_size_string,
   hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_char, hdata_integer, hdata_long, hdata_string, hdata_pointer,
-  hdata_time, hdata_hashtable, hdata_get_string
+  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
+  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
 | upgrade             |
   upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
 |========================================
@@ -457,7 +548,7 @@ Examples:
 
 [source,python]
 ----------------------------------------
-# execute command "/help" on core buffer
+# execute command "/help" on current buffer (result is on core buffer)
 weechat.command("", "/help")
 
 # send "hello" to #weechat IRC channel (users on channel will see message)
@@ -634,21 +725,24 @@ in callback (standard output of process):
 
 [source,python]
 ----------------------------------------
-# Display versions of Linux kernels.
-kernel_txt = ""
+# Display current stable version of WeeChat.
+weechat_version = ""
 
-def kernel_process_cb(data, command, rc, out, err):
-    global kernel_txt
+def weechat_process_cb(data, command, rc, out, err):
+    global weechat_version
     if out != "":
-        kernel_txt += out
+        weechat_version += out
     if int(rc) >= 0:
-        weechat.prnt("", kernel_txt)
+        weechat.prnt("", "Current WeeChat stable is: %s" % weechat_version)
     return weechat.WEECHAT_RC_OK
 
-weechat.hook_process("url:http://www.kernel.org/kdist/finger_banner",
-                     30 * 1000, "kernel_process_cb", "")
+weechat.hook_process("url:http://weechat.org/dev/info/stable/",
+                     30 * 1000, "weechat_process_cb", "")
 ----------------------------------------
 
+[TIP]
+All infos available about WeeChat are on page http://weechat.org/dev/info
+
 Example of URL transfer with an option: download latest WeeChat development
 package in file '/tmp/weechat-devel.tar.gz':
 

doc/en/weechat_tester.en.txt

@@ -36,7 +36,9 @@ info, to know exactly where is problem in WeeChat.
 
 If you're using the 'bash' shell, add following line to your `~/.bashrc`:
 
-  ulimit -c unlimited
+----------------------------------------
+ulimit -c unlimited
+----------------------------------------
 
 
 [[download]]
@@ -57,48 +59,48 @@ Get and build sources
 
 First create a directory, for example 'weechat-git':
 
----------------------
+----------------------------------------
 $ mkdir ~/weechat-git
 $ cd ~/weechat-git
----------------------
+----------------------------------------
 
 If you have git installed, you can just clone the git repository (recommended
 way):
 
---------------------------------------------
+----------------------------------------
 $ git clone git://git.sv.gnu.org/weechat.git
 $ cd weechat
---------------------------------------------
+----------------------------------------
 
 NOTE: Later, you can run "`git pull`" in this directory, to get deltas with
 the latest updates.
 
 Otherwise you can download and unpack 'devel' package:
 
------------------------------------------------------------------
+----------------------------------------
 $ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2
 $ tar xvjf weechat-devel.tar.bz2
 $ cd weechat-devel
------------------------------------------------------------------
+----------------------------------------
 
 To build sources, cmake is recommended:
 
---------------------------------------------------------------
+----------------------------------------
 $ mkdir build
 $ cd build
-$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DPREFIX=$HOME/weechat-git -DWEECHAT_HOME=~/.weechat-dev -DCMAKE_BUILD_TYPE=Debug
 $ make
 $ make install
---------------------------------------------------------------
+----------------------------------------
 
 If you don't have cmake, it's still possible to use autotools:
 
-----------------------------------------------------------
+----------------------------------------
 $ ./autogen.sh
-$ ./configure --prefix=$HOME/weechat-git
+$ ./configure --prefix=$HOME/weechat-git WEECHAT_HOME=~/.weechat-dev
 $ make
 $ make install
-----------------------------------------------------------
+----------------------------------------
 
 [[install_binary_package]]
 Install binary package
@@ -107,7 +109,7 @@ Install binary package
 According to your Linux distribution:
 
 * Debian: http://debian.flashtux.org/
-* Gentoo: http://www.weechat.org/download
+* Gentoo: http://weechat.org/download
 * ArchLinux: PKGBUILD from http://aur.archlinux.org/
 * other: we don't know! Eheh.
 
@@ -121,7 +123,9 @@ version), with option `--dir`.
 
 Command is:
 
-  ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev
+----------------------------------------
+$ ~/weechat-git/bin/weechat
+----------------------------------------
 
 If you're still awake you should see the familiar interface and brag about
 having the newest possible version of WeeChat. ;)

doc/en/weechat_user.en.txt

@@ -6,7 +6,7 @@ Sébastien Helleu <flashcode@flashtux.org>
 This manual documents WeeChat chat client, it is part of WeeChat.
 
 Latest version of this document can be found on this page:
-http://www.weechat.org/doc
+http://weechat.org/doc
 
 
 [[introduction]]
@@ -26,15 +26,15 @@ Main features are:
 * multi-servers connection (with SSL, IPv6, proxy)
 * small, fast and light
 * customizable and extensible with plugins and scripts
-* compliant with IRC RFCs http://www.ietf.org/rfc/rfc1459.txt[1459],
-  http://www.ietf.org/rfc/rfc2810.txt[2810],
-  http://www.ietf.org/rfc/rfc2811.txt[2811],
-  http://www.ietf.org/rfc/rfc2812.txt[2812] and
-  http://www.ietf.org/rfc/rfc2813.txt[2813]
+* compliant with IRC RFCs http://tools.ietf.org/html/rfc1459[1459],
+  http://tools.ietf.org/html/rfc2810[2810],
+  http://tools.ietf.org/html/rfc2811[2811],
+  http://tools.ietf.org/html/rfc2812[2812] and
+  http://tools.ietf.org/html/rfc2813[2813]
 * multi-platform (GNU/Linux, *BSD, MacOS X, Windows and other)
 * 100% GPL, free software
 
-WeeChat homepage is here: http://www.weechat.org/
+WeeChat homepage is here: http://weechat.org/
 
 [[pre-requisites]]
 Pre-requisites
@@ -86,24 +86,26 @@ compile WeeChat.
 
 [width="100%",cols="5,^3,^3,13",options="header"]
 |========================================
-| Package ^(1)^          | Version     | Required | Feature
-| 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)
-| ca-certificates        |             |          | certificates for SSL connections
-| libaspell-dev          |             |          | aspell plugin
-| python-dev             | ≥ 2.5 ^(3)^ |          | python plugin
-| libperl-dev            |             |          | perl 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
-| asciidoc               | ≥ 8.5.0     |          | build documentation (HTML files)
-| source-highlight       |             |          | syntax highlight for sources in HTML documentation
+| Package ^(1)^                   | Version     | Required | Feature
+| 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*    | Secured data, IRC SASL authentication (DH-BLOWFISH/DH-AES), 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)
+| ca-certificates                 |             |          | Certificates for SSL connections
+| libaspell-dev or libenchant-dev |             |          | Aspell plugin
+| python-dev                      | ≥ 2.5 ^(3)^ |          | Python plugin
+| libperl-dev                     |             |          | Perl plugin
+| ruby1.9.1-dev                   | ≥ 1.8       |          | Ruby plugin
+| liblua5.1-0-dev                 |             |          | Lua plugin
+| tcl-dev                         | ≥ 8.5       |          | Tcl plugin
+| guile-2.0-dev                   | ≥ 2.0       |          | Guile (scheme) plugin
+| asciidoc                        | ≥ 8.5.0     |          | Build man page and documentation
+| source-highlight                |             |          | Syntax highlight for sources in documentation
+| xsltproc,
+  docbook-xml, docbook-xsl        |             |          | Build of man page
 |========================================
 
 [NOTE]
@@ -138,6 +140,121 @@ $ make
 $ make install
 ----------------------------------------
 
+Options can be used for cmake, with format: "-DOPTION=VALUE".
+
+List of commonly used options:
+
+[width="100%",cols="2m,2,5m,12",options="header"]
+|========================================
+| Option | Values | Default value | Description
+
+| CMAKE_BUILD_TYPE | `Debug`, `Release`, `RelWithDebInfo`, `MinSizeRel` | |
+  The type of build: `Debug` (or `RelWithDebInfo`) is recommended if you are
+  running development version of WeeChat.
+
+| PREFIX | directory | /usr/local |
+  The directory where WeeChat will be installed.
+
+| WEECHAT_HOME | directory | ~/.weechat |
+  The default home directory when running WeeChat.
+
+| CA_FILE | file | /etc/ssl/certs/ca-certificates.crt |
+  File containing the certificate authorities.
+  This is the default value of option
+  <<option_weechat.network.gnutls_ca_file,weechat.network.gnutls_ca_file>>.
+
+| ENABLE_ALIAS | `ON`, `OFF` | ON |
+  Compile <<alias_plugin,Alias plugin>>.
+
+| ENABLE_ASPELL | `ON`, `OFF` | ON |
+  Compile <<aspell_plugin,Aspell plugin>>.
+
+| ENABLE_CHARSET | `ON`, `OFF` | ON |
+  Compile <<charset_plugin,Charset plugin>>.
+
+| ENABLE_MAN | `ON`, `OFF` | OFF |
+  Compile man page.
+
+| ENABLE_DOC | `ON`, `OFF` | OFF |
+  Compile documentation (it takes a long time, recommended only if you build
+  a binary package embedding documentation or if you can't browse documentation
+  online).
+
+| ENABLE_ENCHANT | `ON`, `OFF` | OFF |
+  Compile <<aspell_plugin,Aspell plugin>> with Enchant.
+
+| ENABLE_FIFO | `ON`, `OFF` | ON |
+  Compile <<fifo_plugin,Fifo plugin>>.
+
+| ENABLE_GNUTLS | `ON`, `OFF` | ON |
+  Enable Gnutls (for SSL).
+
+| ENABLE_GUILE | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Guile plugin>> (Scheme).
+
+| ENABLE_IRC | `ON`, `OFF` | ON |
+  Compile <<irc_plugin,IRC plugin>>.
+
+| ENABLE_LARGEFILE | `ON`, `OFF` | ON |
+  Support of large files.
+
+| ENABLE_LOGGER | `ON`, `OFF` | ON |
+  Compile <<logger_plugin,Logger plugin>>.
+
+| ENABLE_LUA | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Lua plugin>>.
+
+| ENABLE_NCURSES | `ON`, `OFF` | ON |
+  Compile Ncurses interface.
+
+| ENABLE_NLS | `ON`, `OFF` | ON |
+  Enable NLS (translations).
+
+| ENABLE_PERL | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Perl plugin>>.
+
+| ENABLE_PYTHON | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Python plugin>>.
+
+| ENABLE_PYTHON3 | `ON`, `OFF` | OFF |
+  Compile <<scripts_plugins,Python plugin>> using Python 3 (*NOT* recommended
+  because many scripts are not compatible with Python 3).
+
+| ENABLE_RELAY | `ON`, `OFF` | ON |
+  Compile <<relay_plugin,Relay plugin>>.
+
+| ENABLE_RMODIFIER | `ON`, `OFF` | ON |
+  Compile <<rmodifier_plugin,Rmodifier plugin>>.
+
+| ENABLE_RUBY | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Ruby plugin>>.
+
+| ENABLE_SCRIPT | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Script plugin>>.
+
+| ENABLE_SCRIPTS | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,script plugins>> (Python, Perl, Ruby, Lua, Tcl,
+  Guile).
+
+| ENABLE_TCL | `ON`, `OFF` | ON |
+  Compile <<scripts_plugins,Tcl plugin>>.
+
+| ENABLE_XFER | `ON`, `OFF` | ON |
+  Compile <<xfer_plugin,Xfer plugin>>.
+|========================================
+
+The other options can be displayed with this command:
+
+----------------------------------------
+$ cmake -LA
+----------------------------------------
+
+Or with Curses interface:
+
+----------------------------------------
+$ ccmake ..
+----------------------------------------
+
 [[compile_with_autotools]]
 Compile with autotools
 ^^^^^^^^^^^^^^^^^^^^^^
@@ -165,6 +282,13 @@ $ make
 $ make install
 ----------------------------------------
 
+Options can be used for 'configure' script, they can be displayed with this
+command:
+
+----------------------------------------
+$ ./configure --help
+----------------------------------------
+
 [[git_sources]]
 Git sources
 ~~~~~~~~~~~
@@ -241,16 +365,16 @@ When WeeChat crashes, your system will create a file 'core' or 'core.12345'
 This file is created in directory where you have run WeeChat (this is *not*
 directory where WeeChat is installed!).
 
-For example if 'weechat-curses' is installed in '/usr/bin/' and 'core' file is
+For example if 'weechat' is installed in '/usr/bin/' and 'core' file is
 in '/home/xxx/', then run gdb with this command:
 
 ----------------------------------------
-gdb /usr/bin/weechat-curses /home/xxx/core
+gdb /usr/bin/weechat /home/xxx/core
 ----------------------------------------
 
 [NOTE]
 If you installed binary package 'weechat-dbg' (for example under Debian), then
-you can use this path for WeeChat binary: '/usr/lib/debug/usr/bin/weechat-curses'
+you can use this path for WeeChat binary: '/usr/lib/debug/usr/bin/weechat'
 
 Then under gdb, use command `bt full` to display backtrace.
 You will see something like that:
@@ -291,10 +415,10 @@ Debug a running WeeChat
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 To debug a running WeeChat (for example if WeeChat seems blocked), you can use
-gdb with process id (replace '12345' with PID of weechat-curses process):
+gdb with process id (replace '12345' with PID of weechat process):
 
 ----------------------------------------
-gdb /usr/bin/weechat-curses 12345
+gdb /usr/bin/weechat 12345
 ----------------------------------------
 
 Then like for a crash, use command `bt full`:
@@ -313,45 +437,12 @@ Running WeeChat
 
 Command line arguments:
 
--a, --no-connect::
-    Disable auto-connect to servers when WeeChat is starting.
-
--c, --colors::
-    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).
-
--h, --help::
-    Display help.
-
--k, --keys::
-    Display WeeChat default keys.
-
--l, --license::
-    Display WeeChat license.
-
--p, --no-plugin::
-    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.
-
--v, --version::
-    Display WeeChat version.
-
-plugin:option::
-    Option for plugin (see doc for each plugin).
+include::cmdline_options.en.txt[]
 
 To start WeeChat, issue this command:
 
 ----------------------------------------
-$ weechat-curses
+$ weechat
 ----------------------------------------
 
 When you run WeeChat for the first time, a default configuration file is
@@ -413,18 +504,18 @@ Bar 'status' has following default items:
 [width="100%",cols="^3,^3l,10",options="header"]
 |========================================
 | Item                  | Example               | Description
-| time                  | [12:55]               | time
-| 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                 | current buffer name
+| time                  | [12:55]               | Time
+| 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                 | 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)
-| completion            | abc(2) def(5)         | list of words for completion, with number of possible completions for each word
-| scroll                | -MORE(50)-            | scroll indicator, with number of lines below last line displayed
+| 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)
+| completion            | abc(2) def(5)         | List of words for completion, with number of possible completions for each word
+| scroll                | -MORE(50)-            | Scroll indicator, with number of lines below last line displayed
 |========================================
 
 Bar 'input' has following default items:
@@ -432,11 +523,11 @@ 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 peter!                                  | input text
+| 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 | [Search (~ str,msg)]                       | Search indicator ("`~`": case insensitive, "`==`": case sensitive, "`str`": search string, "`regex`": search regular expression, "`msg`": search in messages, "`pre`": search in prefixes, "`pre\|msg`": search in prefixes and messages)
+| input_text   | hi peter!                                  | Input text
 |========================================
 
 [[buffers_and_windows]]
@@ -640,6 +731,10 @@ The option 'items' is a string with a list of bar items, separated by a comma
 
 The list of bar items is displayed with command `/bar listitems`.
 
+Before or after item name, you can use chars (that are not alphanumeric, "-" or
+"_"). They will be displayed before/after item with the delimiters color
+defined in bar (option 'color_delim').
+
 Example of bar with items "[time],buffer_number+:+buffer_plugin+.+buffer_name":
 
 ........................................
@@ -648,6 +743,20 @@ Example of bar with items "[time],buffer_number+:+buffer_plugin+.+buffer_name":
 └─────────────────────────────────────────────────────────────────────────────────────────┘
 ........................................
 
+A special syntax can be used to force the buffer used when displaying the bar
+item: "@buffer:item" (where "buffer" is the full name of buffer and "item" is
+the name of a bar item).
+
+This is useful in root bars, to display item for a specific buffer which is
+not displayed in the current window (or even not displayed at all).
+
+Example: nicklist of bitlbee in a root bar (if the bar is called
+'bitlist' and if bitlbee server is called 'bitlbee'):
+
+----------------------------------------
+/set weechat.bar.bitlist.items "@irc.bitlbee.&bitlbee:buffer_nicklist"
+----------------------------------------
+
 [[bar_filling]]
 Filling
 ^^^^^^^
@@ -744,7 +853,7 @@ 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
+* `${nicklist}`: true if buffer displayed in window has a nicklist
 
 Following pointers are available:
 
@@ -936,7 +1045,9 @@ text in buffer).
 [width="100%",cols="^.^3,.^10,.^5l",options="header"]
 |========================================
 | Key          | Description | Command
-| @k(C-)@k(r)  | Switch exact case for search | /input search_switch_case
+| @k(C-)@k(r)  | Switch search type: string (default), regular expression | /input search_switch_regex
+| @k(A-)@k(c)  | Switch exact case for search | /input search_switch_case
+| @k(Tab)      | Switch search in: messages (default), prefixes, prefixes + messages | /input search_switch_where
 | @k(↑)        | Search previous line | /input search_previous
 | @k(↓)        | Search next line | /input search_next
 | @k(Enter) .3+| Stop search .3+| /input search_stop
@@ -1069,9 +1180,9 @@ List of modifiers:
 [width="50%",cols="3m,4",options="header"]
 |========================================
 | Modifier | Description
-| ctrl     | key @k(-C-)
-| alt      | key @k(-A-)
-| ctrl-alt | keys @k(-C-) and @k(-A-)
+| ctrl     | Key @k(-C-)
+| alt      | Key @k(-A-)
+| ctrl-alt | Keys @k(-C-) and @k(-A-)
 |========================================
 
 List of buttons/wheel:
@@ -1079,12 +1190,12 @@ List of buttons/wheel:
 [width="50%",cols="3m,4",options="header"]
 |========================================
 | Button/wheel        | Description
-| button1             | click on left button
-| button2             | click on right button
-| button3             | click on middle button (often click on wheel)
-| button4 ... button9 | click on extra buttons
-| wheelup             | wheel (up)
-| wheeldown           | wheel (down)
+| button1             | Click on left button
+| button2             | Click on right button
+| button3             | Click on middle button (often click on wheel)
+| button4 ... button9 | Click on extra buttons
+| wheelup             | Wheel (up)
+| wheeldown           | Wheel (down)
 |========================================
 
 List of gestures (only for buttons, not wheel):
@@ -1107,8 +1218,8 @@ 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
+| event-down | Button was pressed but not released yet
+| event-drag | Mouse was moved with button pressed down
 |========================================
 
 Example of events:
@@ -1250,7 +1361,7 @@ for colors in WeeChat:
 ^(1)^ Even if your terminal supports more than 256 pairs, only 256 pairs can be
 used in WeeChat, because of a ncurses limitation.
 
-You can run `weechat-curses --colors` or use command `/color` in WeeChat to
+You can run `weechat --colors` or use command `/color` in WeeChat to
 display limits for your environment.
 
 Some recommended values for 'TERM' if you want 256 colors:
@@ -1285,23 +1396,23 @@ Basic colors in WeeChat are:
 [width="50%",cols="^3m,8",options="header"]
 |========================================
 | Name         | Color
-| default      | default terminal color (transparent for background)
-| black        | black
-| darkgray     | dark gray
-| red          | dark red
-| lightred     | light red
-| green        | dark green
-| lightgreen   | light green
-| brown        | brown
-| yellow       | yellow
-| blue         | dark blue
-| lightblue    | light blue
-| magenta      | dark magenta
-| lightmagenta | light magenta
-| cyan         | dark cyan
-| lightcyan    | light cyan
-| gray         | gray
-| white        | white
+| default      | Default terminal color (transparent for background)
+| black        | Black
+| darkgray     | Dark gray
+| red          | Dark red
+| lightred     | Light red
+| green        | Dark green
+| lightgreen   | Light green
+| brown        | Brown
+| yellow       | Yellow
+| blue         | Dark blue
+| lightblue    | Light blue
+| magenta      | Dark magenta
+| lightmagenta | Light magenta
+| cyan         | Dark cyan
+| lightcyan    | Light cyan
+| gray         | Gray
+| white        | White
 |========================================
 
 [[colors_extended]]
@@ -1377,15 +1488,66 @@ Example of bold with terminal foreground color:
 /set weechat.color.status_time *99999
 ----------------------------------------
 
+[[options_and_commands]]
+Options and commands
+~~~~~~~~~~~~~~~~~~~~
+
+[[sec_options]]
+Secured data options (sec.conf)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command                    | Description
+| crypt   | /set sec.crypt.*                   | Options for encryption
+| data    | <<command_weechat_secure,/secure>> | Secured data
+|========================================
+
+Options:
+
+include::autogen/user/sec_options.txt[]
+
 [[weechat_options]]
 WeeChat options (weechat.conf)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section    | Control command                           | Description
+| debug      | <<command_weechat_debug,/debug set>>      +
+               /set weechat.debug.*                      | Debug level, for core and plugins (options can be added/removed in section)
+| startup    | /set weechat.startup.*                    | Startup options
+| look       | /set weechat.look.*                       | Look and feel
+| palette    | <<command_weechat_color,/color alias>>    +
+               /set weechat.palette.*                    | Color aliases (options can be added/removed in section)
+| color      | /set weechat.color.*                      | Colors
+| completion | /set weechat.completion.*                 | Completion options
+| history    | /set weechat.history.*                    | History options (commands and buffers)
+| proxy      | <<command_weechat_proxy,/proxy>>          +
+               /set weechat.proxy.*                      | Proxy options
+| network    | /set weechat.network.*                    | Network/SSL options
+| bar        | <<command_weechat_bar,/bar>>              +
+               /set weechat.bar.*                        | Bar options
+| layout     | <<command_weechat_layout,/layout>>        | Layouts
+| notify     | <<command_weechat_buffer,/buffer notify>> | Notify levels for buffers (options can be added/removed in section)
+| filter     | <<command_weechat_filter,/filter>>        | Filters
+| key        | <<command_weechat_key,/key>>              | Keys in default context
+| key_search | <<command_weechat_key,/key>>              | Keys in search context
+| key_cursor | <<command_weechat_key,/key>>              | Keys in cursor context
+| key_mouse  | <<command_weechat_key,/key>>              | Keys in mouse context
+|========================================
+
+Options:
 
 include::autogen/user/weechat_options.txt[]
 
 [[weechat_commands]]
 WeeChat commands
-~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^
 
 include::autogen/user/weechat_commands.txt[]
 
@@ -1393,14 +1555,7 @@ include::autogen/user/weechat_commands.txt[]
 Plugins
 -------
 
-To learn more about plugin or script development (through API), please read
-'WeeChat Plugin API Reference' or 'WeeChat Scripting Guide'.
-
-[[plugins_in_weechat]]
-Plugins in WeeChat
-~~~~~~~~~~~~~~~~~~
-
-A plugin is dynamic library, written in C and compiled, which is loaded by
+A plugin is a dynamic library, written in C and compiled, which is loaded by
 WeeChat.
 Under GNU/Linux, the file has ".so" extension, ".dll" under Windows.
 
@@ -1433,11 +1588,10 @@ Default plugins are:
 | alias     | Define alias for commands
 | aspell    | Spell checking for command line
 | charset   | Charset decoding/encoding for buffers
-| demo      | Demo plugin (not compiled by default)
 | fifo      | FIFO pipe used to remotely send commands to WeeChat
 | irc       | IRC chat protocol
 | logger    | Log buffers to files
-| relay     | Relay data via network (IRC proxy)
+| relay     | Relay data via network
 | rmodifier | Alter modifier strings with regular expressions
 | python    | Python scripting API
 | perl      | Perl scripting API
@@ -1448,6 +1602,9 @@ Default plugins are:
 | xfer      | File transfer and direct chat
 |========================================
 
+To learn more about plugin or script development (through API), please read
+'WeeChat Plugin API Reference' or 'WeeChat Scripting Guide'.
+
 [[alias_plugin]]
 Alias plugin
 ~~~~~~~~~~~~
@@ -1472,6 +1629,20 @@ many languages by buffer.
 Options (aspell.conf)
 ^^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section    | Control command                           | Description
+| color      | /set aspell.color.*                       | Colors
+| check      | /set aspell.check.*                       | Options to control spell checking
+| dict       | <<command_aspell_aspell,/aspell setdict>> +
+               /set aspell.dict.*                        | Dictionaries used by buffer (options can be added/removed in section)
+| option     | /set aspell.option.*                      | <<aspell_speller_options,Speller options>> (options can be added/removed in section)
+|========================================
+
+Options:
+
 include::autogen/user/aspell_options.txt[]
 
 [[aspell_commands]]
@@ -1567,6 +1738,20 @@ charset: terminal: ISO-8859-15, internal: UTF-8
 Options (charset.conf)
 ^^^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command                             | Description
+| default | /set charset.default.*                      | Default decoding/encoding charset
+| decode  | <<command_charset_charset,/charset decode>> +
+            /set charset.decode.*                       | Decoding charset by buffer (options can be added/removed in section)
+| encode  | <<command_charset_charset,/charset encode>> +
+            /set charset.encode.*                       | Encoding charset by buffer (options can be added/removed in section)
+|========================================
+
+Options:
+
 include::autogen/user/charset_options.txt[]
 
 [[charset_commands]]
@@ -1713,13 +1898,31 @@ Example to join '#weechat' and '#toto' on server 'irc.freenode.net' server,
 default port (6667), with nick 'nono':
 
 ----------------------------------------
-$ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto
+$ weechat irc://nono@irc.freenode.net/#weechat,#toto
 ----------------------------------------
 
 [[irc_options]]
 Options (irc.conf)
 ^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section        | Control command                | Description
+| look           | /set irc.look.*                | Look and feel
+| color          | /set irc.color.*               | Colors
+| network        | /set irc.network.*             | Network options
+| msgbuffer      | /set irc.msgbuffer.*           | <<irc_target_buffer,Target buffer for IRC messages>> (options can be added/removed in section)
+| ctcp           | /set irc.ctcp.*                | <<irc_ctcp_replies,CTCP replies>> (options can be added/removed in section)
+| ignore         | <<command_irc_ignore,/ignore>> | Ignore people
+| server_default | /set irc.server_default.*      | Default values for servers (used when options in server are not defined)
+| server         | <<command_irc_server,/server>> +
+                   /set irc.server.*              | Servers
+|========================================
+
+Options:
+
 include::autogen/user/irc_options.txt[]
 
 [[irc_commands]]
@@ -1800,13 +2003,16 @@ For more information, look at http://www.oftc.net/oftc/NickServ/CertFP
 SASL authentication
 ^^^^^^^^^^^^^^^^^^^
 
-WeeChat supports SASL authentication, using three mechanisms: "plain" (plain
-text password), "dh-blowfish" (encrypted password) or "external" (client side
-SSL cert).
+WeeChat supports SASL authentication, using different mechanisms:
+
+* 'plain': plain text password
+* 'dh-blowfish': blowfish encrypted password
+* 'dh-aes': AES encrypted password
+* 'external': client side SSL cert
 
 Options in servers are:
 
-* 'sasl_mechanism': mechanism to use ("plain", "dh-blowfish" or "external")
+* 'sasl_mechanism': mechanism to use (see above)
 * 'sasl_timeout': timeout (in seconds) for authentication
 * 'sasl_username': username (nick)
 * 'sasl_password': password
@@ -1819,7 +2025,7 @@ If you want to use "dh-blowfish" by default for all servers:
 
 [NOTE]
 The "gcrypt" library is required when compiling WeeChat in order to use
-"dh-blowfish" mechanism (see <<dependencies,dependencies>>).
+"dh-blowfish" and "dh-aes" mechanisms (see <<dependencies,dependencies>>).
 
 [[irc_tor_freenode]]
 Connect to Freenode with TOR/SASL
@@ -1957,23 +2163,23 @@ 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.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
+| 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 ^(1)^ | 0.4.0-dev (git: v0.3.9-104-g7eb5cc4)
+| $git         | Git version ^(1)^                   | 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.
+^(1)^ 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:
 
@@ -2128,6 +2334,20 @@ about what and how it is saved.
 Options (logger.conf)
 ^^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command     | Description
+| look    | /set logger.look.*  | Look and feel
+| color   | /set logger.color.* | Colors
+| file    | /set logger.file.*  | Options for log files
+| level   | /set logger.level.* | Log level by buffer (options can be added/removed in section)
+| mask    | /set logger.mask.*  | Filename mask by buffer (options can be added/removed in section)
+|========================================
+
+Options:
+
 include::autogen/user/logger_options.txt[]
 
 [[logger_commands]]
@@ -2269,12 +2489,27 @@ The Relay plugin is used to relay data via network, using different protocols:
 * 'irc': IRC proxy: used to share connections to IRC servers with one or many
   other IRC clients
 * 'weechat': protocol used by remote interfaces to display and interact with
-  WeeChat (for example QWeeChat)
+  WeeChat (for example QWeeChat or weechat-android)
 
 [[relay_options]]
 Options (relay.conf)
 ^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command                    | Description
+| look    | /set relay.look.*                  | Look and feel
+| color   | /set relay.color.*                 | Colors
+| network | /set relay.network.*               | Network options
+| irc     | /set relay.irc.*                   | Options specific to irc protocol (irc proxy)
+| port    | <<command_relay_relay,/relay add>> +
+            /set relay.port.*                  | Ports used for relay (irc and weechat protocols) (options can be added/removed in section)
+|========================================
+
+Options:
+
 include::autogen/user/relay_options.txt[]
 
 [[relay_commands]]
@@ -2283,48 +2518,21 @@ Commands
 
 include::autogen/user/relay_commands.txt[]
 
-[[relay_irc_proxy]]
-IRC proxy
-^^^^^^^^^
+[[relay_password]]
+Password
+^^^^^^^^
 
-The Relay plugin can act as an IRC proxy: you can define one port by IRC server
-and use a password for clients.
-
-For example:
+It is highly recommended to set a password for relay, with command:
 
 ----------------------------------------
 /set relay.network.password "mypass"
-/relay add irc.freenode 8000
 ----------------------------------------
 
-Now you can connect on port 8000 with any IRC client (WeeChat, xchat,
-irssi, ..), using server password "mypass".
-
-You can limit number of allowed clients:
-
-----------------------------------------
-/set relay.network.max_clients 1
-----------------------------------------
-
-[[relay_weechat_protocol]]
-WeeChat protocol
-^^^^^^^^^^^^^^^^
-
-The Relay plugin can send data to remote interface using WeeChat protocol.
-
-For example:
-
-----------------------------------------
-/set relay.network.password "mypass"
-/relay add weechat 9000
-----------------------------------------
-
-Now you can connect on port 9000 with a remote interface (like QWeeChat),
-using password "mypass".
+This password is used for 'irc' and 'weechat' protocols.
 
 [[relay_ssl]]
-Relay with SSL
-^^^^^^^^^^^^^^
+SSL
+^^^
 
 You can use SSL by creating a certificate and private key, and by using prefix
 "ssl." in the name of protocol.
@@ -2347,13 +2555,74 @@ with command:
 /relay sslcertkey
 ----------------------------------------
 
-And then add relay with SSL, for example:
+[[relay_irc_proxy]]
+IRC proxy
+^^^^^^^^^
+
+The Relay plugin can act as an IRC proxy: it will simulate an IRC server, and
+you can connect to WeeChat with any other IRC client (including WeeChat itself).
+
+You can define one port by IRC server, or one generic port for all servers.
+
+When using one port for all servers, the client must send the internal name of
+server in the IRC "PASS" command, with this format:
 
 ----------------------------------------
-/relay add ssl.irc.freenode 8001
-/relay add ssl.weechat 9001
+PASS server:password
 ----------------------------------------
 
+Example: IRC proxy with SSL for any server (client will choose):
+
+----------------------------------------
+/relay add ssl.irc 8000
+----------------------------------------
+
+Example: IRC proxy without SSL only for server "freenode":
+
+----------------------------------------
+/relay add irc.freenode 8000
+----------------------------------------
+
+Now you can connect on port 8000 with any IRC client using server password
+"mypass" (or "freenode:mypass" if no server was specified in the relay).
+
+[[relay_weechat_protocol]]
+WeeChat protocol
+^^^^^^^^^^^^^^^^
+
+The Relay plugin can send data to remote interface using WeeChat protocol.
+
+For example:
+
+----------------------------------------
+/relay add weechat 9000
+----------------------------------------
+
+Now you can connect on port 9000 with a remote interface using password
+"mypass".
+
+[[relay_websocket]]
+WebSocket
+^^^^^^^^^
+
+WebSocket protocol (http://tools.ietf.org/html/rfc6455[RFC 6455]) is supported
+in Relay plugin for all protocols.
+
+The WebSocket handshake is automatically detected and socket becomes ready for
+WebSocket if required headers are found in handshake and if origin is allowed
+(see option
+<<option_relay.network.websocket_allowed_origins,relay.network.websocket_allowed_origins>>).
+
+A WebSocket can be opened in a HTML5 with a single line of JavaScript:
+
+[source,js]
+----------------------------------------
+websocket = new WebSocket("ws://server.com:9000/weechat");
+----------------------------------------
+
+The port (9000 in example) is the port defined in Relay plugin.
+The URI must always end with "/weechat" (for 'irc' and 'weechat' protocols).
+
 [[rmodifier_plugin]]
 Rmodifier plugin
 ~~~~~~~~~~~~~~~~
@@ -2367,6 +2636,18 @@ these passwords by `*`.
 Options (rmodifier.conf)
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section  | Control command                                | Description
+| look     | /set rmodifier.look.*                          | Look and feel
+| modifier | <<command_rmodifier_rmodifier,/rmodifier add>> +
+             /set rmodifier.modifier.*                      | Rmodifiers
+|========================================
+
+Options:
+
 include::autogen/user/rmodifier_options.txt[]
 
 [[rmodifier_commands]]
@@ -2402,7 +2683,7 @@ Example of default rmodifier for command `/oper`:
 ** `input_text_display`: called when command line has changed
    (applies only on display, not content of command line)
 * regular expression: `^(/oper +\S+ +)(.*)`
-* groupes: `1,2*`
+* groups: `1,2*`
 
 Each time modifiers "history_add" or "input_text_display" are called, regular
 expression is checked. If string matches, then it is replaced by captured groups,
@@ -2424,7 +2705,7 @@ 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
+repository, which are visible at this URL: http://weechat.org/scripts
 
 For more information about how to write scripts, or WeeChat API for
 scripts, please read 'WeeChat Scripting Guide'.
@@ -2433,6 +2714,18 @@ scripts, please read 'WeeChat Scripting Guide'.
 Script options (script.conf)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command       | Description
+| look    | /set script.look.*    | Look and feel
+| color   | /set script.color.*   | Colors
+| scripts | /set script.scripts.* | Options for download of scripts
+|========================================
+
+Options:
+
 include::autogen/user/script_options.txt[]
 
 [[script_commands]]
@@ -2489,7 +2782,20 @@ Xfer plugin brings:
 
 [[xfer_options]]
 Options (xfer.conf)
-^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^
+
+Sections:
+
+[width="100%",cols="3m,6m,16",options="header"]
+|========================================
+| Section | Control command     | Description
+| look    | /set xfer.look.*    | Look and feel
+| color   | /set xfer.color.*   | Colors
+| network | /set xfer.network.* | Network options
+| file    | /set xfer.file.*    | Options for files sent/received
+|========================================
+
+Options:
 
 include::autogen/user/xfer_options.txt[]
 

doc/es/CMakeLists.txt

@@ -17,13 +17,17 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# quickstart
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=es -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.txt
-  COMMENT "Building weechat_quickstart.es.html"
-)
-ADD_CUSTOM_TARGET(doc-quickstart-es ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
+
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=es -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.txt
+    COMMENT "Building weechat_quickstart.es.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-es ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

doc/es/Makefile.am

@@ -22,21 +22,43 @@ docdir = $(datadir)/doc/$(PACKAGE)
 EXTRA_DIST = CMakeLists.txt \
              weechat_quickstart.es.txt
 
-all-local: weechat_quickstart.es.html
+if MAN
+  man_targets =
+  man_install =
+  man_uninstall =
+endif
+if DOC
+  doc_targets = weechat_quickstart.es.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
 
 # quickstart
 weechat_quickstart.es.html: weechat_quickstart.es.txt
 	$(ASCIIDOC) -a lang=es -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.txt
 
-# install docs
+# install man/docs
 
-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/es/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/es/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
 
-# uninstall docs
+# uninstall man/docs
 
-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/es/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/es/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.es.html
 	-rmdir $(DESTDIR)$(docdir)
 

doc/es/weechat_quickstart.es.txt

@@ -11,20 +11,39 @@ Es recomendable una terminal emulada para X (pero no indispensable)
 rxvt-unicode (tiene un buen soporte para UTF-8, y no da problemas con
 los atajas de teclados predeterminados).
 
-Ejecute "weechat-curses" en la consola.
+// TRANSLATION MISSING
+Run from your shell:
+
+----------------------------------------
+$ weechat
+----------------------------------------
 
 
 [[help_options]]
 Ayuda en linea / Opciones
 -------------------------
 
-WeeChat tiene ayuda para todos los comandos, solo teclee /help Para
-obtener ayuda específicamente de un comando, teclee: `/help comando`
+WeeChat tiene ayuda para todos los comandos, solo teclee:
 
-Para configurar una opción, use `/set config.section.option valor`
-donde `config` es el nombre de la configuración del núcleo o del
+----------------------------------------
+/help
+----------------------------------------
+
+Para obtener ayuda específicamente de un comando, teclee:
+
+----------------------------------------
+/help comando
+----------------------------------------
+
+Para configurar una opción, use:
+
+----------------------------------------
+/set config.section.option valor
+----------------------------------------
+
+(donde `config` es el nombre de la configuración del núcleo o del
 plugin que desea configurar,  `section`, la sección de esa configuración
-y `option` el nombre de la opción.
+y `option` el nombre de la opción).
 
 WeeChat usará inmediatamente el nuevo valor asignado (*no* es necesario
 reiniciar WeeChat después de aplicar cambios a la configuración).
@@ -33,18 +52,30 @@ Usando el comando `/set` con un nombre tecleado parcialmente y el
 comodín "*" al principio o al final del texto; pude mostrar todas las
 opciones que contienen esas letras. Por ejemplo:
 
-`/set`::
-    Mostrará todas las opciones de WeeChat y sus plugins.
+* mostrará todas las opciones de WeeChat y sus plugins:
 
-`/set weechat.*`::
-    Mostrará solo las opciones de WeeChat.
+----------------------------------------
+/set
+----------------------------------------
 
-`/set irc.*`::
-    Mostrará las opciones del plugin IRC
+* mostrará solo las opciones de WeeChat:
+
+----------------------------------------
+/set weechat.*
+----------------------------------------
+
+* mostrará las opciones del plugin IRC:
+
+----------------------------------------
+/set irc.*
+----------------------------------------
 
 Puede mostrar la ayuda de una opción en especifico con  `/help`, por
 ejemplo:
-`/help weechat.look.highlight`.
+
+----------------------------------------
+/help weechat.look.highlight
+----------------------------------------
 
 Todas las opciones se salvarán de manera automática cuando cierre
 WeeChat o usando el comando `/save` para forzar la forzar a WeeChat a
@@ -77,9 +108,15 @@ Crear un servidor IRC
 
 Puede agregar un servidor IRC usando el comando `/server`, por ejemplo:
 
-  /server add oftc irc.oftc.net/6667
+----------------------------------------
+/server add oftc irc.oftc.net/6667
+----------------------------------------
 
-La ayuda está disponible; si te pierdes: `/help server`
+La ayuda está disponible; si te pierdes:
+
+----------------------------------------
+/help server
+----------------------------------------
 
 
 [[irc_server_options]]
@@ -99,55 +136,73 @@ 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 "nick,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:
 
-  /set irc.server.oftc.username "Mi nombre de usuario"
-  /set irc.server.oftc.realname "Mi nombre real"
+----------------------------------------
+/set irc.server.oftc.username "Mi nombre de usuario"
+/set irc.server.oftc.realname "Mi nombre real"
+----------------------------------------
 
 Para que el servidor se conecte cuando WeeChat inicie:
 
-  /set irc.server.oftc.autoconnect on
+----------------------------------------
+/set irc.server.oftc.autoconnect on
+----------------------------------------
 
 // 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_default.sasl_mechanism dh-blowfish
-  /set irc.server.oftc.sasl_username "nick"
-  /set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
+/set irc.server_default.sasl_mechanism dh-blowfish
+/set irc.server.oftc.sasl_username "nick"
+/set irc.server.oftc.sasl_password "xxxxxxx"
+----------------------------------------
 
 // 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"
+----------------------------------------
+/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:
 
-  /set irc.server.oftc.autojoin "#uncanal,#otrocanal"
+----------------------------------------
+/set irc.server.oftc.autojoin "#uncanal,#otrocanal"
+----------------------------------------
 
 Para eliminar un valor asignado a una opción de servidor y usar los
 valores por defecto en su lugar, por ejemplo, usar el nick por defecto
 (irc.server_default.nicks):
 
-  /set irc.server.oftc.nicks null
+----------------------------------------
+/set irc.server.oftc.nicks null
+----------------------------------------
 
 Otras opciones: pude configurar otras opciones con el siguiente comando,
 donde "xxx" es el nombre de la opción.
 
-  /set irc.server.oftc.xxx valor
+----------------------------------------
+/set irc.server.oftc.xxx valor
+----------------------------------------
 
 
 [[connect_to_irc_server]]
 Conectarse a un servidor IRC
 ----------------------------
 
-  /connect oftc
+----------------------------------------
+/connect oftc
+----------------------------------------
 
 [NOTE]
 Este comando también puede usarse para crear y conectarse a un nuevo
@@ -161,22 +216,33 @@ servidores use ctrl+X.
 Es posible deshabilitar esta manera de tener todos los buffer de
 servidores juntos para tenerlos de manera independiente:
 
-  /set irc.look.server_buffer independent
+----------------------------------------
+/set irc.look.server_buffer independent
+----------------------------------------
 
 
 [[join_part_irc_channels]]
 join/part y canales IRC
 -----------------------
 
-`/join #canal`::
-    Se une a un canal llamado "#canal"
+Se une a un canal llamado "#canal":
 
-`/part [mensaje de partida]`::
-    sale de un canal (mantiene el buffer abierto)
+----------------------------------------
+/join #canal
+----------------------------------------
 
-`/close`::
-    cierra un servidor o el buffer de un canal
-     (`/close` es un alias de `/buffer close`)
+Sale de un canal (mantiene el buffer abierto):
+
+----------------------------------------
+/part [mensaje de partida]
+----------------------------------------
+
+Cierra un servidor o el buffer de un canal (`/close` es un alias de
+`/buffer close`):
+
+----------------------------------------
+/close
+----------------------------------------
 
 
 [[buffer_window]]
@@ -193,8 +259,10 @@ ventanas conteniendo varios buffer al mismo tiempo.
 
 Comandos para manipular buffer y ventana:
 
-  /buffer
-  /window
+----------------------------------------
+/buffer
+/window
+----------------------------------------
 
 (le reitero que puede obtener ayuda de los comandos con /help buffer y
 /help ventana respectivamente)
@@ -202,7 +270,9 @@ Comandos para manipular buffer y ventana:
 Por ejemplo, para dividir la pantalla una pequeña ventana (1/3)
 junto a otras mas grande (2/3) use el comando
 
-  /window splitv 33
+----------------------------------------
+/window splitv 33
+----------------------------------------
 
 
 [[key_bindings]]
@@ -229,15 +299,21 @@ alguna tecla.
 Por ejemplo, para asignar la combinación meta-y (alt-y) al comando
 `/buffer close`:
 
-  /key bind (presionamos meta-k) (presionamos meta-y) /buffer close
+----------------------------------------
+/key bind (presionamos meta-k) (presionamos meta-y) /buffer close
+----------------------------------------
 
 El comando se vera mas o menos así:
 
-  /key bind meta-y /buffer close
+----------------------------------------
+/key bind meta-y /buffer close
+----------------------------------------
 
 Para eliminar una combinación:
 
-  /key unbind meta-y
+----------------------------------------
+/key unbind meta-y
+----------------------------------------
 
 
 [[plugins_scripts]]
@@ -251,7 +327,7 @@ Los plugins se cargan de manera automática cuando son encontrados por WeeChat
 plugins y scripts).
 
 Muchos scripts externos (de contribuidores) están disponibles para WeeChat en:
-http://www.weechat.org/scripts
+http://weechat.org/scripts
 
 // TRANSLATION MISSING
 You can manage scripts in WeeChat with command `/script` (see `/help script`
@@ -263,6 +339,6 @@ Más documentación
 -----------------
 
 Ahora puede usar WeeChat y leer las FAQ/documentación para cada pregunta
-en: http://www.weechat.org/doc
+en: http://weechat.org/doc
 
 Disfrute de WeeChat!

doc/fr/CMakeLists.txt

@@ -17,70 +17,89 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# user's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
-  COMMENT "Building weechat_user.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-user-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF (ENABLE_MAN)
+  # man page
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
+    COMMAND ${A2X_EXECUTABLE} ARGS -a lang=fr -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.txt
+    COMMENT "Building weechat.1 (fr)"
+  )
+  ADD_CUSTOM_TARGET(doc-man-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/fr/man1)
+ENDIF (ENABLE_MAN)
 
-# plugin API reference
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt
-  COMMENT "Building weechat_plugin_api.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-plugin-api-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
 
-# scripting guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt
-  COMMENT "Building weechat_scripting.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-scripting-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # user's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    COMMENT "Building weechat_user.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-user-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# FAQ
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
-  COMMENT "Building weechat_faq.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-faq-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # plugin API reference
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt
+    COMMENT "Building weechat_plugin_api.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-plugin-api-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# quickstart
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
-  COMMENT "Building weechat_quickstart.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-quickstart-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # scripting guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.txt
+    COMMENT "Building weechat_scripting.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-scripting-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# tester's guide
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
-  COMMENT "Building weechat_tester.fr.html"
-)
-ADD_CUSTOM_TARGET(doc-tester-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  # FAQ
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
+    COMMENT "Building weechat_faq.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-faq-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
+    COMMENT "Building weechat_quickstart.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # tester's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=fr -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
+    COMMENT "Building weechat_tester.fr.html"
+  )
+  ADD_CUSTOM_TARGET(doc-tester-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

doc/fr/Makefile.am

@@ -21,6 +21,8 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
+             weechat.1.fr.txt \
+             cmdline_options.fr.txt \
              weechat_user.fr.txt \
              weechat_plugin_api.fr.txt \
              weechat_scripting.fr.txt \
@@ -30,15 +32,29 @@ EXTRA_DIST = CMakeLists.txt \
              $(wildcard autogen/user/*.txt) \
              $(wildcard autogen/plugin_api/*.txt)
 
-all-local: weechat_user.fr.html \
+if MAN
+  man_targets = weechat.1
+  man_install = install-man
+  man_uninstall = uninstall-man
+endif
+if DOC
+  doc_targets = weechat_user.fr.html \
 		weechat_plugin_api.fr.html \
 		weechat_scripting.fr.html \
 		weechat_faq.fr.html \
 		weechat_quickstart.fr.html \
 		weechat_tester.fr.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
+
+# man page
+weechat.1: weechat.1.fr.txt cmdline_options.fr.txt
+	$(A2X) -a lang=fr -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L -D . $(abs_top_srcdir)/doc/fr/weechat.1.fr.txt
 
 # user's guide
-weechat_user.fr.html: weechat_user.fr.txt $(wildcard autogen/user/*.txt)
+weechat_user.fr.html: weechat_user.fr.txt cmdline_options.fr.txt $(wildcard autogen/user/*.txt)
 	$(ASCIIDOC) -a lang=fr -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.fr.html $(abs_top_srcdir)/doc/fr/weechat_user.fr.txt
 
 # plugin API reference
@@ -61,19 +77,32 @@ weechat_quickstart.fr.html: weechat_quickstart.fr.txt
 weechat_tester.fr.html: weechat_tester.fr.txt
 	$(ASCIIDOC) -a lang=fr -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.fr.html $(abs_top_srcdir)/doc/fr/weechat_tester.fr.txt
 
-# install docs
+# install man/docs
 
-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/fr/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/fr/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
 
-# uninstall docs
+# uninstall man/docs
 
-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/fr/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/fr/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.fr.html
 	-rmdir $(DESTDIR)$(docdir)
 
 # clean
 
 clean-local:
+	-rm -f weechat.1
 	-rm -f *.html

doc/fr/autogen/plugin_api/completions.txt

@@ -6,7 +6,9 @@
 
 | alias | alias_value | valeur de l'alias
 
-| aspell | aspell_langs | liste des langues supportées pour aspell
+| aspell | aspell_dicts | liste des dictionnaires aspell installés
+
+| aspell | aspell_langs | liste de toutes les langues supportées par aspell
 
 | guile | guile_script | liste des scripts
 
@@ -58,11 +60,11 @@
 
 | script | script_files | fichiers dans les répertoires de script
 
-| script | script_scripts | liste des scripts du repository
+| script | script_scripts | liste des scripts du dépôt
 
-| script | script_scripts_installed | liste des scripts installés (du repository)
+| script | script_scripts_installed | liste des scripts installés (du dépôt)
 
-| script | script_tags | étiquettes des scripts dans le repository
+| script | script_tags | étiquettes des scripts dans le dépôt
 
 | tcl | tcl_script | liste des scripts
 
@@ -104,6 +106,8 @@
 
 | weechat | keys_contexts | contextes de touches
 
+| weechat | layouts_names | noms des dispositions
+
 | weechat | nicks | pseudos dans la liste des pseudos du tampon courant
 
 | weechat | palette_colors | couleurs de la palette
@@ -116,6 +120,8 @@
 
 | weechat | proxies_options | options pour les proxies
 
+| weechat | secured_data | noms de données sécurisées (fichier sec.conf, section data)
+
 | weechat | weechat_commands | commandes weechat
 
 | weechat | windows_numbers | numéros des fenêtres