irc: fix send of split messages when server option "anti_flood" set to 0 (issue #2172)

This fixes generation of TOTP and tests on FreeBSD.

.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.md](https://github.com/weechat/weechat/blob/main/CONTRIBUTING.md#security-reports).
+        **IMPORTANT**: please do not report any security issue here, see [Contributing.adoc](https://github.com/weechat/weechat/blob/master/Contributing.adoc#security-reports).
 
   - type: textarea
     id: bug-description
@@ -85,9 +85,9 @@ body:
   - type: input
     id: os-version
     attributes:
-      label: What OS/distribution are you using?
+      label: What OS are you using?
       description: Name of the operating system and its version.
-      placeholder: Debian 12, Ubuntu 24.04, MacOS 14, ...
+      placeholder: Debian 12, Ubuntu 23.10, MacOS 14, ...
     validations:
       required: true
 

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ env:
     libzstd-dev
     ninja-build
     php-dev
-    pkgconf
+    pkg-config
     pylint
     python3-bandit
     python3-dev
@@ -100,10 +100,9 @@ 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
@@ -138,7 +137,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-14
+          - macos-12
         config:
           - { name: "gcc", cc: "gcc", cxx: "g++" }
           - { name: "clang", cc: "clang", cxx: "clang++" }
@@ -168,9 +167,7 @@ jobs:
           /usr/local/bin/python3.11 \
           /usr/local/bin/python3.11-config \
         ;
-        # workaround for https://github.com/actions/runner-images/issues/10984
+        brew install asciidoctor cjson guile lua pkg-config ruby
-        brew uninstall --ignore-dependencies --force pkg-config@0.29.2
-        brew install asciidoctor aspell cjson guile lua ruby
 
     - uses: actions/checkout@v2
 
@@ -190,10 +187,9 @@ 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:
@@ -231,7 +227,6 @@ jobs:
         weechat --help
         weechat-curses --help
         weechat --version
-        weechat --build-info
         weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
 
   codeql-analysis:

AUTHORS.adoc

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

@@ -1,161 +0,0 @@
-# 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
-- 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
-- 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
-- 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.18)
+cmake_minimum_required(VERSION 3.5)
 
 project(weechat C)
 
@@ -260,6 +260,7 @@ add_subdirectory(icons)
 
 if(ENABLE_NLS)
   find_package(Gettext REQUIRED)
+  add_definitions(-DENABLE_NLS)
   find_package(Intl REQUIRED)
   list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
   add_subdirectory(po)
@@ -321,11 +322,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.md"
+    "${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/CONTRIBUTING.md"
+    "${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+    "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UPGRADING.md"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc"
     DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}"
   )
 endif()

CONTRIBUTING.md

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

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

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

@@ -1,66 +0,0 @@
-# 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/FindLua.cmake

@@ -35,5 +35,5 @@ endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  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)
+  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)
 endif()

cmake/FindRuby.cmake

@@ -0,0 +1,45 @@
+#
+# 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,39 +1,3 @@
-#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
@@ -47,10 +11,6 @@
 #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,8 +6,7 @@ Build-Depends:
     asciidoctor (>= 1.5.4),
     ruby-pygments.rb,
     debhelper (>= 12),
-    cmake,
+    cmake, pkg-config,
-    pkgconf,
     libncurses-dev,
     gem2deb,
     libperl-dev,
@@ -24,7 +23,7 @@ Build-Depends:
     libzstd-dev,
     zlib1g-dev,
     libcjson-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 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,5 +16,8 @@ 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

debian-stable/control

@@ -6,8 +6,7 @@ Build-Depends:
     asciidoctor (>= 1.5.4),
     ruby-pygments.rb,
     debhelper (>= 12),
-    cmake,
+    cmake, pkg-config,
-    pkgconf,
     libncurses-dev,
     gem2deb,
     libperl-dev,
@@ -24,7 +23,7 @@ Build-Depends:
     libzstd-dev,
     zlib1g-dev,
     libcjson-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 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,5 +16,8 @@ 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,5 +1,4 @@
-AUTHORS.md
+AUTHORS.adoc
-CHANGELOG.md
+Contributing.adoc
-CONTRIBUTING.md
+README.adoc
-README.md
+ReleaseNotes.adoc
-UPGRADING.md

debian-stable/weechat-curses.links

@@ -7,4 +7,3 @@ 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +0,0 @@
-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,8 +28,7 @@ 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_API_LANG en fr)
+  set(RELAY_LANG en fr ja sr)
-  set(RELAY_WEECHAT_LANG en fr ja sr)
   set(DEV_LANG en fr ja sr)
 
   find_package(Asciidoctor)
@@ -40,6 +39,7 @@ 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,17 +93,8 @@ if(ENABLE_MAN OR ENABLE_DOC)
       -a docinfo1
     )
 
-    # asciidoctor arguments for relay "api"
+    # asciidoctor arguments for relay protocol
-    set(ASCIIDOCTOR_RELAY_API_ARGS
+    set(ASCIIDOCTOR_RELAY_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
@@ -120,6 +111,54 @@ 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})
@@ -204,7 +243,6 @@ 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"
@@ -225,7 +263,6 @@ 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"
@@ -249,7 +286,6 @@ 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"
@@ -267,7 +303,6 @@ 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"
         )
@@ -282,44 +317,25 @@ 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 "api"
+      # relay protocol
-      foreach(lang ${RELAY_API_LANG})
+      foreach(lang ${RELAY_LANG})
         add_custom_command(
-          OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html"
+          OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${lang}.html"
-          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"
+          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"
           DEPENDS
           "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
-          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_api.${lang}.adoc"
+          "${CMAKE_CURRENT_SOURCE_DIR}/${lang}/weechat_relay_protocol.${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_api.${lang}.html"
+          COMMENT "Building weechat_relay_protocol.${lang}.html"
         )
-        add_custom_target(doc-relay-api-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html")
+        add_custom_target(doc-relay-protocol-${lang} ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${lang}.html")
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_api.${lang}.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.${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})
@@ -329,7 +345,6 @@ 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

@@ -1,23 +0,0 @@
-// 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,10 +39,6 @@
 *-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.md).
+souboru AUTHORS.adoc).
 
 Copyright (C) 2003-2024 {author}
 

doc/cs/weechat_quickstart.cs.adoc

@@ -2,7 +2,6 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: cs
-include::includes/attributes-cs.adoc[]
 
 [[start]]
 == Spuštění WeeChatu
@@ -13,9 +12,8 @@ klávesových zkratek.
 
 Spustění z Vašeho shellu:
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]

doc/de/includes/attributes-de.adoc

@@ -1,23 +0,0 @@
-// 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,9 +35,6 @@
 *-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.md Datei).
+findet man in der AUTHORS.adoc 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
-include::includes/attributes-de.adoc[]
+:toc-title: Inhaltsverzeichnis
 
 Übersetzer:
 
@@ -54,14 +54,12 @@ 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
 ----
@@ -333,16 +331,11 @@ 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.
 
-// TRANSLATION MISSING
-You can toggle nicklist and make it visible only when needed, with key
-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]]
@@ -352,14 +345,10 @@ Dazu kann man den vereinfachten Anzeigemodus nutzen (Standardtaste: kbd:[Alt+l]
 
 Um URLs einfacher zu öffnen, können alternativ folgende Optionen gesetzt werden:
 
-// TRANSLATION MISSING
-* toggle nicklist and make it visible only when needed, with key 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.
@@ -410,7 +399,6 @@ 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
 ----
@@ -725,9 +713,8 @@ 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
@@ -735,9 +722,8 @@ 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]]
@@ -804,7 +790,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:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1081,9 +1067,8 @@ 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]
@@ -1107,17 +1092,15 @@ 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
 ----
