Version 1.6-rc1

core: update Japanese translations

.gitignore

@@ -2,7 +2,6 @@
 
 *.a
 *.gmo
-*.html
 *.la
 *.lai
 *.lo
@@ -54,3 +53,4 @@ weechat-*.cygport
 stamp*
 
 src/gui/curses/weechat
+src/gui/curses/weechat-curses

.mailmap

@@ -11,7 +11,7 @@ Sébastien Helleu <flashcode@flashtux.org> <flashcode>
 Sébastien Helleu <flashcode@flashtux.org> <uid67137>
 Nils Görs <weechatter@arcor.de>
 Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp>
-Krzysztof Korościk <soltys@szluug.org>
+Krzysztof Korościk <soltys1@gmail.com> <soltys@szluug.org>
 Marco Paolone <marcopaolone@gmail.com>
 <marcopaolone@gmail.com> <marco@DrB4tch.sitecomwl601>
 <mikaela.suomalainen@outlook.com> <mkaysi@outlook.com>

.travis.yml

@@ -20,7 +20,8 @@ before_script:
     - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
     - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
     - sudo apt-get update -qq
-    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint asciidoc source-highlight xsltproc docbook-xsl docbook-xml cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl libcpputest-dev
+    - sudo apt-get -y install devscripts equivs python-pip libenchant-dev autopoint cmake pkg-config libncursesw5-dev gem2deb libperl-dev python-dev python3-dev libaspell-dev liblua5.1-0-dev tcl8.5-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt11-dev libgnutls-dev zlib1g-dev curl libcpputest-dev
+    - sudo gem install asciidoctor
     - sudo pip install msgcheck pylint
 
 script:

AUTHORS.adoc

@@ -78,9 +78,11 @@ Alphabetically:
 * Quentin Glidic (SardemFF7)
 * Quentin Pradet
 * Quico Noizeux
+* Raghavendra Prabhu
 * Rettub
 * Rudolf Polzer (divVerent)
 * Ryuunosuke Ayanokouzi
+* scumjr
 * Sergio Durigan Junior
 * Shane McCarron
 * Shawn Smith
@@ -94,7 +96,9 @@ Alphabetically:
 * Tom Alsberg
 * Tor Hveem (xt)
 * Valentin Lorentz (progval)
+* Vasco Almeida
 * Voroskoi
+* Wojciech Kwolek
 * Yannick Palanque
 
 == Contact

CMakeLists.txt

@@ -99,7 +99,7 @@ option(ENABLE_SCRIPT     "Enable Script plugin (scripts manager)"    ON)
 option(ENABLE_SCRIPTS    "Enable script plugins (perl, python, ...)" ON)
 option(ENABLE_PERL       "Enable Perl scripting language"            ON)
 option(ENABLE_PYTHON     "Enable Python scripting language"          ON)
-option(ENABLE_PYTHON3    "Use Python 3.x if found (NOT recommended)" OFF)
+option(ENABLE_PYTHON3    "Use Python 3.x if found (NOT recommended because many \"official\" scripts won't work)" OFF)
 option(ENABLE_RUBY       "Enable Ruby scripting language"            ON)
 option(ENABLE_LUA        "Enable Lua scripting language"             ON)
 option(ENABLE_TCL        "Enable Tcl scripting language"             ON)
@@ -255,11 +255,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BI
 # install some files (only on Cygwin)
 if(CYGWIN)
   install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
     DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 endif()
 
@@ -269,7 +269,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/ic
 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 set(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})

Contributing.adoc

@@ -26,11 +26,11 @@ When reporting https://github.com/weechat/weechat/issues[issues] on GitHub,
 please include:
 
 * your *WeeChat version*: the output of `/v` in WeeChat, for example:
-  'WeeChat 1.0-dev (git: v0.4.3-475-gb174b3c)'. +
+  _WeeChat 1.0-dev (git: v0.4.3-475-gb174b3c)_. +
   If WeeChat does not start at all, please include the version displayed by
   `weechat --help` (or the version installed with your package manager).
 * your *operating system*: its name and version (examples: Linux Debian Wheezy,
-  FreeBSD 10.0, Windows/Cygwin 64-bit, ...).
+  FreeBSD 10.0, Windows/Cygwin 64-bit, Windows/Ubuntu 64-bit...).
 * the *steps to reproduce*: if possible, please include a reproducible example:
   explain the steps which led you to the problem. +
   It's even better if you can reproduce the problem with a new config (and no
@@ -42,7 +42,7 @@ https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's g
 for more info).
 
 [IMPORTANT]
-Most of times, the WeeChat crash log file ('weechat_crash_YYYYMMDD_xxx.log') is
+Most of times, the WeeChat crash log file (_weechat_crash_YYYYMMDD_xxx.log_) is
 *NOT USEFUL* to fix the bug, so please report this file *ONLY* if a developer
 asked you to send it (and be extremely careful, this file can contain personal
 data like passwords and contents of your chats).
@@ -80,7 +80,7 @@ https://github.com/weechat/weechat/milestones[milestones] on GitHub.
 Pull requests on GitHub are welcome for minor new features.
 
 For major new features, it's better to discuss about it in IRC
-(server: 'chat.freenode.net', channel '#weechat').
+(server: _chat.freenode.net_, channel _#weechat_).
 
 Before submitting any pull request, be sure you have read the
 https://weechat.org/files/doc/devel/weechat_dev.en.html#coding_rules[coding rules]

Makefile.am

@@ -31,17 +31,17 @@ endif
 
 SUBDIRS = po doc intl src $(tests_dir)
 
-EXTRA_DIST = AUTHORS.asciidoc \
-             ChangeLog.asciidoc \
-             Contributing.asciidoc \
-             README.asciidoc \
-             ReleaseNotes.asciidoc \
+EXTRA_DIST = AUTHORS.adoc \
+             ChangeLog.adoc \
+             Contributing.adoc \
+             README.adoc \
+             ReleaseNotes.adoc \
              CMakeLists.txt \
              config.rpath \
              config.h.cmake \
              makedist.sh \
              cmake/CMakeParseArguments.cmake \
-             cmake/FindAsciidoc.cmake \
+             cmake/FindAsciidoctor.cmake \
              cmake/FindAspell.cmake \
              cmake/FindCppUTest.cmake \
              cmake/FindENCHANT.cmake \
@@ -57,7 +57,6 @@ EXTRA_DIST = AUTHORS.asciidoc \
              cmake/FindPkgConfig.cmake \
              cmake/FindPython.cmake \
              cmake/FindRuby.cmake \
-             cmake/FindSourcehighlight.cmake \
              cmake/FindTCL.cmake \
              cmake/FindV8.cmake \
              cmake/FindZLIB.cmake \

README.adoc

@@ -52,8 +52,7 @@ Following packages are optional:
 * for SSL: gnutls, ca-certificates
 * for spell checking: aspell
 * for scripting: python, perl, ruby, lua, tcl, guile, libv8 (javascript)
-* for building doc: asciidoc, source-highlight
-  (for man page: xsltproc, docbook-xml, docbook-xsl)
+* for building doc and man page: asciidoctor
 * for building tests: C++ compiler, CppUTest
 
 For a complete list of dependencies and versions recommended, please look at

cmake/FindAsciidoc.cmake

@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2003-2016 Sébastien Helleu <flashcode@flashtux.org>
-#
-# This file is part of WeeChat, the extensible chat client.
-#
-# WeeChat is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# WeeChat is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# - Find Asciidoc
-# This module finds if asciidoc (version 8 or newer) is installed.
-
-if(ASCIIDOC_FOUND)
-  # Already in cache, be silent
-  set(ASCIIDOC_FIND_QUIETLY TRUE)
-endif()
-
-find_program(
-  ASCIIDOC_EXECUTABLE asciidoc
-  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
-)
-
-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
-    )
-
-  string(STRIP ${ASCIIDOC_VERSION} ASCIIDOC_VERSION)
-  string(REPLACE "asciidoc " "" ASCIIDOC_VERSION ${ASCIIDOC_VERSION})
-
-  if(ASCIIDOC_VERSION VERSION_EQUAL "8.0.0" OR ASCIIDOC_VERSION VERSION_GREATER "8.0.0")
-    set(ASCIIDOC_FOUND TRUE)
-  endif()
-
-  mark_as_advanced(
-    ASCIIDOC_EXECUTABLE
-    ASCIIDOC_VERSION
-    )
-endif()

cmake/FindAsciidoctor.cmake

@@ -1,6 +1,5 @@
 #
 # Copyright (C) 2003-2016 Sébastien Helleu <flashcode@flashtux.org>
-# Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -18,22 +17,33 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# - Find Source-Highlight
-# This module finds if source-highlight is installed.
+# - Find Asciidoctor
+# This module finds if asciidoctor (version 1.5.4 or newer) is installed.
 
-if(SOURCEHIGHLIGHT_FOUND)
+if(ASCIIDOCTOR_FOUND)
   # Already in cache, be silent
-  set(SOURCEHIGHLIGHT_FIND_QUIETLY TRUE)
+  set(ASCIIDOCTOR_FIND_QUIETLY TRUE)
 endif()
 
 find_program(
-  SOURCEHIGHLIGHT_EXECUTABLE source-highlight
+  ASCIIDOCTOR_EXECUTABLE asciidoctor
   PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )
 
-if(SOURCEHIGHLIGHT_EXECUTABLE)
-  set(SOURCEHIGHLIGHT_FOUND TRUE)
+if(ASCIIDOCTOR_EXECUTABLE)
+  execute_process(
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
+    OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
+    )
+
+  string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")
+
+  if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.4" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.4")
+    set(ASCIIDOCTOR_FOUND TRUE)
+  endif()
+
   mark_as_advanced(
-    SOURCEHIGHLIGHT_EXECUTABLE
+    ASCIIDOCTOR_EXECUTABLE
+    ASCIIDOCTOR_VERSION
     )
 endif()

cmake/FindPython.cmake

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

configure.ac

@@ -58,7 +58,7 @@ solaris*)
 esac
 
 # Gettext
-ALL_LINGUAS="cs de es fr hu it ja pl pt_BR ru tr"
+ALL_LINGUAS="cs de es fr hu it ja pl pt pt_BR ru tr"
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([0.18])
 
@@ -146,7 +146,7 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
-AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=no)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended because many "official" scripts won't work) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@@ -508,7 +508,7 @@ PYTHON_VERSION=
 
 if test "x$enable_python" = "xyes" ; then
     if test "x$enable_python3" = "xyes" ; then
-        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+        AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
     else
         AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
     fi
@@ -765,7 +765,7 @@ if test "x$enable_tcl" = "xyes" ; then
 
     AC_MSG_CHECKING(for tclConfig.sh)
     tcl_found="no"
-    tcl_dirs="/usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
+    tcl_dirs="/usr/lib/tcl8.6 /usr/lib64/tcl8.6 /usr/lib/tcl8.5 /usr/lib64/tcl8.5 /lib /lib64 /usr/lib /usr/lib64 /usr/tcl/lib /usr/tcl/lib64 /usr/local/tcl-8.6/lib /usr/local/tcl-8.6/lib64 /usr/local/tcl-8.5/lib /usr/local/tcl-8.5/lib64 /usr/local/lib /usr/local/lib64 /usr/local/tcl/lib /usr/local/tcl/lib64 /opt/lib /opt/lib64"
     if test "x$tclconfig" != "x" ; then
       tcl_dirs="${tclconfig} ${tcl_dirs}"
     fi
@@ -1128,54 +1128,35 @@ if test "x$enable_doc" = "xno"; then
 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 -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}])
-                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"
+    AC_CHECK_PROGS(ASCIIDOCTOR, [asciidoctor])
+    if test -n "$ASCIIDOCTOR"; then
+        AC_MSG_CHECKING([for asciidoctor version])
+        asciidoctor_version=`$ASCIIDOCTOR --version 2>/dev/null | head -n 1 | cut -d" " -f2`
+        case "${asciidoctor_version}" in
+        Asciidoctor' '0.*|Asciidoctor' '1.5.[0-3]*)
+                AC_MSG_RESULT([${asciidoctor_version} (too old)])
+                not_found="$not_found asciidoctor"
                 enable_man="no"
                 enable_doc="no"
                 ;;
+        *)
+                AC_MSG_RESULT([${asciidoctor_version}])
+                if test "x$enable_man" = "xyes"; then
+                    msg_man="asciidoctor(${asciidoctor_version}) $msg_man"
+                    AC_DEFINE(MAN)
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    msg_doc="asciidoctor(${asciidoctor_version}) $msg_doc"
+                    AC_DEFINE(DOC)
+                fi
+                ;;
         esac
     else
-        not_found="$not_found asciidoc"
+        not_found="$not_found asciidoctor"
         enable_man="no"
         enable_doc="no"
     fi
-    AC_SUBST(ASCIIDOC)
-    AC_SUBST(A2X)
+    AC_SUBST(ASCIIDOCTOR)
 fi
 
 # ------------------------------------------------------------------------------

debian-devel/control

@@ -3,11 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Sébastien Helleu <flashcode@flashtux.org>
 Build-Depends:
-    asciidoc (>= 8.5),
-    source-highlight,
-    xsltproc,
-    docbook-xsl,
-    docbook-xml,
+    asciidoctor (>= 1.5.4),
     debhelper (>= 9),
     dh-exec,
     cmake, pkg-config,
@@ -17,21 +13,22 @@ Build-Depends:
     python-dev,
     libaspell-dev,
     liblua5.1-0-dev,
-    tcl8.5-dev,
+    tcl8.6-dev,
     guile-2.0-dev,
     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
     libcurl4-gnutls-dev,
     libgcrypt20-dev,
     libgnutls28-dev,
     zlib1g-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: https://weechat.org/
