summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.BANNER4
-rwxr-xr-xConfig10
-rw-r--r--README.md2
-rw-r--r--data/anope.example.conf26
-rw-r--r--data/global.example.conf6
-rw-r--r--data/hostserv.example.conf4
-rw-r--r--data/modules.example.conf12
-rw-r--r--data/nickserv.example.conf22
-rw-r--r--data/operserv.example.conf22
-rw-r--r--data/stats.standalone.example.conf56
-rw-r--r--docs/DEFCON6
-rw-r--r--docs/INSTALL4
-rw-r--r--docs/INSTALL.fr2
-rw-r--r--docs/README4
-rw-r--r--docs/REDIS4
-rw-r--r--include/anope.h4
-rw-r--r--include/modules.h2
-rw-r--r--include/service.h2
-rw-r--r--modules/commands/cs_set.cpp2
-rw-r--r--modules/commands/ns_logout.cpp2
-rw-r--r--modules/commands/ns_set.cpp16
-rw-r--r--modules/commands/os_ignore.cpp6
-rw-r--r--modules/commands/os_jupe.cpp4
-rw-r--r--modules/commands/os_logsearch.cpp2
-rw-r--r--modules/commands/os_reload.cpp6
-rw-r--r--modules/commands/os_set.cpp10
-rw-r--r--modules/commands/os_shutdown.cpp8
-rw-r--r--modules/commands/os_stats.cpp6
-rw-r--r--modules/commands/os_sxline.cpp4
-rw-r--r--modules/commands/os_update.cpp4
-rw-r--r--src/config.cpp2
-rw-r--r--src/init.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/messages.cpp2
-rw-r--r--src/tools/anoperc.in2
35 files changed, 136 insertions, 136 deletions
diff --git a/.BANNER b/.BANNER
index bae644cd0..cd113fc66 100644
--- a/.BANNER
+++ b/.BANNER
@@ -7,11 +7,11 @@
| |
|_| IRC Services
CURVER
-This program will help you to compile your Services, and ask you
+This program will help you to compile your services, and ask you
questions regarding the compile-time settings of it during the
process. For more options type SOURCE_DIR/Config --help
-Anope is a set of Services for IRC networks that allows users to
+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.
diff --git a/Config b/Config
index 1d5db1000..1713839d4 100755
--- a/Config
+++ b/Config
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Configuration script for Services.
+# Configuration script for Anope.
#
# Anope (c) 2003-2021 Anope Team
# Contact us at team@anope.org
@@ -193,7 +193,7 @@ else
echo ""
fi
-echo "Beginning Services configuration."
+echo "Beginning Anope configuration."
echo ""
###########################################################################
@@ -232,7 +232,7 @@ while [ $ok -eq 0 ] ; do
fi
fi
elif exists "$INPUT/include/services.h" ; then
- echo "You cannot use the Services source directory as a target directory."
+ echo "You cannot use the Anope source directory as a target directory."
else
ok=1
fi
@@ -244,11 +244,11 @@ echo ""
OLD_RUNGROUP="$RUNGROUP"
if [ "$RUNGROUP" ] ; then
- echo "Which group should all Services data files be owned by? (If Services"
+ echo "Which group should all Anope data files be owned by? (If Anope"
echo "should not force files to be owned by a particular group, type \"none\""
echo "(without the quotes) and press Return.)"
else
- echo "Which group should all Services data files be owned by? (If Services"
+ echo "Which group should all Anope data files be owned by? (If Anope"
echo "should not force files to be owned by a particular group, just press"
echo "Return.)"
fi
diff --git a/README.md b/README.md
index fdf672218..9a6886519 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
## 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).
+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)
diff --git a/data/anope.example.conf b/data/anope.example.conf
index 5919ac1e6..0a475351a 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -1,7 +1,7 @@
/*
* Example configuration file for Anope. After making the appropriate
* changes to this file, place it in the Anope conf directory (as
- * specified in the "configure" script, default /home/username/anope/conf)
+ * specified in the "Config" script, default /home/username/anope/conf)
* under the name "anope.conf".
*
* The format of this file is fairly simple: three types of comments are supported:
@@ -120,7 +120,7 @@ define
* This section can be included multiple times, and Anope will attempt to
* connect to each server until it finally connects.
*
- * Each uplink IRCd should have a corresponding configuration to allow services
+ * Each uplink IRCd should have a corresponding configuration to allow Anope
* to link to it.
*
* An example configuration for InspIRCd that is compatible with the below uplink
@@ -202,7 +202,7 @@ uplink
serverinfo
{
/*
- * The hostname that services will be seen as, it must have no conflicts with any
+ * The hostname that Anope will be seen as, it must have no conflicts with any
* 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.
*/
@@ -215,8 +215,8 @@ serverinfo
description = "Anope IRC Services"
/*
- * The local address that services will bind to before connecting to the remote
- * server. This may be useful for multihomed hosts. If omitted, services will let
+ * The local address that Anope will bind to before connecting to the remote
+ * server. This may be useful for multihomed hosts. If omitted, Anope will let
* the Operating System choose the local address. This directive is optional.
*
* If you don't know what this means or don't need to use it, just leave this
@@ -297,19 +297,19 @@ networkinfo
/*
* Set this to the maximum allowed nick length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
nicklen = 31
/* Set this to the maximum allowed ident length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
userlen = 10
/* Set this to the maximum allowed hostname length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
hostlen = 64
@@ -325,7 +325,7 @@ networkinfo
/*
* Characters allowed in nicknames. This always includes the characters described
* in RFC1459, and so does not need to be set for normal behavior. Changing this to
- * include characters your IRCd doesn't support will cause your IRCd and/or services
+ * include characters your IRCd doesn't support will cause your IRCd and/or Anope
* to break. Multibyte characters are not supported, nor are escape sequences.
*
* It is recommended you DON'T change this.
@@ -337,7 +337,7 @@ networkinfo
* to services, such as BotServ bot hostnames and user vhosts. Changing this is not
* recommended unless you know for sure your IRCd supports whatever characters you are
* wanting to use. Telling services to set a vHost containing characters your IRCd
- * disallows could potentially break the IRCd and/or services.
+ * disallows could potentially break the IRCd and/or Anope.
*
* It is recommended you DON'T change this.
*/
@@ -377,7 +377,7 @@ options
/*
* The case mapping used by services. This must be set to a valid locale name
- * installed on your machine. Services use this case map to compare, with
+ * installed on your machine. Anope uses this case map to compare, with
* case insensitivity, things such as nick names, channel names, etc.
*
* We provide two special casemaps shipped with Anope, ascii and rfc1459.
@@ -484,14 +484,14 @@ options
#usestrictprivmsg = yes
/*
- * If set, services will only show /stats o to IRC Operators. This directive
+ * If set, Anope will only show /stats o to IRC Operators. This directive
* is optional.
*/
#hidestatso = yes
/*
* 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
+ * the servers in this list are allowed to set channel modes and Anope will
* not attempt to reverse their mode changes.
*
* WARNING: Do NOT put your normal IRC user servers in this directive.
diff --git a/data/global.example.conf b/data/global.example.conf
index 90ec350ce..d48fe0581 100644
--- a/data/global.example.conf
+++ b/data/global.example.conf
@@ -66,7 +66,7 @@ module
client = "Global"
/*
- * This is the global message that will be sent when Services are being
+ * This is the global message that will be sent when Anope is being
* shutdown/restarted.
*
* This directive is optional.
@@ -74,7 +74,7 @@ module
#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
+ * This is the global message that will be sent when Anope (re)joins the
* network.
*
* This directive is optional.
@@ -82,7 +82,7 @@ module
#globaloncycleup = "Services are now back online - have a nice day"
/*
- * If set, Services will hide the IRC Operator's nick in a global
+ * If set, Anope will hide the IRC Operator's nick in a global
* message/notice.
*
* This directive is optional.
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index e13e8fdd1..fb7e66eab 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -161,13 +161,13 @@ module
name = "hs_request"
/*
- * If set, Services will send a memo to the user requesting a vHost when it's been
+ * If set, Anope will send a memo to the user requesting a vHost when it's been
* approved or rejected.
*/
#memouser = yes
/*
- * If set, Services will send a memo to all Services staff when a new vHost is requested.
+ * If set, Anope will send a memo to all services staff when a new vHost is requested.
*/
#memooper = yes
}
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 6c2d809c9..925bee8ad 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -3,7 +3,7 @@
*
* The following blocks are used to load all non-core modules, including 3rd-party modules.
* Modules can be prevented from loading by commenting out the line, other modules can be added by
- * adding a module block. These modules will be loaded prior to Services connecting to your network.
+ * adding a module block. These modules will be loaded prior to Anope connecting to your network.
*
* Note that some of these modules are labeled EXTRA, and must be enabled prior to compiling by
* running the 'extras' script on Linux and UNIX.
@@ -91,14 +91,14 @@ module { name = "help" }
name = "m_dnsbl"
/*
- * If set, Services will check clients against the DNSBLs when services connect to its uplink.
+ * If set, Anope will check clients against the DNSBLs when services connect to its uplink.
* This is not recommended, and on large networks will open a very large amount of DNS queries.
* Whilst services are not drastically affected by this, your nameserver/DNSBL might care.
*/
check_on_connect = no
/*
- * If set, Services will check clients when coming back from a netsplit. This can cause a large number
+ * If set, Anope will check clients when coming back from a netsplit. This can cause a large number
* of DNS queries open at once. Whilst services are not drastically affected by this, your nameserver/DNSBL
* might care.
*/
@@ -319,7 +319,7 @@ module { name = "help" }
* This module dynamically ties users to Anope opertypes when they identify
* via LDAP group membership. Requires m_ldap.
*
- * Note that this doesn't give the user privileges on the IRCd, only in Services.
+ * Note that this doesn't give the user privileges on the IRCd, only in Anope.
*/
#module
{
@@ -537,8 +537,8 @@ 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
+ * Some IRCds allow "SASL" authentication to let users identify to services
+ * during the IRCd user registration process. If this module is loaded, Anope will allow
* authenticating users through this mechanism. Supported mechanisms are:
* PLAIN, EXTERNAL.
*/
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index ac98b7295..c8980bf29 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -107,8 +107,8 @@ module
* - 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
+ * - msg: Messages will be sent as PRIVMSGs instead of NOTICEs, requires options:useprivmsg
+ * to be enabled as well
* - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
* - ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
*
@@ -139,7 +139,7 @@ module
secureadmins = yes
/*
- * If set, Services will set the channel modes a user has access to upon identifying, assuming
+ * If set, Anope will set the channel modes a user has access to upon identifying, assuming
* they are not already set.
*
* This directive is optional.
@@ -147,14 +147,14 @@ module
modeonid = yes
/*
- * If set, Services will set these user modes on any user who identifies.
+ * If set, Anope will set these user modes on any user who identifies.
*
* This directive is optional.
*/
#modesonid = "+R"
/*
- * If set, Services will not show netsplits in the last quit message field
+ * If set, Anope will not show netsplits in the last quit message field
* of NickServ's INFO command.
*/
hidenetsplitquit = no
@@ -168,7 +168,7 @@ module
/*
* If set, forbids the registration of nicks that contain an existing
- * nick with Services access. For example, if Tester is a Services Oper,
+ * nick with services access. For example, if Tester is a Services Oper,
* you can't register NewTester or Tester123 unless you are an IRC
* Operator.
*
@@ -181,14 +181,14 @@ module
#restrictopernicks = yes
/*
- * The username, and possibly hostname, used for fake users created when Services needs to
+ * The username, and possibly hostname, used for fake users created when Anope needs to
* hold a nickname.
*/
enforceruser = "enforcer"
enforcerhost = "services.host"
/*
- * The length of time Services hold nicknames.
+ * The length of time Anope should hold nicknames for.
*
* This directive is optional, but recommended. If not set it defaults to 1 minute.
*/
@@ -204,7 +204,7 @@ module
guestnickprefix = "Guest"
/*
- * If set, Services do not allow ownership of nick names, only ownership of accounts.
+ * If set, Anope does not allow ownership of nick names, only ownership of accounts.
*/
nonicknameownership = no
@@ -266,7 +266,7 @@ module
accessmax = 32
/*
- * If set, Services will add the usermask of registering users to the access list of their
+ * If set, Anope will add the usermask of registering users to the access list of their
* newly created account. If not set, users will always have to identify to NickServ before
* being recognized, unless they manually add an address to the access list of their account.
* This directive is optional.
@@ -452,7 +452,7 @@ module
name = "ns_recover"
/*
- * If set, Services will svsnick and svsjoin users who use the recover
+ * If set, Anope 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 optional.
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 2f31b74f7..cb1c17930 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -75,7 +75,7 @@ module
sqlineexpiry = 30d
/*
- * If set, this option will make Services send an AKILL command immediately after it has been
+ * If set, this option will make Anope send an AKILL command immediately after it has been
* added with AKILL ADD. This eliminates the need for killing the user after the AKILL has
* been added.
*
@@ -84,7 +84,7 @@ module
akillonadd = yes
/*
- * If set, this option will make Services send an (SVS)KILL command immediately after SNLINE ADD.
+ * If set, this option will make Anope send an (SVS)KILL command immediately after SNLINE ADD.
* This eliminates the need for killing the user after the SNLINE has been added.
*
* This directive is optional.
@@ -92,7 +92,7 @@ module
killonsnline = yes
/*
- * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD.
+ * If set, this option will make Anope send an (SVS)KILL command immediately after SQLINE ADD.
* This eliminates the need for killing the user after the SQLINE has been added.
*
* This directive is optional.
@@ -167,7 +167,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
name = "os_defcon"
/*
- * Default DefCon level (1-5) to use when starting Services up. Level 5 constitutes normal operation
+ * Default DefCon level (1-5) to use when starting Anope up. Level 5 constitutes normal operation
* while level 1 constitutes the most restrictive operation. If this setting is left out or set to
* 0, DefCon will be disabled and the rest of this block will be ignored.
*/
@@ -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
*/
@@ -209,7 +209,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
* The channel modes to set on all channels when the DefCon channel mode system is in use.
*
* Note 1: Choose these modes carefully, because when DefCon switches to a level which does NOT have
- * the mode setting selected, Services will set the reverse on all channels, e.g. if this setting
+ * the mode setting selected, Anope will set the reverse on all channels, e.g. if this setting
* is +RN when DefCon is used, all channels will be set to +RN, when DefCon is removed, all
* channels will be set to -RN. You don't want to set this to +k for example, because when DefCon
* is removed, all channels are set -k, removing the key from previously keyed channels.
@@ -227,14 +227,14 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
#timeout = 15m
/*
- * If set, Services will send a global message on DefCon level changes.
+ * If set, Anope will send a global message on DefCon level changes.
*
* This directive is optional.
*/
#globalondefcon = yes
/*
- * If set, Services will send the global message defined in the message directive on DefCon level
+ * If set, Anope will send the global message defined in the message directive on DefCon level
* changes.
*
* This directive is optional.
@@ -348,7 +348,7 @@ command { service = "OperServ"; name = "FORBID"; command = "operserv/forbid"; pe
*
* Provides the command operserv/ignore.
*
- * Used to make Services ignore users.
+ * Used to make Anope ignore users.
*/
module { name = "os_ignore" }
command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; permission = "operserv/ignore"; }
@@ -584,7 +584,7 @@ module
#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
+ * If set and is not 0, this directive tells Anope to add an AKILL if the number of subsequent kills
* for the same host exceeds this value, preventing the network from experiencing KILL floods.
*
* This directive is optional.
diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf
index e65a7d419..835101fee 100644
--- a/data/stats.standalone.example.conf
+++ b/data/stats.standalone.example.conf
@@ -1,7 +1,7 @@
/*
- * Example configuration file for Services. After making the appropriate
- * changes to this file, place it in the Services conf directory (as
- * specified in the "configure" script, default /home/username/anope/conf)
+ * Example configuration file for Anope. After making the appropriate
+ * changes to this file, place it in the Anope conf directory (as
+ * specified in the "Config" script, default /home/username/anope/conf)
* under the name "anope.conf".
*
* The format of this file is fairly simple: three types of comments are supported:
@@ -53,7 +53,7 @@
* included to indicate whether an option is required:
*
* [REQUIRED]
- * Indicates a directive which must be given. Without it, Services will
+ * Indicates a directive which must be given. Without it, Anope will
* not start.
*
* [RECOMMENDED]
@@ -71,7 +71,7 @@
*
* [DEPRECATED]
* Indicates a directive which will disappear in a future version of
- * Services, usually because its functionality has been either
+ * Anope, usually because its functionality has been either
* superseded by that of other directives or incorporated into the main
* program.
*/
@@ -120,7 +120,7 @@ define
* This section can be included multiple times, and Anope will attempt to
* connect to each server until it finally connects.
*
- * Each uplink IRCd should have a corresponding configuration to allow Services
+ * Each uplink IRCd should have a corresponding configuration to allow Anope
* to link to it.
*
* An example configuration for InspIRCd that is compatible with the below uplink
@@ -158,20 +158,20 @@ define
uplink
{
/*
- * The IP or hostname of the IRC server you wish to connect Services to.
- * Usually, you will want to connect Services over 127.0.0.1 (aka localhost).
+ * The IP or hostname of the IRC server you wish to connect Anope to.
+ * Usually, you will want to connect over 127.0.0.1 (aka localhost).
*
* NOTE: On some shell providers, this will not be an option.
*/
host = "127.0.0.1"
/*
- * Enable if Services should connect using IPv6.
+ * Enable if Anope should connect using IPv6.
*/
ipv6 = no
/*
- * Enable if Services should connect using SSL.
+ * Enable if Anope should connect using SSL.
* You must have an SSL module loaded for this to work.
*/
ssl = no
@@ -197,12 +197,12 @@ uplink
/*
* [REQUIRED] Server Information
*
- * This section contains information about the Services server.
+ * This section contains information about the services server.
*/
serverinfo
{
/*
- * The hostname that Services will be seen as, it must have no conflicts with any
+ * The hostname that Anope will be seen as, it must have no conflicts with any
* 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.
*/
@@ -212,11 +212,11 @@ serverinfo
* The text which should appear as the server's information in /WHOIS and similar
* queries.
*/
- description = "Stats for IRC Networks"
+ description = "Anope IRC Statistics"
/*
- * The local address that Services will bind to before connecting to the remote
- * server. This may be useful for multihomed hosts. If omitted, Services will let
+ * The local address that Anope will bind to before connecting to the remote
+ * server. This may be useful for multihomed hosts. If omitted, Anope will let
* the Operating System choose the local address. This directive is optional.
*
* If you don't know what this means or don't need to use it, just leave this
@@ -232,7 +232,7 @@ serverinfo
#id = "00A"
/*
- * The filename containing the Services process ID. The path is relative to the
+ * The filename containing the Anope process ID. The path is relative to the
* services root directory.
*/
pid = "data/anope.pid"
@@ -268,32 +268,32 @@ module
/*
* [REQUIRED] Network Information
*
- * This section contains information about the IRC network that Services will be
+ * This section contains information about the IRC network that Anope will be
* connecting to.
*/
networkinfo
{
/*
- * This is the name of the network that Services will be running on.
+ * This is the name of the network that Anope will be running on.
*/
networkname = "LocalNet"
/*
* Set this to the maximum allowed nick length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * Services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
nicklen = 31
/* Set this to the maximum allowed ident length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * Services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
userlen = 10
/* Set this to the maximum allowed hostname length on your network.
* Be sure to set this correctly, as setting this wrong can result in
- * Services being disconnected from the network.
+ * Anope being disconnected from the network.
*/
hostlen = 64
@@ -311,7 +311,7 @@ networkinfo
* to services, such as BotServ bot hostnames and user vhosts. Changing this is not
* recommended unless you know for sure your IRCd supports whatever characters you are
* wanting to use. Telling services to set a vHost containing characters your IRCd
- * disallows could potentially break the IRCd and/or Services.
+ * disallows could potentially break the IRCd and/or Anope.
*
* It is recommended you DON'T change this.
*/
@@ -336,22 +336,22 @@ networkinfo
}
/*
- * [REQUIRED] Services Options
+ * [REQUIRED] Anope Options
*
- * This section contains various options which determine how Services will operate.
+ * This section contains various options which determine how Anope will operate.
*/
options
{
/*
* On Linux/UNIX systems Anope can setuid and setgid to this user and group
- * after starting up. This is useful if Anope has to bind to privileged ports
+ * after starting up. This is useful if Anope has to bind to privileged ports.
*/
#user = "anope"
#group = "anope"
/*
* The case mapping used by services. This must be set to a valid locale name
- * installed on your machine. Services use this case map to compare, with
+ * installed on your machine. Anope uses this case map to compare, with
* case insensitivity, things such as nick names, channel names, etc.
*
* We provide two special casemaps shipped with Anope, ascii and rfc1459.
@@ -375,14 +375,14 @@ options
warningtimeout = 4h
/*
- * If set, Services will only show /stats o to IRC Operators. This directive
+ * If set, Anope will only show /stats o to IRC Operators. This directive
* is optional.
*/
#hidestatso = yes
/*
* 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
+ * the servers in this list are allowed to set channel modes and Anope will
* not attempt to reverse their mode changes.
*
* WARNING: Do NOT put your normal IRC user servers in this directive.
diff --git a/docs/DEFCON b/docs/DEFCON
index dbc981df9..2eaaa3dfe 100644
--- a/docs/DEFCON
+++ b/docs/DEFCON
@@ -23,7 +23,7 @@ Anope DefCon
These are configurable levels that mandates what actions Anope should
take in case of emergency and change in readiness status.
- It is used to prevent abuse to both Services, and the ircd on which they
+ It is used to prevent abuse to both Anope, and the IRCd on which they
are running. Also to protect the users, primarily in the event of Clones
and/or FloodBOT attacks.
@@ -50,8 +50,8 @@ Anope DefCon
Force Chan Mode
Use Reduced Session Limit
KILL any new clients trying to connect
- Services will ignore everyone but opers
- Services will silently ignore everyone but opers
+ Ignore everyone but opers
+ Silently ignore everyone but opers
AKILL all new clients trying to connect
No new memos sent to block MemoServ attacks
diff --git a/docs/INSTALL b/docs/INSTALL
index ffbf04906..fe0bb9eae 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -75,7 +75,7 @@ Note: You should also read the README and FAQ files!
3) Setting up the IRCd
- Services acts as an IRC server with pseudo-clients on it. To link them to
+ Anope acts as an IRC server with pseudo-clients on it. To link them to
your network, you'll need to configure your IRCd to allow services to link.
The configuration varies depending on the IRCd, but you will probably need
@@ -101,7 +101,7 @@ Note: You should also read the README and FAQ files!
displayed on the screen. Correct them until there are no errors anymore.
A successful startup won't generate any message.
- Give Services at least one minute to link to your network, as certain
+ Give Anope at least one minute to link to your network, as certain
IRCds on some OSes may be really slow for the link process. If nothing
happens after about a minute, it is probably a configuration problem. Try
to launch Anope with ./anope -debug -nofork to see any errors that it
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index c674f3f3d..da50fec42 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -82,7 +82,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
3) Configuration de l'IRCd
- Les Services agissent comme un serveur IRC avec des pseudo-clients.
+ Anope agit comme un serveur IRC avec des pseudo-clients.
Pour les relier à votre réseau, vous aurez besoin de configurer votre
IRCd pour permettre aux services de se connecter.
diff --git a/docs/README b/docs/README
index bdadb6823..bfad176d3 100644
--- a/docs/README
+++ b/docs/README
@@ -120,7 +120,7 @@ Table of Contents
2) Presentation
- Anope is a set of Services for IRC networks that allows users to manage
+ 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.
@@ -225,7 +225,7 @@ Table of Contents
the log file; if you send a bug report, PLEASE include an excerpt from
the log file WITH DEBUGGING ACTIVE; we cannot emphasize enough how
important this is to tracking down problems. (You can also enable
- debugging while Services is running using OperServ's SET DEBUG command.)
+ debugging while Anope is running using OperServ's SET DEBUG command.)
If you repeat use --debug=<level>, the debugging level will be increased,
which provides more detailed information but may also slow Anope down
considerably and make the log file grow dramatically faster. In general,
diff --git a/docs/REDIS b/docs/REDIS
index 8f7a076fd..761d6de9e 100644
--- a/docs/REDIS
+++ b/docs/REDIS
@@ -149,12 +149,12 @@ Table of Contents
Which returns a new object ID for me, in this example it will be "8".
Now I can create the object:
- HMSET hash:BotInfo:8 nick redis user redis host services.anope.org realname "Services for IRC Networks"
+ HMSET hash:BotInfo:8 nick redis user redis host services.anope.org realname "Anope IRC Services"
Note if you are using HSET instead of HMSET you will need to use a transaction, as shown in the above example.
If you are watching your services logs you will immediately see:
- USERS: redis!redis@services.anope.org (Services for IRC Networks) connected to the network (services.anope.org)
+ USERS: redis!redis@services.anope.org (Anope IRC Services) connected to the network (services.anope.org)
And the bot redis will be in BotServ's bot list.
Notice how ids:BotInfo and the value keys are updated automatically.
diff --git a/include/anope.h b/include/anope.h
index 32ba53de7..3f81c3b91 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -366,11 +366,11 @@ namespace Anope
*/
extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
- /** The root of the services installation. Usually ~/anope
+ /** The root of the Anope installation. Usually ~/anope
*/
extern CoreExport Anope::string ServicesDir;
- /** Services binary name (eg services)
+ /** Anope binary name (eg anope)
*/
extern CoreExport Anope::string ServicesBin;
diff --git a/include/modules.h b/include/modules.h
index c3fea51b1..4bf579a1f 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -321,7 +321,7 @@ class CoreExport Module : public Extensible
*/
virtual void OnUserKicked(const MessageSource &source, User *target, const Anope::string &channel, ChannelStatus &status, const Anope::string &kickmsg) { throw NotImplementedException(); }
- /** Called when Services' configuration is being (re)loaded.
+ /** Called when the configuration is being (re)loaded.
* @param conf The config that is being built now and will replace the global Config object
* @throws A ConfigException to abort the config (re)loading process.
*/
diff --git a/include/service.h b/include/service.h
index dc2ebf609..492ac962e 100644
--- a/include/service.h
+++ b/include/service.h
@@ -112,7 +112,7 @@ class CoreExport Service : public virtual Base
}
};
-/** Like Reference, but used to refer to Services.
+/** Like Reference, but used to refer to a Service.
*/
template<typename T>
class ServiceReference : public Reference<T>
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index 80b750c98..858fda279 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -134,7 +134,7 @@ class CommandCSSetBanType : public Command
public:
CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype") : Command(creator, cname, 2, 2)
{
- this->SetDesc(_("Set how Services make bans on the channel"));
+ this->SetDesc(_("Set how services make bans on the channel"));
this->SetSyntax(_("\037channel\037 \037bantype\037"));
}
diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp
index dc441cfec..8eb2934d9 100644
--- a/modules/commands/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
@@ -69,7 +69,7 @@ class CommandNSLogout : public Command
"yourself.\n"
" \n"
"With a parameter, does the same for the given nick. If you\n"
- "specify \002REVALIDATE\002 as well, Services will ask the given nick\n"
+ "specify \002REVALIDATE\002 as well, services will ask the given nick\n"
"to re-identify. This is limited to \002Services Operators\002."));
return true;
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index e96a0e06c..a0f89dd8b 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -797,7 +797,7 @@ class CommandNSSetLanguage : public Command
public:
CommandNSSetLanguage(Module *creator, const Anope::string &sname = "nickserv/set/language", size_t min = 1) : Command(creator, sname, min, min + 1)
{
- this->SetDesc(_("Set the language Services will use when messaging you"));
+ this->SetDesc(_("Set the language services will use when messaging you"));
this->SetSyntax(_("\037language\037"));
}
@@ -852,7 +852,7 @@ class CommandNSSetLanguage : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Changes the language Services uses when sending messages to\n"
+ source.Reply(_("Changes the language services uses when sending messages to\n"
"you (for example, when responding to a command you send).\n"
"\037language\037 should be chosen from the following list of\n"
"supported languages:"));
@@ -888,7 +888,7 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Changes the language Services uses when sending messages to\n"
+ source.Reply(_("Changes the language services uses when sending messages to\n"
"the given user (for example, when responding to a command they send).\n"
"\037language\037 should be chosen from the following list of\n"
"supported languages:"));
@@ -909,7 +909,7 @@ class CommandNSSetMessage : public Command
public:
CommandNSSetMessage(Module *creator, const Anope::string &sname = "nickserv/set/message", size_t min = 1) : Command(creator, sname, min, min + 1)
{
- this->SetDesc(_("Change the communication method of Services"));
+ this->SetDesc(_("Change the communication method of services"));
this->SetSyntax("{ON | OFF}");
}
@@ -970,8 +970,8 @@ class CommandNSSetMessage : public Command
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Allows you to choose the way Services are communicating with\n"
- "you. With \002%s\002 set, Services will use messages, else they'll\n"
+ source.Reply(_("Allows you to choose the way services are communicating with\n"
+ "you. With \002%s\002 set, services will use messages, else they'll\n"
"use notices."), cmd.upper().c_str());
return true;
}
@@ -996,8 +996,8 @@ class CommandNSSASetMessage : public CommandNSSetMessage
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Allows you to choose the way Services are communicating with\n"
- "the given user. With \002MSG\002 set, Services will use messages,\n"
+ source.Reply(_("Allows you to choose the way services are communicating with\n"
+ "the given user. With \002MSG\002 set, services will use messages,\n"
"else they'll use notices."));
return true;
}
diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp
index 0f993c851..d973fe8cc 100644
--- a/modules/commands/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
@@ -338,7 +338,7 @@ class CommandOSIgnore : public Command
public:
CommandOSIgnore(Module *creator) : Command(creator, "operserv/ignore", 1, 4)
{
- this->SetDesc(_("Modify the Services ignore list"));
+ this->SetDesc(_("Modify the services ignore list"));
this->SetSyntax(_("ADD \037expiry\037 {\037nick\037|\037mask\037} [\037reason\037]"));
this->SetSyntax(_("DEL {\037nick\037|\037mask\037}"));
this->SetSyntax("LIST");
@@ -367,13 +367,13 @@ class CommandOSIgnore : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Allows Services Operators to make Services ignore a nick or mask\n"
+ source.Reply(_("Allows Services Operators to make services ignore a nick or mask\n"
"for a certain time or until the next restart. The default\n"
"time format is seconds. You can specify it by using units.\n"
"Valid units are: \037s\037 for seconds, \037m\037 for minutes,\n"
"\037h\037 for hours and \037d\037 for days.\n"
"Combinations of these units are not permitted.\n"
- "To make Services permanently ignore the user, type 0 as time.\n"
+ "To make services permanently ignore the user, type 0 as time.\n"
"When adding a \037mask\037, it should be in the format nick!user@host,\n"
"everything else will be considered a nick. Wildcards are permitted.\n"
" \n"
diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp
index 03ee24424..774e8e694 100644
--- a/modules/commands/os_jupe.cpp
+++ b/modules/commands/os_jupe.cpp
@@ -53,8 +53,8 @@ class CommandOSJupe : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Tells Services to jupiter a server -- that is, to create\n"
- "a fake \"server\" connected to Services which prevents\n"
+ source.Reply(_("Tells services to jupiter a server -- that is, to create\n"
+ "a fake \"server\" connected to services which prevents\n"
"the real server of that name from connecting. The jupe\n"
"may be removed using a standard \002SQUIT\002. If a reason is\n"
"given, it is placed in the server information field;\n"
diff --git a/modules/commands/os_logsearch.cpp b/modules/commands/os_logsearch.cpp
index a4c4829a2..0765b115a 100644
--- a/modules/commands/os_logsearch.cpp
+++ b/modules/commands/os_logsearch.cpp
@@ -156,7 +156,7 @@ class CommandOSLogSearch : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("This command searches the Services logfiles for messages\n"
+ source.Reply(_("This command searches the services logfiles for messages\n"
"that match the given pattern. The day and limit argument\n"
"may be used to specify how many days of logs to search\n"
"and the number of replies to limit to. By default this\n"
diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp
index f3a801db8..cf1293754 100644
--- a/modules/commands/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
@@ -44,9 +44,9 @@ class CommandOSReload : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Causes Services to reload the configuration file. Note that\n"
- "some directives still need the restart of the Services to\n"
- "take effect (such as Services' nicknames, activation of the\n"
+ source.Reply(_("Causes services to reload the configuration file. Note that\n"
+ "some directives still need the restart of the services to\n"
+ "take effect (such as services' nicknames, activation of the\n"
"session limitation, etc.)."));
return true;
}
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp
index b03bab01f..b49a0562e 100644
--- a/modules/commands/os_set.cpp
+++ b/modules/commands/os_set.cpp
@@ -166,7 +166,7 @@ class CommandOSSet : public Command
public:
CommandOSSet(Module *creator) : Command(creator, "operserv/set", 1, 2)
{
- this->SetDesc(_("Set various global Services options"));
+ this->SetDesc(_("Set various global services options"));
this->SetSyntax(_("\037option\037 \037setting\037"));
}
@@ -196,7 +196,7 @@ class CommandOSSet : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Sets various global Services options. Option names\n"
+ source.Reply(_("Sets various global services options. Option names\n"
"currently defined are:\n"
" READONLY Set read-only or read-write mode\n"
" DEBUG Activate or deactivate debug mode\n"
@@ -212,13 +212,13 @@ class CommandOSSet : public Command
source.Reply(_("Syntax: \002READONLY {ON | OFF}\002\n"
" \n"
"Sets read-only mode on or off. In read-only mode, normal\n"
- "users will not be allowed to modify any Services data,\n"
+ "users will not be allowed to modify any services data,\n"
"including channel and nickname access lists, etc. IRCops\n"
- "with sufficient Services privileges will be able to modify\n"
+ "with sufficient services privileges will be able to modify\n"
"Services' AKILL, SQLINE, SNLINE and ignore lists, drop,\n"
"suspend or forbid nicknames and channels, and manage news,\n"
"oper info and DNS, but any such changes will not be saved\n"
- "unless read-only mode is deactivated before Services are\n"
+ "unless read-only mode is deactivated before services are\n"
"terminated or restarted.\n"
" \n"
"This option is equivalent to the command-line option\n"
diff --git a/modules/commands/os_shutdown.cpp b/modules/commands/os_shutdown.cpp
index a6bb5252b..a5fab15e2 100644
--- a/modules/commands/os_shutdown.cpp
+++ b/modules/commands/os_shutdown.cpp
@@ -16,7 +16,7 @@ class CommandOSQuit : public Command
public:
CommandOSQuit(Module *creator) : Command(creator, "operserv/quit", 0, 0)
{
- this->SetDesc(_("Terminate Services WITHOUT saving"));
+ this->SetDesc(_("Terminate services WITHOUT saving"));
}
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
@@ -31,7 +31,7 @@ class CommandOSQuit : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Causes Services to do an immediate shutdown; databases are\n"
+ source.Reply(_("Causes services to do an immediate shutdown; databases are\n"
"\002not\002 saved. This command should not be used unless\n"
"damage to the in-memory copies of the databases is feared\n"
"and they should not be saved."));
@@ -59,7 +59,7 @@ class CommandOSRestart : public Command
bool OnHelp(CommandSource &source, const Anope::string &subcommand) override
{
this->SendSyntax(source);
- source.Reply(_("Causes Services to save all databases and then restart\n"
+ source.Reply(_("Causes services to save all databases and then restart\n"
"(i.e. exit and immediately re-run the executable)."));
return true;
}
@@ -86,7 +86,7 @@ class CommandOSShutdown : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Causes Services to save all databases and then shut down."));
+ source.Reply(_("Causes services to save all databases and then shut down."));
return true;
}
};
diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp
index 42d727fa2..0dac3fb82 100644
--- a/modules/commands/os_stats.cpp
+++ b/modules/commands/os_stats.cpp
@@ -200,7 +200,7 @@ class CommandOSStats : public Command
CommandOSStats(Module *creator) : Command(creator, "operserv/stats", 0, 1),
akills("XLineManager", "xlinemanager/sgline"), snlines("XLineManager", "xlinemanager/snline"), sqlines("XLineManager", "xlinemanager/sqline")
{
- this->SetDesc(_("Show status of Services and network"));
+ this->SetDesc(_("Show status of services and network"));
this->SetSyntax("[AKILL | HASH | UPLINK | UPTIME | ALL | RESET]");
}
@@ -234,8 +234,8 @@ class CommandOSStats : public Command
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_("Without any option, shows the current number of users online,\n"
- "and the highest number of users online since Services was\n"
- "started, and the length of time Services has been running.\n"
+ "and the highest number of users online since services was\n"
+ "started, and the length of time services has been running.\n"
" \n"
"With the \002AKILL\002 option, displays the current size of the\n"
"AKILL list and the current default expiry time.\n"
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index eedf1d02c..eccdf5464 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -435,7 +435,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
source.Reply(" ");
source.Reply(_("Allows Services Operators to manipulate the SNLINE list. If\n"
"a user with a realname matching an SNLINE mask attempts to\n"
- "connect, Services will not allow it to pursue his IRC\n"
+ "connect, services will not allow it to pursue his IRC\n"
"session."));
source.Reply(_(" \n"
"\002SNLINE ADD\002 adds the given realname mask to the SNLINE\n"
@@ -669,7 +669,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
source.Reply(" ");
source.Reply(_("Allows Services Operators to manipulate the SQLINE list. If\n"
"a user with a nick matching an SQLINE mask attempts to\n"
- "connect, Services will not allow it to pursue his IRC\n"
+ "connect, services will not allow it to pursue his IRC\n"
"session.\n"
"If the first character of the mask is #, services will\n"
"prevent the use of matching channels. If the mask is a\n"
diff --git a/modules/commands/os_update.cpp b/modules/commands/os_update.cpp
index 849485181..2175bd32d 100644
--- a/modules/commands/os_update.cpp
+++ b/modules/commands/os_update.cpp
@@ -16,7 +16,7 @@ class CommandOSUpdate : public Command
public:
CommandOSUpdate(Module *creator) : Command(creator, "operserv/update", 0, 0)
{
- this->SetDesc(_("Force the Services databases to be updated immediately"));
+ this->SetDesc(_("Force the services databases to be updated immediately"));
}
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
@@ -31,7 +31,7 @@ class CommandOSUpdate : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Causes Services to update all database files as soon as you\n"
+ source.Reply(_("Causes services to update all database files as soon as you\n"
"send the command."));
return true;
}
diff --git a/src/config.cpp b/src/config.cpp
index 502cb3bac..ae9529b21 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -19,7 +19,7 @@
using namespace Configuration;
-File ServicesConf("anope.conf", false); // Services configuration file name
+File ServicesConf("anope.conf", false); // Configuration file name
Conf *Config = NULL;
Block::Block(const Anope::string &n) : name(n), linenum(-1)
diff --git a/src/init.cpp b/src/init.cpp
index 0620ca253..a1dd04e65 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -411,7 +411,7 @@ void Anope::Init(int ac, char **av)
Anope::LogDir = arg;
}
- /* Chdir to Services data directory. */
+ /* Chdir to Anope data directory. */
if (chdir(Anope::ServicesDir.c_str()) < 0)
{
throw CoreException("Unable to chdir to " + Anope::ServicesDir + ": " + Anope::LastError());
diff --git a/src/main.cpp b/src/main.cpp
index 09bcea007..5ea363f9d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-/* Services -- main source file.
+/* Anope -- main source file.
*
* (C) 2003-2021 Anope Team
* Contact us at team@anope.org
diff --git a/src/messages.cpp b/src/messages.cpp
index c0c41b31b..5b747c7e3 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -199,7 +199,7 @@ void Kill::Run(MessageSource &source, const std::vector<Anope::string> &params,
if (last_time == Anope::CurTime)
{
- Anope::QuitReason = "Kill loop detected. Are Services U:Lined?";
+ Anope::QuitReason = "Kill loop detected. Is Anope U:Lined?";
Anope::Quitting = true;
return;
}
diff --git a/src/tools/anoperc.in b/src/tools/anoperc.in
index 45e097cd4..73d756d3f 100644
--- a/src/tools/anoperc.in
+++ b/src/tools/anoperc.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Configuration script for Services
+# Configuration script for Anope
#
# (C) 2003-2021 Anope Team
# Contact us at team@anope.org