@@ -1289,7 +1272,6 @@ 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
@@ -1300,7 +1282,6 @@ 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

doc/de/weechat_quickstart.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-include::includes/attributes-de.adoc[]
+:toc-title: Inhaltsverzeichnis
 
 Übersetzer:
 
@@ -19,9 +19,8 @@ keine Probleme mit der Standard Tastaturbelegung.
 
 Programmstart aus deiner Shell:
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]

doc/de/weechat_scripting.de.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: de
-include::includes/attributes-de.adoc[]
+:toc-title: Inhaltsverzeichnis
 
 Ü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/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Funktionen
@@ -373,10 +373,9 @@ 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
-include::includes/attributes-de.adoc[]
+:toc-title: Inhaltsverzeichnis
 
 Übersetzer:
 
@@ -115,7 +115,7 @@ Die folgende Tabelle zeigt eine Auflistung der Pakete, die zum Erstellen von Wee
 | cmake | ≥ 3.0
 | bauen.
 
-| pkgconf / pkg-config |
+| pkg-config |
 | entdeckt installierte Bibliotheken.
 
 | libncurses-dev |
@@ -227,9 +227,8 @@ 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]
 ----
-sudo apt-get build-dep weechat
+# apt-get build-dep weechat
 ----
 
 [[build]]
@@ -237,24 +236,22 @@ sudo apt-get build-dep weechat
 
 * 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.
@@ -390,16 +387,14 @@ 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]]
@@ -412,16 +407,14 @@ 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]]
@@ -432,9 +425,8 @@ 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>>).
@@ -455,9 +447,8 @@ 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]]
@@ -466,9 +457,8 @@ 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]
@@ -477,9 +467,8 @@ Absturz zu provozieren. Diese Funktion wird im produktiven Einsatz nicht empfohl
 
 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`.
@@ -500,14 +489,12 @@ 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
 ----
@@ -531,7 +518,6 @@ 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
 ----
@@ -579,7 +565,6 @@ 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
 ----
@@ -595,9 +580,8 @@ 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
@@ -815,24 +799,25 @@ 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_upgrading_notes]]
+[[restart_release_notes]]
-==== Hinweise zum Upgrade
+==== Versionshinweise
 
-Nach einem Upgrade, wird *dringend empfohlen* das Dokukment
+Nach einem Upgrade wird *dringend empfohlen* die,
-https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
+https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[Versionshinweise ^↗^^]
-zu lesen. Dieses Dokument enthält wichtige Informationen zu wichtigen Änderungen und
+zu lesen, denn dort sind wichtige Informationen zu Änderungen enthalten und ob
-einige manuelle Aktionen, die erforderlich sein könnten.
+eventuell ein manuelles Eingreifen erforderlich sein könnte.
 
-Es sollten die Versionen zwischen der alten (abgelaufenen) und der neuen Version (eingeschlossen) gelesen werden. +
+Sie müssen die Versionshinweise aller Versionen zwischen Ihrer alten (abgelaufenen)
-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.
+und Ihrer neuen Version (enthalten) 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
@@ -1357,7 +1342,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 den Befehl <<command_logger_logger,/logger>>).
+| log0 … log9      | Grad der Protokollierung (siehe `/help 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)^
@@ -2864,9 +2849,8 @@ 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:
@@ -3318,7 +3302,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 der unterstützen Optionen, siehe den Befehl <<command_weechat_secure,/secure>>.
+Für eine vollständige Liste aller unterstützten Optionen, siehe  `/help secure`.
 
 Um z.B. das oben eingestellte _libera_ Passwort für eine
 <<irc_sasl_authentication,SASL Authentifizierung>> zu nutzen:
@@ -3441,9 +3425,8 @@ 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]]
@@ -3601,10 +3584,9 @@ 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]
@@ -3625,11 +3607,10 @@ 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]
@@ -3678,9 +3659,8 @@ 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]
@@ -3690,9 +3670,8 @@ 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")
@@ -3762,9 +3741,8 @@ 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
@@ -4188,7 +4166,7 @@ Schlüssel erfordert, aber nicht `#channel2`:
 /set irc.server.libera.autojoin "#channel1,#channel2 key1"
 ----
 
-Hilfe zum Format findet man unter Option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
+Um eine Hilfe über das Format zu erhalten, siehe `/help irc.server.libera.autojoin`.
 
 [[irc_private_messages]]
 === private Nachrichten
@@ -4237,7 +4215,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 den Befehl <<command_weechat_filter,/filter>>):
+dem selben Namen beginnen (siehe `/help filter`):
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4693,11 +4671,10 @@ 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]
@@ -4801,10 +4778,10 @@ dieses Protokoll verbinden.
 Zum Beispiel:
 
 ----
-/relay add weechat 9500
+/relay add weechat 9000
 ----
 
-Nun kann man über den Port 9500 mittels einer Oberfläche und dem Passwort
+Nun kann man über den Port 9000 mittels einer Oberfläche und dem Passwort
 "meinPasswort" eine Verbindung zu WeeChat herstellen.
 
 [[relay_websocket]]
@@ -4821,10 +4798,10 @@ Ein WebSocket kann in HTML5, mit einer JavaScript Zeile, geöffnet werden:
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9500/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----
 
-Der Port (im Beispiel: 9500) ist der Port der in der Relay Erweiterung angegeben wurde.
+Der Port (im Beispiel: 9000) 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.
@@ -4847,9 +4824,8 @@ 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
@@ -4937,39 +4913,34 @@ 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]]

doc/docinfo.html

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

doc/en/includes/attributes-en.adoc

@@ -1,23 +0,0 @@
-// 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,9 +35,6 @@
 *-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.md file).
+the AUTHORS.adoc file).
 
 Copyright (C) 2003-2024 {author}
 

doc/en/includes/relay.en.adoc

@@ -1,18 +0,0 @@
-// 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,7 +2,6 @@
 :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.
 