-Vcs-Git: https://github.com/weechat/weechat.git
-Vcs-Browser: https://github.com/weechat/weechat
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
 
 Package: weechat-devel
 Architecture: all
 Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
 Conflicts: weechat
 Description: Fast, light and extensible chat client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -58,6 +55,7 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
 Conflicts: weechat-curses
 Recommends: weechat-devel-plugins (= ${binary:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - console client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -84,6 +82,7 @@ Package: weechat-devel-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: weechat-core
+Suggests: weechat-devel-doc (= ${source:Version})
 Description: Fast, light and extensible chat client - core files
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -109,6 +108,17 @@ Description: Fast, light and extensible chat client - plugins
   - IRC proxy
   - Trigger
 
+Package: weechat-devel-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: weechat-doc
+Description: Fast, light and extensible chat client - documentation
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ .
+ This package contains the html documentation for WeeChat.
+
 Package: weechat-devel-dev
 Section: devel
 Architecture: all

debian-devel/rules

@@ -7,7 +7,7 @@ $(BUILDDIR)/Makefile:
 	cd $(BUILDDIR) && \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
-		-DENABLE_DOC:BOOL=OFF \
+		-DENABLE_DOC:BOOL=ON \
 		-DENABLE_MAN:BOOL=ON \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
@@ -24,7 +24,7 @@ override_dh_auto_configure:
 	echo
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.asciidoc
+	dh_installchangelogs ChangeLog.adoc
 
 override_dh_strip:
 	dh_strip --dbg-package=weechat-devel-dbg

debian-devel/weechat-devel-doc.doc-base.dev-en

@@ -0,0 +1,10 @@
+Document: weechat-dev-en
+Title: WeeChat developer's guide (English)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.en.html

debian-devel/weechat-devel-doc.doc-base.dev-fr

@@ -0,0 +1,10 @@
+Document: weechat-dev-fr
+Title: WeeChat developer's guide (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.fr.html

debian-devel/weechat-devel-doc.doc-base.dev-ja

@@ -0,0 +1,10 @@
+Document: weechat-dev-ja
+Title: WeeChat developer's guide (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_dev.ja.html

debian-devel/weechat-devel-doc.doc-base.faq-de

@@ -0,0 +1,10 @@
+Document: weechat-faq-de
+Title: WeeChat FAQ (German)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.de.html

debian-devel/weechat-devel-doc.doc-base.faq-en

@@ -0,0 +1,10 @@
+Document: weechat-faq-en
+Title: WeeChat FAQ (English)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.en.html

debian-devel/weechat-devel-doc.doc-base.faq-fr

@@ -0,0 +1,10 @@
+Document: weechat-faq-fr
+Title: WeeChat FAQ (French)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.fr.html

debian-devel/weechat-devel-doc.doc-base.faq-it

@@ -0,0 +1,10 @@
+Document: weechat-faq-it
+Title: WeeChat FAQ (Italian)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.it.html

debian-devel/weechat-devel-doc.doc-base.faq-ja

@@ -0,0 +1,10 @@
+Document: weechat-faq-ja
+Title: WeeChat FAQ (Japanese)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.ja.html

debian-devel/weechat-devel-doc.doc-base.faq-pl

@@ -0,0 +1,10 @@
+Document: weechat-faq-pl
+Title: WeeChat FAQ (Polish)
+Author: Sébastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_faq.pl.html

debian-devel/weechat-devel-doc.doc-base.plugin-en

@@ -0,0 +1,10 @@
+Document: weechat-plugin-en
+Title: WeeChat plugin API reference (English)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.en.html

debian-devel/weechat-devel-doc.doc-base.plugin-fr

@@ -0,0 +1,10 @@
+Document: weechat-plugin-fr
+Title: WeeChat plugin API reference (French)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.fr.html

debian-devel/weechat-devel-doc.doc-base.plugin-it

@@ -0,0 +1,10 @@
+Document: weechat-plugin-it
+Title: WeeChat plugin API reference (Italian)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.it.html

debian-devel/weechat-devel-doc.doc-base.plugin-ja

@@ -0,0 +1,10 @@
+Document: weechat-plugin-ja
+Title: WeeChat plugin API reference (Japanese)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_plugin_api.ja.html

debian-devel/weechat-devel-doc.doc-base.quickstart-de

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-de
+Title: WeeChat quick start guide (German)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.de.html

debian-devel/weechat-devel-doc.doc-base.quickstart-en

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-en
+Title: WeeChat quick start guide (English)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.en.html

debian-devel/weechat-devel-doc.doc-base.quickstart-es

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-es
+Title: WeeChat quick start guide (Spanish)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (Spanish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.es.html

debian-devel/weechat-devel-doc.doc-base.quickstart-fr

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-fr
+Title: WeeChat quick start guide (French)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.fr.html

debian-devel/weechat-devel-doc.doc-base.quickstart-it

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-it
+Title: WeeChat quick start guide (Italian)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.it.html

debian-devel/weechat-devel-doc.doc-base.quickstart-ja

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-ja
+Title: WeeChat quick start guide (Japanese)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ja.html

debian-devel/weechat-devel-doc.doc-base.quickstart-pl

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-pl
+Title: WeeChat quick start guide (Polish)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.pl.html

debian-devel/weechat-devel-doc.doc-base.quickstart-ru

@@ -0,0 +1,9 @@
+Document: weechat-quickstart-ru
+Title: WeeChat quick start guide (Russian)
+Author: Sébastien Helleu
+Abstract: A short HowTo for new WeeChat users (Russian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_quickstart.ru.html

debian-devel/weechat-devel-doc.doc-base.relay-protocol-en

@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-en
+Title: WeeChat Relay protocol (English)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.en.html

debian-devel/weechat-devel-doc.doc-base.relay-protocol-fr

@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-fr
+Title: WeeChat Relay protocol (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.fr.html

debian-devel/weechat-devel-doc.doc-base.relay-protocol-ja

@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-ja
+Title: WeeChat Relay protocol (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_protocol.ja.html

debian-devel/weechat-devel-doc.doc-base.scripting-de

@@ -0,0 +1,10 @@
+Document: weechat-scripting-de
+Title: WeeChat scripting guide (German)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.de.html

debian-devel/weechat-devel-doc.doc-base.scripting-en

@@ -0,0 +1,10 @@
+Document: weechat-scripting-en
+Title: WeeChat scripting guide (English)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.en.html

debian-devel/weechat-devel-doc.doc-base.scripting-fr

@@ -0,0 +1,10 @@
+Document: weechat-scripting-fr
+Title: WeeChat scripting guide (French)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.fr.html

debian-devel/weechat-devel-doc.doc-base.scripting-it

@@ -0,0 +1,10 @@
+Document: weechat-scripting-it
+Title: WeeChat scripting guide (Italian)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.it.html

debian-devel/weechat-devel-doc.doc-base.scripting-ja

@@ -0,0 +1,10 @@
+Document: weechat-scripting-ja
+Title: WeeChat scripting guide (Japanese)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.ja.html

debian-devel/weechat-devel-doc.doc-base.scripting-pl

@@ -0,0 +1,10 @@
+Document: weechat-scripting-pl
+Title: WeeChat scripting guide (Polish)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_scripting.pl.html

debian-devel/weechat-devel-doc.doc-base.tester-de

@@ -0,0 +1,10 @@
+Document: weechat-tester-de
+Title: WeeChat tester's guide (German)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.de.html

debian-devel/weechat-devel-doc.doc-base.tester-en

@@ -0,0 +1,10 @@
+Document: weechat-tester-en
+Title: WeeChat tester's guide (English)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.en.html

debian-devel/weechat-devel-doc.doc-base.tester-fr

@@ -0,0 +1,10 @@
+Document: weechat-tester-fr
+Title: WeeChat tester's guide (French)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.fr.html

debian-devel/weechat-devel-doc.doc-base.tester-it

@@ -0,0 +1,10 @@
+Document: weechat-tester-it
+Title: WeeChat tester's guide (Italian)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.it.html

debian-devel/weechat-devel-doc.doc-base.tester-ja

@@ -0,0 +1,10 @@
+Document: weechat-tester-ja
+Title: WeeChat tester's guide (Japanese)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.ja.html

debian-devel/weechat-devel-doc.doc-base.tester-pl

@@ -0,0 +1,10 @@
+Document: weechat-tester-pl
+Title: WeeChat tester's guide (Polish)
+Author: Sébastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_tester.pl.html

debian-devel/weechat-devel-doc.doc-base.user-de

@@ -0,0 +1,10 @@
+Document: weechat-user-de
+Title: WeeChat user's guide (German)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.de.html

debian-devel/weechat-devel-doc.doc-base.user-en

@@ -0,0 +1,10 @@
+Document: weechat-user-en
+Title: WeeChat user's guide (English)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.en.html

debian-devel/weechat-devel-doc.doc-base.user-fr

@@ -0,0 +1,10 @@
+Document: weechat-user-fr
+Title: WeeChat user's guide (French)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.fr.html

debian-devel/weechat-devel-doc.doc-base.user-it

@@ -0,0 +1,10 @@
+Document: weechat-user-it
+Title: WeeChat user's guide (Italian)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Italian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.it.html

debian-devel/weechat-devel-doc.doc-base.user-ja

@@ -0,0 +1,10 @@
+Document: weechat-user-ja
+Title: WeeChat user's guide (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.ja.html

debian-devel/weechat-devel-doc.doc-base.user-pl

@@ -0,0 +1,10 @@
+Document: weechat-user-pl
+Title: WeeChat user's guide (Polish)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_user.pl.html

debian-devel/weechat-devel-doc.install

@@ -0,0 +1 @@
+usr/share/doc/weechat/*.html usr/share/doc/weechat-devel-doc/html

debian-devel/weechat-devel-doc.links

@@ -0,0 +1 @@
+usr/share/doc/weechat-devel-doc/html usr/share/doc/weechat-devel/html

debian-stable/changelog

@@ -1,3 +1,30 @@
+weechat (1.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove patch to build ruby plugin against ruby2.3
+  * Bump Standards-Version to 3.9.8
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 03 May 2016 09:29:42 +0200
+
+weechat (1.4-2) unstable; urgency=medium
+
+  * Fix Vcs-(Git|Browser) fields to use secure URIs
+  * Enable hardening=+all build
+  * Add a patch to build ruby plugin against ruby2.3 (fix FTBFS). Thanks
+    to Christian Hofstaedtler for the patch (Closes: #816312)
+  * Build Tcl plugin against Tcl 8.6 (Closes: #812320)
+  * Bump Standards-Version to 3.9.7
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 04 Mar 2016 15:58:54 +0100
+
+weechat (1.4-1) unstable; urgency=medium
+
+  * New upstream release
+    - Update copyright (new year)
+    - Refresh XPM menu icon following upstream changes
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 15 Jan 2016 15:16:11 +0100
+
 weechat (1.3-1) unstable; urgency=medium
 
   * New upstream release

debian-stable/control

@@ -3,11 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
-    asciidoc (>= 8.5),
-    source-highlight,
-    xsltproc,
-    docbook-xsl,
-    docbook-xml,
+    asciidoctor (>= 1.5.4),
     debhelper (>= 9),
     dh-exec,
     cmake, pkg-config,
@@ -17,17 +13,17 @@ Build-Depends:
     python-dev,
     libaspell-dev,
     liblua5.1-0-dev,
-    tcl8.5-dev,
+    tcl8.6-dev,
     guile-2.0-dev,
     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
     libcurl4-gnutls-dev,
     libgcrypt20-dev,
     libgnutls28-dev,
     zlib1g-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: https://weechat.org/
-Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git
+Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
 
 Package: weechat
 Architecture: all

debian-stable/copyright

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

debian-stable/rules

@@ -24,7 +24,7 @@ override_dh_auto_configure:
 	echo
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.asciidoc
+	dh_installchangelogs ChangeLog.adoc
 
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg

debian-stable/weechat-core.docs

@@ -1,4 +1,4 @@
-AUTHORS.asciidoc
-Contributing.asciidoc
-README.asciidoc
-ReleaseNotes.asciidoc
+AUTHORS.adoc
+Contributing.adoc
+README.adoc
+ReleaseNotes.adoc

doc/CMakeLists.txt

@@ -20,29 +20,11 @@
 
 if(ENABLE_MAN OR ENABLE_DOC)
 
-  find_package(Sourcehighlight)
-  find_package(Asciidoc)
+  find_package(Asciidoctor)
 
-  if(ASCIIDOC_FOUND)
+  if(ASCIIDOCTOR_FOUND)
 
-    set(CSS_TOC -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/asciidoc_toc.css)
-    set(CSS_TOC2 -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/asciidoc_toc2.css)
-
-    set(ASCIIDOC_ARGS -a revision="${VERSION}" -f ${CMAKE_CURRENT_SOURCE_DIR}/asciidoc.conf)
-
-    # use html5 backend if available (asciidoc >= 8.6.5)
-    if(ASCIIDOC_VERSION VERSION_EQUAL "8.6.5" OR ASCIIDOC_VERSION VERSION_GREATER "8.6.5")
-      set(ASCIIDOC_ARGS -b html5 ${ASCIIDOC_ARGS})
-    endif()
-
-    set(ASCIIDOC_ARGS_USER       ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
-    set(ASCIIDOC_ARGS_API        ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
-    set(ASCIIDOC_ARGS_SCRIPTING  ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
-    set(ASCIIDOC_ARGS_FAQ        ${ASCIIDOC_ARGS} ${CSS_TOC}  -n)
-    set(ASCIIDOC_ARGS_QUICKSTART ${ASCIIDOC_ARGS} ${CSS_TOC2} -n)
-    set(ASCIIDOC_ARGS_TESTER     ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
-    set(ASCIIDOC_ARGS_RELAY      ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
-    set(ASCIIDOC_ARGS_DEV        ${ASCIIDOC_ARGS} ${CSS_TOC2}   )
+    set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
 
     add_subdirectory(en)
     add_subdirectory(fr)

doc/Makefile.am

@@ -21,13 +21,7 @@
 SUBDIRS = . en fr it de pl es ru ja cs
 
 EXTRA_DIST = docgen.py \
-             CMakeLists.txt \
-             asciidoc.conf \
-             asciidoc_toc.css \
-             asciidoc_toc2.css
+             CMakeLists.txt
 
 uninstall-hook:
 	-rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE)
-
-clean-local:
-	-rm -f asciidoc_toc.css asciidoc_toc2.css

doc/asciidoc.conf

@@ -1,12 +0,0 @@
-[attributes]
-date={sys: date +%F}
-
-[replacements]
-key\[([^,\]]+),([^\]]+)\]=key[\1], key[\2]
-key\[(ctrl|alt|shift)\]=<span class="key \1">\1</span>
-key\[(ctrl|alt|shift)-\]=<span class="key \1">\1</span><span class="keyplus">+</span>
-key\[(ctrl|alt|shift)-([^\]]+)\]=<span class="key \1">\1</span><span class="keyplus">+</span>key[\2]
-key\[([A-Za-z0-9/_&\=!-])\]=<span class="key">\1</span>
-key\[([a-z0-9/_&\=!-][^\]]*)\]=<span class="key">\1</span>
-key\[([^\]]+)\]=<span class="key other">\1</span>
-hex\[([0-9a-fA-F]+)\]=<span class="hexa">\1</span>

doc/asciidoc_toc.css

@@ -1,197 +0,0 @@
-/* Custom asciidoc styles */
-
-body {
-  margin: 1em 2em;
-  font-family: verdana, sans-serif;
-  font-size: 12px;
-}
-div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer {
-  font-family: verdana, sans-serif;
-}
-a, a:visited, a:hover, a:active {
-  color: #00c;
-  text-decoration: none;
-}
-em {
-  color: #252;
-}
-strong {
-  color: #000;
-}
-tt {
-  color: #366;
-}
-#author {
-  color: #555;
-}
-#toc {
-  line-height: 1.4em;
-  padding-bottom: 3em;
-}
-#toctitle {
-  margin-bottom: .6em;
-  color: #555;
-}
-#toc .toclevel0, #toc .toclevel1 {
-  display: block;
-  font-size: 1em;
-}
-#toc .toclevel2, #toc .toclevel3, #toc .toclevel4 {
-  display: block;
-  font-size: 1em;
-}
-h1, h2, h3, h4, h5, h6 {
-  margin: 1.2em 0;
-}
-h1 {
-  padding: 1.2em;
-  border: 1px solid #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: 1px solid #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 {
-  padding: .2em .5em;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-shadow: 1px 1px 2px #ccc;
-  margin-right: 12px;
-  background: #eee;
-  font-size: 1.1em;
-}
-p.table {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-div.listingblock > div.content {
-  border: 1px solid #e2e2e2;
-  border-radius: 4px;
-  background: #fbfbfb;
-}
-.listingblock pre {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-table th {
-  background: #fbfbfb;
-  color: #000;
-  font-size: 1.1em;
-}
-table.tableblock, th.tableblock, td.tableblock, .tableblock table th, .tableblock table td {
-  border: 1px solid #bbb;
-}
-table.tableblock {
-  border: 2px solid #888;
-}
-div.title {
-  color: #525252;
-}
-div.admonitionblock .icon {
-  text-decoration: none;
-}
-dt.hdlist1 {
-  margin-bottom: .5em;
-  color: #252;
-}
-.ulist {
-  word-wrap: break-word;
-}
-.key {
-  padding: .1em .4em;
-  border-top: 1px solid #d5d5e5;
-  border-left: 1px solid #d5d5e5;
-  border-bottom: 1px solid #a5a5b5;
-  border-right: 1px solid #a5a5b5;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d5d5e5;
-  margin: 0 2px;
-  background: #eef;
-  font-family: monospace;
-  font-size: 1.1em;
-  line-height: 1.6em;
-}
-.key.ctrl {
-  border-top: 1px solid #dfd0d0;
-  border-left: 1px solid #dfd0d0;
-  border-bottom: 1px solid #afa0a0;
-  border-right: 1px solid #afa0a0;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #dfd0d0;
-  background: #fff0f0;
-  text-transform: capitalize;
-}
-.key.alt {
-  border-top: 1px solid #dfc5b4;
-  border-left: 1px solid #dfc5b4;
-  border-bottom: 1px solid #af9484;
-  border-right: 1px solid #af9484;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #dfc5b4;
-  background: #ffe4d4;
-  text-transform: capitalize;
-}
-.key.shift {
-  border-top: 1px solid #d5d5d5;
-  border-left: 1px solid #d5d5d5;
-  border-bottom: 1px solid #a5a5a5;
-  border-right: 1px solid #a5a5a5;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d5d5d5;
-  background: #f5f5f5;
-  text-transform: capitalize;
-}
-.key.other {
-  border-top: 1px solid #d0e0d0;
-  border-left: 1px solid #d0e0d0;
-  border-bottom: 1px solid #a0b0a0;
-  border-right: 1px solid #a0b0a0;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d0e0d0;
-  background: #eafaea;
-}
-.keyplus {
-  font-size: .8em;
-}
-.hexa {
-  padding: 0 .2em;
-  border: 1px solid #88b;
-  margin: 0 .2em;
-  color: #007;
-  font-family: monospace;
-  font-size: .85em;
-}
-#footer {
-  border-top: solid 1px silver;
-}

doc/asciidoc_toc2.css

@@ -1,219 +0,0 @@
-/* Custom asciidoc styles */
-
-body {
-  margin: 1em 2em;
-  font-family: verdana, sans-serif;
-  font-size: 12px;
-}
-div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer {
-  font-family: verdana, sans-serif;
-}
-a, a:visited, a:hover, a:active {
-  color: #00c;
-  text-decoration: none;
-}
-em {
-  color: #252;
-}
-strong {
-  color: #000;
-}
-tt {
-  color: #366;
-}
-#author {
-  color: #555;
-}
-#toc {
-  line-height: 1.4em;
-  padding-bottom: 3em;
-}
-#toctitle {
-  margin-bottom: .6em;
-  color: #555;
-}
-#toc .toclevel0, #toc .toclevel1 {
-  display: block;
-  font-size: 1em;
-}
-#toc .toclevel2, #toc .toclevel3, #toc .toclevel4 {
-  display: block;
-  font-size: 1em;
-}
-h1, h2, h3, h4, h5, h6 {
-  margin: 1.2em 0;
-}
-h1 {
-  padding: 1.2em;
-  border: 1px solid #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: 1px solid #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 {
-  padding: .2em .5em;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-shadow: 1px 1px 2px #ccc;
-  margin-right: 12px;
-  background: #eee;
-  font-size: 1.1em;
-}
-p.table {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-div.listingblock > div.content {
-  border: 1px solid #e2e2e2;
-  border-radius: 4px;
-  background: #fbfbfb;
-}
-.listingblock pre {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-table th {
-  background: #fbfbfb;
-  color: #000;
-  font-size: 1.1em;
-}
-table.tableblock, th.tableblock, td.tableblock, .tableblock table th, .tableblock table td {
-  border: 1px solid #bbb;
-}
-table.tableblock {
-  border: 2px solid #888;
-}
-div.title {
-  color: #525252;
-}
-div.admonitionblock .icon {
-  text-decoration: none;
-}
-dt.hdlist1 {
-  margin-bottom: .5em;
-  color: #252;
-}
-.ulist {
-  word-wrap: break-word;
-}
-.key {
-  padding: .1em .4em;
-  border-top: 1px solid #d5d5e5;
-  border-left: 1px solid #d5d5e5;
-  border-bottom: 1px solid #a5a5b5;
-  border-right: 1px solid #a5a5b5;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d5d5e5;
-  margin: 0 2px;
-  background: #eef;
-  font-family: monospace;
-  font-size: 1.1em;
-  line-height: 1.6em;
-}
-.key.ctrl {
-  border-top: 1px solid #dfd0d0;
-  border-left: 1px solid #dfd0d0;
-  border-bottom: 1px solid #afa0a0;
-  border-right: 1px solid #afa0a0;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #dfd0d0;
-  background: #fff0f0;
-  text-transform: capitalize;
-}
-.key.alt {
-  border-top: 1px solid #dfc5b4;
-  border-left: 1px solid #dfc5b4;
-  border-bottom: 1px solid #af9484;
-  border-right: 1px solid #af9484;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #dfc5b4;
-  background: #ffe4d4;
-  text-transform: capitalize;
-}
-.key.shift {
-  border-top: 1px solid #d5d5d5;
-  border-left: 1px solid #d5d5d5;
-  border-bottom: 1px solid #a5a5a5;
-  border-right: 1px solid #a5a5a5;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d5d5d5;
-  background: #f5f5f5;
-  text-transform: capitalize;
-}
-.key.other {
-  border-top: 1px solid #d0e0d0;
-  border-left: 1px solid #d0e0d0;
-  border-bottom: 1px solid #a0b0a0;
-  border-right: 1px solid #a0b0a0;
-  border-radius: 3px;
-  box-shadow: 1px 1px 3px #d0e0d0;
-  background: #eafaea;
-}
-.keyplus {
-  font-size: .8em;
-}
-.hexa {
-  padding: 0 .2em;
-  border: 1px solid #88b;
-  margin: 0 .2em;
-  color: #007;
-  font-family: monospace;
-  font-size: .85em;
-}
-#footer {
-  border-top: solid 1px silver;
-}
-
-/* Asciidoc styles with table of contents on the left (toc2) */
-
-body {
-  margin-left: 26em;
-  margin-right: 2em;
-}
-#toc {
-  width: 23em;
-}
-#toc .toclevel2 {
-  margin-left: 1.5em;
-  font-size: .9em;
-}
-#toc .toclevel3 {
-  margin-left: 3em;
-  font-size: .9em;
-}
-#toc .toclevel4 {
-  margin-left: 4.5em;
-  font-size: .9em;
-}

doc/cs/CMakeLists.txt

@@ -21,12 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc .
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.asciidoc .
-    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.cs.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (cs)"
   )
@@ -34,15 +32,15 @@ if(ENABLE_MAN)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)
 endif()
 
-if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
+if(ENABLE_DOC)
 
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.cs.html"
   )

doc/cs/Makefile.am

