Bump for 2.0.21-git.

Release 2.0.20.
Update the change log.
2026-06-13 09:24:46 +02:00 · 2026-05-26 18:00:50 +01:00 · 2026-05-26 17:59:50 +01:00 · 2026-05-26 10:44:44 +01:00 · 2026-05-26 10:36:50 +01:00 · 2026-05-26 09:30:15 +01:00
412 changed files with 16364 additions and 38609 deletions
@@ -1,5 +1,5 @@
   ___
-  / _ \  http://www.anope.org
+  / _ \  https://www.anope.org/
 | /_\ | _ __  _ _  _ _   ___
 |  _  || '_ \/ _ \/ _ \ / _ \
 | | | || | |  |_|  |_| |  __/
@@ -15,4 +15,5 @@ Anope is a set of Services for IRC networks that allows users to
 manage their nicks and channels in a secure and efficient way,
 and administrators to manage their network with powerful tools.

-For all your Anope needs please visit our portal at www.anope.org
+For all your Anope needs please visit our portal at
+https://www.anope.org/
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report a non-security issue with Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your bug report a lot faster. If you have multiple bugs to report then please open one issue for each bug.
+-->
+
+**Description**
+
+
+
+**Steps to reproduce the issue:**
+
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+
+**Describe the results you expected:**
+
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+
+
+**Output of `services --version`:**
+
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Request that a new feature is added to Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your feature request a lot faster. If you have multiple features to request then please open one issue for each feature.
+-->
+
+**Description**
+
+
+
+**Why this would be useful**
+
@@ -0,0 +1 @@
+blank_issues_enabled: false
@@ -0,0 +1,40 @@
+<!--
+Please fill in the template below. It will help us process your pull request a lot faster.
+-->
+
+## Summary
+
+<!--
+Briefly describe what this pull request changes.
+-->
+
+## Rationale
+
+<!--
+Describe why you have made this change.
+-->
+
+## Testing Environment
+
+<!--
+Describe the environment in which you have tested this change:
+-->
+
+I have tested this pull request on:
+
+**Operating system name and version:** <!-- e.g. Linux 3.11 -->
+**Compiler name and version:** <!-- e.g. GCC 4.2.0 -->
+
+## Checks
+
+<!--
+Tick the boxes for the checks you have made.
+-->
+
+I have ensured that:
+
+- [ ] The code I am submitting is my own work and/or I have permission from the author to share it.
+- [ ] Generative AI (Copilot, ChatGPT, etc) was not used to create any part of this pull request.
+- [ ] If the pull request contains a security fix I have followed the reporting rules mentioned in [the security policy](https://github.com/anope/anope/security/policy) (delete if not applicable).
+- [ ] I have documented any features added by this pull request (delete if not applicable).
+- [ ] This pull request does not introduce any incompatible API changes (stable branches only, delete if not applicable).
@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Currently the 2.0 (stable) branch is actively receiving security fixes.
+
+The 2.1 (development) branch is still early in development and currently only receives security fixes when they are synced from the 2.0 branch.
+
+Version | Supported
+------- | ---------
+2.1.x   | :warning:
+2.0.x   | :white_check_mark:
+1.8.x   | :x:
+
+## Reporting a Vulnerability
+
+Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.teranova.net #anope-devel and PM them the details.
+
+We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+    target-branch: "2.1"
@@ -0,0 +1,58 @@
+name: Ubuntu CI
+on:
+  - pull_request
+  - push
+  - workflow_dispatch
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
+    runs-on: ubuntu-24.04
+    env:
+      CXX: ${{ matrix.compiler }}
+      CXXFLAGS: -std=${{ matrix.standard }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update --assume-yes
+          sudo apt-get install --assume-yes --no-install-recommends \
+            clang \
+            g++ \
+            gettext \
+            git \
+            libgnutls28-dev \
+            libldap2-dev \
+            libmysqlclient-dev \
+            libpcre2-dev \
+            libpcre3-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtre-dev \
+            ninja-build
+
+      - name: Enable extras
+        run: |
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          do
+            ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
+          done
+
+      - name: Run CMake
+        run: |
+          mkdir build && cd build
+          cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+
+      - name: Build Anope
+        run: |
+          ninja -C ${{ github.workspace }}/build install
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - clang++
+          - g++
+        standard:
+          - c++98
+          - c++17
@@ -0,0 +1,74 @@
+name: Windows CI
+on:
+  pull_request:
+  push:
+  release:
+    types:
+      - published
+  workflow_dispatch:
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
+    runs-on: windows-2025
+    env:
+      BUILD_TYPE: ${{ github.event_name == 'release' && 'Release' || 'Debug' }}
+      CONAN_USER_HOME: ${{ github.workspace }}/win/build
+      CONAN_USER_HOME_SHORT: None
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup NSIS
+        run: |-
+          choco install nsis
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Setup Conan
+        uses: turtlebrowser/get-conan@v1.2
+        with:
+          version: 1.66.0
+
+      - name: Try to restore libraries from the cache
+        uses: actions/cache/restore@v4
+        id: library-cache
+        with:
+          key: conan-${{ hashFiles('src/win32/conanfile.txt') }}
+          path: ${{ env.CONAN_USER_HOME }}/.conan
+
+      - name: Install libraries
+        run: |
+          conan install ${{ github.workspace }}\src\win32 --build=missing
+
+      - name: Save libraries to the cache
+        if: ${{ steps.library-cache.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v4
+        with:
+          key:  ${{ steps.library-cache.outputs.cache-primary-key }}
+          path: ${{ env.CONAN_USER_HOME }}/.conan
+
+      - name: Run CMake
+        run: |
+          mkdir ${{ github.workspace }}\build
+          cd ${{ github.workspace }}\build
+          cmake -A x64 -D "CMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" -G "Visual Studio 17 2022" ..
+
+      - name: Build Anope
+        working-directory: ${{ github.workspace }}\build
+        run: |
+          msbuild PACKAGE.vcxproj /M:5 /P:Configuration=${{ env.BUILD_TYPE }} /P:Platform=x64 /VERBOSITY:MINIMAL
+
+      - name: Upload installer
+        if: "${{ github.event_name == 'release' }}"
+        working-directory: ${{ github.workspace }}\build
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release upload ${{ github.event.release.tag_name }} $(Get-ChildItem anope-*.exe)
+
+      - name: Upload artifact
+        if: "${{ github.event_name != 'release' }}"
+        uses: actions/upload-artifact@v5
+        with:
+          name: windows-installer
+          path: ${{ github.workspace }}\build\\anope-*.exe
@@ -1,3 +1,20 @@
-config.cache
-include/sysconf.h
 build/
+config.cache
+docs/doxygen
+include/sysconf.h
+modules/m_ldap.cpp
+modules/m_ldap_authentication.cpp
+modules/m_ldap_oper.cpp
+modules/m_mysql.cpp
+modules/m_regex_pcre.cpp
+modules/m_regex_pcre2.cpp
+modules/m_regex_posix.cpp
+modules/m_regex_tre.cpp
+modules/m_sql_authentication.cpp
+modules/m_sql_log.cpp
+modules/m_sql_oper.cpp
+modules/m_sqlite.cpp
+modules/m_ssl_gnutls.cpp
+modules/m_ssl_openssl.cpp
+modules/stats
+run/
@@ -1,3 +1,4 @@
+(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam-@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam@adam-laptop.(none)>
 Adam <adam@anope.org> <Adam@anope.org>
@@ -5,35 +6,55 @@ Adam <adam@anope.org> <Adam@drink-coca-cola.info>
 Adam <adam@anope.org> <Adam@sigterm.info>
 Adam Kramer <ribosome@anope.org> <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Alvaro Toledo <atoledo@keldon.org> <atoledo atoledo@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Attila Molnar <attilamolnar@hush.com>
 Björn Stiddien <keeper@anope.org> <keeper keeper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Charles Kingsley <chaz@anope.org>
 Charles Kingsley <chaz@anope.org> <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>
+Cronus <cronus@nite-serv.com>
 Daniel Engel <dane@zero.org> <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
-David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
 David Robson <rob@anope.org> <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
 Dennis Friis <peavey@inspircd.org> <peavey peavey@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
 Fabio Scotoni <cculex@gmail.com>
+Filippo Cortigiani <simos@simosnap.org> <devel@devel.crtnet.it>
+Filippo Cortigiani <simos@simosnap.org> <simos@H7-25.fritz.box>
 Florian Schulze <certus@anope.org> <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Gabriel Acevedo H. <drstein@anope.org> <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Harakiri <harakiri@overstack.fr>
+Hendrik Jäger <gitcommit@henk.geekmail.org> <github@henk.geekmail.org>
 Jan Milants <viper@anope.org>
 Jan Milants <viper@anope.org> <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864>
 Jan Milants <viper@anope.org> <viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Jens Voss <dukepyrolator@anope.org> <anope@s15355730.onlinehome-server.info>
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@5417fbe8-f217-4b02-8779-1006273d7864>
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@anope.org>
-Jens Voss <dukepyrolator@anope.org> Jens Voß <jens@pyrobook.(none)>
+Jens Voss <dukepyrolator@anope.org> <jens@pyrobook.(none)>
+k4be <k4be@pirc.pl> <34816207+k4bek4be@users.noreply.github.com>
 Lee Holmes <lethality@anope.org>
+Lee Holmes <lethality@anope.org> <lee@lethality.me.uk>
 Mark Summers <mark@goopler.net> <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Matt Schatz <genius3000@g3k.solutions>
+Matt Ullman <matt@airraidsirens.com> <blindsight@gamesurge.net>
+Michael Hazell <michaelhazell@hotmail.com> <Techman-@users.noreply.github.com>
+Michael Stapelberg <michael@robustirc.net> <stapelberg@users.noreply.github.com>
+Michael Wobst <wobst.michael@web.de>
+Michael Wobst <wobst.michael@web.de> <michael@static.163.129.251.148.clients.your-server.de>
+Michael Wobst <wobst.michael@web.de> <michael@wobst.at>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@cyberbotx.com>
 Naram Qashat <cyberbotx@anope.org> <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>
+PeGaSuS <droider.pc@gmail.com>
+PeGaSuS <droider.pc@gmail.com> <25697531+TehPeGaSuS@users.noreply.github.com>
 Pieter Bootsma <geniusdex@anope.org> <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
-Robby <robby@anope.org>
-Robby <robby@chat.be>
-Robby <robby@chatbelgie.be>
+Robby <robby@chatbelgie.be> <robby@anope.org>
+Robby <robby@chatbelgie.be> <robby@chat.be>
+Robert Scheck <robert@fedoraproject.org> <robert-scheck@users.noreply.github.com>
 Robin Burchell <w00t@inspircd.org> <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
 Robin Burchell <w00t@inspircd.org> <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Sadie Powell <sadie@sadiepowell.dev> <petpow@saberuk.com>
+Sadie Powell <sadie@sadiepowell.dev> <sadie@witchery.services>
+Sebastian Barfurth <github@afreshmelon.com>
 Sebastian V. <hal9000@denorastats.org>
 Sebastian V. <hal9000@denorastats.org> <pimpmylinux@5417fbe8-f217-4b02-8779-1006273d7864>
-(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Trystan S. Lee <trystan@nomadirc.net> <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Val Lorentz <progval+git@progval.net> <progval+git@progval.net>
@@ -1,16 +0,0 @@
-language: cpp
-
-compiler:
-  - gcc
-
-before_script:
-  - mkdir build
-  - cd build
-  - cmake -DINSTDIR:STRING=~/services -DDEFUMASK:STRING=077 -DCMAKE_BUILD_TYPE:STRING=DEBUG -DUSE_RUN_CC_PL:BOOLEAN=ON ..
-
-script:
-  - make
-
-notifications:
-  irc:
-    - "irc.anope.org#anope-devel"
@@ -1,14 +1,5 @@
 # This usage of CMake requires at least version 2.4 (checks are made to determine what to use when certain versions lack functions)
-cmake_minimum_required(VERSION 2.4 FATAL_ERROR)
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-  if(POLICY CMP0026)
-    cmake_policy(SET CMP0026 OLD)
-  endif(POLICY CMP0026)
-  if(POLICY CMP0007)
-    cmake_policy(SET CMP0007 OLD)
-  endif(POLICY CMP0007)
-endif(COMMAND cmake_policy)
+cmake_minimum_required(VERSION 2.4...3.20 FATAL_ERROR)

 # Set the project as C++ primarily, but have C enabled for the checks required later
 project(Anope CXX)
@@ -87,9 +78,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
  if(GCC_VERSION LESS 4.2)
    message(FATAL_ERROR "Your compiler is too old to build Anope. Upgrade to GCC 4.2 or newer!")
  endif(GCC_VERSION LESS 4.2)
-  if(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
-    set(CXXFLAGS "${CXXFLAGS} -fno-delete-null-pointer-checks")
-  endif(GCC_VERSION GREATER 6.0 OR GCC_VERSION EQUAL 6.0)
 endif(CMAKE_COMPILER_IS_GNUCXX)

 # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes
@@ -232,6 +220,12 @@ if(EXTRA_LIBS)
  link_directories(${EXTRA_LIBS})
 endif(EXTRA_LIBS)

+# setup conan
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  conan_basic_setup()
+endif()
+
 # Find gettext
 find_package(Gettext)

@@ -419,7 +413,6 @@ read_from_file(${Anope_SOURCE_DIR}/src/version.sh "^VERSION_" VERSIONS)
 # Iterate through the strings found
 foreach(VERSION_STR ${VERSIONS})
  string(REGEX REPLACE "^VERSION_([A-Z]+)=\"?([^\"]*)\"?$" "\\1;\\2" VERSION_OUT ${VERSION_STR})
-  # Depends on CMP0007 OLD
  list(LENGTH VERSION_OUT VERSION_LEN)
  list(GET VERSION_OUT 0 VERSION_TYPE)
  if(${VERSION_LEN} GREATER 1)
@@ -476,16 +469,8 @@ if(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
  endif(MSVC)
 endif(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})

-# Go into the following directories and run their CMakeLists.txt as well
-add_subdirectory(data)
-add_subdirectory(docs)
-add_subdirectory(language)
-add_subdirectory(src)
-add_subdirectory(modules)
-add_subdirectory(include)
-
 # Get the filename of the Anope binary, to use later
-get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION)
+set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>")
 get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)

 # At install time, create the following additional directories
@@ -505,10 +490,6 @@ if(WIN32)
  install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
    DESTINATION ${BIN_DIR}
  )
-
-  # Package any DLLs in src/win/
-  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
-  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
 endif(WIN32)

 install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")
@@ -541,14 +522,14 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
      "bin\\\\anope.bat\\\" \\\"-debug -nofork" "Anope IRC Services (Debug and Window Logging)"
      "bin\\\\anope.bat\\\" \\\"-nofork" "Anope IRC Services (Window Logging)"
      "bin\\\\anope.bat\\\" \\\"-nothird" "Anope IRC Services (No Third Party Modules)"
-      "http://www.anope.org/" "Anope Web Site"
+      "https://www.anope.org/" "Anope Web Site"
    )
    # The following doesn't work, but a bug report has been filed about it
    #set(CPACK_CREATE_DESKTOP_LINK_${SERVICES_BINARY} TRUE)
    set(CPACK_NSIS_MUI_ICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
    set(CPACK_NSIS_MUI_UNIICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
    set(CPACK_NSIS_INSTALLED_ICON_NAME "${SERVICES_BINARY}")
-    set(CPACK_NSIS_URL_INFO_ABOUT "http://www.anope.org/")
+    set(CPACK_NSIS_URL_INFO_ABOUT "https://www.anope.org/")
    set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
  endif(WIN32)
  set(CPACK_SOURCE_PACKAGE_FILE_NAME "anope-${VERSION_FULL_NOBUILD}-source")
@@ -557,3 +538,12 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
  set(CPACK_MONOLITHIC_INSTALL TRUE)
  include(CPack)
 endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
+# Go into the following directories and run their CMakeLists.txt as well
+add_subdirectory(data)
+add_subdirectory(docs)
+add_subdirectory(language)
+add_subdirectory(src)
+add_subdirectory(modules)
+add_subdirectory(include)
+
@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2017 Anope Team
+# Anope (C) 2003-2024 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -149,6 +149,9 @@ while [ $# -ge 1 ] ; do
 		echo "-nointro     Skip intro (disclaimer, etc)"
 		echo "-quick       Skip questions, go straight to cmake"
 		exit 0
+	elif [ $1 = "-devel" ] ; then
+		DEBUG="yes"
+		INSTDIR="$PWD/run"
 	elif [ $1 = "-nocache" ] ; then
 		IGNORE_CACHE="1"
 	elif [ $1 = "-nointro" ] ; then
@@ -173,7 +176,7 @@ done
 cmake --version 2>&1 > /dev/null
 if [ $? -ne 0 ] ; then
 	clear
-	echo "Anope requires CMake 2.4 or newer, which can be downloaded at http://cmake.org or through your system's package manager."
+	echo "Anope requires CMake 2.4 or newer, which can be downloaded at https://cmake.org/ or through your system's package manager."
 	echo "If you have installed CMake already, ensure it is in your PATH environment variable."
 	exit 0
 fi
@@ -190,6 +193,7 @@ if [ ! "$NO_INTRO" ] ; then
 			clear
 			;;
 	esac
+	export MORE='-e'
 	. $SOURCE_DIR/src/version.sh
 	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
 	echo ""
@@ -0,0 +1,46 @@
+## About
+
+Anope is an open source set of IRC Services. It is highly modular, with a vast number of configurable parameters, and is the most used IRC services package. There are also many modules on the [modsite](https://modules.anope.org) to add additional features. It runs on Linux, BSD, and Windows, and supports many modern IRCds, including InspIRCd, UnrealIRCd, and ircd-hybrid. For more details, credits, command line options, and contact information see [docs/README](https://github.com/anope/anope/blob/2.0/docs/README).
+
+* [Website](https://anope.org)
+* [GitHub](https://github.com/anope)
+* IRC \#anope on irc.teranova.net
+
+## Installation
+
+### Linux/BSD
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases).
+
+
+```
+$ ./Config
+$ cd build
+$ make
+$ make install
+```
+
+Now change to the directory where you installed Anope to, e.g. `$ cd ~/services/`
+
+### Windows
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases) and run the installer.
+
+
+## Configuration
+
+Copy conf/example.conf to conf/services.conf
+
+```
+$ cp conf/example.conf conf/services.conf
+```
+
+Edit services.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.teranova.net](ircs://irc.teranova.net/anope).
+
+Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `services.conf` to include the new file.
+
+## Running
+
+Run `$ ./bin/services` to start Anope. If asked to provide logs for support, use the `--support` flag, e.g.: `$ ./bin/services --support`
+
+## Installing extra modules
+
+Extra modules, which are usually modules which require extra libraries to use, such as m\_mysql, can be enabled with the `./extras` command from the source directory. Then re-run `Config`, `make` and `make install` again. Third party modules can be installed by placing them into the `modules/third` directory.
@@ -160,7 +160,7 @@ macro(sort_list LIST)
    # For CMake 2.4.4 or better, this can be done automatically
    list(SORT ${LIST})
  else(CMAKE244_OR_BETTER)
-    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a teporary list
+    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a temporary list
    set(NEW_LIST)
    # Iterate through the old list
    foreach(ITEM ${${LIST}})
@@ -408,7 +408,7 @@ macro(calculate_depends SRC)
        else(FOUND_${FILENAME}_INCLUDE)
          # XXX
          if(NOT ${FILENAME} STREQUAL "libintl.h")
-            message(FATAL_ERROR "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.")
+            message(WARNING "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.")
          endif(NOT ${FILENAME} STREQUAL "libintl.h")
        endif(FOUND_${FILENAME}_INCLUDE)
      endif(CHECK_ANGLE_INCLUDES)
@@ -445,24 +445,32 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
    string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
    # Iterate through the libraries given
    foreach(LIBRARY ${REQUIRED_LIBRARY})
+      # If the library has multiple names extract the alternate.
+      unset(LIBRARY_ALT)
+      if (${LIBRARY} MATCHES "^.+\\|.+$")
+        string(REGEX REPLACE ".+\\|(.*)" "\\1" LIBRARY_ALT ${LIBRARY})
+        string(REGEX REPLACE "(.+)\\|.*" "\\1" LIBRARY ${LIBRARY})
+      endif(${LIBRARY} MATCHES "^.+\\|.+$")
      # Locate the library to see if it exists
      if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
      else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
      endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
      # If the library was found, we will add it to the linker flags
      if(FOUND_${LIBRARY}_LIBRARY)
-        # Get the path only of the library, to add it to linker flags
-        get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
        if(MSVC)
          # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies
          append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
        else(MSVC)
-          # For all others, add the library paths and libraries
+          # Get the path only of the library, to add it to library paths.
+          get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
          append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
+          # Extract the library short name, add it to the library path
+          get_filename_component(LIBRARY_NAME ${FOUND_${LIBRARY}_LIBRARY} NAME_WE)
+          string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
+          append_to_list(LIBRARIES ${LIBRARY_NAME})
        endif(MSVC)
      else(FOUND_${LIBRARY}_LIBRARY)
        # In the case of the library not being found, we fatally error so CMake stops trying to generate
@@ -497,7 +505,7 @@ endmacro(calculate_libraries)
 # check_functions(<source filename> <output variable set to TRUE on success>)
 #
 # This macro is used in most of the module (sub)directories to calculate the
-#   fcuntion dependencies for the given source file.
+#   function dependencies for the given source file.
 ###############################################################################
 macro(check_functions SRC SUCCESS)
  # Default to true
@@ -531,7 +539,7 @@ endmacro(check_functions)
 #   of TRUE is given, periods will be converted to \\. for CPack.
 ###############################################################################
 macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal item
+  # Temporary copy of the original item
  set(REAL_ITEM "${ITEM}")
  # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
  if(${ARGC} GREATER 1)
@@ -10,9 +10,9 @@ if(NOT WIN32)
    endif(GETTEXT_LIBRARY)
  endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
 else(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
+  find_path(GETTEXT_INCLUDE libintl.h)
+  find_library(GETTEXT_LIBRARY gnuintl)
+  find_program(GETTEXT_MSGFMT msgfmt)
  if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
    set(GETTEXT_FOUND TRUE)
    set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})
@@ -118,7 +118,7 @@ Var AR_RegFlags
 "exit_${SecName}:"
 !macroend

-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
  ;  This macro is used to call section's Remove_... macro
  ;from the uninstaller.
  ;Input: section index constant name specified in Section command.
@@ -348,7 +348,7 @@ Function un.RemoveFromPath
 FunctionEnd

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ###########################################
@@ -452,15 +452,15 @@ Done:
 	Exch $R1
 FunctionEnd

-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
  Pop $0
  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
    "$1" "$0"
    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd

 ;--------------------------------
@@ -558,44 +558,44 @@ Section "-Core installation"
  WriteUninstaller "$INSTDIR\Uninstall.exe"
  Push "DisplayName"
  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "DisplayVersion"
  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "Publisher"
  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "UninstallString"
  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "NoRepair"
  Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry

  !ifdef CPACK_NSIS_ADD_REMOVE
  ;Create add/remove functionality
  Push "ModifyPath"
  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !else
  Push "NoModify"
  Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !endif

  ; Optional registration
  Push "DisplayIcon"
  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "HelpLink"
  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "URLInfoAbout"
  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "Contact"
  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

  ;Create shortcuts
@@ -607,19 +607,19 @@ Section "-Core installation"
  ; Write special uninstall registry entries
  Push "StartMenu"
  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "DoNotAddToPath"
  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "AddToPathAllUsers"
  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "AddToPathCurrentUser"
  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
  Push "InstallToDesktop"
  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry

@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@

@@ -731,7 +731,7 @@ Section "Uninstall"
  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"

  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"

  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP

@@ -739,7 +739,7 @@ Section "Uninstall"
@CPACK_NSIS_DELETE_ICONS@
@CPACK_NSIS_DELETE_ICONS_EXTRA@

-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

  startMenuDeleteLoop:
@@ -752,13 +752,13 @@ Section "Uninstall"
    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
  startMenuDeleteLoopDone:

-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
  ; try to fix it.
  StrCpy $MUI_TEMP "$START_MENU"
  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
@CPACK_NSIS_DELETE_ICONS_EXTRA@

-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

  secondStartMenuDeleteLoop:
@@ -242,14 +242,14 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
 *   botserv/kick - Dummy help wrapper for the KICK command.
 *   botserv/kick/amsg - Configures BotServ's AMSG kicker.
 *   botserv/kick/badwords - Configures BotServ's badwords kicker.
- *   botserv/kick/bolds - Configures BotServ's bold text kiceker.
+ *   botserv/kick/bolds - Configures BotServ's bold text kicker.
 *   botserv/kick/caps - Configures BotServ's capital letters kicker.
 *   botserv/kick/colors - Configures BotServ's color kicker.
 *   botserv/kick/flood - Configures BotServ's flood kicker.
 *   botserv/kick/italics - Configures BotServ's italics kicker.
 *   botserv/kick/repeat - Configures BotServ's repeat kicker.
 *   botserv/kick/reverses - Configures BotServ's reverse kicker.
- *   botserv/kick/underlines - Configures BotServ's reverse kicker.
+ *   botserv/kick/underlines - Configures BotServ's underline kicker.
 *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
 *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
 *
@@ -333,10 +333,10 @@ privilege
 /*
 * fantasy
 *
- * Allows 'fantaisist' commands to be used in channels.
+ * Allows fantasy commands (e.g. !kick) to be used in channels.
 *
 * Provides the commands:
- *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasist commands.
+ *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasy commands.
 */
 module
 {
@@ -375,15 +375,15 @@ fantasy { name = "ENFORCE"; command = "chanserv/enforce"; }
 fantasy { name = "ENTRYMSG"; command = "chanserv/entrymsg"; }
 fantasy { name = "FLAGS"; command = "chanserv/flags"; }
 fantasy { name = "HALFOP"; command = "chanserv/modes"; }
-fantasy { name = "HELP"; command = "generic/help"; prepend_channel = false; }
+fantasy { name = "HELP"; command = "generic/help"; prepend_channel = no; }
 fantasy { name = "HOP"; command = "chanserv/xop"; }
-fantasy { name = "INFO"; command = "chanserv/info"; prepend_channel = false; }
+fantasy { name = "INFO"; command = "chanserv/info"; prepend_channel = no; }
 fantasy { name = "INVITE"; command = "chanserv/invite"; }
 fantasy { name = "K"; command = "chanserv/kick"; }
 fantasy { name = "KB"; command = "chanserv/ban"; }
 fantasy { name = "KICK"; command = "chanserv/kick"; }
 fantasy { name = "LEVELS"; command = "chanserv/levels"; }
-fantasy { name = "LIST"; command = "chanserv/list"; prepend_channel = false; }
+fantasy { name = "LIST"; command = "chanserv/list"; prepend_channel = no; }
 fantasy { name = "LOG"; command = "chanserv/log"; }
 fantasy { name = "MODE"; command = "chanserv/mode"; }
 fantasy { name = "MUTE"; command = "chanserv/ban"; kick = no; mode = "QUIET"; }
@@ -391,7 +391,7 @@ fantasy { name = "OP"; command = "chanserv/modes"; }
 fantasy { name = "OWNER"; command = "chanserv/modes"; }
 fantasy { name = "PROTECT"; command = "chanserv/modes"; }
 fantasy { name = "QOP"; command = "chanserv/xop"; }
-fantasy { name = "SEEN"; command = "chanserv/seen"; prepend_channel = false; }
+fantasy { name = "SEEN"; command = "chanserv/seen"; prepend_channel = no; }
 fantasy { name = "SOP"; command = "chanserv/xop"; }
 fantasy { name = "STATUS"; command = "chanserv/status"; }
 fantasy { name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend"; }
@@ -79,7 +79,7 @@ module
 	 * -      cs_secure: Enable channel security, requiring the user to be identified with NickServ in
 	 *                     order to be considered for being on the access list of the channel
 	 * -      secureops: Only allow operator status to be given if the user is on the access list
-	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change it's
+	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change its
 	 *                     password, or change the founder or successor
 	 * -       signkick: Use of ChanServ's KICK command will cause the user's nick to be signed to the kick.
 	 * - signkick_level: Same as above, but the kick will not be signed if the user is at the same access
@@ -89,10 +89,12 @@ module
 	 * -       noautoop: Disables autoop on the channel
 	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
+	 * -   cs_no_expire: Enables no expire. Needs founder, successor (if set) or anyone in the access list
+	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
-	 * and signkick. If you really want no defaults, use "none" by itself as the option.
+	 * This directive is optional, if left blank, the options will default to keeptopic, peace, cs_secure,
+	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
 	defaults = "keeptopic peace cs_secure securefounder signkick"

@@ -107,10 +109,9 @@ module
 	/*
 	 * The length of time before a channel registration expires.
 	 *
-	 * This directive is optional, but recommended.
-	 * If not set, the default is 14 days.
+	 * This directive is optional. If not set, the default is never.
 	 */
-	expire = 14d
+	#expire = 90d

 	/*
 	 * The maximum number of entries on a channel's access list.
@@ -161,19 +162,19 @@ module
 	/*
 	 * If set, prevents channel access entries from containing hostmasks.
 	 */
-	disallow_hostmask_access = false
+	disallow_hostmask_access = no

 	/*
 	 * If set, prevents channels from being on access lists.
 	 */
-	disallow_channel_access = false
+	disallow_channel_access = no

 	/*
 	 * If set, ChanServ will always lower the timestamp of registered channels to their registration date.
 	 * This prevents several race conditions where unauthorized users can join empty registered channels and set
 	 * modes etc. prior to services deopping them.
 	 */
-	always_lower_ts = false
+	always_lower_ts = no
 }

 /*
@@ -193,12 +194,12 @@ module
 *
 * If you load cs_xop, you may define a XOP command to associate the privilege with.
 *
- * The name of privileges are uesd to associate them with channel modes. If you are using an IRCd that allows you to define additional
+ * The name of privileges are used to associate them with channel modes. If you are using an IRCd that allows you to define additional
 * channel status modes, such as InspIRCd, you can associate privileges (and thus access levels, flags, xop) with the mode by naming
 * the privileges appropriately. For example, if you had a channel mode called admin, you could create AUTOADMIN, ADMIN, and ADMINME
 * privileges which would automatically be associated with that channel mode.
 *
- * Defining new privileges here is not useful unless you have a module (eg, a third party one) made to check for
+ * Defining new privileges here is not useful unless you have a module (e.g. a third party one) made to check for
 * the specific level you are defining.
 *
 * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
@@ -420,7 +421,7 @@ privilege
 *
 * Used by chanserv/getkey and nickserv/ajoin.
 *
- * Users with this permission can get they channel key with GETKEY and
+ * Users with this permission can get their channel key with GETKEY and
 * can use nickserv/ajoin to join channels with keys.
 */
 privilege
@@ -692,7 +693,7 @@ privilege
 * chanserv/saset/noexpire and chanserv/set.
 *
 * Users with this permission can set what BotServ will kick for, change
- * BotServ and ChanServ settings, clone ChanServ channel setings, and
+ * BotServ and ChanServ settings, clone ChanServ channel settings, and
 * set ChanServ logging options.
 */
 privilege
@@ -836,8 +837,8 @@ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
 * Provides commands chanserv/access and chanserv/levels.
 * Provides the access system "levels".
 *
- * Used for giving users access in channels using a levels system. Allows allows redefining which privileges
- * are representated by given level on a per channel basis.
+ * Used for giving users access in channels using a levels system. Allows redefining which privileges
+ * are represented by given level on a per channel basis.
 *
 * The "LIST" subcommand of chanserv/access will show every access entry on the channel, including access
 * entries not added by cs_access. The "level" of these entries will be the representation of the access
@@ -941,7 +942,7 @@ command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"
 * Used for giving users access in channels.
 *
 * The "LIST" subcommand of chanserv/flags will show every access entry on the channel, including access
- * entries not added by cs_flags. The "Flags" of these entries will be the flags representation of the
+ * entries not added by cs_flags. The "flags" of these entries will be the flags representation of the
 * privilege set granted by the access entry.
 */
 module { name = "cs_flags" }
@@ -1055,7 +1056,7 @@ command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group =
 * Provides the command chanserv/mode and chanserv/modes.
 *
 * Used for changing mode locks and changing modes. Multiple commands may be mapped to chanserv/modes, the
- * configuration directive 'set' and 'unset' are used to tell chanserv/modes which modes should be set or
+ * configuration directives 'set' and 'unset' are used to tell chanserv/modes which modes should be set or
 * unset when the command is executed.
 */
 module
@@ -1117,7 +1118,7 @@ module
 	name = "cs_seen"

 	/* If set, uses the older 1.8 style seen, which is less resource intensive */
-	simple = false
+	simple = no

 	/* Sets the time to keep seen entries in the seen database. */
 	purgetime = "30d"
@@ -1163,10 +1164,10 @@ module
 	defbantype = 2

 	/*
-	 * If set, persisent channels have their creation times lowered to their
+	 * If set, persistent channels have their creation times lowered to their
 	 * original registration dates.
 	 */
-	persist_lower_ts = true
+	persist_lower_ts = yes
 }
 command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management"; }
 command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
@@ -1287,7 +1288,7 @@ command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "c
 * Provides the access system "XOP".
 *
 * Used for giving users access in channels. Many commands may be linked to chanserv/xop, but the
- * privileges given by each is determined by the privilege:xop settings above. These commands should
+ * privileges given by each are determined by the privilege:xop settings above. These commands should
 * be ordered from highest to lowest, as each command inherits the privileges of the commands below
 * it.
 *
@@ -1309,7 +1310,7 @@ command { service = "ChanServ"; name = "VOP"; command = "chanserv/xop"; group =
 /*
 * cs_statusupdate
 *
- * This module automatically updates users status on channels when the
+ * This module automatically updates users' status on channels when the
 * channel's access list is modified.
 */
 module { name = "cs_statusupdate" }
@@ -32,7 +32,7 @@ module
 }
 command { service = "ChanServ"; name = "SET CHANSTATS"; command = "chanserv/set/chanstats"; }
 command { service = "NickServ"; name = "SET CHANSTATS"; command = "nickserv/set/chanstats"; }
-command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/saset/chanstats"; }
+command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/saset/chanstats"; permission = "nickserv/saset/chanstats"; }

 module { name = "cs_fantasy_stats" }
 command { service = "ChanServ"; name = "STATS"; command = "chanserv/stats"; }
@@ -65,10 +65,6 @@
 *     will typically be disabled. If this is not the case, more
 *     information will be given in the documentation.
 *
- * [DISCOURAGED]
- *     Indicates a directive which may cause undesirable side effects if
- *     specified.
- *
 * [DEPRECATED]
 *     Indicates a directive which will disappear in a future version of
 *     Services, usually because its functionality has been either
@@ -80,17 +76,17 @@
 * [OPTIONAL] Defines
 *
 * You can define values to other values, which can be used to easily change
- * many values in the configuration. at once.
+ * many values in the configuration at once.
 */

 /*
 * The services.host define is used in multiple different locations throughout the
- * configuration for services clients hostnames.
+ * configuration for the server name and pseudoclient hostnames.
 */
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "services.example.com"
 }

 /*
@@ -110,7 +106,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/services.conf"
 }

 /*
@@ -126,30 +122,37 @@ define
 * An example configuration for InspIRCd that is compatible with the below uplink
 * and serverinfo configuration would look like:
 *
- *     <link name="services.localhost.net"
+ *     # This goes in inspircd.conf, *NOT* your Anope config!
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="services.example.com"
 *           ipaddr="127.0.0.1"
 *           port="7000"
 *           sendpass="mypassword"
 *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="services.example.com" silent="yes">
 *
 * An example configuration for UnrealIRCd that is compatible with the below uplink
 * and serverinfo configuration would look like:
 *
- *     link services.localhost.net
- *     {
- *          username *;
- *          hostname *;
- *          bind-ip "127.0.0.1";
- *          port 7000;
- *          hub *;
- *          password-connect "mypassword";
- *          password-receive "mypassword";
- *          class servers;
+ *     // This goes in unrealircd.conf, *NOT* your Anope config!
+ *     listen {
+ *         ip 127.0.0.1;
+ *         port 7000;
+ *         options {
+ *             serversonly;
+ *         };
 *     };
- *     ulines { services.localhost.net; };
- *     listen 127.0.0.1:7000;
+ *     link services.example.com {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
+ *     };
+ *     ulines { services.example.com; };
 */
 uplink
 {
@@ -202,10 +205,10 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "services.localhost.net"
+	name = "services.host"

 	/*
-	 * The text which should appear as the server's information in /whois and similar
+	 * The text which should appear as the server's information in /WHOIS and similar
 	 * queries.
 	 */
 	description = "Services for IRC Networks"
@@ -247,20 +250,21 @@ serverinfo
 * You MUST modify this to match the IRCd you run.
 *
 * Supported:
- *  - bahamut
+ *  - [DEPRECATED] bahamut
 *  - charybdis
 *  - hybrid
- *  - inspircd12
- *  - inspircd20
+ *  - [DEPRECATED] inspircd12
+ *  - [DEPRECATED] inspircd20
+ *  - inspircd3 (for 3.x and 4.x)
 *  - ngircd
 *  - plexus
 *  - ratbox
- *  - unreal (for 3.2.x)
- *  - unreal4
+ *  - [DEPRECATED] unreal (for 3.2.x)
+ *  - unreal4 (for 4.x or later)
 */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"

 	/*
 	 * Some protocol modules can enforce mode locks server-side. This reduces the spam caused by
@@ -339,16 +343,16 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-/"

 	/*
-	 * If set to true, allows vHosts to not contain dots (.).
+	 * If enabled, allows vHosts to not contain dots (.).
 	 * Newer IRCds generally do not have a problem with this, but the same warning as
 	 * vhost_chars applies.
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	allow_undotted_vhosts = false
+	allow_undotted_vhosts = no

 	/*
 	 * The characters that are not allowed to be at the very beginning or very ending
@@ -356,7 +360,7 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	disallow_start_or_end = ".-"
+	disallow_start_or_end = ".-/"
 }

 /*
@@ -450,12 +454,6 @@ options
 	 */
 	readtimeout = 5s

-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
@@ -486,7 +484,7 @@ options

 	/*
 	 * If set, will force Services to only respond to PRIVMSGs addresses to
-	 * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in
+	 * Nick@ServerName - e.g. NickServ@example.com. This should be used in
 	 * conjunction with IRCd aliases. This directive is optional.
 	 *
 	 * This option will have no effect on some IRCds, such as TS6 IRCds.
@@ -500,7 +498,7 @@ options
 	#hidestatso = yes

 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
+	 * A space-separated list of U-lined servers on your network, it is assumed that
 	 * the servers in this list are allowed to set channel modes and Services will
 	 * not attempt to reverse their mode changes.
 	 *
@@ -532,14 +530,14 @@ options
 	 *
 	 * Note for this to work the regex module providing the regex engine must be loaded.
 	 */
-	regexengine = "regex/pcre"
+	#regexengine = "regex/pcre"

 	/*
-	 * A list of languages to load on startup that will be available in /nickserv set language.
+	 * A list of languages to load on startup that will be available in /NICKSERV SET LANGUAGE.
 	 * Useful if you translate Anope to your language. (Explained further in docs/LANGUAGE).
-	 * Note that english should not be listed here because it is the base language.
+	 * Note that English should not be listed here because it is the base language.
 	 *
-	 * Removing .UTF-8 will instead use the default encoding for the language, eg. iso-8859-1 for western European languages.
+	 * Removing .UTF-8 will instead use the default encoding for the language, e.g. iso-8859-1 for western European languages.
 	 */
 	languages = "ca_ES.UTF-8 de_DE.UTF-8 el_GR.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 hu_HU.UTF-8 it_IT.UTF-8 nl_NL.UTF-8 pl_PL.UTF-8 pt_PT.UTF-8 ru_RU.UTF-8 tr_TR.UTF-8"

@@ -616,7 +614,7 @@ include
 }

 /*
- * [OPTIONAL] NickServ
+ * [RECOMMENDED] NickServ
 *
 * Includes nickserv.example.conf, which is necessary for NickServ functionality.
 *
@@ -655,6 +653,8 @@ log
 	 *   - a channel name
 	 *   - a filename
 	 *   - globops
+	 *
+	 * If you specify a filename the current date in the format ".YYYYMMDD" will be appended to the path.
 	 */
 	target = "services.log"

@@ -668,19 +668,19 @@ log

 	/*
 	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
-	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
+	 * This can be a users name, a channel name, one of our clients (e.g. OperServ), or a server name.
 	 */
 	#source = ""

 	/*
-	 * The bot used to log generic messages which have no predefined sender if there
-	 * is a channel in the target directive.
+	 * The bot used to log generic messages which have no predefined sender if the
+	 * target directive is set to a channel or globops.
 	 */
 	bot = "Global"

 	/*
-	 * The number of days to keep logfiles, only useful if you are logging to a file.
-	 * Set to 0 to never delete old logfiles.
+	 * The number of days to keep log files, only useful if you are logging to a file.
+	 * Set to 0 to never delete old log files.
 	 *
 	 * Note that Anope must run 24 hours a day for this feature to work correctly.
 	 */
@@ -705,7 +705,7 @@ log
 	 * means "* ~operserv/*" would log everything because * matches everything.
 	 *
 	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (eg, operserv/akill, chanserv/set)
+	 *    pseudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
@@ -736,6 +736,7 @@ log
 */
 log
 {
+	bot = "Global"
 	target = "globops"
 	admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop"
 	servers = "squit"
@@ -750,7 +751,6 @@ log
 * You may define groups of commands and privileges, as well as who may use them.
 *
 * This block is recommended, as without it you will be unable to access most oper commands.
- * It replaces the old ServicesRoot directive amongst others.
 *
 * The command names below are defaults and are configured in the *serv.conf's. If you configure
 * additional commands with permissions, such as commands from third party modules, the permissions
@@ -762,17 +762,18 @@ log
 *  chanserv/administration       - Can modify the settings of any channel (including changing of the owner!)
 *  chanserv/access/list          - Can view channel access and akick lists, but not modify them
 *  chanserv/access/modify        - Can modify channel access and akick lists, and use /chanserv enforce
- *  chanserv/auspex               - Can see any information with /chanserv info
+ *  chanserv/auspex               - Can see any information with /CHANSERV INFO
 *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
 *  chanserv/kick                 - Can kick and ban users from channels through ChanServ
- *  memoserv/info                 - Can see any information with /memoserv info
+ *  memoserv/info                 - Can see any information with /MEMOSERV INFO
 *  memoserv/set-limit            - Can set the limit of max stored memos on any user and channel
 *  memoserv/no-limit             - Can send memos through limits and throttles
 *  nickserv/access               - Can modify other users access and certificate lists
 *  nickserv/alist                - Can see the channel access list of other users
- *  nickserv/auspex               - Can see any information with /nickserv info
+ *  nickserv/auspex               - Can see any information with /NICKSERV INFO
 *  nickserv/confirm              - Can confirm other users nicknames
 *  nickserv/drop                 - Can drop other users nicks
+ *  nickserv/recover              - Can recover other users nicks
 *  operserv/config               - Can modify services's configuration
 *  operserv/oper/modify          - Can add and remove operators with at most the same privileges
 *  protected                     - Can not be kicked from channels by Services
@@ -812,6 +813,9 @@ log
 * These can contain commands for oper-only strings (see above) which grants access to that specific command,
 * and privileges (which grant access to more general permissions for the named area).
 * Wildcard entries are permitted for both, e.g. 'commands = "operserv/*"' for all OperServ commands.
+ * You can also negate values with a ~. For example, "~operserv/akill operserv/*" would allow all OperServ
+ * commands except for operserv/akill. Note that processing stops at the first matching option, which
+ * means "* ~operserv/*" would allow everything because * matches everything.
 *
 * Below are some default example types, but this is by no means exhaustive,
 * and it is recommended that you configure them to your needs.
@@ -894,7 +898,7 @@ opertype
 	 */
 	require_oper = yes

-	/* An optional password. If defined the user must login using "/msg OperServ LOGIN" first */
+	/* An optional password. If defined, the user must login using "/OPERSERV LOGIN" first */
 	#password = "secret"

 	/* An optional SSL fingerprint. If defined, it's required to be able to use this opertype. */
@@ -938,20 +942,25 @@ mail
 	 * If set, this option enables the mail commands in Services. You may choose
 	 * to disable it if you have no Sendmail-compatible mailer installed. Whilst
 	 * this directive (and entire block) is optional, it is required if
-	 * nickserv:registration is set to yes.
+	 * nickserv:registration is set to mail.
 	 */
 	usemail = yes

 	/*
-	 * This is the command-line that will be used to call the mailer to send an
-	 * e-mail. It must be called with all the parameters needed to make it
-	 * scan the mail input to find the mail recipient; consult your mailer
-	 * documentation.
+	 * The command used for sending emails. It is assumed that this behaves like
+	 * sendmail (i.e. it reads the email from the standard input stream) but you
+	 * should probably use Postfix or some other sendmail-compatible emailer
+	 * instead of sendmail as sendmail is very hard to configure correctly. If
+	 * you are using Windows then https://www.glob.com.au/sendmail/ is probably
+	 * the best option currently.
 	 *
-	 * Postfix users must use the compatible sendmail utility provided with
-	 * it. This one usually needs no parameters on the command-line. Most
-	 * sendmail applications (or replacements of it) require the -t option
-	 * to be used.
+	 * If your emailer sends emails directly from the services host you will
+	 * need to configure DKIM, DMARC, and SPF to avoid email hosts from marking
+	 * your services emails as spam. It is important that you do this *BEFORE*
+	 * sending emails for the first time as some email providers will add your
+	 * host to a DNSBL like Spamhaus if they consider your emails to be spam. If
+	 * this is too difficult then you may want to consider sending emails via an
+	 * external email provider using a forwarder like msmtp.
 	 */
 	sendmailpath = "/usr/sbin/sendmail -t"

@@ -959,7 +968,7 @@ mail
 	 * This is the e-mail address from which all the e-mails are to be sent from.
 	 * It should really exist.
 	 */
-	sendfrom = "services@localhost.net"
+	sendfrom = "services@example.com"

 	/*
 	 * This controls the minimum amount of time a user must wait before sending
@@ -982,8 +991,21 @@ mail
 	 */
 	#dontquoteaddresses = yes

+	/*
+	 * The content type to use when sending emails.
+	 *
+	 * This directive is optional, and is generally only needed if you want to
+	 * use HTML or non UTF-8 text in your services emails.
+	 */
+	#content_type = "text/plain; charset=UTF-8"
+
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	registration_subject = "Nickname registration for %n"
 	registration_message = "Hi,
@@ -997,6 +1019,11 @@ mail

 	/*
 	 * The subject and message of emails sent to users when they request a new password.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	reset_subject = "Reset password request for %n"
 	reset_message = "Hi,
@@ -1010,6 +1037,13 @@ mail

 	/*
 	 * The subject and message of emails sent to users when they request a new email address.
+	 *
+	 * Available tokens for this template are:
+	 *  %e - Gets replaced with the old email address
+	 *  %E - Gets replaced with the new email address
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	emailchange_subject = "Email confirmation"
 	emailchange_message = "Hi,
@@ -1023,6 +1057,13 @@ mail

 	/*
 	 * The subject and message of emails sent to users when they receive a new memo.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %s - Gets replaced with the sender's nickname
+	 *  %d - Gets replaced with the memo number
+	 *  %t - Gets replaced with the memo text
+	 *  %N - Gets replaced with the network name
 	 */
 	memo_subject = "New memo"
 	memo_message = "Hi %n,
@@ -1066,7 +1107,7 @@ mail
 /*
 * [RECOMMENDED] db_flatfile
 *
- * This is the default flatfile database format.
+ * Stores your database in a custom flatfile format.
 */
 module
 {
@@ -1085,7 +1126,7 @@ module
 	 *
 	 * This directive is optional, but recommended.
 	 */
-	keepbackups = 3
+	keepbackups = 7

 	/*
 	 * Allows Services to continue file write operations (i.e. database saving)
@@ -1106,11 +1147,6 @@ module
 	 * This is only useful with very large databases, with hundreds
 	 * of thousands of objects, that have a noticeable delay from
 	 * writing databases.
-	 *
-	 * If your database is large enough cause a noticeable delay when
-	 * saving you should consider a more powerful alternative such
-	 * as db_sql or db_redis, which incrementally update their
-	 * databases asynchronously in real time.
 	 */
 	fork = no
 }
@@ -1118,16 +1154,16 @@ module
 /*
 * db_sql and db_sql_live
 *
- * db_sql module allows saving and loading databases using one of the SQL engines.
- * This module loads the databases once on startup, then incrementally updates
- * objects in the database as they are changed within Anope in real time. Changes
- * to the SQL tables not done by Anope will have no effect and will be overwritten.
+ * Allows saving and loading databases to a SQL database.
 *
- * db_sql_live module allows saving and loading databases using one of the SQL engines.
- * This module reads and writes to SQL in real time. Changes to the SQL tables
- * will be immediately reflected into Anope. This module should not be loaded
- * in conjunction with db_sql.
+ * db_sql loads the databases once on startup and then incrementally updates in
+ * in the database as they are changed within Anope. Changes to the SQL tables
+ * not done by Anope will have no effect and will be overwritten.
 *
+ * db_sql_live module reads and writes to SQL in real time. Changes to the SQL
+ * tables will be immediately reflected in Anope. This module can not be loaded
+ * at the same time as db_sql. It should also not be used on large networks as
+ * it executes quite a lot of queries which can cause performance issues.
 */
 #module
 {
@@ -1135,10 +1171,10 @@ module
 	#name = "db_sql_live"

 	/*
-	 * The SQL service db_sql(_live) should use, these are configured in modules.conf.
-	 * For MySQL, this should probably be mysql/main.
+	 * The SQL service that db_sql(_live) should use. These are configured in
+	 * modules.example.conf. For MySQL, this should probably be mysql/main.
 	 */
-	engine = "sqlite/main"
+	engine = "mysql/main"

 	/*
 	 * An optional prefix to prepended to the name of each created table.
@@ -1146,23 +1182,28 @@ module
 	 */
 	#prefix = "anope_db_"

-	/* Whether or not to import data from another database module in to SQL on startup.
-	 * If you enable this, be sure that the database services is configured to use is
-	 * empty and that another database module to import from is loaded before db_sql.
-	 * After you enable this and do a database import you should disable it for
-	 * subsequent restarts.
+	/*
+	 * Whether or not to import data from another database module in to SQL on
+	 * startup.
 	 *
-	 * Note that you can not import databases using db_sql_live. If you want to import
-	 * databases and use db_sql_live you should import them using db_sql, then shut down
-	 * and start services with db_sql_live.
+	 * If you enable this, be sure that the database Anope is configured to use
+	 * is empty and that another database module to import from is loaded BEFORE
+	 * db_sql. After you enable this and do a database import you MUST disable
+	 * it for subsequent restarts. If you want to keep writing a file database
+	 * after the SQL import is done you should load db_flatfile AFTER this
+	 * module.
+	 *
+	 * Note that you can not import databases using db_sql_live. If you want to
+	 * import databases and use db_sql_live you should import them using db_sql,
+	 * then shut down and start Anope with db_sql_live.
 	 */
-	import = false
+	import = no
 }

 /*
 * db_redis.
 *
- * This module allows using Redis (http://redis.io) as a database backend.
+ * This module allows using Redis (https://redis.io/) as a database backend.
 * This module requires that m_redis is loaded and configured properly.
 *
 * Redis 2.8 supports keyspace notifications which allows Redis to push notifications
@@ -1183,55 +1224,65 @@ module
 /*
 * [RECOMMENDED] Encryption modules.
 *
- * The encryption modules are used when dealing with passwords. This determines how
- * the passwords are stored in the databases, and does not add any security as
- * far as transmitting passwords over the network goes.
- *
- * Without any encryption modules loaded users will not be able to authenticate unless
- * there is another module loaded that provides authentication checking, such as
- * m_ldap_authentication or m_sql_authentication.
- *
- * With enc_none, passwords will be stored in plain text, allowing for passwords
- * to be recovered later but it isn't secure and therefore is not recommended.
- *
- * The other encryption modules use one-way encryption, so the passwords can not
- * be recovered later if those are used.
- *
- * The first encryption module loaded is the primary encryption module. All new passwords are
- * encrypted by this module. Old passwords stored in another encryption method are
- * automatically re-encrypted by the primary encryption module on next identify.
- *
- * NOTE: enc_old is Anope's previous (broken) MD5 implementation which is present in
- * versions prior to Anope 1.7.17. If your databases were made using that module,
- * use this and not enc_md5.
- *
- * NOTE: enc_sha1 relies on how the OS stores 2+ byte data internally, and is
- * potentially broken when moving between 2 different OSes, such as moving from
- * Linux to Windows. It is recommended that you use enc_sha256 instead if you want
- * to use an SHA-based encryption. If you choose to do so, it is also recommended
- * that you first try to get everyone's passwords converted to enc_sha256 before
- * switching OSes by placing enc_sha256 at the beginning of the list.
+ * The encryption modules are used when dealing with passwords. This determines
+ * how the passwords are stored in the databases.
 *
+ * The first encryption module loaded is the primary encryption module. All new
+ * passwords are encrypted by this module. Old passwords encrypted with another
+ * encryption method are automatically re-encrypted with the primary encryption
+ * module the next time the user identifies.
 */

-#module { name = "enc_bcrypt" }
-module { name = "enc_sha256" }
+/*
+ * enc_bcrypt
+ *
+ * Provides support for encrypting passwords using the Bcrypt algorithm. See
+ * https://en.wikipedia.org/wiki/Bcrypt for more information.
+ */
+#module
+{
+	name = "enc_bcrypt"
+
+	/** The number of Bcrypt rounds to perform on passwords. Can be set to any
+	 * number between 10 and 32 but higher numbers are more CPU intensive and
+	 * may impact performance.
+	 */
+	#rounds = 10
+}
+
+/*
+ * [RECOMMENDED] enc_sha256
+ *
+ * Provides support for encrypting passwords using the SHA-2 algorithm with a
+ * salted initialization vector. See https://en.wikipedia.org/wiki/SHA-2 for
+ * more information.
+ */
+module
+{
+	name = "enc_sha256"
+}
+
+/*
+ * [DEPRECATED] enc_md5, enc_none, enc_old, enc_sha1
+ *
+ * Provides support for passwords encrypted using encryption methods from older
+ * versions of Anope. These methods are no longer considered secure and will be
+ * removed in a future version of Anope. Only load them if you are upgrading
+ * from a previous version of Anope that used them.
+ *
+ * enc_md5:    Verifies passwords encrypted with the MD5 algorithm
+ * enc_none:   Verifies passwords that are not encrypted
+ * enc_sha1:   Verifies passwords encrypted with the SHA1 algorithm
+ * enc_old:    Verifies passwords encrypted with the broken MD5 algorithm used
+ *             before 1.7.17.
+ *
+ * You must load another encryption method before this to re-encrypt passwords
+ * with when a user logs in.
+ */
 #module { name = "enc_md5" }
-#module { name = "enc_sha1" }
-
-/*
- * When using enc_none, passwords will be stored without encryption. This isn't secure
- * therefore it is not recommended.
- */
 #module { name = "enc_none" }
-
-/*
- * enc_old is Anope's previous (broken) MD5 implementation used from 1.4.x to 1.7.16.
- * If your databases were made using that module, load it here to allow conversion to the primary
- * encryption method.
- */
 #module { name = "enc_old" }
-
+#module { name = "enc_sha1" }

 /* Extra (optional) modules. */
 include
@@ -71,7 +71,7 @@ module
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while they're gone"

 	/*
 	 * This is the global message that will be sent when Services (re)join the
@@ -68,7 +68,7 @@ module
 	/*
 	 * If enabled, vhosts are activated on users immediately when they are set.
 	 */
-	activate_on_set = false
+	activate_on_set = no
 }

 /*
@@ -110,12 +110,12 @@ module
 	/*
 	 * Upon nickserv/group, this option syncs the nick's main vHost to the grouped nick.
 	 */
-	syncongroup = false
+	syncongroup = no

 	/*
 	 * This makes vhosts act as if they are per account.
 	 */
-	synconset = false
+	synconset = no
 }
 command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }

@@ -18,7 +18,7 @@ service
 	/*
 	 * The hostname of the StatServ client.
 	 */
-	host = "services.host"
+	host = "stats.host"

 	/*
 	 * The realname of the StatServ client.
@@ -45,7 +45,7 @@ service
 	 *
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
-	#channels = "@#services,#mychan"
+	#channels = "@#stats,#mychan"
 }

 module
@@ -58,7 +58,7 @@ module
 	 */
 	client = "StatServ"

-	/* 
+	/*
 	 * The name of the SQL engine to use.
 	 * This must be MySQL and must match the name in the mysql{} block
 	 */
@@ -84,7 +84,7 @@ module
 	/*
 	 * Get the CTCP version from users
 	 * The users connecting to the network will receive a CTCP VERSION
-	 * request from the above configured services client
+	 * request from the above configured stats client
 	 */
 	ctcpuser = "yes"

@@ -95,4 +95,3 @@ module
 	 */
 	ctcpeob = "yes"
 }
-
@@ -78,8 +78,7 @@ module
 	/*
 	 * The delay between consecutive uses of the MemoServ SEND command. This can help prevent spam
 	 * as well as denial-of-service attacks from sending large numbers of memos and filling up disk
-	 * space (and memory). The default 3-second wait means a maximum average of 150 bytes of memo
-	 * per second per user under the current IRC protocol.
+	 * space (and memory).
 	 *
 	 * This directive is optional, but recommended.
 	 */
@@ -186,8 +185,6 @@ command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
 * Provides the command memoserv/rsend.
 *
 * Used to send a memo requiring a receipt be sent back once it is read.
- *
- * Requires configuring memoserv:memoreceipt.
 */
 #module
 {
@@ -198,7 +195,7 @@ command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
 	 *
 	 * This directive is optional.
 	 */
-	operonly = false
+	operonly = no
 }
 #command { service = "MemoServ"; name = "RSEND"; command = "memoserv/rsend"; }

@@ -30,7 +30,7 @@ module { name = "help" }

 	/*
 	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
-	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
+	 * The below should work fine on all UNIX-like systems. Windows users will have to find their nameservers
 	 * from ipconfig /all and put the IP here.
 	 */
 	nameserver = "/etc/resolv.conf"
@@ -65,7 +65,7 @@ module { name = "help" }
 	/* This should be the names of the public facing nameservers serving the records. */
 	nameservers = "ns1.example.com ns2.example.com"

-	/* The time slave servers are allowed to cache. This should be reasonably low
+	/* The time secondary servers are allowed to cache for. This should be reasonably low
 	 * if you want your records to be updated without much delay.
 	 */
 	refresh = 3600
@@ -127,7 +127,7 @@ module { name = "help" }
 		 * %r is the reply reason (configured below). Will be nothing if not configured.
 		 * %N is the network name set in networkinfo:networkname
 		 */
-		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
+		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i=%i for info"

 		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
@@ -171,11 +171,11 @@ module { name = "help" }
 	{
 		name = "dnsbl.dronebl.org"
 		time = 4h
-		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=%N"
+		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup_branded?ip=%i&network=%N"
 	}

 	/* Exempt localhost from DNSBL checks */
-	exempt { ip = "127.0.0.1" }
+	exempt { ip = "127.0.0.0/8" }
 }

 /*
@@ -223,8 +223,9 @@ module { name = "help" }
 		 * extforward_headers set below, set this to its IP.
 		 * This allows services to obtain the real IP of users by
 		 * reading the forwarded-for HTTP header.
+		 * Multiple IP addresses can be specified separated by a space character.
 		 */