@@ -503,7 +502,6 @@ 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.
@@ -533,8 +531,7 @@ 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_api.XX.adoc               | link:weechat_relay_api.en.html[Relay "api" protocol ^↗^^] (for remote interfaces).
+|       weechat_relay_protocol.XX.adoc          | link:weechat_relay_protocol.en.html[Relay 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.
@@ -1173,7 +1170,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 branch `main`, preferred way
+Any patch for bug or new feature must be done on master branch, preferred way
 is a GitHub pull request. A patch can also be sent by e-mail
 (made with `git diff` or `git format-patch`).
 
@@ -1190,15 +1187,15 @@ Where _component_ is one of following:
 | Component | Files | Description
 
 | core
-| AUTHORS.md +
+| AUTHORS.adoc +
-  CHANGELOG.md +
+  ChangeLog.adoc +
-  CONTRIBUTING.md +
+  Contributing.adoc +
   .github/FUNDING.yml +
   .github/ISSUE_TEMPLATE/* +
   icons/* +
   po/* +
-  README.md +
+  README.adoc +
-  UPGRADING.md +
+  ReleaseNotes.adoc +
   src/core/* +
   src/gui/* +
   version.sh +
@@ -1255,9 +1252,8 @@ Where _component_ is one of following:
 | Plugin API reference
 
 | doc/relay
-| doc/xx/weechat_relay_api.xx.adoc +
+| doc/xx/weechat_relay_protocol.xx.adoc
-  doc/xx/weechat_relay_weechat.xx.adoc
+| Relay protocol
-| Relay protocols
 
 | doc/dev
 | doc/xx/weechat_dev.en.adoc
@@ -1301,10 +1297,9 @@ 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
@@ -1313,9 +1308,8 @@ 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).
@@ -1323,9 +1317,8 @@ 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.

doc/en/weechat_faq.en.adoc

@@ -2,7 +2,6 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
-include::includes/attributes-en.adoc[]
 
 [[general]]
 == General
@@ -49,14 +48,12 @@ 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
 ----
@@ -316,14 +313,10 @@ 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]]
@@ -333,13 +326,10 @@ 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:
@@ -389,7 +379,6 @@ 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
 ----
@@ -693,18 +682,16 @@ 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]]
@@ -759,7 +746,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:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1012,9 +999,8 @@ 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]
@@ -1038,17 +1024,15 @@ 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
 ----
@@ -1218,7 +1202,6 @@ 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
@@ -1229,7 +1212,6 @@ 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

doc/en/weechat_plugin_api.en.adoc

@@ -2,7 +2,6 @@
 :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.
 
@@ -166,10 +165,9 @@ 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]]
@@ -638,7 +636,7 @@ Arguments:
 
 * _string_: string to cut
 * _length_: max chars
-* _count_suffix_: if 1, the length of suffix is counted in the max length
+* _count_suffix_: if 1, the length of suffix is counter 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
 
@@ -2618,7 +2616,8 @@ 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, 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._
+_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._
 
 Evaluate an expression and return result as a string.
 Special variables with format `+${variable}+` are expanded (see table below).
@@ -3333,12 +3332,6 @@ 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}+` +
@@ -5815,7 +5808,7 @@ Hashtable functions.
 
 ==== hashtable_new
 
-_WeeChat ≥ 0.3.3, updated in 4.4.0._
+_WeeChat ≥ 0.3.3._
 
 Create a new hashtable.
 
@@ -5844,14 +5837,12 @@ 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:
@@ -6212,14 +6203,12 @@ 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")
@@ -11127,7 +11116,7 @@ hook2 = weechat.hook_url("http://localhost:8080/", options, 20000, "my_url_cb",
 
 ==== hook_connect
 
-_Updated in 1.5, 2.0, 4.4.0._
+_Updated in 1.5, 2.0._
 
 Hook a connection (background connection to a remote host).
 
@@ -11162,10 +11151,7 @@ Arguments:
   without proxy)
 * _address_: name or IP address to connect to
 * _port_: port number
-* _ipv6_:
+* _ipv6_: 1 to use IPv6 (with fallback to IPv4), 0 to use only IPv4
-** `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)
@@ -11185,7 +11171,7 @@ Arguments:
   return value:
 ** _const void *pointer_: pointer
 ** _void *data_: pointer
-** _int status_: connection status ^(2)^:
+** _int status_: connection status:
 *** _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
@@ -11197,8 +11183,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()_ ^(2)^
+** _gnutls_rc_: return value of _gnutls_handshake()_
-** _sock_: socket used to connect ^(2)^
+** _sock_: socket used to connect
 ** _const char *error_: return value of _gnutls_strerror(gnutls_rc)_
 ** _const char *ip_address_: IP address found
 ** return value:
@@ -11209,19 +11195,16 @@ Arguments:
   if not NULL, it must have been allocated with malloc (or similar function)
   and it is automatically freed when the hook is deleted
 
-[NOTE]
-^(1)^ Constants for parameter _ipv6_ are available since WeeChat 4.4.0. +
-For older releases, allowed values are `1` (use IPv6 with fallback to IPv4) and
-`0` (disable IPv6, use only IPv4). +
-^(2)^ 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
 
+[IMPORTANT]
+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)`.
+
 C example:
 
 [source,c]
@@ -11271,8 +11254,7 @@ 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,
-                                                       WEECHAT_HOOK_CONNECT_IPV6_AUTO,
+                                                       1, 0,
-                                                       0,
                                                        NULL, NULL, 0,  /* GnuTLS */
                                                        NULL,
                                                        &my_connect_cb, NULL, NULL);
@@ -11288,32 +11270,31 @@ 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.WEECHAT_HOOK_CONNECT_OK:
+    if status == WEECHAT_HOOK_CONNECT_OK:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
+    elif status == WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_PROXY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_PROXY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_TIMEOUT:
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
         # ...
     return weechat.WEECHAT_RC_OK
 
-hook = weechat.hook_connect("", "my.server.org", 1234,
+hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
-                            weechat.WEECHAT_HOOK_CONNECT_IPV6_AUTO, 0, "",
                             "my_connect_cb", "")
 ----
 
@@ -12125,10 +12106,6 @@ 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.
@@ -12173,10 +12150,6 @@ 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.
@@ -12287,14 +12260,6 @@ 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.
@@ -14643,6 +14608,7 @@ 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
@@ -14814,7 +14780,7 @@ C example:
 
 [source,c]
 ----
-weechat_printf (NULL, "plugin pointer of my buffer: %p",
+weechat_printf (NULL, "plugin pointer of my buffer: %lx",
                 weechat_buffer_get_pointer (my_buffer, "plugin"));
 ----
 
@@ -15226,46 +15192,6 @@ 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
 
@@ -15330,7 +15256,7 @@ C example:
 [source,c]
 ----
 weechat_printf (NULL,
-                "window displaying core buffer: %p",
+                "window displaying core buffer: %lx",
                 weechat_window_search_with_buffer (weechat_buffer_search_main ()));
 ----
 
@@ -15467,7 +15393,7 @@ C example:
 [source,c]
 ----
 weechat_printf (NULL,
-                "buffer displayed in current window: %p",
+                "buffer displayed in current window: %lx",
                 weechat_window_get_pointer (weechat_current_window (), "buffer"));
 ----
 
@@ -19335,7 +19261,7 @@ C example:
 ----
 struct t_hdata *hdata = weechat_hdata_get ("buffer");
 struct t_gui_buffer *buffer = weechat_buffer_search_main ();
-weechat_printf (NULL, "lines = %p", weechat_hdata_pointer (hdata, buffer, "lines"));
+weechat_printf (NULL, "lines = %lx", weechat_hdata_pointer (hdata, buffer, "lines"));
 ----
 
 Script (Python):

doc/en/weechat_quickstart.en.adoc

@@ -2,7 +2,6 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: en
-include::includes/attributes-en.adoc[]
 
 [[start]]
 == Start WeeChat
@@ -12,9 +11,8 @@ It has good UTF-8 support and works well with WeeChat's default key bindings.
 
 Run from your shell:
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]

doc/en/weechat_relay_protocol.en.adoc

@@ -2,12 +2,11 @@
 :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]]
@@ -25,11 +24,28 @@ 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. +
+All clients here are clients using _weechat_ protocol in _relay_ plugin. The
-The _relay_ plugin also allows _api_ and _irc_ protocols (not described in this document).
+_relay_ plugin also allows IRC clients, then _relay_ plugin acts as an
+_IRC proxy_ (not described in this document).
 
 [[protocol_generalities]]
 == Protocol generalities
@@ -1489,9 +1505,6 @@ 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.
 
