From c18499a33208aa92f627e4710ae0bfafea0e31ed Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 7 Jun 2024 19:19:19 +0100
Subject: Rename regex_pcre back to regex_pcre2.

This rename happened before we had config compatibility and it doesn't
make sense to keep it anymore.
---
 docs/conf/modules.conf.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs')

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 1df6dfc07..6f65755c5 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1054,7 +1054,7 @@
 # Valid engines are:                                                  #
 #                                                                     #
 # glob   - Glob patterns, provided via regex_glob.                    #
-# pcre   - PCRE regexps, provided via regex_pcre, needs libpcre2.     #
+# pcre   - PCRE regexps, provided via regex_pcre2, needs libpcre2.    #
 # posix  - POSIX regexps, provided via regex_posix, not available     #
 #          on Windows, no dependencies on other operating systems.    #
 # stdregex - stdlib regexps, provided via regex_stdlib, see comment   #
@@ -2008,7 +2008,7 @@
 # Expressions). You need libpcre2 installed to compile and load this
 # module. You must have at least 1 provider loaded to use the filter or
 # R-line modules.
-#<module name="regex_pcre">
+#<module name="regex_pcre2">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Regular Expression Provider for RE2 Regular Expressions.
-- 
cgit v1.3.1-10-gc9f91


From 748f3c62001b8a86f1acf81fee0d485a0ddc0130 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 7 Jun 2024 19:29:17 +0100
Subject: Add /GL and /GLOBAL to the generic services config file.

---
 docs/conf/services/anope.conf.example   | 4 ----
 docs/conf/services/atheme.conf.example  | 2 --
 docs/conf/services/generic.conf.example | 2 ++
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf.example
index 1a53dcfdd..b1406e431 100644
--- a/docs/conf/services/anope.conf.example
+++ b/docs/conf/services/anope.conf.example
@@ -3,7 +3,3 @@
 
 # This file inherits from the generic config to avoid repetition.
 <include file="examples/services/generic.conf.example">
-
-# /GLOBAL <message>
-# Sends a global notice.
-<alias text="GLOBAL" format="*" replace="SQUERY $requirement :GLOBAL $2-" requires="Global" service="yes" operonly="yes">
diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf.example
index 9896eb566..c2e569a48 100644
--- a/docs/conf/services/atheme.conf.example
+++ b/docs/conf/services/atheme.conf.example
@@ -9,7 +9,6 @@
 <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
 <alias text="CHANFIX"   replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
 <alias text="GAMESERV"  replace="SQUERY $requirement :$2-" requires="GameServ"  service="yes">
-<alias text="GLOBAL"    replace="SQUERY $requirement :$2-" requires="Global"    service="yes" operonly="yes">
 <alias text="GROUPSERV" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
 <alias text="HELPSERV"  replace="SQUERY $requirement :$2-" requires="HelpServ"  service="yes">
 <alias text="INFOSERV"  replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
@@ -18,7 +17,6 @@
 
 # Short hand aliases for services pseudoclients.
 <alias text="CF" replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
-<alias text="GL" replace="SQUERY $requirement :$2-" requires="Global"    service="yes" operonly="yes">
 <alias text="GS" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
 <alias text="IS" replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
 <alias text="LS" replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf.example
index 5db7196db..7adf5d5be 100644
--- a/docs/conf/services/generic.conf.example
+++ b/docs/conf/services/generic.conf.example
@@ -6,6 +6,7 @@
 # Long hand aliases for services pseudoclients.
 <alias text="BOTSERV"  replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
 <alias text="CHANSERV" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GLOBAL"   replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
 <alias text="HOSTSERV" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
 <alias text="MEMOSERV" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
 <alias text="NICKSERV" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
@@ -15,6 +16,7 @@
 # Short hand aliases for services pseudoclients.
 <alias text="BS" replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
 <alias text="CS" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GL" replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
 <alias text="HS" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
 <alias text="MS" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
 <alias text="NS" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
-- 
cgit v1.3.1-10-gc9f91