-		#extforward_ip = "192.168.0.255"
+		#extforward_ip = "192.168.0.255 192.168.1.255"

 		/* The header to look for. These probably work as is. */
 		extforward_header = "X-Forwarded-For Forwarded-For"
@@ -232,7 +233,7 @@ module { name = "help" }
 }

 /*
- * m_ldap [EXTRA]
+ * [EXTRA] m_ldap
 *
 * This module allows other modules to use LDAP. By itself, this module does nothing useful.
 */
@@ -253,7 +254,7 @@ module { name = "help" }
 }

 /*
- * m_ldap_authentication [EXTRA]
+ * [EXTRA] m_ldap_authentication
 *
 * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
 * LDAP to authenticate users. Requires m_ldap.
@@ -298,22 +299,22 @@ module { name = "help" }
 	password_attribute = "userPassword"

 	/*
-	 * If set, the reason to give the users who try to register with nickserv,
+	 * If set, the reason to give the users who try to register with NickServ,
 	 * including nick registration from grouping.
 	 *
 	 * If not set, then registration is not blocked.
 	 */
-	#disable_register_reason = "To register on this network visit http://some.misconfigured.site/register"
+	#disable_register_reason = "To register on this network visit https://some.misconfigured.site.example/register"

 	/*
 	 * If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
 	 * If not set, then email changing is not blocked.
 	 */