@@ -2046,7 +2059,6 @@ 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.
@@ -2067,7 +2079,6 @@ id: '_buffer_line_added'
 hda:
     keys: {
         'buffer': 'ptr',
-        'id': 'int',
         'date': 'tim',
         'date_usec': 'int',
         'date_printed': 'tim',
@@ -2083,58 +2094,6 @@ 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,7 +2,6 @@
 :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.
 
@@ -68,7 +67,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/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Functions
@@ -363,10 +362,9 @@ 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,7 +2,6 @@
 :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.
 
@@ -111,7 +110,7 @@ WeeChat:
 | cmake | ≥ 3.0
 | Build.
 
-| pkgconf / pkg-config |
+| pkg-config |
 | Detect installed libraries.
 
 | libncurses-dev |
@@ -221,9 +220,8 @@ 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]
 ----
-sudo apt-get build-dep weechat
+# apt-get build-dep weechat
 ----
 
 [[build]]
@@ -231,24 +229,22 @@ sudo apt-get build-dep weechat
 
 * 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`.
@@ -384,16 +380,14 @@ 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]]
@@ -406,16 +400,14 @@ 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]]
@@ -426,9 +418,8 @@ 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
@@ -451,9 +442,8 @@ you have to:
 
 If you're compiling with CMake:
 
-[source,shell]
 ----
-cmake .. -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----
 
 [[address_sanitizer]]
@@ -462,9 +452,8 @@ 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]
@@ -473,9 +462,8 @@ 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`.
@@ -495,14 +483,12 @@ 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
 ----
@@ -524,7 +510,6 @@ 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
 ----
@@ -572,7 +557,6 @@ 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
 ----
@@ -588,9 +572,8 @@ 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
@@ -806,25 +789,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_upgrading_notes]]
+[[restart_release_notes]]
-==== Upgrading notes
+==== Release notes
 
-After an upgrade, it is *strongly recommended* to read the file
+After an upgrade, it is *strongly recommended* to read the
-https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
+https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[release notes ^↗^^]
-which contains important information about breaking changes and some
+which contain important information about breaking changes and some
 manual actions that could be required.
 
-You must read the versions between your old (excluded) and your new version (included). +
+You must read the release notes of all versions between your old (excluded) and
-For example if you switch from version 4.0.0 to 4.3.0, you must read versions
+your new version (included). +
-4.0.1 to 4.3.0.
+For example if you switch from version 3.0 to 3.2, you must read release notes
+of versions 3.1 and 3.2.
 
 [[restart_configuration_upgrade]]
 ==== Configuration upgrade
@@ -1343,7 +1326,7 @@ Tags commonly used (non-exhaustive list):
 | no_filter        | Line can not 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 the <<command_logger_logger,/logger>> command).
+| log0 … log9      | Level of log for line (see `/help logger`).
 | 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)^
@@ -2824,9 +2807,8 @@ 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":
@@ -3262,7 +3244,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 the <<command_weechat_secure,/secure>> command.
+For a complete list of supported options, see `/help secure`.
 
 To use the _libera_ password, for example with
 <<irc_sasl_authentication,SASL authentication>>:
@@ -3386,9 +3368,8 @@ 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]]
@@ -3542,10 +3523,9 @@ 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]
@@ -3566,11 +3546,10 @@ 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]
@@ -3618,9 +3597,8 @@ 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]
@@ -3629,9 +3607,8 @@ 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
@@ -3698,9 +3675,8 @@ 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
@@ -4121,7 +4097,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 option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
+For help on the format, see `/help irc.server.libera.autojoin`.
 
 [[irc_private_messages]]
 === Private messages
@@ -4168,7 +4144,7 @@ buffers, for example:
 ----
 
 It is possible to create filter for one channel only or channels beginning with
-same name (see the <<command_weechat_filter,/filter>> command):
+same name (see `/help filter`):
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4613,11 +4589,10 @@ 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]
@@ -4717,10 +4692,10 @@ WeeChat itself can NOT connect to another WeeChat with this protocol.
 For example:
 
 ----
-/relay add weechat 9500
+/relay add weechat 9000
 ----
 
-Now you can connect on port 9500 with a remote interface using password
+Now you can connect on port 9000 with a remote interface using password
 "mypassword".
 
 [[relay_websocket]]
@@ -4738,10 +4713,10 @@ A WebSocket can be opened in a HTML5 with a single line of JavaScript:
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9500/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----
 
-The port (9500 in example) is the port defined in Relay plugin.
+The port (9000 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.
@@ -4762,9 +4737,8 @@ 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
@@ -4850,39 +4824,34 @@ 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]]

doc/es/includes/attributes-es.adoc

@@ -1,23 +0,0 @@
-// 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
-include::includes/attributes-es.adoc[]
+:toc-title: Índice
 
 Traductores
 
@@ -58,14 +58,12 @@ 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
 ----
@@ -328,15 +326,10 @@ 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]]
@@ -347,14 +340,10 @@ 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:
@@ -405,7 +394,6 @@ 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
 ----
@@ -713,18 +701,16 @@ 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]]
@@ -780,7 +766,7 @@ Puede intentar una cadena de prioridad diferente, reemplace "xxx" por el nombre
 de su servidor:
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1047,9 +1033,8 @@ 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
@@ -1074,10 +1059,9 @@ 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
@@ -1085,7 +1069,6 @@ 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
 ----
@@ -1260,7 +1243,6 @@ 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
@@ -1271,7 +1253,6 @@ 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

doc/es/weechat_quickstart.es.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: es
-include::includes/attributes-es.adoc[]
+:toc-title: Índice
 
 Traductores:
 
@@ -18,9 +18,8 @@ los atajos de teclado predeterminados.
 
 Ejecuta desde una consola:
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]

doc/fr/includes/attributes-fr.adoc

@@ -1,23 +0,0 @@
-// 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,9 +36,6 @@
 *-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.md).
+est dans le fichier AUTHORS.adoc).
 
 Copyright (C) 2003-2024 {author}
 

doc/fr/includes/relay.fr.adoc