@@ -20,11 +20,11 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.cs.asciidoc \
-             cmdline_options.cs.asciidoc \
-             weechat_quickstart.cs.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.cs.adoc \
+             cmdline_options.cs.adoc \
+             weechat_quickstart.cs.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -39,17 +39,12 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.cs.asciidoc cmdline_options.cs.asciidoc
-	-mkdir tmp_man
-	cp -f $(abs_top_srcdir)/doc/cs/weechat.1.cs.asciidoc ./tmp_man/
-	cp -f $(abs_top_srcdir)/doc/cs/cmdline_options.cs.asciidoc ./tmp_man/
-	(cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.cs.asciidoc)
-	mv -f tmp_man/weechat.1 .
-	rm -rf tmp_man
+weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc
 
 # quickstart
-weechat_quickstart.cs.html: weechat_quickstart.cs.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.asciidoc
+weechat_quickstart.cs.html: weechat_quickstart.cs.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.adoc
 
 # install man/docs
 
@@ -78,5 +73,4 @@ uninstall-doc:
 # clean
 
 clean-local:
-	-rm -f weechat.1 weechat.1.cs.asciidoc cmdline_options.cs.asciidoc
-	-rm -f *.html
+	-rm -f weechat.1 weechat_*.html

doc/cs/cmdline_options.cs.adoc

@@ -4,10 +4,10 @@
 *-c*, *--colors*::
     Zobraz defaultní barvy v terminálu.
 
-*-d*, *--dir* '<path>'::
+*-d*, *--dir* _<path>_::
     Nastav cestu jako dovmský adresář pro WeeChat (použitou pro konfigurační
     soubory, logy, uživatelské pluginy a skripty), výchozí hodnota je
-    '~/.weechat' (poznámka: složka bude vytvořena pokud nebude nalezena
+    "~/.weechat" (poznámka: složka bude vytvořena pokud nebude nalezena
     Weechatem)
     Pokud tato volba není zadána, použije se promněná prostředí WEECHAT_HOME
     (pokud není prázdná)
@@ -21,7 +21,7 @@
 *-p*, *--no-plugin*::
     Vypne automatické nahrání pluginů.
 
-*-r*, *--run-command* '<command>'::
+*-r*, *--run-command* _<command>_::
     Spustí příkaz(y) po startu (více přůkazů může být odděleno středníky).
 
 *-s*, *--no-script*::

doc/cs/docinfo.html

@@ -0,0 +1 @@
+../docinfo.html

doc/cs/weechat.1.cs.adoc

@@ -1,6 +1,11 @@
-= WEECHAT(1)
+= weechat(1)
 :doctype: manpage
+:author: Sébastien Helleu
+:email: flashcode@flashtux.org
 :lang: cs
+// TRANSLATION MISSING
+:man manual: WeeChat Manual
+:man source: WeeChat {revnumber}
 
 == JMÉNO
 
@@ -9,11 +14,11 @@ weechat - the extensible chat client
 == PŘEHLED
 
 [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' [-l|--license]
-'weechat' [-v|--version]
+*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* [-l|--license]
+*weechat* [-v|--version]
 
 == POPIS
 
@@ -23,7 +28,7 @@ Je velmi připůsobitelný a rozšiřitelný s skripty.
 
 == VOLBY
 
-include::cmdline_options.cs.asciidoc[]
+include::cmdline_options.cs.adoc[]
 
 == VOLBY PLUGINŮ
 
@@ -54,49 +59,49 @@ $HOME/.weechat/sec.conf::
     konfigurační soubor s chráněnými daty
 
 $HOME/.weechat/alias.conf::
-    configurační soubor pro 'alias' plugin
+    configurační soubor pro _alias_ plugin
 
 $HOME/.weechat/aspell.conf::
-    konfigurační soubor pro 'aspell' plugin
+    konfigurační soubor pro _aspell_ plugin
 
 $HOME/.weechat/charset.conf::
-    konfigurační soubor pro 'charset' plugin
+    konfigurační soubor pro _charset_ plugin
 
 $HOME/.weechat/exec.conf::
-    konfigurační soubor pro 'exec' plugin
+    konfigurační soubor pro _exec_ plugin
 
 $HOME/.weechat/irc.conf::
-    konfigurační soubor pro 'irc' plugin
+    konfigurační soubor pro _irc_ plugin
 
 $HOME/.weechat/logger.conf::
-    konfigurační soubor pro 'logger' plugin
+    konfigurační soubor pro _logger_ plugin
 
 $HOME/.weechat/relay.conf::
-    konfigurační soubor pro 'relay' plugin
+    konfigurační soubor pro _relay_ plugin
 
 $HOME/.weechat/script.conf::
-    konfigurační soubor pro 'script' plugin
+    konfigurační soubor pro _script_ plugin
 
 $HOME/.weechat/trigger.conf::
-    konfigurační soubor pro 'trigger' plugin
+    konfigurační soubor pro _trigger_ plugin
 
 $HOME/.weechat/xfer.conf::
-    konfigurační soubor pro 'xfer' plugin
+    konfigurační soubor pro _xfer_ plugin
 
 $HOME/.weechat/weechat.log::
     soubor záznamů WeeChatu
 
 == AUTOŘI
 
-Tato manuálová stránka byla napsána Sébastienem Helleu <flashcode@flashtux.org>.
-Tato manuálová stránka byla přeložena Ondřejem Súkupem <mimi.vx@gmail.com>
+Tato manuálová stránka byla napsána {author}.
+Tato manuálová stránka byla přeložena Ondřejem Súkupem.
 
 == COPYRIGHT
 
 WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.asciidoc).
+souboru AUTHORS.adoc).
 
-Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org>
+Copyright (C) 2003-2016 {author}
 
 WeeChat je svobodný software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -105,8 +110,8 @@ the Free Software Foundation; either version 3 of the License, or
 
 Prosím přečtěte si soubor COPYING pro více informací.
 
-Web: <https://weechat.org/>
+Web: https://weechat.org/
 
 == PODPORA / HLÁŠENÍ CHYB
 
-Pro pomoc nebo hlášení chyb <https://weechat.org/dev/support>
+Pro pomoc nebo hlášení chyb https://weechat.org/dev/support

doc/cs/weechat_quickstart.cs.adoc

@@ -2,8 +2,9 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: cs
-:toc2:
-:max-width: 100%
+:toc: left
+:sectnums:
+:docinfo1:
 
 
 [[start]]
@@ -160,7 +161,7 @@ K spuštění příkazů po připojení k serveru, například k autentizaci s n
 ----
 
 [NOTE]
-Více příkazů v volbě 'command' bůže být odděleno pomocí ';' (středník).
+Více příkazů v volbě _command_ bůže být odděleno pomocí `;` (středník).
 
 // TRANSLATION MISSING
 If you want to protect your password in configuration files, you can use
@@ -181,7 +182,7 @@ Then add a secured data with your freenode password:
 ----
 
 // TRANSLATION MISSING
-Then you can use `${sec.data.freenode_password}` instead of your password in
+Then you can use `+${sec.data.freenode_password}+` instead of your password in
 IRC options mentioned above, for example:
 
 ----
@@ -220,8 +221,8 @@ Tento příkaz může být použit k vytvoření nového připojení k serveru b
 použití příkazu `/server` (mohu zopakovat že můžete zobrazit nápovědu
 pro tento příkaz s `/help connect` ?).
 
-Ve výchozím nastavení jsou serverové bufery spojen s Weechat 'core' buferem.
-K přepnutí mezi 'core' a server bufery můžete použít klávesu [ctrl-x].
+Ve výchozím nastavení jsou serverové bufery spojen s Weechat _core_ buferem.
+K přepnutí mezi _core_ a server bufery můžete použít klávesu kbd:[Ctrl+x].
 
 Je možné vypnout automatické sloučení serverových buferů a mít nezávislé
 serverové bufery:
@@ -267,7 +268,7 @@ Disconnect from server, on the server buffer:
 [[irc_private_messages]]
 == IRC soukromé zprávy
 
-Otevření buferu a poslání soukromé zprávy jinému uživateli (přezdívka 'foo'):
+Otevření buferu a poslání soukromé zprávy jinému uživateli (přezdívka _foo_):
 
 ----
 /query foo tato zpráva
@@ -305,25 +306,32 @@ okno (2/3), použijte příkaz:
 /window splitv 33
 ----
 
+// TRANSLATION MISSING
+To remove the split:
+
+----
+/window merge
+----
+
 [[key_bindings]]
 == Předvoblby klávesových zkratek
 
 Weechat používá ve výchozím nastavení mnoho klávesových zkratek, Všechny
 najdete v dokumentaci, ale je dobré znát alespoň pár těchto důležitých:
 
-- key[alt-]key[←]/key[→] nebo key[F5]/key[F6]: přepnout na předchozí/další bufer
-- key[F7]/key[F8]: přepnout na předchozí/další okno (pokud je obrazovka rozdělena)
-- key[F9]/key[F10]: posunoutí titulku
-- key[F11]/key[F12]: posunutí seznamu přezdívek
-- key[Tab]: doplnění textu v vstupním řádku, podobně jak v shellu
-- key[PgUp]/key[PgDn]: posunutí textu v aktuálním buferu
-- key[alt-a]: přepni do aktivního buferu (v seznamu)
+- kbd:[Alt+←] / kbd:[Alt+→] nebo kbd:[F5] / kbd:[F6]: přepnout na předchozí/další bufer
+- kbd:[F7] / kbd:[F8]: přepnout na předchozí/další okno (pokud je obrazovka rozdělena)
+- kbd:[F9] / kbd:[F10]: posunoutí titulku
+- kbd:[F11] / kbd:[F12]: posunutí seznamu přezdívek
+- kbd:[Tab]: doplnění textu v vstupním řádku, podobně jak v shellu
+- kbd:[PgUp] / kbd:[PgDn]: posunutí textu v aktuálním buferu
+- kbd:[Alt+a]: přepni do aktivního buferu (v seznamu)
 
 Dle Vaší klávesnice a/nebo vašich potřeb, můžete přenastavit jakoukoliv
 klávesovou zkratku pomocí příkazu `/key`.
-Užitečná zkratka je key[alt-k] k najítí kodů kláves.
+Užitečná zkratka je kbd:[Alt+k] k najítí kodů kláves.
 
-Například k nastavení zkratky key[alt-!] na příkaz `/buffer close`:
+Například k nastavení zkratky kbd:[Alt+!] na příkaz `/buffer close`:
 
 ----
 /key bind (press alt-k) (press alt-!) /buffer close

doc/de/CMakeLists.txt

@@ -21,12 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc .
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc .
-    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (de)"
   )
@@ -34,17 +32,17 @@ if(ENABLE_MAN)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)
 endif()
 
-if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
+if(ENABLE_DOC)
 
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.de.html"
   )
@@ -54,10 +52,10 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.de.html"
   )
@@ -67,10 +65,10 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.de.html"
   )
@@ -80,10 +78,10 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.de.html"
   )
@@ -93,10 +91,10 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.de.html"
   )

doc/de/Makefile.am

