api: return input string in function string_iconv_from_internal when current locale is wrong

This fixes a bug when writing configuration files with a wrong locale: now
UTF-8 is kept and written in files instead of string converted using a wrong
charset.

.editorconfig

@@ -0,0 +1,25 @@
+# To use this config on you editor, follow the instructions at:
+# https://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_size = 4
+indent_style = space
+tab_width = 8
+trim_trailing_whitespace = true
+
+[{*.{c,cpp,h}}]
+max_line_length = 80
+
+[{CMakeLists.txt,*.cmake}]
+max_line_length = 80
+indent_size = 2
+
+[*.html]
+indent_size = 2
+
+[*.yml]
+indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -9,7 +9,7 @@ body:
         Before submitting a bug, please check that it has not already been reported by searching in [open and closed bugs](https://github.com/weechat/weechat/issues?q=is%3Aissue+label%3Abug).
         If you don't use the latest version, please try if possible with the latest stable release to be sure the issue is still present and report the issue on this version.
 
-        **IMPORTANT**: please do not report any security issue here, see [Contributing.adoc](https://github.com/weechat/weechat/blob/master/Contributing.adoc#security-reports).
+        **IMPORTANT**: please do not report any security issue here, see [CONTRIBUTING.md](https://github.com/weechat/weechat/blob/main/CONTRIBUTING.md#security-reports).
 
   - type: textarea
     id: bug-description
@@ -85,9 +85,9 @@ body:
   - type: input
     id: os-version
     attributes:
-      label: What OS are you using?
+      label: What OS/distribution are you using?
       description: Name of the operating system and its version.
-      placeholder: Debian 12, Ubuntu 23.10, MacOS 14, ...
+      placeholder: Debian 12, Ubuntu 24.04, macOS 14, ...
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/question.yaml

@@ -10,6 +10,8 @@ body:
         - please read the [FAQ](https://weechat.org/doc/weechat/faq) and [documentation](https://weechat.org/doc/weechat/)
         - please ask on #weechat channel (on server irc.libera.chat).
 
+        **IMPORTANT**: please do not report any security issue here, see [CONTRIBUTING.md](https://github.com/weechat/weechat/blob/main/CONTRIBUTING.md#security-reports).
+
   - type: textarea
     id: question
     attributes:

.github/workflows/ci.yml

@@ -7,8 +7,9 @@ on:
     - cron: '22 9 * * 2'
 
 env:
-  WEECHAT_DEPENDENCIES: >-
+  WEECHAT_DEPS_UBUNTU: >-
     asciidoctor
+    build-essential
     cmake
     curl
     devscripts
@@ -33,24 +34,75 @@ env:
     libzstd-dev
     ninja-build
     php-dev
-    pkg-config
+    pipx
+    pkgconf
     pylint
     python3-bandit
     python3-dev
-    python3-pip
     ruby-pygments.rb
     shellcheck
     tcl8.6-dev
     zlib1g-dev
+  WEECHAT_DEPS_ROCKYLINUX: >-
+    asciidoctor
+    aspell-devel
+    cjson-devel
+    clang
+    cmake
+    cpputest-devel
+    gcc
+    gettext
+    glibc-langpack-en
+    gnutls-devel
+    guile30-devel
+    libcurl-devel
+    libgcrypt-devel
+    libzstd-devel
+    lua-devel
+    ncurses-devel
+    perl-devel
+    php-devel
+    php-embedded
+    python-devel
+    ruby-devel
+    sudo
+    tcl-devel
+    zlib-devel
+  WEECHAT_DEPS_FREEBSD: >-
+    aspell
+    cmake
+    cpputest
+    curl
+    gcc
+    gettext
+    git
+    gnutls
+    guile3
+    libargon2
+    libcjson
+    libgcrypt
+    libiconv
+    llvm
+    lua54
+    ncurses
+    perl5
+    php83
+    pkgconf
+    python3
+    ruby
+    rubygem-asciidoctor
+    sudo
+    tcl87
+    zstd
 
 jobs:
 
-  tests_linux:
+  tests_ubuntu:
 
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
+          - ubuntu-24.04
         config:
           - { name: "gcc", cc: "gcc", cxx: "g++", buildargs: "" }
           - { name: "gcc_ninja", cc: "gcc", cxx: "g++", buildargs: "-G Ninja" }
@@ -60,20 +112,20 @@ jobs:
           - { name: "gcc_coverage", cc: "gcc", cxx: "g++", buildargs: "-DENABLE_CODE_COVERAGE=ON" }
           - { name: "clang", cc: "clang", cxx: "clang++", buildargs: "" }
 
-    name: "Tests: ${{ matrix.config.name }} on ${{ matrix.os }}"
+    name: "${{ matrix.os }} (${{ matrix.config.name }})"
     runs-on: ${{ matrix.os }}
 
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: |
         sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }}
+        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPS_UBUNTU }}
         # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
-        sudo apt-get --yes purge php8.1-imagick
+        sudo apt-get --yes purge php8.3-imagick
-        sudo -H pip3 install --ignore-installed msgcheck
+        pipx install msgcheck
 
     - name: Check gettext files
       run: msgcheck po/*.po
@@ -100,9 +152,10 @@ jobs:
       run: |
         weechat --help
         weechat-curses --help
+        weechat --version
+        weechat --build-info
         weechat --colors
         weechat --license
-        weechat --version
         weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
 
     - name: Test Relay OpenAPI
@@ -110,7 +163,7 @@ jobs:
       env:
         RELAY_PASSWORD: test
       run: |
-        sudo -H pip3 install --ignore-installed schemathesis
+        pipx install schemathesis
         weechat-headless \
           --dir /tmp/weechat-test-api \
           --run-command '/set relay.network.password "${{ env.RELAY_PASSWORD }}"' \
@@ -132,17 +185,178 @@ jobs:
         lcov --list coverage.info
         bash <(curl -s https://codecov.io/bash) -f coverage.info || echo 'Codecov error'
 
+  build_debian:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+
+    name: "${{ matrix.os }} (build Debian)"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPS_UBUNTU }}
+
+    - name: Test Debian patches
+      run: ./tools/build_debian.sh test-patches
+
+    - name: Build Debian packages
+      run: ./tools/build_debian.sh devel ubuntu/noble
+
+    - name: Install Debian packages
+      run: sudo dpkg -i ../weechat-devel*.deb
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --version
+        weechat --build-info
+        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+  codeql-analysis:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+
+    name: "${{ matrix.os }} (CodeQL)"
+    runs-on: ${{ matrix.os }}
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPS_UBUNTU }}
+        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
+        sudo apt-get --yes purge php8.3-imagick
+        pipx install msgcheck
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: cpp
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:cpp"
+
+  tests_rockylinux:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+        config:
+          - { name: "gcc", cc: "gcc", cxx: "g++", buildargs: "" }
+          - { name: "clang", cc: "clang", cxx: "clang++", buildargs: "" }
+
+    name: "rockylinux-9 (${{ matrix.config.name }})"
+    runs-on: ${{ matrix.os }}
+    container:
+      image: rockylinux:9
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        dnf install -y epel-release
+        dnf config-manager --set-enabled crb
+        dnf install -y ${{ env.WEECHAT_DEPS_ROCKYLINUX }}
+
+    - name: Build and run tests
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+        BUILDARGS: ${{ matrix.config.buildargs }}
+      run: ./tools/build_test.sh
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --version
+        weechat --build-info
+        weechat --colors
+        weechat --license
+        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+  tests_freebsd:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+        config:
+          # - { name: "gcc", cc: "gcc", cxx: "g++", buildargs: "" }
+          - { name: "clang", cc: "clang", cxx: "clang++", buildargs: "" }
+
+    name: "freebsd-14 (${{ matrix.config.name }})"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies, build and run tests, run WeeChat
+      uses: vmactions/freebsd-vm@v1
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+        BUILDARGS: ${{ matrix.config.buildargs }}
+        TERM: xterm-256color
+      with:
+        envs: "CC CXX BUILDARGS TERM"
+        usesh: true
+        prepare: pkg install -y ${{ env.WEECHAT_DEPS_FREEBSD }}
+        run: |
+          ./tools/build_test.sh
+          weechat --help
+          weechat-curses --help
+          weechat --version
+          weechat --build-info
+          weechat --colors
+          weechat --license
+          weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
   tests_macos:
 
     strategy:
       matrix:
         os:
-          - macos-12
+          - macos-14
         config:
           - { name: "gcc", cc: "gcc", cxx: "g++" }
           - { name: "clang", cc: "clang", cxx: "clang++" }
 
-    name: "Tests: ${{ matrix.config.name }} on ${{ matrix.os }}"
+    name: "${{ matrix.os }} (${{ matrix.config.name }})"
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -167,9 +381,9 @@ jobs:
           /usr/local/bin/python3.11 \
           /usr/local/bin/python3.11-config \
         ;
-        brew install asciidoctor cjson guile lua pkg-config ruby
+        brew install asciidoctor aspell cjson guile lua pkg-config ruby
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Build
       env:
@@ -187,80 +401,8 @@ jobs:
       run: |
         weechat --help
         weechat-curses --help
+        weechat --version
+        weechat --build-info
         weechat --colors
         weechat --license
-        weechat --version
         weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  build_debian:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-22.04
-
-    name: "Build Debian on ${{ matrix.os }}"
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-    - uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }}
-
-    - name: Test Debian patches
-      run: ./tools/build_debian.sh test-patches
-
-    - name: Build Debian packages
-      run: ./tools/build_debian.sh devel ubuntu/jammy
-
-    - name: Install Debian packages
-      run: sudo dpkg -i ../weechat-devel*.deb
-
-    - name: Run WeeChat
-      env:
-        TERM: xterm-256color
-      run: |
-        weechat --help
-        weechat-curses --help
-        weechat --version
-        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  codeql-analysis:
-
-    name: CodeQL
-    runs-on: ubuntu-latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }}
-        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
-        sudo apt-get --yes purge php8.1-imagick
-        sudo -H pip3 install --ignore-installed msgcheck
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: cpp
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:cpp"

AUTHORS.adoc

@@ -1,164 +0,0 @@
-= WeeChat Authors
-:author: Sébastien Helleu
-:email: flashcode@flashtux.org
-:lang: en
-
-
-== Developers
-
-* General code
-** Sébastien Helleu (FlashCode) <flashcode@flashtux.org>
-* Scripts plugins, debian packager
-** Emmanuel Bouthenot (kolter) <kolter@openics.org>
-
-== Contributors
-
-Alphabetically:
-
-* Adam Saponara (adsr)
-* Adrian Bjugård
-* Ailin Nemui (Nei)
-* Aleksey V Zapparov
-* Alex Tarkovsky
-* Anders Bergh
-* Andrew Potter (talisein)
-* Antoine Pietri (seirl)
-* Arvydas Sidorenko
-* Asakura
-* Bazerka
-* Benoit Papillault (benoit)
-* Chris Hills
-* Christian Duerr
-* Christian Heinz
-* Christopher O'Neill (deltafire)
-* coypoop
-* Danilo Spinella
-* David Flatz
-* Dmitry Kobylin
-* Dominik Honnef
-* Dominique Martinet
-* dotflac
-* Eduardo Elias
-* Eli Schwartz
-* Elizabeth Myers (Elizacat)
-* Elián Hanisch (m4v)
-* Emanuele Giaquinta
-* Emir Sarı
-* emk
-* Érico Nogueira
-* Esteban I. Ruiz Moreno (Exio)
-* Evgeny Shmarnev
-* Felix Eckhofer
-* Frank Zacharias
-* Fredrik Fornwall
-* Grant Wu
-* Gu1ll4um3r0m41n
-* Guido Berhoerster
-* Gwenn
-* Hasan Kiran (turgay)
-* Ivan Pešić
-* Ivan Sichmann Freitas
-* Jakub Jirutka
-* Jan Palus
-* Jason A. Donenfeld (zx2c4)
-* JD Horelick (jdhore)
-* jesopo
-* Jim Ramsay (lack)
-* Jiri Golembiovsky (GolemJ)
-* Joey Pabalinas (alyptik)
-* Johan Rylander
-* Johannes Kuhn
-* Joram Schrijver
-* Jos Ahrens
-* Joseph Kichline
-* Juan Francisco Cantero Hurtado
-* Julien Louis (ptitlouis)
-* Karthik K
-* Koka El Kiwi (KiwiDash)
-* Krzysztof Koroscik (soltys)
-* Kyle Fuller (kylef)
-* Kyle Sabo
-* Latchezar Tzvetkoff
-* Lázaro A.
-* Leonid Evdokimov
-* Linus Heckemann
-* LuK1337
-* Maarten de Vries
-* Mantas Mikulėnas (grawity)
-* Marco Paolone
-* Marco Sirabella
-* Mario Campos
-* Mateusz Poszwa
-* Matt Robinson
-* Matthew Horan
-* Matthew Martin
-* Matti Virkkunen
-* Max Anton Teufel
-* Maxim Baz
-* Michael Siegel
-* Miroslav Koskar
-* Murilo Opsfelder Araujo
-* Neui
-* Nick (SolitaryCipher)
-* Nicolas Cavigneaux
-* Nils Görs (nils_2)
-* nyuszika7h
-* Odin
-* Ondřej Súkup
-* Patrick Steinhardt
-* Patrik Janoušek
-* Paul Komkoff
-* Pavel Shevchuk (Stalwart)
-* Peter Boström (pbos)
-* Phillip Sz
-* Pierre Carru
-* Piotr Szymaniak
-* Pistos
-* Quentin Glidic (SardemFF7)
-* Quentin Pradet
-* Quico Noizeux
-* rafasc
-* Raghavendra Prabhu
-* raspbeguy
-* Rettub
-* Rob Campbell
-* Romero B. de S. Malaquias
-* Rudolf Polzer (divVerent)
-* Ruslan Bekenev
-* Ryan Farley
-* Ryan Qian
-* Ryuunosuke Ayanokouzi
-* scumjr
-* Sergio Durigan Junior
-* Shane McCarron
-* Shawn Smith
-* Shun Sakai
-* Simmo Saan (sim642)
-* Simon Arlott
-* Simon Kuhnle
-* Simon Ser
-* Stefano Pigozzi
-* Stfn
-* Sven Knurr (Cthulhux)
-* Tim D. Smith
-* Tim Harder
-* Tobias Stoeckmann
-* Tom Alsberg
-* Tom Fitzhenry
-* Tomoe Mami
-* Tor Hveem (xt)
-* Trevor Bergeron
-* Valentin Lorentz (progval)
-* Vasco Almeida
-* Victorhck
-* Voroskoi
-* wfrsk
-* Wojciech Kwolek
-* W. Trevor King
-* Yannick Palanque
-* ZethJack
-* Ørjan Malde
-
-== Contact
-
-See the https://weechat.org/about/support/[support page].

AUTHORS.md

@@ -0,0 +1,165 @@
+# WeeChat Authors
+
+## Developers
+
+- General code
+  - [Sébastien Helleu](https://github.com/flashcode) (FlashCode)
+- Scripts plugins, debian packager
+  - [Emmanuel Bouthenot](https://github.com/k0lter) (kolter)
+
+## Contributors
+
+Alphabetically:
+
+- Adam Saponara (adsr)
+- Adrian Bjugård
+- Ailin Nemui (Nei)
+- Aleksey V Zapparov
+- Alex Tarkovsky
+- Anders Bergh
+- Andrew Potter (talisein)
+- Antoine Pietri (seirl)
+- Arvydas Sidorenko
+- Asakura
+- Bazerka
+- Benoit Papillault (benoit)
+- Chris Hills
+- Christian Duerr
+- Christian Heinz
+- Christopher O'Neill (deltafire)
+- coypoop
+- Danilo Spinella
+- David Flatz
+- Dmitry Kobylin
+- Dominik Honnef
+- Dominique Martinet
+- dotflac
+- Eduardo Elias
+- Eli Schwartz
+- Elizabeth Myers (Elizacat)
+- Elián Hanisch (m4v)
+- Emanuele Giaquinta
+- Emil Velikov
+- Emir Sarı
+- emk
+- Érico Nogueira
+- Esteban I. Ruiz Moreno (Exio)
+- Evgeny Shmarnev
+- Felix Eckhofer
+- Frank Zacharias
+- Fredrik Fornwall
+- Grant Wu
+- Gu1ll4um3r0m41n
+- Guido Berhoerster
+- Gwenn
+- Hasan Kiran (turgay)
+- Ivan Pešić
+- Ivan Sichmann Freitas
+- Jakub Jirutka
+- James C. Morey
+- Jan Palus
+- Jason A. Donenfeld (zx2c4)
+- JD Horelick (jdhore)
+- jesopo
+- Jim Ramsay (lack)
+- Jiri Golembiovsky (GolemJ)
+- Joey Pabalinas (alyptik)
+- Johan Rylander
+- Johannes Kuhn
+- Joram Schrijver
+- Jos Ahrens
+- Joseph Kichline
+- Josh Soref
+- Juan Francisco Cantero Hurtado
+- Julien Louis (ptitlouis)
+- Karthik K
+- Koka El Kiwi (KiwiDash)
+- Krzysztof Koroscik (soltys)
+- Kyle Fuller (kylef)
+- Kyle Sabo
+- Latchezar Tzvetkoff
+- Lázaro A.
+- Leonid Evdokimov
+- Linus Heckemann
+- LuK1337
+- Maarten de Vries
+- Mantas Mikulėnas (grawity)
+- Marco Paolone
+- Marco Sirabella
+- Mario Campos
+- Mateusz Poszwa
+- Matt Robinson
+- Matthew Horan
+- Matthew Martin
+- Matti Virkkunen
+- Max Anton Teufel
+- Maxim Baz
+- Michael Siegel
+- Miko
+- Miroslav Koskar
+- Murilo Opsfelder Araujo
+- Neui
+- Nick (SolitaryCipher)
+- Nicolas Cavigneaux
+- Nils Görs (nils_2)
+- nyuszika7h
+- Odin
+- Ondřej Súkup
+- Patrick Steinhardt
+- Patrik Janoušek
+- Paul Komkoff
+- Pavel Shevchuk (Stalwart)
+- Peter Boström (pbos)
+- Phillip Sz
+- Pierre Carru
+- Piotr Szymaniak
+- Pistos
+- Quentin Glidic (SardemFF7)
+- Quentin Pradet
+- Quico Noizeux
+- rafasc
+- Raghavendra Prabhu
+- raspbeguy
+- Rettub
+- Rob Campbell
+- Romero B. de S. Malaquias
+- Rudolf Polzer (divVerent)
+- Ruslan Bekenev
+- Ryan Farley
+- Ryan Qian
+- Ryuunosuke Ayanokouzi
+- scumjr
+- Sergio Durigan Junior
+- Shane McCarron
+- Shawn Smith
+- Shun Sakai
+- Simmo Saan (sim642)
+- Simon Arlott
+- Simon Kuhnle
+- Simon Ser
+- Stefano Pigozzi
+- Stfn
+- Sven Knurr (Cthulhux)
+- Tim D. Smith
+- Tim Harder
+- Tobias Stoeckmann
+- Tom Alsberg
+- Tom Fitzhenry
+- Tomoe Mami
+- Tor Hveem (xt)
+- Trevor Bergeron
+- Valentin Lorentz (progval)
+- Vasco Almeida
+- Victorhck
+- Voroskoi
+- wfrsk
+- Wojciech Kwolek
+- W. Trevor King
+- Yannick Palanque
+- Yiheng Cao
+- ZethJack
+- Ørjan Malde
+
+## Contact
+
+See the [support page](https://weechat.org/about/support/).

CMakeLists.txt

@@ -19,7 +19,7 @@
 # along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.18)
 
 project(weechat C)
 
@@ -206,16 +206,14 @@ if(ENABLE_LARGEFILE)
 endif()
 
 # Check for libgcrypt
-find_package(GCRYPT REQUIRED)
+pkg_check_modules(LIBGCRYPT REQUIRED libgcrypt)
-add_definitions(-DHAVE_GCRYPT)
+include_directories(${LIBGCRYPT_INCLUDE_DIRS})
-list(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})
+list(APPEND EXTRA_LIBS ${LIBGCRYPT_LDFLAGS})
 
 # Check for GnuTLS
-find_package(GnuTLS REQUIRED)
+pkg_check_modules(GNUTLS REQUIRED gnutls>=3.3.0)
-string(REGEX REPLACE "/[^/]*$" "" GNUTLS_LIBRARY_PATH "${GNUTLS_LIBRARY}")
+include_directories(${GNUTLS_INCLUDE_DIRS})
-include_directories(${GNUTLS_INCLUDE_PATH})
+list(APPEND EXTRA_LIBS ${GNUTLS_LDFLAGS})
-set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
-list(APPEND EXTRA_LIBS gnutls)
 
 # Check for zlib
 find_package(ZLIB REQUIRED)
@@ -239,28 +237,25 @@ if(ICONV_FOUND)
 endif()
 
 # Check for CURL
-find_package(CURL REQUIRED)
+# NOTE: keep version in sync with tools/check_curl_symbols.py
-
+pkg_check_modules(LIBCURL REQUIRED libcurl>=7.47.0)
-# weechat_gui_common MUST be the first lib in the list
+include_directories(${LIBCURL_INCLUDE_DIRS})
-set(STATIC_LIBS weechat_gui_common)
+list(APPEND EXTRA_LIBS ${LIBCURL_LDFLAGS})
 
 find_library(DL_LIBRARY
   NAMES dl
   PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec
 )
-list(APPEND STATIC_LIBS weechat_plugins)
 if(DL_LIBRARY)
-  string(REGEX REPLACE "/[^/]*$" "" DL_LIBRARY_PATH "${DL_LIBRARY}")
+  list(APPEND EXTRA_LIBS ${DL_LIBRARY})
-  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${DL_LIBRARY_PATH}")
-  list(APPEND EXTRA_LIBS dl)
 endif()
 
 add_subdirectory(icons)
 
 if(ENABLE_NLS)
   find_package(Gettext REQUIRED)
-  add_definitions(-DENABLE_NLS)
   find_package(Intl REQUIRED)
+  include_directories(${Intl_INCLUDE_DIRS})
   list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
   add_subdirectory(po)
 else()
@@ -321,11 +316,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in" "${CMAKE_CURRENT
 # install some files (only on Cygwin)
 if(CYGWIN)
   install(FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.md"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md"
-    "${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/CONTRIBUTING.md"
-    "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
-    "${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/UPGRADING.md"
     DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}"
   )
 endif()

CONTRIBUTING.md

@@ -0,0 +1,109 @@
+# Contributing to WeeChat
+
+## Reporting bugs
+
+First, some basic things:
+
+- Use only English to communicate with developers.
+- Search in issues if the same problem or feature request has already been
+  reported (a duplicate is waste of time for you and the developers!).
+- If you can, please check if the problem has been fixed in development version
+  (if you are using a stable release or old version).
+- Report only one bug or feature request per issue.
+
+### Security reports
+
+Please **DO NOT** file a GitHub issue for security related problems, but send an
+email to [security@weechat.org](mailto:security@weechat.org) instead.
+
+### Required info
+
+When reporting [issues](https://github.com/weechat/weechat/issues) on GitHub,
+please include:
+
+- Your **WeeChat version**: the output of `/v` in WeeChat, for example:
+  `WeeChat 1.7-dev (git: v1.6-6-g997f47f)`.\
+  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 Bookworm,
+  FreeBSD 13.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
+  scripts loaded): try `weechat --dir /tmp/weechat` and check if you have the
+  problem here.
+- The **gdb's backtrace** (only for a crash): if you can reproduce the crash
+  (or if you have a core file), please include the backtrace from gdb (look at
+  [User's guide](https://weechat.org/doc/weechat/user/#report_crashes) for more info).
+- The **actual result**.
+- The **expected result**: the correct result you are expecting.
+
+> [!IMPORTANT]
+> 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).
+
+### Scripts related issues
+
+If you are using scripts, they can cause problems/crashes. To check if the
+problem is related to one script, try to unload them one by one (using
+command `/script unload <name>`).
+
+Many issues reported are in fact related to bugs in scripts, so please first
+check that before reporting any issue on WeeChat itself.
+
+If you think the problem comes from a specific script, please report the issue
+in the [scripts git repository](https://github.com/weechat/scripts/issues) instead.
+
+## Translations
+
+Pull requests on GitHub for fixes or new translations are welcome at any
+time, for [WeeChat](https://github.com/weechat/weechat) and the website
+[weechat.org](https://github.com/weechat/weechat.org).
+
+To start a translation in a new language (not yet supported), please look at
+[translations](https://weechat.org/doc/weechat/dev/#translations)
+in Developer's guide.
+
+## Feature requests
+
+WeeChat is under active development, so your idea may already have been
+implemented, or scheduled for a future version (you can check in
+[roadmap](https://weechat.org/dev/) or
+[milestones](https://github.com/weechat/weechat/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: `irc.libera.chat`, channel `#weechat`).
+
+Before submitting any pull request, be sure you have read the
+[coding rules](https://weechat.org/doc/weechat/dev/#coding_rules)
+in Developer's guide, which contains info about styles used, naming convention
+and other useful info.
+
+## Semantic versioning
+
+Since version 4.0.0, WeeChat is following a "practical" semantic versioning.
+
+It is based on [Semantic Versioning](https://semver.org/) but in a less strict way:
+breaking changes in API with low user impact don't bump the major version.
+
+The version number is on three digits `X.Y.Z`, where:
+
+- `X` is the major version
+- `Y` is the minor version
+- `Z` is the patch version.
+
+Rules to increment the version number:
+
+- the **major version** number (`X`) is incremented only when intentional breaking changes
+  target feature areas that are actively consumed by users, scripts or C plugin API
+- the **minor version** number (`Y`) is incremented for any new release of WeeChat
+  that includes new features and bug fixes, possibly breaking API with low impact on users
+- the **patch version** number (`Z`) is reserved for releases that address severe bugs
+  or security issues found after the release.
+
+For more information, see the
+[specification](https://specs.weechat.org/specs/2023-003-practical-semantic-versioning.html).

Contributing.adoc

@@ -1,109 +0,0 @@
-= Contributing to WeeChat
-:author: Sébastien Helleu
-:email: flashcode@flashtux.org
-:lang: en
-
-
-== Reporting bugs
-
-First, some basic things:
-
-* Use only English to communicate with developers.
-* Search in issues if the same problem or feature request has already been
-  reported (a duplicate is waste of time for you and the developers!).
-* If you can, please check if the problem has been fixed in development version
-  (if you are using a stable release or old version).
-* Report only one bug or feature request per issue.
-
-=== Security reports
-
-Please *DO NOT* file a GitHub issue for security related problems, but send an
-email to <security@weechat.org> instead.
-
-=== Required info
-
-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.7-dev (git: v1.6-6-g997f47f)_. +
-  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 Bookworm,
-  FreeBSD 13.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
-  scripts loaded): try `weechat --dir /tmp/weechat` and check if you have the
-  problem here.
-* The *gdb's backtrace* (only for a crash): if you can reproduce the crash
-  (or if you have a core file), please include the backtrace from gdb (look at
-  https://weechat.org/doc/weechat/user/#report_crashes[User's guide] for more info).
-* The *actual result*.
-* The *expected result*: the correct result you are expecting.
-
-[IMPORTANT]
-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).
-
-=== Scripts related issues
-
-If you are using scripts, they can cause problems/crashes. To check if the
-problem is related to one script, try to unload them one by one (using
-command `/script unload <name>`).
-
-Many issues reported are in fact related to bugs in scripts, so please first
-check that before reporting any issue on WeeChat itself.
-
-If you think the problem comes from a specific script, please report the issue
-in the https://github.com/weechat/scripts/issues[scripts git repository]
-instead.
-
-== Translations
-
-Pull requests on GitHub for fixes or new translations are welcome at any
-time, for https://github.com/weechat/weechat[WeeChat] and the website
-https://github.com/weechat/weechat.org[weechat.org].
-
-To start a translation in a new language (not yet supported), please look at
-https://weechat.org/doc/weechat/dev/#translations[translations]
-in Developer's guide.
-
-== Feature requests
-
-WeeChat is under active development, so your idea may already have been
-implemented, or scheduled for a future version (you can check in
-https://weechat.org/dev/[roadmap] or
-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: _irc.libera.chat_, channel _#weechat_).
-
-Before submitting any pull request, be sure you have read the
-https://weechat.org/doc/weechat/dev/#coding_rules[coding rules]
-in Developer's guide, which contains info about styles used, naming convention
-and other useful info.
-
-== Semantic versioning
-
-Since version 4.0.0, WeeChat is following a "practical" semantic versioning.
-
-It is based on https://semver.org/[Semantic Versioning] but in a less strict way: breaking changes in API with low user impact don't bump the major version.
-
-The version number is on three digits `X.Y.Z`, where:
-
-* `X` is the major version
-* `Y` is the minor version
-* `Z` is the patch version.
-
-Rules to increment the version number:
-
-* the *major version* number (`X`) is incremented only when intentional breaking changes target feature areas that are actively consumed by users, scripts or C plugin API
-* the *minor version* number (`Y`) is incremented for any new release of WeeChat that includes new features and bug fixes, possibly breaking API with low impact on users
-* the *patch version* number (`Z`) is reserved for releases that address severe bugs or security issues found after the release.
-
-For more information, see the https://specs.weechat.org/specs/2023-003-practical-semantic-versioning.html[specification].

README.adoc

@@ -1,67 +0,0 @@
-:author: Sébastien Helleu
-:email: flashcode@flashtux.org
-:lang: en
-
-
-pass:[<p align="center">] image:https://weechat.org/media/images/weechat_logo_large.png[align="center"] pass:[</p>]
-
-image:https://img.shields.io/badge/mastodon-follow-blue.svg["Mastodon", link="https://hostux.social/@weechat"]
-image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="https://diasp.eu/u/weechat"]
-image:https://img.shields.io/badge/x-follow-blue.svg["Twitter", link="https://x.com/WeeChatClient"]
-image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://blog.weechat.org/"]
-image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="https://www.slant.co/topics/1323/~best-irc-clients-for-linux"]
-image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/donate/"]
-
-image:https://github.com/weechat/weechat/workflows/CI/badge.svg["CI", link="https://github.com/weechat/weechat/actions"]
-image:https://codecov.io/gh/weechat/weechat/branch/master/graph/badge.svg["Code coverage", link="https://codecov.io/gh/weechat/weechat"]
-
-*WeeChat* (Wee Enhanced Environment for Chat) is a free chat client, fast and
-light, designed for many operating systems.
-It is highly customizable and extensible with scripts.
-
-Homepage: https://weechat.org/
-
-== Features
-
-* *Modular chat client*: WeeChat has a lightweight core and optional https://weechat.org/doc/weechat/user/#plugins[plugins]. All plugins (including https://weechat.org/doc/weechat/user/#irc[IRC]) are independent and can be unloaded.
-* *Multi-platform*: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Haiku, macOS and Windows (Bash/Ubuntu and Cygwin).
-* *Multi-protocols*: WeeChat is designed to support multiple protocols by plugins, like IRC.
-* *Standards-compliant*: the IRC plugin is compliant with RFCs https://datatracker.ietf.org/doc/html/rfc1459[1459], https://datatracker.ietf.org/doc/html/rfc2810[2810], https://datatracker.ietf.org/doc/html/rfc2811[2811], https://datatracker.ietf.org/doc/html/rfc2812[2812], https://datatracker.ietf.org/doc/html/rfc2813[2813] and https://datatracker.ietf.org/doc/html/rfc7194[7194].
-* *Small, fast, and very light*: the core is and should stay as light and fast as possible.
-* *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and https://weechat.org/scripts/[scripts] (https://weechat.org/scripts/language/perl/[Perl], https://weechat.org/scripts/language/python/[Python], https://weechat.org/scripts/language/ruby[Ruby], https://weechat.org/scripts/language/lua/[Lua], https://weechat.org/scripts/language/tcl/[Tcl], https://weechat.org/scripts/language/guile/[Scheme], https://weechat.org/scripts/language/javascript/[JavaScript] and https://weechat.org/scripts/language/php/[PHP]).
-* *Fully documented*: there is comprehensive https://weechat.org/doc/weechat/[documentation], which is https://weechat.org/doc/weechat/dev/#translations[translated] into several languages.
-* *Developed from scratch*: WeeChat was built from scratch and is not based on any other client.
-* *Free software*: WeeChat is released under https://www.gnu.org/licenses/gpl-3.0.html[GPLv3].
-
-pass:[<p align="center">] image:https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"] pass:[</p>]
-
-On WeeChat's website you can find https://weechat.org/about/screenshots/[more screenshots].
-
-== Installation
-
-WeeChat can be installed using your favorite package manager (recommended) or by compiling it yourself.
-
-For detailed instructions, please check the https://weechat.org/doc/weechat/user/#install[WeeChat user's guide].
-
-== Semantic versioning
-
-WeeChat is following a "practical" semantic versioning, see file link:Contributing.adoc#semantic-versioning[Contributing.adoc].
-
-== Copyright
-
-Copyright (C) 2003-2024 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 <https://www.gnu.org/licenses/>.

README.md

@@ -0,0 +1,66 @@
+# WeeChat
+
+<p align="center">
+  <img src="https://weechat.org/media/images/weechat_logo_large.png" alt="WeeChat" />
+</p>
+
+[![Mastodon](https://img.shields.io/badge/mastodon-follow-blue.svg)](https://hostux.social/@weechat)
+[![Diaspora*](https://img.shields.io/badge/diaspora*-follow-blue.svg)](https://diasp.eu/u/weechat)
+[![X](https://img.shields.io/badge/x-follow-blue.svg)](https://x.com/WeeChatClient)
+[![Devel blog](https://img.shields.io/badge/devel%20blog-follow-blue.svg)](https://blog.weechat.org/)
+[![Slant](https://img.shields.io/badge/slant-recommend-28acad.svg)](https://www.slant.co/topics/1323/~best-irc-clients-for-linux)
+[![Donate](https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg)](https://weechat.org/donate/)
+
+[![CI](https://github.com/weechat/weechat/workflows/CI/badge.svg)](https://github.com/weechat/weechat/actions)
+[![Code coverage](https://codecov.io/gh/weechat/weechat/branch/main/graph/badge.svg)](https://codecov.io/gh/weechat/weechat)
+
+**WeeChat** (Wee Enhanced Environment for Chat) is a free chat client, fast and light, designed for many operating systems.\
+It is highly customizable and extensible with scripts.
+
+Homepage: [https://weechat.org/](https://weechat.org/)
+
+## Features
+
+- **Modular chat client**: WeeChat has a lightweight core and optional [plugins](https://weechat.org/doc/weechat/user/#plugins). All plugins (including [IRC](https://weechat.org/doc/weechat/user/#irc)) are independent and can be unloaded.
+- **Multi-platform**: WeeChat runs on GNU/Linux, *BSD, GNU/Hurd, Haiku, macOS and Windows (Bash/Ubuntu and Cygwin).
+- **Multi-protocols**: WeeChat is designed to support multiple protocols by plugins, like IRC.
+- **Standards-compliant**: the IRC plugin is compliant with RFCs [1459](https://datatracker.ietf.org/doc/html/rfc1459), [2810](https://datatracker.ietf.org/doc/html/rfc2810), [2811](https://datatracker.ietf.org/doc/html/rfc2811), [2812](https://datatracker.ietf.org/doc/html/rfc2812), [2813](https://datatracker.ietf.org/doc/html/rfc2813) and [7194](https://datatracker.ietf.org/doc/html/rfc7194).
+- **Small, fast, and very light**: the core is and should stay as light and fast as possible.
+- **Customizable and extensible**: there are a lot of options to customize WeeChat, and it is extensible with C plugins and [scripts](https://weechat.org/scripts/) ([Perl](https://weechat.org/scripts/language/perl/), [Python](https://weechat.org/scripts/language/python/), [Ruby](https://weechat.org/scripts/language/ruby), [Lua](https://weechat.org/scripts/language/lua/), [Tcl](https://weechat.org/scripts/language/tcl/), [Scheme](https://weechat.org/scripts/language/guile/), [JavaScript](https://weechat.org/scripts/language/javascript/) and [PHP](https://weechat.org/scripts/language/php/)).
+- **Fully documented**: there is comprehensive [documentation](https://weechat.org/doc/weechat/), which is [translated](https://weechat.org/doc/weechat/dev/#translations) into several languages.
+- **Developed from scratch**: WeeChat was built from scratch and is not based on any other client.
+- **Free software**: WeeChat is released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html).
+
+<p align="center">
+  <img src="https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png" alt="WeeChat" />
+</p>
+
+On WeeChat's website you can find [more screenshots](https://weechat.org/about/screenshots/).
+
+## Installation
+
+WeeChat can be installed using your favorite package manager (recommended) or by compiling it yourself.\
+For detailed instructions, please check the [WeeChat user's guide](https://weechat.org/doc/weechat/user/#install).
+
+## Semantic versioning
+
+WeeChat is following a "practical" semantic versioning, see file [CONTRIBUTING.md](CONTRIBUTING.md#semantic-versioning).
+
+## Copyright
+
+Copyright © 2003-2024 [Sébastien Helleu](https://github.com/flashcode)
+
+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 <https://www.gnu.org/licenses/>.

cmake/FindGCRYPT.cmake

@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2003-2024 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 <https://www.gnu.org/licenses/>.
-#
-
-# - Find Gcrypt
-# This module finds if libgcrypt is installed and determines where
-# the include files and libraries are.
-#
-# This code sets the following variables:
-#
-#  GCRYPT_CFLAGS = cflags to use to compile
-#  GCRYPT_LDFLAGS = ldflags to use to compile
-#
-
-find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config)
-
-set(GCRYPT_LDFLAGS)
-set(GCRYPT_CFLAGS)
-
-if(LIBGCRYPT_CONFIG_EXECUTABLE)
-
-  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-  execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
-
-  if(NOT DEFINED ${GCRYPT_CFLAGS})
-    set(GCRYPT_CFLAGS " ")
-  endif()
-
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
-
-if(GCRYPT_FOUND)
-  mark_as_advanced(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
-endif()

cmake/FindGnuTLS.cmake

@@ -1,75 +0,0 @@
-#
-# Copyright (C) 2003-2024 Sébastien Helleu <flashcode@flashtux.org>
-# Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.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 <https://www.gnu.org/licenses/>.
-#
-
-# - Find GnuTLS
-# This module finds if libgnutls is installed and determines where
-# the include files and libraries are.
-#
-# This code sets the following variables:
-#
-#  GNUTLS_INCLUDE_PATH = path to where <gnutls/gnutls.h> can be found
-#  GNUTLS_LIBRARY = path to where libgnutls.so* can be found
-#  GNUTLS_CFLAGS = cflags to use to compile
-#  GNUTLS_LDFLAGS = ldflags to use to compile
-
-if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-  # Already in cache, be silent
-  set(GNUTLS_FIND_QUIETLY TRUE)
-endif()
-
-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
-
-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
-  OUTPUT_VARIABLE GNUTLS_PREFIX
-)
-
-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
-  OUTPUT_VARIABLE GNUTLS_CFLAGS
-)
-string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")
-
-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
-  OUTPUT_VARIABLE GNUTLS_LDFLAGS
-)
-string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
-
-set(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
-set(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")
-
-find_path(GNUTLS_INCLUDE_PATH
-  NAMES gnutls/gnutls.h
-  PATHS GNUTLS_POSSIBLE_INCLUDE_PATH
-)
-
-find_library(GNUTLS_LIBRARY
-  NAMES gnutls
-  PATHS GNUTLS_POSSIBLE_LIB_DIR
-)
-
-if(NOT GNUTLS_INCLUDE_PATH OR NOT GNUTLS_LIBRARY)
-  message(FATAL_ERROR "GnuTLS was not found")
-endif()
-
-mark_as_advanced(
-  GNUTLS_INCLUDE_PATH
-  GNUTLS_LIBRARY
-  GNUTLS_CFLAGS
-  GNUTLS_LDFLAGS
-)

cmake/FindLua.cmake

@@ -35,5 +35,5 @@ endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(LUA lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+  pkg_search_module(LUA lua lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50)
 endif()

cmake/FindPHP.cmake

@@ -29,6 +29,8 @@ endif()
 
 if(NOT PHP_FOUND)
   find_program(PHP_CONFIG_EXECUTABLE NAMES
+    php-config8.4 php-config84
+    php-config8.3 php-config83
     php-config8.2 php-config82
     php-config8.1 php-config81
     php-config8.0 php-config80
@@ -48,7 +50,7 @@ if(NOT PHP_FOUND)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --version OUTPUT_VARIABLE PHP_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(${PHP_VERSION} MATCHES "^[78]")
       find_library(PHP_LIB
-        NAMES php8.2 php82 php8.1 php81 php8.0 php80 php8 php7.4 php74 php7.3 php73 php7.2 php72 php7.1 php71 php7.0 php70 php7 php
+        NAMES php8.4 php84 php8.3 php83 php8.2 php82 php8.1 php81 php8.0 php80 php8 php7.4 php74 php7.3 php73 php7.2 php72 php7.1 php71 php7.0 php70 php7 php
         HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
       )
       if(PHP_LIB)

cmake/FindRuby.cmake

@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2003-2024 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 <https://www.gnu.org/licenses/>.
-#
-
-# - Find Ruby
-# This module finds if Ruby is installed and determines where the include files
-# and libraries are. It also determines what the name of the library is. This
-# code sets the following variables:
-#
-#  RUBY_INCLUDE_DIRS = C flags to compile with ruby
-#  RUBY_LIBRARY_DIRS = linker flags to compile with ruby (found with pkg-config)
-#  RUBY_LIB          = ruby library (found without pkg-config)
-
-if(RUBY_FOUND)
-  # Already in cache, be silent
-  set(RUBY_FIND_QUIETLY TRUE)
-endif()
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    # set specific search path for macOS
-    set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig")
-  endif()
-  pkg_search_module(RUBY ruby-3.3 ruby-3.2 ruby-3.1 ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby)
-  if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    # FIXME: weird hack: hardcoding the Ruby lib location on macOS
-    set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib")
-  endif()
-endif()

config.h.cmake

@@ -1,3 +1,39 @@
+#cmakedefine01 ENABLE_NCURSES
+#cmakedefine01 ENABLE_HEADLESS
+#cmakedefine01 ENABLE_NLS
+#cmakedefine01 ENABLE_LARGEFILE
+#cmakedefine01 ENABLE_ZSTD
+#cmakedefine01 ENABLE_CJSON
+#cmakedefine01 ENABLE_ALIAS
+#cmakedefine01 ENABLE_BUFLIST
+#cmakedefine01 ENABLE_CHARSET
+#cmakedefine01 ENABLE_EXEC
+#cmakedefine01 ENABLE_FIFO
+#cmakedefine01 ENABLE_FSET
+#cmakedefine01 ENABLE_IRC
+#cmakedefine01 ENABLE_LOGGER
+#cmakedefine01 ENABLE_RELAY
+#cmakedefine01 ENABLE_SCRIPT
+#cmakedefine01 ENABLE_SCRIPTS
+#cmakedefine01 ENABLE_PERL
+#cmakedefine01 ENABLE_PYTHON
+#cmakedefine01 ENABLE_RUBY
+#cmakedefine01 ENABLE_LUA
+#cmakedefine01 ENABLE_TCL
+#cmakedefine01 ENABLE_GUILE
+#cmakedefine01 ENABLE_JAVASCRIPT
+#cmakedefine01 ENABLE_PHP
+#cmakedefine01 ENABLE_SPELL
+#cmakedefine01 ENABLE_ENCHANT
+#cmakedefine01 ENABLE_TRIGGER
+#cmakedefine01 ENABLE_TYPING
+#cmakedefine01 ENABLE_XFER
+#cmakedefine01 ENABLE_MAN
+#cmakedefine01 ENABLE_DOC
+#cmakedefine01 ENABLE_DOC_INCOMPLETE
+#cmakedefine01 ENABLE_TESTS
+#cmakedefine01 ENABLE_CODE_COVERAGE
+
 #cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET
@@ -11,6 +47,10 @@
 #cmakedefine HAVE_ASPELL_VERSION_STRING
 #cmakedefine HAVE_ENCHANT_GET_VERSION
 #cmakedefine HAVE_GUILE_GMP_MEMORY_FUNCTIONS
+
+#define CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
+#define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+
 #define PACKAGE_VERSION "@VERSION@"
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"

debian-devel/control

@@ -6,7 +6,8 @@ Build-Depends:
     asciidoctor (>= 1.5.4),
     ruby-pygments.rb,
     debhelper (>= 12),
-    cmake, pkg-config,
+    cmake,
+    pkgconf,
     libncurses-dev,
     gem2deb,
     libperl-dev,
@@ -23,7 +24,7 @@ Build-Depends:
     libzstd-dev,
     zlib1g-dev,
     libcjson-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat

debian-devel/rules

@@ -16,8 +16,5 @@ override_dh_auto_configure:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.adoc
-
 %:
 	dh $@ --builddirectory=$(BUILDDIR)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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.relay-weechat-en

@@ -0,0 +1,10 @@
+Document: weechat-relay-weechat-en
+Title: WeeChat Relay "weechat" protocol (English)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay "weechat" 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_weechat.en.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_weechat.en.html

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

@@ -0,0 +1,10 @@
+Document: weechat-relay-weechat-fr
+Title: WeeChat Relay "weechat" protocol (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay "weechat" 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_weechat.fr.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_weechat.fr.html

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

@@ -0,0 +1,10 @@
+Document: weechat-relay-weechat-ja
+Title: WeeChat Relay "weechat" protocol (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay "weechat" 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_weechat.ja.html
+Files: /usr/share/doc/weechat-devel-doc/html/weechat_relay_weechat.ja.html

debian-devel/weechat-devel-doc.doc-base.relay-weechat-sr

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

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

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

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

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

debian-stable/changelog

@@ -1,3 +1,44 @@
+weechat (4.5.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update copyright file (new year)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 20 Jan 2025 14:39:42 +0000
+
+weechat (4.4.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Remove (fixed upstream) the fix for a possible privacy breach with html
+    documentation which includes stylesheets and fonts (font-awesome) hosted
+    on remote CDN (Cloudflare).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 06 Nov 2024 21:27:08 +0000
+
+weechat (4.4.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - fix crash where exiting (Closes: #1076532)
+    - fix a minor security issue (Closes: #1081942)
+  * Bump Standards-Version to 4.7.0
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 22 Sep 2024 13:08:28 +0000
+
+weechat (4.3.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1067608)
+    - fix FTBFS against libgcrypt 1.11 (Closes: #1071960)
+  * Add build dependency on libcjson-dev
+  * Replace pkg-config build dependency by pkgconf
+  * Minor updates in debian/copyright
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sat, 01 Jun 2024 14:21:02 +0000
+
+weechat (4.1.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1055278)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 03 Nov 2023 20:23:37 +0000
+
 weechat (4.0.5-1) unstable; urgency=medium
 
   * New upstream release
@@ -512,7 +553,7 @@ weechat (0.3.6-1) unstable; urgency=low
   documentation when weechat-doc is installed (Closes: #632621)
   * Add a Suggest on weechat-doc for weechat and weechat-curses. Thanks to
   Jonathan Nieder for the proposal.
-  * Fix the cmake invokation from debian/rules (cflags and ldflags)
+  * Fix the cmake invocation from debian/rules (cflags and ldflags)
 
  -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 26 Oct 2011 20:10:09 +0000
 
@@ -734,7 +775,7 @@ weechat (0.2.3-1) unstable; urgency=low
   * New upstream release
   * Bump lua build-dependency to liblua5.1-0-dev
   * Add pkg-config to Build-Depends
-  * Remove some duplited changelog entries.
+  * Remove some duplicated changelog entries.
   * Improve weechat-plugins description
 
  -- Julien Louis <ptitlouis@sysif.net>  Fri, 12 Jan 2007 09:01:46 +0100
@@ -742,7 +783,7 @@ weechat (0.2.3-1) unstable; urgency=low
 weechat (0.2.1-1) unstable; urgency=low
 
   * New upstream release
-  * Overrive lintian menu-icon-missing warning
+  * Override lintian menu-icon-missing warning
     since the icon is in the weechat-common package.
 
  -- Julien Louis <ptitlouis@sysif.net>  Mon,  2 Oct 2006 15:30:06 +0200
@@ -887,7 +928,7 @@ weechat (0.1.1-2) unstable; urgency=low
 
   * debian/control:
     - Add myself to uploaders.
-    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
+    - Remove unnecessary dependency on weechat-gtk (Closes: #308287).
 
  -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
 

debian-stable/control

@@ -6,7 +6,8 @@ Build-Depends:
     asciidoctor (>= 1.5.4),
     ruby-pygments.rb,
     debhelper (>= 12),
-    cmake, pkg-config,
+    cmake,
+    pkgconf,
     libncurses-dev,
     gem2deb,
     libperl-dev,
@@ -23,7 +24,7 @@ Build-Depends:
     libzstd-dev,
     zlib1g-dev,
     libcjson-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat

debian-stable/rules

@@ -16,8 +16,5 @@ override_dh_auto_configure:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.adoc
-
 %:
 	dh $@ --builddirectory=$(BUILDDIR)

debian-stable/weechat-core.docs

@@ -1,4 +1,5 @@
-AUTHORS.adoc
+AUTHORS.md
-Contributing.adoc
+CHANGELOG.md
-README.adoc
+CONTRIBUTING.md
-ReleaseNotes.adoc
+README.md
+UPGRADING.md

debian-stable/weechat-curses.links

@@ -7,3 +7,4 @@ usr/share/man/it/man1/weechat.1.gz usr/share/man/it/man1/weechat-curses.1.gz
 usr/share/man/ja/man1/weechat.1.gz usr/share/man/ja/man1/weechat-curses.1.gz
 usr/share/man/pl/man1/weechat.1.gz usr/share/man/pl/man1/weechat-curses.1.gz
 usr/share/man/ru/man1/weechat.1.gz usr/share/man/ru/man1/weechat-curses.1.gz
+usr/share/man/sr/man1/weechat.1.gz usr/share/man/sr/man1/weechat-curses.1.gz

debian-stable/weechat-devel-doc.doc-base.relay-api-en

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

debian-stable/weechat-devel-doc.doc-base.relay-api-fr

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

debian-stable/weechat-doc.doc-base.dev-sr

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

debian-stable/weechat-doc.doc-base.faq-sr

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

debian-stable/weechat-doc.doc-base.plugin-sr

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

debian-stable/weechat-doc.doc-base.quickstart-cs

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

debian-stable/weechat-doc.doc-base.quickstart-sr

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

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

@@ -1,10 +0,0 @@
-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-doc/html/weechat_relay_protocol.en.html
-Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.en.html

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

@@ -1,10 +0,0 @@
-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-doc/html/weechat_relay_protocol.fr.html
-Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html

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

@@ -1,10 +0,0 @@
-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-doc/html/weechat_relay_protocol.ja.html
-Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.ja.html

debian-stable/weechat-doc.doc-base.relay-weechat-en

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

debian-stable/weechat-doc.doc-base.relay-weechat-fr

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

debian-stable/weechat-doc.doc-base.relay-weechat-ja

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

debian-stable/weechat-doc.doc-base.relay-weechat-sr

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

debian-stable/weechat-doc.doc-base.scripting-sr

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

debian-stable/weechat-doc.doc-base.user-sr

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

doc/CMakeLists.txt

@@ -28,7 +28,8 @@ if(ENABLE_MAN OR ENABLE_DOC)
   set(SCRIPTING_LANG de en fr it ja pl sr)
   set(FAQ_LANG de en es fr it ja pl sr)
   set(QUICKSTART_LANG cs de en es fr it ja pl ru sr)
-  set(RELAY_LANG en fr ja sr)
+  set(RELAY_API_LANG en fr)
+  set(RELAY_WEECHAT_LANG en fr ja sr)
   set(DEV_LANG en fr ja sr)
 
   find_package(Asciidoctor)
@@ -39,7 +40,6 @@ if(ENABLE_MAN OR ENABLE_DOC)
       -a reproducible
       -a "prewrap!"
       -a "webfonts!"
-      -a icons=font
       -a revnumber="${VERSION}"
       -a sectanchors
       -a source-highlighter=pygments
@@ -93,8 +93,17 @@ if(ENABLE_MAN OR ENABLE_DOC)
       -a docinfo1
     )
 
-    # asciidoctor arguments for relay protocol
+    # asciidoctor arguments for relay "api"
-    set(ASCIIDOCTOR_RELAY_ARGS
+    set(ASCIIDOCTOR_RELAY_API_ARGS
+      -a toc=left
+      -a toclevels=3
+      -a sectnums
+      -a sectnumlevels=2
+      -a docinfo1
+    )
+
+    # asciidoctor arguments for relay "weechat"
+    set(ASCIIDOCTOR_RELAY_WEECHAT_ARGS
       -a toc=left
       -a toclevels=3
       -a sectnums
@@ -111,54 +120,6 @@ if(ENABLE_MAN OR ENABLE_DOC)
       -a docinfo1
     )
 
-    # sed arguments used to replace links in ChangeLog and release notes
-    set(SED_LINKS_ARGS
-      -e "'s/issue #\\([0-9][0-9]*\\)/https:\\/\\/github.com\\/weechat\\/weechat\\/issues\\/\\1[issue #\\1^]/g'"
-      -e "'s/bug #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/bugs\\/?\\1[bug #\\1^]/g'"
-      -e "'s/task #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/task\\/?\\1[task #\\1^]/g'"
-      -e "'s/patch #\\([0-9][0-9]*\\)/https:\\/\\/savannah.nongnu.org\\/patch\\/?\\1[patch #\\1^]/g'"
-      -e "'s/debian #\\([0-9][0-9]*\\)/http:\\/\\/bugs.debian.org\\/cgi-bin\\/bugreport.cgi?bug=\\1[debian bug #\\1^]/g'"
-      -e "'s/\\(CVE-[0-9][0-9]*-[0-9][0-9]*\\)/https:\\/\\/cve.mitre.org\\/cgi-bin\\/cvename.cgi?name=\\1[\\1^]/g'"
-    )
-
-    # ChangeLog
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
-      COMMAND sed ARGS ${SED_LINKS_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc" > "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
-      DEPENDS
-      "${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html"
-      COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -o ChangeLog.html "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
-      DEPENDS
-      "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
-      "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-      COMMENT "Building ChangeLog.html"
-    )
-    add_custom_target(changelog DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html")
-
-    # Release notes
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
-      COMMAND sed ARGS ${SED_LINKS_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc" > "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
-      DEPENDS
-      "${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html"
-      COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -o ReleaseNotes.html "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
-      DEPENDS
-      "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
-      "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-      COMMENT "Building ReleaseNotes.html"
-    )
-    add_custom_target(rn DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html")
-
     if(ENABLE_DOC)
       set(AUTOGEN_FILES "")
       foreach(lang ${AUTOGEN_LANG})
@@ -243,6 +204,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_user.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/cmdline_options.${lang}.adoc"
           doc-autogen
           "${CMAKE_CURRENT_BINARY_DIR}/autogen/autogen_user_commands.${lang}.adoc"
@@ -263,6 +225,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_plugin_api.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           doc-autogen
           "${CMAKE_CURRENT_BINARY_DIR}/autogen/autogen_api_completions.${lang}.adoc"
           "${CMAKE_CURRENT_BINARY_DIR}/autogen/autogen_api_config_priority.${lang}.adoc"
@@ -286,6 +249,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_scripting.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           doc-autogen
           "${CMAKE_CURRENT_BINARY_DIR}/autogen/autogen_scripting_functions.${lang}.adoc"
           "${CMAKE_CURRENT_BINARY_DIR}/autogen/autogen_scripting_constants.${lang}.adoc"
@@ -303,6 +267,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_faq.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
           COMMENT "Building weechat_faq.${lang}.html"
         )
@@ -317,25 +282,44 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_quickstart.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
           COMMENT "Building weechat_quickstart.${lang}.html"
         )
         add_custom_target(doc-quickstart-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.${lang}.html")
         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.${lang}.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
       endforeach()
-      # relay protocol
+      # relay "api"
-      foreach(lang ${RELAY_LANG})
+      foreach(lang ${RELAY_API_LANG})
         add_custom_command(
-          OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${lang}.html"
+          OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html"
-          COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} ${ASCIIDOCTOR_RELAY_ARGS} -o "weechat_relay_protocol.${lang}.html" "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_protocol.${lang}.adoc"
+          COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} ${ASCIIDOCTOR_RELAY_API_ARGS} -o "weechat_relay_api.${lang}.html" "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_api.${lang}.adoc"
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
-          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_protocol.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_api.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/relay.${lang}.adoc"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-          COMMENT "Building weechat_relay_protocol.${lang}.html"
+          COMMENT "Building weechat_relay_api.${lang}.html"
         )
-        add_custom_target(doc-relay-protocol-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${lang}.html")
+        add_custom_target(doc-relay-api-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html")
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${lang}.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
+      endforeach()
+      # relay "weechat"
+      foreach(lang ${RELAY_WEECHAT_LANG})
+        add_custom_command(
+          OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_weechat.${lang}.html"
+          COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} ${ASCIIDOCTOR_RELAY_WEECHAT_ARGS} -o "weechat_relay_weechat.${lang}.html" "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_weechat.${lang}.adoc"
+          DEPENDS
+          "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_weechat.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/relay.${lang}.adoc"
+          WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+          COMMENT "Building weechat_relay_weechat.${lang}.html"
+        )
+        add_custom_target(doc-relay-weechat-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_weechat.${lang}.html")
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_weechat.${lang}.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
       endforeach()
       # developer's guide
       foreach(lang ${DEV_LANG})
@@ -345,6 +329,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
           "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_dev.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/includes/attributes-${lang}.adoc"
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
           COMMENT "Building weechat_dev.${lang}.html"
         )

doc/cs/includes/attributes-cs.adoc

@@ -0,0 +1,23 @@
+// czech translation, for reference only; matches the built-in behavior of core
+:appendix-caption: Příloha
+:appendix-refsig: {appendix-caption}
+:caution-caption: Upozornění
+:chapter-signifier: Kapitola
+:chapter-refsig: {chapter-signifier}
+:example-caption: Příklad
+:figure-caption: Obrázek
+:important-caption: Důležité
+:last-update-label: Změněno
+ifdef::listing-caption[:listing-caption: Seznam]
+ifdef::manname-title[:manname-title: Název]
+:note-caption: Poznámka
+:part-signifier: Část
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Úvod]
+:section-refsig: Oddíl
+:table-caption: Tabulka
+:tip-caption: Tip
+:toc-title: Obsah
+:untitled-label: Nepojmenovaný
+:version-label: Verze
+:warning-caption: Varování

doc/cs/includes/cmdline_options.cs.adoc

@@ -39,6 +39,10 @@
 *-h*, *--help*::
     Zobrazí nápovědu.
 
+// TRANSLATION MISSING
+*-i*, *--build-info*::
+    Display build information and exit.
+
 *-l*, *--license*::
     Zobrazí licenci WeeChatu.
 

doc/cs/includes/man.cs.adoc

@@ -97,7 +97,7 @@ $HOME/.local/share/weechat/weechat.log::
 
 // tag::copyright[]
 WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.adoc).
+souboru AUTHORS.md).
 
 Copyright (C) 2003-2024 {author}
 

doc/cs/weechat_quickstart.cs.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: cs
+include::includes/attributes-cs.adoc[]
 
 [[start]]
 == Spuštění WeeChatu
@@ -12,8 +13,9 @@ klávesových zkratek.
 
 Spustění z Vašeho shellu:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 [[help]]
@@ -285,7 +287,7 @@ Close a server, channel or private buffer (`/close` is an alias for
 ----
 
 // TRANSLATION MISSING
-[WARNING]
+[CAUTION]
 Closing the server buffer will close all channel/private buffers.
 
 // TRANSLATION MISSING

doc/de/includes/attributes-de.adoc

@@ -0,0 +1,23 @@
+// German translation, courtesy of Florian Wilhelm
+:appendix-caption: Anhang
+:appendix-refsig: {appendix-caption}
+:caution-caption: Achtung
+:chapter-signifier: Kapitel
+:chapter-refsig: {chapter-signifier}
+:example-caption: Beispiel
+:figure-caption: Abbildung
+:important-caption: Wichtig
+:last-update-label: Zuletzt aktualisiert
+ifdef::listing-caption[:listing-caption: Listing]
+ifdef::manname-title[:manname-title: Bezeichnung]
+:note-caption: Anmerkung
+:part-signifier: Teil
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Vorwort]
+:section-refsig: Abschnitt
+:table-caption: Tabelle
+:tip-caption: Hinweis
+:toc-title: Inhaltsverzeichnis
+:untitled-label: Ohne Titel
+:version-label: Version
+:warning-caption: Warnung

doc/de/includes/cmdline_options.de.adoc

@@ -35,6 +35,9 @@
 *-h*, *--help*::
     zeigt einen Hilfstext an.
 
+*-i*, *--build-info*::
+    Build-Informationen anzeigen und beenden.
+
 *-l*, *--license*::
     zeigt die Lizenz von WeeChat an.
 

doc/de/includes/man.de.adoc

@@ -98,7 +98,7 @@ $HOME/.local/share/weechat/weechat.log::
 
 // tag::copyright[]
 WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung
-findet man in der AUTHORS.adoc Datei).
+findet man in der AUTHORS.md Datei).
 
 Copyright (C) 2003-2024 {author}
 

doc/de/weechat_faq.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-:toc-title: Inhaltsverzeichnis
+include::includes/attributes-de.adoc[]
 
 Übersetzer:
 
@@ -54,12 +54,14 @@ Wenn Sie weiterhin Probleme haben, melden Sie diese bitte den Entwicklern.
 Wir empfehlen, dass zur Installation https://brew.sh/[Homebrew ^↗^^] genutzt wird.
 Hilfe erhält man mittels:
 
+[source,shell]
 ----
 brew info weechat
 ----
 
 WeeChat kann durch folgenden Befehl installiert werden:
 
+[source,shell]
 ----
 brew install weechat
 ----
@@ -331,11 +333,14 @@ unterstützt (rxvt-unicode, konsole, gnome-terminal, ... um nur einige zu nennen
 Im Normalfall erfolgt die Markierung des Textes mittels der Tasten kbd:[Ctrl+Alt]
 in Verbindung mit der Auswahl durch die Maus.
 
+Die Nickliste kann umgeschaltet und nur bei Bedarf sichtbar gemacht werden, mit der Taste kbd:[Alt+Shift+N].
+
 Eine weitere Möglichkeit besteht darin,
 die Benutzerliste am oberen oder unteren Rand des WeeChat-Bildschirmes zu positionieren:
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 [[urls]]
@@ -345,10 +350,13 @@ Dazu kann man den vereinfachten Anzeigemodus nutzen (Standardtaste: kbd:[Alt+l]
 
 Um URLs einfacher zu öffnen, können alternativ folgende Optionen gesetzt werden:
 
+* Nickliste umschalten und nur bei Bedarf darstellen, mit dem Tastenkurzbefehl kbd:[Alt+Shift+N]
+
 * Die Benutzerliste am oberen Bildschirmbereich positionieren.
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 * Die Ausrichtung bei einem Zeilenumbruch innerhalb eines Wortes deaktivieren.
@@ -399,6 +407,7 @@ Umgebungsvariable `TZ` muss auf einen entsprechenden Wert eingestellt werden.
 Am Besten machen Sie dies in Ihrer Shell-Initialisierungsdatei oder in der
 Befehlszeile, bevor Sie WeeChat starten:
 
+[source,shell]
 ----
 export TZ=Europe/Berlin
 ----
@@ -713,8 +722,9 @@ Entsprechend der ausgegebenen Information, wird ggf. eine Maus nicht unterstütz
 Um zu testen ob eine Mausunterstützung vom Terminal bereitgestellt wird, sollte
 man folgende Zeile im Terminal eingeben:
 
+[source,shell]
 ----
-$ printf '\033[?1002h'
+printf '\033[?1002h'
 ----
 
 Jetzt klickt man mit der Maus auf das erste Zeichen im Terminal (linke obere
@@ -722,8 +732,9 @@ Ecke). Als Ergebnis sollte man folgende Zeichenkette erhalten: " !!#!!".
 
 Um die Mausunterstützung im Terminal zu beenden:
 
+[source,shell]
 ----
-$ printf '\033[?1002l'
+printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -790,7 +801,7 @@ Man sollte versuchen, eine andere Priorität zu nutzen; Im folgenden Beispiel
 muss "xxx" durch den betroffenen Servernamen ersetzt werden:
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1067,8 +1078,9 @@ Als erstes sollte das Kapitel über TLS Verbindungen in dieser FAQ gelesen werde
 Wenn das nicht hilft, sollte die Skriptliste von Hand gelöscht werden. Dazu
 folgenden Befehl in der Shell ausführen:
 
+[source,shell]
 ----
-$ rm ~/.cache/weechat/script/plugins.xml.gz
+rm ~/.cache/weechat/script/plugins.xml.gz
 ----
 
 [NOTE]
@@ -1092,15 +1104,17 @@ Das bedeutet aber auch, dass die Skripten von Hand aktuell gehalten werden müss
 
 * und in der Shell, mit installiertem curl:
 
+[source,shell]
 ----
-$ cd ~/.cache/weechat/script
+cd ~/.cache/weechat/script
-$ curl -O https://weechat.org/files/plugins.xml.gz
+curl -O https://weechat.org/files/plugins.xml.gz
 ----
 
 Wenn Sie macOS ausführen und die heruntergeladene Datei eine Größe von 0 Byte hat,
 versuchen Sie, diese Variable in Ihrer Shell-Initialisierungsdatei oder auf der
 Befehlszeile zu setzen. Bevor Sie WeeChat starten:
 
+[source,shell]
 ----
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 ----
@@ -1272,6 +1286,7 @@ siehe https://weechat.org/about/support/[this page ^↗^^].
 
 Falls man WeeChat in gdb ausführt, kann folgende Fehlermeldung erscheinen:
 
+[source,shell]
 ----
 $ gdb /Pfad/zu/weechat
 (gdb) run
@@ -1282,6 +1297,7 @@ Cannot find new threads: generic error
 Um diesen Fehler zu beheben, sollte man gdb wie folgt aufrufen (der Pfad zu
 libpthread und WeeChat muss natürlich an das eigene System angepasst werden):
 
+[source,shell]
 ----
 $ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat
 (gdb) run
@@ -1290,7 +1306,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat
 [[supported_os]]
 === Auf welchen Plattformen läuft WeeChat und wird es noch auf andere Betriebssysteme portiert?
 
-WeeChat läuft auf den meisten Linux/BSD-Distributionen, GNU/Hurd, Mac OS und
+WeeChat läuft auf den meisten Linux/BSD-Distributionen, GNU/Hurd, macOS und
 Windows (Cygwin und Windows Subsystem für Linux) einwandfrei.
 
 Wir geben unser Bestes, WeeChat auf möglichst viele Plattformen zu portieren.

doc/de/weechat_quickstart.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-:toc-title: Inhaltsverzeichnis
+include::includes/attributes-de.adoc[]
 
 Übersetzer:
 
@@ -19,8 +19,9 @@ keine Probleme mit der Standard Tastaturbelegung.
 
 Programmstart aus deiner Shell:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 [[help]]
@@ -300,7 +301,7 @@ Einen Buffer schließen (Server, Channel, privater Buffer);
 /close
 ----
 
-[WARNING]
+[CAUTION]
 Wird ein Server-Buffer geschlossen,
 schließt WeeChat ebenfalls alle zum Server
 gehörenden Channels und privaten Buffer.

doc/de/weechat_scripting.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-:toc-title: Inhaltsverzeichnis
+include::includes/attributes-de.adoc[]
 
 Übersetzer:
 
@@ -73,7 +73,7 @@ und die Dokumentation für die Funktion `+hook_process+` in link:weechat_plugin_
 WeeChat definiert ein `weechat` Module welches mittels `import weechat`
 importiert werden muss. +
 Ein Python-Stub für die WeeChat-API ist im Repository verfügbar:
-https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Funktionen
@@ -373,9 +373,10 @@ anlegen, der in das Verzeichnis _Skriptsprache/autoload_ zeigt.
 
 Ein Beispiel für ein Python-Skript:
 
+[source,shell]
 ----
-$ cd ~/.local/share/weechat/python/autoload
+cd ~/.local/share/weechat/python/autoload
-$ ln -s ../script.py
+ln -s ../script.py
 ----
 
 [NOTE]

doc/de/weechat_user.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-:toc-title: Inhaltsverzeichnis
+include::includes/attributes-de.adoc[]
 
 Übersetzer:
 
@@ -115,7 +115,7 @@ Die folgende Tabelle zeigt eine Auflistung der Pakete, die zum Erstellen von Wee
 | cmake | ≥ 3.0
 | bauen.
 
-| pkg-config |
+| pkgconf / pkg-config |
 | entdeckt installierte Bibliotheken.
 
 | libncurses-dev |
@@ -227,8 +227,9 @@ Falls eine Debian/Ubuntu basierte Distribution genutzt wird und man einen
 es mit folgendem Befehl möglich alle notwendigen Abhängigkeiten zu
 installieren:
 
+[source,shell]
 ----
-# apt-get build-dep weechat
+sudo apt-get build-dep weechat
 ----
 
 [[build]]
@@ -236,22 +237,24 @@ installieren:
 
 * Installation in das Systemverzeichnis (benötigt _root_ Privilegien):
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake ..
+cmake ..
-$ make
+make
-$ sudo make install
+sudo make install
 ----
 
 * Installation in ein benutzerdefiniertes Verzeichnis (zum Beispiel ins Heimatverzeichnis):
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=/Pfad/zum/Verzeichnis
+cmake .. -DCMAKE_INSTALL_PREFIX=/Pfad/zum/Verzeichnis
-$ make
+make
-$ make install
+make install
 ----
 
 Optionen für CMake können mit dem Format, `-DOPTION=VALUE`, genutzt werden.
@@ -387,14 +390,16 @@ Liste der verfügbaren Optionen:
 
 Weitere Optionen können mit folgendem Befehl angezeigt werden:
 
+[source,shell]
 ----
-$ cmake -LA
+cmake -LA
 ----
 
 oder mittels der Curses-Oberfläche:
 
+[source,shell]
 ----
-$ ccmake ..
+ccmake ..
 ----
 
 [[tests]]
@@ -407,14 +412,16 @@ Folgende Pakete werden *benötigt* um Tests zu kompilieren:
 
 Tests muss aktiviert werden wenn WeeChat kompiliert wird:
 
+[source,shell]
 ----
-$ cmake .. -DENABLE_TESTS=ON
+cmake .. -DENABLE_TESTS=ON
 ----
 
 Nach der Kompilierung wird die Testumgebung im build-Verzeichnis ausgeführt:
 
+[source,shell]
 ----
-$ ctest -V
+ctest -V
 ----
 
 [[git_sources]]
@@ -425,8 +432,9 @@ sich die Quellen nicht kompilieren oder der Code ist nicht stabil. Sie sind hier
 
 Um die Git Quellen zu beziehen nutzen Sie folgende Befehle:
 
+[source,shell]
 ----
-$ git clone https://github.com/weechat/weechat.git
+git clone https://github.com/weechat/weechat.git
 ----
 
 Folgen Sie bitte der Anleitung zur Erstellung aus Quellpaketen (siehe <<source_package,Quellpakete>>).
@@ -447,8 +455,9 @@ Falls WeeChat abgestürzt sein sollte und Sie diesen Fehler melden möchten:
 
 Bei der Kompilierung mit CMake muss folgende Option gesetzt werden:
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug
+cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----
 
 [[address_sanitizer]]
@@ -457,18 +466,20 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 Sie können zusätzlich den Adress-Sanitizer aktivieren, der bei Problemen sofort
 zum Absturz von WeeChat führt:
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
 ----
 
-[WARNING]
+[CAUTION]
 Sie sollten die Adressbereinigung nur aktivieren, wenn Sie versuchen, einen
 Absturz zu provozieren. Diese Funktion wird im produktiven Einsatz nicht empfohlen.
 
 Nach dem Kompilieren und Installieren müssen Sie WeeChat folgendermaßen ausführen:
 
+[source,shell]
 ----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
+ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
 ----
 
 Im Falle eines Absturzes befinden sich zusätzliche Informationen in der Datei, `asan.log`.
@@ -489,12 +500,14 @@ aktivieren, bevor WeeChat gestaret wird, wird der Befehl `ulimit` benötigt.
 Zum Beispiel muss unter Linux in einer _bash_ Shell folgender Befehl in die `~/.bashrc`
 Datei eingetragen werden:
 
+[source,shell]
 ----
 ulimit -c unlimited
 ----
 
 optional kann noch die maximale Dateigröße bestimmt werden:
 
+[source,shell]
 ----
 ulimit -c 200000
 ----
@@ -518,6 +531,7 @@ https://wiki.archlinux.org/title/Core_dump[wiki page ^↗^^].
 Beispiel: _weechat_ ist in _/usr/bin/_ installiert und die _core_ Datei befindet sich
 in _/home/user/_. Nun wird gdb mit folgendem Befehl aufgerufen:
 
+[source,shell]
 ----
 gdb /usr/bin/weechat /home/user/core
 ----
@@ -565,6 +579,7 @@ Um eine laufende Sitzung von WeeChat zu debuggen (zum Beispiel wenn WeeChat nich
 mehr reagieren sollte) sollte man gdb mit der Prozess-ID starten (_12345_ muss durch
 die PID des laufenden weechat Prozesses ersetzt werden):
 
+[source,shell]
 ----
 gdb /usr/bin/weechat 12345
 ----
@@ -580,8 +595,9 @@ Sollte WeeChat abgestürzt sein, muss der Befehl `bt full` genutzt werden:
 
 Um WeeChat zu starten muss folgender Befehl ausgeführt werden:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 Wird WeeChat das erste mal ausgeführt, wird die Standardkonfiguration und
@@ -595,7 +611,7 @@ include::includes/cmdline_options.de.adoc[tag=standard]
 
 Einige zusätzliche Optionen sollten nur für Debug-Zwecke genutzt werden:
 
-[WARNING]
+[CAUTION]
 *KEINE* dieser Optionen sollte für ein Produktivsystem genutzt werden!
 
 include::includes/cmdline_options.de.adoc[tag=debug]
@@ -799,25 +815,24 @@ Dies speichert den aktuellen Status in `*.upgrade`-Dateien. Sie können dann ent
 die gesamten WeeChat-Verzeichnisse (Konfiguration, Daten, Cache) neu starten oder auf
 einen anderen Computer verschieben und WeeChat später mit diesem Befehl neu starten:
 
+[source,shell]
 ----
-$ weechat --upgrade
+weechat --upgrade
 ----
 
 [[restart_after_upgrade]]
 === Neustart nach Upgrade
 
-[[restart_release_notes]]
+[[restart_upgrading_notes]]
-==== Versionshinweise
+==== Hinweise zum Upgrade
 
-Nach einem Upgrade wird *dringend empfohlen* die,
+Nach einem Upgrade, wird *dringend empfohlen* das Dokukment
-https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[Versionshinweise ^↗^^]
+https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
-zu lesen, denn dort sind wichtige Informationen zu Änderungen enthalten und ob
+zu lesen. Dieses Dokument enthält wichtige Informationen zu wichtigen Änderungen und
-eventuell ein manuelles Eingreifen erforderlich sein könnte.
+einige manuelle Aktionen, die erforderlich sein könnten.
 
-Sie müssen die Versionshinweise aller Versionen zwischen Ihrer alten (abgelaufenen)
+Es sollten die Versionen zwischen der alten (abgelaufenen) und der neuen Version (eingeschlossen) gelesen werden. +
-und Ihrer neuen Version (enthalten) lesen. +
+Wenn beispielsweise von Version 4.0.0 auf 4.3.0 gewechselt wurde, ist es ratsam die Versionen von 4.0.1 bis 4.3.0 zu lesen.
-Wenn Sie beispielsweise von Version 3.0 auf 3.2 wechseln, müssen Sie die Versionshinweise
-der Versionen 3.1 und 3.2 lesen.
 
 [[restart_configuration_upgrade]]
 ==== Konfigurations-Upgrade
@@ -867,7 +882,7 @@ Beispiel des WeeChat-Terminals:
 │         │                                                                    │       │
 │         │                                                                    │       │
 │         │                                                                    │       │
-│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* [H: 3:#abc(2,5), 5]                │
+│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* M [H: 3:#abc(2,5), 5]              │
 │         │[@Flashy(i)] hi peter!█                                                     │
 └──────────────────────────────────────────────────────────────────────────────────────┘
             ▲ Bars "status" und "input"                               Bar "nicklist" ▲
@@ -906,32 +921,34 @@ Die _status_-Bar besitzt als Standardeinträge:
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Item                  | Beispiel              | Beschreibung
+| Item                  | Beispiel               | Beschreibung
-| time                  | `[12:55]`             | Uhrzeit.
+| time                  | `12:55`                | Uhrzeit.
-| buffer_last_number    | `[5]`                 | Nummer des letzten Buffers.
+| buffer_last_number    | `5`                    | Nummer des letzten Buffers (kann sich unterscheiden von `buffer_count` wenn Option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> deaktiviert (`off`) ist).
-| buffer_plugin         | `[irc/libera]`        | Erweiterung des aktuellen Buffers (IRC Erweiterung setzt den IRC Servername für den Buffer).
+| buffer_plugin         | `irc/libera`           | Erweiterung des aktuellen Buffers (IRC Erweiterung setzt den IRC Servername für den Buffer).
-| buffer_number         | `2`                   | Aktuelle Nummer des Buffers.
+| buffer_number         | `2`                    | Aktuelle Nummer des Buffers.
-| buffer_name           | `#test`               | Name des aktuellen Buffers.
+| buffer_name           | `#test`                | Name des aktuellen Buffers.
-| buffer_modes          | `+n`                  | IRC Kanal-Modi.
+| buffer_modes          | `+n`                   | IRC Kanal-Modi.
-| buffer_nicklist_count | `{4}`                 | Anzahl der Nicks die in der Nickliste angezeigt werden.
+| buffer_nicklist_count | `4`                    | Anzahl der Nicks die in der Nickliste angezeigt werden.
-| buffer_zoom           | !                     | `!` bedeutet, dass ein zusammengefügter Buffer gezoomed (nur dieser Buffer wird angezeigt) wird.
+| buffer_zoom           | !                      | `!` bedeutet, dass ein zusammengefügter Buffer gezoomed (nur dieser Buffer wird angezeigt) wird.
-| buffer_filter         | `+*+`                 | Filteranzeige: `+*+` bedeutet das Zeilen gefiltert (unterdrückt) werden. Ein leerer Eintrag zeigt an, dass alle Zeilen dargestellt werden.
+| buffer_filter         | `+*+`                  | Filteranzeige: `+*+` bedeutet das Zeilen gefiltert (unterdrückt) werden. Ein leerer Eintrag zeigt an, dass alle Zeilen dargestellt werden.
-| scroll                | `-MORE(50)-`          | Scroll Indikator, zeigt an wie viele Zeilen unterhalb der zur Zeit dargestellten Zeile vorhanden sind.
+| mouse_status          | `M`                    | Mouse status (empty if mouse is disabled), see command <<command_weechat_mouse,/mouse>> and <<key_bindings_toggle_keys,Tasten zum Umschalten von Funktionen>>.
-| lag                   | `[Lag: 2.5]`          | Verzögerungsanzeige, in Sekunden (keine Anzeige falls Verzögerung gering).
+| scroll                | `-MORE(50)-`           | Scroll Indikator, zeigt an wie viele Zeilen unterhalb der zur Zeit dargestellten Zeile vorhanden sind.
-| hotlist               | `[H: 3:#abc(2,5), 5]` | Liste der Buffer mit Aktivität (ungelesene Nachrichten) (für das Beispiel: 2 Highlights und 5 ungelesene Nachrichten im Kanal _#abc_, eine ungelesene Nachricht in Buffer #5).
+| lag                   | `Lag: 2.5`             | Verzögerungsanzeige, in Sekunden (keine Anzeige falls Verzögerung gering).
-| completion            | `abc(2) def(5)`       | Liste von Wörtern für Vervollständigung, die Zahl zeigt an wie viele Varianten möglich sind.
+| hotlist               | `H: 3:#abc(2,5), 5`    | Liste der Buffer mit Aktivität (ungelesene Nachrichten) (für das Beispiel: 2 Highlights und 5 ungelesene Nachrichten im Kanal _#abc_, eine ungelesene Nachricht in Buffer #5).
+| typing                | `Typing: bob, (alice)` | Schreibbenachrichtigung, siehe <<typing_notifications,Schreibbenachrichtigung>>.
+| completion            | `abc(2) def(5)`        | Liste von Wörtern für Vervollständigung, die Zahl zeigt an wie viele Varianten möglich sind.
 |===
 
 In der _input_ Bar lautet die Standardeinstellung:
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Item         | Beispiel                                      | Beschreibung
+| Item         | Beispiel                                    | Beschreibung
-| input_prompt | `[@Flashy(i)]`                                | Input prompt, für irc: Nick und Modi (Modus "+i" bedeutet auf libera, unsichtbar).
+| input_prompt | `@Flashy(i)`                                | Input prompt, für irc: Nick und Modi (Modus "+i" bedeutet auf libera, unsichtbar).
-| away         | `(away)`                                      | Abwesenheitsanzeige.
+| away         | `away`                                      | Abwesenheitsanzeige.
-| input_search | `[Search lines (~ str,msg)]`                  | Suchindikatoren ("`~`": Groß-und Kleinschreibung ignorieren, "`==`": Groß-und Kleinschreibung berücksichtigen, "`str`": einfache Textsuche, "`regex`": suche mit regulären Ausdrücken, "`msg`": Suche in Nachrichten, "`pre`": Suche in Präfix, "`pre\|msg`": Suche in Präfix und Nachrichten).
+| input_search | `Search lines (~ str,msg)`                  | Suchindikatoren ("`~`": Groß-und Kleinschreibung ignorieren, "`==`": Groß-und Kleinschreibung berücksichtigen, "`str`": einfache Textsuche, "`regex`": suche mit regulären Ausdrücken, "`msg`": Suche in Nachrichten, "`pre`": Suche in Präfix, "`pre\|msg`": Suche in Präfix und Nachrichten).
-| input_paste  | `[Paste 7 lines ? [ctrl-y] Ja [ctrl-n] Nein]` | Nachfrage, ob sieben Zeilen eingefügt werden sollen.
+| input_paste  | `Paste 7 lines ? [ctrl-y] Ja [ctrl-n] Nein` | Nachfrage, ob sieben Zeilen eingefügt werden sollen.
-| input_text   | `hi peter!`                                   | Text der eingegeben wird.
+| input_text   | `hi peter!`                                 | Text der eingegeben wird.
 |===
 
 Es existieren zwei Suchmodi:
@@ -966,8 +983,7 @@ andere Items die zur Verfügung stehen (die aber nicht standardmäßig in einer
 [width="100%",cols="^3,^3,9",options="header"]
 |===
 | Item                         | Beispiel                 | Beschreibung
-| buffer_count                 | `10`                     | absolute Anzahl an geöffneten Buffern.
+| buffer_count                 | `5`                      | absolute Anzahl an geöffneten Buffern.
-| buffer_last_number           | `10`                     | Nummer des letzten Buffers (kann sich unterscheiden von `buffer_count` wenn Option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> deaktiviert (`off`) ist).
 | buffer_nicklist_count_all    | `4`                      | Anzahl der sichtbaren Gruppen und Nicks in der Nickliste.
 | buffer_nicklist_count_groups | `0`                      | Anzahl der sichtbaren Gruppen in der Nickliste.
 | buffer_short_name            | `#test`                  | Kurzname des aktuellen Buffers.
@@ -982,7 +998,7 @@ andere Items die zur Verfügung stehen (die aber nicht standardmäßig in einer
 | irc_nick_host                | `+Flashy!user@host.com+` | aktueller IRC Nick und Host.
 | irc_nick_modes               | `i`                      | IRC Modi für den eigenen Nick.
 | irc_nick_prefix              | `@`                      | IRC Nick-Präfix für den Kanal.
-| mouse_status                 | `M`                      | Status der Maus (keine Anzeige, falls Maus deaktiviert).
+| spacer                       |                          | spezielles Item um Text in einer Bar auszurichten, siehe <<item_spacer,Spacer item>>.
 | spell_dict                   | `de,en`                  | zeigt an welche Wörterbücher für die Rechtschreibung im aktuellen Buffer genutzt werden.
 | spell_suggest                | `Glück,Glocke,Block`     | Vorschläge für ein falsch geschriebenes Wort.
 | tls_version                  | `TLS1.3`                 | TLS Version die für den IRC Server genutzt wird.
@@ -1342,7 +1358,7 @@ Tags die häufig verwendet werden (keine vollständige Auflistung):
 | no_filter        | Zeile kann nicht gefiltert werden.
 | no_highlight     | die Zeile kann nicht gehiglighted werden.
 | no_log           | Zeile wird nicht in die Log-Datei geschrieben.
-| log0 … log9      | Grad der Protokollierung (siehe `/help logger`).
+| log0 … log9      | Grad der Protokollierung (siehe den Befehl <<command_logger_logger,/logger>>).
 | notify_none      | Diese Zeile wird erzeugt keinen Hotlist-Eintrag. ^(1)^
 | notify_message   | Diese Zeile ist eine User Nachricht. ^(1)^
 | notify_private   | Diese Zeile ist eine private Nachricht. ^(1)^
@@ -2022,27 +2038,27 @@ Beispiel des fset-Buffer, der Optionen anzeigt, die mit `weechat.look` beginnen
 [subs="quotes"]
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│1/121 | Filter: weechat.look.* | Sort: ~name | Key(input): alt+space=toggle │
+│1.weechat│7/125 | Filter: weechat.look.* | Sortierung: ~name | Taste(input): alt+Lee>>│
-│2.fset   │weechat.look.bare_display_exit_on_input: exit the bare display mode on any c│
+│2.fset   │weechat.look.bare_display_exit_on_input: beendet den einfachen Anzeigemodus │
-│         │hanges in input [default: on]                                               │
+│         │durch Tastendruck [Standardwert: on]                                        │
 │         │----------------------------------------------------------------------------│
-│         │  weechat.look.align_end_of_lines                   enum     message        │
+│         │  weechat.look.align_end_of_lines              Aufzählung    message        │
-│         │  weechat.look.align_multiline_words                boolean  on             │
+│         │  weechat.look.align_multiline_words           boolesch      on             │
-│         │  weechat.look.bar_more_down                        string   "++"           │
+│         │  weechat.look.bar_more_down                   Zeichenkette  "++"           │
-│         │  weechat.look.bar_more_left                        string   "<<"           │
+│         │  weechat.look.bar_more_left                   Zeichenkette  "<<"           │
-│         │  weechat.look.bar_more_right                       string   ">>"           │
+│         │  weechat.look.bar_more_right                  Zeichenkette  ">>"           │
-│         │  weechat.look.bar_more_up                          string   "--"           │
+│         │  weechat.look.bar_more_up                     Zeichenkette  "--"           │
-│         │##  weechat.look.bare_display_exit_on_input           boolean  on             ##│
+│         │##  weechat.look.bare_display_exit_on_input      boolesch      on             ##│
-│         │  weechat.look.bare_display_time_format             string   "%H:%M"        │
+│         │  weechat.look.bare_display_time_format        Zeichenkette  "%H:%M"        │
-│         │  weechat.look.buffer_auto_renumber                 boolean  on             │
+│         │  weechat.look.buffer_auto_renumber            boolesch      on             │
-│         │  weechat.look.buffer_notify_default                enum     all            │
+│         │  weechat.look.buffer_notify_default           Aufzählung    all            │
-│         │  weechat.look.buffer_position                      enum     end            │
+│         │  weechat.look.buffer_position                 Aufzählung    end            │
-│         │  weechat.look.buffer_search_case_sensitive         boolean  off            │
+│         │  weechat.look.buffer_search_case_sensitive    boolesch      off            │
-│         │  weechat.look.buffer_search_force_default          boolean  off            │
+│         │  weechat.look.buffer_search_force_default     boolesch      off            │
-│         │  weechat.look.buffer_search_regex                  boolean  off            │
+│         │  weechat.look.buffer_search_history           Aufzählung    local          │
-│         │  weechat.look.buffer_search_where                  enum     prefix_message │
+│         │  weechat.look.buffer_search_regex             boolesch      off            │
-│         │  weechat.look.buffer_time_format                   string   "%H:%M:%S"     │
+│         │  weechat.look.buffer_search_where             Aufzählung    prefix_message │
-│         │  weechat.look.buffer_time_same                     string   ""             │
+│         │  weechat.look.buffer_time_format              Zeichenkette  "%H:%M:%S"     │
 │         │[12:55] [2] [fset] 2:fset                                                   │
 │         │█                                                                           │
 └──────────────────────────────────────────────────────────────────────────────────────┘
@@ -2849,8 +2865,9 @@ Option in die Sektion "option" der Aspell-Konfiguration hinzufügt.
 Den Name der Option findet man in der ASpell-Konfigurationsdatei. Eine Auflistung aller
 möglichen Optionen erhält man durch:
 
+[source,shell]
 ----
-$ aspell config
+aspell config
 ----
 
 Um zum Beispiel die Option "ignore-case" einzuschalten:
@@ -3302,7 +3319,7 @@ Passwörter beinhalten. Dies dient dazu Passwörter nicht im Klartext als
 Wert einer Option zu sichern. Dazu wird folgendes Format, anstelle des
 Passwortes, verwendet: "${sec.data.xxx}". "xxx" ist hierbei der Name den man
 dem Passwort zugeordnet hat (siehe oben, mittels `/secure set xxx ...`). +
-Für eine vollständige Liste aller unterstützten Optionen, siehe  `/help secure`.
+Für eine vollständige Liste der unterstützen Optionen, siehe den Befehl <<command_weechat_secure,/secure>>.
 
 Um z.B. das oben eingestellte _libera_ Passwort für eine
 <<irc_sasl_authentication,SASL Authentifizierung>> zu nutzen:
@@ -3425,8 +3442,9 @@ irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]]
 Beispiel: Anmelden beim Server _irc.libera.chat_ mit dem Nick _alice_ und betreten
 der Kanäle _#weechat_ und _#weechat-fr_ (Standardport (6667) wird genutzt):
 
+[source,shell]
 ----
-$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
 ----
 
 [[irc_servers]]
@@ -3439,14 +3457,16 @@ Standardmäßig sind keine Server angelegt. Es gibt keine Begrenzung für die
 Anzahl von Servern. Server können mit dem Befehl <<command_irc_server,/server>>
 angelegt werden.
 
-Um zum Beispiel eine TLS verschlüsselte Verbindung zu
+Zum Beispiel für eine Verbindung zu https://libera.chat/[libera.chat ^↗^^]:
-https://libera.chat/[libera.chat ^↗^^] herzustellen:
 
 ----
-/server add libera irc.libera.chat/6697 -tls
+/server add libera irc.libera.chat
 ----
 
-Um WeeChat beim Start direkt mit dem Server zu verbinden:
+[NOTE]
+Der Standardport ist 6697 und TLS (verschlüsselter Datenverkehr) ist aktiviert.
+
+Um WeeChat, beim Programmstart, direkt mit einem Server zu verbinden:
 
 ----
 /set irc.server.libera.autoconnect on
@@ -3463,7 +3483,7 @@ Kapitel über <<irc_sasl_authentication,SASL authentication>>):
 ----
 
 Wenn SASL nicht unterstützt wird, können Sie einen Befehl verwenden, um eine
-Nachricht an nickserv zu senden, um sich zu Authentifizieren:
+Nachricht an nickserv zu senden, um sich zu authentifizieren:
 
 ----
 /set irc.server.libera.command "/msg nickserv identify ${sec.data.libera}"
@@ -3487,51 +3507,52 @@ Wenn Sie beispielsweise den _libera_-Server mit den obigen Befehlen erstellt hab
 sehen Sie dies mit dem Befehl `/fset libera`:
 
 ....
-irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.addresses             Zeichenkette  "irc.libera.chat"
-irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood            integer       null -> 2000
-irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           boolesch      on
-irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              Zeichenkette  null -> ""
-irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autojoin_delay        integer       null -> 0
-irc.server.libera.autojoin_dynamic      boolean  null -> off
+irc.server.libera.autojoin_dynamic      boolesch      null -> off
-irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect         boolesch      null -> on
-irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autoreconnect_delay   integer       null -> 10
-irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin            boolesch      null -> off
-irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.autorejoin_delay      integer       null -> 30
-irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check            integer       null -> 0
-irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.away_check_max_nicks  integer       null -> 25
-irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.capabilities          Zeichenkette  null -> "*"
-irc.server.libera.charset_message       enum     null -> message
+irc.server.libera.charset_message       Aufzählung    null -> message
-irc.server.libera.command               string   null -> ""
+irc.server.libera.command               Zeichenkette  null -> ""
-irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.command_delay         integer       null -> 0
-irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.connection_timeout    integer       null -> 60
-irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.default_chantypes     Zeichenkette  null -> "#&"
-irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.ipv6                  Aufzählung    null -> auto
-irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.local_hostname        Zeichenkette  null -> ""
-irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_kick              Zeichenkette  null -> ""
-irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_part              Zeichenkette  null -> "WeeChat ${info:version}"
-irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              Zeichenkette  null -> "WeeChat ${info:version}"
-irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks                 Zeichenkette  null -> "${username},${username}2,${username}3,${username}4,${username}5"
-irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.nicks_alternate       boolesch      null -> on
-irc.server.libera.notify                string   null -> ""
+irc.server.libera.notify                Zeichenkette  null -> ""
-irc.server.libera.password              string   null -> ""
+irc.server.libera.password              Zeichenkette  null -> ""
-irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.proxy                 Zeichenkette  null -> ""
-irc.server.libera.realname              string   null -> ""
+irc.server.libera.realname              Zeichenkette  null -> ""
-irc.server.libera.sasl_fail             enum     null -> reconnect
+irc.server.libera.registered_mode       Zeichenkette  null -> "r"
-irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_fail             Aufzählung    null -> reconnect
-irc.server.libera.sasl_mechanism        enum     null -> plain
+irc.server.libera.sasl_key              Zeichenkette  null -> ""
-irc.server.libera.sasl_password         string   "${sec.data.libera}"
+irc.server.libera.sasl_mechanism        Aufzählung    null -> plain
-irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_password         Zeichenkette  "${sec.data.libera}"
-irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.sasl_timeout          integer       null -> 15
-irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.sasl_username         Zeichenkette  "alice"
-irc.server.libera.tls                   boolean  on
+irc.server.libera.split_msg_max_length  integer       null -> 512
-irc.server.libera.tls_cert              string   null -> ""
+irc.server.libera.tls                   boolesch      null -> on
-irc.server.libera.tls_dhkey_size        integer  null -> 2048
+irc.server.libera.tls_cert              Zeichenkette  null -> ""
-irc.server.libera.tls_fingerprint       string   null -> ""
+irc.server.libera.tls_dhkey_size        integer       null -> 2048
-irc.server.libera.tls_password          string   null -> ""
+irc.server.libera.tls_fingerprint       Zeichenkette  null -> ""
-irc.server.libera.tls_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.tls_password          Zeichenkette  null -> ""
-irc.server.libera.tls_verify            boolean  null -> on
+irc.server.libera.tls_priorities        Zeichenkette  null -> "NORMAL"
-irc.server.libera.usermode              string   null -> ""
+irc.server.libera.tls_verify            boolesch      null -> on
-irc.server.libera.username              string   null -> "alice"
+irc.server.libera.usermode              Zeichenkette  null -> ""
+irc.server.libera.username              Zeichenkette  null -> "${username}"
 ....
 
 Wenn Sie beispielsweise automatisch eine Verbindung zu allen von Ihnen
@@ -3584,9 +3605,10 @@ die Verbindung mit einer vorherigen Version (<0.3.1) funktioniert hat.
 
 * Importieren Sie die Zertifikate in einer Shell:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
+wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
 ----
 
 [NOTE]
@@ -3607,10 +3629,11 @@ Es ist möglich mehrere Zertifikate in der Datei CAs.pem zu verwenden.
 
 * Erstellen Sie ein Zertifikat in der Shell:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
+openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
 ----
 
 [NOTE]
@@ -3659,8 +3682,9 @@ dadurch kein Passwort während des Verbindungsaufbaus benötigt).
 
 Ein Schlüssel kann mit folgendem Befehl erzeugt werden:
 
+[source,shell]
 ----
-$ openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
+openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
 ----
 
 [NOTE]
@@ -3670,8 +3694,9 @@ das auch beispielsweise `~/.weechat` sein kann.
 Um den öffentlichen Schlüssel zu erhalten (base64 enkodiert) muss
 folgender Befehl ausgeführt werden:
 
+[source,shell]
 ----
-$ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
 ----
 
 Nun Verbindung zum Server herstellen, identifizieren (z.B. mittels "nickserv identify")
@@ -3741,8 +3766,9 @@ Privatsphäre und Sicherheit im Internet verbessern können.
 
 Im ersten Schritt muss Tor installiert werden. Für Debian (und Derivate):
 
+[source,shell]
 ----
-$ sudo apt-get install tor
+sudo apt-get install tor
 ----
 
 In WeeChat muss nun ein socks5-Proxy für den Tor Service erstellt werden (Hostname/IP
@@ -4026,7 +4052,7 @@ Spezifikation: https://ircv3.net/specs/extensions/message-tags[message-tags ^
 Diese Funktion ermöglicht das Hinzufügen von Metadaten zu Nachrichten. +
 Diese Tags können mit dem Befehl `/debug tags` angezeigt werden.
 
-Um diese Funktion zu verwenden, muss sie aktiviert werden: <<typing_notifications,typing notifications>>.
+Um diese Funktion zu verwenden, muss sie aktiviert werden: <<typing_notifications,Schreibbenachrichtigung>>.
 
 [[irc_ircv3_monitor]]
 ==== monitor
@@ -4097,7 +4123,7 @@ Mit dieser Funktion können Sie Ihren richtigen Namen ändern, indem Sie den
 
 Spezifikation: https://ircv3.net/specs/client-tags/typing[typing ^↗^^]
 
-Siehe das entsprechende Kapitel <<typing_notifications,Typing notifications>>.
+Siehe das entsprechende Kapitel <<typing_notifications,Schreibbenachrichtigung>>.
 
 [[irc_ircv3_userhost_in_names]]
 ==== userhost-in-names
@@ -4166,7 +4192,7 @@ Schlüssel erfordert, aber nicht `#channel2`:
 /set irc.server.libera.autojoin "#channel1,#channel2 key1"
 ----
 
-Um eine Hilfe über das Format zu erhalten, siehe `/help irc.server.libera.autojoin`.
+Hilfe zum Format findet man unter Option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
 
 [[irc_private_messages]]
 === private Nachrichten
@@ -4215,7 +4241,7 @@ damit die Zeilen im Buffer unterdrückt werden. Zum Beispiel:
 ----
 
 Dabei ist es möglich, einen Filter für nur einen Kanal oder für mehrere Kanäle zu erstellen, die mit
-dem selben Namen beginnen (siehe `/help filter`):
+dem selben Namen beginnen (siehe den Befehl <<command_weechat_filter,/filter>>):
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4671,10 +4697,11 @@ Der Standardpfad zum Zertifikat/Schlüssel wird durch die Option definiert
 Ein Zertifikat und einen privaten Schlüssel kann man mit folgenden Befehlen
 erstellen:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
+openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
 ----
 
 [NOTE]
@@ -4750,13 +4777,21 @@ Zum Beispiel:
 Jetzt kann man sich über Port 9000 mit einem WeeChat oder einer Remote-Schnittstelle
 verbinden, indem das Passwort „mypassword“ verwendet wird.
 
-So stellt man mit WeeChat eine Verbindung zu einem _api_ Relay her:
+Um eine lokale Verbindung via _api_ Relay mittels WeeChat herzustelen:
 
 ----
 /remote add weechat http://localhost:9000 -password=mypassword
 /remote connect weechat
 ----
 
+Um eine entfernte Verbindung via _api_Relay mittels WeeChat herzustelen
+(TLS wird dringend empfohlen):
+
+----
+/remote add weechat https://example.com:9000 -password=mypassword
+/remote connect weechat
+----
+
 [NOTE]
 Der Remote-WeeChat muss dieselbe API-Version wie der lokale WeeChat nutzen.
 Daher wird dringend empfohlen, auf dem Remote- und dem lokalen Client genau
@@ -4778,10 +4813,10 @@ dieses Protokoll verbinden.
 Zum Beispiel:
 
 ----
-/relay add weechat 9000
+/relay add weechat 9500
 ----
 
-Nun kann man über den Port 9000 mittels einer Oberfläche und dem Passwort
+Nun kann man über den Port 9500 mittels einer Oberfläche und dem Passwort
 "meinPasswort" eine Verbindung zu WeeChat herstellen.
 
 [[relay_websocket]]
@@ -4798,10 +4833,10 @@ Ein WebSocket kann in HTML5, mit einer JavaScript Zeile, geöffnet werden:
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9000/weechat");
+websocket = new WebSocket("ws://example.com:9500/weechat");
 ----
 
-Der Port (im Beispiel: 9000) ist der Port der in der Relay Erweiterung angegeben wurde.
+Der Port (im Beispiel: 9500) ist der Port der in der Relay Erweiterung angegeben wurde.
 
 Die URI muss mit „/weechat“ für die Protokolle _irc_ und _weechat_ und mit „/api“
 für das Protokoll _api_ enden.
@@ -4824,8 +4859,9 @@ andere Ports nicht geöffnet werden können.
 
 OpenSSH nutzen:
 
+[source,shell]
 ----
-$ ssh -L 9000:.weechat/relay_socket user@hostname
+ssh -L 9000:.weechat/relay_socket user@hostname
 ----
 
 Dies leitet lokale relay Client Verbindungen von Port 9000 um, zu
@@ -4913,34 +4949,39 @@ einige Beispiele:
 
 * Ändert den eigenen Nick auf dem IRC Server libera in "newnick":
 
+[source,shell]
 ----
-$ echo 'irc.server.libera */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.server.libera */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Schickt eine Nachrich in den IRC #weechat Channel:
 
+[source,shell]
 ----
-$ echo 'irc.libera.#weechat *hello!' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.libera.#weechat *hello!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Sendet eine mehrzeilige Nachricht in den IRC Kanal #test, wenn die Fähigkeit "draft/multiline"
   auf dem Ergo Server aktiviert ist:
 
+[source,shell]
 ----
-$ echo 'irc.ergo.#test \hello\n...on two lines!' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.ergo.#test \hello\n...on two lines!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Schickt eine Nachricht in den aktuellen Buffer:
 
+[source,shell]
 ----
-$ echo '*hello!' >/run/user/1000/weechat/weechat_fifo_12345
+echo '*hello!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Sendet zwei Befehle um alle Python-Skripten zu entfernen und dann neu zu laden (die beiden Befehle müssen
   mit "\n" getrennt werden):
 