-	#disable_email_reason = "To change your email address visit http://some.misconfigured.site"
+	#disable_email_reason = "To change your email address visit https://some.misconfigured.site.example"
 }

 /*
- * m_ldap_oper [EXTRA]
+ * [EXTRA] m_ldap_oper
 *
 * This module dynamically ties users to Anope opertypes when they identify
 * via LDAP group membership. Requires m_ldap.
@@ -354,7 +355,7 @@ module { name = "help" }
 }

 /*
- * m_mysql [EXTRA]
+ * [EXTRA] m_mysql
 *
 * This module allows other modules to use MySQL.
 */
@@ -373,6 +374,7 @@ module { name = "help" }
 		port = 3306
 	}
 }
+
 /*
 * m_redis
 *
@@ -399,14 +401,23 @@ module { name = "help" }
 }

 /*
- * m_regex_pcre [EXTRA]
+ * [DEPRECATED] [EXTRA] m_regex_pcre
 *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
 */
 #module { name = "m_regex_pcre" }

 /*
- * m_regex_posix [EXTRA]
+ * [EXTRA] m_regex_pcre2
+ *
+ * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+ */
+#module { name = "m_regex_pcre2" }
+
+/*
+ * [EXTRA] m_regex_posix
 *
 * Provides the regex engine regex/posix, which uses the POSIX compliant regular expressions.
 * This is likely the only regex module you will not need extra libraries for.
@@ -414,7 +425,7 @@ module { name = "help" }
 #module { name = "m_regex_posix" }

 /*
- * m_regex_tre [EXTRA]
+ * [EXTRA] m_regex_tre
 *
 * Provides the regex engine regex/tre, which uses the TRE regex library.
 */