@@ -21,14 +21,14 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.de.asciidoc \
-             cmdline_options.de.asciidoc \
-             weechat_user.de.asciidoc \
-             weechat_scripting.de.asciidoc \
-             weechat_faq.de.asciidoc \
-             weechat_quickstart.de.asciidoc \
-             weechat_tester.de.asciidoc \
-             $(wildcard autogen/user/*.asciidoc)
+             weechat.1.de.adoc \
+             cmdline_options.de.adoc \
+             weechat_user.de.adoc \
+             weechat_scripting.de.adoc \
+             weechat_faq.de.adoc \
+             weechat_quickstart.de.adoc \
+             weechat_tester.de.adoc \
+             $(wildcard autogen/user/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -47,33 +47,28 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.de.asciidoc cmdline_options.de.asciidoc
-	-mkdir tmp_man
-	cp -f $(abs_top_srcdir)/doc/de/weechat.1.de.asciidoc ./tmp_man/
-	cp -f $(abs_top_srcdir)/doc/de/cmdline_options.de.asciidoc ./tmp_man/
-	(cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.de.asciidoc)
-	mv -f tmp_man/weechat.1 .
-	rm -rf tmp_man
+weechat.1: weechat.1.de.adoc cmdline_options.de.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc
 
 # user's guide
-weechat_user.de.html: weechat_user.de.asciidoc cmdline_options.de.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.asciidoc
+weechat_user.de.html: weechat_user.de.adoc cmdline_options.de.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.adoc
 
 # scripting guide
-weechat_scripting.de.html: weechat_scripting.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.asciidoc
+weechat_scripting.de.html: weechat_scripting.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.adoc
 
 # FAQ
-weechat_faq.de.html: weechat_faq.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.asciidoc
+weechat_faq.de.html: weechat_faq.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.adoc
 
 # quickstart
-weechat_quickstart.de.html: weechat_quickstart.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.asciidoc
+weechat_quickstart.de.html: weechat_quickstart.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.adoc
 
 # tester's guide
-weechat_tester.de.html: weechat_tester.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css
-	$(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.asciidoc
+weechat_tester.de.html: weechat_tester.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=prettify -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.adoc
 
 # install man/docs
 
@@ -102,5 +97,4 @@ uninstall-doc:
 # clean
 
 clean-local:
-	-rm -f weechat.1 weechat.1.de.asciidoc cmdline_options.de.asciidoc
-	-rm -f *.html
+	-rm -f weechat.1 weechat_*.html

doc/de/autogen/plugin_api/completions.adoc

@@ -2,7 +2,7 @@
 // This file is auto-generated by script docgen.py.
 // DO NOT EDIT BY HAND!
 //
-[width="65%",cols="^1,^2,8",options="header"]
+[width="100%",cols="^1,^2,7",options="header"]
 |===
 | Erweiterung | Name | Beschreibung
 
@@ -102,6 +102,8 @@
 
 | trigger | trigger_options | Einstellungen für Trigger
 
+| trigger | trigger_post_action | nachfolgende Aktion für Trigger
+
 | weechat | bars_names | Namen der Infobars
 
 | weechat | bars_options | Einstellungen für Infobars

doc/de/autogen/plugin_api/hdata.adoc

@@ -0,0 +1,974 @@
+//
+// This file is auto-generated by script docgen.py.
+// DO NOT EDIT BY HAND!
+//
+:hdata_update_create: __create
+:hdata_update_delete: __delete
+[width="100%",cols="^1,^2,2,2,5",options="header"]
+|===
+| Erweiterung | Name | Beschreibung | Listen | Variablen
+
+| guile
+| [[hdata_guile_script]]<<hdata_guile_script,guile_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "guile_script") +
+_next_script_   (pointer, hdata: "guile_script") +
+
+
+| irc
+| [[hdata_irc_channel]]<<hdata_irc_channel,irc_channel>>
+| IRC-Channel
+| -
+| _type_   (integer) +
+_name_   (string) +
+_topic_   (string) +
+_modes_   (string) +
+_limit_   (integer) +
+_key_   (string) +
+_join_msg_received_   (hashtable) +
+_checking_whox_   (integer) +
+_away_message_   (string) +
+_has_quit_server_   (integer) +
+_cycle_   (integer) +
+_part_   (integer) +
+_nick_completion_reset_   (integer) +
+_pv_remote_nick_color_   (string) +
+_hook_autorejoin_   (pointer) +
+_nicks_count_   (integer) +
+_nicks_   (pointer, hdata: "irc_nick") +
+_last_nick_   (pointer, hdata: "irc_nick") +
+_nicks_speaking_   (pointer) +
+_nicks_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
+_last_nick_speaking_time_   (pointer, hdata: "irc_channel_speaking") +
+_join_smart_filtered_   (hashtable) +
+_buffer_   (pointer, hdata: "buffer") +
+_buffer_as_string_   (string) +
+_prev_channel_   (pointer, hdata: "irc_channel") +
+_next_channel_   (pointer, hdata: "irc_channel") +
+
+
+| irc
+| [[hdata_irc_channel_speaking]]<<hdata_irc_channel_speaking,irc_channel_speaking>>
+| IRC channel_speaking
+| -
+| _nick_   (string) +
+_time_last_message_   (time) +
+_prev_nick_   (pointer, hdata: "irc_channel_speaking") +
+_next_nick_   (pointer, hdata: "irc_channel_speaking") +
+
+
+| irc
+| [[hdata_irc_ignore]]<<hdata_irc_ignore,irc_ignore>>
+| IRC ignorieren
+| _irc_ignore_list_ +
+_last_irc_ignore_ +
+
+| _number_   (integer) +
+_mask_   (string) +
+_regex_mask_   (pointer) +
+_server_   (string) +
+_channel_   (string) +
+_prev_ignore_   (pointer, hdata: "irc_ignore") +
+_next_ignore_   (pointer, hdata: "irc_ignore") +
+
+
+| irc
+| [[hdata_irc_nick]]<<hdata_irc_nick,irc_nick>>
+| IRC-Nick
+| -
+| _name_   (string) +
+_host_   (string) +
+_prefixes_   (string) +
+_prefix_   (string) +
+_away_   (integer) +
+_account_   (string) +
+_realname_   (string) +
+_color_   (string) +
+_prev_nick_   (pointer, hdata: "irc_nick") +
+_next_nick_   (pointer, hdata: "irc_nick") +
+
+
+| irc
+| [[hdata_irc_notify]]<<hdata_irc_notify,irc_notify>>
+| IRC-Benachrichtigungen
+| -
+| _server_   (pointer, hdata: "irc_server") +
+_nick_   (string) +
+_check_away_   (integer) +
+_is_on_server_   (integer) +
+_away_message_   (string) +
+_ison_received_   (integer) +
+_prev_notify_   (pointer, hdata: "irc_notify") +
+_next_notify_   (pointer, hdata: "irc_notify") +
+
+
+| irc
+| [[hdata_irc_redirect]]<<hdata_irc_redirect,irc_redirect>>
+| IRC Weiterleitung
+| -
+| _server_   (pointer, hdata: "irc_server") +
+_pattern_   (string) +
+_signal_   (string) +
+_count_   (integer) +
+_current_count_   (integer) +
+_string_   (string) +
+_timeout_   (integer) +
+_command_   (string) +
+_assigned_to_command_   (integer) +
+_start_time_   (time) +
+_cmd_start_   (hashtable) +
+_cmd_stop_   (hashtable) +
+_cmd_extra_   (hashtable) +
+_cmd_start_received_   (integer) +
+_cmd_stop_received_   (integer) +
+_cmd_filter_   (hashtable) +
+_output_   (string) +
+_output_size_   (integer) +
+_prev_redirect_   (pointer, hdata: "irc_redirect") +
+_next_redirect_   (pointer, hdata: "irc_redirect") +
+
+
+| irc
+| [[hdata_irc_redirect_pattern]]<<hdata_irc_redirect_pattern,irc_redirect_pattern>>
+| Muster für IRC Weiterleitung
+| _irc_redirect_patterns_ +
+_last_irc_redirect_pattern_ +
+
+| _name_   (string) +
+_temp_pattern_   (integer) +
+_timeout_   (integer) +
+_cmd_start_   (string) +
+_cmd_stop_   (string) +
+_cmd_extra_   (string) +
+_prev_redirect_   (pointer, hdata: "irc_redirect_pattern") +
+_next_redirect_   (pointer, hdata: "irc_redirect_pattern") +
+
+
+| irc
+| [[hdata_irc_server]]<<hdata_irc_server,irc_server>>
+| IRC-Server
+| _irc_servers_ +
+_last_irc_server_ +
+
+| _name_   (string) +
+_options_   (pointer) +
+_temp_server_   (integer) +
+_reloading_from_config_   (integer) +
+_reloaded_from_config_   (integer) +
+_addresses_count_   (integer) +
+_addresses_array_   (string, array_size: "addresses_count") +
+_ports_array_   (integer, array_size: "addresses_count") +
+_retry_array_   (integer, array_size: "addresses_count") +
+_index_current_address_   (integer) +
+_current_address_   (string) +
+_current_ip_   (string) +
+_current_port_   (integer) +
+_current_retry_   (integer) +
+_sock_   (integer) +
+_hook_connect_   (pointer, hdata: "hook") +
+_hook_fd_   (pointer, hdata: "hook") +
+_hook_timer_connection_   (pointer, hdata: "hook") +
+_hook_timer_sasl_   (pointer, hdata: "hook") +
+_is_connected_   (integer) +
+_ssl_connected_   (integer) +
+_disconnected_   (integer) +
+_gnutls_sess_   (other) +
+_tls_cert_   (other) +
+_tls_cert_key_   (other) +
+_unterminated_message_   (string) +
+_nicks_count_   (integer) +
+_nicks_array_   (string, array_size: "nicks_count") +
+_nick_first_tried_   (integer) +
+_nick_alternate_number_   (integer) +
+_nick_   (string) +
+_nick_modes_   (string) +
+_cap_away_notify_   (integer) +
+_cap_account_notify_   (integer) +
+_cap_extended_join_   (integer) +
+_isupport_   (string) +
+_prefix_modes_   (string) +
+_prefix_chars_   (string) +
+_nick_max_length_   (integer) +
+_casemapping_   (integer) +
+_chantypes_   (string) +
+_chanmodes_   (string) +
+_monitor_   (integer) +
+_monitor_time_   (time) +
+_reconnect_delay_   (integer) +
+_reconnect_start_   (time) +
+_command_time_   (time) +
+_reconnect_join_   (integer) +
+_disable_autojoin_   (integer) +
+_is_away_   (integer) +
+_away_message_   (string) +
+_away_time_   (time) +
+_lag_   (integer) +
+_lag_displayed_   (integer) +
+_lag_check_time_   (other) +
+_lag_next_check_   (time) +
+_lag_last_refresh_   (time) +
+_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") +
+_last_redirect_   (pointer, hdata: "irc_redirect") +
+_notify_list_   (pointer, hdata: "irc_notify") +
+_last_notify_   (pointer, hdata: "irc_notify") +
+_notify_count_   (integer) +
+_join_manual_   (hashtable) +
+_join_channel_key_   (hashtable) +
+_join_noswitch_   (hashtable) +
+_buffer_   (pointer, hdata: "buffer") +
+_buffer_as_string_   (string) +
+_channels_   (pointer, hdata: "irc_channel") +
+_last_channel_   (pointer, hdata: "irc_channel") +
+_prev_server_   (pointer, hdata: "irc_server") +
+_next_server_   (pointer, hdata: "irc_server") +
+
+
+| javascript
+| [[hdata_javascript_script]]<<hdata_javascript_script,javascript_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "javascript_script") +
+_next_script_   (pointer, hdata: "javascript_script") +
+
+
+| lua
+| [[hdata_lua_script]]<<hdata_lua_script,lua_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "lua_script") +
+_next_script_   (pointer, hdata: "lua_script") +
+
+
+| perl
+| [[hdata_perl_script]]<<hdata_perl_script,perl_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "perl_script") +
+_next_script_   (pointer, hdata: "perl_script") +
+
+
+| python
+| [[hdata_python_script]]<<hdata_python_script,python_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "python_script") +
+_next_script_   (pointer, hdata: "python_script") +
+
+
+| ruby
+| [[hdata_ruby_script]]<<hdata_ruby_script,ruby_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "ruby_script") +
+_next_script_   (pointer, hdata: "ruby_script") +
+
+
+| script
+| [[hdata_script_script]]<<hdata_script_script,script_script>>
+| Skripten aus dem Repositorium
+| _scripts_repo_ +
+_last_script_repo_ +
+
+| _name_   (string) +
+_name_with_extension_   (string) +
+_language_   (integer) +
+_author_   (string) +
+_mail_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_tags_   (string) +
+_requirements_   (string) +
+_min_weechat_   (string) +
+_max_weechat_   (string) +
+_md5sum_   (string) +
+_url_   (string) +
+_popularity_   (integer) +
+_date_added_   (time) +
+_date_updated_   (time) +
+_status_   (integer) +
+_version_loaded_   (string) +
+_displayed_   (integer) +
+_install_order_   (integer) +
+_prev_script_   (pointer, hdata: "script_script") +
+_next_script_   (pointer, hdata: "script_script") +
+
+
+| tcl
+| [[hdata_tcl_script]]<<hdata_tcl_script,tcl_script>>
+| Liste der Skripten
+| _scripts_ +
+_last_script_ +
+
+| _filename_   (string) +
+_interpreter_   (pointer) +
+_name_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_description_   (string) +
+_shutdown_func_   (string) +
+_charset_   (string) +
+_unloading_   (integer) +
+_prev_script_   (pointer, hdata: "tcl_script") +
+_next_script_   (pointer, hdata: "tcl_script") +
+
+
+| weechat
+| [[hdata_bar]]<<hdata_bar,bar>>
+| Bar
+| _gui_bars_ +
+_last_gui_bar_ +
+
+| _name_   (string) +
+_options_   (pointer) +
+_items_count_   (integer) +
+_items_subcount_   (pointer) +
+_items_array_   (pointer) +
+_items_buffer_   (pointer) +
+_items_prefix_   (pointer) +
+_items_name_   (pointer) +
+_items_suffix_   (pointer) +
+_bar_window_   (pointer, hdata: "bar_window") +
+_bar_refresh_needed_   (integer) +
+_prev_bar_   (pointer, hdata: "bar") +
+_next_bar_   (pointer, hdata: "bar") +
+
+
+| weechat
+| [[hdata_bar_item]]<<hdata_bar_item,bar_item>>
+| Bar-Item
+| _gui_bar_items_ +
+_last_gui_bar_item_ +
+
+| _plugin_   (pointer, hdata: "plugin") +
+_name_   (string) +
+_build_callback_   (pointer) +
+_build_callback_pointer_   (pointer) +
+_build_callback_data_   (pointer) +
+_prev_item_   (pointer, hdata: "bar_item") +
+_next_item_   (pointer, hdata: "bar_item") +
+
+
+| weechat
+| [[hdata_bar_window]]<<hdata_bar_window,bar_window>>
+| Bar-Fenster
+| -
+| _bar_   (pointer, hdata: "bar") +
+_x_   (integer) +
+_y_   (integer) +
+_width_   (integer) +
+_height_   (integer) +
+_scroll_x_   (integer) +
+_scroll_y_   (integer) +
+_cursor_x_   (integer) +
+_cursor_y_   (integer) +
+_current_size_   (integer) +
+_items_count_   (integer) +
+_items_subcount_   (pointer) +
+_items_content_   (pointer) +
+_items_num_lines_   (pointer) +
+_items_refresh_needed_   (pointer) +
+_screen_col_size_   (integer) +
+_screen_lines_   (integer) +
+_coords_count_   (integer) +
+_coords_   (pointer) +
+_gui_objects_   (pointer) +
+_prev_bar_window_   (pointer, hdata: "bar_window") +
+_next_bar_window_   (pointer, hdata: "bar_window") +
+
+
+| weechat
+| [[hdata_buffer]]<<hdata_buffer,buffer>>
+| Buffer
+| _gui_buffer_last_displayed_ +
+_gui_buffers_ +
+_last_gui_buffer_ +
+
+| _plugin_   (pointer, hdata: "plugin") +
+_plugin_name_for_upgrade_   (string) +
+_number_   (integer) +
+_layout_number_   (integer) +
+_layout_number_merge_order_   (integer) +
+_name_   (string) +
+_full_name_   (string) +
+_short_name_   (string) +
+_type_   (integer) +
+_notify_   (integer) +
+_num_displayed_   (integer) +
+_active_   (integer) +
+_hidden_   (integer) +
+_zoomed_   (integer) +
+_print_hooks_enabled_   (integer) +
+_day_change_   (integer) +
+_clear_   (integer) +
+_filter_   (integer) +
+_close_callback_   (pointer) +
+_close_callback_pointer_   (pointer) +
+_close_callback_data_   (pointer) +
+_closing_   (integer) +
+_title_   (string) +
+_own_lines_   (pointer, hdata: "lines") +
+_mixed_lines_   (pointer, hdata: "lines") +
+_lines_   (pointer, hdata: "lines") +
+_time_for_each_line_   (integer) +
+_chat_refresh_needed_   (integer) +
+_nicklist_   (integer) +
+_nicklist_case_sensitive_   (integer) +
+_nicklist_root_   (pointer, hdata: "nick_group") +
+_nicklist_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_pointer_   (pointer) +
+_nickcmp_callback_data_   (pointer) +
+_input_   (integer) +
+_input_callback_   (pointer) +
+_input_callback_pointer_   (pointer) +
+_input_callback_data_   (pointer) +
+_input_get_unknown_commands_   (integer) +
+_input_buffer_   (string) +
+_input_buffer_alloc_   (integer) +
+_input_buffer_size_   (integer) +
+_input_buffer_length_   (integer) +
+_input_buffer_pos_   (integer) +
+_input_buffer_1st_display_   (integer) +
+_input_undo_snap_   (pointer, hdata: "input_undo") +
+_input_undo_   (pointer, hdata: "input_undo") +
+_last_input_undo_   (pointer, hdata: "input_undo") +
+_ptr_input_undo_   (pointer, hdata: "input_undo") +
+_input_undo_count_   (integer) +
+_completion_   (pointer, hdata: "completion") +
+_history_   (pointer, hdata: "history") +
+_last_history_   (pointer, hdata: "history") +
+_ptr_history_   (pointer, hdata: "history") +
+_num_history_   (integer) +
+_text_search_   (integer) +
+_text_search_exact_   (integer) +
+_text_search_regex_   (integer) +
+_text_search_regex_compiled_   (pointer) +
+_text_search_where_   (integer) +
+_text_search_found_   (integer) +
+_text_search_input_   (string) +
+_highlight_words_   (string) +
+_highlight_regex_   (string) +
+_highlight_regex_compiled_   (pointer) +
+_highlight_tags_restrict_   (string) +
+_highlight_tags_restrict_count_   (integer) +
+_highlight_tags_restrict_array_   (pointer, array_size: "highlight_tags_restrict_count") +
+_highlight_tags_   (string) +
+_highlight_tags_count_   (integer) +
+_highlight_tags_array_   (pointer, array_size: "highlight_tags_count") +
+_hotlist_max_level_nicks_   (hashtable) +
+_keys_   (pointer, hdata: "key") +
+_last_key_   (pointer, hdata: "key") +
+_keys_count_   (integer) +
+_local_variables_   (hashtable) +
+_prev_buffer_   (pointer, hdata: "buffer") +
+_next_buffer_   (pointer, hdata: "buffer") +
+
+
+| weechat
+| [[hdata_buffer_visited]]<<hdata_buffer_visited,buffer_visited>>
+| besuchte Buffer
+| _gui_buffers_visited_ +
+_last_gui_buffer_visited_ +
+
+| _buffer_   (pointer, hdata: "buffer") +
+_prev_buffer_   (pointer, hdata: "buffer_visited") +
+_next_buffer_   (pointer, hdata: "buffer_visited") +
+
+
+| weechat
+| [[hdata_completion]]<<hdata_completion,completion>>
+| Struktur mit Vervollständigung
+| -
+| _buffer_   (pointer, hdata: "buffer") +
+_context_   (integer) +
+_base_command_   (string) +
+_base_command_arg_index_   (integer) +
+_base_word_   (string) +
+_base_word_pos_   (integer) +
+_position_   (integer) +
+_args_   (string) +
+_direction_   (integer) +
+_add_space_   (integer) +
+_force_partial_completion_   (integer) +
+_list_   (pointer) +
+_word_found_   (string) +
+_word_found_is_nick_   (integer) +
+_position_replace_   (integer) +
+_diff_size_   (integer) +
+_diff_length_   (integer) +
+_partial_list_   (pointer) +
+
+
+| weechat
+| [[hdata_config_file]]<<hdata_config_file,config_file>>
+| Konfigurationsdatei
+| _config_files_ +
+_last_config_file_ +
+
+| _plugin_   (pointer, hdata: "plugin") +
+_name_   (string) +
+_filename_   (string) +
+_file_   (pointer) +
+_callback_reload_   (pointer) +
+_callback_reload_pointer_   (pointer) +
+_callback_reload_data_   (pointer) +
+_sections_   (pointer, hdata: "config_section") +
+_last_section_   (pointer, hdata: "config_section") +
+_prev_config_   (pointer, hdata: "config_file") +
+_next_config_   (pointer, hdata: "config_file") +
+
+
+| weechat
+| [[hdata_config_option]]<<hdata_config_option,config_option>>
+| Konfigurationsoptionen
+| -
+| _config_file_   (pointer, hdata: "config_file") +
+_section_   (pointer, hdata: "config_section") +
+_name_   (string) +
+_parent_name_   (string) +
+_type_   (integer) +
+_description_   (string) +
+_string_values_   (string, array_size: "*") +
+_min_   (integer) +
+_max_   (integer) +
+_default_value_   (pointer) +
+_value_   (pointer) +
+_null_value_allowed_   (integer) +
+_callback_check_value_   (pointer) +
+_callback_check_value_pointer_   (pointer) +
+_callback_check_value_data_   (pointer) +
+_callback_change_   (pointer) +
+_callback_change_pointer_   (pointer) +
+_callback_change_data_   (pointer) +
+_callback_delete_   (pointer) +
+_callback_delete_pointer_   (pointer) +
+_callback_delete_data_   (pointer) +
+_loaded_   (integer) +
+_prev_option_   (pointer, hdata: "config_option") +
+_next_option_   (pointer, hdata: "config_option") +
+
+
+| weechat
+| [[hdata_config_section]]<<hdata_config_section,config_section>>
+| Konfigurationssektion
+| -
+| _config_file_   (pointer, hdata: "config_file") +
+_name_   (string) +
+_user_can_add_options_   (integer) +
+_user_can_delete_options_   (integer) +
+_callback_read_   (pointer) +
+_callback_read_pointer_   (pointer) +
+_callback_read_data_   (pointer) +
+_callback_write_   (pointer) +
+_callback_write_pointer_   (pointer) +
+_callback_write_data_   (pointer) +
+_callback_write_default_   (pointer) +
+_callback_write_default_pointer_   (pointer) +
+_callback_write_default_data_   (pointer) +
+_callback_create_option_   (pointer) +
+_callback_create_option_pointer_   (pointer) +
+_callback_create_option_data_   (pointer) +
+_callback_delete_option_   (pointer) +
+_callback_delete_option_pointer_   (pointer) +
+_callback_delete_option_data_   (pointer) +
+_options_   (pointer, hdata: "config_option") +
+_last_option_   (pointer, hdata: "config_option") +
+_prev_section_   (pointer, hdata: "config_section") +
+_next_section_   (pointer, hdata: "config_section") +
+
+
+| weechat
+| [[hdata_filter]]<<hdata_filter,filter>>
+| Filter
+| _gui_filters_ +
+_last_gui_filter_ +
+
+| _enabled_   (integer) +
+_name_   (string) +
+_buffer_name_   (string) +
+_num_buffers_   (integer) +
+_buffers_   (pointer) +
+_tags_   (string) +
+_tags_count_   (integer) +
+_tags_array_   (pointer, array_size: "tags_count") +
+_regex_   (string) +
+_regex_prefix_   (pointer) +
+_regex_message_   (pointer) +
+_prev_filter_   (pointer, hdata: "filter") +
+_next_filter_   (pointer, hdata: "filter") +
+
+
+| weechat
+| [[hdata_history]]<<hdata_history,history>>
+| Verlaufspeicher von Befehlen in einem Buffer
+| _gui_history_ +
+_last_gui_history_ +
+
+| _text_   (string) +
+_next_history_   (pointer, hdata: "history") +
+_prev_history_   (pointer, hdata: "history") +
+
+*Update erlaubt:* +
+    _{hdata_update_create}_ +
+    _{hdata_update_delete}_ +
+
+| weechat
+| [[hdata_hotlist]]<<hdata_hotlist,hotlist>>
+| Hotliste
+| _gui_hotlist_ +
+_last_gui_hotlist_ +
+
+| _priority_   (integer) +
+_creation_time.tv_sec_   (time) +
+_creation_time.tv_usec_   (long) +
+_buffer_   (pointer) +
+_count_   (integer, array_size: "4") +
+_prev_hotlist_   (pointer, hdata: "hotlist") +
+_next_hotlist_   (pointer, hdata: "hotlist") +
+
+
+| weechat
+| [[hdata_input_undo]]<<hdata_input_undo,input_undo>>
+| Struktur der Rücknahmen für die Befehlszeile
+| -
+| _data_   (string) +
+_pos_   (integer) +
+_prev_undo_   (pointer, hdata: "input_undo") +
+_next_undo_   (pointer, hdata: "input_undo") +
+
+
+| weechat
+| [[hdata_key]]<<hdata_key,key>>
+| Tastenbelegung (Tastaturkurzbefehl)
+| _gui_default_keys_ +
+_gui_default_keys_cursor_ +
+_gui_default_keys_mouse_ +
+_gui_default_keys_search_ +
+_gui_keys_ +
+_gui_keys_cursor_ +
+_gui_keys_mouse_ +
+_gui_keys_search_ +
+_last_gui_default_key_ +
+_last_gui_default_key_cursor_ +
+_last_gui_default_key_mouse_ +
+_last_gui_default_key_search_ +
+_last_gui_key_ +
+_last_gui_key_cursor_ +
+_last_gui_key_mouse_ +
+_last_gui_key_search_ +
+
+| _key_   (string) +
+_area_type_   (pointer) +
+_area_name_   (pointer) +
+_area_key_   (string) +
+_command_   (string) +
+_score_   (integer) +
+_prev_key_   (pointer, hdata: "key") +
+_next_key_   (pointer, hdata: "key") +
+
+
+| weechat
+| [[hdata_layout]]<<hdata_layout,layout>>
+| Layout
+| _gui_layout_current_ +
+_gui_layouts_ +
+_last_gui_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") +
+
+
+| weechat
+| [[hdata_layout_buffer]]<<hdata_layout_buffer,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
+| [[hdata_layout_window]]<<hdata_layout_window,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
+| [[hdata_line]]<<hdata_line,line>>
+| Struktur mit einer Zeile
+| -
+| _data_   (pointer, hdata: "line_data") +
+_prev_line_   (pointer, hdata: "line") +
+_next_line_   (pointer, hdata: "line") +
+
+
+| weechat
+| [[hdata_line_data]]<<hdata_line_data,line_data>>
+| Struktur mit einzeiligen Daten
+| -
+| _buffer_   (pointer, hdata: "buffer") +
+_y_   (integer) +
+_date_   (time) +
+_date_printed_   (time) +
+_str_time_   (string) +
+_tags_count_   (integer) +
+_tags_array_   (shared_string, array_size: "tags_count") +
+_displayed_   (char) +
+_highlight_   (char) +
+_refresh_needed_   (char) +
+_prefix_   (shared_string) +
+_prefix_length_   (integer) +
+_message_   (string) +
+
+*Update erlaubt:* +
+    _date_ (time) +
+    _date_printed_ (time) +
+    _tags_array_ (shared_string) +
+    _prefix_ (shared_string) +
+    _message_ (string) +
+
+| weechat
+| [[hdata_lines]]<<hdata_lines,lines>>
+| Struktur mit Zeilen
+| -
+| _first_line_   (pointer, hdata: "line") +
+_last_line_   (pointer, hdata: "line") +
+_last_read_line_   (pointer, hdata: "line") +
+_lines_count_   (integer) +
+_first_line_not_read_   (integer) +
+_lines_hidden_   (integer) +
+_buffer_max_length_   (integer) +
+_buffer_max_length_refresh_   (integer) +
+_prefix_max_length_   (integer) +
+_prefix_max_length_refresh_   (integer) +
+
+
+| weechat
+| [[hdata_nick]]<<hdata_nick,nick>>
+| Nick in Benutzerliste
+| -
+| _group_   (pointer, hdata: "nick_group") +
+_name_   (shared_string) +
+_color_   (shared_string) +
+_prefix_   (shared_string) +
+_prefix_color_   (shared_string) +
+_visible_   (integer) +
+_prev_nick_   (pointer, hdata: "nick") +
+_next_nick_   (pointer, hdata: "nick") +
+
+
+| weechat
+| [[hdata_nick_group]]<<hdata_nick_group,nick_group>>
+| Gruppen in Benutzerliste
+| -
+| _name_   (shared_string) +
+_color_   (shared_string) +
+_visible_   (integer) +
+_level_   (integer) +
+_parent_   (pointer, hdata: "nick_group") +
+_children_   (pointer, hdata: "nick_group") +
+_last_child_   (pointer, hdata: "nick_group") +
+_nicks_   (pointer, hdata: "nick") +
+_last_nick_   (pointer, hdata: "nick") +
+_prev_group_   (pointer, hdata: "nick_group") +
+_next_group_   (pointer, hdata: "nick_group") +
+
+
+| weechat
+| [[hdata_plugin]]<<hdata_plugin,plugin>>
+| Erweiterung
+| _weechat_plugins_ +
+_last_weechat_plugin_ +
+
+| _filename_   (string) +
+_handle_   (pointer) +
+_name_   (string) +
+_description_   (string) +
+_author_   (string) +
+_version_   (string) +
+_license_   (string) +
+_charset_   (string) +
+_priority_   (integer) +
+_initialized_   (integer) +
+_debug_   (integer) +
+_prev_plugin_   (pointer, hdata: "plugin") +
+_next_plugin_   (pointer, hdata: "plugin") +
+
+
+| weechat
+| [[hdata_proxy]]<<hdata_proxy,proxy>>
+| Proxy
+| _weechat_proxies_ +
+_last_weechat_proxy_ +
+
+| _name_   (string) +
+_options_   (pointer) +
+_prev_proxy_   (pointer, hdata: "proxy") +
+_next_proxy_   (pointer, hdata: "proxy") +
+
+
+| weechat
+| [[hdata_window]]<<hdata_window,window>>
+| Fenster
+| _gui_current_window_ +
+_gui_windows_ +
+_last_gui_window_ +
+
+| _number_   (integer) +
+_win_x_   (integer) +
+_win_y_   (integer) +
+_win_width_   (integer) +
+_win_height_   (integer) +
+_win_width_pct_   (integer) +
+_win_height_pct_   (integer) +
+_win_chat_x_   (integer) +
+_win_chat_y_   (integer) +
+_win_chat_width_   (integer) +
+_win_chat_height_   (integer) +
+_win_chat_cursor_x_   (integer) +
+_win_chat_cursor_y_   (integer) +
+_bar_windows_   (pointer, hdata: "bar_window") +
+_last_bar_window_   (pointer, hdata: "bar_window") +
+_refresh_needed_   (integer) +
+_gui_objects_   (pointer) +
+_buffer_   (pointer, hdata: "buffer") +
+_layout_plugin_name_   (string) +
+_layout_buffer_name_   (string) +
+_scroll_   (pointer, hdata: "window_scroll") +
+_ptr_tree_   (pointer, hdata: "window_tree") +
+_prev_window_   (pointer, hdata: "window") +
+_next_window_   (pointer, hdata: "window") +
+
+
+| weechat
+| [[hdata_window_scroll]]<<hdata_window_scroll,window_scroll>>
+| Scroll-Info in Fenstern
+| -
+| _buffer_   (pointer, hdata: "buffer") +
+_first_line_displayed_   (integer) +
+_start_line_   (pointer, hdata: "line") +
+_start_line_pos_   (integer) +
+_scrolling_   (integer) +
+_start_col_   (integer) +
+_lines_after_   (integer) +
+_text_search_start_line_   (pointer, hdata: "line") +
+_prev_scroll_   (pointer, hdata: "window_scroll") +
+_next_scroll_   (pointer, hdata: "window_scroll") +
+
+
+| weechat
+| [[hdata_window_tree]]<<hdata_window_tree,window_tree>>
+| Baumstruktur der Fenster
+| _gui_windows_tree_ +
+
+| _parent_node_   (pointer, hdata: "window_tree") +
+_split_pct_   (integer) +
+_split_horizontal_   (integer) +
+_child1_   (pointer, hdata: "window_tree") +
+_child2_   (pointer, hdata: "window_tree") +
+_window_   (pointer, hdata: "window") +
+
+
+|===

doc/de/autogen/plugin_api/hdata.asciidoc

@@ -1,863 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-* [[hdata_guile_script]]<<hdata_guile_script,'guile_script'>>: Liste der Skripten
-** Erweiterung: guile
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "guile_script")
-*** 'next_script' (pointer, hdata: "guile_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_irc_channel]]<<hdata_irc_channel,'irc_channel'>>: IRC-Channel
-** Erweiterung: irc
-** Variablen:
-*** 'type' (integer)
-*** 'name' (string)
-*** 'topic' (string)
-*** 'modes' (string)
-*** 'limit' (integer)
-*** 'key' (string)
-*** 'join_msg_received' (hashtable)
-*** 'checking_whox' (integer)
-*** 'away_message' (string)
-*** 'has_quit_server' (integer)
-*** 'cycle' (integer)
-*** 'part' (integer)
-*** 'nick_completion_reset' (integer)
-*** 'pv_remote_nick_color' (string)
-*** 'hook_autorejoin' (pointer)
-*** 'nicks_count' (integer)
-*** 'nicks' (pointer, hdata: "irc_nick")
-*** 'last_nick' (pointer, hdata: "irc_nick")
-*** 'nicks_speaking' (pointer)
-*** 'nicks_speaking_time' (pointer, hdata: "irc_channel_speaking")
-*** 'last_nick_speaking_time' (pointer, hdata: "irc_channel_speaking")
-*** 'join_smart_filtered' (hashtable)
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'buffer_as_string' (string)
-*** 'prev_channel' (pointer, hdata: "irc_channel")
-*** 'next_channel' (pointer, hdata: "irc_channel")
-* [[hdata_irc_channel_speaking]]<<hdata_irc_channel_speaking,'irc_channel_speaking'>>: IRC channel_speaking
-** Erweiterung: irc
-** Variablen:
-*** 'nick' (string)
-*** 'time_last_message' (time)
-*** 'prev_nick' (pointer, hdata: "irc_channel_speaking")
-*** 'next_nick' (pointer, hdata: "irc_channel_speaking")
-* [[hdata_irc_ignore]]<<hdata_irc_ignore,'irc_ignore'>>: IRC ignorieren
-** Erweiterung: irc
-** Variablen:
-*** 'number' (integer)
-*** 'mask' (string)
-*** 'regex_mask' (pointer)
-*** 'server' (string)
-*** 'channel' (string)
-*** 'prev_ignore' (pointer, hdata: "irc_ignore")
-*** 'next_ignore' (pointer, hdata: "irc_ignore")
-** Listen:
-*** 'irc_ignore_list'
-*** 'last_irc_ignore'
-* [[hdata_irc_nick]]<<hdata_irc_nick,'irc_nick'>>: IRC-Nick
-** Erweiterung: irc
-** Variablen:
-*** 'name' (string)
-*** 'host' (string)
-*** 'prefixes' (string)
-*** 'prefix' (string)
-*** 'away' (integer)
-*** 'account' (string)
-*** 'realname' (string)
-*** 'color' (string)
-*** 'prev_nick' (pointer, hdata: "irc_nick")
-*** 'next_nick' (pointer, hdata: "irc_nick")
-* [[hdata_irc_notify]]<<hdata_irc_notify,'irc_notify'>>: IRC-Benachrichtigungen
-** Erweiterung: irc
-** Variablen:
-*** 'server' (pointer, hdata: "irc_server")
-*** 'nick' (string)
-*** 'check_away' (integer)
-*** 'is_on_server' (integer)
-*** 'away_message' (string)
-*** 'ison_received' (integer)
-*** 'prev_notify' (pointer, hdata: "irc_notify")
-*** 'next_notify' (pointer, hdata: "irc_notify")
-* [[hdata_irc_redirect]]<<hdata_irc_redirect,'irc_redirect'>>: IRC Weiterleitung
-** Erweiterung: irc
-** Variablen:
-*** 'server' (pointer, hdata: "irc_server")
-*** 'pattern' (string)
-*** 'signal' (string)
-*** 'count' (integer)
-*** 'current_count' (integer)
-*** 'string' (string)
-*** 'timeout' (integer)
-*** 'command' (string)
-*** 'assigned_to_command' (integer)
-*** 'start_time' (time)
-*** 'cmd_start' (hashtable)
-*** 'cmd_stop' (hashtable)
-*** 'cmd_extra' (hashtable)
-*** 'cmd_start_received' (integer)
-*** 'cmd_stop_received' (integer)
-*** 'cmd_filter' (hashtable)
-*** 'output' (string)
-*** 'output_size' (integer)
-*** 'prev_redirect' (pointer, hdata: "irc_redirect")
-*** 'next_redirect' (pointer, hdata: "irc_redirect")
-* [[hdata_irc_redirect_pattern]]<<hdata_irc_redirect_pattern,'irc_redirect_pattern'>>: Muster für IRC Weiterleitung
-** Erweiterung: irc
-** Variablen:
-*** 'name' (string)
-*** 'temp_pattern' (integer)
-*** 'timeout' (integer)
-*** 'cmd_start' (string)
-*** 'cmd_stop' (string)
-*** 'cmd_extra' (string)
-*** 'prev_redirect' (pointer, hdata: "irc_redirect_pattern")
-*** 'next_redirect' (pointer, hdata: "irc_redirect_pattern")
-** Listen:
-*** 'irc_redirect_patterns'
-*** 'last_irc_redirect_pattern'
-* [[hdata_irc_server]]<<hdata_irc_server,'irc_server'>>: IRC-Server
-** Erweiterung: irc
-** Variablen:
-*** 'name' (string)
-*** 'options' (pointer)
-*** 'temp_server' (integer)
-*** 'reloading_from_config' (integer)
-*** 'reloaded_from_config' (integer)
-*** 'addresses_count' (integer)
-*** 'addresses_array' (string, array_size: "addresses_count")
-*** 'ports_array' (integer, array_size: "addresses_count")
-*** 'retry_array' (integer, array_size: "addresses_count")
-*** 'index_current_address' (integer)
-*** 'current_address' (string)
-*** 'current_ip' (string)
-*** 'current_port' (integer)
-*** 'current_retry' (integer)
-*** 'sock' (integer)
-*** 'hook_connect' (pointer, hdata: "hook")
-*** 'hook_fd' (pointer, hdata: "hook")
-*** 'hook_timer_connection' (pointer, hdata: "hook")
-*** 'hook_timer_sasl' (pointer, hdata: "hook")
-*** 'is_connected' (integer)
-*** 'ssl_connected' (integer)
-*** 'disconnected' (integer)
-*** 'gnutls_sess' (other)
-*** 'tls_cert' (other)
-*** 'tls_cert_key' (other)
-*** 'unterminated_message' (string)
-*** 'nicks_count' (integer)
-*** 'nicks_array' (string, array_size: "nicks_count")
-*** 'nick_first_tried' (integer)
-*** 'nick_alternate_number' (integer)
-*** 'nick' (string)
-*** 'nick_modes' (string)
-*** 'cap_away_notify' (integer)
-*** 'cap_account_notify' (integer)
-*** 'cap_extended_join' (integer)
-*** 'isupport' (string)
-*** 'prefix_modes' (string)
-*** 'prefix_chars' (string)
-*** 'nick_max_length' (integer)
-*** 'casemapping' (integer)
-*** 'chantypes' (string)
-*** 'chanmodes' (string)
-*** 'monitor' (integer)
-*** 'monitor_time' (time)
-*** 'reconnect_delay' (integer)
-*** 'reconnect_start' (time)
-*** 'command_time' (time)
-*** 'reconnect_join' (integer)
-*** 'disable_autojoin' (integer)
-*** 'is_away' (integer)
-*** 'away_message' (string)
-*** 'away_time' (time)
-*** 'lag' (integer)
-*** 'lag_displayed' (integer)
-*** 'lag_check_time' (other)
-*** 'lag_next_check' (time)
-*** 'lag_last_refresh' (time)
-*** '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")
-*** 'last_redirect' (pointer, hdata: "irc_redirect")
-*** 'notify_list' (pointer, hdata: "irc_notify")
-*** 'last_notify' (pointer, hdata: "irc_notify")
-*** 'notify_count' (integer)
-*** 'join_manual' (hashtable)
-*** 'join_channel_key' (hashtable)
-*** 'join_noswitch' (hashtable)
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'buffer_as_string' (string)
-*** 'channels' (pointer, hdata: "irc_channel")
-*** 'last_channel' (pointer, hdata: "irc_channel")
-*** 'prev_server' (pointer, hdata: "irc_server")
-*** 'next_server' (pointer, hdata: "irc_server")
-** Listen:
-*** 'irc_servers'
-*** 'last_irc_server'
-* [[hdata_javascript_script]]<<hdata_javascript_script,'javascript_script'>>: Liste der Skripten
-** Erweiterung: javascript
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "javascript_script")
-*** 'next_script' (pointer, hdata: "javascript_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_lua_script]]<<hdata_lua_script,'lua_script'>>: Liste der Skripten
-** Erweiterung: lua
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "lua_script")
-*** 'next_script' (pointer, hdata: "lua_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_perl_script]]<<hdata_perl_script,'perl_script'>>: Liste der Skripten
-** Erweiterung: perl
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "perl_script")
-*** 'next_script' (pointer, hdata: "perl_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_python_script]]<<hdata_python_script,'python_script'>>: Liste der Skripten
-** Erweiterung: python
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "python_script")
-*** 'next_script' (pointer, hdata: "python_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_ruby_script]]<<hdata_ruby_script,'ruby_script'>>: Liste der Skripten
-** Erweiterung: ruby
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "ruby_script")
-*** 'next_script' (pointer, hdata: "ruby_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_script_script]]<<hdata_script_script,'script_script'>>: Skripten aus dem Repositorium
-** Erweiterung: script
-** Variablen:
-*** 'name' (string)
-*** 'name_with_extension' (string)
-*** 'language' (integer)
-*** 'author' (string)
-*** 'mail' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'tags' (string)
-*** 'requirements' (string)
-*** 'min_weechat' (string)
-*** 'max_weechat' (string)
-*** 'md5sum' (string)
-*** 'url' (string)
-*** 'popularity' (integer)
-*** 'date_added' (time)
-*** 'date_updated' (time)
-*** 'status' (integer)
-*** 'version_loaded' (string)
-*** 'displayed' (integer)
-*** 'install_order' (integer)
-*** 'prev_script' (pointer, hdata: "script_script")
-*** 'next_script' (pointer, hdata: "script_script")
-** Listen:
-*** 'last_script_repo'
-*** 'scripts_repo'
-* [[hdata_tcl_script]]<<hdata_tcl_script,'tcl_script'>>: Liste der Skripten
-** Erweiterung: tcl
-** Variablen:
-*** 'filename' (string)
-*** 'interpreter' (pointer)
-*** 'name' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'description' (string)
-*** 'shutdown_func' (string)
-*** 'charset' (string)
-*** 'unloading' (integer)
-*** 'prev_script' (pointer, hdata: "tcl_script")
-*** 'next_script' (pointer, hdata: "tcl_script")
-** Listen:
-*** 'last_script'
-*** 'scripts'
-* [[hdata_bar]]<<hdata_bar,'bar'>>: Bar
-** Erweiterung: weechat
-** Variablen:
-*** 'name' (string)
-*** 'options' (pointer)
-*** 'items_count' (integer)
-*** 'items_subcount' (pointer)
-*** 'items_array' (pointer)
-*** 'items_buffer' (pointer)
-*** 'items_prefix' (pointer)
-*** 'items_name' (pointer)
-*** 'items_suffix' (pointer)
-*** 'bar_window' (pointer, hdata: "bar_window")
-*** 'bar_refresh_needed' (integer)
-*** 'prev_bar' (pointer, hdata: "bar")
-*** 'next_bar' (pointer, hdata: "bar")
-** Listen:
-*** 'gui_bars'
-*** 'last_gui_bar'
-* [[hdata_bar_item]]<<hdata_bar_item,'bar_item'>>: Bar-Item
-** Erweiterung: weechat
-** Variablen:
-*** 'plugin' (pointer, hdata: "plugin")
-*** 'name' (string)
-*** 'build_callback' (pointer)
-*** 'build_callback_pointer' (pointer)
-*** 'build_callback_data' (pointer)
-*** 'prev_item' (pointer, hdata: "bar_item")
-*** 'next_item' (pointer, hdata: "bar_item")
-** Listen:
-*** 'gui_bar_items'
-*** 'last_gui_bar_item'
-* [[hdata_bar_window]]<<hdata_bar_window,'bar_window'>>: Bar-Fenster
-** Erweiterung: weechat
-** Variablen:
-*** 'bar' (pointer, hdata: "bar")
-*** 'x' (integer)
-*** 'y' (integer)
-*** 'width' (integer)
-*** 'height' (integer)
-*** 'scroll_x' (integer)
-*** 'scroll_y' (integer)
-*** 'cursor_x' (integer)
-*** 'cursor_y' (integer)
-*** 'current_size' (integer)
-*** 'items_count' (integer)
-*** 'items_subcount' (pointer)
-*** 'items_content' (pointer)
-*** 'items_num_lines' (pointer)
-*** 'items_refresh_needed' (pointer)
-*** 'screen_col_size' (integer)
-*** 'screen_lines' (integer)
-*** 'coords_count' (integer)
-*** 'coords' (pointer)
-*** 'gui_objects' (pointer)
-*** 'prev_bar_window' (pointer, hdata: "bar_window")
-*** 'next_bar_window' (pointer, hdata: "bar_window")
-* [[hdata_buffer]]<<hdata_buffer,'buffer'>>: Buffer
-** Erweiterung: weechat
-** Variablen:
-*** 'plugin' (pointer, hdata: "plugin")
-*** 'plugin_name_for_upgrade' (string)
-*** 'number' (integer)
-*** 'layout_number' (integer)
-*** 'layout_number_merge_order' (integer)
-*** 'name' (string)
-*** 'full_name' (string)
-*** 'short_name' (string)
-*** 'type' (integer)
-*** 'notify' (integer)
-*** 'num_displayed' (integer)
-*** 'active' (integer)
-*** 'hidden' (integer)
-*** 'zoomed' (integer)
-*** 'print_hooks_enabled' (integer)
-*** 'day_change' (integer)
-*** 'clear' (integer)
-*** 'filter' (integer)
-*** 'close_callback' (pointer)
-*** 'close_callback_pointer' (pointer)
-*** 'close_callback_data' (pointer)
-*** 'closing' (integer)
-*** 'title' (string)
-*** 'own_lines' (pointer, hdata: "lines")
-*** 'mixed_lines' (pointer, hdata: "lines")
-*** 'lines' (pointer, hdata: "lines")
-*** 'time_for_each_line' (integer)
-*** 'chat_refresh_needed' (integer)
-*** 'nicklist' (integer)
-*** 'nicklist_case_sensitive' (integer)
-*** 'nicklist_root' (pointer, hdata: "nick_group")
-*** 'nicklist_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_pointer' (pointer)
-*** 'nickcmp_callback_data' (pointer)
-*** 'input' (integer)
-*** 'input_callback' (pointer)
-*** 'input_callback_pointer' (pointer)
-*** 'input_callback_data' (pointer)
-*** 'input_get_unknown_commands' (integer)
-*** 'input_buffer' (string)
-*** 'input_buffer_alloc' (integer)
-*** 'input_buffer_size' (integer)
-*** 'input_buffer_length' (integer)
-*** 'input_buffer_pos' (integer)
-*** 'input_buffer_1st_display' (integer)
-*** 'input_undo_snap' (pointer, hdata: "input_undo")
-*** 'input_undo' (pointer, hdata: "input_undo")
-*** 'last_input_undo' (pointer, hdata: "input_undo")
-*** 'ptr_input_undo' (pointer, hdata: "input_undo")
-*** 'input_undo_count' (integer)
-*** 'completion' (pointer, hdata: "completion")
-*** 'history' (pointer, hdata: "history")
-*** 'last_history' (pointer, hdata: "history")
-*** 'ptr_history' (pointer, hdata: "history")
-*** 'num_history' (integer)
-*** 'text_search' (integer)
-*** 'text_search_exact' (integer)
-*** 'text_search_regex' (integer)
-*** 'text_search_regex_compiled' (pointer)
-*** 'text_search_where' (integer)
-*** 'text_search_found' (integer)
-*** 'text_search_input' (string)
-*** 'highlight_words' (string)
-*** 'highlight_regex' (string)
-*** 'highlight_regex_compiled' (pointer)
-*** 'highlight_tags_restrict' (string)
-*** 'highlight_tags_restrict_count' (integer)
-*** 'highlight_tags_restrict_array' (pointer, array_size: "highlight_tags_restrict_count")
-*** 'highlight_tags' (string)
-*** 'highlight_tags_count' (integer)
-*** 'highlight_tags_array' (pointer, array_size: "highlight_tags_count")
-*** 'hotlist_max_level_nicks' (hashtable)
-*** 'keys' (pointer, hdata: "key")
-*** 'last_key' (pointer, hdata: "key")
-*** 'keys_count' (integer)
-*** 'local_variables' (hashtable)
-*** 'prev_buffer' (pointer, hdata: "buffer")
-*** 'next_buffer' (pointer, hdata: "buffer")
-** Listen:
-*** 'gui_buffer_last_displayed'
-*** 'gui_buffers'
-*** 'last_gui_buffer'
-* [[hdata_buffer_visited]]<<hdata_buffer_visited,'buffer_visited'>>: besuchte Buffer
-** Erweiterung: weechat
-** Variablen:
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'prev_buffer' (pointer, hdata: "buffer_visited")
-*** 'next_buffer' (pointer, hdata: "buffer_visited")
-** Listen:
-*** 'gui_buffers_visited'
-*** 'last_gui_buffer_visited'
-* [[hdata_completion]]<<hdata_completion,'completion'>>: Struktur mit Vervollständigung
-** Erweiterung: weechat
-** Variablen:
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'context' (integer)
-*** 'base_command' (string)
-*** 'base_command_arg_index' (integer)
-*** 'base_word' (string)
-*** 'base_word_pos' (integer)
-*** 'position' (integer)
-*** 'args' (string)
-*** 'direction' (integer)
-*** 'add_space' (integer)
-*** 'force_partial_completion' (integer)
-*** 'list' (pointer)
-*** 'word_found' (string)
-*** 'word_found_is_nick' (integer)
-*** 'position_replace' (integer)
-*** 'diff_size' (integer)
-*** 'diff_length' (integer)
-*** 'partial_list' (pointer)
-* [[hdata_config_file]]<<hdata_config_file,'config_file'>>: Konfigurationsdatei
-** Erweiterung: weechat
-** Variablen:
-*** 'plugin' (pointer, hdata: "plugin")
-*** 'name' (string)
-*** 'filename' (string)
-*** 'file' (pointer)
-*** 'callback_reload' (pointer)
-*** 'callback_reload_pointer' (pointer)
-*** 'callback_reload_data' (pointer)
-*** 'sections' (pointer, hdata: "config_section")
-*** 'last_section' (pointer, hdata: "config_section")
-*** 'prev_config' (pointer, hdata: "config_file")
-*** 'next_config' (pointer, hdata: "config_file")
-** Listen:
-*** 'config_files'
-*** 'last_config_file'
-* [[hdata_config_option]]<<hdata_config_option,'config_option'>>: Konfigurationsoptionen
-** Erweiterung: weechat
-** Variablen:
-*** 'config_file' (pointer, hdata: "config_file")
-*** 'section' (pointer, hdata: "config_section")
-*** 'name' (string)
-*** 'parent_name' (string)
-*** 'type' (integer)
-*** 'description' (string)
-*** 'string_values' (string, array_size: "*")
-*** 'min' (integer)
-*** 'max' (integer)
-*** 'default_value' (pointer)
-*** 'value' (pointer)
-*** 'null_value_allowed' (integer)
-*** 'callback_check_value' (pointer)
-*** 'callback_check_value_pointer' (pointer)
-*** 'callback_check_value_data' (pointer)
-*** 'callback_change' (pointer)
-*** 'callback_change_pointer' (pointer)
-*** 'callback_change_data' (pointer)
-*** 'callback_delete' (pointer)
-*** 'callback_delete_pointer' (pointer)
-*** 'callback_delete_data' (pointer)
-*** 'loaded' (integer)
-*** 'prev_option' (pointer, hdata: "config_option")
-*** 'next_option' (pointer, hdata: "config_option")
-* [[hdata_config_section]]<<hdata_config_section,'config_section'>>: Konfigurationssektion
-** Erweiterung: weechat
-** Variablen:
-*** 'config_file' (pointer, hdata: "config_file")
-*** 'name' (string)
-*** 'user_can_add_options' (integer)
-*** 'user_can_delete_options' (integer)
-*** 'callback_read' (pointer)
-*** 'callback_read_pointer' (pointer)
-*** 'callback_read_data' (pointer)
-*** 'callback_write' (pointer)
-*** 'callback_write_pointer' (pointer)
-*** 'callback_write_data' (pointer)
-*** 'callback_write_default' (pointer)
-*** 'callback_write_default_pointer' (pointer)
-*** 'callback_write_default_data' (pointer)
-*** 'callback_create_option' (pointer)
-*** 'callback_create_option_pointer' (pointer)
-*** 'callback_create_option_data' (pointer)
-*** 'callback_delete_option' (pointer)
-*** 'callback_delete_option_pointer' (pointer)
-*** 'callback_delete_option_data' (pointer)
-*** 'options' (pointer, hdata: "config_option")
-*** 'last_option' (pointer, hdata: "config_option")
-*** 'prev_section' (pointer, hdata: "config_section")
-*** 'next_section' (pointer, hdata: "config_section")
-* [[hdata_filter]]<<hdata_filter,'filter'>>: Filter
-** Erweiterung: weechat
-** Variablen:
-*** 'enabled' (integer)
-*** 'name' (string)
-*** 'buffer_name' (string)
-*** 'num_buffers' (integer)
-*** 'buffers' (pointer)
-*** 'tags' (string)
-*** 'tags_count' (integer)
-*** 'tags_array' (pointer, array_size: "tags_count")
-*** 'regex' (string)
-*** 'regex_prefix' (pointer)
-*** 'regex_message' (pointer)
-*** 'prev_filter' (pointer, hdata: "filter")
-*** 'next_filter' (pointer, hdata: "filter")
-** Listen:
-*** 'gui_filters'
-*** 'last_gui_filter'
-* [[hdata_history]]<<hdata_history,'history'>>: Verlaufspeicher von Befehlen in einem Buffer
-** Erweiterung: weechat
-** Variablen:
-*** 'text' (string)
-*** 'next_history' (pointer, hdata: "history")
-*** 'prev_history' (pointer, hdata: "history")
-** Update erlaubt:
-*** '__create'
-*** '__delete'
-** Listen:
-*** 'gui_history'
-*** 'last_gui_history'
-* [[hdata_hotlist]]<<hdata_hotlist,'hotlist'>>: Hotliste
-** Erweiterung: weechat
-** Variablen:
-*** 'priority' (integer)
-*** 'creation_time.tv_sec' (time)
-*** 'creation_time.tv_usec' (long)
-*** 'buffer' (pointer)
-*** 'count' (integer, array_size: "4")
-*** 'prev_hotlist' (pointer, hdata: "hotlist")
-*** 'next_hotlist' (pointer, hdata: "hotlist")
-** Listen:
-*** 'gui_hotlist'
-*** 'last_gui_hotlist'
-* [[hdata_input_undo]]<<hdata_input_undo,'input_undo'>>: Struktur der Rücknahmen für die Befehlszeile
-** Erweiterung: weechat
-** Variablen:
-*** 'data' (string)
-*** 'pos' (integer)
-*** 'prev_undo' (pointer, hdata: "input_undo")
-*** 'next_undo' (pointer, hdata: "input_undo")
-* [[hdata_key]]<<hdata_key,'key'>>: Tastenbelegung (Tastaturkurzbefehl)
-** Erweiterung: weechat
-** Variablen:
-*** 'key' (string)
-*** 'area_type' (pointer)
-*** 'area_name' (pointer)
-*** 'area_key' (string)
-*** 'command' (string)
-*** 'score' (integer)
-*** 'prev_key' (pointer, hdata: "key")
-*** 'next_key' (pointer, hdata: "key")
-** Listen:
-*** 'gui_default_keys'
-*** 'gui_default_keys_cursor'
-*** 'gui_default_keys_mouse'
-*** 'gui_default_keys_search'
-*** 'gui_keys'
-*** 'gui_keys_cursor'
-*** 'gui_keys_mouse'
-*** 'gui_keys_search'
-*** 'last_gui_default_key'
-*** 'last_gui_default_key_cursor'
-*** 'last_gui_default_key_mouse'
-*** 'last_gui_default_key_search'
-*** 'last_gui_key'
-*** 'last_gui_key_cursor'
-*** 'last_gui_key_mouse'
-*** 'last_gui_key_search'
-* [[hdata_layout]]<<hdata_layout,'layout'>>: Layout
-** Erweiterung: weechat
-** Variablen:
-*** '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")
-** Listen:
-*** 'gui_layout_current'
-*** 'gui_layouts'
-*** 'last_gui_layout'
-* [[hdata_layout_buffer]]<<hdata_layout_buffer,'layout_buffer'>>: Buffer-Layout
-** Erweiterung: weechat
-** Variablen:
-*** 'plugin_name' (string)
-*** 'buffer_name' (string)
-*** 'number' (integer)
-*** 'prev_layout' (pointer, hdata: "layout_buffer")
-*** 'next_layout' (pointer, hdata: "layout_buffer")
-* [[hdata_layout_window]]<<hdata_layout_window,'layout_window'>>: Fenster-Layout
-** Erweiterung: weechat
-** Variablen:
-*** '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)
-* [[hdata_line]]<<hdata_line,'line'>>: Struktur mit einer Zeile
-** Erweiterung: weechat
-** Variablen:
-*** 'data' (pointer, hdata: "line_data")
-*** 'prev_line' (pointer, hdata: "line")
-*** 'next_line' (pointer, hdata: "line")
-* [[hdata_line_data]]<<hdata_line_data,'line_data'>>: Struktur mit einzeiligen Daten
-** Erweiterung: weechat
-** Variablen:
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'y' (integer)
-*** 'date' (time)
-*** 'date_printed' (time)
-*** 'str_time' (string)
-*** 'tags_count' (integer)
-*** 'tags_array' (shared_string, array_size: "tags_count")
-*** 'displayed' (char)
-*** 'highlight' (char)
-*** 'refresh_needed' (char)
-*** 'prefix' (shared_string)
-*** 'prefix_length' (integer)
-*** 'message' (string)
-** Update erlaubt:
-*** 'date' (time)
-*** 'date_printed' (time)
-*** 'tags_array' (shared_string)
-*** 'prefix' (shared_string)
-*** 'message' (string)
-* [[hdata_lines]]<<hdata_lines,'lines'>>: Struktur mit Zeilen
-** Erweiterung: weechat
-** Variablen:
-*** 'first_line' (pointer, hdata: "line")
-*** 'last_line' (pointer, hdata: "line")
-*** 'last_read_line' (pointer, hdata: "line")
-*** 'lines_count' (integer)
-*** 'first_line_not_read' (integer)
-*** 'lines_hidden' (integer)
-*** 'buffer_max_length' (integer)
-*** 'buffer_max_length_refresh' (integer)
-*** 'prefix_max_length' (integer)
-*** 'prefix_max_length_refresh' (integer)
-* [[hdata_nick]]<<hdata_nick,'nick'>>: Nick in Benutzerliste
-** Erweiterung: weechat
-** Variablen:
-*** 'group' (pointer, hdata: "nick_group")
-*** 'name' (shared_string)
-*** 'color' (shared_string)
-*** 'prefix' (shared_string)
-*** 'prefix_color' (shared_string)
-*** 'visible' (integer)
-*** 'prev_nick' (pointer, hdata: "nick")
-*** 'next_nick' (pointer, hdata: "nick")
-* [[hdata_nick_group]]<<hdata_nick_group,'nick_group'>>: Gruppen in Benutzerliste
-** Erweiterung: weechat
-** Variablen:
-*** 'name' (shared_string)
-*** 'color' (shared_string)
-*** 'visible' (integer)
-*** 'level' (integer)
-*** 'parent' (pointer, hdata: "nick_group")
-*** 'children' (pointer, hdata: "nick_group")
-*** 'last_child' (pointer, hdata: "nick_group")
-*** 'nicks' (pointer, hdata: "nick")
-*** 'last_nick' (pointer, hdata: "nick")
-*** 'prev_group' (pointer, hdata: "nick_group")
-*** 'next_group' (pointer, hdata: "nick_group")
-* [[hdata_plugin]]<<hdata_plugin,'plugin'>>: Erweiterung
-** Erweiterung: weechat
-** Variablen:
-*** 'filename' (string)
-*** 'handle' (pointer)
-*** 'name' (string)
-*** 'description' (string)
-*** 'author' (string)
-*** 'version' (string)
-*** 'license' (string)
-*** 'charset' (string)
-*** 'priority' (integer)
-*** 'initialized' (integer)
-*** 'debug' (integer)
-*** 'prev_plugin' (pointer, hdata: "plugin")
-*** 'next_plugin' (pointer, hdata: "plugin")
-** Listen:
-*** 'last_weechat_plugin'
-*** 'weechat_plugins'
-* [[hdata_proxy]]<<hdata_proxy,'proxy'>>: Proxy
-** Erweiterung: weechat
-** Variablen:
-*** 'name' (string)
-*** 'options' (pointer)
-*** 'prev_proxy' (pointer, hdata: "proxy")
-*** 'next_proxy' (pointer, hdata: "proxy")
-** Listen:
-*** 'last_weechat_proxy'
-*** 'weechat_proxies'
-* [[hdata_window]]<<hdata_window,'window'>>: Fenster
-** Erweiterung: weechat
-** Variablen:
-*** 'number' (integer)
-*** 'win_x' (integer)
-*** 'win_y' (integer)
-*** 'win_width' (integer)
-*** 'win_height' (integer)
-*** 'win_width_pct' (integer)
-*** 'win_height_pct' (integer)
-*** 'win_chat_x' (integer)
-*** 'win_chat_y' (integer)
-*** 'win_chat_width' (integer)
-*** 'win_chat_height' (integer)
-*** 'win_chat_cursor_x' (integer)
-*** 'win_chat_cursor_y' (integer)
-*** 'bar_windows' (pointer, hdata: "bar_window")
-*** 'last_bar_window' (pointer, hdata: "bar_window")
-*** 'refresh_needed' (integer)
-*** 'gui_objects' (pointer)
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'layout_plugin_name' (string)
-*** 'layout_buffer_name' (string)
-*** 'scroll' (pointer, hdata: "window_scroll")
-*** 'ptr_tree' (pointer, hdata: "window_tree")
-*** 'prev_window' (pointer, hdata: "window")
-*** 'next_window' (pointer, hdata: "window")
-** Listen:
-*** 'gui_current_window'
-*** 'gui_windows'
-*** 'last_gui_window'
-* [[hdata_window_scroll]]<<hdata_window_scroll,'window_scroll'>>: Scroll-Info in Fenstern
-** Erweiterung: weechat
-** Variablen:
-*** 'buffer' (pointer, hdata: "buffer")
-*** 'first_line_displayed' (integer)
-*** 'start_line' (pointer, hdata: "line")
-*** 'start_line_pos' (integer)
-*** 'scrolling' (integer)
-*** 'start_col' (integer)
-*** 'lines_after' (integer)
-*** 'text_search_start_line' (pointer, hdata: "line")
-*** 'prev_scroll' (pointer, hdata: "window_scroll")
-*** 'next_scroll' (pointer, hdata: "window_scroll")
-* [[hdata_window_tree]]<<hdata_window_tree,'window_tree'>>: Baumstruktur der Fenster
-** Erweiterung: weechat
-** Variablen:
-*** 'parent_node' (pointer, hdata: "window_tree")
-*** 'split_pct' (integer)
-*** 'split_horizontal' (integer)
-*** 'child1' (pointer, hdata: "window_tree")
-*** 'child2' (pointer, hdata: "window_tree")
-*** 'window' (pointer, hdata: "window")
-** Listen:
-*** 'gui_windows_tree'

doc/de/autogen/plugin_api/infos_hashtable.adoc

@@ -2,7 +2,7 @@
 // This file is auto-generated by script docgen.py.
 // DO NOT EDIT BY HAND!
 //
-[width="100%",cols="^1,^2,6,6,6",options="header"]
+[width="100%",cols="^1,^2,6,6,8",options="header"]
 |===
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)
 

doc/de/autogen/plugin_api/url_options.adoc

@@ -42,14 +42,12 @@
 
 | address_scope | long |
 
-| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs
 
-| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher
+| redir_protocols | mask | http, https, ftp, ftps, scp, sftp, telnet, ldap, ldaps, dict, file, tftp, all, imap, imaps, pop3, pop3s, smtp, smtps, rtsp, rtmp, rtmpt, rtmpe, rtmpte, rtmps, rtmpts, gopher, smb, smbs
 
 | noproxy | string |
 
-| socks5_gssapi_service | string |
-
 | socks5_gssapi_nec | long |
 
 | tcp_keepalive | long |
@@ -58,15 +56,27 @@
 
 | tcp_keepintvl | long |
 
+| unix_socket_path | string |
+
+| path_as_is | long |
+
+| proxy_service_name | string |
+
+| service_name | string |
+
+| default_protocol | string |
+
+| tcp_fastopen | long |
+
 | netrc | long | ignored, optional, required
 
 | userpwd | string |
 
 | proxyuserpwd | string |
 
-| httpauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| httpauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
 
-| proxyauth | mask | none, basic, digest, gssnegotiate, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
+| proxyauth | mask | none, basic, digest, ntlm, any, anysafe, digest_ie, only, ntlm_wb, negotiate
 
 | netrc_file | string |
 
@@ -116,7 +126,7 @@
 
 | cookiejar | string |
 
-| http_version | long | none, 1_0, 1_1
+| http_version | long | none, 1_0, 1_1, 2_0, 2, 2tls, 2_prior_knowledge
 
 | cookiesession | long |
 
@@ -144,12 +154,18 @@
 
 | headeropt | mask | unified, separate
 
+| pipewait | long |
+
+| stream_weight | long |
+
 | mail_from | string |
 
 | mail_auth | string |
 
 | tftp_blksize | long |
 
+| tftp_no_options | long |
+
 | ftpport | string |
 
 | ftp_use_epsv | long |
@@ -302,12 +318,18 @@
 
 | gssapi_delegation | long | none, policy_flag, flag
 
-| ssl_options | long | allow_beast
+| ssl_options | long | allow_beast, no_revoke
 
 | ssl_enable_alpn | long |
 
 | ssl_enable_npn | long |
 
+| pinnedpublickey | string |
+
+| ssl_verifystatus | long |
+
+| ssl_falsestart | long |
+
 | ssh_auth_types | mask | none, policy_flag, flag
 
 | ssh_public_keyfile | string |

doc/de/autogen/user/alias_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_alias_alias]]
-[command]*`alias`* auflisten, hinzufügen oder entfernen von Alternativnamen::
+* `+alias+`: auflisten, hinzufügen oder entfernen von Alternativnamen
 
 ----
 /alias  list [<alias>]

doc/de/autogen/user/aspell_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_aspell_aspell]]
-[command]*`aspell`* Konfiguration für Aspell-Erweiterung::
+* `+aspell+`: Konfiguration für Aspell-Erweiterung
 
 ----
 /aspell  enable|disable|toggle

doc/de/autogen/user/aspell_options.adoc

@@ -0,0 +1,48 @@
+//
+// This file is auto-generated by script docgen.py.
+// DO NOT EDIT BY HAND!
+//
+* [[option_aspell.check.commands]] *aspell.check.commands*
+** Beschreibung: pass:none[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"+`)
+
+* [[option_aspell.check.default_dict]] *aspell.check.default_dict*
+** Beschreibung: pass:none[Voreingestelltes Wörterbuch (oder durch Kommata getrennte Liste der Wörterbücher) welche(s) genutzt werden soll, sofern kein Wörterbuch für einen Buffer definiert wurde. Wird kein Wörterbuch angegeben dann ist Aspell in allen Buffer deaktiviert, außer es wird für einen Buffer explizit ein Wörterbuch angegeben]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+""+`)
+
+* [[option_aspell.check.during_search]] *aspell.check.during_search*
+** Beschreibung: pass:none[Überprüfe Wörter während im Buffer nach einem Text gesucht wird]
+** Typ: boolesch
+** Werte: on, off (Standardwert: `+off+`)
+
+* [[option_aspell.check.enabled]] *aspell.check.enabled*
+** Beschreibung: pass:none[Aspell wird für die Eingabezeile aktiviert]
+** Typ: boolesch
+** Werte: on, off (Standardwert: `+off+`)
+
+* [[option_aspell.check.real_time]] *aspell.check.real_time*
+** Beschreibung: pass:none[Eine Korrektur findet während der Texteingabe statt (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft sobald ein Leerzeichen dem vorangegangenen Wort folgt)]
+** Typ: boolesch
+** Werte: on, off (Standardwert: `+off+`)
+
+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** Beschreibung: pass:none[legt die Anzahl an Vorschlägen, für ein falsch geschriebenes Wort, fest. Die Vorschläge werden mittels der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), die für den Buffer augewählt wurden, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge, für alle ausgewählten Sprachen, an)]
+** Typ: integer
+** Werte: -1 .. 2147483647 (Standardwert: `+-1+`)
+
+* [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
+** Beschreibung: pass:none[Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)]
+** Typ: integer
+** Werte: 0 .. 2147483647 (Standardwert: `+2+`)
+
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
+** Beschreibung: pass:none[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 kursiv, "_" für unterstrichen (Standardwert: `+lightred+`)
+
+* [[option_aspell.color.suggestions]] *aspell.color.suggestions*
+** Beschreibung: pass:none[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 kursiv, "_" für unterstrichen (Standardwert: `+default+`)

doc/de/autogen/user/aspell_options.asciidoc

@@ -1,48 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-* [[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)`
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `"ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"`)
-
-* [[option_aspell.check.default_dict]] *aspell.check.default_dict*
-** Beschreibung: `Voreingestelltes Wörterbuch (oder durch Kommata getrennte Liste der Wörterbücher) welche(s) genutzt werden soll, sofern kein Wörterbuch für einen Buffer definiert wurde. Wird kein Wörterbuch angegeben dann ist Aspell in allen Buffer deaktiviert, außer es wird für einen Buffer explizit ein Wörterbuch angegeben`
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `""`)
-
-* [[option_aspell.check.during_search]] *aspell.check.during_search*
-** Beschreibung: `Überprüfe Wörter während im Buffer nach einem Text gesucht wird`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
-
-* [[option_aspell.check.enabled]] *aspell.check.enabled*
-** Beschreibung: `Aspell wird für die Eingabezeile aktiviert`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
-
-* [[option_aspell.check.real_time]] *aspell.check.real_time*
-** Beschreibung: `Eine Korrektur findet während der Texteingabe statt (da dies langsamer ist, ist diese Funktion standardmäßig deaktiviert. Wörter werden erst überprüft sobald ein Leerzeichen dem vorangegangenen Wort folgt)`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `off`)
-
-* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
-** Beschreibung: `legt die Anzahl an Vorschlägen, für ein falsch geschriebenes Wort, fest. Die Vorschläge werden mittels der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), die für den Buffer augewählt wurden, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge, für alle ausgewählten Sprachen, an)`
-** Typ: integer
-** Werte: -1 .. 2147483647 (Standardwert: `-1`)
-
-* [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
-** Beschreibung: `Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)`
-** Typ: integer
-** Werte: 0 .. 2147483647 (Standardwert: `2`)
-
-* [[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 kursiv, "_" 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 kursiv, "_" für unterstrichen (Standardwert: `default`)

doc/de/autogen/user/charset_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_charset_charset]]
-[command]*`charset`* Ändert den Zeichensatz für aktuellen Buffer::
+* `+charset+`: Ändert den Zeichensatz für aktuellen Buffer
 
 ----
 /charset  decode|encode <charset>

doc/de/autogen/user/charset_options.adoc

@@ -0,0 +1,13 @@
+//
+// This file is auto-generated by script docgen.py.
+// DO NOT EDIT BY HAND!
+//
+* [[option_charset.default.decode]] *charset.default.decode*
+** Beschreibung: pass:none[globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll, falls diese nicht UTF-8 gültig ist]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+"iso-8859-1"+`)
+
+* [[option_charset.default.encode]] *charset.default.encode*
+** Beschreibung: pass:none[globale Zeichenkodierung: Zeichenkodierung die für ausgehende Nachrichten genutzt werden soll (sollte keine Zeichenkodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Kodierung nutzt)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `+""+`)

doc/de/autogen/user/charset_options.asciidoc

@@ -1,13 +0,0 @@
-//
-// This file is auto-generated by script docgen.py.
-// DO NOT EDIT BY HAND!
-//
-* [[option_charset.default.decode]] *charset.default.decode*
-** Beschreibung: `globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll, falls diese nicht UTF-8 gültig ist`
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `"iso-8859-1"`)
-
-* [[option_charset.default.encode]] *charset.default.encode*
-** Beschreibung: `globale Zeichenkodierung: Zeichenkodierung die für ausgehende Nachrichten genutzt werden soll (sollte keine Zeichenkodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Kodierung nutzt)`
-** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `""`)

doc/de/autogen/user/exec_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_exec_exec]]
-[command]*`exec`* führe externe Befehle aus::
+* `+exec+`: führe externe Befehle aus
 
 ----
 /exec  -list

doc/de/autogen/user/exec_options.adoc

@@ -3,21 +3,21 @@
 // DO NOT EDIT BY HAND!
 //
 * [[option_exec.color.flag_finished]] *exec.color.flag_finished*
-** Beschreibung: `Textfarbe des Statusindikator (in der Auflistung der Befehle) für beendete Befehle`
+** Beschreibung: pass:none[Textfarbe des Statusindikator (in der Auflistung der Befehle) für beendete Befehle]
 ** Typ: Farbe
-** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `lightred`)
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `+lightred+`)
 
 * [[option_exec.color.flag_running]] *exec.color.flag_running*
-** Beschreibung: `Textfarbe des Statusindikator (in der Auflistung der Befehle) für Befehle die zur Zeit ausgeführt werden`
+** Beschreibung: pass:none[Textfarbe des Statusindikator (in der Auflistung der Befehle) für Befehle die zur Zeit ausgeführt werden]
 ** Typ: Farbe
-** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `lightgreen`)
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `+lightgreen+`)
 
 * [[option_exec.command.default_options]] *exec.command.default_options*
-** Beschreibung: `Standardoptionen für den Befehl /exec (siehe /help exec); Beispiele: "-nosh -bg" führt alle Befehle im Hintergrund aus (keine Textausgabe) und ohne das die shell genutzt wird`
+** Beschreibung: pass:none[Standardoptionen für den Befehl /exec (siehe /help exec); Beispiele: "-nosh -bg" führt alle Befehle im Hintergrund aus (keine Textausgabe) und ohne das die shell genutzt wird]
 ** Typ: Zeichenkette
-** Werte: beliebige Zeichenkette (Standardwert: `""`)
+** Werte: beliebige Zeichenkette (Standardwert: `+""+`)
 
 * [[option_exec.command.purge_delay]] *exec.command.purge_delay*
-** Beschreibung: `Wartezeit bis nicht mehr ausgeführte Befehle gelöscht werden (in Sekunden, 0 = lösche Befehle unmittelbar, -1 = niemals löschen)`
+** Beschreibung: pass:none[Wartezeit bis nicht mehr ausgeführte Befehle gelöscht werden (in Sekunden, 0 = lösche Befehle unmittelbar, -1 = niemals löschen)]
 ** Typ: integer
-** Werte: -1 .. 25920000 (Standardwert: `0`)
+** Werte: -1 .. 25920000 (Standardwert: `+0+`)

doc/de/autogen/user/fifo_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_fifo_fifo]]
-[command]*`fifo`* Konfiguration für "fifo" Erweiterung::
+* `+fifo+`: Konfiguration für "fifo" Erweiterung
 
 ----
 /fifo  enable|disable|toggle

doc/de/autogen/user/guile_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_guile_guile]]
-[command]*`guile`* auflisten/installieren/beenden von Skripten::
+* `+guile+`: auflisten/installieren/beenden von Skripten
 
 ----
 /guile  list|listfull [<name>]

doc/de/autogen/user/irc_commands.adoc

@@ -3,7 +3,7 @@
 // DO NOT EDIT BY HAND!
 //
 [[command_irc_admin]]
-[command]*`admin`* Information über den Server-Administrator abfragen::
+* `+admin+`: Information über den Server-Administrator abfragen
 
 ----
 /admin  [<target>]
@@ -12,7 +12,7 @@ target: Servername
 ----
 
 [[command_irc_allchan]]
-[command]*`allchan`* führt einen Befehl aus der an alle Channels gesendet wird, die mit einem Server verbunden sind::
+* `+allchan+`: führt einen Befehl aus der an alle Channels gesendet wird, die mit einem Server verbunden sind
 
 ----
 /allchan  [-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]
@@ -32,7 +32,7 @@ Beispiele:
 ----
 
 [[command_irc_allpv]]
-[command]*`allpv`* führt einen Befehl aus der an alle privaten Buffer gesendet wird, die mit einem Server verbunden sind::
+* `+allpv+`: führt einen Befehl aus der an alle privaten Buffer gesendet wird, die mit einem Server verbunden sind
 
 ----
 /allpv  [-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>]
@@ -54,7 +54,7 @@ Beispiele:
 ----
 
 [[command_irc_allserv]]
-[command]*`allserv`* führt einen Befehl aus, der zu allen verbundenen Server gesendet wird::
+* `+allserv+`: führt einen Befehl aus, der zu allen verbundenen Server gesendet wird
 
 ----
 /allserv  [-exclude=<server>[,<server>...]] <command> [<arguments>]
@@ -73,7 +73,7 @@ Beispiele:
 ----
 
 [[command_irc_ban]]
-[command]*`ban`* Nicknamen oder Hosts sperren/verbannen::
+* `+ban+`: Nicknamen oder Hosts sperren/verbannen
 
 ----
 /ban  [<channel>] [<nick> [<nick>...]]
@@ -85,7 +85,7 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei
 ----
 
 [[command_irc_cap]]
-[command]*`cap`* Aushandlung der Clientfähigkeit::
+* `+cap+`: Aushandlung der Clientfähigkeit
 
 ----
 /cap  ls
@@ -111,7 +111,7 @@ Beispiele:
 ----
 
 [[command_irc_connect]]
-[command]*`connect`* Mit IRC-Server(n) verbinden::
+* `+connect+`: Mit IRC-Server(n) verbinden
 
 ----
 /connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
@@ -143,7 +143,7 @@ Beispiele:
 ----
 
 [[command_irc_ctcp]]
-[command]*`ctcp`* CTCP-Nachricht verschicken::
+* `+ctcp+`: CTCP-Nachricht verschicken
 
 ----
 /ctcp  [-server <server>] <target>[,<target>...] <type> [<arguments>]
@@ -160,7 +160,7 @@ Beispiele:
 ----
 
 [[command_irc_cycle]]
-[command]*`cycle`* Einen Channel verlassen und wieder betreten::
+* `+cycle+`: Einen Channel verlassen und wieder betreten
 
 ----
 /cycle  [<channel>[,<channel>...]] [<message>]
@@ -170,7 +170,7 @@ message: Abschiedsnachricht (wird anderen Usern angezeigt)
 ----
 
 [[command_irc_dcc]]
-[command]*`dcc`* Startet DCC Verbindung (Datentransfer oder einen Direktchat)::
+* `+dcc+`: Startet DCC Verbindung (Datentransfer oder einen Direktchat)
 
 ----
 /dcc  chat <nick>
@@ -187,7 +187,7 @@ Beispiel:
 ----
 
 [[command_irc_dehalfop]]
-[command]*`dehalfop`* halb-Operator-Privilegien einem oder mehreren Nick(s) entziehen::
+* `+dehalfop+`: halb-Operator-Privilegien einem oder mehreren Nick(s) entziehen
 
 ----
 /dehalfop  <nick> [<nick>...]
@@ -197,7 +197,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_deop]]
-[command]*`deop`* Operator-Privilegien einem oder mehreren Nicknamen entziehen::
+* `+deop+`: Operator-Privilegien einem oder mehreren Nicknamen entziehen
 
 ----
 /deop  <nick> [<nick>...]
@@ -208,7 +208,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_devoice]]
-[command]*`devoice`* Voice-Privilegien einem oder mehreren Nicknamen entziehen::
+* `+devoice+`: Voice-Privilegien einem oder mehreren Nicknamen entziehen
 
 ----
 /devoice  <nick> [<nick>...]
@@ -219,7 +219,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_die]]
-[command]*`die`* Server herunterfahren::
+* `+die+`: Server herunterfahren
 
 ----
 /die  [<target>]
@@ -228,7 +228,7 @@ target: Servername
 ----
 
 [[command_irc_disconnect]]
-[command]*`disconnect`* Verbindung zu einem oder mehreren IRC-Server(n) trennen::
+* `+disconnect+`: Verbindung zu einem oder mehreren IRC-Server(n) trennen
 
 ----
 /disconnect  [<server>|-all|-pending [<reason>]]
@@ -240,7 +240,7 @@ reason: Begründung der Trennung
 ----
 
 [[command_irc_halfop]]
-[command]*`halfop`* halb-Operator Status an Nick(s) vergeben::
+* `+halfop+`: halb-Operator Status an Nick(s) vergeben
 
 ----
 /halfop  <nick> [<nick>...]
@@ -251,7 +251,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_ignore]]
-[command]*`ignore`* Ignoriert Nicks/Hosts von Channels oder Servern::
+* `+ignore+`: Ignoriert Nicks/Hosts von Channels oder Servern
 
 ----
 /ignore  list
@@ -279,7 +279,7 @@ Beispiele:
 ----
 
 [[command_irc_info]]
-[command]*`info`* Information über den Server abfragen::
+* `+info+`: Information über den Server abfragen
 
 ----
 /info  [<target>]
@@ -288,7 +288,7 @@ target: Servername
 ----
 
 [[command_irc_invite]]
-[command]*`invite`* Eine Person in einen Channel einladen::
+* `+invite+`: Eine Person in einen Channel einladen
 
 ----
 /invite  <nick> [<nick>...] [<channel>]
@@ -298,7 +298,7 @@ channel: Name des Channels
 ----
 
 [[command_irc_ison]]
-[command]*`ison`* Überprüft ob ein Nick gegenwärtig auf IRC angemeldet ist::
+* `+ison+`: Überprüft ob ein Nick gegenwärtig auf IRC angemeldet ist
 
 ----
 /ison  <nick> [<nick>...]
@@ -307,7 +307,7 @@ nick: Nickname
 ----
 
 [[command_irc_join]]
-[command]*`join`* einen Channel betreten::
+* `+join+`: einen Channel betreten
 
 ----
 /join  [-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]
@@ -325,7 +325,7 @@ Beispiele:
 ----
 
 [[command_irc_kick]]
-[command]*`kick`* wirft einen User aus einem Channel::
+* `+kick+`: wirft einen User aus einem Channel
 
 ----
 /kick  [<channel>] <nick> [<reason>]
@@ -336,7 +336,7 @@ channel: Channelname
 ----
 
 [[command_irc_kickban]]
-[command]*`kickban`* wirft einen User aus einem Channel und sein Host kommt auf die Bannliste::
+* `+kickban+`: wirft einen User aus einem Channel und sein Host kommt auf die Bannliste
 
 ----
 /kickban  [<channel>] <nick> [<reason>]
@@ -353,7 +353,7 @@ Beispiel:
 ----
 
 [[command_irc_kill]]
-[command]*`kill`* Beende Client-Server Verbindung::
+* `+kill+`: Beende Client-Server Verbindung
 
 ----
 /kill  <nick> [<reason>]
@@ -363,7 +363,7 @@ reason: Grund der Abmeldung
 ----
 
 [[command_irc_links]]
-[command]*`links`* alle Servernamen auflisten die dem antwortenden Server bekannt sind::
+* `+links+`: alle Servernamen auflisten die dem antwortenden Server bekannt sind
 
 ----
 /links  [[<server>] <server_mask>]
@@ -373,7 +373,7 @@ server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
 ----
 
 [[command_irc_list]]
-[command]*`list`* Channels mit ihrem Thema auflisten::
+* `+list+`: Channels mit ihrem Thema auflisten
 
 ----
 /list  [<channel>[,<channel>...]] [<server>] [-re <regex>]
@@ -392,7 +392,7 @@ Beispiele:
 ----
 
 [[command_irc_lusers]]
-[command]*`lusers`* Statistik über die Größe des IRC-Netzwerks abfragen::
+* `+lusers+`: Statistik über die Größe des IRC-Netzwerks abfragen
 
 ----
 /lusers  [<mask> [<target>]]
@@ -402,13 +402,13 @@ target: Server, der die Anfrage weiterleiten soll
 ----
 
 [[command_irc_map]]
-[command]*`map`* Zeigt das IRC Netzwerk, in Form einer Baumstruktur, an::
+* `+map+`: Zeigt das IRC Netzwerk, in Form einer Baumstruktur, an
 
 ----
 ----
 
 [[command_irc_me]]
-[command]*`me`* eine CTCP ACTION an den aktuellen Channel senden::
+* `+me+`: eine CTCP ACTION an den aktuellen Channel senden
 
 ----
 /me  <message>
@@ -417,7 +417,7 @@ message: zu sendende Nachricht
 ----
 
 [[command_irc_mode]]
-[command]*`mode`* Eigenschaften eines Channel oder von einem User ändern::
+* `+mode+`: Eigenschaften eines Channel oder von einem User ändern
 
 ----
 /mode  [<channel>] [+|-]o|p|s|i|t|n|m|l|b|e|v|k [<arguments>]
@@ -454,7 +454,7 @@ Beispiele:
 ----
 
 [[command_irc_motd]]
-[command]*`motd`* Die "Mitteilung des Tages" abfragen::
+* `+motd+`: Die "Mitteilung des Tages" abfragen
 
 ----
 /motd  [<target>]
@@ -463,7 +463,7 @@ target: Servername
 ----
 
 [[command_irc_msg]]
-[command]*`msg`* Nachricht an Nick/Channel verschicken::
+* `+msg+`: Nachricht an Nick/Channel verschicken
 
 ----
 /msg  [-server <server>] <target>[,<target>...] <text>
@@ -474,7 +474,7 @@ target: Nick oder Channel (darf eine Maske sein, '*' = aktueller Channel)
 ----
 
 [[command_irc_names]]
-[command]*`names`* Nicknamen in Channels auflisten::
+* `+names+`: Nicknamen in Channels auflisten
 
 ----
 /names  [<channel>[,<channel>...]]
@@ -483,7 +483,7 @@ channel: Name des Channels
 ----
 
 [[command_irc_nick]]
-[command]*`nick`* derzeitigen Nicknamen ändern::
+* `+nick+`: derzeitigen Nicknamen ändern
 
 ----
 /nick  [-all] <nick>
@@ -493,7 +493,7 @@ nick: neuer Nickname
 ----
 
 [[command_irc_notice]]
-[command]*`notice`* Mitteilung (notice) an einen User verschicken::
+* `+notice+`: Mitteilung (notice) an einen User verschicken
 
 ----
 /notice  [-server <server>] <target> <text>
@@ -504,7 +504,7 @@ target: Nick- oder Channelname
 ----
 
 [[command_irc_notify]]
-[command]*`notify`* fügt eine Benachrichtigung für An- oder Abwesenheit von Nicks auf Servern hinzu::
+* `+notify+`: fügt eine Benachrichtigung für An- oder Abwesenheit von Nicks auf Servern hinzu
 
 ----
 /notify  add <nick> [<server> [-away]]
@@ -529,7 +529,7 @@ Beispiele:
 ----
 
 [[command_irc_op]]
-[command]*`op`* Channel-Operator Status an Nicknamen vergeben::
+* `+op+`: Channel-Operator Status an Nicknamen vergeben
 
 ----
 /op  <nick> [<nick>...]
@@ -540,7 +540,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_oper]]
-[command]*`oper`* Operator Privilegien anfordern::
+* `+oper+`: Operator Privilegien anfordern
 
 ----
 /oper  <user> <password>
@@ -550,7 +550,7 @@ password: Passwort
 ----
 
 [[command_irc_part]]
-[command]*`part`* Einen Channel verlassen::
+* `+part+`: Einen Channel verlassen
 
 ----
 /part  [<channel>[,<channel>...]] [<message>]
@@ -560,7 +560,7 @@ message: Abschiedsnachricht (wird anderen Usern angezeigt)
 ----
 
 [[command_irc_ping]]
-[command]*`ping`* sendet einen Ping an den Server::
+* `+ping+`: sendet einen Ping an den Server
 
 ----
 /ping  <server1> [<server2>]
@@ -570,7 +570,7 @@ server2: Ping an diesen Server weiterleiten
 ----
 
 [[command_irc_pong]]
-[command]*`pong`* Auf Ping antworten::
+* `+pong+`: Auf Ping antworten
 
 ----
 /pong  <daemon> [<daemon2>]
@@ -580,7 +580,7 @@ Daemon2: Nachricht an diesen Daemon weiterleiten
 ----
 
 [[command_irc_query]]
-[command]*`query`* Eine private Nachricht an einen Nick schicken::
+* `+query+`: Eine private Nachricht an einen Nick schicken
 
 ----
 /query  [-noswitch] [-server <server>] <nick>[,<nick>...] [<text>]
@@ -592,7 +592,7 @@ target: Nickname
 ----
 
 [[command_irc_quiet]]
-[command]*`quiet`* Nicks oder Hosts das Wort entziehen (User können im Channel erst schreiben, wenn sie "+v" oder höher besitzen)::
+* `+quiet+`: Nicks oder Hosts das Wort entziehen (User können im Channel erst schreiben, wenn sie "+v" oder höher besitzen)
 
 ----
 /quiet  [<channel>] [<nick> [<nick>...]]
@@ -604,7 +604,7 @@ Ohne Angabe von Argumenten wird die Quiet-Liste für den aktuellen Channel angez
 ----
 
 [[command_irc_quote]]
-[command]*`quote`* Daten direkt an Server senden (siehe RFC 2812)::
+* `+quote+`: Daten direkt an Server senden (siehe RFC 2812)
 
 ----
 /quote  [-server <server>] <data>
@@ -614,7 +614,7 @@ data: unbearbeitete (RAW) Daten die gesendet werden sollen
 ----
 
 [[command_irc_reconnect]]
-[command]*`reconnect`* Mit einem oder mehreren Server(n) erneut verbinden::
+* `+reconnect+`: Mit einem oder mehreren Server(n) erneut verbinden
 
 ----
 /reconnect  <server> [<server>...] [-nojoin] [-switch]
@@ -627,7 +627,7 @@ data: unbearbeitete (RAW) Daten die gesendet werden sollen
 ----
 
 [[command_irc_rehash]]
-[command]*`rehash`* Den Server auffordern seine Konfigurationsdatei neu zu laden::
+* `+rehash+`: Den Server auffordern seine Konfigurationsdatei neu zu laden
 
 ----
 /rehash  [<option>]
@@ -636,7 +636,7 @@ option: zusätzliche Einstellung, die von manchen Servern berücksichtigt wird
 ----
 
 [[command_irc_remove]]
-[command]*`remove`* zwingt einen User einen Channel zu verlassen::
+* `+remove+`: zwingt einen User einen Channel zu verlassen
 
 ----
 /remove  [<channel>] <nick> [<reason>]
@@ -647,7 +647,7 @@ channel: Channelname
 ----
 
 [[command_irc_restart]]
-[command]*`restart`* Server dazu bringen sich selbst neu zu starten::
+* `+restart+`: Server dazu bringen sich selbst neu zu starten
 
 ----
 /restart  [<target>]
@@ -656,7 +656,7 @@ target: Servername
 ----
 
 [[command_irc_sajoin]]
-[command]*`sajoin`* fordert einen User auf einen oder mehrere Channel zu betreten::
+* `+sajoin+`: fordert einen User auf einen oder mehrere Channel zu betreten
 
 ----
 /sajoin  <nick> <channel>[,<channel>...]
@@ -666,7 +666,7 @@ channel: Name des Channels
 ----
 
 [[command_irc_samode]]
-[command]*`samode`* ändert den Modus des Channels ohne das Operator-Privilegien vorliegen::
+* `+samode+`: ändert den Modus des Channels ohne das Operator-Privilegien vorliegen
 
 ----
 /samode  [<channel>] <mode>
@@ -676,7 +676,7 @@ Channel: Name des Channel
 ----
 
 [[command_irc_sanick]]
-[command]*`sanick`* zwingt einen User den Nick zu ändern::
+* `+sanick+`: zwingt einen User den Nick zu ändern
 
 ----
 /sanick  <nick> <new_nick>
@@ -686,7 +686,7 @@ new_nick: neuer Nickname
 ----
 
 [[command_irc_sapart]]
-[command]*`sapart`* zwingt einen User den oder die Channel(s) zu verlassen::
+* `+sapart+`: zwingt einen User den oder die Channel(s) zu verlassen
 
 ----
 /sapart  <nick> <channel>[,<channel>...]
@@ -696,7 +696,7 @@ channel: Name des Channels
 ----
 
 [[command_irc_saquit]]
-[command]*`saquit`* Zwingt einen User den Server mit Begründung zu verlassen::
+* `+saquit+`: Zwingt einen User den Server mit Begründung zu verlassen
 
 ----
 /saquit  <nick> <reason>
@@ -706,7 +706,7 @@ reason: Grund der Abmeldung
 ----
 
 [[command_irc_server]]
-[command]*`server`* auflisten, hinzufügen oder entfernen von IRC-Servern::
+* `+server+`: auflisten, hinzufügen oder entfernen von IRC-Servern
 
 ----
 /server  list|listfull [<server>]
@@ -746,7 +746,7 @@ Beispiele:
 ----
 
 [[command_irc_service]]
-[command]*`service`* einen neuen Service eintragen::
+* `+service+`: einen neuen Service eintragen
 
 ----
 /service  <nick> <reserved> <distribution> <type> <reserved> <info>
@@ -756,7 +756,7 @@ distribution: Sichtbarkeit des Services
 ----
 
 [[command_irc_servlist]]
-[command]*`servlist`* Auflistung von Services die momentan mit dem Netzwerk verbunden sind::
+* `+servlist+`: Auflistung von Services die momentan mit dem Netzwerk verbunden sind
 
 ----
 /servlist  [<mask> [<type>]]
@@ -766,7 +766,7 @@ type: nur Services von diesem Typ auflisten
 ----
 
 [[command_irc_squery]]
-[command]*`squery`* Nachricht an einen Service senden::
+* `+squery+`: Nachricht an einen Service senden
 
 ----
 /squery  <service> <text>
@@ -776,7 +776,7 @@ service: Name des Service
 ----
 
 [[command_irc_squit]]
-[command]*`squit`* Verbindung zum Server trennen::
+* `+squit+`: Verbindung zum Server trennen
 
 ----
 /squit  <server> <comment>
@@ -786,7 +786,7 @@ comment: Kommentar
 ----
 
 [[command_irc_stats]]
-[command]*`stats`* Serverstatistik abfragen::
+* `+stats+`: Serverstatistik abfragen
 
 ----
 /stats  [<query> [<server>]]
@@ -796,7 +796,7 @@ server: Name des Servers
 ----
 
 [[command_irc_summon]]
-[command]*`summon`* Nutzer die auf dem IRC-Server arbeiten darum bitten auf den IRC-Server zu kommen::
+* `+summon+`: Nutzer die auf dem IRC-Server arbeiten darum bitten auf den IRC-Server zu kommen
 
 ----
 /summon  <user> [<target> [<channel>]]
@@ -807,7 +807,7 @@ channel: Channelname
 ----
 
 [[command_irc_time]]
-[command]*`time`* Ortszeit des Servers abfragen::
+* `+time+`: Ortszeit des Servers abfragen
 
 ----
 /time  [<target>]
@@ -816,7 +816,7 @@ target: Zeit des angegebenen Servers abfragen
 ----
 
 [[command_irc_topic]]
-[command]*`topic`* Thema des Channels abfragen/setzen::
+* `+topic+`: Thema des Channels abfragen/setzen
 
 ----
 /topic  [<channel>] [<topic>|-delete]
@@ -827,7 +827,7 @@ channel: Name des Channels
 ----
 
 [[command_irc_trace]]
-[command]*`trace`* Route zum angegebenen Server ermitteln::
+* `+trace+`: Route zum angegebenen Server ermitteln
 
 ----
 /trace  [<target>]
@@ -836,7 +836,7 @@ target: Servername
 ----
 
 [[command_irc_unban]]
-[command]*`unban`* Bann von Nicks oder Hosts aufheben::
+* `+unban+`: Bann von Nicks oder Hosts aufheben
 
 ----
 /unban  [<channel>] <nick> [<nick>...]
@@ -846,7 +846,7 @@ channel: Name des Channel
 ----
 
 [[command_irc_unquiet]]
-[command]*`unquiet`* Nicks oder Hosts das Wort erteilen::
+* `+unquiet+`: Nicks oder Hosts das Wort erteilen
 
 ----
 /unquiet  [<channel>] <nick> [<nick>...]
@@ -856,7 +856,7 @@ channel: Name des Channel
 ----
 
 [[command_irc_userhost]]
-[command]*`userhost`* zeigt Informationen zu Nicknamen an::
+* `+userhost+`: zeigt Informationen zu Nicknamen an
 
 ----
 /userhost  <nick> [<nick>...]
@@ -865,7 +865,7 @@ nick: Nickname
 ----
 
 [[command_irc_users]]
-[command]*`users`* Auflistung der User die bei dem Server angemeldet sind::
+* `+users+`: Auflistung der User die bei dem Server angemeldet sind
 
 ----
 /users  [<target>]
@@ -874,7 +874,7 @@ target: Servername
 ----
 
 [[command_irc_version]]
-[command]*`version`* Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder angegebenen Nick/Server)::
+* `+version+`: Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder angegebenen Nick/Server)
 
 ----
 /version  [<server>|<nick>]
@@ -884,7 +884,7 @@ server: Servername
 ----
 
 [[command_irc_voice]]
-[command]*`voice`* Voice an Nick(s) vergeben::
+* `+voice+`: Voice an Nick(s) vergeben
 
 ----
 /voice  <nick> [<nick>...]
@@ -894,7 +894,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden)
 ----
 
 [[command_irc_wallchops]]
-[command]*`wallchops`* Nachricht an Channel-Operator verschicken::
+* `+wallchops+`: Nachricht an Channel-Operator verschicken
 
 ----
 /wallchops  [<channel>] <text>
@@ -904,7 +904,7 @@ channel: Name des Channel
 ----
 
 [[command_irc_wallops]]
-[command]*`wallops`* Nachricht an alle User schicken die den 'w'-Mode gesetzt haben::
+* `+wallops+`: Nachricht an alle User schicken die den 'w'-Mode gesetzt haben
 
 ----
 /wallops  <text>
@@ -913,7 +913,7 @@ text: Text der gesendet werden soll
 ----
 
 [[command_irc_who]]
-[command]*`who`* sendet eine Anfrage die eine Anzahl von Informationen zurück gibt::
+* `+who+`: sendet eine Anfrage die eine Anzahl von Informationen zurück gibt
 
 ----
 /who  [<mask> [o]]
@@ -923,7 +923,7 @@ mask: nur Information über betreffende Nicknamen abfragen
 ----
 
 [[command_irc_whois]]
-[command]*`whois`* Information über User abfragen::
+* `+whois+`: Information über User abfragen
 
 ----
 /whois  [<server>] [<nick>[,<nick>...]]
@@ -939,7 +939,7 @@ Sollte die Einstellung irc.network.whois_double_nick aktiviert sein dann wird ei
 ----
 
 [[command_irc_whowas]]
-[command]*`whowas`* Informationen über einen nicht mehr angemeldeten Nicknamen abfragen::
+* `+whowas+`: Informationen über einen nicht mehr angemeldeten Nicknamen abfragen
 
 ----
 /whowas  <nick>[,<nick>...] [<count> [<target>]]