+[source,shell]
 ----
-$ printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
+printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 [[fifo_commands]]
@@ -5858,7 +5899,7 @@ Aus Datenschutzgründen ist das Herunterladen von Skripten standardmäßig deakt
 Um es zu aktivieren, geben Sie diesen Befehl ein:
 
 ----
-/set script.scripts.download_enabled on
+/script enable
 ----
 
 Dann können Sie die Liste der Skripte herunterladen und in einem separaten Buffer,
@@ -5868,33 +5909,33 @@ mit dem Befehl <<command_script_script,/script>>, anzeigen lassen:
 :x: *
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│368/368 scripts (filter: {x}) | Sort: i,p,n | Alt+key/input: i=install, r=remove, l=load, L=reload, u=│
+│1.weechat│322/322 Skripten (Filter: {x}) | Sortierung: i,p,n | Alt+Taste/Eingabe: i=installieren, r=entfernen,>>│
-│2.scripts│{x}      autosort.py                 3.9     2020-10-11 | Automatically keep buffers grouped by server│
+│2.scripts│{x}      autosort.py                     3.10    2023-12-31 | Behält die Gruppierung der Buffer nach S│
-│         │{x}      multiline.pl                0.6.3   2016-01-02 | Multi-line edit box, also supports editing o│
+│         │{x}      highmon.pl                      2.7     2020-06-21 | Startet einen Highlight Monitor Buffer. │
-│         │{x}      highmon.pl                  2.7     2020-06-21 | Adds a highlight monitor buffer.            │
+│         │{x}ia r  grep.py                   0.8.6 0.8.6   2022-11-11 | Sucht nach regulären Ausdrücken in Buffe│
-│         │##{x}ia r  grep.py               0.8.5 0.8.5   2021-05-11 | Search regular expression in buffers or log ##│
+│         │{x}      colorize_nicks.py               32      2023-10-30 | Im Textbereich oder der Eingabezeile wir│
-│         │{x}      autojoin.py                 0.3.1   2019-10-06 | Configure autojoin for all servers according│
+│         │##{x}ia r  go.py                     3.0.1 3.0.1   2024-05-30 | Schneller Wechsel zu Buffern.           ##│
-│         │{x}      colorize_nicks.py           28      2021-03-06 | Use the weechat nick colors in the chat area│
+│         │       aesthetic.py                    1.0.6   2020-10-25 | Macht Nachrichten Ä S T H E T I S C H an│
-│         │{x}ia r  go.py                 2.7   2.7     2021-05-26 | Quick jump to buffers.                      │
+│         │       aformat.py                      0.2     2018-06-21 | Alternative Textformatierung, nützlich f│
-│         │{x}      text_item.py                0.9     2019-05-25 | Add bar items with plain text.              │
+│         │       alternatetz.py                  0.4     2022-01-25 | Fügt der Bar-Item eine zusätzliche Zeitz│
-│         │       aesthetic.py                1.0.6   2020-10-25 | Make messages more A E S T H E T I C A L L Y│
+│         │       amarok2.pl                      0.7     2012-05-08 | Fernbedienung für Amarok2 und zum anzeig│
-│         │       aformat.py                  0.2     2018-06-21 | Alternate text formatting, useful for relays│
+│         │       amqp_notify.rb                  0.1     2011-01-12 | Schickt private Nachrichten und Highligh│
-│         │       alternatetz.py              0.3     2018-11-11 | Add an alternate timezone item.             │
+│         │       announce_url_title.py           19      2021-06-05 | Schickt einen URL Titel an einen User od│
-│         │       amarok2.pl                  0.7     2012-05-08 | Amarok 2 control and now playing script.    │
+│         │       anotify.py                      1.0.2   2020-05-16 | Benachrichtigung von privaten Nachrichte│
-│         │       amqp_notify.rb              0.1     2011-01-12 | Send private messages and highlights to an A│
+│         │       anti_password.py                1.2.1   2021-03-13 | Verhindert, dass ein Kennwort versehentl│
-│         │       announce_url_title.py       19      2021-06-05 | Announce URL title to user or to channel.   │
+│         │       apply_corrections.py            1.3     2018-06-21 | Zeigt den korrigierten Text an wenn der │
-│         │       anotify.py                  1.0.2   2020-05-16 | Notifications of private messages, highlight│
+│         │       arespond.py                     0.1.2   2022-01-25 | Anfragen werden automatisch beantwortet.│
-│         │       anti_password.py            1.2.1   2021-03-13 | Prevent a password from being accidentally s│
+│         │       atcomplete.pl                   0.001   2016-10-29 | Fügt "@" Präfix bei der Nick Tab-Vervoll│
-│         │       apply_corrections.py        1.3     2018-06-21 | Display corrected text when user sends s/typ│
+│         │       audacious.pl                    0.3     2009-05-03 | Zeigt an welche Musik gerade von Audacio│
-│         │       arespond.py                 0.1.1   2020-10-11 | Simple autoresponder.                       │
+│         │       auth.rb                         0.3     2014-05-30 | Automatische Authentifizierung mittels S│
-│         │       atcomplete.pl               0.001   2016-10-29 | Tab complete nicks when prefixed with "@".  │
+│         │       auto_away.py                    0.4     2018-11-11 | Ein einfaches Abwesenheit-Skript.       │
-│         │       audacious.pl                0.3     2009-05-03 | Display which song Audacious is currently pl│
+│         │       autoauth.py                     1.3     2021-11-07 | Erlaubt automatische Authentisierung, we│
-│         │       auth.rb                     0.3     2014-05-30 | Automatically authenticate with NickServ usi│
+│         │       autobump.py                     0.1.0   2019-06-14 | Springt zu Buffern nach deren Aktivität.│
-│         │       auto_away.py                0.4     2018-11-11 | A simple auto-away script.                  │
+│         │       autoconf.py                     0.4     2021-05-11 | Automatisches speichern/laden von Option│
-│         │       autoauth.py                 1.3     2021-11-07 | Permits to auto-authenticate when changing n│
+│         │       autoconnect.py                  0.3.3   2019-10-06 | Öffnet erneut die Server und Channel die│
-│         │       autobump.py                 0.1.0   2019-06-14 | Bump buffers upon activity.                 │
+│         │       autojoin_on_invite.py           0.9     2022-10-25 | Betritt automatisch einen Kanal wenn man│
-│         │       autoconf.py                 0.4     2021-05-11 | Auto save/load changed options in a .weerc f│
+│         │       automarkbuffer.py               1.0     2015-03-31 | Buffer werden als gelesen markiert falls│
-│         │       autoconnect.py              0.3.3   2019-10-06 | Reopen servers and channels opened last time│
+│         │       automerge.py                    0.2     2018-03-03 | Automatische Zusammenführung neuer Buffe│
 │         │[12:55] [2] [script] 2:scripts                                                                      │
 │         │█                                                                                                   │
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