@@ -1,18 +0,0 @@
-// 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
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -504,7 +504,6 @@ 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".
@@ -534,8 +533,7 @@ 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_api.XX.adoc               | link:weechat_relay_api.fr.html[Protocole relay "api" ^↗^^] (pour les interfaces distantes).
+|       weechat_relay_protocol.XX.adoc          | link:weechat_relay_protocol.fr.html[Protocole Relay ^↗^^] (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.
@@ -1192,7 +1190,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 `main`, le format préféré étant une "pull request" sur GitHub. Un patch
+branche master, 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
@@ -1209,15 +1207,15 @@ Où _composant_ est :
 | Composant | Fichiers | Description
 
 | core
-| AUTHORS.md +
+| AUTHORS.adoc +
-  CHANGELOG.md +
+  ChangeLog.adoc +
-  CONTRIBUTING.md +
+  Contributing.adoc +
   .github/FUNDING.yml +
   .github/ISSUE_TEMPLATE/* +
   icons/* +
   po/* +
-  README.md +
+  README.adoc +
-  UPGRADING.md +
+  ReleaseNotes.adoc +
   src/core/* +
   src/gui/* +
   version.sh +
@@ -1274,9 +1272,8 @@ Où _composant_ est :
 | Référence extension API
 
 | doc/relay
-| doc/xx/weechat_relay_api.xx.adoc +
+| doc/xx/weechat_relay_protocol.xx.adoc
-  doc/xx/weechat_relay_weechat.xx.adoc
+| Protocole relay
-| Protocoles relay
 
 | doc/dev
 | doc/xx/weechat_dev.en.adoc
@@ -1320,10 +1317,9 @@ 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
@@ -1332,9 +1328,8 @@ 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
@@ -1343,9 +1338,8 @@ 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
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 == Général
 
@@ -50,14 +50,12 @@ 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
 ----
@@ -326,15 +324,11 @@ 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]]
@@ -344,14 +338,10 @@ 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 :
@@ -403,7 +393,6 @@ 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
 ----
@@ -715,9 +704,8 @@ 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
@@ -725,9 +713,8 @@ voir " !!#!!".
 
 Pour désactiver la souris dans le terminal :
 
-[source,shell]
 ----
-printf '\033[?1002l'
+$ printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -785,7 +772,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:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1048,9 +1035,8 @@ 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]
@@ -1076,17 +1062,15 @@ 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
 ----
@@ -1268,7 +1252,6 @@ 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
@@ -1279,7 +1262,6 @@ 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

doc/fr/weechat_plugin_api.fr.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 Ce manuel documente le client de messagerie instantanée WeeChat, il fait
 partie de WeeChat.
@@ -170,10 +170,9 @@ _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]]
@@ -2664,7 +2663,8 @@ 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, 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._
+_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._
 
 É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,12 +3390,6 @@ 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}+` +
@@ -5904,7 +5898,7 @@ Fonctions pour les tables de hachage.
 
 ==== hashtable_new
 
-_WeeChat ≥ 0.3.3, mis à jour dans la 4.4.0._
+_WeeChat ≥ 0.3.3._
 
 Créer une nouvelle table de hachage.
 
@@ -5934,14 +5928,12 @@ 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
@@ -6309,14 +6301,12 @@ 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")
@@ -11338,7 +11328,7 @@ hook2 = weechat.hook_url("http://localhost:8080/", options, 20000, "my_url_cb",
 
 ==== hook_connect
 
-_Mis à jour dans la 1.5, 2.0, 4.4.0._
+_Mis à jour dans la 1.5, 2.0._
 
 Accrocher une connexion (connexion à une machine distante en tâche de fond).
 
@@ -11373,10 +11363,8 @@ Paramètres :
   une connexion sans proxy)
 * _address_ : nom ou adresse IP de la machine à laquelle se connecter
 * _port_ : numéro de port
-* _ipv6_:
+* _ipv6_ : 1 pour utiliser IPv6 (avec repli sur IPv4), 0 pour utiliser seulement
-** `WEECHAT_HOOK_CONNECT_IPV6_DISABLE` ^(1)^ : désactiver IPv6 (utiliser seulement IPv4)
+  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)
@@ -11398,7 +11386,7 @@ Paramètres :
   paramètres et valeur de retour :
 ** _const void *pointer_ : pointeur
 ** _void *data_ : pointeur
-** _int status_ : statut de connexion ^(2)^ :
+** _int status_ : statut de connexion :
 *** _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
@@ -11411,8 +11399,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()_ ^(2)^
+** _gnutls_rc_ : valeur retour de _gnutls_handshake()_
-** _sock_ : socket utilisé pour la connexion ^(2)^
+** _sock_ : socket utilisé pour la connexion
 ** _const char *error_ : valeur retour de _gnutls_strerror(gnutls_rc)_
 ** _const char *ip_address_ : adresse IP trouvée
 ** valeur de retour :
@@ -11425,21 +11413,17 @@ Paramètres :
   fonction similaire) et est automatiquement libéré (par free) lorsque le
   "hook" est supprimé
 
-[NOTE]
+Valeur de retour :
-^(1)^ Les constantes pour le paramètre _ipv6_ sont disponibles à partir de
+
-WeeChat 4.4.0. +
+* pointeur vers le nouveau "hook", NULL en cas d'erreur
-Pour les versions plus anciennes, les valeurs autorisées sont `1` (utiliser IPv6
+
-avec repli sur IPv4) et `0` (désactiver IPv6, utiliser seulement IPv4). +
+[IMPORTANT]
-^(2)^ Dans les scripts, avec WeeChat ≥ 2.0, les paramètres de la fonction de rappel
+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]
@@ -11489,8 +11473,7 @@ 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,
-                                                       WEECHAT_HOOK_CONNECT_IPV6_AUTO,
+                                                       1, 0,
-                                                       0,
                                                        NULL, NULL, 0,  /* GnuTLS */
                                                        NULL,
                                                        &my_connect_cb, NULL, NULL);
@@ -11506,32 +11489,31 @@ 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.WEECHAT_HOOK_CONNECT_OK:
+    if status == WEECHAT_HOOK_CONNECT_OK:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
+    elif status == WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_PROXY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_PROXY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_TIMEOUT:
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
         # ...
     return weechat.WEECHAT_RC_OK
 
-hook = weechat.hook_connect("", "my.server.org", 1234,
+hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
-                            weechat.WEECHAT_HOOK_CONNECT_IPV6_AUTO, 0, "",
                             "my_connect_cb", "")
 ----
 
@@ -12375,10 +12357,6 @@ 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.
@@ -12423,10 +12401,6 @@ 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é.
@@ -12539,14 +12513,6 @@ 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.
@@ -14959,6 +14925,7 @@ 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
@@ -15130,7 +15097,7 @@ Exemple en C :
 
 [source,c]
 ----
-weechat_printf (NULL, "pointeur vers l'extension de mon tampon : %p",
+weechat_printf (NULL, "pointeur vers l'extension de mon tampon : %lx",
                 weechat_buffer_get_pointer (mon_tampon, "plugin"));
 ----
 
@@ -15556,46 +15523,6 @@ 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
 
@@ -15661,7 +15588,7 @@ Exemple en C :
 [source,c]
 ----
 weechat_printf (NULL,
-                "fenêtre affichant le tampon core : %p",
+                "fenêtre affichant le tampon core : %lx",
                 weechat_window_search_with_buffer (weechat_buffer_search_main ()));
 ----
 
@@ -15806,7 +15733,7 @@ Exemple en C :
 [source,c]
 ----
 weechat_printf (NULL,
-                "tampon affiché dans la fenêtre courante : %p",
+                "tampon affiché dans la fenêtre courante : %lx",
                 weechat_window_get_pointer (weechat_current_window (), "buffer"));
 ----
 
@@ -19737,7 +19664,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 = %p", weechat_hdata_pointer (hdata, buffer, "lines"));
+weechat_printf (NULL, "lines = %lx", 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
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 [[start]]
 == Démarrer WeeChat
@@ -13,9 +13,8 @@ touches par défaut.
 
 Lancer depuis votre shell :
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]

doc/fr/weechat_relay_protocol.fr.adoc

@@ -2,12 +2,12 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: fr
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 [[introduction]]
 == Introduction
 
-Ce document est une spécification du protocole relay _weechat_ : le protocole
+Ce document est une spécification du protocole Relay de WeeChat : le protocole
 utilisé pour relayer les données de WeeChat aux clients, qui sont surtout des
 interfaces distantes.
 
@@ -27,11 +27,28 @@ 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 les protocoles _api_ et _irc_ (non décrits dans ce document).
+L'extension _relay_ autorise aussi des clients IRC, et _relay_ agit alors comme
+un _proxy IRC_ (non décrit dans ce document).
 
 [[protocol_generalities]]
 == Généralités sur le protocole
@@ -1514,9 +1531,6 @@ 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.
 
@@ -2073,7 +2087,6 @@ 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.
@@ -2095,7 +2108,6 @@ id: '_buffer_line_added'
 hda:
     keys: {
         'buffer': 'ptr',
-        'id': 'int',
         'date': 'tim',
         'date_usec': 'int',
         'date_printed': 'tim',
@@ -2111,59 +2123,6 @@ 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
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 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/main/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
+https://raw.githubusercontent.com/weechat/weechat/master/src/plugins/python/weechat.pyi[weechat.pyi ^↗^^].
 
 [[python_functions]]
 ===== Fonctions
@@ -376,10 +376,9 @@ 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
-include::includes/attributes-fr.adoc[]
+:toc-title: Table des matières
 
 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.
 
-| pkgconf / pkg-config |
+| pkg-config |
 | Détection des bibliothèques installées.
 
 | libncurses-dev |
@@ -219,9 +219,8 @@ 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]
 ----
-sudo apt-get build-dep weechat
+# apt-get build-dep weechat
 ----
 
 [[build]]
@@ -229,24 +228,22 @@ sudo apt-get build-dep weechat
 
 * 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`.
@@ -383,16 +380,14 @@ 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]]
@@ -405,16 +400,14 @@ 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]]
@@ -425,9 +418,8 @@ 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
@@ -450,9 +442,8 @@ futur de WeeChat, vous devez :
 
 Si vous compilez avec CMake :
 
-[source,shell]
 ----
-cmake .. -DCMAKE_BUILD_TYPE=Debug
+$ cmake .. -DCMAKE_BUILD_TYPE=Debug
 ----
 
 [[address_sanitizer]]
@@ -461,9 +452,8 @@ 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]
@@ -472,9 +462,8 @@ 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`.
@@ -495,14 +484,12 @@ 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
 ----
@@ -526,7 +513,6 @@ 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
 ----
@@ -575,7 +561,6 @@ 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
 ----
@@ -591,9 +576,8 @@ 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
@@ -817,26 +801,25 @@ 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_upgrading_notes]]
+[[restart_release_notes]]
-==== Notes de mise à jour
+==== Notes de version
 