@@ -431,13 +442,13 @@ module { name = "help" }
 	service = "ChanServ"; name = "CLEAR"; command = "rewrite"

 	/* Enable m_rewrite. */
-	rewrite = true
+	rewrite = yes

 	/* Source message to match. A $ can be used to match anything. */
 	rewrite_source = "CLEAR $ USERS"

 	/*
-	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
+	 * Message to rewrite the source message to. A $ followed by a number, e.g. $0, gets
 	 * replaced by the number-th word from the source_message, starting from 0.
 	 */
 	rewrite_target = "KICK $1 *"
@@ -535,20 +546,31 @@ module { name = "help" }
 /*
 * m_sasl
 *
- * Some IRCds allow "SASL" authentication to let users identify to Services
- * during the IRCd user registration process. If this module is loaded, Services will allow
- * authenticating users through this mechanism. Supported mechanisms are:
- * PLAIN, EXTERNAL.
+ * Provides support for authentication to services via IRCv3 SASL. This is a standardised
+ * alternative to ns_identify that is supported by several IRCds.
+ *
+ * You will need to configure your IRCd to use SASL. See the following links for details:
+ *
+ * InspIRCd: https://docs.inspircd.org/4/modules/sasl/
+ * UnrealIRCd: https://www.unrealircd.org/docs/SASL#Enabling_SASL_on_the_server
 */
-#module { name = "m_sasl" }
+module
+{
+	name = "m_sasl"
+
+	/*
+	 * The nick of the client which operates as the SASL agent.
+	 */
+	#agent = "NickServ"
+}

 /*
- * m_ssl_gnutls [EXTRA]
+ * [EXTRA] m_ssl_gnutls
 *
 * This module provides SSL services to Anope using GnuTLS, for example to
 * connect to the uplink server(s) via SSL.
 *
- * You may only load either m_ssl_gnutls or m_ssl_openssl, bot not both.
+ * You may only load either m_ssl_gnutls or m_ssl_openssl, but not both.
 */
 #module
 {
@@ -581,12 +603,12 @@ module { name = "help" }
 }

 /*
- * m_ssl_openssl [EXTRA]
+ * [EXTRA] m_ssl_openssl
 *
 * This module provides SSL services to Anope using OpenSSL, for example to
 * connect to the uplink server(s) via SSL.
 *
- * You may only load either m_ssl_openssl or m_ssl_gnutls, bot not both.
+ * You may only load either m_ssl_openssl or m_ssl_gnutls, but not both.
 *
 */
 #module
@@ -614,7 +636,7 @@ module { name = "help" }
 }

 /*
- * m_sql_authentication [EXTRA]
+ * [EXTRA] m_sql_authentication
 *
 * This module allows authenticating users against an external SQL database using a custom
 * query.
@@ -655,20 +677,20 @@ module { name = "help" }
 	 * If set, the reason to give the users who try to "/msg NickServ REGISTER".
 	 * If not set, then registration is not blocked.
 	 */
-	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
+	#disable_reason = "To register on this network visit https://some.misconfigured.site.example/register"

 	/*
 	 * If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
 	 * If not set, then email changing is not blocked.
 	 */
-	#disable_email_reason = "To change your email address visit http://some.misconfigured.site"
+	#disable_email_reason = "To change your email address visit https://some.misconfigured.site.example"
 }

 /*
- * m_sql_log [EXTRA]
+ * [EXTRA] m_sql_log
 *
 * This module adds an additional target option to log{} blocks
- * that allows logging Service's logs to SQL. To log to SQL, add
+ * that allows logging Services' logs to SQL. To log to SQL, add
 * the SQL service name to log:targets prefixed by sql_log:. For
 * example:
 *
@@ -685,7 +707,7 @@ module { name = "help" }
 #module { name = "m_sql_log" }

 /*
- * m_sql_oper [EXTRA]
+ * [EXTRA] m_sql_oper
 *
 * This module allows granting users services operator privileges and possibly IRC Operator
 * privileges based on an external SQL database using a custom query.
@@ -711,7 +733,7 @@ module { name = "help" }
 }

 /*
- * m_sqlite [EXTRA]
+ * [EXTRA] m_sqlite
 *
 * This module allows other modules to use SQLite.
 */
@@ -726,7 +748,7 @@ module { name = "help" }
 		name = "sqlite/main"

 		/* The database name, it will be created if it does not exist. */
-		database = "anope.db"
+		database = "anope.sqlite"
 	}
 }

@@ -744,13 +766,13 @@ module { name = "help" }
 	name = "webcpanel"

 	/* Web server to use. */
-	server = "httpd/main";
+	server = "httpd/main"

 	/* Template to use. */
-	template = "default";
+	template = "default"

 	/* Page title. */
-	title = "Anope IRC Services";
+	title = "Anope IRC Services"
 }

 /*
@@ -68,7 +68,7 @@ module
 	/*
 	 * Force users to give an e-mail address when they register a nick.
 	 *
-	 * This directive defaults to "yes" and is recommended to be enabled. This is required if e-mail registration is enabled.
+	 * This directive defaults to "yes" and is recommended to be enabled.
 	 */
 	forceemail = yes

@@ -92,27 +92,29 @@ module
 	 *
 	 * The options are:
 	 * -   killprotect: Kill nick if not identified within 60 seconds
-	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                    option and the above must be specified with this one
+	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the killprotect
+	 *                    option and the killprotect option must be specified with this one
+	 * -    kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
+	 *                    and kill_quick options and the killprotect option must be specified with this one
 	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
 	 *                    can be done on it
 	 * -    ns_private: Hide the nick from NickServ's LIST command
-	 * -    hide_email: Hide's the nick's e-mail address from NickServ's INFO command
-	 * -     hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command
-	 * -     hide_quit: Hide's the nick's last quit message
+	 * -    hide_email: Hide the nick's e-mail address from NickServ's INFO command
+	 * -     hide_mask: Hide the nick's last or current user@host from NickServ's INFO command
+	 * -   hide_status: Hide the nick's services operator access status from NickServ's INFO command
+	 * -     hide_quit: Hide the nick's last quit message from NickServ's INFO command
 	 * -   memo_signon: Notify user if they have a new memo when they sign into the nick
 	 * -  memo_receive: Notify user if they have a new memo as soon as it's received
 	 * -     memo_mail: Notify user if they have a new memo by mail
 	 * -        autoop: User will be automatically opped in channels they enter and have access to
 	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
 	 *                    options:useprivmsg to be enabled as well
-	 * -  ns_keepmodes: Enables keepmodes, which retains user modes across sessions
-	 * -  ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
+	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
 	 *
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"

 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -261,7 +263,7 @@ module
 	 * being recognized, unless they manually add an address to the access list of their account.
 	 * This directive is optional.
 	 */
-	addaccessonreg = yes
+	addaccessonreg = no
 }
 command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }

@@ -333,7 +335,7 @@ module { name = "ns_getemail" }
 command { service = "NickServ"; name = "GETEMAIL"; command = "nickserv/getemail"; permission = "nickserv/getemail"; group = "nickserv/admin"; }

 /*
- * ns_getpass
+ * [DEPRECATED] ns_getpass
 *
 * Provides the command nickserv/getpass.
 *
@@ -391,7 +393,7 @@ module
 	 */
 	maxlogins = 10
 }
-command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = true; }
+command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = yes; }
 command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"; }

 /*
@@ -457,7 +459,7 @@ module
 	 * If set, Services will svsnick and svsjoin users who use the recover
 	 * command on an identified user to the nick and channels of the recovered user.
 	 *
-	 * This directive is opional.
+	 * This directive is optional.
 	 */
 	restoreonrecover = yes
 }
@@ -591,12 +593,12 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
 module { name = "ns_set_misc" }
 command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); }
-#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
-#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
-#command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); }
+#command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
+#command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET TIMEZONE"; command = "nickserv/set/misc"; misc_description = _("Associate a time zone with your account"); }
+#command { service = "NickServ"; name = "SASET TIMEZONE"; command = "nickserv/saset/misc"; misc_description = _("Associate a time zone with this account"); permission = "nickserv/saset/timezone"; group = "nickserv/admin"; }

 /*
 * ns_status
@@ -100,7 +100,7 @@ module
 	killonsqline = yes

 	/*
-	 * Adds the nickname of the IRC Operator issuing an AKILL to the kill reason.
+	 * Adds the nickname of the Services Operator issuing an AKILL to the kill reason.
 	 *
 	 * This directive is optional.
 	 */
@@ -159,7 +159,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 *
 * Provides the command operserv/defcon.
 *
- * Allows you to set services in defcon mode, which can be used to restrict services access
+ * Allows you to set services in DefCon mode, which can be used to restrict services access
 * during bot attacks.
 */
 #module
@@ -184,8 +184,8 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	 * - forcechanmodes: Forces all channels to have the modes given in the later chanmodes directive
 	 * - reducedsessions: Reduces the session limit to the value given in the later sessionlimit directive
 	 * - nonewclients: KILL any new clients trying to connect
-	 * - operonly: Services will ignore all non-IRCops
-	 * - silentoperonly: Services will silently ignore all non-IRCops
+	 * - operonly: Ignore all non-IRCops
+	 * - silentoperonly: Silently ignore all non-IRCops
 	 * - akillnewclients: AKILL any new clients trying to connect
 	 * - nonewmemos: No new memos will be sent to block MemoServ attacks
 	 */
@@ -276,15 +276,15 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 * To use this module you must set a nameserver record for services
 * so that DNS queries go to services.
 *
- * Alternatively, you may use a slave DNS server to hide service's IP,
+ * Alternatively, you may use a secondary DNS server to hide services' IP,
 * provide query caching, and provide better fault tolerance.
 *
 * To do this using BIND, configure similar to:
 *
 * options { max-refresh-time 60; };
 * zone "irc.example.com" IN {
- *   type slave;
- *   masters { 127.0.0.1 port 5353; };
+ *   type secondary;
+ *   primaries { 127.0.0.1 port 5353; };
 * };
 *
 * Where 127.0.0.1:5353 is the IP and port services are listening on.
@@ -507,15 +507,15 @@ module { name = "os_noop" }
 command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permission = "operserv/noop"; }

 /*
- * os_oline
+ * [DEPRECATED] os_oline
 *
 * Provides the command operserv/oline.
 *
- * Used to set oper flags on users, and is specific to UnrealIRCd.
+ * Used to set oper flags on users, and is specific to UnrealIRCd 3.2.
 * See /helpop ?svso on your IRCd for more information.
 */
-module { name = "os_oline" }
-command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
+#module { name = "os_oline" }
+#command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }

 /*
 * os_oper
@@ -544,7 +544,7 @@ command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; pe
 *
 * This module enables session limiting. Session limiting prevents users from connecting more than a certain
 * number of times from the same IP at the same time - thus preventing most types of cloning.
- * Once a host reaches it's session limit, all clients attempting to connect from that host will
+ * Once a host reaches its session limit, all clients attempting to connect from that host will
 * be killed. Exceptions to the default session limit can be defined via the exception list.
 *
 * Used to manage the session limit exception list, and view currently active sessions.
@@ -559,7 +559,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5

 	/*
 	 * The maximum session limit that may be set for a host in an exception.
@@ -592,7 +592,7 @@ module
 	 *
 	 * This directive is optional, if not set, nothing will be sent.
 	 */
