--- a/CHANGES.md	Wed Feb 17 19:45:00 2021 +0100
+++ b/CHANGES.md	Wed Feb 17 20:01:00 2021 +0100
@@ -58,29 +58,29 @@
 ======================
 
 - Added a new hook system. Hooks consist of an alternative approach to plugins
-  to extend irccd in any language (#2342).
+  to extend irccd in any language.
 
 irccd 3.0.3 2019-10-06
 ======================
 
-- Fix errors in irccdctl.conf example file (#2398),
-- Add example of password in irccdctl.conf and irccd.conf (#2407).
+- Fix errors in irccdctl.conf example file,
+- Add example of password in irccdctl.conf and irccd.conf.
 
 irccd 3.0.2 2019-09-22
 ======================
 
-- Added *IRCCD_WITH_JS* CMake variable in irccd package (#2340),
-- Fixed trailing CTCP escape code (#2339),
-- Fixed invalid parameters in topic event (#2341),
-- Fixed invalid documentation of Irccd.System.usleep function (#2262),
-- Fixed invalid system configuration directory (#2263).
+- Added *IRCCD_WITH_JS* CMake variable in irccd package,
+- Fixed trailing CTCP escape code,
+- Fixed invalid parameters in topic event,
+- Fixed invalid documentation of Irccd.System.usleep function,
+- Fixed invalid system configuration directory.
 
 irccd 3.0.1 2019-09-01
 ======================
 
-- Fixed an invalid template escape sequence (#2250),
-- Updated the default configuration files (#2249),
-- Fix RPATH handling for private libraries like Duktape (#2257).
+- Fixed an invalid template escape sequence,
+- Updated the default configuration files,
+- Fix RPATH handling for private libraries like Duktape.
 
 irccd 3.0.0 2019-08-15
 ======================
@@ -91,90 +91,90 @@
 -----
 
 - New sections `[paths]` and `[paths.plugin]` have been added to control
-  standard paths for both irccd and plugins (#611),
-- Irccd no longer supports uid, gid, pid and daemon features (#846),
-- Sections `[identity]` and `[server]` have been merged (#905),
-- Local transports support SSL (#939),
-- The origin in rule is now first class value (#947),
-- New option `ipv4` in `[transport]` (#945),
-- New option `ipv4` in `[server]` (#945),
-- Section `[format]` is renamed to `[templates]` (#1671),
-- New commands are available as irccd arguments `info` and `version` (#1672).
+  standard paths for both irccd and plugins,
+- Irccd no longer supports uid, gid, pid and daemon features,
+- Sections `[identity]` and `[server]` have been merged,
+- Local transports support SSL,
+- The origin in rule is now first class value,
+- New option `ipv4` in `[transport]`,
+- New option `ipv4` in `[server]`,
+- Section `[format]` is renamed to `[templates]`,
+- New commands are available as irccd arguments `info` and `version`.
 
 irccdctl
 --------
 
-- New option `ipv4` in `[connect]` (#945),
-- New option `-o` in `rule-add` (#947),
-- New option `-o` and `-O` in `rule-edit` (#947).
+- New option `ipv4` in `[connect]`,
+- New option `-o` in `rule-add`,
+- New option `-o` and `-O` in `rule-edit`.
 
 irccd-test
 ----------
 
 - A brand new `irccd-test` program has been added to tests plugins on the
-  command line (#569).
+  command line.
 
 cmake
 -----
 
-- CMake no longer create a fake installation directory while building (#674),
-- All targets are placed into the `bin` directory while building (#715).
+- CMake no longer create a fake installation directory while building,
+- All targets are placed into the `bin` directory while building.
 
 network API
 -----------
 
-- Network commands return an error code instead of a string (#739).
+- Network commands return an error code instead of a string.
 
 javascript API
 --------------
 
 - The Irccd.Timer API now runs on top of Boost.Asio and no longer have custom
-  buggy code (#595),
-- New Irccd.Server.isSelf function (#735).
+  buggy code,
+- New Irccd.Server.isSelf function.
 
 internal
 --------
 
-- The code is now based on Boost for many internal parts of the core, (#593),
-  (#594), (#595), (#681), (#697),
-- The libircclient has been replaced by a simple homemade library (#581).
+- The code is now based on Boost for many internal parts of the core,,
+ ,
+- The libircclient has been replaced by a simple homemade library.
 
 misc
 ----
 
-- The documentation is in pure manual pages now (#1674),
-- All command line options are now in short form only (#1673).
+- The documentation is in pure manual pages now,
+- All command line options are now in short form only.
 
 plugins
 -------
 
-- Introduce brand new joke plugin (#609),
-- Introduce brand new tictactoe plugin (#393),
-- Introduce brand new links plugin (#872).
+- Introduce brand new joke plugin,
+- Introduce brand new tictactoe plugin,
+- Introduce brand new links plugin.
 
 irccd 2.2.0 2017-09-26
 ======================
 
-- Add new Irccd.Util.cut function (#635),
-- Add new irccdctl commands to edit rules (#641),
-- Plugin plugin: add options max-list-lines, max-list-columns (#618),
-- Import Duktape 2.1.0 (#648),
-- Fix identity.ctcp-version option (#690).
+- Add new Irccd.Util.cut function,
+- Add new irccdctl commands to edit rules,
+- Plugin plugin: add options max-list-lines, max-list-columns,
+- Import Duktape 2.1.0,
+- Fix identity.ctcp-version option.
 
 irccd 2.1.3 2017-07-28
 ======================
 
-- Rules are now case insensitive (#645),
-- Plugin hangman, history and logger are now case insensitive (#642),
-- Plugin hangman: fix successive word selection (#644).
+- Rules are now case insensitive,
+- Plugin hangman, history and logger are now case insensitive,
+- Plugin hangman: fix successive word selection.
 
 irccd 2.1.2 2017-06-02
 ======================
 
-- Fix SSL initialization error in libircclient (#653),
-- Fix various SSL warnings (#652),
-- Fix build on Linux with musl (#649),
-- Fix case sensitivity in hangman and roulette (#642).
+- Fix SSL initialization error in libircclient,
+- Fix various SSL warnings,
+- Fix build on Linux with musl,
+- Fix case sensitivity in hangman and roulette.
 
 irccd 2.1.1 2017-03-07
 ======================