-Après une mise à jour, il est *fortement recommandé* de lire le fichier
+Après une mise à jour, il est *fortement recommandé* de lire les
-https://github.com/weechat/weechat/blob/main/UPGRADING.md[UPGRADING.md ^↗^^]
+https://weechat.org/files/doc/weechat/ReleaseNotes-devel.html[notes de version ^↗^^]
-qui contient des informations importantes sur les changements majeurs et
+qui contiennent des informations importantes sur les changements majeurs et
 quelques actions manuelles qui pourraient être nécessaires.
 
-Vous devez lire les versions entre votre version ancienne (exclue)
+Vous devez lire les notes des versions entre votre version ancienne (exclue)
 et votre nouvelle version (incluse). +
-Par exemple si vous passez de la version 4.0.0 à 4.3.0, vous devez lire les
+Par exemple si vous passez de la version 3.0 à 3.2, vous devez lire les notes
-versions 4.0.1 à 4.3.0.
+des versions 3.1 et 3.2.
 
 [[restart_configuration_upgrade]]
 ==== Mise à jour de la configuration
@@ -1367,7 +1350,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 la commande <<command_logger_logger,/logger>>).
+| log0 … log9      | Niveau de log pour la ligne (voir `/help 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)^
@@ -2893,9 +2876,8 @@ 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" :
@@ -3357,7 +3339,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 la commande <<command_weechat_secure,/secure>>.
+Pour une liste complète des options supportées, voir `/help secure`.
 
 Pour utiliser le mot de passe _libera_, par exemple avec
 <<irc_sasl_authentication,l'authentification SASL>> :
@@ -3483,9 +3465,8 @@ 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]]
@@ -3643,10 +3624,9 @@ 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]
@@ -3667,11 +3647,10 @@ 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]
@@ -3721,9 +3700,8 @@ 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]
@@ -3732,9 +3710,8 @@ 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
@@ -3804,9 +3781,8 @@ 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
@@ -4239,7 +4215,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 l'option <<option_irc.server_default.autojoin,irc.server_default.autojoin>>.
+Pour de l'aide sur le format, voir `/help irc.server.libera.autojoin`.
 
 [[irc_private_messages]]
 === Messages privés
@@ -4288,7 +4264,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 la commande <<command_weechat_filter,/filter>>) :
+commençant par le même nom (voir `/help filter`) :
 
 ----
 /filter add irc_smart_weechat irc.libera.#weechat* irc_smart_filter *
@@ -4747,11 +4723,10 @@ 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]
@@ -4857,10 +4832,10 @@ protocole.
 Par exemple :
 
 ----
-/relay add weechat 9500
+/relay add weechat 9000
 ----
 
-Maintenant vous pouvez vous connecter sur le port 9500 avec une interface
+Maintenant vous pouvez vous connecter sur le port 9000 avec une interface
 distante en utilisant le mot de passe "motdepasse".
 
 [[relay_websocket]]
@@ -4880,10 +4855,10 @@ JavaScript :
 
 [source,javascript]
 ----
-websocket = new WebSocket("ws://server.com:9500/weechat");
+websocket = new WebSocket("ws://server.com:9000/weechat");
 ----
 
-Le port (9500 dans l'exemple) est le port défini dans l'extension Relay.
+Le port (9000 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_.
@@ -4906,9 +4881,8 @@ _/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
@@ -4996,39 +4970,34 @@ 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]]

doc/it/includes/attributes-it.adoc

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

doc/it/includes/cmdline_options.it.adoc

@@ -39,10 +39,6 @@
 *-h*, *--help*::
     Mostra l'aiuto.
 
-// TRANSLATION MISSING
-*-i*, *--build-info*::
-    Display build information and exit.
-
 *-l*, *--license*::
     Mostra la licenza di WeeChat.
 

doc/it/includes/man.it.adoc

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

doc/it/weechat_faq.it.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: it
-include::includes/attributes-it.adoc[]
+:toc-title: Indice
 
 // TRANSLATION MISSING
 Translators:
@@ -62,7 +62,6 @@ 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
 ----
@@ -70,7 +69,6 @@ brew info weechat
 // TRANSLATION MISSING
 You can install WeeChat with this command:
 
-[source,shell]
 ----
 brew install weechat
 ----
@@ -350,15 +348,10 @@ just the contents of the currently selected window, without any formatting.
 rxvt-unicode, konsole, gnome-terminal, ...). La combinazione tasti in
 generale è kbd:[Ctrl] + kbd:[Alt] + selezione mouse.
 
-// TRANSLATION MISSING
-You can toggle nicklist and make it visible only when needed, with key
-kbd:[Alt+Shift+N].
-
 Un'altra soluzione è spostare la lista nick in alto o in basso, per esempio:
 
 ----
 /set weechat.bar.nicklist.position top
-/set weechat.bar.nicklist.size_max 8
 ----
 
 [[urls]]
@@ -370,15 +363,11 @@ You can use the bare display (default key: kbd:[Alt+l] (`L`)).
 // TRANSLATION MISSING
 To make opening URLs easier, you can:
 
-// TRANSLATION MISSING
-* toggle nicklist and make it visible only when needed, with key kbd:[Alt+Shift+N]
-
 // TRANSLATION MISSING
 * move nicklist to top:
 
 ----
 /set weechat.bar.nicklist.position top
-/set weechat.bar.nicklist.size_max 8
 ----
 
 // TRANSLATION MISSING
@@ -435,7 +424,6 @@ There is no option in WeeChat to change the timezone, the environment variable
 // TRANSLATION MISSING
 In your shell initialization file or on command line, before starting WeeChat:
 
-[source,shell]
 ----
 export TZ=Europe/Rome
 ----
@@ -762,9 +750,8 @@ In base al terminale usato, il mouse potrebbe non essere supportato.
 
 È possibile testare il supporto al mouse nel terminale:
 
-[source,shell]
 ----
-printf '\033[?1002h'
+$ printf '\033[?1002h'
 ----
 
 E poi cliccare sul primo carattere del terminale (in alto a sinistra. Dovrebbe
@@ -772,9 +759,8 @@ essere possibile vedere  !!#!!".
 
 Per disabilitare il mouse nel terminale:
 
-[source,shell]
 ----
-printf '\033[?1002l'
+$ printf '\033[?1002l'
 ----
 
 [[mouse_coords]]
@@ -832,7 +818,7 @@ should be, you can specify the fingerprint (SHA-512, SHA-256 or SHA-1):
 Provare una stringa di priorità diversa, sostituendo "xxx" con il nome del server:
 
 ----
-/set irc.server.xxx.tls_priorities "NORMAL:%COMPAT"
+/set irc.server.xxx.tls_priorities "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
 ----
 
 [[irc_tls_libera]]
@@ -1110,9 +1096,8 @@ 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
 ----
 
 // TRANSLATION MISSING
@@ -1137,10 +1122,9 @@ 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
 ----
 
 // TRANSLATION MISSING
@@ -1148,7 +1132,6 @@ 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
 ----
@@ -1339,7 +1322,6 @@ See https://weechat.org/about/support/[this page ^↗^^].
 Quando viene eseguito WeeChat all'interno di gdb, potrebbe verificarsi
 questo errore:
 
-[source,shell]
 ----
 $ gdb /path/to/weechat
 (gdb) run
@@ -1350,7 +1332,6 @@ Cannot find new threads: generic error
 Per correggerlo, è possibile eseguire gdb con questo comando (sostituire il
 path di libpthread e WeeChat con i path del proprio sistema):
 
-[source,shell]
 ----
 $ LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat
 (gdb) run

doc/it/weechat_plugin_api.it.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: it
-include::includes/attributes-it.adoc[]
+:toc-title: Indice
 
 // TRANSLATION MISSING
 Translators:
@@ -185,10 +185,9 @@ il file _weechat-plugin.h_.
 
 Per compilare un plugin che ha un file "tizio.c" (in GNU/Linux):
 
-[source,shell]
 ----
-gcc -fPIC -Wall -c tizio.c
+$ gcc -fPIC -Wall -c tizio.c
-gcc -shared -fPIC -o tizio.so tizio.o
+$ gcc -shared -fPIC -o tizio.so tizio.o
 ----
 
 [[load_plugin]]
@@ -677,7 +676,7 @@ Argomenti:
 
 * _string_: string to cut
 * _length_: max chars
-* _count_suffix_: if 1, the length of suffix is counted in the max length
+* _count_suffix_: if 1, the length of suffix is counter 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
 
@@ -2773,7 +2772,8 @@ str3 = weechat.string_input_for_buffer("//test")  # "/test"
 // TRANSLATION MISSING
 ==== 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, 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._
+_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._
 
 Evaluate an expression and return result as a string.
 Special variables with format `+${variable}+` are expanded (see table below).
@@ -3487,12 +3487,6 @@ 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}+` +
@@ -6074,8 +6068,7 @@ Funzioni per le tabelle hash.
 
 ==== hashtable_new
 
-// TRANSLATION MISSING
+_WeeChat ≥ 0.3.3._
-_WeeChat ≥ 0.3.3, updated in 4.4.0._
 
 Crea una nuova tabella hash.
 
@@ -6104,14 +6097,12 @@ Argomenti:
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
-** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 * _type_values_: tipo per i valori nella tabella hash:
 ** _WEECHAT_HASHTABLE_INTEGER_
 ** _WEECHAT_HASHTABLE_STRING_
 ** _WEECHAT_HASHTABLE_POINTER_
 ** _WEECHAT_HASHTABLE_BUFFER_
 ** _WEECHAT_HASHTABLE_TIME_
-** _WEECHAT_HASHTABLE_LONGLONG_ _(WeeChat ≥ 4.4.0)_
 // TRANSLATION MISSING
 * _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),