-	#sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
+	#sessionlimitdetailsloc = "Please visit https://your.website.url/ for more information about session limits."

 	/*
 	 * If set and is not 0, this directive tells Services to add an AKILL if the number of subsequent kills
@@ -65,10 +65,6 @@
 *     will typically be disabled. If this is not the case, more
 *     information will be given in the documentation.
 *
- * [DISCOURAGED]
- *     Indicates a directive which may cause undesirable side effects if
- *     specified.
- *
 * [DEPRECATED]
 *     Indicates a directive which will disappear in a future version of
 *     Services, usually because its functionality has been either
@@ -80,17 +76,17 @@
 * [OPTIONAL] Defines
 *
 * You can define values to other values, which can be used to easily change
- * many values in the configuration. at once.
+ * many values in the configuration at once.
 */

 /*
 * The services.host define is used in multiple different locations throughout the
- * configuration for services clients hostnames.
+ * configuration for the server name and pseudoclient hostnames.
 */
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "stats.example.com"
 }

 /*
@@ -110,7 +106,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/stats.conf"
 }

 /*
@@ -126,30 +122,37 @@ define
 * An example configuration for InspIRCd that is compatible with the below uplink
 * and serverinfo configuration would look like:
 *
- *     <link name="services.localhost.net"
+ *     # This goes in inspircd.conf, *NOT* your Anope config!
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="stats.example.com"
 *           ipaddr="127.0.0.1"
 *           port="7000"
 *           sendpass="mypassword"
 *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="stats.example.com" silent="yes">
 *
 * An example configuration for UnrealIRCd that is compatible with the below uplink
 * and serverinfo configuration would look like:
 *
- *     link services.localhost.net
- *     {
- *          username *;
- *          hostname *;
- *          bind-ip "127.0.0.1";
- *          port 7000;
- *          hub *;
- *          password-connect "mypassword";
- *          password-receive "mypassword";
- *          class servers;
+ *     // This goes in unrealircd.conf, *NOT* your Anope config!
+ *     listen {
+ *         ip 127.0.0.1;
+ *         port 7000;
+ *         options {
+ *             serversonly;
+ *         };
 *     };
- *     ulines { services.localhost.net; };
- *     listen 127.0.0.1:7000;
+ *     link stats.example.com {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
+ *     };
+ *     ulines { stats.example.com; };
 */
 uplink
 {
@@ -202,10 +205,10 @@ serverinfo
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "stats.localhost.net"
+	name = "stats.example.com"

 	/*
-	 * The text which should appear as the server's information in /whois and similar
+	 * The text which should appear as the server's information in /WHOIS and similar
 	 * queries.
 	 */
 	description = "Stats for IRC Networks"
@@ -231,13 +234,13 @@ serverinfo
 	 * The filename containing the Services process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/services.pid"
+	pid = "data/stats.pid"

 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/stats.motd"
 }

 /*
@@ -247,19 +250,21 @@ serverinfo
 * You MUST modify this to match the IRCd you run.
 *
 * Supported:
- *  - bahamut
+ *  - [DEPRECATED] bahamut
 *  - charybdis
 *  - hybrid
- *  - inspircd12
- *  - inspircd20
+ *  - [DEPRECATED] inspircd12
+ *  - [DEPRECATED] inspircd20
+ *  - inspircd3 (for 3.x and 4.x)
 *  - ngircd
 *  - plexus
 *  - ratbox
- *  - unreal
+ *  - [DEPRECATED] unreal (for 3.2.x)
+ *  - unreal4 (for 4.x or later)
 */
 module
 {
-	name = "inspircd20"
+	name = "inspircd3"
 }

 /*
@@ -312,7 +317,7 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
+	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-/"

 	/*
 	 * If set to true, allows vHosts to not contain dots (.).
@@ -321,7 +326,7 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	allow_undotted_vhosts = false
+	allow_undotted_vhosts = no

 	/*
 	 * The characters that are not allowed to be at the very beginning or very ending
@@ -329,7 +334,7 @@ networkinfo
 	 *
 	 * It is recommended you DON'T change this.
 	 */
-	disallow_start_or_end = ".-"
+	disallow_start_or_end = ".-/"
 }

 /*
@@ -365,12 +370,6 @@ options
 	 */
 	readtimeout = 5s

-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * If set, Services will only show /stats o to IRC Operators. This directive
 	 * is optional.
@@ -378,7 +377,7 @@ options
 	#hidestatso = yes

 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
+	 * A space-separated list of U-lined servers on your network, it is assumed that
 	 * the servers in this list are allowed to set channel modes and Services will
 	 * not attempt to reverse their mode changes.
 	 *
@@ -411,29 +410,29 @@ log
 	 */
 	target = "stats.log"

-	/* Log to both services.log and the channel #services
+	/* Log to both stats.log and the channel #stats
 	 *
 	 * Note that some older IRCds, such as Ratbox, require services to be in the
 	 * log channel to be able to message it. To do this, configure service:channels to
 	 * join your logging channel.
 	 */
-	#target = "stats.log #services"
+	#target = "stats.log #stats"

 	/*
 	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
-	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
+	 * This can be a users name, a channel name, one of our clients (e.g. OperServ), or a server name.
 	 */
 	#source = ""

 	/*
-	 * The bot used to log generic messages which have no predefined sender if there
-	 * is a channel in the target directive.
+	 * The bot used to log generic messages which have no predefined sender if the
+	 * target directive is set to a channel or globops.
 	 */
 	bot = "Global"

 	/*
-	 * The number of days to keep logfiles, only useful if you are logging to a file.
-	 * Set to 0 to never delete old logfiles.
+	 * The number of days to keep log files, only useful if you are logging to a file.
+	 * Set to 0 to never delete old log files.
 	 *
 	 * Note that Anope must run 24 hours a day for this feature to work correctly.
 	 */
@@ -461,7 +460,7 @@ log
 	 *    create, destroy, join, part, kick, leave, mode
 	 *
 	 * Valid user options are:
-	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper
+	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper, away
 	 *
 	 * Rawio and debug are simple yes/no answers, there are no types for them.
 	 *
@@ -510,4 +509,3 @@ include
 	type = "file"
 	name = "irc2sql.example.conf"
 }
-
@@ -1 +1 @@
-For all bug reports / updates please see http://bugs.anope.org
+For all bug reports / updates please see https://github.com/anope/anope/issues
@@ -100,12 +100,12 @@ Links
 The following links are web sites I've used to get this information, and might
 describe some of the above a bit better than I have. :P

-http://www.acm.org/crossroads/xrds3-1/ovp3-1.html
+https://www.acm.org/crossroads/xrds3-1/ovp3-1.html
 http://www.cplusplus.com/doc/tutorial/typecasting.html
 http://www.codeguru.com/forum/showthread.php?t=312456
-http://www.cs.umd.edu/class/sum2003/cmsc311/Notes/BitOp/cast.html
-http://msdn.microsoft.com/en-us/library/5f6c9f8h(VS.80).aspx
-http://en.wikibooks.org/wiki/C%2B%2B_Programming/Type_Casting
-http://www.informit.com/guides/content.aspx?g=cplusplus&seqNum=134
+https://web.archive.org/web/20170810222238/http://www.cs.umd.edu/class/sum2003/cmsc311/Notes/BitOp/cast.html
+https://www.microsoft.com/en-us/download/details.aspx?id=55984
+https://en.wikibooks.org/wiki/C%2B%2B_Programming/Type_Casting
+https://web.archive.org/web/20160510114447/http://www.informit.com/guides/content.aspx?g=cplusplus&seqNum=134

 -- CyberBotX, Nov 23, 2008
@@ -1,4 +1,4 @@
-Originally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines
+Originally pulled from: https://wiki.inspircd.org/Coding_Guidelines

 ---

@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces

   Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
     if (apples == "green")
     {
         cout << "Apples are green" << endl;
@@ -1,3 +1,202 @@
+Anope Version 2.0.21-git
+------------------------
+No significant changes.
+
+Anope Version 2.0.20
+--------------------
+Fixed an escaped value that wasn't escaped enough in chanstats.
+Fixed not having a handler for the FNAME message on InspIRCd.
+Fixed os_stats reporting the SGLine expiry time as the SQLine expiry time.
+Fixed the DNs and search filters not being escaped correctly in the ldap_authentication and ldap_oper modules.
+Modernised the advice in docs/LANGUAGE regarding the installation of language packs.
+
+Anope Version 2.0.19
+--------------------
+Added a Doxygen config file.
+Backported various minor config changes from 2.1.
+Fixed chanserv/enforce enforcing against founders.
+Fixed creating channel entries in irc2sql.
+Fixed not respecting the mode state when removing a mode lock.
+Fixed reading the settings in m_dns.
+Fixed resetpass confirming accounts when not using email confirmation.
+Fixed trying to write to a buffered socket when there's no data.
+Fixed various minor spelling issues.
+Updated some messages for the language used by modern BIND versions.
+
+Anope Version 2.0.18
+--------------------
+Backported better sendmail error messages from 2.1.
+Backported the Windows CI fom 2.1.
+Fixed a CMake error when it encounters a hard to parse header file.
+Fixed being able to group guest nicknames.
+Fixed building Anope with CMake 4.
+Fixed compatibility with MariaDB.
+Fixed counting email addresses in ns_maxemail.
+Fixed importing user ICQ and URL data from 1.8.
+Fixed operserv/ignore not being prioritised first.
+Fixed resetting the stats with operserv/stats.
+Updated the Dutch translation.
+
+Anope Version 2.0.17
+--------------------
+Fixed importing large flatfile databases into SQL.
+Fixed marking channels as permanent.
+Fixed serialising unset boolean extension items.
+Fixed the documentation about how to import SQL databases.
+Fixed the documentation of options:usemail.
+Fixed the location of the geoipupdate CSV files.
+Fixed translating memo emails.
+Fixed unnecessary SQL updates caused by dereferencing user accounts.
+Increased the size of the chanstats letter and word count columns.
+Updated the location of the Anope IRC channels.
+
+Anope Version 2.0.16
+--------------------
+Added a workaround for users matching expired sqlines.
+Fixed a copy/paste error in webcpanel.
+Fixed a crash in db_flatfile caused by trying to serialize data without a type.
+Fixed duplicate messages when synconset/syncongroup is set.
+Fixed expiring channel suspensions.
+Fixed expiring forbids.
+Fixed expiring nick suspensions.
+Fixed feature detection on InspIRCd.
+Fixed InspIRCd account cloaks causing CHGHOST spam when a user also has a services vhost.
+Fixed joining users to channels with a key set on InspIRCd.
+Fixed logging users out fully when their nick gets suspended.
+Fixed marking boolean columns in SQL as TEXT instead of INT.
+Fixed matching extbans on InspIRCd and implement missing matchers.
+Fixed operserv/sqline expiry on UnrealIRCd
+Fixed respecting --noexpire in cs_suspend and ns_suspend.
+Fixed sending emails to nicks ending with a backslash.
+Fixed sending SVSTOPIC when topiclock is loaded on InspIRCd.
+Fixed some SQL tables taking up too much space on disk.
+Fixed the default config for channel suspensions.
+Fixed the TIME message on InspIRCd.
+Fixed trying to escape SQL data when not connected to MySQL.
+Fixed {ldap,sql}_authentication creating zombie accounts on expiry.
+
+Anope Version 2.0.15
+--------------------
+Fixed a race condition in changing the nick of a user.
+Fixed being able to reset the password of suspended accounts.
+Fixed chanserv/suspend info not being visible to regular users.
+Fixed removing entries by an alias in chanserv/access and chanserv/xop.
+Fixed various grammar issues in messages.
+Made the SASL PLAIN implementation more robust.
+Updated the Dutch translation.
+Updated the French translation.
+Updated the Turkish translation.
+
+Anope Version 2.0.14
+--------------------
+Added support for sqlining channels on UnrealIRCd.
+Fixed a crash when trying to access config for non-loaded modules.
+Fixed detection of the InspIRCd nopartmsg module.
+Fixed not getting memo notifications when authing with SASL.
+Fixed not serialising dontkickops/dontkickvoices in botserv/kick.
+Fixed sending emails with the wrong kind of line terminator.
+Fixed sending log messages from a renamed pseudoclient.
+Fixed telling users their passcode is incorrect when they need to authenticate in nickserv/confirm.
+Fixed the Config script freezing on some versions of util-linux.
+Updated the Windows packaging scripts to use dependencies from Conan.
+
+Anope Version 2.0.13
+--------------------
+Fixed a crash on some compilers when trying to call methods on a null pointer
+Fixed a crash when encountering an unterminated commented config block
+Fixed erroneously rejecting spaces in fantasy:name
+Fixed marking services pseudoclients as an oper on InspIRCd
+Fixed not checking user@ip as well as user@host when logging into an operator account
+Fixed setting the vhost/vident during SASL on UnrealIRCd
+Updated the German translation
+Updated the Italian translation
+
+Anope Version 2.0.12
+--------------------
+Added account confirmation to the web panel
+Added the regex_pcre2 module which provides regex/pcre with PCRE2
+Documented the cs_no_expire channel default
+Fixed config validation mistakenly allowing spaces in some fields
+Fixed the bahamut protocol module not knowing about halfops
+Fixed writing a flatfile database not being atomic
+Updated the hybrid protocol module for recent protocol changes
+
+Anope Version 2.0.11
+--------------------
+Fixed ldap on OpenLDAP 2.5+
+Fixed not using utf-8 encoding for outgoing email
+Fixed ns_resetpass not returning a response for XMLRPC
+Fixed some message params being sent as <middle> instead of <trailing>
+Fixed unsetting vhosts on unreal4
+Fixed username validity checking on ircd-hybrid
+Send the oper mode for services pseudoclients on InspIRCd
+Updated the pl_PL translation
+Updated unreal4 for various protocol changes
+
+Anope Version 2.0.10
+--------------------
+Add support for channel SQLines on InspIRCd
+Change default protocol module from inspircd20 to inspircd3
+Change the character set used by chanstats and irc2sql to utf8mb4
+Fix a ton of typos in messages
+Fix being able to override MAXLIST on InspIRCd
+Fix blocking on boot when trying to upgrade SQL databases without account identifiers
+Fix not flushing the ERROR message on squit
+Fix using an invalidated iterator when deleting bots
+Fix various harmless compiler warnings
+Fix webcpanel not using the forwarded IP
+Show the account name in nickserv/info
+
+Anope Version 2.0.9
+-------------------
+Fix a regression from 2.0.8 that prevented serialising to MySQL
+Send account identifiers to InspIRCd on SASL logins too
+Fix a query bug in irc2sql
+
+Anope Version 2.0.8
+-------------------
+Add +K channel mode for ircd-hybrid
+Add immutable identifiers to user accounts
+Fix build on systems that use musl libc
+Fix help of global/global not showing the correct origin nick
+Fix not removing vhosts when an nick is dropped
+Fix parsing channel metadata on InspIRCd 3+
+Fix parsing kicks on InspIRCd 3+
+Fix parsing topic changes on InspIRCd 3+
+Fix topiclock on InspIRCd
+Modernize the ircd-hybrid protocol module
+
+
+Anope Version 2.0.7
+-------------------
+Fix not sending login data on successful NickServ GROUP
+Fix m_httpd to not consider headers to be case sensitive
+Add InspIRCd 3 protocol support
+Add 'n' email token for use in the email change template
+Add logging for NickServ UNGROUP
+Fix setting swhois on UnrealIRCd
+Add nickserv/recover permission to allow opers to recover other users
+Fix superadmin not being removed when deopering
+Fix setting nickserv access list in webcpanel
+Add support for post-handshake SASL in Unreal 4.2.2+
+Add logging for channel memo deletionso
+
+Anope Version 2.0.6
+-------------------
+Log client IP for web clients running commands via webcpanel
+Fix log file path for the config file could not be opened log message
+Allow nickserv/group to be used via XMLRPC
+Fix logsearch without wildcards
+Support cidr exempts in m_dnsbl
+Add support for IPv6 dnsbls
+Add +u and +L channel modes for ircd-hybrid
+Set +x after hostserv/off on InspIRCd and UnrealIRCd
+Fix chanserv/mode not being able to set extbans
+Send CHGIDENT/CHGHOST on SVSLOGIN on InspIRCd
+Fix escaping replies from commands in webcpanel
+Enable require_oper for all opers added via operserv/oper
+Advertise SASL mechanisms to UnrealIRCd servers
+
 Anope Version 2.0.5
 -------------------
 Fix negative levels to not match users with negative access
@@ -30,7 +229,7 @@ Fix chankill to not add duplicate akills
 Allow nickserv/maxemail to disregard gmail style aliases when comparing emails
 Fix chanserv/mode when setting listmodes with CIDR ranges
 Fix reported expiry time when the time is divisible by 1 year
-Clearify botserv repeat kicker help and allow setting repeat times to 1
+Clarify botserv repeat kicker help and allow setting repeat times to 1
 Send vident/vhost with SASL login
 Add support for SASL reauth
 Fix log and database backup directories to be properly created by the installer
@@ -45,7 +244,7 @@ Show memo notify settings in ms_info
 Fix some actions bumping channels last used time that shouldn't have
 Add maxlogins configuration directive to limit the number of concurrent logins to one account
 Fix race with auto svsnick on ghost sometimes causing nick collisions instead
-Fix saset langauge reply
+Fix saset language reply
 Show akill/sxlines ids in VIEW
 Fix crash when an oper is configured in both the configuration and via os_oper
 Fix m_ldap reconnect logic not properly setting protocol and network timeout settings
@@ -112,7 +311,7 @@ A Added SQL logging support
 A Added Redis database support
 A Added ability to configure what privileges XOP commands give
 U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
+U Updated Spanish language file, from Isaac Fontal <i_fontal@hotmail.com>
 F Fix build on Solaris and OSX
 F Fixed setting BotServ's default settings in the config
 F Fixed some names of config items, including NickServ's kill protect
@@ -202,7 +401,7 @@ Anope Version 1.9.3
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
+A Prevent negative mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
 A Renamed the SGLINE to be SNLINE
@@ -214,15 +413,15 @@ A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
 A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
+A Added os_modreload, which allows reloading some modules not normally unloadable, like the protocol module
 A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
 F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
+F Not flushing the anope_extra table before rewriting database
 F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
+F Fixed a potential crash if HostServ or BotServ was disabled

 Anope Version 1.9.2
 -------------------
@@ -246,7 +445,7 @@ F Unban command to accept an optional nick arg
 F Some typos in services.conf
 F Crash when users change their host that are identified to a group, but not a nick
 F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
+F Only show if a user is online in NS INFO if they are really identified for the group of the nick they are on
 F Crash when using BSSmartJoin
 F Converting access entries to access from xop when a users access is below voice
 F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash
@@ -1,3 +1,72 @@
+Anope Version 2.0.21-git
+------------------------
+No significant changes.
+
+Anope Version 2.0.20
+--------------------
+No significant changes.
+
+Anope Version 2.0.19
+--------------------
+No significant changes.
+
+Anope Version 2.0.18
+--------------------
+No significant changes.
+
+Anope Version 2.0.17
+--------------------
+No significant changes.
+
+Anope Version 2.0.16
+--------------------
+No significant changes.
+
+Anope Version 2.0.15
+--------------------
+No significant changes.
+
+Anope Version 2.0.14
+--------------------
+Added mail:content_type to allow customizing the content type of emails.
+
+Anope Version 2.0.13
+--------------------
+No significant changes.
+
+Anope Version 2.0.12
+--------------------
+Added the regex_pcre2 module
+
+Anope Version 2.0.11
+--------------------
+No significant changes.
+
+Anope Version 2.0.10
+--------------------
+No significant changes.
+
+Anope Version 2.0.9
+-------------------
+No significant changes.
+
+Anope Version 2.0.8
+-------------------
+Fix ns_register:unconfirmedexpire not being used
+
+Anope Version 2.0.7
+-------------------
+Add nickserv/recover permission
+Add inspircd3 protocol module
+Add default permission for chanstats saset chanstats command
+
+Anope Version 2.0.6
+-------------------
+Mark enc_md5 and enc_sha1 as deprecated. Their use has been discouraged for years, and they will be removed in a future release.
+Exempt all of 127.0.0.0/8 from m_dnsbl by default
+Load m_sasl by default
+Fix documentation for nickserv default option ns_keep_modes
+
 Anope Version 2.0.5
 -------------------
 No significant changes.
@@ -39,7 +108,7 @@ mail:restrict removed

 Anope Version 1.9.9
 -------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
+There is not many config changes between 1.9.8 and 1.9.9, however many of the
 options have been moved around to make more sense, too many to list here,
 so get a new config.

@@ -140,7 +209,7 @@ options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels
 options:database added for the database modules
 options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
+options:userlen added to configure maximum ident length
 options:hostlen added to configure maximum hostname length
 options:database added to configure what database modules to use
 options:passlen added to specify the maximum length of passwords
@@ -90,4 +90,4 @@ Anope DefCon
 6) Support

    You might get DefCon support by posting on our online forum, or maybe on