doc/docinfo.html

@@ -198,6 +198,10 @@ mark {
 
 /* syntax highlighting tuning */
 
+pre.pygments {
+  color: #ddd !important;
+}
+
 pre.pygments .tok-cp {
   color: #44cfaf;
 }

doc/en/includes/attributes-en.adoc

@@ -0,0 +1,23 @@
+// English translation, for reference only; matches the built-in behavior of core
+:appendix-caption: Appendix
+:appendix-refsig: {appendix-caption}
+:caution-caption: Caution
+:chapter-signifier: Chapter
+:chapter-refsig: {chapter-signifier}
+:example-caption: Example
+:figure-caption: Figure
+:important-caption: Important
+:last-update-label: Last updated
+ifdef::listing-caption[:listing-caption: Listing]
+ifdef::manname-title[:manname-title: Name]
+:note-caption: Note
+:part-signifier: Part
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Preface]
+:section-refsig: Section
+:table-caption: Table
+:tip-caption: Tip
+:toc-title: Table of Contents
+:untitled-label: Untitled
+:version-label: Version
+:warning-caption: Warning

doc/en/includes/cmdline_options.en.adoc

@@ -35,6 +35,9 @@
 *-h*, *--help*::
     Display help.
 
+*-i*, *--build-info*::
+    Display build information and exit.
+
 *-l*, *--license*::
     Display WeeChat license.
 