@@ -6481,16 +6472,12 @@ Argomenti:
 *** _pointer_: puntatore
 *** _buffer_: buffer
 *** _time_: tempo
-// TRANSLATION MISSING
-*** _longlong_: long long integer
 ** _type_values_: tipo per i valori:
 *** _integer_: intero
 *** _string_: stringa
 *** _pointer_: puntatore
 *** _buffer_: buffer
 *** _time_: tempo
-// TRANSLATION MISSING
-*** _longlong_: long long integer
 ** _keys_: stringa con la lista di chiavi (formato: "chiave1,chiave2,chiave3")
 ** _keys_sorted_: stringa con l'elenco di chiavi ordinate (formato: "chiave1,chiave2,chiave3")
 ** _values_: stringa  con la lista di valori (formato: "valore1,valore2,valore3")
@@ -11543,7 +11530,7 @@ hook2 = weechat.hook_url("http://localhost:8080/", options, 20000, "my_url_cb",
 ==== hook_connect
 
 // TRANSLATION MISSING
-_Updated in 1.5, 2.0, 4.4.0._
+_Updated in 1.5, 2.0._
 
 Hook su una connessione (connessione in secondo piano ad un host remoto).
 
@@ -11579,13 +11566,7 @@ Argomenti:
 * _address_: nome o indirizzo IP al quale connettersi
 * _port_: numero della porta
 // TRANSLATION MISSING
-* _ipv6_:
+* _ipv6_: 1 to use IPv6 (with fallback to IPv4), 0 to use only IPv4
-// TRANSLATION MISSING
-** `WEECHAT_HOOK_CONNECT_IPV6_DISABLE` ^(1)^: disable IPv6 (use only IPv4)
-// TRANSLATION MISSING
-** `WEECHAT_HOOK_CONNECT_IPV6_AUTO` ^(1)^: use IPv6 with fallback to IPv4
-// TRANSLATION MISSING
-** `WEECHAT_HOOK_CONNECT_IPV6_FORCE` ^(1)^: force IPv6 (do not use IPv4) _(WeeChat ≥ 4.4.0)_
 // TRANSLATION MISSING
 * _retry_: retry count, used to fallback to IPv4 hosts if IPv6 hosts connect
   but then fail to accept the client
@@ -11608,7 +11589,7 @@ Argomenti:
   successo oppure no, argomenti e valore restituito:
 ** _const void *pointer_: puntatore
 ** _void *data_: puntatore
-** _int status_: stato della connessione ^(2)^:
+** _int status_: stato della connessione:
 *** _WEECHAT_HOOK_CONNECT_OK_: connessione avvenuta con successo
 *** _WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND_: indirizzo non trovato
 *** _WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND_: indirizzo IP non trovato
@@ -11620,8 +11601,8 @@ Argomenti:
 *** _WEECHAT_HOOK_CONNECT_MEMORY_ERROR_: memoria insufficiente
 *** _WEECHAT_HOOK_CONNECT_TIMEOUT_: timeout
 *** _WEECHAT_HOOK_CONNECT_SOCKET_ERROR_: errore nella creazione socket
-** _gnutls_rc_: valore del risultato di _gnutls_handshake()_ ^(2)^
+** _gnutls_rc_: valore del risultato di _gnutls_handshake()_
-** _sock_: socket utilizzato per la connessione ^(2)^
+** _sock_: socket utilizzato per la connessione
 ** _const char *error_: valore del risultato di _gnutls_strerror(gnutls_rc)_
 ** _const char *ip_address_: indirizzo IP trovato
 ** valore restituito:
@@ -11633,20 +11614,17 @@ Argomenti:
   if not NULL, it must have been allocated with malloc (or similar function)
   and it is automatically freed when the hook is deleted
 
-// TRANSLATION MISSING
-[NOTE]
-^(1)^ Constants for parameter _ipv6_ are available since WeeChat 4.4.0. +
-For older releases, allowed values are `1` (use IPv6 with fallback to IPv4) and
-`0` (disable IPv6, use only IPv4). +
-^(2)^ 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)`.
-
 Valore restituito:
 
 * puntatore al nuovo hook, NULL in caso di errore
 
+// TRANSLATION MISSING
+[IMPORTANT]
+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)`.
+
 Esempio in C:
 
 [source,c]