-    our #anope channel at /server irc.anope.org.
+    our #anope channel at /server irc.teranova.net.
@@ -0,0 +1,313 @@
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = "Anope"
+PROJECT_NUMBER         = 2.0
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
+PROJECT_ICON           = src/win32/anope-icon.ico
+OUTPUT_DIRECTORY       = docs/doxygen
+CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS_LEVEL   = 8
+ALLOW_UNICODE_NAMES    = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+PYTHON_DOCSTRING       = YES
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 4
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
+MARKDOWN_ID_STYLE      = GITHUB
+AUTOLINK_SUPPORT       = YES
+AUTOLINK_IGNORE_WORDS  =
+BUILTIN_STL_SUPPORT    = YES
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+NUM_PROC_THREADS       = 0
+TIMESTAMP              = NO
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+RESOLVE_UNNAMED_PARAMS = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_NAMESPACES  = YES
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = SYSTEM
+HIDE_SCOPE_NAMES       = NO
+HIDE_COMPOUND_REFERENCE= NO
+SHOW_HEADERFILE        = YES
+SHOW_INCLUDE_FILES     = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
+EXTERNAL_TOOL_PATH     =
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_DOC_ERROR      = YES
+WARN_IF_INCOMPLETE_DOC = YES
+WARN_NO_PARAMDOC       = NO
+WARN_IF_UNDOC_ENUM_VAL = NO
+WARN_LAYOUT_FILE       = YES
+WARN_AS_ERROR          = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LINE_FORMAT       = "at line $line of file $file"
+WARN_LOGFILE           =
+INPUT                  = README.md \
+                         include
+INPUT_ENCODING         = UTF-8
+INPUT_FILE_ENCODING    =
+FILE_PATTERNS          =
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = YES
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE = README.md
+IMPLICIT_DIR_DOCS      = YES
+FORTRAN_COMMENT_AFTER  = 72
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+ALPHABETICAL_INDEX     = YES
+IGNORE_PREFIX          =
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE        = AUTO_LIGHT
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_CODE_FOLDING      = YES
+HTML_COPY_CLIPBOARD    = YES
+HTML_PROJECT_COOKIE    =
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated documentation"
+DOCSET_FEEDURL         =
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+SITEMAP_URL            =
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+GENERATE_TREEVIEW      = NO
+FULL_SIDEBAR           = NO
+ENUM_VALUES_PER_LINE   = 4
+SHOW_ENUM_VALUES       = NO
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+OBFUSCATE_EMAILS       = YES
+HTML_FORMULA_FORMAT    = png
+FORMULA_FONTSIZE       = 10
+FORMULA_MACROFILE      =
+USE_MATHJAX            = NO
+MATHJAX_VERSION        = MathJax_2
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = YES
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_BIB_STYLE        = plainnat
+LATEX_EMOJI_DIRECTORY  =
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_EXTRA_FILES        =
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_SUBDIR             =
+MAN_LINKS              = NO
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+GENERATE_AUTOGEN_DEF   = NO
+GENERATE_SQLITE3       = NO
+SQLITE3_OUTPUT         = sqlite3
+SQLITE3_RECREATE_DB    = YES
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             = CoreExport=/**/ \
+                         ATTR_NOT_NULL(...)=/**/
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
+DOT_UML_DETAILS        = NO
+DOT_WRAP_THRESHOLD     = 17
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DIR_GRAPH_MAX_DEPTH    = 1
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+DIA_PATH               =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+PLANTUMLFILE_DIRS      =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+MSCGEN_TOOL            =
+MSCFILE_DIRS           =
@@ -1,10 +1,10 @@
 Frequently Asked Questions (FAQ) concerning Anope
 -------------------------------------------------

-The information in the 1.9 FAQ is subject to change at any
+The information in the 2.0 FAQ is subject to change at any
 moment due to new developments. Please visit our website
 for the most up to date information.

 An updated version of the FAQ can be found here:

-http://wiki.anope.org/index.php/FAQ
+https://wiki.anope.org/index.php/2.0/FAQ
@@ -19,7 +19,7 @@ Note: You should also read the README and FAQ files!
    The very first thing you need to do is to get the Anope package (if not
    already done). You can find it at:

-        http://www.anope.org/
+        https://www.anope.org/

    Anope requires cmake to build. You can check if CMake is already
    installed on your system using the command:
@@ -32,7 +32,7 @@ Note: You should also read the README and FAQ files!
    CMake unless you install it yourself into your home directory. CMake
    can be downloaded from:

-        http://www.cmake.org/cmake/resources/software.html
+        https://cmake.org/download/

    Next, unpack the package in your home directory, and go into the created
    directory.
@@ -59,8 +59,8 @@ Note: You should also read the README and FAQ files!
    the file carefully. Using the default values is NOT a good idea, and will
    most likely not work!

-    If you need help, you should visit http://forum.anope.org/ or #anope on
-    irc.anope.org. Provide *complete* error output, along with other relevant
+    If you need help, you should visit https://forum.anope.org/ or #anope on
+    irc.teranova.net. Provide *complete* error output, along with other relevant
    information eg. OS, compiler and C++ library versions.
    See the README file for more information.

@@ -80,7 +80,7 @@ Note: You should also read the README and FAQ files!

    The configuration varies depending on the IRCd, but you will probably need
    a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
    in the link block.

    Example link configurations can be found in example.conf for some of the
@@ -88,10 +88,6 @@ Note: You should also read the README and FAQ files!

    Don't forget to /rehash your IRCd to apply changes.

-    You may also try our interactive link maker, which is located at:
-
-        http://anope.org/ilm.php
-
 4) Starting Anope

    Go into the directory where binaries were installed (by default, this is
@@ -19,7 +19,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    La première chose que vous devez faire est d'obtenir le package Anope
    (si ce n'est déjà fait). Vous pouvez le trouver ici :

-        http://www.anope.org/
+        https://www.anope.org/

    Anope nécessite cmake pour être compilé. Vous pouvez vérifier si CMake
    est déjà installé sur votre système avec la commande :
@@ -32,7 +32,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    pourrez pas utiliser CMake à moins de l'installer vous-même dans votre
    répertoire home. CMake peut être téléchargé ici :

-        http://www.cmake.org/cmake/resources/software.html
+        https://cmake.org/download/

    Ensuite, décompressez le package dans votre répertoire home, et allez
    dans le répértoire qui vient d'être créé.
@@ -64,7 +64,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
    recommandée, et Anope ne fonctionnera probablement pas !

    Si vous avez besoin d'aide, vous pouvez aller sur le site
-    http://forum.anope.org/ ou le canal #anope sur irc.anope.org.
+    https://forum.anope.org/ ou le canal #anope sur irc.teranova.net.
    Fournissez *l'essemble* des erreurs qui apparaîssent, en plus de
    toutes informations utiles, comme les versions de votre OS, du
    compilateur utilisé et de la librairie C++. Lisez le fichier README
@@ -96,11 +96,6 @@ Note : Vous devrez également lire les fichiers README et FAQ !

    Souvenez-vous de /rehash votre IRCd pour appliquer les changements.

-    Vous pouvez également essayer notre créateur de bloc link interactif
-    situé ici :
-
-        http://anope.org/ilm.php
-
 4) Mettre en route Anope

    Allez dans le répertoire où les fichiers binaires ont été installés
@@ -1,42 +1,38 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------

 1) Building Anope with gettext support
 2) Adding a new language
 3) Using languages with modules
+4) Updating a language file

 1) Building Anope with gettext support

    To build Anope with gettext support, gettext and its development libraries must be installed on the system.

-    On Debian install the locales-all package.
+    On Debian-based systems install the locales-all package.

-    On Ubuntu run locale-gen for each language you want to enable.
-        For example:
-        locale-gen es_ES.UTF-8
+    On RHEL-based systems run `yum list glibc-langpack-*` and install the languages you want to enable.

-        Then execute:
-        dpkg-reconfigure locales
+    If you have already built Anope you will need to delete the build directory and rebuild from scratch.

    Building Anope on Windows with gettext support is explained in docs/WIN32.txt

 2) Adding a new language

-    Anope uses gettext (http://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
+    Anope uses gettext (https://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
    install gettext and run `msginit -l language -o anope.language.po -i anope.pot`. For example if I was translating to
    Spanish I could run `msginit -l es_ES -o anope.es_ES.po -i anope.pot`. Open the newly generating .po file and start
    translating. Once you are done simply rerun ./Config; make && make install and add the language to your services.conf.
    Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.

-    Poedit (http://www.poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
    po files (especially on Windows).

-    If you have finished a language file translation and you want others to use it, please send it to team@anope.org
-    (don't forget to mention clearly your (nick)name, your e-mail and the language name). You'll of course get full credit for it.
+    If you have finished a language file translation and you want others to use it, please file a pull request on GitHub.
+    You'll of course get full credit for it.

-    NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
-
-3) Using langages with modules
+3) Using languages with modules

    Module authors can easily add the ability to have their modules translated by adding _() around the strings they
    want translated (messages to the user, etc).
@@ -51,3 +47,14 @@ Anope Mutli Language Support

    All .po and .pot files should be placed in modules/third/language. Additionally an update script is provided there
    that will create .pot files and merge any changes to it with existing .po files.
+
+4) Updating a language file
+
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    po files (especially on Windows).
+
+    Before editing the relevant file in languages/, run `update.sh` in the languages/ folder, i.e. `cd` to it and run
+        ./update.sh
+    This will update the language file to contain all strings that need a translation.
+
+    Then commit only the changed .po files in git.
@@ -87,7 +87,7 @@ Anope Modules

 5) More Modules

-    You can download more useful modules from http://modules.anope.org/. Just
+    You can download more useful modules from https://modules.anope.org/. Just
    grab the module file (usually with a .cpp extension). Place the module
    file in your modules (anope-1.9.x/modules/third) folder; although any of
    the other folders within the modules directory will work.
@@ -111,18 +111,18 @@ Anope Modules
    Use modules at your own risk, and make sure you get them from a
    reputable source. You might get module support by contacting the module
    author, posting on our online forum, or maybe on our #anope channel
-    at /server irc.anope.org.
+    at /server irc.teranova.net.

 7) Information for Developers

    There are a number of useful documents on the Anope Wiki. The Anope Wiki
    can be reached at:

-    * http://wiki.anope.org/
+    * https://wiki.anope.org/

 8) Modules Repository

-    You can find modules at http://modules.anope.org
+    You can find modules at https://modules.anope.org/

    These modules are 3rd party and as such are not supported by the Anope Team.
    Contact the Module Author directly with problems, not the Anope Team.
@@ -1,16 +1,14 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------

-Anope is          2003-2017 Anope Team    <team@anope.org>.
+Anope is          2003-2024 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.

 This program is free but copyrighted software; see the file COPYING for
 details.

-Information about Anope may be found at http://www.anope.org/
-Information about Epona may be found at http://www.epona.org/
-Information about Services may be found at http://www.ircservices.esper.net/
+Information about Anope may be found at https://www.anope.org/

 Table of Contents
 -----------------
@@ -19,7 +17,7 @@ Table of Contents
 3) Installation
 4) Command Line Options
 5) Messages Translation
-6) Contact and Mailing List
+6) Contact

 1) Credits

@@ -94,7 +92,7 @@ Table of Contents
        * Lee Holmes <lethality@anope.org>
        * Lucas Nussbaum <lucas@lucas-nussbaum.net>
        * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
        * Naram Qashat <cyberbotx@anope.org>
        * Phil Lavin <phil@anope.org>
        * Pieter Bootsma <geniusdex@anope.org>
@@ -170,12 +168,12 @@ Table of Contents

        * Bahamut 1.4.27 or later (including 1.8)
        * Charybdis 3.4 or later
-        * Hybrid 8.1 or later
-        * InspIRCd 1.2 or 2.0
+        * ircd-hybrid 8.2.23 or later
+        * InspIRCd 1.2 or later
        * ngIRCd 19.2 or later
        * Plexus 3 or later
        * Ratbox 2.0.6 or later
-        * UnrealIRCd 3.2 or 4
+        * UnrealIRCd 3.2 or later

    Anope could also work with some of the daemons derived by the ones listed
    above, but there's no support for them if they work or don't work.
@@ -242,19 +240,19 @@ Table of Contents
 6) Contact

    For announcements and discussions about Anope, please visit our
-    Portal and Forums at http://www.anope.org/ -- make sure you register
+    Portal and Forums at https://www.anope.org/ -- make sure you register
    yourself to get full benefits.

    If you read the documentation carefully, and didn't find the answer to
    your question, feel free to post on the website forums or join our irc
-    channel (irc.anope.org #anope). Once you join our Support channel be as
+    channel (irc.teranova.net #anope). Once you join our Support channel be as
    precise as possible when asking a question, because we have no extraordinary
    powers and can't guess things if they aren't provided.

    The more precise you are the sooner you'll be likely to get an answer.

    If you think you found a bug, add it to the bug tracking system
-    (http://bugs.anope.org) and - again - be as precise as possible. Also say
-    whether the bug happens always or under what circumstances, and anything
+    (https://github.com/anope/anope/issues) and - again - be as precise as possible.
+    Also say whether the bug happens always or under what circumstances, and anything
    that could be useful to track your bug down. If you wrote a patch, send
    it over. :)
@@ -1,8 +1,8 @@
-Starting in Anope 1.9.9, Anope has Redis database support (http://redis.io/).
+Starting in Anope 1.9.9, Anope has Redis database support (https://redis.io/).
 This document explains the data structure used by Anope, and explains how
 keyspace notification works.

-This is not a tutorial on how to use Redis, see http://redis.io/documentation
+This is not a tutorial on how to use Redis, see https://redis.io/documentation
 for that.

 Table of Contents
@@ -32,7 +32,7 @@ Table of Contents

        hash -  The keys in hash are the actual objects, stored as hashes. For
                example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:

                redis 127.0.0.1:6379> HGETALL hash:BotInfo:1

@@ -70,10 +70,10 @@ Table of Contents
 2) Keyspace notifications

    Redis 2.7 (unstable) and 2.8 (stable) and newer support keyspace notifications
-    (http://redis.io/topics/notifications). This allows Redis to notify Anope of
+    (https://redis.io/topics/notifications). This allows Redis to notify Anope of
    any external changes to objects in the database. Once notified, Anope will
    immediately update the object. Otherwise, Anope keeps all objects in memory
-    and will not regularly read from the databaes once started.
+    and will not regularly read from the database once started.

    You can use this to modify objects in Redis and have them immediately reflected
    back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents

    The key space ids and value are managed entirely by Anope, you do
    not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.

    Finally, always use atomic operations. If you are inserting a new object with
    multiple commands, or inserting multiple objects at once, specifically if the
@@ -18,10 +18,10 @@ Anope for Windows
    1) Download the required files:

        * Current Anope source:
-            http://sourceforge.net/project/showfiles.php?group_id=94081
+            https://github.com/anope/anope/releases

        * CMake:
-            http://www.cmake.org/cmake/resources/software.html
+            https://cmake.org/download/

        (NOTE: When installing, tell CMake to add itself to the PATH.)

@@ -3,7 +3,7 @@
 /**
 * XMLRPC Functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2024 Anope Team
 * Contact us at team@anope.org
 */

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl

 #
-# Script taken from InspIRCd, www.inspircd.org
+# Script taken from InspIRCd, https://www.inspircd.org/
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -9,7 +9,7 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #


@@ -1,16 +1,16 @@
 # Set version.cpp to use C++ as well as set its compile flags
 set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}")
-# Generate version executable to modify version.h, setting it's linker flags as well
-add_executable(version version.cpp)
-set_target_properties(version PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
-get_target_property(version_BINARY version LOCATION)
+# Generate version-bin executable to modify version.h, setting it's linker flags as well
+add_executable(version-bin version.cpp)
+set_target_properties(version-bin PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
+set(version_BINARY "$<TARGET_FILE:version-bin>")
 # Modify version.h from the above executable, with dependencies to version.cpp
 # and all of the source files in the main build
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
-  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
-  DEPENDS version ${SRC_SRCS}
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  COMMAND version-bin ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  DEPENDS version-bin ${SRC_SRCS}
 )
-# Add version to list of files for CPack to ignore
+# Add version-bin to list of files for CPack to ignore
 get_filename_component(version_BINARY ${version_BINARY} NAME)
 add_to_cpack_ignored_files("${version_BINARY}$" TRUE)
 if(NOT WIN32)
@@ -61,4 +61,4 @@ if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)

 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h ${PCH_SOURCES_GCH})
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -80,7 +80,7 @@ class CoreExport ChanAccess : public Serializable
 public:
 	typedef std::vector<ChanAccess *> Path;

- 	/* The provider that created this access entry */
+	/* The provider that created this access entry */
 	AccessProvider *provider;
 	/* Channel this access entry is on */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport AccessGroup
 	/* access entries + paths */
 	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
- 	const ChannelInfo *ci;
+	const ChannelInfo *ci;
 	/* Account these entries affect, if any */
 	const NickCore *nc;
 	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@

 typedef Anope::hash_map<NickAlias *> nickalias_map;
 typedef Anope::hash_map<NickCore *> nickcore_map;
+typedef TR1NS::unordered_map<uint64_t, NickCore *> nickcoreid_map;

 extern CoreExport Serialize::Checker<nickalias_map> NickAliasList;
 extern CoreExport Serialize::Checker<nickcore_map> NickCoreList;
+extern CoreExport nickcoreid_map NickCoreIdList;

 /* A registered nickname.
 * It matters that Base is here before Extensible (it is inherited by Serializable)
@@ -45,7 +47,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
 	Serialize::Reference<NickCore> nc;

- 	/** Constructor
+	/** Constructor
 	 * @param nickname The nick
 	 * @param nickcore The nickcore for this nick
 	 */
@@ -55,11 +57,11 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);

- 	/** Set a vhost for the user
+	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
-	 * @param time When the vhost was craated
+	 * @param time When the vhost was created
 	 */
 	void SetVhost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);

@@ -107,8 +109,10 @@ class CoreExport NickCore : public Serializable, public Extensible
 {
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
+	/* Unique identifier for the account. */
+	uint64_t id;
 public:
- 	/* Name of the account. Find(display)->nc == this. */
+	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
 	Anope::string pass;
@@ -126,7 +130,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	Serialize::Checker<std::vector<NickAlias *> > aliases;

-	/* Set if this user is a services operattor. o->ot must exist. */
+	/* Set if this user is a services operator. o->ot must exist. */
 	Oper *o;

 	/* Unsaved data */
@@ -140,8 +144,9 @@ class CoreExport NickCore : public Serializable, public Extensible

 	/** Constructor
 	 * @param display The display nick
+	 * @param id The account id
 	 */
-	NickCore(const Anope::string &nickdisplay);
+	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
 	~NickCore();

 	void Serialize(Serialize::Data &data) const anope_override;
@@ -178,6 +183,9 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	unsigned GetAccessCount() const;

+	/** Retrieves the account id for this user */
+	uint64_t GetId();
+
 	/** Find an entry in the nick's access list
 	 *
 	 * @param entry The nick!ident@host entry to search for
@@ -226,7 +234,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 class CoreExport IdentifyRequest
 {
 	/* Owner of this request, used to cleanup requests if a module is unloaded
-	 * while a reqyest us pending */
+	 * while a request us pending */
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
@@ -242,10 +250,11 @@ class CoreExport IdentifyRequest
 	virtual ~IdentifyRequest();

 public:
- 	/* One of these is called when the request goes through */
+	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;

+	Module *GetOwner() const { return owner; }
 	const Anope::string &GetAccount() const { return account; }
 	const Anope::string &GetPassword() const { return password; }

@@ -253,17 +262,17 @@ class CoreExport IdentifyRequest
 	 * for the request to complete. Multiple modules may hold a request at any time,
 	 * but the request is not complete until every module has released it. If you do not
 	 * require holding this (eg, your password check is done in this thread and immediately)
-	 * then you don't need to hold the request before Successing it.
+	 * then you don't need to hold the request before calling `Success()`.
 	 * @param m The module holding this request
 	 */
 	void Hold(Module *m);

 	/** Releases a held request
-	 * @param m The module releaseing the hold
+	 * @param m The module releasing the hold
 	 */
 	void Release(Module *m);

-	/** Called by modules when this IdentifyRequest has successeded successfully.
+	/** Called by modules when this IdentifyRequest has succeeded.
 	 * If this request is behind held it must still be Released after calling this.
 	 * @param m The module confirming authentication
 	 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -54,6 +54,9 @@ namespace Anope
 		string(const ci::string &_str) : _string(_str.c_str()) { }
 		string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { }
 		template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
+#if __cplusplus >= 201103L
+		string(const string &) = default;
+#endif

 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -362,7 +365,7 @@ namespace Anope
 	 */
 	extern CoreExport int Debug;

-	/** Other comand line options.
+	/** Other command line options.
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;

@@ -403,7 +406,7 @@ namespace Anope

 	/** Used to "fork" the process and go into the background during initial startup
 	 * while we are AtTerm(). The actual fork is not done here, but earlier, and this
-	 * simply notifys the parent via kill() to exit().
+	 * simply notifies the parent via kill() to exit().
 	 */
 	extern void Fork();

@@ -413,7 +416,7 @@ namespace Anope

 	/** One of the first functions called, does general initialization such as reading
 	 * command line args, loading the configuration, doing the initial fork() if necessary,
-	 * initializating language support, loading modules, and loading databases.
+	 * initializing language support, loading modules, and loading databases.
 	 * @throws CoreException if something bad went wrong
 	 */
 	extern void Init(int ac, char **av);
@@ -470,6 +473,13 @@ namespace Anope
 	 */
 	extern CoreExport bool Decrypt(const Anope::string &src, Anope::string &dest);

+	/** Hashes a buffer with SipHash-2-4
+	 * @param src The start of the buffer to hash
+	 * @param src_sz The total number of bytes in the buffer
+	 * @param key A 16 byte key to hash the buffer with.
+	 */
+	extern CoreExport uint64_t SipHash24(const void *src, unsigned long src_sz, const char key[16]);
+
 	/** Returns a sequence of data formatted as the format argument specifies.
 	 ** After the format parameter, the function expects at least as many
 	 ** additional arguments as specified in format.
@@ -538,6 +548,13 @@ namespace Anope
 	 */
 	extern Anope::string Resolve(const Anope::string &host, int type);

+	/** Does a blocking dns query and returns all IPs.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return A list of all IPs that the host resolves to
+	 */
+	extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type);
+
 	/** Generate a string of random letters and numbers
 	 * @param len The length of the string returned
 	 */
@@ -555,7 +572,7 @@ class CoreExport sepstream
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position
@@ -567,7 +584,7 @@ class CoreExport sepstream
 public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator, bool allowempty = false);
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);

 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