doc/en/includes/man.en.adoc

@@ -98,7 +98,7 @@ $HOME/.local/share/weechat/weechat.log::
 
 // tag::copyright[]
 WeeChat is written by Sébastien Helleu and contributors (complete list is in
-the AUTHORS.adoc file).
+the AUTHORS.md file).
 
 Copyright (C) 2003-2024 {author}
 

doc/en/includes/relay.en.adoc

@@ -0,0 +1,18 @@
+// tag::diagram[]
+....
+                                              ┌──────────┐ Workstation
+ ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
+ │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS, …)
+ └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
+   ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Mobile device
+ ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone, …)
+ │ jabber │◄──┘  ╚═══════════╧═══════╝    │      ......
+ └────────┘                               │   ┌──────────┐
+   ......                                 └───┤ client N │ Other devices
+                                              └──────────┘
+
+
+└────────────┘   └───────────────────┘╘══════╛└────────────────────────────────┘
+network servers    ncurses interface    relay         remote interfaces
+....
+// end::diagram[]

doc/en/weechat_dev.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 This manual documents WeeChat chat client, it is part of WeeChat.
 
@@ -326,6 +327,7 @@ WeeChat "core" is located in following directories:
 |    relay/                          | Relay plugin (IRC proxy and relay for remote interfaces).
 |       relay.c                      | Main relay functions.
 |       relay-auth.c                 | Clients authentication.
+|       relay-bar-item.c             | Relay bar items.
 |       relay-buffer.c               | Relay buffer.
 |       relay-client.c               | Clients of relay.
 |       relay-command.c              | Relay commands.
@@ -422,10 +424,11 @@ WeeChat "core" is located in following directories:
 |          test-core-crypto.cpp              | Tests: cryptographic functions.
 |          test-core-dir.cpp                 | Tests: directory/file functions.
 |          test-core-eval.cpp                | Tests: evaluation of expressions.
-|          test-core-hashtble.cpp            | Tests: hashtables.
+|          test-core-hashtable.cpp           | Tests: hashtables.
 |          test-core-hdata.cpp               | Tests: hdata.
 |          test-core-hook.cpp                | Tests: hooks.
 |          test-core-infolist.cpp            | Tests: infolists.
+|          test-core-input.cpp               | Tests: input functions.
 |          test-core-list.cpp                | Tests: lists.
 |          test-core-network.cpp             | Tests: network functions.
 |          test-core-secure.cpp              | Tests: secured data.
@@ -502,6 +505,7 @@ WeeChat "core" is located in following directories:
 |          relay/                            | Root of unit tests for Relay plugin.
 |             test-relay-auth.cpp            | Tests: clients authentication.
 |             test-relay-http.cpp            | Tests: HTTP functions for Relay plugin.
+|             test-relay-raw.cpp             | Tests: raw messages functions for Relay plugin.
 |             test-relay-remote.cpp          | Tests: remote functions for Relay plugin.
 |             test-relay-websocket.cpp       | Tests: websocket functions for Relay plugin.
 |             api/                           | Root of unit tests for Relay "api" protocol.
@@ -531,7 +535,8 @@ Documentation files:
 |       weechat_faq.XX.adoc                     | link:weechat_faq.en.html[FAQ ^↗^^].
 |       weechat_plugin_api.XX.adoc              | link:weechat_plugin_api.en.html[Plugin API reference ^↗^^].
 |       weechat_quickstart.XX.adoc              | link:weechat_quickstart.en.html[Quickstart guide ^↗^^].
-|       weechat_relay_protocol.XX.adoc          | link:weechat_relay_protocol.en.html[Relay protocol ^↗^^] (for remote interfaces).
+|       weechat_relay_api.XX.adoc               | link:weechat_relay_api.en.html[Relay "api" protocol ^↗^^] (for remote interfaces).
+|       weechat_relay_weechat.XX.adoc           | link:weechat_relay_weechat.en.html[Relay "weechat" protocol ^↗^^] (for remote interfaces).
 |       weechat_scripting.XX.adoc               | link:weechat_scripting.en.html[Scripting guide ^↗^^].
 |       weechat_user.XX.adoc                    | link:weechat_user.en.html[User's guide ^↗^^].
 |       includes/                               | Files included in documentation.
@@ -1045,16 +1050,16 @@ _src/gui/gui-color.h_):
 | 14   | weechat.color.chat_nick
 | 15   | weechat.color.chat_nick_self
 | 16   | weechat.color.chat_nick_other
-| 17   | _(not used any more since WeeChat 0.3.4)_
+| 17   | _(not used anymore since WeeChat 0.3.4)_
-| 18   | _(not used any more since WeeChat 0.3.4)_
+| 18   | _(not used anymore since WeeChat 0.3.4)_
-| 19   | _(not used any more since WeeChat 0.3.4)_
+| 19   | _(not used anymore since WeeChat 0.3.4)_
-| 20   | _(not used any more since WeeChat 0.3.4)_
+| 20   | _(not used anymore since WeeChat 0.3.4)_
-| 21   | _(not used any more since WeeChat 0.3.4)_
+| 21   | _(not used anymore since WeeChat 0.3.4)_
-| 22   | _(not used any more since WeeChat 0.3.4)_
+| 22   | _(not used anymore since WeeChat 0.3.4)_
-| 23   | _(not used any more since WeeChat 0.3.4)_
+| 23   | _(not used anymore since WeeChat 0.3.4)_
-| 24   | _(not used any more since WeeChat 0.3.4)_
+| 24   | _(not used anymore since WeeChat 0.3.4)_
-| 25   | _(not used any more since WeeChat 0.3.4)_
+| 25   | _(not used anymore since WeeChat 0.3.4)_
-| 26   | _(not used any more since WeeChat 0.3.4)_
+| 26   | _(not used anymore since WeeChat 0.3.4)_
 | 27   | weechat.color.chat_host
 | 28   | weechat.color.chat_delimiters
 | 29   | weechat.color.chat_highlight
@@ -1170,7 +1175,7 @@ server->hook_timer_sasl = weechat_hook_timer (timeout * 1000,
 
 Git repository is on https://github.com/weechat/weechat[GitHub ^↗^^].
 
-Any patch for bug or new feature must be done on master branch, preferred way
+Any patch for bug or new feature must be done on branch `main`, preferred way
 is a GitHub pull request. A patch can also be sent by e-mail
 (made with `git diff` or `git format-patch`).
 
@@ -1187,15 +1192,15 @@ Where _component_ is one of following:
 | Component | Files | Description
 
 | core
-| AUTHORS.adoc +
+| AUTHORS.md +
-  ChangeLog.adoc +
+  CHANGELOG.md +
-  Contributing.adoc +
+  CONTRIBUTING.md +
   .github/FUNDING.yml +
   .github/ISSUE_TEMPLATE/* +
   icons/* +
   po/* +
-  README.adoc +
+  README.md +
-  ReleaseNotes.adoc +
+  UPGRADING.md +
   src/core/* +
   src/gui/* +
   version.sh +
@@ -1252,8 +1257,9 @@ Where _component_ is one of following:
 | Plugin API reference
 
 | doc/relay
-| doc/xx/weechat_relay_protocol.xx.adoc
+| doc/xx/weechat_relay_api.xx.adoc +
-| Relay protocol
+  doc/xx/weechat_relay_weechat.xx.adoc
+| Relay protocols
 
 | doc/dev
 | doc/xx/weechat_dev.en.adoc
@@ -1297,9 +1303,10 @@ Gettext files are in directory _po/_.
 If you want to initialize a new language, use command `msginit`. For example to
 create a file which is ready to translate to Dutch:
 
+[source,shell]
 ----
-$ cd po
+cd po
-$ msginit -i weechat.pot -l nl_NL -o nl.po
+msginit -i weechat.pot -l nl_NL -o nl.po
 ----
 
 Base language for WeeChat is English, so you must of course perfectly understand
@@ -1308,8 +1315,9 @@ English in order to translate to your language.
 After changes in sources, you can regenerate all translations files: run this
 command in the CMake "build" directory:
 
+[source,shell]
 ----
-$ make translations && make update-po
+make translations && make update-po
 ----
 
 Then you can edit .po files (if you can translate in a language).
@@ -1317,8 +1325,9 @@ Then you can edit .po files (if you can translate in a language).
 When done, you *have* to check your file with
 https://github.com/flashcode/msgcheck[msgcheck ^↗^^]:
 
+[source,shell]
 ----
-$ msgcheck.py xx.po
+msgcheck.py xx.po
 ----
 
 And then you can recompile WeeChat to use the new translations.
@@ -1355,5 +1364,5 @@ warnings, ... These words must be kept unchanged:
 When there is a name after `+<<link_name>>+`, then you must translate it:
 
 ----
-<<link_name,this text must be translated>>
+<<link_name,this text should be translated>>
 ----

doc/en/weechat_faq.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 [[general]]
 == General
@@ -48,12 +49,14 @@ If you still have issues, please report them to the developers.
 It is recommended to use https://brew.sh/[Homebrew ^↗^^],
 you can get help with:
 
+[source,shell]
 ----
 brew info weechat
 ----
 
 You can install WeeChat with this command:
 
+[source,shell]
 ----
 brew install weechat
 ----
@@ -266,7 +269,7 @@ for more info about the hotlist.
 [[input_bar_size]]
 === How to use command line with more than one line?
 
-The option _size_ in input bar can be set to a value higher than 1 (for fixed
+The option _size_ in input bar can be set to a value greater than 1 (for fixed
 size, default size is 1) or 0 for dynamic size, and then option _size_max_ will
 set the max size (0 = no limit).
 
@@ -313,10 +316,14 @@ You can use a terminal with rectangular selection (like rxvt-unicode,
 konsole, gnome-terminal, etc.). Key is usually kbd:[Ctrl] + kbd:[Alt] + mouse
 selection.
 
+You can toggle nicklist and make it visible only when needed, with key
+kbd:[Alt+Shift+N].
+
 Another solution is to move nicklist to top or bottom, for example:
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 [[urls]]
@@ -326,10 +333,13 @@ You can use the bare display (default key: kbd:[Alt+l] (`L`)).
 
 To make opening URLs easier, you can:
 
+* toggle nicklist and make it visible only when needed, with key kbd:[Alt+Shift+N]
+
 * move nicklist to top:
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 * disable alignment for multiline words:
@@ -379,6 +389,7 @@ There is no option in WeeChat to change the timezone, the environment variable
 
 In your shell initialization file or on command line, before starting WeeChat:
 
+[source,shell]
 ----
 export TZ=America/New_York
 ----
@@ -682,16 +693,18 @@ According to terminfo used, mouse may not be supported.
 
 You can test mouse support in terminal:
 
+[source,shell]
 ----
-$ printf '\033[?1002h'
+printf '\033[?1002h'
 ----
 
 And then click on first char of terminal (upper left). You should see " !!#!!".
 
 To disable mouse in terminal:
 
+[source,shell]
 ----
-$ printf '\033[?1002l'
+printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -746,7 +759,7 @@ should be, you can specify the fingerprint (SHA-512, SHA-256 or SHA-1):
 You can try a different priority string, replace "xxx" by your server name:
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -993,14 +1006,15 @@ for help).
 Scripts are not compatible with other IRC clients.
 
 [[scripts_update]]
-=== The command "/script update" can not read scripts, how to fix that?
+=== The command "/script update" cannot read scripts, how to fix that?
 
 First check questions about TLS connection in this FAQ.
 
 If still not working, try to manually delete the scripts file (in your shell):
 
+[source,shell]
 ----
-$ rm ~/.cache/weechat/script/plugins.xml.gz
+rm ~/.cache/weechat/script/plugins.xml.gz
 ----
 
 [NOTE]
@@ -1024,15 +1038,17 @@ have to update manually the file yourself to get updates):
 
 * in your shell, with curl installed:
 
+[source,shell]
 ----
-$ cd ~/.cache/weechat/script
+cd ~/.cache/weechat/script
-$ curl -O https://weechat.org/files/plugins.xml.gz
+curl -O https://weechat.org/files/plugins.xml.gz
 ----
 
 If you're running macOS and the downloaded file has a size of 0 bytes,
 try to set this variable in your shell initialization file or on command line,
 before starting WeeChat:
 
+[source,shell]
 ----
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 ----
@@ -1202,6 +1218,7 @@ See https://weechat.org/about/support/[this page ^↗^^].
 
 When you run WeeChat under gdb, you may have this error:
 
+[source,shell]
 ----
 $ gdb /path/to/weechat
 (gdb) run
@@ -1212,6 +1229,7 @@ Cannot find new threads: generic error
 To fix that, you can run gdb with this command (replace path to libpthread and
 WeeChat with paths on your system):
 
+[source,shell]
 ----
 $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 (gdb) run
@@ -1220,7 +1238,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 [[supported_os]]
 === What is the list of supported platforms for WeeChat? Will it be ported to other operating systems?
 
-WeeChat runs fine on most Linux/BSD distributions, GNU/Hurd, Mac OS and Windows
+WeeChat runs fine on most Linux/BSD distributions, GNU/Hurd, macOS and Windows
 (Cygwin and Windows Subsystem for Linux).
 
 We do our best to run on as many platforms as possible. Help is welcome for

doc/en/weechat_plugin_api.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 This manual documents WeeChat chat client, it is part of WeeChat.
 
@@ -165,9 +166,10 @@ required.
 
 To compile a plugin which has one file "toto.c" (under GNU/Linux):
 
+[source,shell]
 ----
-$ gcc -fPIC -Wall -c toto.c
+gcc -fPIC -Wall -c toto.c
-$ gcc -shared -fPIC -o toto.so toto.o
+gcc -shared -fPIC -o toto.so toto.o
 ----
 
 [[load_plugin]]
@@ -636,7 +638,7 @@ Arguments:
 
 * _string_: string to cut
 * _length_: max chars
-* _count_suffix_: if 1, the length of suffix is counter in the max length
+* _count_suffix_: if 1, the length of suffix is counted in the max length
 * _screen_: if 1, the cut is based on width of chars displayed
 * _cut_suffix_: the suffix added after the string if it is cut
 
@@ -816,7 +818,7 @@ This function is not available in scripting API.
 
 _WeeChat ≥ 3.8._
 
-Case sensitive string comparison.
+Case-sensitive string comparison.
 
 Prototype:
 
@@ -852,7 +854,7 @@ This function is not available in scripting API.
 
 _WeeChat ≥ 3.8._
 
-Case sensitive string comparison, for _max_ chars.
+Case-sensitive string comparison, for _max_ chars.
 
 Prototype:
 
@@ -889,7 +891,7 @@ This function is not available in scripting API.
 
 _Updated in 1.0, 3.8._
 
-Case insensitive string comparison.
+Case-insensitive string comparison.
 
 [NOTE]
 Behavior has changed in version 3.8: now all uppercase letters are properly
@@ -978,7 +980,7 @@ This function is not available in scripting API.
 
 _Updated in 1.0, 3.8._
 
-Case insensitive string comparison, for _max_ chars.
+Case-insensitive string comparison, for _max_ chars.
 
 [NOTE]
 Behavior has changed in version 3.8: now all uppercase letters are properly
@@ -1083,7 +1085,7 @@ Arguments:
 * _string1_: first string for comparison
 * _string2_: second string for comparison
 * _chars_ignored_: string with chars to ignored
-* _case_sensitive_: 1 for case sensitive comparison, otherwise 0
+* _case_sensitive_: 1 for case-sensitive comparison, otherwise 0
 
 [NOTE]
 Behavior has changed in version 3.8 when _case_sensitive_ is set to 0: now all
@@ -1093,7 +1095,7 @@ uppercase letters are properly converted to lowercase (by calling function
 Return value:
 
 * arithmetic result of subtracting the last compared UTF-8 char in
-  _string2_ (converted to lowercase if _case_sentitive_ is set to 0) from the last
+  _string2_ (converted to lowercase if _case_sensitive_ is set to 0) from the last
   compared UTF-8 char in _string1_ (converted to lowercase if _case_sensitive_ is
   set to 0):
 ** < 0 if string1 < string2
@@ -1114,7 +1116,7 @@ This function is not available in scripting API.
 
 _Updated in 1.3, 3.8._
 
-Case insensitive string search.
+Case-insensitive string search.
 
 [NOTE]
 Behavior has changed in version 3.8: now all uppercase letters are properly
@@ -1209,7 +1211,7 @@ Arguments:
 * _string_: string
 * _mask_: mask with wildcards (`+*+`), each wildcard matches 0 or more chars in
   the string
-* _case_sensitive_: 1 for case sensitive comparison, otherwise 0
+* _case_sensitive_: 1 for case-sensitive comparison, otherwise 0
 
 [NOTE]
 Since version 1.0, wildcards are allowed inside the mask
@@ -1271,7 +1273,7 @@ Arguments:
 * _string_: string
 * _masks_: list of masks, with a NULL after the last mask in list; each mask
   is compared to the string with the function <<_string_match,string_match>>
-* _case_sensitive_: 1 for case sensitive comparison, otherwise 0
+* _case_sensitive_: 1 for case-sensitive comparison, otherwise 0
 
 [NOTE]
 Behavior has changed in version 3.8 when _case_sensitive_ is set to 0: now all
@@ -1597,7 +1599,7 @@ Flags must be at beginning of regular expression. Format is:
 Allowed flags are:
 
 * _e_: POSIX extended regular expression (_REG_EXTENDED_)
-* _i_: case insensitive (_REG_ICASE_)
+* _i_: case-insensitive (_REG_ICASE_)
 * _n_: match-any-character operators don't match a newline (_REG_NEWLINE_)
 * _s_: support for substring addressing of matches is not required (_REG_NOSUB_)
 
@@ -2616,8 +2618,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"
 
 ==== string_eval_expression
 
-_WeeChat ≥ 0.4.0, updated in 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0,
+_WeeChat ≥ 0.4.0, updated in 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0, 2.2, 2.3, 2.7, 2.9, 3.1, 3.2, 3.3, 3.4, 3.6, 3.8, 4.0.0, 4.2.0, 4.3.0, 4.4.0._
-2.2, 2.3, 2.7, 2.9, 3.1, 3.2, 3.3, 3.4, 3.6, 3.8, 4.0.0, 4.2.0, 4.3.0._
 
 Evaluate an expression and return result as a string.
 Special variables with format `+${variable}+` are expanded (see table below).
@@ -2791,7 +2792,7 @@ from first used to last):
   == `+1+`
 
 | `+==*+` | 2.9
-| Is matching mask where "*" is allowed, case sensitive (see function <<_string_match,string_match>>)
+| Is matching mask where "*" is allowed, case-sensitive (see function <<_string_match,string_match>>)
 | >> `+abc def ==* a*f+` +
   == `+1+` +
   +
@@ -2799,7 +2800,7 @@ from first used to last):
   == `+0+`
 
 | `+!!*+` | 2.9
-| Is NOT wildcard mask where "*" is allowed, case sensitive (see function <<_string_match,string_match>>)
+| Is NOT wildcard mask where "*" is allowed, case-sensitive (see function <<_string_match,string_match>>)
 | >> `+abc def !!* a*f+` +
   == `+0+` +
   +
@@ -2807,7 +2808,7 @@ from first used to last):
   == `+1+`
 
 | `+=*+` | 1.8
-| Is matching mask where "*" is allowed, case insensitive (see function <<_string_match,string_match>>)
+| Is matching mask where "*" is allowed, case-insensitive (see function <<_string_match,string_match>>)
 | >> `+abc def =* A*F+` +
   == `+1+` +
   +
@@ -2815,7 +2816,7 @@ from first used to last):
   == `+0+`
 
 | `+!*+` | 1.8
-| Is NOT wildcard mask where "*" is allowed, case insensitive (see function <<_string_match,string_match>>)
+| Is NOT wildcard mask where "*" is allowed, case-insensitive (see function <<_string_match,string_match>>)
 | >> `+abc def !* A*F+` +
   == `+0+` +
   +
@@ -2823,7 +2824,7 @@ from first used to last):
   == `+1+`
 
 | `+==-+` | 2.9
-| Is included, case sensitive
+| Is included, case-sensitive
 | >> `+abc def ==- bc+` +
   == `+1+` +
   +
@@ -2831,7 +2832,7 @@ from first used to last):
   == `+0+`
 
 | `+!!-+` | 2.9
-| Is NOT included, case sensitive
+| Is NOT included, case-sensitive
 | >> `+abc def !!- bc+` +
   == `+0+` +
   +
@@ -2839,7 +2840,7 @@ from first used to last):
   == `+1+`
 
 | `+=-+` | 2.9
-| Is included, case insensitive
+| Is included, case-insensitive
 | >> `+abc def =- BC+` +
   == `+1+` +
   +
@@ -2847,7 +2848,7 @@ from first used to last):
   == `+0+`
 
 | `+!-+` | 2.9
-| Is NOT included, case insensitive
+| Is NOT included, case-insensitive
 | >> `+abc def !- BC+` +
   == `+0+` +
   +
@@ -3332,6 +3333,12 @@ expanded to last):
 | >> `+${define:len,${calc:5+3}}${len}x${len}+` +
   == `+8x8+`
 
+| `+${hdata_count:name[list]}+` +
+  `+${hdata_count:name[pointer]}+` | 4.4.0
+| Number of items in a hdata list or starting at `pointer`.
+| >> `+${hdata_count:buffer[gui_buffers]}+` +
+  == `+15+`
+
 | `+${sec.data.name}+` |
 | Value of the secured data `name`.
 | >> `+${sec.data.libera_pass}+` +
@@ -3995,7 +4002,7 @@ Arguments:
 
 Return value:
 
-* real potision (in bytes)
+* real position (in bytes)
 
 C example:
 
@@ -5808,7 +5815,7 @@ Hashtable functions.
 
 ==== hashtable_new
 
-_WeeChat ≥ 0.3.3._
+_WeeChat ≥ 0.3.3, updated in 4.4.0._
 
 Create a new hashtable.
 
@@ -5837,12 +5844,14 @@ Arguments:
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
+** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 * _type_values_: type for values in hashtable:
 ** _WEECHAT_HASHTABLE_INTEGER_
 ** _WEECHAT_HASHTABLE_STRING_
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
+** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 * _callback_hash_key_: callback used to "hash" a key (key as integer value), can
   be NULL if key type is not "buffer" (a default hash function is used),
   arguments and return value:
@@ -6203,12 +6212,14 @@ Arguments:
 *** _pointer_: pointer
 *** _buffer_: buffer
 *** _time_: time
+*** _longlong_: long long integer
 ** _type_values_: type for values:
 *** _integer_: integer
 *** _string_: string
 *** _pointer_: pointer
 *** _buffer_: buffer
 *** _time_: time
+*** _longlong_: long long integer
 ** _keys_: string with list of keys (format: "key1,key2,key3")
 ** _keys_sorted_: string with list of sorted keys (format: "key1,key2,key3")
 ** _values_: string with list of values (format: "value1,value2,value3")
@@ -6956,7 +6967,7 @@ my_section_delete_option_cb (const void *pointer, void *data,
     /* return WEECHAT_CONFIG_OPTION_UNSET_ERROR; */
 }
 