@@ -11696,8 +11674,7 @@ 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,
-                                                       WEECHAT_HOOK_CONNECT_IPV6_AUTO,
+                                                       1, 0,
-                                                       0,
                                                        NULL, NULL, 0,  /* GnuTLS */
                                                        NULL,
                                                        &my_connect_cb, NULL, NULL);
@@ -11713,32 +11690,31 @@ def hook_connect(proxy: str, address: str, port: int, ipv6: int, retry: int, loc
 
 # esempio
 def my_connect_cb(data: str, status: int, gnutls_rc: int, sock: int, error: str, ip_address: str) -> int:
-    if status == weechat.WEECHAT_HOOK_CONNECT_OK:
+    if status == WEECHAT_HOOK_CONNECT_OK:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
+    elif status == WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
+    elif status == WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_PROXY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_PROXY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_MEMORY_ERROR:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_TIMEOUT:
+    elif status == WEECHAT_HOOK_CONNECT_TIMEOUT:
         # ...
-    elif status == weechat.WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
+    elif status == WEECHAT_HOOK_CONNECT_SOCKET_ERROR:
         # ...
     return weechat.WEECHAT_RC_OK
 
-hook = weechat.hook_connect("", "my.server.org", 1234,
+hook = weechat.hook_connect("", "my.server.org", 1234, 1, 0, "",
-                            weechat.WEECHAT_HOOK_CONNECT_IPV6_AUTO, 0, "",
                             "my_connect_cb", "")
 ----
 
@@ -12629,11 +12605,6 @@ List of signals sent by WeeChat and plugins:
 | Puntatore: riga.
 | Riga aggiunta in un buffer.
 
-// TRANSLATION MISSING
-| 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 |
 | Puntatore: buffer.
 | Righe nascoste nel buffer.
@@ -12681,11 +12652,6 @@ List of signals sent by WeeChat and plugins:
 | Pointer: buffer.
 | Modes of buffer changed.
 
-// TRANSLATION MISSING
-| 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 |
 | Puntatore: buffer.
 | Tipo di buffer modificato.
@@ -12810,16 +12776,6 @@ List of signals sent by WeeChat and plugins:
 | String: key combo.
 | Key combo in _cursor_ context.
 
-// TRANSLATION MISSING
-| weechat | [[hook_signal_layout_buffers_applied]] layout_buffers_applied | 4.4.0
-| String: layout name.
-| Layout applied for buffers.
-
-// TRANSLATION MISSING
-| weechat | [[hook_signal_layout_windows_applied]] layout_windows_applied | 4.4.0
-| String: layout name.
-| Layout applied for windows.
-
 // TRANSLATION MISSING
 | weechat | [[hook_signal_mouse_enabled]] mouse_enabled | 1.1
 | -
@@ -15323,6 +15279,7 @@ Argomenti:
 ** _number_: numero del buffer (inizia da 1)
 ** _layout_number_: numero del buffer salvato nel layout
 ** _layout_number_merge_order_: ordine di unione per i layout
+** _short_name_is_set_: 1 se il nome breve è impostato, 0 in caso contrario
 ** _type_: tipo dibuffer (0: formattato, 1: contenuto libero)
 ** _notify_: livello di notifica per il buffer
 ** _num_displayed_: numero delle finestre che visualizzano il buffer
@@ -15533,7 +15490,7 @@ Esempio in C:
 
 [source,c]
 ----
-weechat_printf (NULL, "plugin pointer of my buffer: %p",
+weechat_printf (NULL, "plugin pointer of my buffer: %lx",
                 weechat_buffer_get_pointer (my_buffer, "plugin"));
 ----
 
@@ -15985,50 +15942,6 @@ if buffer:
     weechat.prnt("", "%d" % weechat.buffer_match_list(buffer, "irc.oftc.*,python.*"))  # 0
 ----
 
-// TRANSLATION MISSING
-[[buffer_lines]]
-=== Buffer lines
-
-// TRANSLATION MISSING
-Functions for buffer lines.
-
-==== line_search_by_id
-
-_WeeChat ≥ 4.4.0._
-
-// TRANSLATION MISSING
-Search line in buffer by identifier.
-
-Prototipo:
-
-[source,c]
-----
-struct t_gui_line *weechat_line_search_by_id (struct t_gui_buffer *buffer, int id);
-----
-
-Valore restituito:
-
-// TRANSLATION MISSING
-* pointer to line found, NULL if not found
-
-Esempio in C:
-
-[source,c]
-----
-struct t_gui_line *line = weechat_line_search_by_id (buffer, 123);
-----
-
-Script (Python):
-
-[source,python]
-----
-# prototipo
-def line_search_by_id(buffer: str, line_id: int) -> str: ...
-
-# esempio
-line = weechat.line_search_by_id(buffer, 123)
-----
-
 [[windows]]
 === Finestre
 
@@ -16094,7 +16007,7 @@ Esempio in C:
 [source,c]
 ----
 weechat_printf (NULL,
-                "window displaying core buffer: %p",
+                "window displaying core buffer: %lx",
                 weechat_window_search_with_buffer (weechat_buffer_search_main ()));
 ----
 
@@ -16234,7 +16147,7 @@ Esempio in C:
 [source,c]
 ----
 weechat_printf (NULL,
-                "buffer displayed in current window: %p",
+                "buffer displayed in current window: %lx",
                 weechat_window_get_pointer (weechat_current_window (), "buffer"));
 ----
 
@@ -20250,7 +20163,7 @@ Esempio in C:
 ----
 struct t_hdata *hdata = weechat_hdata_get ("buffer");
 struct t_gui_buffer *buffer = weechat_buffer_search_main ();
-weechat_printf (NULL, "lines = %p", weechat_hdata_pointer (hdata, buffer, "lines"));
+weechat_printf (NULL, "lines = %lx", weechat_hdata_pointer (hdata, buffer, "lines"));
 ----
 
 Script (Python):

doc/it/weechat_quickstart.it.adoc

@@ -2,7 +2,7 @@
 :author: Sébastien Helleu
 :email: flashcode@flashtux.org
 :lang: it
-include::includes/attributes-it.adoc[]
+:toc-title: Indice
 
 Traduttori:
 
@@ -18,9 +18,8 @@ le scorciatoie da tastiera predefinite.
 
 Avviare dalla propria shell:
 
-[source,shell]
 ----
-weechat
+$ weechat
 ----
 
 [[help]]