@@ -577,7 +594,7 @@ class CoreExport sepstream

 	/** Gets token number 'num' from the stream
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetToken(Anope::string &token, int num);
@@ -595,7 +612,7 @@ class CoreExport sepstream

 	/** Gets token number 'num' from the stream and all remaining tokens.
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetTokenRemainder(Anope::string &token, int num);
@@ -621,7 +638,7 @@ class CoreExport sepstream
 class commasepstream : public sepstream
 {
 public:
-	/** Initialize with comma seperator
+	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
@@ -631,7 +648,7 @@ class commasepstream : public sepstream
 class spacesepstream : public sepstream
 {
 public:
-	/** Initialize with space seperator
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
@@ -652,7 +669,7 @@ class CoreException : public std::exception
 	 */
 	Anope::string source;
 public:
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
+	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -684,7 +701,7 @@ class CoreException : public std::exception
 class ModuleException : public CoreException
 {
 public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
+	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }

@@ -759,7 +776,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
 }

 /** Casts to be used instead of dynamic_cast, this uses dynamic_cast
- * for debug builds and static_cast on releass builds
+ * for debug builds and static_cast on release builds
 * to speed up the program because dynamic_cast relies on RTTI.
 */
 #ifdef DEBUG_BUILD
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2026 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -50,7 +50,7 @@ class Reference : public ReferenceBase
 protected:
 	T *ref;
 public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}

@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2026 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -1,6 +1,6 @@
 /* Channel support
 *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -41,7 +41,7 @@ class CoreExport Channel : public Base, public Extensible
 	ModeList modes;

 public:
- 	/* Channel name */
+	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
@@ -139,7 +139,7 @@ class CoreExport Channel : public Base, public Extensible
 	/** See if a channel has a mode
 	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
 	size_t HasMode(const Anope::string &name, const Anope::string &param = "");

@@ -232,7 +232,7 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param bi The sender, can be NULL for the service bot for this channel
 	 * @param u The user being kicked
 	 * @param reason The reason for the kick
-	 * @return true if the kick was scucessful, false if a module blocked the kick
+	 * @return true if the kick was successful, false if a module blocked the kick
 	 */
 	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...);

@@ -249,7 +249,7 @@ class CoreExport Channel : public Base, public Extensible

 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
-	 * @param plus If set to false (with complete), mode parameters will not be given for modes requring no parameters to be unset
+	 * @param plus If set to false (with complete), mode parameters will not be given for modes requiring no parameters to be unset
 	 * @return A mode string
 	 */
 	Anope::string GetModes(bool complete, bool plus);
@@ -289,6 +289,11 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool CheckKick(User *user);

+	/** Find which bot should send mode/topic/etc changes for this channel
+	 * @return The bot
+	 */
+	BotInfo *WhoSends() const;
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found
@@ -1,6 +1,6 @@
 /* Declarations for command data.
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ struct CommandInfo
 	bool prepend_channel;
 };

-/* Where the replies from commands go to. User inheits from this and is the normal
+/* Where the replies from commands go to. User inherits from this and is the normal
 * source of a CommandReply
 */
 struct CoreExport CommandReply
@@ -59,6 +59,8 @@ class CoreExport CommandSource
 public:
 	/* The account executing the command */
 	Reference<NickCore> nc;
+	/* for web clients */
+	Anope::string ip;
 	/* Where the reply should go */
 	CommandReply *reply;
 	/* Channel the command was executed on (fantasy) */
@@ -99,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;

 public:
- 	/* Maximum paramaters accepted by this command */
+	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -134,11 +136,11 @@ class CoreExport Command : public Service
 	bool AllowUnregistered() const;
 	bool RequireUser() const;

- 	/** Get the command description
+	/** Get the command description
 	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	virtual const Anope::string GetDesc(CommandSource &source) const;
+	virtual const Anope::string GetDesc(CommandSource &source) const;

 	/** Execute this command.
 	 * @param source The source
@@ -146,7 +148,7 @@ class CoreExport Command : public Service
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;

-	/** Called when HELP is requsted for the client this command is on.
+	/** Called when HELP is requested for the client this command is on.
 	 * @param source The source
 	 */
 	virtual void OnServHelp(CommandSource &source);
@@ -176,7 +178,7 @@ class CoreExport Command : public Service
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
 	 * @param bot If found, is set to the bot the command is on, eg NickServ
-	 * @param name If found, is set to the comand name, eg REGISTER
+	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
 	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -20,9 +20,11 @@

 namespace Configuration
 {
+	namespace Internal
+	{
 	class CoreExport Block
 	{
-		friend struct Conf;
+		friend struct Configuration::Conf;

 	 public:
 		typedef Anope::map<Anope::string> item_map;
@@ -34,13 +36,17 @@ namespace Configuration
 		block_map blocks;
 		int linenum;

-	 public:
-	 	Block(const Anope::string &);
-		const Anope::string &GetName() const;
-		int CountBlock(const Anope::string &name);
-		Block* GetBlock(const Anope::string &name, int num = 0);
+		/* Represents a missing tag. */
+		static Block EmptyBlock;

-		template<typename T> inline T Get(const Anope::string &tag)
+	 public:
+		Block(const Anope::string &);
+		const Anope::string &GetName() const;
+		int CountBlock(const Anope::string &name) const;
+		const Block* GetBlock(const Anope::string &name, int num = 0) const;
+		Block* GetMutableBlock(const Anope::string &name, int num = 0);
+
+		template<typename T> inline T Get(const Anope::string &tag) const
 		{
 			return this->Get<T>(tag, "");
 		}
@@ -66,6 +72,10 @@ namespace Configuration
 	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
+	} // namespace Internal
+
+	typedef const Internal::Block Block;
+	typedef Internal::Block MutableBlock;

 	/** Represents a configuration file
 	 */
@@ -78,6 +88,7 @@ namespace Configuration
 		File(const Anope::string &, bool);
 		~File();
 		const Anope::string &GetName() const;
+		Anope::string GetPath() const;

 		bool IsOpen() const;
 		bool Open();
@@ -139,7 +150,7 @@ namespace Configuration

 		BotInfo *GetClient(const Anope::string &name);

-		Block *GetCommand(CommandSource &);
+		const Block *GetCommand(CommandSource &);
 	};

 	struct Uplink
@@ -164,7 +175,7 @@ namespace Configuration
 class ConfigException : public CoreException
 {
 public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -164,7 +164,7 @@ template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
 public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }

 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
@@ -186,11 +186,12 @@ template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
 public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }

 	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
 	{
-		data[this->name] << true;
+		data.SetType(this->name, Serialize::Data::DT_INT);
+		data[this->name] << this->HasExt(e);
 	}

 	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override
@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2017 Anope Team <team@anope.org>
+ * (C) 2009-2026 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -26,7 +26,7 @@ namespace Anope
 {
 	class string;

-	/* Casemap in use by Anope. ci::string's comparation functions use this (and thus Anope::string) */
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
 	extern std::locale casemap;

 	extern void CaseMapRebuild();
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -40,7 +40,7 @@ namespace Language
 	extern CoreExport const char *Translate(const char *string);

 	/** Translates a string to the language of the given user.
-	 * @param u The user to transate the string for
+	 * @param u The user to translate the string for
 	 * @param string A string to translate
 	 * @return The translated string if found, else the original string.
 	 */
@@ -82,7 +82,7 @@ namespace Language
 #define CHAN_X_SUSPENDED		_("Channel %s is currently suspended.")
 #define CHAN_X_NOT_REGISTERED		_("Channel \002%s\002 isn't registered.")
 #define CHAN_X_NOT_IN_USE		_("Channel \002%s\002 doesn't exist.")
-#define NICK_IDENTIFY_REQUIRED		_("Password authentication required for that command.")
+#define NICK_IDENTIFY_REQUIRED		_("You must be logged into an account to use that command.")
 #define MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -64,7 +64,7 @@ class CoreExport NumberList
 class CoreExport ListFormatter
 {
 public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
+	typedef std::map<Anope::string, Anope::string> ListEntry;
 private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -17,9 +17,9 @@

 enum LogType
 {
-	/* Used whenever an administrator uses an administrative comand */
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
-	/* Used whenever an administrator overides something, such as adding
+	/* Used whenever an administrator overrides something, such as adding
 	 * access to a channel where they don't have permission to.
 	 */
 	LOG_OVERRIDE,
@@ -52,7 +52,7 @@ struct LogFile
 class CoreExport Log
 {
 public:
- 	/* Bot that should log this message */
+	/* Bot that should log this message */
 	BotInfo *bi;
 	/* For commands, the user executing the command, but might not always exist */
 	User *u;
@@ -113,7 +113,7 @@ class CoreExport Log
 class CoreExport LogInfo
 {
 public:
- 	BotInfo *bot;
+	BotInfo *bot;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
 	int last_day;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -26,17 +26,18 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
-	 	Anope::string sendmail_path;
+		Anope::string error;
+		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
 		Anope::string subject;
 		Anope::string message;
+		Anope::string content_type;
 		bool dont_quote_addresses;

-		bool success;
 	 public:
-	 	/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
 		 * @param addr Destination address to mail
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -19,9 +19,9 @@ class CoreExport Memo : public Serializable
 {
 public:
 	MemoInfo *mi;
- 	bool unread;
+	bool unread;
 	bool receipt;
- 	Memo();
+	Memo();
 	~Memo();

 	void Serialize(Serialize::Data &data) const anope_override;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -165,7 +165,7 @@ namespace Message

 	struct CoreExport Whois : IRCDMessage
 	{
- 		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }

 		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 	};
@@ -1,7 +1,7 @@
 /* Mode support
 *
 * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2026 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -39,8 +39,8 @@ enum ModeClass
 class CoreExport Mode : public Base
 {
 public:
- 	/* Mode name */
- 	Anope::string name;
+	/* Mode name */
+	Anope::string name;
 	/* Class of mode this is (user/channel) */
 	ModeClass mclass;
 	/* Mode char for this, eg 'b' */
@@ -78,7 +78,7 @@ class CoreExport UserMode : public Mode
 class CoreExport UserModeParam : public UserMode
 {
 public:
- 	/** constructor
+	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
 	 */
@@ -96,7 +96,7 @@ class CoreExport UserModeParam : public UserMode
 class CoreExport ChannelMode : public Mode
 {
 public:
-	/* channel modes that can posssibly unwrap this mode */
+	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;

 	/** constructor
@@ -160,7 +160,7 @@ class CoreExport ChannelModeList : public ChannelMode
 	virtual void OnDel(Channel *chan, const Anope::string &mask) { }
 };

-/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
+/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {
@@ -192,7 +192,7 @@ class CoreExport ChannelModeStatus : public ChannelMode
 	/* The "level" of the mode, used to compare with other modes.
 	 * Used so we know op > halfop > voice etc.
 	 */
-	short level;
+	unsigned level;

 	/** constructor
 	 * @param name The mode name
@@ -200,7 +200,7 @@ class CoreExport ChannelModeStatus : public ChannelMode
 	 * @param msymbol The symbol for the mode, eg @ %
 	 * @param mlevel A level for the mode, which is usually determined by the PREFIX capab
 	 */
-	ChannelModeStatus(const Anope::string &name, char mc, char msymbol, short mlevel);
+	ChannelModeStatus(const Anope::string &name, char mc, char msymbol, unsigned mlevel);
 };

 /** A virtual mode. This mode doesn't natively exist on the IRCd (like extbans),
@@ -221,7 +221,7 @@ class CoreExport ChannelModeVirtual : public T

 	ChannelMode *Wrap(Anope::string &param) anope_override;

-	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) = 0;
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) anope_override = 0;
 };

 /* The status a user has on a channel (+v, +h, +o) etc */
@@ -229,9 +229,9 @@ class CoreExport ChannelStatus
 {
 	Anope::string modes;
 public:
- 	ChannelStatus();
- 	ChannelStatus(const Anope::string &modes);
- 	void AddMode(char c);
+	ChannelStatus();
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
 	void DelMode(char c);
 	bool HasMode(char c) const;
 	bool Empty() const;
@@ -399,8 +399,8 @@ class CoreExport Entry
 	Anope::string nick, user, host, real;

 	/** Constructor
- 	 * @param mode What mode this host is for, can be empty for unknown/no mode
-	 * @param host A full or poartial nick!ident@host/cidr#real name mask
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @param host A full or partial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* Modular support
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -301,6 +301,11 @@ class CoreExport Module : public Extensible
 	 * before they will be called.
 	 */

+	/** Called on startup after database load, but before
+	 * connecting to the uplink.
+	 */
+	virtual void OnPostInit() { throw NotImplementedException(); }
+
 	/** Called before a user has been kicked from a channel.
 	 * @param source The kicker
 	 * @param cu The user, channel, and status of the user being kicked
@@ -397,7 +402,6 @@ class CoreExport Module : public Extensible
 	virtual EventReturn OnLoadDatabase() { throw NotImplementedException(); }

 	/** Called when anope needs to check passwords against encryption
-	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 	virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
@@ -502,7 +506,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { throw NotImplementedException(); }

-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
 	 */
 	virtual void OnPreServerConnect() { throw NotImplementedException(); }

@@ -550,7 +554,7 @@ class CoreExport Module : public Extensible

 	/** Called before an exception is deleted
 	 * @param source The source deleting it
-	 * @param ex The exceotion
+	 * @param ex The exception
 	 */
 	virtual void OnExceptionDel(CommandSource &source, Exception *ex) { throw NotImplementedException(); }

@@ -771,7 +775,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { throw NotImplementedException(); }

-	/** Called when a nick is unsuspneded
+	/** Called when a nick is unsuspended
 	 * @param na The nick alias
 	 */
 	virtual void OnNickUnsuspended(NickAlias *na) { throw NotImplementedException(); }
@@ -934,12 +938,12 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) { throw NotImplementedException(); }

-	/** Called when a channel mode is introducted into Anope
+	/** Called when a channel mode is introduced into Anope
 	 * @param cm The mode
 	 */
 	virtual void OnChannelModeAdd(ChannelMode *cm) { throw NotImplementedException(); }

-	/** Called when a user mode is introducted into Anope
+	/** Called when a user mode is introduced into Anope
 	 * @param um The mode
 	 */
 	virtual void OnUserModeAdd(UserMode *um) { throw NotImplementedException(); }
@@ -1061,7 +1065,7 @@ class CoreExport Module : public Extensible
 	/** Called when a nickserv/set command is used.
 	 * @param source The source of the command
 	 * @param cmd The command
-	 * @param nc The nickcore being modifed
+	 * @param nc The nickcore being modified
 	 * @param setting The setting passed to the command. Probably ON/OFF.
 	 * @return EVENT_STOP to halt immediately
 	 */
@@ -1075,7 +1079,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnMessage(MessageSource &source, Anope::string &command, std::vector<Anope::string> &param) { throw NotImplementedException(); }

-	/** Called to determine if a chnanel mode can be set by a user
+	/** Called to determine if a channel mode can be set by a user
 	 * @param u The user
 	 * @param cm The mode
 	 */
@@ -1088,17 +1092,25 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnExpireTick() { throw NotImplementedException(); }

-	/** Called when a nick is validated. That is, to determine if a user is permissted
+	/** Called when a nick is validated. That is, to determine if a user is permitted
 	 * to be on the given nick.
 	 * @param u The user
 	 * @param na The nick they are on
 	 * @return EVENT_STOP to force the user off of the nick
 	 */
 	virtual EventReturn OnNickValidate(User *u, NickAlias *na) { throw NotImplementedException(); }
+
+	/** Called when a certain user has to be unbanned on a certain channel.
+	 * May be used to send protocol-specific messages.
+	 * @param u The user to be unbanned
+	 * @param c The channel that user has to be unbanned on
+	 */
+	virtual void OnChannelUnban(User *u, ChannelInfo *ci) { throw NotImplementedException(); }
 };

 enum Implementation
 {
+	I_OnPostInit,
 	I_OnPreUserKicked, I_OnUserKicked, I_OnReload, I_OnPreBotAssign, I_OnBotAssign, I_OnBotUnAssign, I_OnUserConnect,
 	I_OnNewServer, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp, I_OnPreCommand, I_OnPostCommand, I_OnSaveDatabase,
 	I_OnLoadDatabase, I_OnEncrypt, I_OnDecrypt, I_OnBotFantasy, I_OnBotNoFantasyAccess, I_OnBotBan, I_OnBadWordAdd,
@@ -1119,7 +1131,7 @@ enum Implementation
 	I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,
 	I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
 	I_OnSerializeTypeCreate, I_OnSetChannelOption, I_OnSetNickOption, I_OnMessage, I_OnCanSet, I_OnCheckDelete,
-	I_OnExpireTick, I_OnNickValidate,
+	I_OnExpireTick, I_OnNickValidate, I_OnChannelUnban,
 	I_SIZE
 };

@@ -1132,7 +1144,7 @@ class CoreExport ModuleManager
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];

- 	/** List of all modules loaded in Anope
+	/** List of all modules loaded in Anope
 	 */
 	static std::list<Module *> Modules;

@@ -1171,7 +1183,7 @@ class CoreExport ModuleManager
 	/** Checks whether this version of Anope is at least major.minor.patch.build
 	 * Throws a ModuleException if not
 	 * @param major The major version
-	 * @param minor The minor vesion
+	 * @param minor The minor version
 	 * @param patch The patch version
 	 */
 	static void RequireVersion(int major, int minor, int patch);
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* BotServ core functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -37,6 +37,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}

 public:
- 	virtual ~LogSettings() { }
+	virtual ~LogSettings() { }
 	virtual LogSetting *Create() = 0;
 };
@@ -1,6 +1,6 @@
 /* ChanServ core functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -74,7 +74,7 @@ struct ModeLocks

 	/** Get details for a specific mlock
 	 * @param mname The mode name
- 	 * @param An optional param to match with
+	 * @param An optional param to match with
 	 * @return The MLock, if any
 	 */
 	virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string &param = "") = 0;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -139,8 +139,8 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
-	 	/* Creator of this request */
+		unsigned short id;
+		/* Creator of this request */
 		Module *creator;

 		Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -17,7 +17,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-	 	virtual ~Context() { }
+		virtual ~Context() { }
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2012-2017 Anope Team
+ * (C) 2012-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -23,7 +23,7 @@ struct HTTPReply
 {
 	HTTPError error;
 	Anope::string content_type;
-	std::map<Anope::string, Anope::string> headers;
+	std::map<Anope::string, Anope::string, ci::less> headers;
 	typedef std::list<std::pair<Anope::string, Anope::string> > cookie;
 	std::vector<cookie> cookies;

@@ -80,7 +80,7 @@ struct HTTPReply
 	}
 };