-/* standard section, user can not add/delete options */
+/* standard section, user cannot add/delete options */
 struct t_config_section *new_section1 =
     weechat_config_new_section (config_file, "section1", 0, 0,
                                 NULL, NULL, NULL,
@@ -8111,7 +8122,7 @@ def config_boolean_inherited(option: str) -> int: ...
 
 # example
 option = weechat.config_get("irc.server.libera.autoconnect")
-autoconect = weechat.config_boolean_inherited(option)
+autoconnect = weechat.config_boolean_inherited(option)
 ----
 
 ==== config_integer
@@ -9412,7 +9423,7 @@ _WeeChat ≥ 0.3.6, updated in 2.0._
 
 Remove key binding(s).
 
-[WARNING]
+[CAUTION]
 When calling this function, ensure that you will not remove a user key binding.
 
 Prototype:
@@ -9999,7 +10010,7 @@ C examples:
 [source,c]
 ----
 /* hook modifier with priority = 2000 */
-/* high priority: called before other modifier calbacks */
+/* high priority: called before other modifier callbacks */
 weechat_hook_modifier ("2000|input_text_display", &modifier_cb, NULL, NULL);
 
 /* hook two signals with priority = 3000 */
@@ -10465,7 +10476,7 @@ Arguments:
 * _flag_read_: 1 = catch read event, 0 = ignore
 * _flag_write_: 1 = catch write event, 0 = ignore
 * _flag_exception_: 1 = catch exception event, 0 = ignore
-  (_WeeChat ≥ 1.3_: this argument is ignored and not used any more)
+  (_WeeChat ≥ 1.3_: this argument is ignored and not used anymore)
 * _callback_: function called a selected event occurs for file (or socket),
   arguments and return value:
 ** _const void *pointer_: pointer
@@ -10529,7 +10540,7 @@ _Updated in 1.5._
 Hook a process (launched with fork), and catch output.
 
 [NOTE]
-Since version 0.3.9.2, the shell is not used any more to execute the command.
+Since version 0.3.9.2, the shell is not used anymore to execute the command.
 WeeChat makes an automatic split of the command and its arguments (like the
 shell does). +
 If the split is not correct (according to quotes in your command), or if you
@@ -11116,7 +11127,7 @@ hook2 = weechat.hook_url("http://localhost:8080/", options, 20000, "my_url_cb",
 
 ==== hook_connect
 
-_Updated in 1.5, 2.0._
+_Updated in 1.5, 2.0, 4.4.0._
 
 Hook a connection (background connection to a remote host).
 
@@ -11151,7 +11162,10 @@ Arguments:
   without proxy)
 * _address_: name or IP address to connect to
 * _port_: port number
-* _ipv6_: 1 to use IPv6 (with fallback to IPv4), 0 to use only IPv4
+* _ipv6_:
+** `WEECHAT_HOOK_CONNECT_IPV6_DISABLE` ^(1)^: disable IPv6 (use only IPv4)
+** `WEECHAT_HOOK_CONNECT_IPV6_AUTO` ^(1)^: use IPv6 with fallback to IPv4
+** `WEECHAT_HOOK_CONNECT_IPV6_FORCE` ^(1)^: force IPv6 (do not use IPv4) _(WeeChat ≥ 4.4.0)_
 * _retry_: retry count, used to fallback to IPv4 hosts if IPv6 hosts connect
   but then fail to accept the client
 * _gnutls_sess_: GnuTLS session (optional)
@@ -11171,7 +11185,7 @@ Arguments:
   return value:
 ** _const void *pointer_: pointer
 ** _void *data_: pointer
-** _int status_: connection status:
+** _int status_: connection status ^(2)^:
 *** _WEECHAT_HOOK_CONNECT_OK_: connection OK
 *** _WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND_: address not found
 *** _WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND_: IP address not found
@@ -11183,8 +11197,8 @@ Arguments:
 *** _WEECHAT_HOOK_CONNECT_MEMORY_ERROR_: insufficient memory
 *** _WEECHAT_HOOK_CONNECT_TIMEOUT_: timeout
 *** _WEECHAT_HOOK_CONNECT_SOCKET_ERROR_: unable to create socket
-** _gnutls_rc_: return value of _gnutls_handshake()_
+** _gnutls_rc_: return value of _gnutls_handshake()_ ^(2)^
-** _sock_: socket used to connect
+** _sock_: socket used to connect ^(2)^
 ** _const char *error_: return value of _gnutls_strerror(gnutls_rc)_
 ** _const char *ip_address_: IP address found
 ** return value:
@@ -11195,16 +11209,19 @@ Arguments:
   if not NULL, it must have been allocated with malloc (or similar function)
   and it is automatically freed when the hook is deleted
 
-Return value:
+[NOTE]
-
+^(1)^ Constants for parameter _ipv6_ are available since WeeChat 4.4.0. +
-* pointer to new hook, NULL if error occurred
+For older releases, allowed values are `1` (use IPv6 with fallback to IPv4) and
-
+`0` (disable IPv6, use only IPv4). +
-[IMPORTANT]
+^(2)^ In scripts, with WeeChat ≥ 2.0, the callback arguments _status_, _gnutls_rc_
-In scripts, with WeeChat ≥ 2.0, the callback arguments _status_, _gnutls_rc_
 and _sock_ are integers (with WeeChat ≤ 1.9, they were strings). +
 To be compatible with all versions, it is recommended to convert the argument
 to integer before using it, for example in Python: `int(sock)`.
 
+Return value:
+
+* pointer to new hook, NULL if error occurred
+
 C example:
 
 [source,c]
@@ -11254,7 +11271,8 @@ my_connect_cb (const void *pointer, void *data, int status, int gnutls_rc,
 
 struct t_hook *my_connect_hook = weechat_hook_connect (NULL,
                                                        "my.server.org", 1234,
-                                                       1, 0,
+                                                       WEECHAT_HOOK_CONNECT_IPV6_AUTO,
+                                                       0,
                                                        NULL, NULL, 0,  /* GnuTLS */
                                                        NULL,
                                                        &my_connect_cb, NULL, NULL);
@@ -11270,31 +11288,32 @@ def hook_connect(proxy: str, address: str, port: int, ipv6: int, retry: int, loc
 
 # example
 def my_connect_cb(data: str, status: int, gnutls_rc: int, sock: int, error: str, ip_address: str) -> int:
-    if status == WEECHAT_HOOK_CONNECT_OK:
+    if status == weechat.WEECHAT_HOOK_CONNECT_OK:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_PROXY_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_PROXY_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_TIMEOUT:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
         # ...
     return weechat.WEECHAT_RC_OK
 
-hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
+hook = weechat.hook_connect("", "my.server.org", 1234,
+                            weechat.WEECHAT_HOOK_CONNECT_IPV6_AUTO, 0, "",
                             "my_connect_cb", "")
 ----
 
@@ -11559,7 +11578,7 @@ C example:
 [source,c]
 ----
 int
-my_line_cb (const void *pointer, void *data, struct t_hasbtable *line)
+my_line_cb (const void *pointer, void *data, struct t_hashtable *line)
 {
     struct t_hashtable *hashtable;
 
@@ -12106,6 +12125,10 @@ List of signals sent by WeeChat and plugins:
 | Pointer: line.
 | Line added in a buffer.
 
+| weechat | [[hook_signal_buffer_line_data_changed]] buffer_line_data_changed | 4.4.0
+| Pointer: line data.
+| Line data has been updated in a buffer.
+
 | weechat | [[hook_signal_buffer_lines_hidden]] buffer_lines_hidden |
 | Pointer: buffer.
 | Lines hidden in buffer.
@@ -12150,6 +12173,10 @@ List of signals sent by WeeChat and plugins:
 | Pointer: buffer.
 | Modes of buffer changed.
 
+| weechat | [[hook_signal_buffer_time_for_each_line_changed]] buffer_time_for_each_line_changed | 4.4.0
+| Pointer: buffer.
+| Display time for each line changed.
+
 | weechat | [[hook_signal_buffer_type_changed]] buffer_type_changed |
 | Pointer: buffer.
 | Type of buffer changed.
@@ -12166,7 +12193,7 @@ List of signals sent by WeeChat and plugins:
 | String: text sent to buffer.
 | Text sent to a user buffer as input (sent only for buffers created with `/buffer add`). +
   If the return code of a callback is _WEECHAT_RC_OK_EAT_, then the string "q"
-  can not be used any more to close the buffer.
+  cannot be used anymore to close the buffer.
 
 | weechat | [[hook_signal_buffer_user_closing_xxx]] buffer_user_closing_xxx ^(2)^ | 3.8
 | -
@@ -12260,6 +12287,14 @@ List of signals sent by WeeChat and plugins:
 | String: key combo.
 | Key combo in _cursor_ context.
 
+| weechat | [[hook_signal_layout_buffers_applied]] layout_buffers_applied | 4.4.0
+| String: layout name.
+| Layout applied for buffers.
+
+| weechat | [[hook_signal_layout_windows_applied]] layout_windows_applied | 4.4.0
+| String: layout name.
+| Layout applied for windows.
+
 | weechat | [[hook_signal_mouse_enabled]] mouse_enabled | 1.1
 | -
 | Mouse enabled.
@@ -12453,7 +12488,7 @@ hook = weechat.hook_signal("quit;upgrade", "my_signal_cb", "")
 
 ==== hook_signal_send
 
-_Updated in 1.0._
+_Updated in 1.0, 4.5.0._
 
 Send a signal.
 
@@ -12467,10 +12502,20 @@ int weechat_hook_signal_send (const char *signal, const char *type_data,
 
 Arguments:
 
-* _signal_: signal to send
+* _signal_: signal to send; flags are allowed before the signal name (see below)
+  _(WeeChat ≥ 4.5.0)_
 * _type_data_: type of data sent with signal (see <<_hook_signal,hook_signal>>)
 * _signal_data_: data sent with signal
 
+The signal name can contain flags with the following format: `[flags:xxx,yyy]signal`
+where `xxx` and `yyy` are names of flags, and `signal` the signal name. +
+The following flags are supported:
+
+* _stop_on_error_: exit immediately if a callback returns WEECHAT_RC_ERROR
+  (remaining callbacks are then NOT executed) _(WeeChat ≥ 4.5.0)_
+* _ignore_eat_: consider any callback returning WEECHAT_RC_OK_EAT is in fact
+  WEECHAT_RC_OK and execute remaining callbacks _(WeeChat ≥ 4.5.0)_
+
 Return value _(WeeChat ≥ 1.0)_:
 
 * return code of last callback executed (_WEECHAT_RC_OK_ if no callback was
@@ -12484,6 +12529,8 @@ C example:
 [source,c]
 ----
 int rc = weechat_hook_signal_send ("my_signal", WEECHAT_HOOK_SIGNAL_STRING, my_string);
+int rc2 = weechat_hook_signal_send ("[flags:stop_on_error,ignore_eat]my_signal2",
+                                    WEECHAT_HOOK_SIGNAL_STRING, my_string);
 ----
 
 Script (Python):
@@ -12493,8 +12540,10 @@ Script (Python):
 # prototype
 def hook_signal_send(signal: str, type_data: str, signal_data: str) -> int: ...
 
-# example
+# examples
 rc = weechat.hook_signal_send("my_signal", weechat.WEECHAT_HOOK_SIGNAL_STRING, my_string)
+rc2 = weechat.hook_signal_send("[flags:stop_on_error,ignore_eat]my_signal2",
+                               weechat.WEECHAT_HOOK_SIGNAL_STRING, my_string)
 ----
 
 [[signal_logger_backlog]]
@@ -12779,7 +12828,7 @@ hook = weechat.hook_hsignal("test", "my_hsignal_cb", "")
 
 ==== hook_hsignal_send
 
-_WeeChat ≥ 0.3.4, updated in 1.0._
+_WeeChat ≥ 0.3.4, updated in 1.0, 4.5.0._
 
 Send a hsignal (signal with hashtable).
 
@@ -12792,7 +12841,8 @@ int weechat_hook_hsignal_send (const char *signal, struct t_hashtable *hashtable
 
 Arguments:
 
-* _signal_: signal to send
+* _signal_: signal to send; flags are allowed before the signal name
+  (see function <<_hook_signal_send,hook_signal_send>>) _(WeeChat ≥ 4.5.0)_
 * _hashtable_: hashtable
 
 Return value _(WeeChat ≥ 1.0)_:
@@ -12807,7 +12857,7 @@ C example:
 
 [source,c]
 ----
-int rc;
+int rc, rc2;
 struct t_hashtable *hashtable = weechat_hashtable_new (8,
                                                        WEECHAT_HASHTABLE_STRING,
                                                        WEECHAT_HASHTABLE_STRING,
@@ -12817,6 +12867,7 @@ if (hashtable)
 {
     weechat_hashtable_set (hashtable, "key", "value");
     rc = weechat_hook_hsignal_send ("my_hsignal", hashtable);
+    rc2 = weechat_hook_hsignal_send ("[flags:stop_on_error,ignore_eat]my_hsignal2", hashtable);
     weechat_hashtable_free (hashtable);
 }
 ----
@@ -12828,8 +12879,9 @@ Script (Python):
 # prototype
 def hook_hsignal_send(signal: str, hashtable: Dict[str, str]) -> int: ...
 
-# example
+# examples
 rc = weechat.hook_hsignal_send("my_hsignal", {"key": "value"})
+rc2 = weechat.hook_hsignal_send("[flags:stop_on_error,ignore_eat]my_hsignal2", {"key": "value"})
 ----
 
 [[hsignal_irc_redirect_command]]
@@ -14373,7 +14425,7 @@ Arguments:
 ** `+==id+`: the name used is the buffer unique identifier (`id`) _(WeeChat ≥ 4.3.0)_
 * _name_: name of buffer, if it is NULL or empty string, the current buffer is
   returned (buffer displayed by current window); if the name starts with
-  `(?i)`, the search is case insensitive _(WeeChat ≥ 1.0)_
+  `(?i)`, the search is case-insensitive _(WeeChat ≥ 1.0)_
 
 Return value:
 
@@ -14608,7 +14660,6 @@ Arguments:
 ** _number_: number of buffer (starts to 1)
 ** _layout_number_: number of buffer saved in layout
 ** _layout_number_merge_order_: order in merge for layout
-** _short_name_is_set_: 1 if short name is set, 0 if not set
 ** _type_: buffer type (0: formatted, 1: free content)
 ** _notify_: notify level for buffer
 ** _num_displayed_: number of windows displaying buffer
@@ -14625,7 +14676,7 @@ Arguments:
 ** _next_line_id_: next line id in buffer _(WeeChat ≥ 3.8)_
 ** _time_for_each_line_: 1 if time is displayed for each line in buffer (default), otherwise 0
 ** _nicklist_: 1 if nicklist is enabled, otherwise 0
-** _nicklist_case_sensitive_: 1 if nicks are case sensitive, otherwise 0
+** _nicklist_case_sensitive_: 1 if nicks are case-sensitive, otherwise 0
 ** _nicklist_max_length_: max length for a nick
 ** _nicklist_display_groups_: 1 if groups are displayed, otherwise 0
 ** _nicklist_count_: number of nicks and groups in nicklist
@@ -14651,7 +14702,7 @@ Arguments:
 ** _text_search_direction_: direction for search:
 *** 0: backward search (direction: oldest messages/commands)
 *** 1: forward search (direction: newest messages/commands)
-** _text_search_exact_: 1 if text search is case sensitive
+** _text_search_exact_: 1 if text search is case-sensitive
 ** _text_search_regex_: 1 if searching with a regular expression
 ** _text_search_where_:
 *** 0: no search at this moment
@@ -14780,7 +14831,7 @@ C example:
 
 [source,c]
 ----
-weechat_printf (NULL, "plugin pointer of my buffer: %lx",
+weechat_printf (NULL, "plugin pointer of my buffer: %p",
                 weechat_buffer_get_pointer (my_buffer, "plugin"));
 ----
 
@@ -14828,6 +14879,12 @@ Properties:
   are *NOT* checked) +
   "-1": remove buffer from hotlist _(WeeChat ≥ 1.0)_.
 
+| hotlist_conditions | 4.5.0 | WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE,
+  WEECHAT_HOTLIST_PRIVATE, WEECHAT_HOTLIST_HIGHLIGHT
+| priority: add buffer to hotlist with this priority
+  (conditions defined in option _weechat.look.hotlist_add_conditions_
+  are checked).
+
 | completion_freeze | | "0" or "1"
 | "0": no freeze of completion (default value)
   (global setting, buffer pointer is not used) +
@@ -14899,7 +14956,7 @@ Properties:
 | "0" to remove nicklist for buffer, "1" to add nicklist for buffer.
 
 | nicklist_case_sensitive | | "0" or "1"
-| "0" to have case insensitive nicklist, "1" to have case sensitive nicklist.
+| "0" to have case-insensitive nicklist, "1" to have case-sensitive nicklist.
 
 | nicklist_display_groups | | "0" or "1"
 | "0" to hide nicklist groups, "1" to display nicklist groups.
@@ -15156,7 +15213,7 @@ Arguments:
 ** wildcard `+*+` is allowed in name
 
 [NOTE]
-Since version 4.0.0, comparison of buffer names is case sensitive.
+Since version 4.0.0, comparison of buffer names is case-sensitive.
 
 Return value:
 
@@ -15192,6 +15249,46 @@ if buffer:
     weechat.prnt("", "%d" % weechat.buffer_match_list(buffer, "irc.oftc.*,python.*"))  # 0
 ----
 
+[[buffer_lines]]
+=== Buffer lines
+
+Functions for buffer lines.
+
+==== line_search_by_id
+
+_WeeChat ≥ 4.4.0._
+
+Search line in buffer by identifier.
+
+Prototype:
+
+[source,c]
+----
+struct t_gui_line *weechat_line_search_by_id (struct t_gui_buffer *buffer, int id);
+----
+
+Return value:
+
+* pointer to line found, NULL if not found
+
+C example:
+
+[source,c]
+----
+struct t_gui_line *line = weechat_line_search_by_id (buffer, 123);
+----
+
+Script (Python):
+
+[source,python]
+----
+# prototype
+def line_search_by_id(buffer: str, line_id: int) -> str: ...
+
+# example
+line = weechat.line_search_by_id(buffer, 123)
+----
+
 [[windows]]
 === Windows
 
@@ -15256,7 +15353,7 @@ C example:
 [source,c]
 ----
 weechat_printf (NULL,
-                "window displaying core buffer: %lx",
+                "window displaying core buffer: %p",
                 weechat_window_search_with_buffer (weechat_buffer_search_main ()));
 ----
 
@@ -15393,7 +15490,7 @@ C example:
 [source,c]
 ----
 weechat_printf (NULL,
-                "buffer displayed in current window: %lx",
+                "buffer displayed in current window: %p",
                 weechat_window_get_pointer (weechat_current_window (), "buffer"));
 ----
 
@@ -16776,7 +16873,7 @@ rc = weechat.command(weechat.buffer_search("irc", "libera.#weechat"), "/whois Fl
 
 ==== command_options
 
-_WeeChat ≥ 2.5, updated in 4.0.0._
+_WeeChat ≥ 2.5, updated in 4.0.0, 4.5.0._
 
 Execute a command or send text to buffer with options.
 
@@ -16792,13 +16889,14 @@ Arguments:
 
 * _buffer_: buffer pointer (command is executed on this buffer, use NULL for
   current buffer)
-* _command_: command to execute (if beginning with a "/"), or text to send to
+* _command_: command to execute (if beginning with a `/` or a command char),
-  buffer
+  or text to send to buffer
 * _options_: a hashtable with some options (keys and values must be string)
   (can be NULL):
 ** _commands_: a comma-separated list of commands allowed to be executed during
-   this call; see function <<_string_match_list,string_match_list>> for the
+   this call (see function <<_string_match_list,string_match_list>> for the
-   format
+   format); the special value `-` (hyphen-minus) disables the execution of commands
+   and the string in _command_ is sent as-is to the buffer (_WeeChat ≥ 4.5.0_)
 ** _delay_: delay to execute command, in milliseconds
 ** _split_newline_: `1` to split commands on newline char (`\n`) (_WeeChat ≥ 4.0.0_)
 
@@ -16831,7 +16929,7 @@ Script (Python):
 def command_options(buffer: str, command: str, options: Dict[str, str]) -> int: ...
 
 # example: allow any command except /exec
-rc = weechat.command_options("", "/some_command arguments", {"commands": "*,!exec"})
+rc = weechat.command_options("", "/some_command arguments", {"commands": "*,!exec", "delay": "2000"})
 ----
 
 [[completion]]
@@ -19261,7 +19359,7 @@ C example:
 ----
 struct t_hdata *hdata = weechat_hdata_get ("buffer");
 struct t_gui_buffer *buffer = weechat_buffer_search_main ();
-weechat_printf (NULL, "lines = %lx", weechat_hdata_pointer (hdata, buffer, "lines"));
+weechat_printf (NULL, "lines = %p", weechat_hdata_pointer (hdata, buffer, "lines"));
 ----
 
 Script (Python):
@@ -19416,7 +19514,7 @@ Arguments:
 * _pointer2_: pointer to second WeeChat/plugin object
 * _name_: variable name or path to a variable name; for arrays, the name can be
   "N|name" where N is the index in array (starting at 0), for example: "2|name"
-* _case_sensitive_: 1 for case sensitive comparison of strings, otherwise 0
+* _case_sensitive_: 1 for case-sensitive comparison of strings, otherwise 0
 
 Return value:
 

doc/en/weechat_quickstart.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 [[start]]
 == Start WeeChat
@@ -11,8 +12,9 @@ It has good UTF-8 support and works well with WeeChat's default key bindings.
 
 Run from your shell:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 [[help]]
@@ -265,7 +267,7 @@ Close a server, channel or private buffer (`/close` is an alias for
 /close
 ----
 
-[WARNING]
+[CAUTION]
 Closing the server buffer will close all channel/private buffers.
 
 Disconnect from server, on the server buffer:

doc/en/weechat_relay_weechat.en.adoc

@@ -2,11 +2,12 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 [[introduction]]
 == Introduction
 
-This document is the specification of WeeChat Relay protocol: the protocol used
+This document is the specification of _weechat_ relay protocol: the protocol used
 to relay WeeChat data to clients, which are mostly remote interfaces.
 
 [[terminology]]
@@ -24,28 +25,11 @@ The following terms are used in this document:
 
 The _clients_ are connected to _relay_ like shown in this diagram:
 
-....
+include::includes/relay.en.adoc[tag=diagram]
-                                              ┌──────────┐ Workstation
- ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
- │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS ...)
- └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
-   ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Mobile device
- ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone ...)
- │ jabber │◄──┘  ╚═══════════╧═══════╝    │      ......
- └────────┘                               │   ┌──────────┐
-   ......                                 └───┤ client N │ Other devices
-                                              └──────────┘
-
-
-└────────────┘   └───────────────────┘╘══════╛└────────────────────────────────┘
-network servers    ncurses interface    relay         remote interfaces
-                                      protocol
-....
 
 [NOTE]
-All clients here are clients using _weechat_ protocol in _relay_ plugin. The
+All clients here are clients using _weechat_ protocol in _relay_ plugin. +
-_relay_ plugin also allows IRC clients, then _relay_ plugin acts as an
+The _relay_ plugin also allows _api_ and _irc_ protocols (not described in this document).
-_IRC proxy_ (not described in this document).
 
 [[protocol_generalities]]
 == Protocol generalities
@@ -995,7 +979,7 @@ Arguments:
 
 Examples:
 
-* Send command "/help filter" on WeeChat core bufer:
+* Send command "/help filter" on WeeChat core buffer:
 
 ----
 input core.weechat /help filter
@@ -1505,6 +1489,9 @@ WeeChat reserved identifiers:
 | _buffer_line_added | buffer | hdata: line
 | Line added in buffer. | Display line in buffer.
 
+| _buffer_line_data_changed | buffer | hdata: line
+| Line changed in buffer. | Update line displayed in buffer.
+
 | _nicklist | nicklist | hdata: nicklist_item
 | Nicklist for a buffer. | Replace nicklist.
 
@@ -2059,6 +2046,7 @@ Data sent as hdata:
 |===
 | Name              | Type             | Description
 | buffer            | pointer          | Buffer pointer.
+| id                | integer          | Line identifier.
 | date              | time             | Date of message.
 | date_usec         | integer          | Microseconds of date.
 | date_printed      | time             | Date when WeeChat displayed message.
@@ -2079,6 +2067,7 @@ id: '_buffer_line_added'
 hda:
     keys: {
         'buffer': 'ptr',
+        'id': 'int',
         'date': 'tim',
         'date_usec': 'int',
         'date_printed': 'tim',
@@ -2094,6 +2083,58 @@ hda:
     item 1:
         __path: ['0x4a49600']
         buffer: '0x4a715d0'
+        id: 12
+        date: 1362728993
+        date_usec: 902765
+        date_printed: 1362728993
+        date_usec_printed: 902765
+        displayed: 1
+        notify_level: 1
+        highlight: 0
+        tags_array: [
+            'irc_privmsg',
+            'notify_message',
+            'prefix_nick_142',
+            'nick_FlashCode',
+            'log1',
+        ]
+        prefix: 'F06@F@00142FlashCode'
+        message: 'hello!'
+----
+
+[[message_buffer_line_data_changed]]
+==== _buffer_line_data_changed
+
+This message is sent to the client when the signal "buffer_line_data_changed"
+is sent by WeeChat.
+
+Data sent as hdata: same data as <<message_buffer_line_added,_buffer_line_added>>.
+
+Example: message _hello!_ from nick _FlashCode_ on buffer _irc.libera.#weechat_ has been updated:
+
+[source,python]
+----
+id: '_buffer_line_data_changed'
+hda:
+    keys: {
+        'buffer': 'ptr',
+        'id': 'int',
+        'date': 'tim',
+        'date_usec': 'int',
+        'date_printed': 'tim',
+        'date_usec_printed': 'int',
+        'displayed': 'chr',
+        'notify_level': 'chr',
+        'highlight': 'chr',
+        'tags_array': 'arr',
+        'prefix': 'str',
+        'message': 'str',
+    }
+    path: ['line_data']
+    item 1:
+        __path: ['0x4a49600']
+        buffer: '0x4a715d0'
+        id: 12
         date: 1362728993
         date_usec: 902765
         date_printed: 1362728993

doc/en/weechat_scripting.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 This manual documents WeeChat chat client, it is part of WeeChat.
 
@@ -67,7 +68,7 @@ link:weechat_plugin_api.en.html#_hook_process[WeeChat plugin API reference ^↗
 
 WeeChat defines a `weechat` module which must be imported with `import weechat`. +
 A Python stub for WeeChat API is available in the repository:
-https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Functions
@@ -362,9 +363,10 @@ WeeChat is starting.
 
 For example with Python:
 
+[source,shell]
 ----
-$ cd ~/.local/share/weechat/python/autoload
+cd ~/.local/share/weechat/python/autoload
-$ ln -s ../script.py
+ln -s ../script.py
 ----
 
 [NOTE]

doc/en/weechat_user.en.adoc

@@ -2,6 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
+include::includes/attributes-en.adoc[]
 
 This manual documents WeeChat chat client, it is part of WeeChat.
 
@@ -110,7 +111,7 @@ WeeChat:
 | cmake | ≥ 3.0
 | Build.
 
-| pkg-config |
+| pkgconf / pkg-config |
 | Detect installed libraries.
 
 | libncurses-dev |
@@ -220,8 +221,9 @@ If you are using a Debian/Ubuntu based distribution, and if you have some
 "deb-src" source entries in your file _/etc/apt/sources.list_, you can install
 all dependencies with the command:
 
+[source,shell]
 ----
-# apt-get build-dep weechat
+sudo apt-get build-dep weechat
 ----
 
 [[build]]
@@ -229,22 +231,24 @@ all dependencies with the command:
 
 * Installation in system directories (requires _root_ privileges):
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake ..
+cmake ..
-$ make
+make
-$ sudo make install
+sudo make install
 ----
 
 * Installation in custom directory (for example your home):
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
+cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/directory
-$ make
+make
-$ make install
+make install
 ----
 
 Options can be used for CMake, with format: `-DOPTION=VALUE`.
@@ -380,14 +384,16 @@ List of available options:
 
 The other options can be displayed with this command:
 
+[source,shell]
 ----
-$ cmake -LA
+cmake -LA
 ----
 
 Or with Curses interface:
 
+[source,shell]
 ----
-$ ccmake ..
+ccmake ..
 ----
 
 [[tests]]
@@ -400,14 +406,16 @@ Following packages are *required* to compile tests:
 
 Tests must be enabled when compiling WeeChat:
 
+[source,shell]
 ----
-$ cmake .. -DENABLE_TESTS=ON
+cmake .. -DENABLE_TESTS=ON
 ----
 
 They can be launched after compilation from the build directory:
 
+[source,shell]
 ----
-$ ctest -V
+ctest -V
 ----
 
 [[git_sources]]
@@ -418,8 +426,9 @@ stable. You're warned!
 
 To get Git sources, issue this command:
 
+[source,shell]
 ----
-$ git clone https://github.com/weechat/weechat.git
+git clone https://github.com/weechat/weechat.git
 ----
 
 Then follow instructions for source package (see
@@ -442,8 +451,9 @@ you have to:
 
 If you're compiling with CMake:
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug
+cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----
 
 [[address_sanitizer]]
@@ -452,18 +462,20 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 You can additionally enable the address sanitizer, which causes WeeChat to
 crash immediately in case of problem:
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
 ----
 
-[WARNING]
+[CAUTION]
 You should enable address sanitizer only if you're trying to cause a crash,
 this is not recommended in production.
 
 Then once compiled and installed, you must run WeeChat like this:
 
+[source,shell]
 ----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
+ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
 ----
 
 In case of crash, the backtrace is in file `asan.log`.
@@ -483,12 +495,14 @@ starts, you can use `ulimit` command.
 
 For example under Linux with _bash_ shell, add this line to your `~/.bashrc`:
 
+[source,shell]
 ----
 ulimit -c unlimited
 ----
 
 Or max size:
 
+[source,shell]
 ----
 ulimit -c 200000
 ----
@@ -510,6 +524,7 @@ https://wiki.archlinux.org/title/Core_dump[wiki page ^↗^^].
 For example if _weechat_ is installed in _/usr/bin/_ and _core_ file is
 in _/home/user/_, then run gdb with this command:
 
+[source,shell]
 ----
 gdb /usr/bin/weechat /home/user/core
 ----
@@ -557,6 +572,7 @@ Thank you for your help!
 To debug a running WeeChat (for example if WeeChat seems blocked), you can use
 gdb with process id (replace _12345_ with PID of weechat process):
 
+[source,shell]
 ----
 gdb /usr/bin/weechat 12345
 ----
@@ -572,8 +588,9 @@ Then like for a crash, use command `bt full`:
 
 To start WeeChat, issue this command:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 When you run WeeChat for the first time, the default configuration files are
@@ -587,7 +604,7 @@ include::includes/cmdline_options.en.adoc[tag=standard]
 
 Some extra options are available for debug purposes only:
 
-[WARNING]
+[CAUTION]
 Do *NOT* use any of these options in production!
 
 include::includes/cmdline_options.en.adoc[tag=debug]
@@ -789,25 +806,25 @@ This saves the current state in `*.upgrade` files. You can then either reboot
 or move the whole WeeChat directories (config, data, cache) to another machine,
 and restart WeeChat later with this command:
 
+[source,shell]
 ----
-$ weechat --upgrade
+weechat --upgrade
 ----
 
 [[restart_after_upgrade]]
 === Restart after upgrade
 
-[[restart_release_notes]]
+[[restart_upgrading_notes]]
-==== Release notes
+==== Upgrading notes
 
-After an upgrade, it is *strongly recommended* to read the
+After an upgrade, it is *strongly recommended* to read the file
-https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[release notes ^↗^^]
+https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
-which contain important information about breaking changes and some
+which contains important information about breaking changes and some
 manual actions that could be required.
 
-You must read the release notes of all versions between your old (excluded) and
+You must read the versions between your old (excluded) and your new version (included). +
-your new version (included). +
+For example if you switch from version 4.0.0 to 4.3.0, you must read versions
-For example if you switch from version 3.0 to 3.2, you must read release notes
+4.0.1 to 4.3.0.
-of versions 3.1 and 3.2.
 
 [[restart_configuration_upgrade]]
 ==== Configuration upgrade
@@ -860,7 +877,7 @@ Example of terminal with WeeChat:
 │         │                                                                    │       │
 │         │                                                                    │       │
 │         │                                                                    │       │
-│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* [H: 3:#abc(2,5), 5]                │
+│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* M [H: 3:#abc(2,5), 5]              │
 │         │[@Flashy(i)] hi peter!█                                                     │
 └──────────────────────────────────────────────────────────────────────────────────────┘
             ▲ bars "status" and "input"                               bar "nicklist" ▲
@@ -899,39 +916,41 @@ Bar _status_ has following default items:
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Item                  | Example               | Description
+| Item                  | Example                | Description
-| time                  | `[12:55]`             | Time.
+| time                  | `12:55`                | Time.
-| buffer_last_number    | `[5]`                 | Number of last buffer in list.
+| buffer_last_number    | `5`                    | Number of the latest buffer (can be different from `buffer_count` if option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> is `off`).
-| buffer_plugin         | `[irc/libera]`        | Plugin of current buffer (irc plugin can add IRC server name used by buffer).
+| buffer_plugin         | `irc/libera`           | Plugin of current buffer (irc plugin can add IRC server name used by buffer).
-| buffer_number         | `2`                   | Current buffer number.
+| buffer_number         | `2`                    | Current buffer number.
-| buffer_name           | `#test`               | Current buffer name.
+| buffer_name           | `#test`                | Current buffer name.
-| buffer_modes          | `+n`                  | IRC channel modes.
+| buffer_modes          | `+n`                   | IRC channel modes.
-| buffer_nicklist_count | `{4}`                 | Number of nicks displayed in nicklist.
+| buffer_nicklist_count | `4`                    | Number of nicks displayed in nicklist.
-| buffer_zoom           | !                     | `!` means the merged buffer is zoomed (only this one is displayed), empty value means all merged buffers are displayed.
+| buffer_zoom           | !                      | `!` means the merged buffer is zoomed (only this one is displayed), empty value means all merged buffers are displayed.
-| buffer_filter         | `+*+`                 | Filtering indicator: `+*+` means some lines are filtered (hidden), empty value means all lines are displayed.
+| buffer_filter         | `+*+`                  | Filtering indicator: `+*+` means some lines are filtered (hidden), empty value means all lines are displayed.
-| scroll                | `-MORE(50)-`          | Scroll indicator, with number of lines below last line displayed.
+| mouse_status          | `M`                    | Mouse status (empty if mouse is disabled), see command <<command_weechat_mouse,/mouse>> and <<key_bindings_toggle_keys,toggle keys>>.
-| lag                   | `[Lag: 2.5]`          | Lag indicator, in seconds (hidden if lag is low).
+| scroll                | `-MORE(50)-`           | Scroll indicator, with number of lines below last line displayed.
-| hotlist               | `[H: 3:#abc(2,5), 5]` | List of buffers with activity (unread messages) (in example, 2 highlights and 5 unread messages on _#abc_, one unread message on buffer #5).
+| lag                   | `Lag: 2.5`             | Lag indicator, in seconds (hidden if lag is low).
-| completion            | `abc(2) def(5)`       | List of words for completion, with number of possible completions for each word.
+| hotlist               | `H: 3:#abc(2,5), 5`    | List of buffers with activity (unread messages) (in example, 2 highlights and 5 unread messages on _#abc_, one unread message on buffer #5).
+| typing                | `Typing: bob, (alice)` | Typing notification, see <<typing_notifications,typing notifications>>.
+| completion            | `abc(2) def(5)`        | List of words for completion, with number of possible completions for each word.
 |===
 
 Bar _input_ has following default items:
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Item         | Example                                      | Description
+| Item         | Example                                    | Description
-| input_prompt | `[@Flashy(i)]`                               | Input prompt, for irc: nick and modes (mode "+i" means invisible on libera).
+| input_prompt | `@Flashy(i)`                               | Input prompt, for irc: nick and modes (mode "+i" means invisible on libera).
-| away         | `(away)`                                     | Away indicator.
+| away         | `away`                                     | Away indicator.
-| input_search | `[Search lines (~ str,msg)]`                 | Search indicator (see below)
+| input_search | `Search lines (~ str,msg)`                 | Search indicator (see below)
-| input_paste  | `[Paste 7 lines ? [ctrl-y] Yes [ctrl-n] No]` | Question to user for pasting lines.
+| input_paste  | `Paste 7 lines ? [ctrl-y] Yes [ctrl-n] No` | Question to user for pasting lines.
-| input_text   | `hi peter!`                                  | Input text.
+| input_text   | `hi peter!`                                | Input text.
 |===
 
 There are two search modes:
 
 * search in lines, for example `[Search lines (~ str,msg)]`, with the following info:
-** `~`: case insensitive
+** `~`: case-insensitive
-** `==`: case sensitive
+** `==`: case-sensitive
 ** `str`: search string
 ** `regex`: search regular expression
 ** `msg`: search in messages
@@ -939,8 +958,8 @@ There are two search modes:
 ** `pre\|msg`: search in prefixes and messages.
 * search in commands history, for example `[Search command (~ str,local)]`,
   with the following info:
-** `~`: case insensitive
+** `~`: case-insensitive
-** `==`: case sensitive
+** `==`: case-sensitive
 ** `str`: search string
 ** `regex`: search regular expression
 ** `local`: search in buffer local history
@@ -959,8 +978,7 @@ Other items available (not used in bars by default):
 [width="100%",cols="^3,^3,9",options="header"]
 |===
 | Item                         | Example                  | Description
-| buffer_count                 | `10`                     | Total number of buffers opened.
+| buffer_count                 | `5`                      | Total number of buffers opened.
-| buffer_last_number           | `10`                     | Number of the latest buffer (can be different from `buffer_count` if option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> is `off`).
 | buffer_nicklist_count_all    | `4`                      | Number of visible groups and nicks in nicklist.
 | buffer_nicklist_count_groups | `0`                      | Number of visible groups in nicklist.
 | buffer_short_name            | `#test`                  | Current buffer short name.
@@ -975,7 +993,7 @@ Other items available (not used in bars by default):
 | irc_nick_host                | `+Flashy!user@host.com+` | Current IRC nick and host.
 | irc_nick_modes               | `i`                      | IRC modes for self nick.
 | irc_nick_prefix              | `@`                      | IRC nick prefix on channel.
-| mouse_status                 | `M`                      | Mouse status (empty if mouse is disabled).
+| spacer                       |                          | Special item used to align text in bars, see <<item_spacer,Spacer item>>.
 | spell_dict                   | `fr,en`                  | Spelling dictionaries used on current buffer.
 | spell_suggest                | `print,prone,prune`      | Spelling suggestions for word under cursor (if misspelled).
 | tls_version                  | `TLS1.3`                 | TLS version in use for current IRC server.
@@ -1085,7 +1103,7 @@ data).
 
 Examples of buffers:
 
-* core buffer (created by WeeChat on startup, can not be closed)
+* core buffer (created by WeeChat on startup, cannot be closed)
 * irc server (displays messages from server)
 * irc channel
 * irc private messages
@@ -1323,10 +1341,10 @@ Tags commonly used (non-exhaustive list):
 [width="100%",cols="1m,4",options="header"]
 |===
 | Tag              | Description
-| no_filter        | Line can not be filtered.
+| no_filter        | Line cannot be filtered.
 | no_highlight     | No highlight is possible on line.
 | no_log           | Line is not written in log file.
-| log0 … log9      | Level of log for line (see `/help logger`).
+| log0 … log9      | Level of log for line (see the <<command_logger_logger,/logger>> command).
 | notify_none      | The line must not be added to hotlist. ^(1)^
 | notify_message   | The line is a user message. ^(1)^
 | notify_private   | The line is a private message. ^(1)^
@@ -1950,9 +1968,9 @@ These keys and actions are used on the IRC /list buffer (see command <<command_i
 | kbd:[F11]      | `pass:[<]`   | Scroll horizontally on the left. | `+/list -left+`
 | kbd:[F12]      | `pass:[>]`   | Scroll horizontally on the right. | `+/list -right+`
 | kbd:[Ctrl+j]   | `j`          | Join IRC channel on selected line. | `+/list -join+`
-|                | `xxx`        | Show only channels with "xxx" in name or topic (case insensitive). |
+|                | `xxx`        | Show only channels with "xxx" in name or topic (case-insensitive). |
-|                | `n:xxx`      | Show only channels with "xxx" in name (case insensitive). |
+|                | `n:xxx`      | Show only channels with "xxx" in name (case-insensitive). |
-|                | `t:xxx`      | Show only channels with "xxx" in topic (case insensitive). |
+|                | `t:xxx`      | Show only channels with "xxx" in topic (case-insensitive). |
 |                | `u:n`        | Show only channels with at least "n" users. |
 |                | `u:>n`       | Show only channels with more than "n" users. |
 |                | `u:<n`       | Show only channels with less than "n" users. |
@@ -2009,27 +2027,27 @@ Example of fset buffer displaying options starting with `weechat.look` :
 [subs="quotes"]
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│1/121 | Filter: weechat.look.* | Sort: ~name | Key(input): alt+space=toggle │
+│1.weechat│7/125 | Filter: weechat.look.* | Sort: ~name | Key(input): alt+space=toggl>>│
 │2.fset   │weechat.look.bare_display_exit_on_input: exit the bare display mode on any c│
 │         │hanges in input [default: on]                                               │
 │         │----------------------------------------------------------------------------│
-│         │  weechat.look.align_end_of_lines                   enum     message        │
+│         │  weechat.look.align_end_of_lines              enum     message             │
-│         │  weechat.look.align_multiline_words                boolean  on             │
+│         │  weechat.look.align_multiline_words           boolean  on                  │
-│         │  weechat.look.bar_more_down                        string   "++"           │
+│         │  weechat.look.bar_more_down                   string   "++"                │
-│         │  weechat.look.bar_more_left                        string   "<<"           │
+│         │  weechat.look.bar_more_left                   string   "<<"                │
-│         │  weechat.look.bar_more_right                       string   ">>"           │
+│         │  weechat.look.bar_more_right                  string   ">>"                │
-│         │  weechat.look.bar_more_up                          string   "--"           │
+│         │  weechat.look.bar_more_up                     string   "--"                │
-│         │##  weechat.look.bare_display_exit_on_input           boolean  on             ##│
+│         │##  weechat.look.bare_display_exit_on_input      boolean  on                  ##│
-│         │  weechat.look.bare_display_time_format             string   "%H:%M"        │
+│         │  weechat.look.bare_display_time_format        string   "%H:%M"             │
-│         │  weechat.look.buffer_auto_renumber                 boolean  on             │
+│         │  weechat.look.buffer_auto_renumber            boolean  on                  │
-│         │  weechat.look.buffer_notify_default                enum     all            │
+│         │  weechat.look.buffer_notify_default           enum     all                 │
-│         │  weechat.look.buffer_position                      enum     end            │
+│         │  weechat.look.buffer_position                 enum     end                 │
-│         │  weechat.look.buffer_search_case_sensitive         boolean  off            │
+│         │  weechat.look.buffer_search_case_sensitive    boolean  off                 │
-│         │  weechat.look.buffer_search_force_default          boolean  off            │
+│         │  weechat.look.buffer_search_force_default     boolean  off                 │
-│         │  weechat.look.buffer_search_regex                  boolean  off            │
+│         │  weechat.look.buffer_search_history           enum     local               │
-│         │  weechat.look.buffer_search_where                  enum     prefix_message │
+│         │  weechat.look.buffer_search_regex             boolean  off                 │
-│         │  weechat.look.buffer_time_format                   string   "%H:%M:%S"     │
+│         │  weechat.look.buffer_search_where             enum     prefix_message      │
-│         │  weechat.look.buffer_time_same                     string   ""             │
+│         │  weechat.look.buffer_time_format              string   "%H:%M:%S"          │
 │         │[12:55] [2] [fset] 2:fset                                                   │
 │         │█                                                                           │
 └──────────────────────────────────────────────────────────────────────────────────────┘
@@ -2807,8 +2825,9 @@ configuration.
 The option name is an aspell configuration option. List of options can be found
 in a shell with following command:
 
+[source,shell]
 ----
-$ aspell config
+aspell config
 ----
 
 For example, to enable option "ignore-case":
@@ -3244,7 +3263,7 @@ buffer to see values), just do:
 Secured data can be used in some options that can contain private data like
 password, using this format: "${sec.data.xxx}" where "xxx" is the name of
 secured data (used with `/secure set xxx ...`). +
-For a complete list of supported options, see `/help secure`.
+For a complete list of supported options, see the <<command_weechat_secure,/secure>> command.
 
 To use the _libera_ password, for example with
 <<irc_sasl_authentication,SASL authentication>>:
@@ -3260,7 +3279,7 @@ Alias plugin lets you create alias for commands (from WeeChat or other
 plugins).
 
 Some aliases are created by default, with name in upper case (to make them
-different from standard commands); commands are not case sensitive in WeeChat,
+different from standard commands); commands are not case-sensitive in WeeChat,
 so for example `/close` runs the alias `/CLOSE`.
 
 List of default aliases:
@@ -3368,8 +3387,9 @@ irc[6][s]://[nick[:password]@]irc.example.org[:port][/channel][,channel[...]]
 Example to join _#weechat_ and _#weechat-fr_ on server _irc.libera.chat_ server,
 default port (6667), with nick _alice_:
 
+[source,shell]
 ----
-$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
 ----
 
 [[irc_servers]]
@@ -3381,13 +3401,15 @@ $ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
 By default no servers are defined. You can add as many servers as you want with
 the <<command_irc_server,/server>> command.
 
-For example to connect to https://libera.chat/[libera.chat ^↗^^]
+For example to connect to https://libera.chat/[libera.chat ^↗^^]:
-with TLS (encrypted trafic):
 
 ----
-/server add libera irc.libera.chat/6697 -tls
+/server add libera irc.libera.chat
 ----
 
+[NOTE]
+Default port is 6697 and TLS (encrypted traffic) is enabled.
+
 You can tell WeeChat to auto-connect to this server on startup:
 
 ----
@@ -3428,11 +3450,11 @@ For example if you created the _libera_ server with the commands above, you'll
 see this with the command `/fset libera`:
 
 ....
-irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.addresses             string   "irc.libera.chat"
-irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood            integer  null -> 2000
-irc.server.libera.anti_flood_prio_low   integer  null -> 2
 irc.server.libera.autoconnect           boolean  on
 irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autojoin_delay        integer  null -> 0
 irc.server.libera.autojoin_dynamic      boolean  null -> off
 irc.server.libera.autoreconnect         boolean  null -> on
 irc.server.libera.autoreconnect_delay   integer  null -> 10
@@ -3446,17 +3468,18 @@ irc.server.libera.command               string   null -> ""
 irc.server.libera.command_delay         integer  null -> 0
 irc.server.libera.connection_timeout    integer  null -> 60
 irc.server.libera.default_chantypes     string   null -> "#&"
-irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.ipv6                  enum     null -> auto
 irc.server.libera.local_hostname        string   null -> ""
 irc.server.libera.msg_kick              string   null -> ""
 irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
 irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
-irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks                 string   null -> "${username},${username}2,${username}3,${username}4,${username}5"
 irc.server.libera.nicks_alternate       boolean  null -> on
 irc.server.libera.notify                string   null -> ""
 irc.server.libera.password              string   null -> ""
 irc.server.libera.proxy                 string   null -> ""
 irc.server.libera.realname              string   null -> ""
+irc.server.libera.registered_mode       string   null -> "r"
 irc.server.libera.sasl_fail             enum     null -> reconnect
 irc.server.libera.sasl_key              string   null -> ""
 irc.server.libera.sasl_mechanism        enum     null -> plain
@@ -3464,15 +3487,15 @@ irc.server.libera.sasl_password         string   "${sec.data.libera}"
 irc.server.libera.sasl_timeout          integer  null -> 15
 irc.server.libera.sasl_username         string   "alice"
 irc.server.libera.split_msg_max_length  integer  null -> 512
-irc.server.libera.tls                   boolean  on
+irc.server.libera.tls                   boolean  null -> on
 irc.server.libera.tls_cert              string   null -> ""
 irc.server.libera.tls_dhkey_size        integer  null -> 2048
 irc.server.libera.tls_fingerprint       string   null -> ""
 irc.server.libera.tls_password          string   null -> ""
-irc.server.libera.tls_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.tls_priorities        string   null -> "NORMAL"
 irc.server.libera.tls_verify            boolean  null -> on
 irc.server.libera.usermode              string   null -> ""
-irc.server.libera.username              string   null -> "alice"
+irc.server.libera.username              string   null -> "${username}"
 ....
 
 For example if you want to automatically connect to all servers you define
@@ -3523,9 +3546,10 @@ even if it was OK with versions prior to 0.3.1.
 
 * Import certificate in shell:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
+wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
 ----
 
 [NOTE]
@@ -3546,10 +3570,11 @@ It is possible to concatenate many certificates in file CAs.pem.
 
 * Create certificate in shell:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
+openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
 ----
 
 [NOTE]
@@ -3592,13 +3617,14 @@ Options in servers are:
 [[irc_sasl_ecdsa_nist256p_challenge]]
 ===== SASL ECDSA-NIST256P-CHALLENGE
 
-You must generate a private key in order to authentify with the
+You must generate a private key in order to authenticate with the
 ECDSA-NIST256P-CHALLENGE mechanism (no password is required on connection).
 
 You can generate the key with this command:
 
+[source,shell]
 ----
-$ openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
+openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
 ----
 
 [NOTE]
@@ -3607,8 +3633,9 @@ which can also be for example `~/.weechat`.
 
 Get the public key (encoded as base64) with this command:
 
+[source,shell]
 ----
-$ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
 ----
 
 Connect to the server, identify (for example with "nickserv identify") and set
@@ -3675,8 +3702,9 @@ privacy and security on the Internet.
 
 In first place, install Tor. For Debian (and derived):
 
+[source,shell]
 ----
-$ sudo apt-get install tor
+sudo apt-get install tor
 ----
 
 In WeeChat you need to add a socks5 proxy for Tor service (hostname/IP and
@@ -4097,7 +4125,7 @@ for example if `#channel1` requires a key but not `#channel2`:
 /set irc.server.libera.autojoin "#channel1,#channel2 key1"
 ----
 
-For help on the format, see `/help irc.server.libera.autojoin`.
+For help on the format, see option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
 
 [[irc_private_messages]]
 === Private messages
@@ -4144,7 +4172,7 @@ buffers, for example:
 ----
 
 It is possible to create filter for one channel only or channels beginning with
-same name (see `/help filter`):
+same name (see the <<command_weechat_filter,/filter>> command):
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4589,10 +4617,11 @@ The default path to certificate/key is defined by option
 
 You can create a certificate and private key with following commands:
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
+openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
 ----
 
 [NOTE]
@@ -4666,13 +4695,21 @@ For example:
 Now you can connect on port 9000 with a WeeChat or a remote interface using
 password "mypassword".
 
-To connect to an _api_ relay with WeeChat:
+To connect to an _api_ relay running locally with WeeChat:
 
 ----
 /remote add weechat http://localhost:9000 -password=mypassword
 /remote connect weechat
 ----
 
+To connect to an _api_ relay running elsewhere with WeeChat
+(TLS is highly recommended):
+
+----
+/remote add weechat https://example.com:9000 -password=mypassword
+/remote connect weechat
+----
+
 [NOTE]
 The remote WeeChat must expose the same API version as the local WeeChat, so
 it's highly recommended to use exactly the same WeeChat version on remote
@@ -4687,15 +4724,15 @@ You can connect with a remote interface, see
 https://weechat.org/about/interfaces/[this page ^↗^^].
 
 [IMPORTANT]
-WeeChat itself can NOT connect to another WeeChat with this protocol.
+WeeChat itself cannot connect to another WeeChat with this protocol.
 
 For example:
 
 ----
-/relay add weechat 9000
+/relay add weechat 9500
 ----
 
-Now you can connect on port 9000 with a remote interface using password
+Now you can connect on port 9500 with a remote interface using password
 "mypassword".
 
 [[relay_websocket]]
@@ -4713,10 +4750,10 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9000/weechat");
+websocket = new WebSocket("ws://example.com:9500/weechat");
 ----
 
-The port (9000 in example) is the port defined in Relay plugin.
+The port (9500 in example) is the port defined in Relay plugin.
 
 The URI must end with "/weechat" for _irc_ and _weechat_ protocols and "/api"
 for _api_ protocol.
@@ -4737,8 +4774,9 @@ SSH forwarding for relay clients, when other ports cannot be opened.
 
 Using OpenSSH:
 
+[source,shell]
 ----
-$ ssh -L 9000:.weechat/relay_socket user@hostname
+ssh -L 9000:.weechat/relay_socket user@hostname
 ----
 
 This redirects local relay clients connecting on port 9000 to the WeeChat
@@ -4824,34 +4862,39 @@ Some examples:
 
 * Change nick on IRC server libera to "newnick":
 
+[source,shell]
 ----
-$ echo 'irc.server.libera */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.server.libera */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Send a message on IRC #weechat channel:
 
+[source,shell]
 ----
-$ echo 'irc.libera.#weechat *hello!' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.libera.#weechat *hello!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Send a multiline message on IRC #test channel, if capability "draft/multiline"
   is enabled on the ergo server:
 
+[source,shell]
 ----
-$ echo 'irc.ergo.#test \hello\n...on two lines!' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.ergo.#test \hello\n...on two lines!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Send a message on current buffer:
 
+[source,shell]
 ----
-$ echo '*hello!' >/run/user/1000/weechat/weechat_fifo_12345
+echo '*hello!' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Send two commands to unload/reload Python scripts (you have to separate them
   with "\n"):
 
+[source,shell]
 ----
-$ printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
+printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 [[fifo_commands]]
@@ -4934,7 +4977,7 @@ A trigger has the following options (names are
 
 | enabled | `on`, `off`
 | When option is `off`, the trigger is disabled and actions are not executed
-  any more.
+  anymore.
 
 | hook | `+signal+`, `+hsignal+`, `+modifier+`, `+line+`, `+print+`, `+command+`,
   `+command_run+`, `+timer+`, `+config+`, `+focus+`, `+info+`, `+info_hashtable+`
@@ -5748,7 +5791,7 @@ For privacy considerations, the download of scripts is disabled by default. +
 To enable it, type this command:
 
 ----
-/set script.scripts.download_enabled on
+/script enable
 ----
 
 Then you can download the list of scripts and display them in a new buffer
@@ -5758,33 +5801,33 @@ with the <<command_script_script,/script>> command:
 :x: *
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│368/368 scripts (filter: {x}) | Sort: i,p,n | Alt+key/input: i=install, r=remove, l=load, L=reload, u=│
+│1.weechat│322/322 scripts (filter: {x}) | Sort: i,p,n | Alt+key/input: i=install, r=remove, l=load, L=reload, >>│
-│2.scripts│{x}      autosort.py                 3.9     2020-10-11 | Automatically keep buffers grouped by server│
+│2.scripts│{x}      autosort.py                     3.10    2023-12-31 | Automatically keep buffers grouped by se│
-│         │{x}      multiline.pl                0.6.3   2016-01-02 | Multi-line edit box, also supports editing o│
+│         │{x}      highmon.pl                      2.7     2020-06-21 | Adds a highlight monitor buffer.        │
-│         │{x}      highmon.pl                  2.7     2020-06-21 | Adds a highlight monitor buffer.            │
+│         │{x}ia r  grep.py                   0.8.6 0.8.6   2022-11-11 | Search regular expression in buffers or │
-│         │##{x}ia r  grep.py               0.8.5 0.8.5   2021-05-11 | Search regular expression in buffers or log ##│
+│         │{x}      colorize_nicks.py               32      2023-10-30 | Use the weechat nick colors in the chat │
-│         │{x}      autojoin.py                 0.3.1   2019-10-06 | Configure autojoin for all servers according│
+│         │##{x}ia r  go.py                     3.0.1 3.0.1   2024-05-30 | Quick jump to buffers.                  ##│
-│         │{x}      colorize_nicks.py           28      2021-03-06 | Use the weechat nick colors in the chat area│
+│         │       aesthetic.py                    1.0.6   2020-10-25 | Make messages more A E S T H E T I C A L│
-│         │{x}ia r  go.py                 2.7   2.7     2021-05-26 | Quick jump to buffers.                      │
+│         │       aformat.py                      0.2     2018-06-21 | Alternate text formatting, useful for re│
-│         │{x}      text_item.py                0.9     2019-05-25 | Add bar items with plain text.              │
+│         │       alternatetz.py                  0.4     2022-01-25 | Add an alternate timezone item.         │
-│         │       aesthetic.py                1.0.6   2020-10-25 | Make messages more A E S T H E T I C A L L Y│
+│         │       amarok2.pl                      0.7     2012-05-08 | Amarok 2 control and now playing script.│
-│         │       aformat.py                  0.2     2018-06-21 | Alternate text formatting, useful for relays│
+│         │       amqp_notify.rb                  0.1     2011-01-12 | Send private messages and highlights to │
-│         │       alternatetz.py              0.3     2018-11-11 | Add an alternate timezone item.             │
+│         │       announce_url_title.py           19      2021-06-05 | Announce URL title to user or to channel│
-│         │       amarok2.pl                  0.7     2012-05-08 | Amarok 2 control and now playing script.    │
+│         │       anotify.py                      1.0.2   2020-05-16 | Notifications of private messages, highl│
-│         │       amqp_notify.rb              0.1     2011-01-12 | Send private messages and highlights to an A│
+│         │       anti_password.py                1.2.1   2021-03-13 | Prevent a password from being accidental│
-│         │       announce_url_title.py       19      2021-06-05 | Announce URL title to user or to channel.   │
+│         │       apply_corrections.py            1.3     2018-06-21 | Display corrected text when user sends s│
-│         │       anotify.py                  1.0.2   2020-05-16 | Notifications of private messages, highlight│
+│         │       arespond.py                     0.1.2   2022-01-25 | Simple autoresponder.                   │
-│         │       anti_password.py            1.2.1   2021-03-13 | Prevent a password from being accidentally s│
+│         │       atcomplete.pl                   0.001   2016-10-29 | Tab complete nicks when prefixed with "@│
-│         │       apply_corrections.py        1.3     2018-06-21 | Display corrected text when user sends s/typ│
+│         │       audacious.pl                    0.3     2009-05-03 | Display which song Audacious is currentl│
-│         │       arespond.py                 0.1.1   2020-10-11 | Simple autoresponder.                       │
+│         │       auth.rb                         0.3     2014-05-30 | Automatically authenticate with NickServ│
-│         │       atcomplete.pl               0.001   2016-10-29 | Tab complete nicks when prefixed with "@".  │
+│         │       auto_away.py                    0.4     2018-11-11 | A simple auto-away script.              │
-│         │       audacious.pl                0.3     2009-05-03 | Display which song Audacious is currently pl│
+│         │       autoauth.py                     1.3     2021-11-07 | Permits to auto-authenticate when changi│
-│         │       auth.rb                     0.3     2014-05-30 | Automatically authenticate with NickServ usi│
+│         │       autobump.py                     0.1.0   2019-06-14 | Bump buffers upon activity.             │
-│         │       auto_away.py                0.4     2018-11-11 | A simple auto-away script.                  │
+│         │       autoconf.py                     0.4     2021-05-11 | Auto save/load changed options in a .wee│
-│         │       autoauth.py                 1.3     2021-11-07 | Permits to auto-authenticate when changing n│
+│         │       autoconnect.py                  0.3.3   2019-10-06 | Reopen servers and channels opened last │
-│         │       autobump.py                 0.1.0   2019-06-14 | Bump buffers upon activity.                 │
+│         │       autojoin_on_invite.py           0.9     2022-10-25 | Auto joins channels when invited.       │
-│         │       autoconf.py                 0.4     2021-05-11 | Auto save/load changed options in a .weerc f│
+│         │       automarkbuffer.py               1.0     2015-03-31 | Mark buffers as read if there is no new │
-│         │       autoconnect.py              0.3.3   2019-10-06 | Reopen servers and channels opened last time│
+│         │       automerge.py                    0.2     2018-03-03 | Automatically merge new buffers accordin│
 │         │[12:55] [2] [script] 2:scripts                                                                      │
 │         │█                                                                                                   │
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

doc/es/includes/attributes-es.adoc

@@ -0,0 +1,23 @@
+// Spanish translation, courtesy of Eddú Meléndez <eddu.melendez@gmail.com> with updates from Fede Mendez <federicomh@gmail.com>
+:appendix-caption: Apéndice
+:appendix-refsig: {appendix-caption}
+:caution-caption: Precaución
+:chapter-signifier: Capítulo
+:chapter-refsig: {chapter-signifier}
+:example-caption: Ejemplo
+:figure-caption: Figura
+:important-caption: Importante
+:last-update-label: Ultima actualización
+ifdef::listing-caption[:listing-caption: Lista]
+ifdef::manname-title[:manname-title: Nombre]
+:note-caption: Nota
+:part-signifier: Parte
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Prefacio]
+:section-refsig: Sección
+:table-caption: Tabla
+:tip-caption: Sugerencia
+:toc-title: Tabla de Contenido
+:untitled-label: Sin título
+:version-label: Versión
+:warning-caption: Aviso

doc/es/weechat_faq.es.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: es
-:toc-title: Índice
+include::includes/attributes-es.adoc[]
 
 Traductores
 
@@ -58,12 +58,14 @@ If you still have issues, please report them to the developers.
 Se recomienda utilizar https://brew.sh/[Homebrew ^↗^^],
 puede obtener ayuda con el comando:
 
+[source,shell]
 ----
 brew info weechat
 ----
 
 Puede instalar WeeChat con este comando:
 
+[source,shell]
 ----
 brew install weechat
 ----
@@ -326,10 +328,15 @@ Puede utilizar una terminal con selección rectangualr (como rxvt-unicode,
 konsole, gnome-terminal, etc.). La tecla normalmente es kbd:[Ctrl] + kbd:[Alt] + la selección
 con el ratón.
 
+// TRANSLATION MISSING
+You can toggle nicklist and make it visible only when needed, with key
+kbd:[Alt+Shift+N].
+
 Otra solución es mover la lista de apodos a la parte superior o inferior, por ejemplo:
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 [[urls]]
@@ -340,10 +347,14 @@ You can use the bare display (default key: kbd:[Alt+l] (`L`)).
 
 Para abrir direcciones URL más fácilmente, puede:
 
+// TRANSLATION MISSING
+* toggle nicklist and make it visible only when needed, with key kbd:[Alt+Shift+N]
+
 * mover la lista de apodos a la parte superior con este comando:
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 * inhabilitar la alineación de palabras multilínea:
@@ -394,6 +405,7 @@ No hay razón en WeeChat para cambiar la zona horaria, la variable de entorno
 
 En el archivo de inicialización de su shell o en la línea de comando, antes de ejecutar WeeChat:
 
+[source,shell]
 ----
 export TZ=America/New_York
 ----
@@ -701,16 +713,18 @@ De acuerdo a la información usada, el ratón podrá o no estar soportado.
 
 Puede comprobar el soporte del ratón en la terminal:
 
+[source,shell]
 ----
-$ printf '\033[?1002h'
+printf '\033[?1002h'
 ----
 
 Y después haga clic en el primer caracter de la terminal (superior izquierdo). Debería ver " !!#!!".
 
 Para inhabilitar el ratón en la terminal:
 
+[source,shell]
 ----
-$ printf '\033[?1002l'
+printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -766,7 +780,7 @@ Puede intentar una cadena de prioridad diferente, reemplace "xxx" por el nombre
 de su servidor:
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1033,8 +1047,9 @@ Primero compruebe las preguntas sobre la conexión TLS en este documento.
 
 Si todavía no funciona, trate de manera manual eliminar los archivos de scripts (escriba en su terminal):
 
+[source,shell]
 ----
-$ rm ~/.cache/weechat/script/plugins.xml.gz
+rm ~/.cache/weechat/script/plugins.xml.gz
 ----
 
 // TRANSLATION MISSING
@@ -1059,9 +1074,10 @@ que actualizar manualmente el archivo usted mismo para obtener las actualizacion
 
 * en su terminal, con el software curl instalado:
 
+[source,shell]
 ----
-$ cd ~/.cache/weechat/script
+cd ~/.cache/weechat/script
-$ curl -O https://weechat.org/files/plugins.xml.gz
+curl -O https://weechat.org/files/plugins.xml.gz
 ----
 
 // TRANSLATION MISSING
@@ -1069,6 +1085,7 @@ If you're running macOS and the downloaded file has a size of 0 bytes,
 try to set this variable in your shell initialization file or on command line,
 before starting WeeChat:
 
+[source,shell]
 ----
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 ----
@@ -1243,6 +1260,7 @@ See https://weechat.org/about/support/[this page ^↗^^].
 
 Cuando ejecuta WeeChat bajo gdb, puede tener este error:
 
+[source,shell]
 ----
 $ gdb /ruta/a/weechat
 (gdb) run
@@ -1253,6 +1271,7 @@ Cannot find new threads: generic error
 Para solucionar esto, puede ejecutar gdb con este comando (reemplace la ruta a libpthread y
 WeeChat con las rutas de su sistema):
 
+[source,shell]
 ----
 $ LD_PRELOAD=/lib/libpthread.so.0 gdb /ruta/a/weechat
 (gdb) run
@@ -1261,7 +1280,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /ruta/a/weechat
 [[supported_os]]
 === ¿Cual es la lista de plataformas para las que está disponible WeeChat? ¿Será portado a otros sistemas operativos?
 
-WeeChat se ejecuta sin problemas en la mayoría de distribuciones Linux/BSD, GNU/Hurd, Mac OS y Windows
+WeeChat se ejecuta sin problemas en la mayoría de distribuciones Linux/BSD, GNU/Hurd, macOS y Windows
 (Cygwin y Windows Subsystem para Linux).
 
 Hacemos todo lo posible para que pueda ser ejecutado en cuantas plataformas sea posible. La ayuda es bienvenida para

doc/es/weechat_quickstart.es.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: es
-:toc-title: Índice
+include::includes/attributes-es.adoc[]
 
 Traductores:
 
@@ -18,8 +18,9 @@ los atajos de teclado predeterminados.
 
 Ejecuta desde una consola:
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 [[help]]
@@ -282,7 +283,7 @@ Cierra un servidor, canal o buffer privado (`/close` es un alias para
 /close
 ----
 
-[WARNING]
+[CAUTION]
 Al cerrar el buffer del servidor cerrará todos los buffer de canales/privados
 
 Para desconectar del servidor, en el buffer del servidor ejecute:

doc/fr/includes/attributes-fr.adoc

@@ -0,0 +1,23 @@
+// French translation, courtesy of Nicolas Comet <nicolas.comet@gmail.com> with updates from Maheva Bagard Laursen <mblaursen@gbif.org>
+:appendix-caption: Annexe
+:appendix-refsig: {appendix-caption}
+:caution-caption: Attention
+:chapter-signifier: Chapitre
+:chapter-refsig: {chapter-signifier}
+:example-caption: Exemple
+:figure-caption: Figure
+:important-caption: Important
+:last-update-label: Dernière mise à jour
+ifdef::listing-caption[:listing-caption: Liste]
+ifdef::manname-title[:manname-title: Nom]
+:note-caption: Note
+:part-signifier: Partie
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Préface]
+:section-refsig: Section
+:table-caption: Tableau
+:tip-caption: Astuce
+:toc-title: Table des matières
+:untitled-label: Sans titre
+:version-label: Version
+:warning-caption: Avertissement

doc/fr/includes/cmdline_options.fr.adoc

@@ -36,6 +36,9 @@
 *-h*, *--help*::
     Afficher l'aide.
 
+*-i*, *--build-info*::
+    Afficher les informations de construction et quitter.
+
 *-l*, *--license*::
     Afficher la licence de WeeChat.
 

doc/fr/includes/man.fr.adoc

@@ -100,7 +100,7 @@ $HOME/.local/share/weechat/weechat.log::
 
 // tag::copyright[]
 WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète
-est dans le fichier AUTHORS.adoc).
+est dans le fichier AUTHORS.md).
 
 Copyright (C) 2003-2024 {author}
 

doc/fr/includes/relay.fr.adoc

@@ -0,0 +1,18 @@
+// tag::diagram[]
+....
+                                              ┌──────────┐ Station de travail
+ ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
+ │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS, …)
+ └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
+   ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Appareil mobile
+ ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone, …)
+ │ jabber │◄──┘  ╚═══════════╧═══════╝    │      ......
+ └────────┘                               │   ┌──────────┐
+   ......                                 └───┤ client N │ Autres appareils
+                                              └──────────┘
+
+
+└────────────┘   └───────────────────┘╘══════╛└────────────────────────────────┘
+   serveurs        interface ncurses    relay        interfaces distantes
+....
+// end::diagram[]

doc/fr/weechat_dev.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -328,6 +328,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |    relay/                          | Extension Relay (proxy IRC et relai pour des interfaces distantes).
 |       relay.c                      | Fonctions principales de Relay.
 |       relay-auth.c                 | Authentification des clients.
+|       relay-bar-item.c             | Objets de barre Relay.
 |       relay-buffer.c               | Tampon Relay.
 |       relay-client.c               | Clients du relai.
 |       relay-command.c              | Commandes de Relay.
@@ -424,10 +425,11 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |          test-core-crypto.cpp              | Tests : fonctions cryptographiques.
 |          test-core-dir.cpp                 | Tests : répertoires/fichiers.
 |          test-core-eval.cpp                | Tests : évaluation d'expressions.
-|          test-core-hashtble.cpp            | Tests : tables de hachage.
+|          test-core-hashtable.cpp           | Tests : tables de hachage.
 |          test-core-hdata.cpp               | Tests : hdata.
 |          test-core-hook.cpp                | Tests : hooks.
 |          test-core-infolist.cpp            | Tests : infolists.
+|          test-core-input.cpp               | Tests : fonctions d'entrée.
 |          test-core-list.cpp                | Tests : listes.
 |          test-core-network.cpp             | Tests : fonctions réseau.
 |          test-core-secure.cpp              | Tests : données sécurisées.
@@ -504,6 +506,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |          relay/                            | Racine des tests unitaires pour l'extension Relay.
 |             test-relay-auth.cpp            | Tests : authentification des clients.
 |             test-relay-http.cpp            | Tests : fonctions HTTP pour l'extension Relay.
+|             test-relay-raw.cpp             | Tests : fonctions sur les messages bruts pour l'extension Relay.
 |             test-relay-remote.cpp          | Tests : fonctions remote pour l'extension Relay.
 |             test-relay-websocket.cpp       | Tests : fonctions websocket pour l'extension Relay.
 |             api/                           | Racine des tests unitaires pour le protocole relay "api".
@@ -533,7 +536,8 @@ Fichiers de documentation :
 |       weechat_faq.XX.adoc                     | link:weechat_faq.fr.html[FAQ ^↗^^] (questions fréquemment posées).
 |       weechat_plugin_api.XX.adoc              | link:weechat_plugin_api.fr.html[Référence API extension ^↗^^].
 |       weechat_quickstart.XX.adoc              | link:weechat_quickstart.fr.html[Guide de démarrage ^↗^^].
-|       weechat_relay_protocol.XX.adoc          | link:weechat_relay_protocol.fr.html[Protocole Relay ^↗^^] (pour les interfaces distantes).
+|       weechat_relay_api.XX.adoc               | link:weechat_relay_api.fr.html[Protocole relay "api" ^↗^^] (pour les interfaces distantes).
+|       weechat_relay_weechat.XX.adoc           | link:weechat_relay_weechat.fr.html[Protocole relay "weechat" ^↗^^] (pour les interfaces distantes).
 |       weechat_scripting.XX.adoc               | link:weechat_scripting.fr.html[Guide pour scripts ^↗^^].
 |       weechat_user.XX.adoc                    | link:weechat_user.fr.html[Guide utilisateur ^↗^^].
 |       includes/                               | Fichiers inclus dans la documentation.
@@ -1190,7 +1194,7 @@ server->hook_timer_sasl = weechat_hook_timer (timeout * 1000,
 Le dépôt Git est sur https://github.com/weechat/weechat[GitHub ^↗^^].
 
 Tout patch pour un bug ou une nouvelle fonctionnalité doit être effectué sur la
-branche master, le format préféré étant une "pull request" sur GitHub. Un patch
+branche `main`, le format préféré étant une "pull request" sur GitHub. Un patch
 peut aussi être envoyé par e-mail (fait avec `git diff` ou `git format-patch`).
 
 Le format du message de commit est le suivant (avec fermeture automatique
@@ -1207,15 +1211,15 @@ Où _composant_ est :
 | Composant | Fichiers | Description
 
 | core
-| AUTHORS.adoc +
+| AUTHORS.md +
-  ChangeLog.adoc +
+  CHANGELOG.md +
-  Contributing.adoc +
+  CONTRIBUTING.md +
   .github/FUNDING.yml +
   .github/ISSUE_TEMPLATE/* +
   icons/* +
   po/* +
-  README.adoc +
+  README.md +
-  ReleaseNotes.adoc +
+  UPGRADING.md +
   src/core/* +
   src/gui/* +
   version.sh +
@@ -1272,8 +1276,9 @@ Où _composant_ est :
 | Référence extension API
 
 | doc/relay
-| doc/xx/weechat_relay_protocol.xx.adoc
+| doc/xx/weechat_relay_api.xx.adoc +
-| Protocole relay
+  doc/xx/weechat_relay_weechat.xx.adoc
+| Protocoles relay
 
 | doc/dev
 | doc/xx/weechat_dev.en.adoc
@@ -1317,9 +1322,10 @@ Si vous souhaitez initialiser une nouvelle langue, utilisez la commande
 `msginit`. Par exemple pour créer un fichier qui est prêt à traduire en
 néerlandais :
 
+[source,shell]
 ----
-$ cd po
+cd po
-$ msginit -i weechat.pot -l nl_NL -o nl.po
+msginit -i weechat.pot -l nl_NL -o nl.po
 ----
 
 La langue de base pour WeeChat est l'anglais, donc vous devez évidemment
@@ -1328,8 +1334,9 @@ comprendre parfaitement l'anglais pour traduire vers votre langue.
 Après des changements dans les sources, vous pouvez regénérer toutes les
 traductions : lancez cette commande dans le répertoire "build" de CMake :
 
+[source,shell]
 ----
-$ make translations && make update-po
+make translations && make update-po
 ----
 
 Vous pouvez alors éditer les fichiers .po (si vous pouvez traduire dans une
@@ -1338,8 +1345,9 @@ langue).
 Une fois terminé, vous *devez* vérifier votre fichier avec
 https://github.com/flashcode/msgcheck[msgcheck ^↗^^] :
 
+[source,shell]
 ----
-$ msgcheck.py xx.po
+msgcheck.py xx.po
 ----
 
 Et vous pouvez alors recompiler WeeChat pour utiliser les nouvelles traductions.

doc/fr/weechat_faq.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 == Général
 
@@ -50,12 +50,14 @@ Si vous avez toujours des problèmes, merci de les remonter aux développeurs.
 Il est recommandé d'utiliser https://brew.sh/[Homebrew ^↗^^],
 vous pouvez avoir de l'aide avec :
 
+[source,shell]
 ----
 brew info weechat
 ----
 
 Vous pouvez installer WeeChat avec cette commande :
 
+[source,shell]
 ----
 brew install weechat
 ----
@@ -324,11 +326,15 @@ Vous pouvez utiliser un terminal qui propose la sélection rectangulaire (comme
 rxvt-unicode, konsole, gnome-terminal, etc.). La touche est habituellement
 kbd:[Ctrl] + kbd:[Alt] + sélection à la souris.
 
+Vous pouvez afficher/cacher la liste des pesudos et la rendre visible seulement
+lorsque c'est nécessaire, avec la touche kbd:[Alt+Shift+N].
+
 Une autre solution est de déplacer la liste des pseudos en haut ou en bas, par
 exemple :
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 [[urls]]
@@ -338,10 +344,14 @@ Vous pouvez utiliser l'affichage dépouillé (touche par défaut : kbd:[Alt+l]
 
 Pour rendre le clic d'URL plus facile, vous pouvez :
 
+* afficher/cacher la liste des pseudos et la rendre visible seulement lorsque
+  c'est nécessaire, avec la touche kbd:[Alt+Shift+N]
+
 * déplacer la liste des pseudos en haut :
 
 ----
 /set weechat.bar.nicklist.position top
+/set weechat.bar.nicklist.size_max 8
 ----
 
 * désactiver l'alignement pour les mots sur plusieurs lignes :
@@ -393,6 +403,7 @@ d'environnement `TZ` doit être positionnée à la valeur appropriée.
 Dans votre fichier d'initialisation du shell ou sur la ligne de commande, avant
 de démarrer WeeChat :
 
+[source,shell]
 ----
 export TZ=Europe/Paris
 ----
@@ -704,8 +715,9 @@ Selon le terminfo utilisé, la souris peut ne pas être supportée.
 
 Vous pouvez tester le support de la souris dans le terminal :
 
+[source,shell]
 ----
-$ printf '\033[?1002h'
+printf '\033[?1002h'
 ----
 
 Et cliquez sur le premier caractère du terminal (en haut à gauche). Vous devriez
@@ -713,8 +725,9 @@ voir " !!#!!".
 
 Pour désactiver la souris dans le terminal :
 
+[source,shell]
 ----
-$ printf '\033[?1002l'
+printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -772,7 +785,7 @@ Vous pouvez essayer une chaîne de priorité différente, remplacez "xxx" par
 le nom de votre serveur :
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1035,8 +1048,9 @@ Consultez d'abord les questions à propos des connexions TLS dans cette FAQ.
 Si cela ne fonctionne toujours pas, essayez de supprimer manuellement le fichier
 avec les scripts (dans votre shell) :
 
+[source,shell]
 ----
-$ rm ~/.cache/weechat/script/plugins.xml.gz
+rm ~/.cache/weechat/script/plugins.xml.gz
 ----
 
 [NOTE]
@@ -1062,15 +1076,17 @@ vous-même pour obtenir les mises à jour) :
 
 * dans votre shell, avec curl installé :
 
+[source,shell]
 ----
-$ cd ~/.cache/weechat/script
+cd ~/.cache/weechat/script
-$ curl -O https://weechat.org/files/plugins.xml.gz
+curl -O https://weechat.org/files/plugins.xml.gz
 ----
 
 Si vous êtes sous macOS et que le fichier téléchargé a une taille de 0 octet,
 essayez de définir cette variable dans votre fichier d'initialisation du shell
 ou sur la ligne de commande, avant de démarrer WeeChat :
 
+[source,shell]
 ----
 export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 ----
@@ -1252,6 +1268,7 @@ Voir https://weechat.org/about/support/[cette page ^↗^^].
 
 Quand vous lancez WeeChat sous gdb, vous pouvez avoir cette erreur :
 
+[source,shell]
 ----
 $ gdb /path/to/weechat
 (gdb) run
@@ -1262,6 +1279,7 @@ Cannot find new threads: generic error
 Pour corriger ça, vous pouvez lancer gdb avec cette commande (remplacez le
 chemin vers libpthread et WeeChat avec les chemins sur votre système) :
 
+[source,shell]
 ----
 $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 (gdb) run
@@ -1270,7 +1288,7 @@ $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 [[supported_os]]
 === Quelle est la liste des plates-formes supportées par WeeChat ? Sera-t-il porté sur d'autres systèmes d'exploitation ?
 
-WeeChat tourne bien sur la plupart des distributions Linux/BSD, GNU/Hurd, Mac OS
+WeeChat tourne bien sur la plupart des distributions Linux/BSD, GNU/Hurd, macOS
 et Windows (Cygwin et Windows Subsystem for Linux).
 
 Nous faisons le maximum pour supporter le plus de plates-formes possible.

doc/fr/weechat_plugin_api.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -170,9 +170,10 @@ _weechat-plugin.h_ est requis.
 
 Pour compiler l'extension qui n'a qu'un fichier "toto.c" (sous GNU/Linux) :
 
+[source,shell]
 ----
-$ gcc -fPIC -Wall -c toto.c
+gcc -fPIC -Wall -c toto.c
-$ gcc -shared -fPIC -o toto.so toto.o
+gcc -shared -fPIC -o toto.so toto.o
 ----
 
 [[load_plugin]]
@@ -2663,8 +2664,7 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"
 
 ==== string_eval_expression
 
-_WeeChat ≥ 0.4.0, mis à jour dans la 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8,
+_WeeChat ≥ 0.4.0, mis à jour dans la 0.4.2, 0.4.3, 1.0, 1.1, 1.2, 1.3, 1.6, 1.8, 2.0, 2.2, 2.3, 2.7, 2.9, 3.1, 3.2, 3.3, 3.4, 3.6, 3.8, 4.0.0, 4.2.0, 4.3.0, 4.4.0._
-2.0, 2.2, 2.3, 2.7, 2.9, 3.1, 3.2, 3.3, 3.4, 3.6, 3.8, 4.0.0, 4.2.0, 4.3.0._
 
 Évaluer l'expression et retourner le résultat sous forme de chaîne.
 Les variables spéciales avec le format `+${variable}+` sont étendues (voir le
@@ -3390,6 +3390,12 @@ première étendue à la dernière) :
 | >> `+${define:len,${calc:5+3}}${len}x${len}+` +
   == `+8x8+`
 
+| `+${hdata_count:name[list]}+` +
+  `+${hdata_count:name[pointer]}+` | 4.4.0
+| Nombre d'éléments dans la liste hdata ou en démarrant à `pointer`.
+| >> `+${hdata_count:buffer[gui_buffers]}+` +
+  == `+15+`
+
 | `+${sec.data.nom}+` |
 | Valeur de la donnée sécurisée `nom`.
 | >> `+${sec.data.libera_pass}+` +
@@ -5898,7 +5904,7 @@ Fonctions pour les tables de hachage.
 
 ==== hashtable_new
 
-_WeeChat ≥ 0.3.3._
+_WeeChat ≥ 0.3.3, mis à jour dans la 4.4.0._
 
 Créer une nouvelle table de hachage.
 
@@ -5928,12 +5934,14 @@ Paramètres :
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
+** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 * _type_values_ : type pour les valeurs dans la table de hachage :
 ** _WEECHAT_HASHTABLE_INTEGER_
 ** _WEECHAT_HASHTABLE_STRING_
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
+** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 * _callback_hash_key_ : fonction appelée pour rendre le hachage d'une clé (la
   clé sous forme de nombre entier), peut être NULL si le type de clé n'est pas
   "buffer" (une fonction de hachage par défaut est utilisée), paramètres et
@@ -6301,12 +6309,14 @@ Paramètres :
 *** _pointer_ : pointeur
 *** _buffer_ : buffer
 *** _time_ : heure
+*** _longlong_: entier de type "long long"
 ** _type_values_ : type pour les valeurs :
 *** _integer_ : entier
 *** _string_ : chaîne
 *** _pointer_ : pointeur
 *** _buffer_ : buffer
 *** _time_ : heure
+*** _longlong_: entier de type "long long"
 ** _keys_ : chaîne avec la liste des clés (format : "clé1,clé2,clé3")
 ** _keys_sorted_ : chaîne avec la liste triée des clés (format :
    "clé1,clé2,clé3")
@@ -8246,7 +8256,7 @@ def config_boolean_inherited(option: str) -> int: ...
 
 # exemple
 option = weechat.config_get("irc.server.libera.autoconnect")
-autoconect = weechat.config_boolean_inherited(option)
+autoconnect = weechat.config_boolean_inherited(option)
 ----
 
 ==== config_integer
@@ -9558,7 +9568,7 @@ _WeeChat ≥ 0.3.6, mis à jour dans la 2.0._
 
 Supprimer une/des association(s) de touche(s).
 
-[WARNING]
+[CAUTION]
 Lors de l'appel à cette fonction, assurez-vous que vous n'allez pas supprimer
 une touche définie par l'utilisateur.
 
@@ -11328,7 +11338,7 @@ hook2 = weechat.hook_url("http://localhost:8080/", options, 20000, "my_url_cb",
 
 ==== hook_connect
 
-_Mis à jour dans la 1.5, 2.0._
+_Mis à jour dans la 1.5, 2.0, 4.4.0._
 
 Accrocher une connexion (connexion à une machine distante en tâche de fond).
 
@@ -11363,8 +11373,10 @@ Paramètres :
   une connexion sans proxy)
 * _address_ : nom ou adresse IP de la machine à laquelle se connecter
 * _port_ : numéro de port
-* _ipv6_ : 1 pour utiliser IPv6 (avec repli sur IPv4), 0 pour utiliser seulement
+* _ipv6_:
-  IPv4
+** `WEECHAT_HOOK_CONNECT_IPV6_DISABLE` ^(1)^ : désactiver IPv6 (utiliser seulement IPv4)
+** `WEECHAT_HOOK_CONNECT_IPV6_AUTO` ^(1)^ : utiliser IPv6 avec repli sur IPv4
+** `WEECHAT_HOOK_CONNECT_IPV6_FORCE` ^(1)^ : forcer IPv6 (ne pas utiliser IPv4) _(WeeChat ≥ 4.4.0)_
 * _retry_ : numéro de nouvelle tentative, utilisé pour se rabattre sur les
   adresses IPv4 si la connexion IPv6 échoue
 * _gnutls_sess_ : session GnuTLS (optionnel)
@@ -11386,7 +11398,7 @@ Paramètres :
   paramètres et valeur de retour :
 ** _const void *pointer_ : pointeur
 ** _void *data_ : pointeur
-** _int status_ : statut de connexion :
+** _int status_ : statut de connexion ^(2)^ :
 *** _WEECHAT_HOOK_CONNECT_OK_ : connexion ok
 *** _WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND_ : adresse non trouvée
 *** _WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND_ : adresse IP non trouvée
@@ -11399,8 +11411,8 @@ Paramètres :
 *** _WEECHAT_HOOK_CONNECT_MEMORY_ERROR_ : mémoire insuffisante
 *** _WEECHAT_HOOK_CONNECT_TIMEOUT_ : temps maximum dépassé
 *** _WEECHAT_HOOK_CONNECT_SOCKET_ERROR_ : erreur de création socket
-** _gnutls_rc_ : valeur retour de _gnutls_handshake()_
+** _gnutls_rc_ : valeur retour de _gnutls_handshake()_ ^(2)^
-** _sock_ : socket utilisé pour la connexion
+** _sock_ : socket utilisé pour la connexion ^(2)^
 ** _const char *error_ : valeur retour de _gnutls_strerror(gnutls_rc)_
 ** _const char *ip_address_ : adresse IP trouvée
 ** valeur de retour :
@@ -11413,17 +11425,21 @@ Paramètres :
   fonction similaire) et est automatiquement libéré (par free) lorsque le
   "hook" est supprimé
 
-Valeur de retour :
+[NOTE]
-
+^(1)^ Les constantes pour le paramètre _ipv6_ sont disponibles à partir de
-* pointeur vers le nouveau "hook", NULL en cas d'erreur
+WeeChat 4.4.0. +
-
+Pour les versions plus anciennes, les valeurs autorisées sont `1` (utiliser IPv6
-[IMPORTANT]
+avec repli sur IPv4) et `0` (désactiver IPv6, utiliser seulement IPv4). +
-Dans les scripts, avec WeeChat ≥ 2.0, les paramètres de la fonction de rappel
+^(2)^ Dans les scripts, avec WeeChat ≥ 2.0, les paramètres de la fonction de rappel
 _status_, _gnutls_rc_ et _sock_ sont des entiers (avec WeeChat ≤ 1.9, ils étaient
 des chaînes). +
 Pour être compatible avec toutes les versions, il est recommandé de convertir
 le paramètre avant de l'utiliser, par exemple en Python: `int(sock)`.
 
+Valeur de retour :
+
+* pointeur vers le nouveau "hook", NULL en cas d'erreur
+
 Exemple en C :
 
 [source,c]
@@ -11473,7 +11489,8 @@ my_connect_cb (const void *pointer, void *data, int status, int gnutls_rc,
 
 struct t_hook *my_connect_hook = weechat_hook_connect (NULL,
                                                        "my.server.org", 1234,
-                                                       1, 0,
+                                                       WEECHAT_HOOK_CONNECT_IPV6_AUTO,
+                                                       0,
                                                        NULL, NULL, 0,  /* GnuTLS */
                                                        NULL,
                                                        &my_connect_cb, NULL, NULL);
@@ -11489,31 +11506,32 @@ def hook_connect(proxy: str, address: str, port: int, ipv6: int, retry: int, loc
 
 # exemple
 def my_connect_cb(data: str, status: int, gnutls_rc: int, sock: int, error: str, ip_address: str) -> int:
-    if status == WEECHAT_HOOK_CONNECT_OK:
+    if status == weechat.WEECHAT_HOOK_CONNECT_OK:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_PROXY_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_PROXY_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_TIMEOUT:
         # ...
-    elif status == WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
+    elif status == weechat.WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
         # ...
     return weechat.WEECHAT_RC_OK
 
-hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
+hook = weechat.hook_connect("", "my.server.org", 1234,
+                            weechat.WEECHAT_HOOK_CONNECT_IPV6_AUTO, 0, "",
                             "my_connect_cb", "")
 ----
 
@@ -11790,7 +11808,7 @@ Exemple en C :
 [source,c]
 ----
 int
-my_line_cb (const void *pointer, void *data, struct t_hasbtable *line)
+my_line_cb (const void *pointer, void *data, struct t_hashtable *line)
 {
     struct t_hashtable *hashtable;
 
@@ -12357,6 +12375,10 @@ Liste des signaux envoyés par WeeChat et les extensions :
 | Pointeur : ligne.
 | Ligne ajoutée dans un tampon.
 
+| weechat | [[hook_signal_buffer_line_data_changed]] buffer_line_data_changed | 4.4.0
+| Pointeur : données de la ligne.
+| Les données de la ligne ont changé dans un tampon.
+
 | weechat | [[hook_signal_buffer_lines_hidden]] buffer_lines_hidden |
 | Pointeur : tampon.
 | Lignes cachées dans le tampon.
@@ -12401,6 +12423,10 @@ Liste des signaux envoyés par WeeChat et les extensions :
 | Pointeur : tampon.
 | Modes du tampon changés.
 
+| weechat | [[hook_signal_buffer_time_for_each_line_changed]] buffer_time_for_each_line_changed | 4.4.0
+| Pointeur : tampon.
+| Affichage de l'heure pour chaque ligne changé.
+
 | weechat | [[hook_signal_buffer_type_changed]] buffer_type_changed |
 | Pointeur : tampon.
 | Type de tampon changé.
@@ -12513,6 +12539,14 @@ Liste des signaux envoyés par WeeChat et les extensions :
 | Chaîne : combinaison de touches.
 | Combinaison de touches dans le contexte _cursor_.
 
+| weechat | [[hook_signal_layout_buffers_applied]] layout_buffers_applied | 4.4.0
+| Chaîne : nom de la disposition.
+| Disposition appliquée pour les tampons.
+
+| weechat | [[hook_signal_layout_windows_applied]] layout_windows_applied | 4.4.0
+| Chaîne : nom de la disposition.
+| Disposition appliquée pour les fenêtres.
+
 | weechat | [[hook_signal_mouse_enabled]] mouse_enabled | 1.1
 | -
 | Souris activée.
@@ -12706,7 +12740,7 @@ hook = weechat.hook_signal("quit;upgrade", "my_signal_cb", "")
 
 ==== hook_signal_send
 
-_Mis à jour dans la 1.0._
+_Mis à jour dans la 1.0, 4.5.0._
 
 Envoyer un signal.
 
@@ -12720,11 +12754,23 @@ int weechat_hook_signal_send (const char *signal, const char *type_data,
 
 Paramètres :
 
-* _signal_ : signal à envoyer
+* _signal_ : signal à envoyer ; des drapeaux sont autorisés avant le nom du signal
+  (voir ci-dessous) _(WeeChat ≥ 4.5.0)_
 * _type_data_ : type de données à envoyer avec le signal (voir
   <<_hook_signal,hook_signal>>)
 * _signal_data_ : données envoyées avec le signal
 
+Le nom du signal peut contenir des drapeaux avec le format suivant : `[flags:xxx,yyy]signal`
+où `xxx` et `yyy` sont des noms de drapeaux et `signal` le nom du signal. +
+Les drapeaux suivants sont supportés :
+
+* _stop_on_error_ : sortir immédiatement si une fonction de rappel retourne
+  WEECHAT_RC_ERROR (les autres fonctions de rappel ne sont donc PAS exécutées)
+  _(WeeChat ≥ 4.5.0)_
+* _ignore_eat_ : considérer que toute fonction de rappel renvoyant WEECHAT_RC_OK_EAT
+  est en fait WEECHAT_RC_OK et exécuter les fonctions de rappel restantes
+  _(WeeChat ≥ 4.5.0)_
+
 Valeur de retour _(WeeChat ≥ 1.0)_ :
 
 * code retour de la dernière fonction de rappel exécutée (_WEECHAT_RC_OK_ si
@@ -12738,6 +12784,8 @@ Exemple en C :
 [source,c]
 ----
 int rc = weechat_hook_signal_send ("mon_signal", WEECHAT_HOOK_SIGNAL_STRING, ma_chaine);
+int rc2 = weechat_hook_signal_send ("[flags:stop_on_error,ignore_eat]my_signal2",
+                                    WEECHAT_HOOK_SIGNAL_STRING, my_string);
 ----
 
 Script (Python) :
@@ -12747,8 +12795,10 @@ Script (Python) :
 # prototype
 def hook_signal_send(signal: str, type_data: str, signal_data: str) -> int: ...
 
-# exemple
+# exemples
 rc = weechat.hook_signal_send("mon_signal", weechat.WEECHAT_HOOK_SIGNAL_STRING, ma_chaine)
+rc2 = weechat.hook_signal_send("[flags:stop_on_error,ignore_eat]my_signal2",
+                               weechat.WEECHAT_HOOK_SIGNAL_STRING, my_string)
 ----
 
 [[signal_logger_backlog]]
@@ -13042,7 +13092,7 @@ hook = weechat.hook_hsignal("test", "my_hsignal_cb", "")
 
 ==== hook_hsignal_send
 
-_WeeChat ≥ 0.3.4, mis à jour dans la 1.0._
+_WeeChat ≥ 0.3.4, mis à jour dans la 1.0, 4.5.0._
 
 Envoyer un hsignal (signal avec table de hachage).
 
@@ -13055,7 +13105,8 @@ int weechat_hook_hsignal_send (const char *signal, struct t_hashtable *hashtable
 
 Paramètres :
 
-* _signal_ : signal à envoyer
+* _signal_ : signal à envoyer ; des drapeaux sont autorisés avant le nom du signal
+  (voir la fonction <<_hook_signal_send,hook_signal_send>>) _(WeeChat ≥ 4.5.0)_
 * _hashtable_ : table de hachage
 
 Valeur de retour _(WeeChat ≥ 1.0)_ :
@@ -13070,7 +13121,7 @@ Exemple en C :
 
 [source,c]
 ----
-int rc;
+int rc, rc2;
 struct t_hashtable *hashtable = weechat_hashtable_new (8,
                                                        WEECHAT_HASHTABLE_STRING,
                                                        WEECHAT_HASHTABLE_STRING,
@@ -13080,6 +13131,7 @@ if (hashtable)
 {
     weechat_hashtable_set (hashtable, "clé", "valeur");
     rc = weechat_hook_hsignal_send ("my_hsignal", hashtable);
+    rc2 = weechat_hook_hsignal_send ("[flags:stop_on_error,ignore_eat]my_hsignal2", hashtable);
     weechat_hashtable_free (hashtable);
 }
 ----
@@ -13091,8 +13143,9 @@ Script (Python) :
 # prototype
 def hook_hsignal_send(signal: str, hashtable: Dict[str, str]) -> int: ...
 
-# exemple
+# exemples
 rc = weechat.hook_hsignal_send("my_hsignal", {"clé": "valeur"})
+rc2 = weechat.hook_hsignal_send("[flags:stop_on_error,ignore_eat]my_hsignal2", {"key": "value"})
 ----
 
 [[hsignal_irc_redirect_command]]
@@ -14925,7 +14978,6 @@ Paramètres :
 ** _number_ : numéro du tampon (commence à 1)
 ** _layout_number_ : numéro du tampon sauvegardé dans le "layout"
 ** _layout_number_merge_order_ : ordre du tampon mélangé pour le "layout"
-** _short_name_is_set_ : 1 si le nom court est défini, 0 si non défini
 ** _type_ : type de tampon (0 : formaté, 1 : contenu libre)
 ** _notify_ : niveau de notification du tampon
 ** _num_displayed_ : nombre de fenêtres affichant ce tampon
@@ -15097,7 +15149,7 @@ Exemple en C :
 
 [source,c]
 ----
-weechat_printf (NULL, "pointeur vers l'extension de mon tampon : %lx",
+weechat_printf (NULL, "pointeur vers l'extension de mon tampon : %p",
                 weechat_buffer_get_pointer (mon_tampon, "plugin"));
 ----
 
@@ -15147,6 +15199,12 @@ Propriétés :
   ne sont *PAS* vérifiées) +
   "-1" : supprimer ce tampon de la hotlist _(WeeChat ≥ 1.0)_.
 
+| hotlist_conditions | 4.5.0 | WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE,
+  WEECHAT_HOTLIST_PRIVATE, WEECHAT_HOTLIST_HIGHLIGHT
+| priorité : ajouter ce tampon dans la hotlist avec cette priorité
+  (les conditions définies dans l'option _weechat.look.hotlist_add_conditions_
+  sont vérifiées).
+
 | completion_freeze | | "0" ou "1"
 | "0" : pas de gel de la complétion (valeur par défaut)
   (option globale, le pointeur vers le tampon n'est pas utilisé) +
@@ -15523,6 +15581,46 @@ if buffer:
     weechat.prnt("", "%d" % weechat.buffer_match_list(buffer, "irc.oftc.*,python.*"))  # 0
 ----
 
+[[buffer_lines]]
+=== Lignes de tampons
+
+Fonctions pour les lignes de tampons.
+
+==== line_search_by_id
+
+_WeeChat ≥ 4.4.0._
+
+Rechercher une ligne du tampon par son identifiant.
+
+Prototype :
+
+[source,c]
+----
+struct t_gui_line *weechat_line_search_by_id (struct t_gui_buffer *buffer, int id);
+----
+
+Valeur de retour :
+
+* pointeur vers la ligne trouvée, NULL si non trouvée
+
+Exemple en C :
+
+[source,c]
+----
+struct t_gui_line *line = weechat_line_search_by_id (buffer, 123);
+----
+
+Script (Python) :
+
+[source,python]
+----
+# prototype
+def line_search_by_id(buffer: str, line_id: int) -> str: ...
+
+# exemple
+line = weechat.line_search_by_id(buffer, 123)
+----
+
 [[windows]]
 === Fenêtres
 
@@ -15588,7 +15686,7 @@ Exemple en C :
 [source,c]
 ----
 weechat_printf (NULL,
-                "fenêtre affichant le tampon core : %lx",
+                "fenêtre affichant le tampon core : %p",
                 weechat_window_search_with_buffer (weechat_buffer_search_main ()));
 ----
 
@@ -15733,7 +15831,7 @@ Exemple en C :
 [source,c]
 ----
 weechat_printf (NULL,
-                "tampon affiché dans la fenêtre courante : %lx",
+                "tampon affiché dans la fenêtre courante : %p",
                 weechat_window_get_pointer (weechat_current_window (), "buffer"));
 ----
 
@@ -17137,7 +17235,7 @@ rc = weechat.command(weechat.buffer_search("irc", "libera.#weechat"), "/whois Fl
 
 ==== command_options
 
-_WeeChat ≥ 2.5, mis à jour dans la 4.0.0._
+_WeeChat ≥ 2.5, mis à jour dans la 4.0.0, 4.5.0._
 
 Exécuter une commande ou envoyer du texte au tampon avec des options.
 
@@ -17153,13 +17251,15 @@ Paramètres :
 
 * _buffer_ : pointeur vers le tampon (la commande est exécutée sur ce tampon,
   NULL pour le tampon courant)
-* _command_ : commande à exécuter (si elle commence par "/"), ou texte à
+* _command_ : commande à exécuter (si elle commence par `/` ou un caractère de
-  envoyer au tampon
+  commande), ou texte à envoyer au tampon
 * _options_ : table de hachage avec des options (les clés et valeurs doivent
   être des chaînes) (peut être NULL) :
 ** _commands_ : une liste de commandes autorisées pendant l'appel, séparées par
-   des virgules ; voir la fonction <<_string_match_list,string_match_list>>
+   des virgules (voir la fonction <<_string_match_list,string_match_list>>
-   pour le format
+   pour le format) ; la valeur spéciale `-` (moins) désactive l'exécution des
+   commandes et la chaîne dans _command_ est envoyée telle quelle au tampon
+   (_WeeChat ≥ 4.5.0_)
 ** _delay_ : délai pour exécuter la commande, en millisecondes
 ** _split_newline_ : `1` pour découper les commandes sur le caractère de retour
    à la ligne (`\n`) (_WeeChat ≥ 4.0.0_)
@@ -17193,7 +17293,7 @@ Script (Python) :
 def command_options(buffer: str, command: str, options: Dict[str, str]) -> int: ...
 
 # exemple : autoriser toute commande sauf /exec
-rc = weechat.command_options("", "/une_commande paramètres", {"commands": "*,!exec"})
+rc = weechat.command_options("", "/une_commande paramètres", {"commands": "*,!exec", "delay": "2000"})
 ----
 
 [[completion]]
@@ -19664,7 +19764,7 @@ Exemple en C :
 ----
 struct t_hdata *hdata = weechat_hdata_get ("buffer");
 struct t_gui_buffer *buffer = weechat_buffer_search_main ();
-weechat_printf (NULL, "lines = %lx", weechat_hdata_pointer (hdata, buffer, "lines"));
+weechat_printf (NULL, "lines = %p", weechat_hdata_pointer (hdata, buffer, "lines"));
 ----
 
 Script (Python) :

doc/fr/weechat_quickstart.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 [[start]]
 == Démarrer WeeChat
@@ -13,8 +13,9 @@ touches par défaut.
 
 Lancer depuis votre shell :
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 [[help]]
@@ -275,7 +276,7 @@ Fermer un tampon serveur, canal ou privé (`/close` est un alias sur
 /close
 ----
 
-[WARNING]
+[CAUTION]
 Fermer le tampon du serveur fermera tous les tampons canaux/privés.
 
 Se déconnecter du serveur, sur le tampon du serveur :

doc/fr/weechat_relay_weechat.fr.adoc

@@ -2,12 +2,12 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 [[introduction]]
 == Introduction
 
-Ce document est une spécification du protocole Relay de WeeChat : le protocole
+Ce document est une spécification du protocole relay _weechat_ : le protocole
 utilisé pour relayer les données de WeeChat aux clients, qui sont surtout des
 interfaces distantes.
 
@@ -27,28 +27,11 @@ Les termes suivants sont utilisés dans ce document :
 
 Les _clients_ sont connectés au _relay_ comme dans le diagramme ci-dessous :
 
-....
+include::includes/relay.fr.adoc[tag=diagram]
-                                              ┌──────────┐ Station de travail
- ┌────────┐                               ┌───┤ client 1 │ (Linux, Windows,
- │  irc   │◄──┐  ╔═══════════╤═══════╗    │   └──────────┘ BSD, macOS ...)
- └────────┘   └──╢           │       ║◄───┘   ┌──────────┐
-   ......        ║  WeeChat  │ Relay ║◄───────┤ client 2 │ Appareil mobile
- ┌────────┐   ┌──╢           │       ║◄───┐   └──────────┘ (Android, iPhone ...)
- │ jabber │◄──┘  ╚═══════════╧═══════╝    │      ......
- └────────┘                               │   ┌──────────┐
-   ......                                 └───┤ client N │ Autres appareils
-                                              └──────────┘
-
-
-└────────────┘   └───────────────────┘╘══════╛└────────────────────────────────┘
-   serveurs        interface ncurses  protocole      interfaces distantes
-                                        relay
-....
 
 [NOTE]
 Tous les clients ici utilisent le protocole _weechat_ dans l'extension _relay_.
-L'extension _relay_ autorise aussi des clients IRC, et _relay_ agit alors comme
+L'extension _relay_ autorise aussi les protocoles _api_ et _irc_ (non décrits dans ce document).
-un _proxy IRC_ (non décrit dans ce document).
 
 [[protocol_generalities]]
 == Généralités sur le protocole
@@ -1531,6 +1514,9 @@ Les identifiants réservés par WeeChat :
 | _buffer_line_added | buffer | hdata : line
 | Ligne ajoutée dans le tampon. | Afficher la ligne dans le tampon.
 
+| _buffer_line_data_changed | buffer | hdata : line
+| Ligne changée dans le tampon. | Modifier la ligne affichée dans le tampon.
+
 | _nicklist | nicklist | hdata : nicklist_item
 | Liste de pseudos pour un tampon. | Remplacer la liste de pseudos.
 
@@ -2087,6 +2073,7 @@ Données envoyées dans le hdata :
 |===
 | Nom               | Type               | Description
 | buffer            | pointeur           | Pointeur vers le tampon.
+| id                | entier             | Identifiant de ligne.
 | date              | date/heure         | Date du message.
 | date_usec         | entier             | Microsecondes de la date.
 | date_printed      | date/heure         | Date d'affichage du message.
@@ -2108,6 +2095,7 @@ id: '_buffer_line_added'
 hda:
     keys: {
         'buffer': 'ptr',
+        'id': 'int',
         'date': 'tim',
         'date_usec': 'int',
         'date_printed': 'tim',
@@ -2123,6 +2111,59 @@ hda:
     item 1:
         __path: ['0x4a49600']
         buffer: '0x4a715d0'
+        id: 12
+        date: 1362728993
+        date_usec: 902765
+        date_printed: 1362728993
+        date_usec_printed: 902765
+        displayed: 1
+        notify_level: 1
+        highlight: 0
+        tags_array: [
+            'irc_privmsg',
+            'notify_message',
+            'prefix_nick_142',
+            'nick_FlashCode',
+            'log1',
+        ]
+        prefix: 'F06@F@00142FlashCode'
+        message: 'hello!'
+----
+
+[[message_buffer_line_data_changed]]
+==== _buffer_line_data_changed
+
+Ce message est envoyé au client lorsque le signal "buffer_line_data_changed"
+est envoyé par WeeChat.
+
+Données envoyées dans le hdata : mêmes données que pour
+<<message_buffer_line_added,_buffer_line_added>>.
+
+Exemple : le message _hello!_ du pseudo _FlashCode_ sur le tampon _irc.libera.#weechat_ a été mis à jour :
+
+[source,python]
+----
+id: '_buffer_line_data_changed'
+hda:
+    keys: {
+        'buffer': 'ptr',
+        'id': 'int',
+        'date': 'tim',
+        'date_usec': 'int',
+        'date_printed': 'tim',
+        'date_usec_printed': 'int',
+        'displayed': 'chr',
+        'notify_level': 'chr',
+        'highlight': 'chr',
+        'tags_array': 'arr',
+        'prefix': 'str',
+        'message': 'str',
+    }
+    path: ['line_data']
+    item 1:
+        __path: ['0x4a49600']
+        buffer: '0x4a715d0'
+        id: 12
         date: 1362728993
         date_usec: 902765
         date_printed: 1362728993

doc/fr/weechat_scripting.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -73,7 +73,7 @@ link:weechat_plugin_api.fr.html#_hook_process[Référence API extension WeeChat
 
 WeeChat définit un module `weechat` qui doit être importé avec `import weechat`. +
 Un "stub" Python pour l'API WeeChat est disponible dans le dépôt :
-https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Fonctions
@@ -376,9 +376,10 @@ automatiquement le script quand WeeChat démarre.
 
 Par exemple en Python :
 
+[source,shell]
 ----
-$ cd ~/.local/share/weechat/python/autoload
+cd ~/.local/share/weechat/python/autoload
-$ ln -s ../script.py
+ln -s ../script.py
 ----
 
 [NOTE]

doc/fr/weechat_user.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-:toc-title: Table des matières
+include::includes/attributes-fr.adoc[]
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -110,7 +110,7 @@ Le tableau suivant liste les paquets *requis* pour construire WeeChat :
 | cmake | ≥ 3.0
 | Construction.
 
-| pkg-config |
+| pkgconf / pkg-config |
 | Détection des bibliothèques installées.
 
 | libncurses-dev |
@@ -219,8 +219,9 @@ Si vous utilisez une distribution basée sur Debian ou Ubuntu, et si vous avez
 des entrées source "deb-src" dans votre fichier _/etc/apt/sources.list_, vous
 pouvez installer toutes les dépendances avec la commande :
 
+[source,shell]
 ----
-# apt-get build-dep weechat
+sudo apt-get build-dep weechat
 ----
 
 [[build]]
@@ -228,22 +229,24 @@ pouvez installer toutes les dépendances avec la commande :
 
 * Installation dans les répertoires systèmes (nécessite les droits _root_) :
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake ..
+cmake ..
-$ make
+make
-$ sudo make install
+sudo make install
 ----
 
 * Installation dans un répertoire spécifique (par exemple dans votre "home") :
 
+[source,shell]
 ----
-$ mkdir build
+mkdir build
-$ cd build
+cd build
-$ cmake .. -DCMAKE_INSTALL_PREFIX=/chemin/vers/répertoire
+cmake .. -DCMAKE_INSTALL_PREFIX=/chemin/vers/répertoire
-$ make
+make
-$ make install
+make install
 ----
 
 Des options peuvent être utilisées pour CMake, avec le format : `-DOPTION=VALUE`.
@@ -380,14 +383,16 @@ Liste des options disponibles :
 
 Les autres options peuvent être affichées avec cette commande :
 
+[source,shell]
 ----
-$ cmake -LA
+cmake -LA
 ----
 
 Ou avec l'interface Curses :
 
+[source,shell]
 ----
-$ ccmake ..
+ccmake ..
 ----
 
 [[tests]]
@@ -400,14 +405,16 @@ Les paquets suivants sont nécessaires pour compiler les tests :
 
 Les tests doivent être activés pour compiler WeeChat :
 
+[source,shell]
 ----
-$ cmake .. -DENABLE_TESTS=ON
+cmake .. -DENABLE_TESTS=ON
 ----
 
 Ils peuvent être lancés après compilation depuis le répertoire de construction :
 
+[source,shell]
 ----
-$ ctest -V
+ctest -V
 ----
 
 [[git_sources]]
@@ -418,8 +425,9 @@ que WeeChat ne compile pas et qu'il soit très instable. Vous êtes prévenus !
 
 Pour récupérer les sources Git, tapez cette commande :
 
+[source,shell]
 ----
-$ git clone https://github.com/weechat/weechat.git
+git clone https://github.com/weechat/weechat.git
 ----
 
 Suivez alors les instructions du paquet source (voir
@@ -442,8 +450,9 @@ futur de WeeChat, vous devez :
 
 Si vous compilez avec CMake :
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug
+cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----
 
 [[address_sanitizer]]
@@ -452,18 +461,20 @@ $ cmake .. -DCMAKE_BUILD_TYPE=Debug
 Vous pouvez aussi activer la vérification des adresses (« address sanitizer »),
 ce qui provoquera immédiatement un plantage de WeeChat en cas de problème :
 
+[source,shell]
 ----
-$ cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address
 ----
 
-[WARNING]
+[CAUTION]
 Vous ne devriez activer la vérification des adresses que si vous essayez de
 provoquer un plantage, ce qui n'est pas recommandé en production.
 
 Une fois compilé et installé, vous devez lancer WeeChat comme ceci :
 
+[source,shell]
 ----
-$ ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
+ASAN_OPTIONS="detect_odr_violation=0 log_path=asan.log" weechat
 ----
 
 En cas de plantage, la trace se trouve dans le fichier `asan.log`.
@@ -484,12 +495,14 @@ WeeChat ne démarre, vous pouvez utiliser la commande `ulimit`.
 Par exemple sous Linux avec le shell _bash_, ajoutez cette ligne dans votre
 `~/.bashrc` :
 
+[source,shell]
 ----
 ulimit -c unlimited
 ----
 
 Ou une taille maximum :
 
+[source,shell]
 ----
 ulimit -c 200000
 ----
@@ -513,6 +526,7 @@ https://wiki.archlinux.org/title/Core_dump[page wiki ^↗^^].
 Par exemple si _weechat_ est installé dans _/usr/bin/_ et que le fichier
 _core_ se trouve dans _/home/user/_, alors il faut lancer gdb avec cette commande :
 
+[source,shell]
 ----
 gdb /usr/bin/weechat /home/user/core
 ----
@@ -561,6 +575,7 @@ Pour déboguer WeeChat qui tourne (par exemple si WeeChat semble bloqué), vous
 pouvez utiliser gdb avec l'identifiant du processus (remplacez _12345_ par le
 PID du processus weechat) :
 
+[source,shell]
 ----
 gdb /usr/bin/weechat 12345
 ----
@@ -576,8 +591,9 @@ Ensuite comme pour un crash, utilisez la commande `bt full` :
 
 Pour lancer WeeChat, tapez cette commande :
 
+[source,shell]
 ----
-$ weechat
+weechat
 ----
 
 Lorsque vous lancez WeeChat pour la première fois, les fichiers de configuration
@@ -591,7 +607,7 @@ include::includes/cmdline_options.fr.adoc[tag=standard]
 
 Quelques options supplémentaires sont disponibles pour du debug seulement :
 
-[WARNING]
+[CAUTION]
 N'utilisez *AUCUNE* de ces options in production !
 
 include::includes/cmdline_options.fr.adoc[tag=debug]
@@ -801,25 +817,26 @@ Cela sauvegarde l'état actuel dans des fichiers `*.upgrade`. Vous pouvez soit
 rebooter ou déplacer les répertoires WeeChat (config, data, cache) vers une
 autre machine, et redémarrer WeeChat plus tard avec cette commande :
 
+[source,shell]
 ----
-$ weechat --upgrade
+weechat --upgrade
 ----
 
 [[restart_after_upgrade]]
 === Redémarrage après mise à jour
 
-[[restart_release_notes]]
+[[restart_upgrading_notes]]
-==== Notes de version
+==== Notes de mise à jour
 
-Après une mise à jour, il est *fortement recommandé* de lire les
+Après une mise à jour, il est *fortement recommandé* de lire le fichier
-https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[notes de version ^↗^^]
+https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
-qui contiennent des informations importantes sur les changements majeurs et
+qui contient des informations importantes sur les changements majeurs et
 quelques actions manuelles qui pourraient être nécessaires.
 
-Vous devez lire les notes des versions entre votre version ancienne (exclue)
+Vous devez lire les versions entre votre version ancienne (exclue)
 et votre nouvelle version (incluse). +
-Par exemple si vous passez de la version 3.0 à 3.2, vous devez lire les notes
+Par exemple si vous passez de la version 4.0.0 à 4.3.0, vous devez lire les
-des versions 3.1 et 3.2.
+versions 4.0.1 à 4.3.0.
 
 [[restart_configuration_upgrade]]
 ==== Mise à jour de la configuration
@@ -873,7 +890,7 @@ Exemple de terminal avec WeeChat :
 │         │                                                                    │       │
 │         │                                                                    │       │
 │         │                                                                    │       │
-│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* [H: 3:#abc(2,5), 5]                │
+│         │[12:55] [5] [irc/libera] 2:#test(+n){4}* M [H: 3:#abc(2,5), 5]              │
 │         │[@Flashy(i)] salut peter !█                                                 │
 └──────────────────────────────────────────────────────────────────────────────────────┘
             ▲ barres "status" et "input"                            barre "nicklist" ▲
@@ -913,32 +930,34 @@ La barre _status_ contient les objets (items) suivants par défaut :
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Objet (item)          | Exemple               | Description
+| Objet (item)          | Exemple                | Description
-| time                  | `[12:55]`             | Heure.
+| time                  | `12:55`                | Heure.
-| buffer_last_number    | `[5]`                 | Numéro du dernier tampon de la liste.
+| buffer_last_number    | `5`                    | Numéro du dernier tampon (peut être différent de `buffer_count` si l'option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> est `off`).
-| buffer_plugin         | `[irc/libera]`        | Extension du tampon courant (l'extension irc peut afficher le nom du serveur IRC auquel est rattaché ce tampon).
+| buffer_plugin         | `irc/libera`           | Extension du tampon courant (l'extension irc peut afficher le nom du serveur IRC auquel est rattaché ce tampon).
-| buffer_number         | `2`                   | Numéro du tampon courant.
+| buffer_number         | `2`                    | Numéro du tampon courant.
-| buffer_name           | `#test`               | Nom du tampon courant.
+| buffer_name           | `#test`                | Nom du tampon courant.
-| buffer_modes          | `+n`                  | Modes du canal IRC.
+| buffer_modes          | `+n`                   | Modes du canal IRC.
-| buffer_nicklist_count | `{4}`                 | Nombre de pseudos affichés dans la liste des pseudos.
+| buffer_nicklist_count | `4`                    | Nombre de pseudos affichés dans la liste des pseudos.
-| buffer_zoom           | !                     | `!` signifie que le tampon mélangé est zoomé, une valeur vide signifie que tous les tampons mélangés sont affichés.
+| buffer_zoom           | !                      | `!` signifie que le tampon mélangé est zoomé, une valeur vide signifie que tous les tampons mélangés sont affichés.
-| buffer_filter         | `+*+`                 | Indicateur de filtrage : `+*+` signifie que des lignes sont filtrées (cachées), une valeur vide signifie que toutes les lignes sont affichées.
+| buffer_filter         | `+*+`                  | Indicateur de filtrage : `+*+` signifie que des lignes sont filtrées (cachées), une valeur vide signifie que toutes les lignes sont affichées.
-| scroll                | `-PLUS(50)-`          | Indicateur de scroll, avec le nombre de lignes sous la dernière ligne affichée.
+| mouse_status          | `M`                    | Statut de la souris (vide si la souris est désactivée), voir la commande <<command_weechat_mouse,/mouse>> et <<key_bindings_toggle_keys,Touches de bascule>>.
-| lag                   | `[Lag: 2.5]`          | Indicateur de "lag" (ralentissements réseau), en secondes (caché si le lag est faible).
+| scroll                | `-PLUS(50)-`           | Indicateur de scroll, avec le nombre de lignes sous la dernière ligne affichée.
-| hotlist               | `[H: 3:#abc(2,5), 5]` | Liste des tampons où il y a de l'activité (messages non lus) (dans cet exemple, 2 highlights et 5 messages non lus sur _#abc_, un message non lu sur le tampon numéro 5).
+| lag                   | `Lag: 2.5`             | Indicateur de "lag" (ralentissements réseau), en secondes (caché si le lag est faible).
-| completion            | `abc(2) def(5)`       | Liste des mots pour la complétion, avec le nombre de complétions possibles pour chaque mot.
+| hotlist               | `H: 3:#abc(2,5), 5`    | Liste des tampons où il y a de l'activité (messages non lus) (dans cet exemple, 2 highlights et 5 messages non lus sur _#abc_, un message non lu sur le tampon numéro 5).
+| typing                | `Écrit : bob, (alice)` | Notification de saisie, voir <<typing_notifications,Notifications de saisie>>.
+| completion            | `abc(2) def(5)`        | Liste des mots pour la complétion, avec le nombre de complétions possibles pour chaque mot.
 |===
 
 La barre _input_ contient les objets (items) suivants par défaut :
 
 [width="100%",cols="^3,^3,9",options="header"]
 |===
-| Objet (item) | Exemple                                         | Description
+| Objet (item) | Exemple                                       | Description
-| input_prompt | `[@Flashy(i)]`                                  | Prompt, pour irc : pseudo et modes (le mode "+i" signifie invisible sur libera).
+| input_prompt | `@Flashy(i)`                                  | Prompt, pour irc : pseudo et modes (le mode "+i" signifie invisible sur libera).
-| away         | `(absent)`                                      | Indicateur d'absence.
+| away         | `absent`                                      | Indicateur d'absence.
-| input_search | `[Recherche lignes (~ str,msg)]`                | Indicateur de recherche de texte (voir ci-dessous).
+| input_search | `Recherche lignes (~ str,msg)`                | Indicateur de recherche de texte (voir ci-dessous).
-| input_paste  | `[Coller 7 lignes ? [ctrl-y] Oui [ctrl-n] Non]` | Question à l'utilisateur pour coller des lignes.
+| input_paste  | `Coller 7 lignes ? [ctrl-y] Oui [ctrl-n] Non` | Question à l'utilisateur pour coller des lignes.
-| input_text   | `salut peter !`                                 | Texte entré.
+| input_text   | `salut peter !`                               | Texte entré.
 |===
 
 Il y a deux modes de recherche :
@@ -974,8 +993,7 @@ Autres objets (non utilisés dans des barres par défaut) :
 [width="100%",cols="^3,^3,9",options="header"]
 |===
 | Objet (item)                 | Exemple                  | Description
-| buffer_count                 | `10`                     | Nombre total de tampons ouverts.
+| buffer_count                 | `5`                      | Nombre total de tampons ouverts.
-| buffer_last_number           | `10`                     | Numéro du dernier tampon (peut être différent de `buffer_count` si l'option <<option_weechat.look.buffer_auto_renumber,weechat.look.buffer_auto_renumber>> est `off`).
 | buffer_nicklist_count_all    | `4`                      | Nombre de groupes et pseudos visibles dans la liste de pseudos.
 | buffer_nicklist_count_groups | `0`                      | Nombre de groupes visibles dans la liste de pseudos.
 | buffer_short_name            | `#test`                  | Nom court du tampon courant.
@@ -990,7 +1008,7 @@ Autres objets (non utilisés dans des barres par défaut) :
 | irc_nick_host                | `+Flashy!user@host.com+` | Pseudo et hôte IRC.
 | irc_nick_modes               | `i`                      | Modes IRC pour le pseudo.
 | irc_nick_prefix              | `@`                      | Préfixe de pseudo IRC sur le canal.
-| mouse_status                 | `M`                      | Statut de la souris (vide si la souris est désactivée).
+| spacer                       |                          | Objet spécial utilisé pour aligner le texte dans les barres, voir <<item_spacer,Objet d'espacement>>.
 | spell_dict                   | `fr,en`                  | Dictionnaires utilisés pour la vérification de l'orthographe sur le tampon courant.
 | spell_suggest                | `print,prone,prune`      | Suggestions pour le mot sous le curseur (si mal orthographié).
 | tls_version                  | `TLS1.3`                 | Version de TLS utilisée sur le serveur IRC courant.
@@ -1350,7 +1368,7 @@ Les étiquettes couramment utilisées (liste non exhaustive) :
 | no_filter        | La ligne ne peut pas être filtrée.
 | no_highlight     | Aucun highlight n'est possible sur cette ligne.
 | no_log           | La ligne n'est pas écrite dans le fichier de log.
-| log0 … log9      | Niveau de log pour la ligne (voir `/help logger`).
+| log0 … log9      | Niveau de log pour la ligne (voir la commande <<command_logger_logger,/logger>>).
 | notify_none      | La ligne ne doit pas être ajoutée à la "hotlist". ^(1)^
 | notify_message   | La ligne est un message utilisateur. ^(1)^
 | notify_private   | La ligne est un message privé. ^(1)^
@@ -2047,27 +2065,27 @@ Exemple de tampon fset affichant les options commençant par `weechat.look` :
 [subs="quotes"]
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│1/121 | Filter: weechat.look.* | Sort: ~name | Key(input): alt+space=toggle │
+│1.weechat│7/125 | Filtre : weechat.look.* | Tri : ~name | Touche(entrée) : alt+space>>│
-│2.fset   │weechat.look.bare_display_exit_on_input: exit the bare display mode on any c│
+│2.fset   │weechat.look.bare_display_exit_on_input : sortir du mode d'affichage dépouil│
-│         │hanges in input [default: on]                                               │
+│         │lé ("bare") sur tout changement dans la ligne de commande [défaut : on]     │
 │         │----------------------------------------------------------------------------│
-│         │  weechat.look.align_end_of_lines                   enum     message        │
+│         │  weechat.look.align_end_of_lines              énuméré  message             │
-│         │  weechat.look.align_multiline_words                boolean  on             │
+│         │  weechat.look.align_multiline_words           booléen  on                  │
-│         │  weechat.look.bar_more_down                        string   "++"           │
+│         │  weechat.look.bar_more_down                   chaîne   "++"                │
-│         │  weechat.look.bar_more_left                        string   "<<"           │
+│         │  weechat.look.bar_more_left                   chaîne   "<<"                │
-│         │  weechat.look.bar_more_right                       string   ">>"           │
+│         │  weechat.look.bar_more_right                  chaîne   ">>"                │
-│         │  weechat.look.bar_more_up                          string   "--"           │
+│         │  weechat.look.bar_more_up                     chaîne   "--"                │
-│         │##  weechat.look.bare_display_exit_on_input           boolean  on             ##│
+│         │##  weechat.look.bare_display_exit_on_input      booléen  on                  ##│
-│         │  weechat.look.bare_display_time_format             string   "%H:%M"        │
+│         │  weechat.look.bare_display_time_format        chaîne   "%H:%M"             │
-│         │  weechat.look.buffer_auto_renumber                 boolean  on             │
+│         │  weechat.look.buffer_auto_renumber            booléen  on                  │
-│         │  weechat.look.buffer_notify_default                enum     all            │
+│         │  weechat.look.buffer_notify_default           énuméré  all                 │
-│         │  weechat.look.buffer_position                      enum     end            │
+│         │  weechat.look.buffer_position                 énuméré  end                 │
-│         │  weechat.look.buffer_search_case_sensitive         boolean  off            │
+│         │  weechat.look.buffer_search_case_sensitive    booléen  off                 │
-│         │  weechat.look.buffer_search_force_default          boolean  off            │
+│         │  weechat.look.buffer_search_force_default     booléen  off                 │
-│         │  weechat.look.buffer_search_regex                  boolean  off            │
+│         │  weechat.look.buffer_search_history           énuméré  local               │
-│         │  weechat.look.buffer_search_where                  enum     prefix_message │
+│         │  weechat.look.buffer_search_regex             booléen  off                 │
-│         │  weechat.look.buffer_time_format                   string   "%H:%M:%S"     │
+│         │  weechat.look.buffer_search_where             énuméré  prefix_message      │
-│         │  weechat.look.buffer_time_same                     string   ""             │
+│         │  weechat.look.buffer_time_format              chaîne   "%H:%M:%S"          │
 │         │[12:55] [2] [fset] 2:fset                                                   │
 │         │█                                                                           │
 └──────────────────────────────────────────────────────────────────────────────────────┘
@@ -2876,8 +2894,9 @@ options dans la section "option" de la configuration aspell.
 Le nom de l'option est une option de configuration aspell. La liste des options
 peut être trouvée par la commande suivante sous le shell :
 
+[source,shell]
 ----
-$ aspell config
+aspell config
 ----
 
 Par exemple, pour activer l'option "ignore-case" :
@@ -3339,7 +3358,7 @@ Les données sécurisées peuvent être utilisées dans quelques options qui peu
 contenir des données sensibles comme un mot de passe, en utilisant ce format :
 "${sec.data.xxx}" où "xxx" est le nom de la donnée sécurisée (utilisé dans la
 commande `/secure set xxx ...`). +
-Pour une liste complète des options supportées, voir `/help secure`.
+Pour une liste complète des options supportées, voir la commande <<command_weechat_secure,/secure>>.
 
 Pour utiliser le mot de passe _libera_, par exemple avec
 <<irc_sasl_authentication,l'authentification SASL>> :
@@ -3465,8 +3484,9 @@ irc[6][s]://[pseudo[:mot_passe]@]irc.example.org[:port][/canal][,canal[...]]
 Exemple pour rejoindre _#weechat_ et _#weechat-fr_ sur le serveur
 _irc.libera.chat_, port par défaut (6667), avec le pseudo _alice_ :
 
+[source,shell]
 ----
-$ weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
+weechat irc://alice@irc.libera.chat/#weechat,#weechat-fr
 ----
 
 [[irc_servers]]
@@ -3482,9 +3502,12 @@ Par exemple pour vous connecter à https://libera.chat/[libera.chat ^↗^^] ave
 (communications chiffrées) :
 
 ----
-/server add libera irc.libera.chat/6697 -tls
+/server add libera irc.libera.chat
 ----
 
+[NOTE]
+Le port par défaut est 6697 et TLS (communications chiffrées) est activé.
+
 Vous pouvez demander à WeeChat de se connecter automatiquement à ce serveur
 au démarrage :
 
@@ -3527,51 +3550,52 @@ Par exemple si vous avez créé le serveur _libera_ avec les commandes ci-dessus
 vous verrez ceci avec la commande `/fset libera` :
 
 ....
-irc.server.libera.addresses             string   "irc.libera.chat/6697"
+irc.server.libera.addresses             chaîne   "irc.libera.chat"
-irc.server.libera.anti_flood_prio_high  integer  null -> 2
+irc.server.libera.anti_flood            entier   null -> 2000
-irc.server.libera.anti_flood_prio_low   integer  null -> 2
+irc.server.libera.autoconnect           booléen  on
-irc.server.libera.autoconnect           boolean  on
+irc.server.libera.autojoin              chaîne   null -> ""
-irc.server.libera.autojoin              string   null -> ""
+irc.server.libera.autojoin_delay        entier   null -> 0
-irc.server.libera.autojoin_dynamic      boolean  null -> off
+irc.server.libera.autojoin_dynamic      booléen  null -> off
-irc.server.libera.autoreconnect         boolean  null -> on
+irc.server.libera.autoreconnect         booléen  null -> on
-irc.server.libera.autoreconnect_delay   integer  null -> 10
+irc.server.libera.autoreconnect_delay   entier   null -> 10
-irc.server.libera.autorejoin            boolean  null -> off
+irc.server.libera.autorejoin            booléen  null -> off
-irc.server.libera.autorejoin_delay      integer  null -> 30
+irc.server.libera.autorejoin_delay      entier   null -> 30
-irc.server.libera.away_check            integer  null -> 0
+irc.server.libera.away_check            entier   null -> 0
-irc.server.libera.away_check_max_nicks  integer  null -> 25
+irc.server.libera.away_check_max_nicks  entier   null -> 25
-irc.server.libera.capabilities          string   null -> "*"
+irc.server.libera.capabilities          chaîne   null -> "*"
-irc.server.libera.charset_message       enum     null -> message
+irc.server.libera.charset_message       énuméré  null -> message
-irc.server.libera.command               string   null -> ""
+irc.server.libera.command               chaîne   null -> ""
-irc.server.libera.command_delay         integer  null -> 0
+irc.server.libera.command_delay         entier   null -> 0
-irc.server.libera.connection_timeout    integer  null -> 60
+irc.server.libera.connection_timeout    entier   null -> 60
-irc.server.libera.default_chantypes     string   null -> "#&"
+irc.server.libera.default_chantypes     chaîne   null -> "#&"
-irc.server.libera.ipv6                  boolean  null -> on
+irc.server.libera.ipv6                  énuméré  null -> auto
-irc.server.libera.local_hostname        string   null -> ""
+irc.server.libera.local_hostname        chaîne   null -> ""
-irc.server.libera.msg_kick              string   null -> ""
+irc.server.libera.msg_kick              chaîne   null -> ""
-irc.server.libera.msg_part              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_part              chaîne   null -> "WeeChat ${info:version}"
-irc.server.libera.msg_quit              string   null -> "WeeChat ${info:version}"
+irc.server.libera.msg_quit              chaîne   null -> "WeeChat ${info:version}"
-irc.server.libera.nicks                 string   null -> "alice,alice1,alice2,alice3,alice4"
+irc.server.libera.nicks                 chaîne   null -> "${username},${username}2,${username}3,${username}4,${username}5"
-irc.server.libera.nicks_alternate       boolean  null -> on
+irc.server.libera.nicks_alternate       booléen  null -> on
-irc.server.libera.notify                string   null -> ""
+irc.server.libera.notify                chaîne   null -> ""
-irc.server.libera.password              string   null -> ""
+irc.server.libera.password              chaîne   null -> ""
-irc.server.libera.proxy                 string   null -> ""
+irc.server.libera.proxy                 chaîne   null -> ""
-irc.server.libera.realname              string   null -> ""
+irc.server.libera.realname              chaîne   null -> ""
-irc.server.libera.sasl_fail             enum     null -> reconnect
+irc.server.libera.registered_mode       chaîne   null -> "r"
-irc.server.libera.sasl_key              string   null -> ""
+irc.server.libera.sasl_fail             énuméré  null -> reconnect
-irc.server.libera.sasl_mechanism        enum     null -> plain
+irc.server.libera.sasl_key              chaîne   null -> ""
-irc.server.libera.sasl_password         string   "${sec.data.libera}"
+irc.server.libera.sasl_mechanism        énuméré  null -> plain
-irc.server.libera.sasl_timeout          integer  null -> 15
+irc.server.libera.sasl_password         chaîne   "${sec.data.libera}"
-irc.server.libera.sasl_username         string   "alice"
+irc.server.libera.sasl_timeout          entier   null -> 15
-irc.server.libera.split_msg_max_length  integer  null -> 512
+irc.server.libera.sasl_username         chaîne   "alice"
-irc.server.libera.tls                   boolean  on
+irc.server.libera.split_msg_max_length  entier   null -> 512
-irc.server.libera.tls_cert              string   null -> ""
+irc.server.libera.tls                   booléen  null -> on
-irc.server.libera.tls_dhkey_size        integer  null -> 2048
+irc.server.libera.tls_cert              chaîne   null -> ""
-irc.server.libera.tls_fingerprint       string   null -> ""
+irc.server.libera.tls_dhkey_size        entier   null -> 2048
-irc.server.libera.tls_password          string   null -> ""
+irc.server.libera.tls_fingerprint       chaîne   null -> ""
-irc.server.libera.tls_priorities        string   null -> "NORMAL:-VERS-SSL3.0"
+irc.server.libera.tls_password          chaîne   null -> ""
-irc.server.libera.tls_verify            boolean  null -> on
+irc.server.libera.tls_priorities        chaîne   null -> "NORMAL"
-irc.server.libera.usermode              string   null -> ""
+irc.server.libera.tls_verify            booléen  null -> on
-irc.server.libera.username              string   null -> "alice"
+irc.server.libera.usermode              chaîne   null -> ""
+irc.server.libera.username              chaîne   null -> "${username}"
 ....
 
 Par exemple si vous voulez vous connecter automatiquement à tous les serveurs
@@ -3624,9 +3648,10 @@ et peut échouer, même si cela pouvait être OK dans les versions inférieures
 
 * Importer le certificat sous le shell :
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
+wget -O ~/.config/weechat/tls/CAs.pem https://www.spi-inc.org/ca/spi-cacert.crt
 ----
 
 [NOTE]
@@ -3647,10 +3672,11 @@ Il est possible de concaténer plusieurs certificats dans le fichier CAs.pem.
 
 * Créer le certificat sous le shell :
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
+openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick.pem
 ----
 
 [NOTE]
@@ -3700,8 +3726,9 @@ connexion).
 
 Vous pouvez générer la clé avec cette commande :
 
+[source,shell]
 ----
-$ openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
+openssl ecparam -genkey -name prime256v1 -out ~/.config/weechat/ecdsa.pem
 ----
 
 [NOTE]
@@ -3710,8 +3737,9 @@ config WeeChat qui peut aussi être par exemple `~/.weechat`.
 
 Récupérez la clé publique (encodée en base64) avec cette commande :
 
+[source,shell]
 ----
-$ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
+openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem | grep '^pub:' -A 3 | tail -n 3 | tr -d ' \n:' | xxd -r -p | base64
 ----
 
 Connectez-vous au serveur, identifiez vous (par exemple avec
@@ -3781,8 +3809,9 @@ sur Internet.
 
 En premier lieu, installez Tor. Pour Debian (et dérivés) :
 
+[source,shell]
 ----
-$ sudo apt-get install tor
+sudo apt-get install tor
 ----
 
 Sous WeeChat vous devez ajouter un proxy socks5 pour le service Tor (le nom/IP
@@ -4215,7 +4244,7 @@ des clés, par exemple si `#canal1` requiert une clé mais pas `#canal2`:
 /set irc.server.libera.autojoin "#canal1,#canal2 cle1"
 ----
 
-Pour de l'aide sur le format, voir `/help irc.server.libera.autojoin`.
+Pour de l'aide sur le format, voir l'option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
 
 [[irc_private_messages]]
 === Messages privés
@@ -4264,7 +4293,7 @@ pour cacher les lignes sur les tampons, par exemple :
 ----
 
 Il est possible de créer un filtre pour un canal seulement ou plusieurs canaux
-commençant par le même nom (voir `/help filter`) :
+commençant par le même nom (voir la commande <<command_weechat_filter,/filter>>) :
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4723,10 +4752,11 @@ Le chemin par défaut vers le certificat/clé est défini par l'option
 
 Vous pouvez créer le certificat et la clé privée avec les commandes suivantes :
 
+[source,shell]
 ----
-$ mkdir -p ~/.config/weechat/tls
+mkdir -p ~/.config/weechat/tls
-$ cd ~/.config/weechat/tls
+cd ~/.config/weechat/tls
-$ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
+openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out relay.pem
 ----
 
 [NOTE]
@@ -4811,6 +4841,14 @@ Pour vous connecter à un relai _api_ avec WeeChat :
 /remote connect weechat
 ----
 
+Pour vous connecter à un relai _api_ tournant ailleurs avec WeeChat
+(TLS est fortement recommandé) :
+
+----
+/remote add weechat https://example.com:9000 -password=mypassword
+/remote connect weechat
+----
+
 [NOTE]
 Le WeeChat distant doit exposer exactement la même version d'API que le WeeChat
 local, il est donc fortement recommandé d'utiliser exactement la même version
@@ -4832,10 +4870,10 @@ protocole.
 Par exemple :
 
 ----
-/relay add weechat 9000
+/relay add weechat 9500
 ----
 
-Maintenant vous pouvez vous connecter sur le port 9000 avec une interface
+Maintenant vous pouvez vous connecter sur le port 9500 avec une interface
 distante en utilisant le mot de passe "motdepasse".
 
 [[relay_websocket]]
@@ -4855,10 +4893,10 @@ JavaScript :
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9000/weechat");
+websocket = new WebSocket("ws://example.com:9500/weechat");
 ----
 
-Le port (9000 dans l'exemple) est le port défini dans l'extension Relay.
+Le port (9500 dans l'exemple) est le port défini dans l'extension Relay.
 
 L'URI doit se terminer par "/weechat" pour les protocoles _irc_ et _weechat_ et
 "/api" pour le protocole _api_.
@@ -4881,8 +4919,9 @@ _/run/user/1000/weechat/relay_socket_. Cela est utile pour autoriser le
 
 Avec OpenSSH :
 
+[source,shell]
 ----
-$ ssh -L 9000:.weechat/relay_socket user@hostname
+ssh -L 9000:.weechat/relay_socket user@hostname
 ----
 
 Cela redirige les clients relay locaux qui se connectent au port 9000 vers
@@ -4970,34 +5009,39 @@ Quelques exemples :
 
 * Changer le pseudo sur libera en "autrepseudo" :
 
+[source,shell]
 ----
-$ echo 'irc.server.libera */nick autrepseudo' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.server.libera */nick autrepseudo' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Envoyer un message sur le canal IRC #weechat :
 
+[source,shell]
 ----
-$ echo 'irc.libera.#weechat *bonjour !' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.libera.#weechat *bonjour !' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Envoyer un message multi-lignes sur le canal IRC #test, si la capacité
   "draft/multiline" est activée sur le serveur ergo :
 
+[source,shell]
 ----
-$ echo 'irc.ergo.#test \bonjour\n...sur deux lignes !' >/run/user/1000/weechat/weechat_fifo_12345
+echo 'irc.ergo.#test \bonjour\n...sur deux lignes !' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Envoyer un message sur le tampon courant :
 
+[source,shell]
 ----
-$ echo '*bonjour !' >/run/user/1000/weechat/weechat_fifo_12345
+echo '*bonjour !' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 * Envoyer deux commandes pour décharger/recharger les scripts Python (vous devez
   les séparer par "\n") :
 
+[source,shell]
 ----
-$ printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
+printf '%b' '*/python unload\n*/python autoload\n' >/run/user/1000/weechat/weechat_fifo_12345
 ----
 
 [[fifo_commands]]
@@ -5935,7 +5979,7 @@ désactivé par défaut. +
 Pour l'activer, tapez cette commande :
 
 ----
-/set script.scripts.download_enabled on
+/script enable
 ----
 
 Vous pouvez alors télécharger la liste des scripts et les afficher dans un tampon
@@ -5945,33 +5989,33 @@ avec la commande <<command_script_script,/script>> :
 :x: *
 ....
 ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-│1.weechat│368/368 scripts (filter: {x}) | Sort: i,p,n | Alt+key/input: i=install, r=remove, l=load, L=reload, u=│
+│1.weechat│322/322 scripts (filtre : {x}) | Tri : i,p,n | Alt+touche/entrée : i=installer, r=supprimer, l=charg>>│
-│2.scripts│{x}      autosort.py                 3.9     2020-10-11 | Automatically keep buffers grouped by server│
+│2.scripts│{x}      autosort.py                     3.10    2023-12-31 | Garder automatiquement les tampons group│
-│         │{x}      multiline.pl                0.6.3   2016-01-02 | Multi-line edit box, also supports editing o│
+│         │{x}      highmon.pl                      2.7     2020-06-21 | Ajouter un tampon moniteur de highlights│
-│         │{x}      highmon.pl                  2.7     2020-06-21 | Adds a highlight monitor buffer.            │
+│         │{x}ia r  grep.py                   0.8.6 0.8.6   2022-11-11 | Recherche d'expression régulière dans le│
-│         │##{x}ia r  grep.py               0.8.5 0.8.5   2021-05-11 | Search regular expression in buffers or log ##│
+│         │{x}      colorize_nicks.py               32      2023-10-30 | Utiliser la couleur des pseudos weechat │
-│         │{x}      autojoin.py                 0.3.1   2019-10-06 | Configure autojoin for all servers according│
+│         │##{x}ia r  go.py                     3.0.1 3.0.1   2024-05-30 | Déplacement rapide dans les tampons.    ##│
-│         │{x}      colorize_nicks.py           28      2021-03-06 | Use the weechat nick colors in the chat area│
+│         │       aesthetic.py                    1.0.6   2020-10-25 | Affiche des messages de manière plus E S│
-│         │{x}ia r  go.py                 2.7   2.7     2021-05-26 | Quick jump to buffers.                      │
+│         │       aformat.py                      0.2     2018-06-21 | Formatage de texte alternatif, pratique │
-│         │{x}      text_item.py                0.9     2019-05-25 | Add bar items with plain text.              │
+│         │       alternatetz.py                  0.4     2022-01-25 | Ajouter un objet de barre avec un fuseau│
-│         │       aesthetic.py                1.0.6   2020-10-25 | Make messages more A E S T H E T I C A L L Y│
+│         │       amarok2.pl                      0.7     2012-05-08 | Contrôler et afficher la musique jouée p│
-│         │       aformat.py                  0.2     2018-06-21 | Alternate text formatting, useful for relays│
+│         │       amqp_notify.rb                  0.1     2011-01-12 | Envoyer les messages privés et highlight│
-│         │       alternatetz.py              0.3     2018-11-11 | Add an alternate timezone item.             │
+│         │       announce_url_title.py           19      2021-06-05 | Annoncer le titre de l'URL à l'utilisate│
-│         │       amarok2.pl                  0.7     2012-05-08 | Amarok 2 control and now playing script.    │
+│         │       anotify.py                      1.0.2   2020-05-16 | Notifications des messages privés, highl│
-│         │       amqp_notify.rb              0.1     2011-01-12 | Send private messages and highlights to an A│
+│         │       anti_password.py                1.2.1   2021-03-13 | Empêcher un mot de passe d'être envoyé a│
-│         │       announce_url_title.py       19      2021-06-05 | Announce URL title to user or to channel.   │
+│         │       apply_corrections.py            1.3     2018-06-21 | Afficher le texte corrigé quand un utili│
-│         │       anotify.py                  1.0.2   2020-05-16 | Notifications of private messages, highlight│
+│         │       arespond.py                     0.1.2   2022-01-25 | Simple auto-réponse.                    │
-│         │       anti_password.py            1.2.1   2021-03-13 | Prevent a password from being accidentally s│
+│         │       atcomplete.pl                   0.001   2016-10-29 | Complétion avec Tab des pseudos préfixés│
-│         │       apply_corrections.py        1.3     2018-06-21 | Display corrected text when user sends s/typ│
+│         │       audacious.pl                    0.3     2009-05-03 | Afficher la chanson actuellement jouée p│
-│         │       arespond.py                 0.1.1   2020-10-11 | Simple autoresponder.                       │
+│         │       auth.rb                         0.3     2014-05-30 | S'authentifier automatiquement avec Nick│
-│         │       atcomplete.pl               0.001   2016-10-29 | Tab complete nicks when prefixed with "@".  │
+│         │       auto_away.py                    0.4     2018-11-11 | Un script simple d'auto absence (away). │
-│         │       audacious.pl                0.3     2009-05-03 | Display which song Audacious is currently pl│
+│         │       autoauth.py                     1.3     2021-11-07 | Identification automatique en cas de cha│
-│         │       auth.rb                     0.3     2014-05-30 | Automatically authenticate with NickServ usi│
+│         │       autobump.py                     0.1.0   2019-06-14 | Trier les tampons selon l'activité.     │
-│         │       auto_away.py                0.4     2018-11-11 | A simple auto-away script.                  │
+│         │       autoconf.py                     0.4     2021-05-11 | Charger/sauver automatiquement les optio│
-│         │       autoauth.py                 1.3     2021-11-07 | Permits to auto-authenticate when changing n│
+│         │       autoconnect.py                  0.3.3   2019-10-06 | Réouvrir les serveurs et canaux ouverts │
-│         │       autobump.py                 0.1.0   2019-06-14 | Bump buffers upon activity.                 │
+│         │       autojoin_on_invite.py           0.9     2022-10-25 | Rejoindre automatiquement les canaux où │
-│         │       autoconf.py                 0.4     2021-05-11 | Auto save/load changed options in a .weerc f│
+│         │       automarkbuffer.py               1.0     2015-03-31 | Marquer les tampons comme lus s'il n'y a│
-│         │       autoconnect.py              0.3.3   2019-10-06 | Reopen servers and channels opened last time│
+│         │       automerge.py                    0.2     2018-03-03 | Fusionner automatiquement les tampons se│
 │         │[12:55] [2] [script] 2:scripts                                                                      │
 │         │█                                                                                                   │
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

doc/it/includes/attributes-it.adoc

@@ -0,0 +1,23 @@
+// Italian translation, courtesy of Marco Ciampa <ciampix@posteo.net>
+:appendix-caption: Appendice
+:appendix-refsig: {appendix-caption}
+:caution-caption: Attenzione
+:chapter-signifier: Capitolo
+:chapter-refsig: {chapter-signifier}
+:example-caption: Esempio
+:figure-caption: Figura
+:important-caption: Importante
+:last-update-label: Ultimo aggiornamento
+ifdef::listing-caption[:listing-caption: Elenco]
+ifdef::manname-title[:manname-title: Nome]
+:note-caption: Nota
+:part-signifier: Parte
+:part-refsig: {part-signifier}
+ifdef::preface-title[:preface-title: Prefazione]
+:section-refsig: Sezione
+:table-caption: Tabella
+:tip-caption: Suggerimento
+:toc-title: Indice
+:untitled-label: Senza titolo
+:version-label: Versione
+:warning-caption: Attenzione