-/* A message from soneone */
+/* A message from someone */
 struct HTTPMessage
 {
 	std::map<Anope::string, Anope::string> headers;
@@ -99,7 +99,7 @@ class HTTPPage : public Base
 	Anope::string content_type;

 public:
- 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
+	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }

 	const Anope::string &GetURL() const { return this->url; }

@@ -137,11 +137,11 @@ class HTTPClient : public ClientSocket, public BinarySocket, public Base

 class HTTPProvider : public ListenSocket, public Service
 {
- 	Anope::string ip;
+	Anope::string ip;
 	unsigned short port;
 	bool ssl;
 public:
-	Anope::string ext_ip;
+	std::vector<Anope::string> ext_ips;
 	std::vector<Anope::string> ext_headers;

 	HTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, bool s) : ListenSocket(i, p, i.find(':') != Anope::string::npos), Service(c, "HTTPProvider", n), ip(i), port(p), ssl(s) { }
@@ -228,6 +228,9 @@ namespace HTTPUtils
 				case '"':
 					dst += "&quot;";
 					break;
+				case '&':
+					dst += "&amp;";
+					break;
 				default:
 					dst += src[i];
 			}
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -166,6 +166,16 @@ class LDAPProvider : public Service
 	 * @param attributes The attributes to modify
 	 */
 	virtual void Modify(LDAPInterface *i, const Anope::string &base, LDAPMods &attributes) = 0;
+
+	/** Escapes a LDAP string for use in a DN.
+	 * @param str The string to escape.
+	 */
+	virtual Anope::string EscapeDN(const Anope::string &str) const = 0;
+
+	/** Escapes a LDAP string for use in a search filter.
+	 * @param str The string to escape.
+	 */
+	virtual Anope::string EscapeSF(const Anope::string &str) const = 0;
 };

 #endif // ANOPE_LDAP_H
@@ -1,6 +1,6 @@
 /* NickServ core functions
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -26,7 +26,7 @@ struct NSCertList

 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -45,6 +45,8 @@ class ForbidService : public Service

 	virtual ForbidData *FindForbid(const Anope::string &mask, ForbidType type) = 0;

+	virtual ForbidData *FindForbidExact(const Anope::string &mask, ForbidType type) = 0;
+
 	virtual std::vector<ForbidData *> GetForbids() = 0;
 };

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -35,7 +35,7 @@ struct Exception : Serializable
 class SessionService : public Service
 {
 public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;

 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -16,6 +16,9 @@ class GlobalService : public Service
 	{
 	}

+	/** Retrieves the bot which sends global messages unless otherwise specified. */
+	virtual Reference<BotInfo> GetDefaultSender() = 0;
+
 	/** Send out a global message to all users
 	 * @param sender Our client which should send the global
 	 * @param source The sender of the global
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -25,7 +25,7 @@ class MemoServService : public Service
 	}

 	/** Sends a memo.
-	 * @param source The source of the memo, can be anythin.
+	 * @param source The source of the memo, can be anything.
 	 * @param target The target of the memo, nick or channel.
 	 * @param message Memo text
 	 * @param force true to force the memo, restrictions/delays etc are not checked
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -58,6 +58,8 @@ namespace Redis
 	 public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }

+		virtual bool IsSocketDead() = 0;
+
 		virtual void SendCommand(Interface *i, const std::vector<Anope::string> &cmds) = 0;
 		virtual void SendCommand(Interface *i, const Anope::string &str) = 0;

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2014-2017 Anope Team
+ * (C) 2014-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -102,7 +102,7 @@ namespace SASL
 				if (!hostname.empty() && !ip.empty())
 					user = hostname + " (" + ip + ")";

-				Log(Config->GetClient("NickServ"), "sasl") << user << " identified to account " << this->GetAccount() << " using SASL";
+				Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " identified to account " << this->GetAccount() << " using SASL";
 				sasl->Succeed(s, na->nc);
 				delete s;
 			}
@@ -133,7 +133,7 @@ namespace SASL
 			if (!hostname.empty() && !ip.empty())
 				user = hostname + " (" + ip + ")";

-			Log(Config->GetClient("NickServ"), "sasl") << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
+			Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
 		}
 	};
 }
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -12,7 +12,7 @@ namespace SQL
 	class Data : public Serialize::Data
 	{
 	 public:
- 		typedef std::map<Anope::string, std::stringstream *> Map;
+		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;

@@ -142,14 +142,14 @@ namespace SQL
 		Anope::string error;
 	 public:
 		unsigned int id;
- 		Anope::string finished_query;
+		Anope::string finished_query;

 		Result() : id(0) { }
 		Result(unsigned int i, const Query &q, const Anope::string &fq, const Anope::string &err = "") : query(q), error(err), id(i), finished_query(fq) { }

 		inline operator bool() const { return this->error.empty(); }

-		inline const unsigned int GetID() const { return this->id; }
+		inline unsigned int GetID() const { return this->id; }
 		inline const Query &GetQuery() const { return this->query; }
 		inline const Anope::string &GetError() const { return this->error; }

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2010-2017 Anope Team
+ * (C) 2010-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2010-2017 Anope Team
+ * (C) 2010-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -28,7 +28,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
 public:
- 	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() { }
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };

@@ -1,7 +1,7 @@
 /*
 *
 * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2026 Anope Team <team@anope.org>
 *
 * Please read COPYING and README for further details.
 */
@@ -67,7 +67,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
 public:
- 	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -15,14 +15,15 @@
 #include "services.h"
 #include "anope.h"
 #include "service.h"
+#include "modes.h"

-/* Encapsultes the IRCd protocol we are speaking. */
+/* Encapsulates the IRCd protocol we are speaking. */
 class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;

 protected:
- 	IRCDProto(Module *creator, const Anope::string &proto_name);
+	IRCDProto(Module *creator, const Anope::string &proto_name);
 public:
 	virtual ~IRCDProto();

@@ -39,7 +40,7 @@ class CoreExport IRCDProto : public Service
 	virtual void SendNumericInternal(int numeric, const Anope::string &dest, const Anope::string &buf);

 	const Anope::string &GetProtocolName();
-	virtual void Parse(const Anope::string &, Anope::string &, Anope::string &, std::vector<Anope::string> &);
+	virtual bool Parse(const Anope::string &, Anope::map<Anope::string> &, Anope::string &, Anope::string &, std::vector<Anope::string> &);
 	virtual Anope::string Format(const Anope::string &source, const Anope::string &message);

 	/* Modes used by default by our clients */
@@ -54,7 +55,7 @@ class CoreExport IRCDProto : public Service
 	bool CanSNLine;
 	/* Can we ban specific nicknames from being used? */
 	bool CanSQLine;
-	/* Can we ban sepcific channel names from being used? */
+	/* Can we ban specific channel names from being used? */
 	bool CanSQLineChannel;
 	/* Can we ban by IP? */
 	bool CanSZLine;
@@ -241,6 +242,7 @@ class CoreExport IRCDProto : public Service
 	 * Defaults to Config->ListSize
 	 */
 	virtual unsigned GetMaxListFor(Channel *c);
+	virtual unsigned GetMaxListFor(Channel *c, ChannelMode *cm);

 	virtual Anope::string NormalizeMask(const Anope::string &mask);
 };
@@ -278,11 +280,39 @@ class CoreExport IRCDMessage : public Service
 	IRCDMessage(Module *owner, const Anope::string &n, unsigned p = 0);
 	unsigned GetParamCount() const;
 	virtual void Run(MessageSource &, const std::vector<Anope::string> &params) = 0;
+	virtual void Run(MessageSource &, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags);

 	void SetFlag(IRCDMessageFlag f) { flags.insert(f); }
 	bool HasFlag(IRCDMessageFlag f) const { return flags.count(f); }
 };

+/** MessageTokenizer allows tokens in the IRC wire format to be read from a string */
+class CoreExport MessageTokenizer
+{
+private:
+	/** The message we are parsing tokens from. */
+	Anope::string message;
+
+	/** The current position within the message. */
+	Anope::string::size_type position;
+
+ public:
+	/** Create a tokenstream and fill it with the provided data. */
+	MessageTokenizer(const Anope::string &msg);
+
+	/** Retrieve the next \<middle> token in the message.
+	 * @param token The next token available, or an empty string if none remain.
+	 * @return True if a token was retrieved; otherwise, false.
+	 */
+	bool GetMiddle(Anope::string &token);
+
+	/** Retrieve the next \<trailing> token in the message.
+	 * @param token The next token available, or an empty string if none remain.
+	 * @return True if a token was retrieved; otherwise, false.
+	 */
+	bool GetTrailing(Anope::string &token);
+};
+
 extern CoreExport IRCDProto *IRCD;

 #endif // PROTOCOL_H
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -36,7 +36,7 @@ class CoreExport AutoKick : public Serializable
 	time_t addtime;
 	time_t last_used;

- 	AutoKick();
+	AutoKick();
 	~AutoKick();
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
@@ -56,7 +56,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	Anope::map<int16_t> levels;

 public:
- 	friend class ChanAccess;
+	friend class ChanAccess;
 	friend class AutoKick;

 	Anope::string name;                       /* Channel name */
@@ -82,7 +82,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible

 	time_t banexpire;                       /* Time bans expire in */

- 	/** Constructor
+	/** Constructor
 	 * @param chname The channel name
 	 */
 	ChannelInfo(const Anope::string &chname);
@@ -97,7 +97,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);

-	/** Change the founder of the channek
+	/** Change the founder of the channel
 	 * @params nc The new founder
 	 */
 	void SetFounder(NickCore *nc);
@@ -135,7 +135,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	AccessGroup AccessFor(const User *u, bool updateLastUsed = true);
 	AccessGroup AccessFor(const NickCore *nc, bool updateLastUsed = true);

-	/** Get the size of the accss vector for this channel
+	/** Get the size of the access vector for this channel
 	 * @return The access vector size
 	 */
 	unsigned GetAccessCount() const;
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -30,7 +30,7 @@ class CoreExport Regex
 protected:
 	Regex(const Anope::string &expr) : expression(expr) { }
 public:
- 	virtual ~Regex() { }
+	virtual ~Regex() { }
 	const Anope::string &GetExpression() { return expression; }
 	virtual bool Matches(const Anope::string &str) = 0;
 };
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -22,7 +22,7 @@ namespace Serialize
 	class Data
 	{
 	 public:
- 		enum Type
+		enum Type
 		{
 			DT_TEXT,
 			DT_INT
@@ -46,7 +46,7 @@ namespace Serialize
 	template<typename T> class Reference;
 }

-/** A serialziable object. Serializable objects can be serialized into
+/** A serializable object. Serializable objects can be serialized into
 * abstract data types (Serialize::Data), and then reconstructed or
 * updated later at any time.
 */
@@ -62,7 +62,7 @@ class CoreExport Serializable : public virtual Base
 	friend class Serialize::Type;
 	/* The type of item this object is */
 	Serialize::Type *s_type;
- 	/* Iterator into serializable_items */
+	/* Iterator into serializable_items */
 	std::list<Serializable *>::iterator s_iter;
 	/* The hash of the last serialized form of this object committed to the database */
 	size_t last_commit;
@@ -70,7 +70,7 @@ class CoreExport Serializable : public virtual Base
 	time_t last_commit_time;

 protected:
- 	Serializable(const Anope::string &serialize_type);
+	Serializable(const Anope::string &serialize_type);
 	Serializable(const Serializable &);

 	Serializable &operator=(const Serializable &);
@@ -78,7 +78,7 @@ class CoreExport Serializable : public virtual Base
 public:
 	virtual ~Serializable();

- 	/* Unique ID (per type, not globally) for this object */
+	/* Unique ID (per type, not globally) for this object */
 	uint64_t id;

 	/* Only used by redis, to ignore updates */
@@ -105,7 +105,7 @@ class CoreExport Serializable : public virtual Base
 };

 /* A serializable type. There should be one of these classes for each type
- * of class that inherits from Serialiable. Used for unserializing objects
+ * of class that inherits from Serializable. Used for unserializing objects
 * of this type, as it requires a function pointer to a static member function.
 */
 class CoreExport Serialize::Type : public Base
@@ -123,14 +123,14 @@ class CoreExport Serialize::Type : public Base
 	 */
 	Module *owner;

-	/* The timesatmp for this type. All objects of this type are as up to date as
+	/* The timestamp for this type. All objects of this type are as up to date as
 	 * this timestamp. if curtime == timestamp then we have the most up to date
 	 * version of every object of this type.
 	 */
 	time_t timestamp;

 public:
- 	/* Map of Serializable::id to Serializable objects */
+	/* Map of Serializable::id to Serializable objects */
 	std::map<uint64_t, Serializable *> objects;

 	/** Creates a new serializable type
@@ -247,7 +247,7 @@ class Serialize::Reference : public ReferenceBase
 	T *ref;

 public:
- 	Reference() : ref(NULL)
+	Reference() : ref(NULL)
 	{
 	}

@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -79,8 +79,8 @@ class CoreExport Server : public Extensible
 	~Server();

 public:
- 	/* Number of users on the server */
- 	unsigned users;
+	/* Number of users on the server */
+	unsigned users;

 	/** Delete this server with a reason
 	 * @param reason The reason
@@ -170,7 +170,7 @@ class CoreExport Server : public Extensible
 	 */
 	bool IsQuitting() const;

-	/** Send a message to alll users on this server
+	/** Send a message to all users on this server
 	 * @param source The source of the message
 	 * @param message The message
 	 */
@@ -1,6 +1,6 @@
 /*
 *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2026 Anope Team
 * Contact us at team@anope.org
 *
 * Please read COPYING and README for further details.
@@ -43,7 +43,7 @@ class CoreExport Service : public virtual Base
 	}

 public:
- 	static Service *FindService(const Anope::string &t, const Anope::string &n)
+	static Service *FindService(const Anope::string &t, const Anope::string &n)
 	{
 		std::map<Anope::string, std::map<Anope::string, Service *> >::const_iterator it = Services.find(t);
 		if (it == Services.end())
@@ -122,12 +122,16 @@ class ServiceReference : public Reference<T>
 	Anope::string name;

 public:
- 	ServiceReference() { }
+	ServiceReference() { }

 	ServiceReference(const Anope::string &t, const Anope::string &n) : type(t), name(n)
 	{
 	}

+	const Anope::string &GetServiceName() const { return name; }
+
+	const Anope::string &GetServiceType() const { return type; }
+
 	inline void operator=(const Anope::string &n)
 	{
 		this->name = n;
--- a/Show More
+++ b/Show More