Rename things from services to anope.

27 files changed, 132 insertions, 138 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 131447e33..ade4d8eef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,13 +293,7 @@ if(MINGW)
 endif(MINGW)
 
 if(NOT PROGRAM_NAME)
-  # Under Windows, we set the executable name for Anope to be anope
-  if(WIN32)
-    set(PROGRAM_NAME anope)
-  # Under *nix, we set the executable name for Anope to be services
-  else(WIN32)
-    set(PROGRAM_NAME services)
-  endif(WIN32)
+  set(PROGRAM_NAME anope)
 endif(NOT PROGRAM_NAME)
 
 # If we are not using Visual Studio, we'll run the following checks
@@ -382,11 +376,11 @@ find_program(SH sh)
 find_program(CHGRP chgrp)
 find_program(CHMOD chmod)
 
-# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the services directory under the user's home directory
+# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the anope directory under the user's home directory
 if(INSTDIR)
   set(CMAKE_INSTALL_PREFIX "${INSTDIR}")
 elseif(NOT CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/services")
+  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope")
 endif(INSTDIR)
 
 # Set default paths for various directories if not already defined
diff --git a/Config b/Config
index c4ea86be8..4ad3ff527 100755
--- a/Config
+++ b/Config
@@ -125,7 +125,7 @@ export ECHO2 ECHO2SUF
 # Init values
 ###########################################################################
 
-INSTDIR=$HOME/services
+INSTDIR=$HOME/anope
 RUNGROUP=
 UMASK=
 DEBUG="no"
diff --git a/README.md b/README.md
index 9d4b62350..fdf672218 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ $ make
 $ make install
 ```
 
-Now change to the directory where you installed Anope to, e.g. `$ cd ~/services/`
+Now change to the directory where you installed Anope to, e.g. `$ cd ~/anope/`
 
 ### Windows
 Download the latest release off of the [releases page](https://github.com/anope/anope/releases) and run the installer.
@@ -27,19 +27,19 @@ Download the latest release off of the [releases page](https://github.com/anope/
 
 ## Configuration
 
-Copy conf/example.conf to conf/services.conf
+Copy conf/anope.example.conf to conf/anope.conf
 
 ```
-$ cp conf/example.conf conf/services.conf
+$ cp conf/anope.example.conf conf/anope.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.anope.org](irc://irc.anope.org/#anope).
+Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the anope.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.anope.org](irc://irc.anope.org/#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.
+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 `anope.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`
+Run `$ ./bin/anope` to start Anope. If asked to provide logs for support, use the `--support` flag, e.g.: `$ ./bin/anope --support`
 
 ## Installing extra modules
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8bb635dcf..fca99879e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Only install example.chk and example.conf from this directory
+# Only install example.chk and anope.example.conf from this directory
 # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
-set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
+set(DATA example.chk anope.example.conf botserv.example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
 install(FILES ${DATA}
   DESTINATION ${CONF_DIR}
 )
diff --git a/data/example.conf b/data/anope.example.conf
index d9cad96b4..d599c7e39 100644
--- a/data/example.conf
+++ b/data/anope.example.conf
@@ -1,8 +1,8 @@
 /*
- * 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/services/conf)
- * under the name "services.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 "configure" 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:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -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.
  */
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/anope.conf"
 }
 
 /*
@@ -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 services
  * 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 services 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 = "Services for IRC Networks"
+	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 services will bind to before connecting to the remote
+	 * server. This may be useful for multihomed hosts. If omitted, services 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,16 +232,16 @@ 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/services.pid"
+	pid = "data/anope.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/motd.txt"
 }
 
 /*
@@ -284,32 +284,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.
+	 * services 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.
+	 * services 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.
+	 * services 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 services
 	 * 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 services.
 	 *
 	 * It is recommended you DON'T change this.
 	 */
@@ -362,15 +362,15 @@ 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"
@@ -403,10 +403,10 @@ options
 	#seed = 9866235
 
 	/*
-	 * If set, Services will perform more stringent checks on passwords. If this
-	 * isn't set, Services will only disallow a password if it is the same as the
+	 * If set, services will perform more stringent checks on passwords. If this
+	 * isn't set, services will only disallow a password if it is the same as the
 	 * entity (nickname name) with which it is associated. When set, however,
-	 * Services will also check that the password is at least five
+	 * services will also check that the password is at least five
 	 * characters long, and in the future will probably check other things
 	 * as well.
 	 *
@@ -415,11 +415,11 @@ options
 	strictpasswords = yes
 
 	/*
-	 * Sets the number of invalid password tries before Services removes a user
+	 * Sets the number of invalid password tries before services removes a user
 	 * from the network. If a user enters a number of invalid passwords equal to
-	 * the given amount for any Services function or combination of functions
-	 * during a single IRC session (subject to badpasstimeout, below), Services
-	 * will issues a /KILL for the user. If not given, Services will ignore
+	 * the given amount for any services function or combination of functions
+	 * during a single IRC session (subject to badpasstimeout, below), services
+	 * will issues a /KILL for the user. If not given, services will ignore
 	 * failed password attempts (though they will be logged in any case).
 	 *
 	 * This directive is optional, but recommended.
@@ -461,7 +461,7 @@ options
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
-	 * such as nick kills, occur; it also determines how much CPU time Services
+	 * such as nick kills, occur; it also determines how much CPU time services
 	 * will use doing this. Higher values will cause less accurate timing but
 	 * less CPU usage.
 	 *
@@ -474,7 +474,7 @@ options
 	timeoutcheck = 3s
 
 	/*
-	 * If set, this will allow users to let Services send PRIVMSGs to them
+	 * If set, this will allow users to let services send PRIVMSGs to them
 	 * instead of NOTICEs. Also see the "msg" option of nickserv:defaults,
 	 * which also toggles the default communication (PRIVMSG or NOTICE) to
 	 * use for unregistered users.
@@ -487,7 +487,7 @@ options
 	#useprivmsg = yes
 
 	/*
-	 * If set, will force Services to only respond to PRIVMSGs addresses to
+	 * If set, will force services to only respond to PRIVMSGs addresses to
 	 * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in
 	 * conjunction with IRCd aliases. This directive is optional.
 	 *
@@ -496,14 +496,14 @@ options
 	#usestrictprivmsg = yes
 
 	/*
-	 * If set, Services will only show /stats o to IRC Operators. This directive
+	 * If set, services 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 services will
 	 * not attempt to reverse their mode changes.
 	 *
 	 * WARNING: Do NOT put your normal IRC user servers in this directive.
@@ -518,13 +518,13 @@ options
 	retrywait = 60s
 
 	/*
-	 * If set, Services will hide commands that users don't have the privilege to execute
+	 * If set, services will hide commands that users don't have the privilege to execute
 	 * from HELP output.
 	 */
 	hideprivilegedcommands = yes
 
 	/*
-	 * If set, Services will hide commands that users can't execute because they are not
+	 * If set, services will hide commands that users can't execute because they are not
 	 * logged in from HELP output.
 	 */
 	hideregisteredcommands = yes
@@ -779,7 +779,7 @@ log
  *  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
+ *  protected                     - Can not be kicked from channels by services
  *
  * Available commands:
  *   botserv/bot/del          botserv/bot/add               botserv/bot/change        botserv/set/private
@@ -881,10 +881,10 @@ opertype
  * After defining different types of operators in the above opertype section, we now define who is in these groups
  * through 'oper' blocks, similar to ircd access.
  *
- * The default is to comment these out (so NOBODY will have Services access).
+ * The default is to comment these out (so NOBODY will have access).
  * You probably want to add yourself and a few other people at minimum.
  *
- * As with all permissions, make sure to only give trustworthy people access to Services.
+ * As with all permissions, make sure to only give trustworthy people access.
  */
 
 #oper
@@ -895,7 +895,7 @@ opertype
 	/* The opertype this person will have */
 	type = "Services Root"
 
-	/* If set, the user must be an oper on the IRCd to gain their Services
+	/* If set, the user must be an oper on the IRCd to gain their
 	 * oper privileges.
 	 */
 	require_oper = yes
@@ -930,7 +930,7 @@ opertype
 /*
  * [OPTIONAL] Mail Config
  *
- * This section contains settings related to the use of e-mail from Services.
+ * This section contains settings related to the use of e-mail from services.
  * If the usemail directive is set to yes, unless specified otherwise, all other
  * directives are required.
  *
@@ -941,7 +941,7 @@ opertype
 mail
 {
 	/*
-	 * If set, this option enables the mail commands in Services. You may choose
+	 * If set, this option enables the mail commands in Anope. 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.
@@ -972,7 +972,7 @@ mail
 	 * another e-mail after they have sent one. It also controls the minimum time
 	 * a user must wait before they can receive another e-mail.
 	 *
-	 * This feature prevents users from being mail bombed using Services and
+	 * This feature prevents users from being mail bombed using services and
 	 * it is highly recommended that it be used.
 	 *
 	 * This directive is optional, but highly recommended.
@@ -980,7 +980,7 @@ mail
 	delay = 5m
 
 	/*
-	 * If set, Services will not attempt to put quotes around the TO: fields
+	 * If set, Anope will not put quotes around the TO: fields
 	 * in e-mails.
 	 *
 	 * This directive is optional, and as far as we know, it's only needed
@@ -1109,18 +1109,18 @@ module
 
 	/*
 	 * Sets the number of days backups of databases are kept. If you don't give it,
-	 * or if you set it to 0, Services won't backup the databases.
+	 * or if you set it to 0, Anope won't backup the databases.
 	 *
-	 * NOTE: Services must run 24 hours a day for this feature to work.
+	 * NOTE: Anope must run 24 hours a day for this feature to work.
 	 *
 	 * This directive is optional, but recommended.
 	 */
 	keepbackups = 3
 
 	/*
-	 * Allows Services to continue file write operations (i.e. database saving)
+	 * Allows Anope to continue file write operations (i.e. database saving)
 	 * even if the original file cannot be backed up. Enabling this option may
-	 * allow Services to continue operation under conditions where it might
+	 * allow Anope to continue operation under conditions where it might
 	 * otherwise fail, such as a nearly-full disk.
 	 *
 	 * NOTE: Enabling this option can cause irrecoverable data loss under some
diff --git a/data/example.chk b/data/example.chk
index 119b1ca99..e71928f1c 100644
--- a/data/example.chk
+++ b/data/example.chk
@@ -9,16 +9,16 @@
 ###############################################################
 
 # Anope binary directory
-ANOPATH=/home/ircd/services/bin
+ANOPATH=/home/ircd/anope/bin
 
 # Anope data directory
-ANODATA=/home/ircd/services/data
+ANODATA=/home/ircd/anope/data
 
 # Name of the pid file
-ANOPIDF=services.pid
+ANOPIDF=anope.pid
 
 # Name of the executable
-ANOPROG=services
+ANOPROG=anope
 
 # Parameters to pass to the executable
 ANOARGS=""
diff --git a/data/modules.example.conf b/data/modules.example.conf
index aae45ff12..6c2d809c9 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -701,7 +701,7 @@ module { name = "m_sasl" }
 
 	/* Query to execute to determine if a user should have operator privileges.
 	 * A field named opertype must be returned in order to link the user to their oper type.
-	 * The oper types must be configured earlier in services.conf.
+	 * The oper types must be configured earlier in anope.conf.
 	 *
 	 * If a field named modes is returned from this query then those modes are set on the user.
 	 * Without this, only a simple +o is sent.
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index 25ba7b5e5..89e333241 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -521,7 +521,7 @@ command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permis
  *
  * Provides the command operserv/reload.
  *
- * Used to reload the services.conf configuration file.
+ * Used to reload the anope.conf configuration file.
  */
 module { name = "os_reload" }
 command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf
index 2520f0cfc..93d85811c 100644
--- a/data/stats.standalone.example.conf
+++ b/data/stats.standalone.example.conf
@@ -1,8 +1,8 @@
 /*
  * 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/services/conf)
- * under the name "services.conf".
+ * specified in the "configure" 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:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -235,13 +235,13 @@ serverinfo
 	 * The filename containing the Services process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/stats.pid"
+	pid = "data/anope.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/stats.motd"
+	motd = "conf/motd.txt"
 }
 
 /*
diff --git a/docs/INSTALL b/docs/INSTALL
index 21ca16e19..5046c6912 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -52,8 +52,8 @@ Note: You should also read the README and FAQ files!
     cause trouble on your network if passwords are not encrypted, or read
     the memos of any user.
 
-    Now go into the conf directory (by default, ~/services/conf). Copy the example
-    configuration file (example.conf) to services.conf, and open the latter
+    Now go into the conf directory (by default, ~/anope/conf). Copy the example
+    configuration file (anope.example.conf) to anope.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     the file carefully. Using the default values is NOT a good idea, and will
@@ -71,7 +71,7 @@ Note: You should also read the README and FAQ files!
 
         * IMPORTANT: Back up your old databases!
         * If you are upgrading to a new major release, ALWAYS restart a
-          fresh configuration file from example.conf.
+          fresh configuration file from anope.example.conf.
 
 3) Setting up the IRCd
 
@@ -83,7 +83,7 @@ Note: You should also read the README and FAQ files!
     a shared block), and be sure that the IRCd is listneing on the given port
     in the link block.
 
-    Example link configurations can be found in example.conf for some of the
+    Example link configurations can be found in anope.example.conf for some of the
     popular IRCds.
 
     Don't forget to /rehash your IRCd to apply changes.
@@ -95,7 +95,7 @@ Note: You should also read the README and FAQ files!
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is
-    ~/services/bin). Type ./services to launch Anope.
+    ~/anope/bin). Type ./anope to launch Anope.
 
     If there are syntax errors in the configuration file they will be
     displayed on the screen. Correct them until there are no errors anymore.
@@ -104,7 +104,7 @@ Note: You should also read the README and FAQ files!
     Give Services 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 ./services -debug -nofork to see any errors that it
+    to launch Anope with ./anope -debug -nofork to see any errors that it
     encounters, and try to correct them.
 
     If you need help to solve errors, feel free to subscribe to the Anope
@@ -116,16 +116,16 @@ Note: You should also read the README and FAQ files!
     still running, and restart it if not.
 
     First rename the example.chk script that is in Anope path (by default,
-    this is ~/services/conf) to services.chk and edit it. You'll need to
+    this is ~/anope/conf) to anope.chk and edit it. You'll need to
     modify the CONFIGURATION part of the file. Then ensure that the file is
-    marked as executable by typing chmod +x services.chk, and try to launch the
+    marked as executable by typing chmod +x anope.chk, and try to launch the
     script to see if it works (Anope must not be running when you do this ;))
 
     When this is done, you'll have to add the crontab entry. Type crontab -e.
     This will open the default text editor with the crontab file. Enter the
     following (with correct path):
 
-        */5 * * * * /home/ircd/services/conf/services.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/anope.chk >/dev/null 2>&1
 
     The */5 at the beginning means "check every 5 minutes". You may replace
     the 5 with other another number if you want (but less than 60). Consult
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index 245af3e57..c674f3f3d 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -49,15 +49,15 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     Allez dans le dossier build (cd build) et tapez make et make install.
     Ceci va installer tous les fichiers nécessaires dans les dossiers que
     vous avez indiqués avec le script Config et régler les permissions des
-    fichiers. Vous devez vous assurer que le répertoire data n'est pas 
+    fichiers. Vous devez vous assurer que le répertoire data n'est pas
     accessible par les autres utilisateurs, car des utilisateurs
     malveillants pourraient causer des problèmes sur votre réseau, si les
     mots de passe ne sont pas chiffrés, ou lire les mémos de tous les
     utilisateurs.
 
-    Allez maintenant dans le répertoire conf (par défaut, ~/services/conf).
-    Copiez l'exemple de fichier de configuration (example.conf) en
-    services.conf et ouvrez ce dernier avec votre éditeur de texte favori.
+    Allez maintenant dans le répertoire conf (par défaut, ~/anope/conf).
+    Copiez l'exemple de fichier de configuration (anope.example.conf) en
+    anope.conf et ouvrez ce dernier avec votre éditeur de texte favori.
     Il contient toutes les directives de configuration qu'Anope va utiliser
     en démarrant. Lisez attentivement les instructions contenues dans le
     fichier. L'utilisation des valeurs par défaut n'est pas toujours
@@ -78,7 +78,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
         * IMPORTANT : Sauvegardez vos anciennes bases de données !
         * Si vous mettez à jour vers une nouvelle version majeure,
           recommencez *toujours* toute votre configuration à partir du
-          fichier example.conf.
+          fichier anope.example.conf.
 
 3) Configuration de l'IRCd
 
@@ -92,7 +92,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     sur le port donné dans le bloc link.
 
     Des exemples de configurations de bloc link peuvent être trouvés dans
-    le fichier example.conf pour certains des IRCd les plus populaires.
+    le fichier anope.example.conf pour certains des IRCd les plus populaires.
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
@@ -104,7 +104,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés
-    (par défaut, ~/services/bin). Tapez ./services pour lancer Anope.
+    (par défaut, ~/anope/bin). Tapez ./anope pour lancer Anope.
 
     S'il y a des erreurs de syntaxe dans le fichier de configuration, elles
     seront affichées à l'écran. Corrigez-les jusqu'à ce qu'il n'y en ait
@@ -114,7 +114,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     réseau, car certains IRCds sur certains systèmes peuvent être très
     lents pour le processus de liaison. Si rien ne se passe après environ
     une minute, il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug avec ./services -debug -nofork pour voir
+    de lancer Anope en mode debug avec ./anope -debug -nofork pour voir
     toutes les erreurs rencontrées et essayez de les corriger.
 
     Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à
@@ -127,10 +127,10 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     est toujours en cours d'exécution et de le redémarrer s'il n'est pas.
 
     D'abord renommez le script example.chk qui est dans les dossiers
-    d'Anope (par défaut, ~/services/conf) en services.chk et modifiez-le.
+    d'Anope (par défaut, ~/anope/conf) en anope.chk et modifiez-le.
     Vous aurez besoin de modifier la partie CONFIGURATION du fichier.
     Assurez-vous ensuite que le fichier est marqué comme exécutable en
-    tapant chmod +x services.chk et essayez de lancer le script pour voir
+    tapant chmod +x anope.chk et essayez de lancer le script pour voir
     si cela fonctionne (Anope ne doit pas être en marche lorsque vous
     testez cela ;))
 
@@ -138,7 +138,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     crontab -e. Cela va ouvrir l'éditeur de texte par défaut avec le
     fichier crontab. Entrez la ligne suivante (avec le chemin correct) :
 
-        */5 * * * * /home/ircd/services/conf/services.chk > /dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/anope.chk > /dev/null 2>&1
 
     Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
     remplacer le 5 par un autre numéro si vous voulez (mais moins de 60).
diff --git a/docs/LANGUAGE b/docs/LANGUAGE
index bf7317864..bb76ca485 100644
--- a/docs/LANGUAGE
+++ b/docs/LANGUAGE
@@ -25,7 +25,7 @@ Anope Mutli Language Support
     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.
+    translating. Once you are done simply rerun ./Config; make && make install and add the language to your anope.conf.
     Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.
 
     Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
diff --git a/docs/MODULES b/docs/MODULES
index 52cb3b25c..d74f4f35a 100644
--- a/docs/MODULES
+++ b/docs/MODULES
@@ -22,7 +22,7 @@ Anope Modules
     1. If modules are supported by your system, they will be configured
        automatically when you run ./Config. The modules will be installed
        to the modules directory in your data path (by default this will
-       be ~/services/data/modules).
+       be ~/anope/data/modules).
 
     2. Compile Anope as usual using ./Config. The "make" process will now
        compile module support into Anope, and compile the default sample
@@ -98,7 +98,7 @@ Anope Modules
     1. Make sure you're in the main source directory. (usually anope-1.X.XX/)
     2. Run ./Config to find and configure modules, then `cd build`.
     3. Run `make` to compile Anope, and any modules.
-    4. Run `make install` to copy the compiled binaries to the ~/services/
+    4. Run `make install` to copy the compiled binaries to the ~/anope/
        directory.
 
     You can now use /msg OperServ MODLOAD to load the new modules.
diff --git a/docs/TOOLS b/docs/TOOLS
index 5e8f139cb..8b036065f 100644
--- a/docs/TOOLS
+++ b/docs/TOOLS
@@ -8,12 +8,12 @@ Anope Bundled Tools
 
     The SMTP client can be used instead of sendmail for use with Anope's mail
     options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines sendmailpath. On
+    services configuration file (anope.conf) that defines sendmailpath. On
     that line, change the path to your services installation directory, then
     followed by "bin/anopesmtp" and the IP address of a valid SMTP server. It
     should look like this:
 
-        sendmailpath = "/home/anope/services/bin/anopesmtp 127.0.0.1"
+        sendmailpath = "/home/ircd/anope/bin/anopesmtp 127.0.0.1"
 
     If the SMTP client doesn't send mail, or if there's an other problem with
     it, you can enable debug mode by passing the --debug flag after the server
diff --git a/docs/WIN32.txt b/docs/WIN32.txt
index 2880cb0e0..104ef7441 100644
--- a/docs/WIN32.txt
+++ b/docs/WIN32.txt
@@ -103,7 +103,7 @@ Anope for Windows
        INSTALL within the Solution Explorer. Right-click on INSTALL and choose Build.

 

        When you have done this, all the files will be installed to where they belong.

-       The only thing you need to do is rename "data/example.conf" to be "data/services.conf",

+       The only thing you need to do is rename "data/anope.example.conf" to be "data/anope.conf",

        and then follow the steps to set up Anope.

 

     You have now completed the building phase of Anope for Windows. You can

@@ -120,7 +120,7 @@ Anope for Windows
     Notepad will cause strange characters to appear, and you may not be able to

     edit the file correctly.

 

-    Open services.conf, and read through it carefully and adjust the settings

+    Open anope.conf, and read through it carefully and adjust the settings

     you think you need to adjust.

 

     If you are unsure of the settings, you can go to the dos command prompt

diff --git a/include/anope.h b/include/anope.h
index cbcd3e85a..cdbc1f650 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -366,7 +366,7 @@ namespace Anope
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
 
-	/** The root of the services installation. Usually ~/services
+	/** The root of the services installation. Usually ~/anope
 	 */
 	extern CoreExport Anope::string ServicesDir;
 
diff --git a/include/language.h b/include/language.h
index ba371167b..6b9f0f622 100644
--- a/include/language.h
+++ b/include/language.h
@@ -11,7 +11,7 @@
 namespace Language
 {
 
-	/* Languages we support as configured in services.conf. They are
+	/* Languages we support as configured in anope.conf. They are
 	 * added to this list if we detect a language exists in the correct
 	 * location for each language.
 	 */
diff --git a/language/anope.ca_ES.po b/language/anope.ca_ES.po
index d7137856a..43ef36727 100644
--- a/language/anope.ca_ES.po
+++ b/language/anope.ca_ES.po
@@ -4867,7 +4867,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4889,7 +4889,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -9124,7 +9124,7 @@ msgstr "Sucessor de %s desabilitat."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.de_DE.po b/language/anope.de_DE.po
index ff238f43a..5206a3363 100644
--- a/language/anope.de_DE.po
+++ b/language/anope.de_DE.po
@@ -4545,7 +4545,7 @@ msgstr ""
 "angezeigt. (Es werden jedoch nur max. %d angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neuesten angezeigt.)\n"
-"NewsCount kann in der services.conf eingestellt werden.\n"
+"NewsCount kann in der anope.conf eingestellt werden.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -4564,7 +4564,7 @@ msgstr ""
 "(Es werden jedoch nur max. %d Nachrichten angezeigt, um ein\n"
 "Flooding des Users zu verhindern. Wenn mehr News\n"
 "existieren, werden nur die neüsten angezeigt.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "Diese Funktion ist beschränkt auf Services Operatoren."
 
@@ -8762,7 +8762,7 @@ msgstr "Der Eintrag des Vertreters für %s wurde entfernt."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin muss in der services.conf eingeschaltet werden."
+msgstr "SuperAdmin muss in der anope.conf eingeschaltet werden."
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.el_GR.po b/language/anope.el_GR.po
index 28217bb22..2acb14f5c 100644
--- a/language/anope.el_GR.po
+++ b/language/anope.el_GR.po
@@ -4782,7 +4782,7 @@ msgstr ""
 "(Παρόλα αυτά, δεν θα του στέλνονται παραπάνω από #%d# μηνύματα\n"
 "για να αποφευχθεί το flood του χρήστη. Αν υπάρχουν\n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 "\n"
 "Η εντολή LOGONNEWS μπορεί να χρησιμοποιηθεί μόνο από IRC Operators."
 
@@ -4805,7 +4805,7 @@ msgstr ""
 "μηνύματα\n"
 "για να αποφευχθεί flood στον χρήστη. Αν υπάρχουν \n"
 "περισσότερα μηνύματα, θα φαίνονται τα πιο πρόσφατα.)\n"
-"Το NewsCount μπορεί να ρυθμιστεί στο services.conf.\n"
+"Το NewsCount μπορεί να ρυθμιστεί στο anope.conf.\n"
 " \n"
 "Το OPERNEWS μπορεί να χρησιμοποιηθεί μόνο από Services Operators."
 
@@ -9033,7 +9033,7 @@ msgstr "Ο Successor του #%s# δεν έχει οριστεί."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο services.conf"
+msgstr "H ρύθμιση SuperAdmin δεν έχει ενεργοποιηθεί στο anope.conf"
 
 #
 #: modules/commands/ns_suspend.cpp:60
diff --git a/language/anope.hu_HU.po b/language/anope.hu_HU.po
index 90dba2d22..9b6d12352 100644
--- a/language/anope.hu_HU.po
+++ b/language/anope.hu_HU.po
@@ -4826,7 +4826,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4848,7 +4848,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -9034,7 +9034,7 @@ msgstr "A megadott csatorna %s successora törölve."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.pt_PT.po b/language/anope.pt_PT.po
index 589f3dc7c..3d292221a 100644
--- a/language/anope.pt_PT.po
+++ b/language/anope.pt_PT.po
@@ -4792,7 +4792,7 @@ msgstr ""
 "to them.  (However, no more than %s messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4814,7 +4814,7 @@ msgstr ""
 "be sent to them.  (However, no more than %s messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8993,7 +8993,7 @@ msgstr "Successor do canal %s removido."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "Opção SuperAdmin não habilitada no arquivo services.conf"
+msgstr "Opção SuperAdmin não habilitada no arquivo anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/language/anope.ru_RU.po b/language/anope.ru_RU.po
index bf6db2d8d..387098b66 100644
--- a/language/anope.ru_RU.po
+++ b/language/anope.ru_RU.po
@@ -3795,7 +3795,7 @@ msgid ""
 msgstr ""
 "Синтаксис: RELOAD\n"
 "\n"
-"Заставляет сервисы перечитать конфигурационный файл services.conf.\n"
+"Заставляет сервисы перечитать конфигурационный файл anope.conf.\n"
 "Примечание: активация некоторых новых/измененных директив конфига\n"
 "требует  полного  перезапуска  сервисов  (например: изменение ников\n"
 "сервисов, активация лимитирования сессий, и т.д.)"
@@ -4905,7 +4905,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда LOGONNEWS ADD позволяет добавить новость в список.\n"
 "\n"
@@ -4934,7 +4934,7 @@ msgstr ""
 "Стоит заметить, что во избежание  флуда пользователь получит только\n"
 "%d новость(и), так что если у  вас в списке их  больше - показаны\n"
 "будут только  последние из них. Значение  NewsCount,  отвечающее за\n"
-"одновременно посылаемое кол-во новостей, указывается в services.conf\n"
+"одновременно посылаемое кол-во новостей, указывается в anope.conf\n"
 "\n"
 "Команда OPERNEWS ADD позволяет добавить новость в список.\n"
 "\n"
diff --git a/language/anope.tr_TR.po b/language/anope.tr_TR.po
index deed44887..1f44e95f9 100644
--- a/language/anope.tr_TR.po
+++ b/language/anope.tr_TR.po
@@ -4782,7 +4782,7 @@ msgstr ""
 "to them.  (However, no more than %d messages will be\n"
 "sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "LOGONNEWS may only be used by Services Operators."
 
@@ -4804,7 +4804,7 @@ msgstr ""
 "be sent to them.  (However, no more than %d messages will\n"
 "be sent in order to avoid flooding the user.  If there are\n"
 "more news messages, only the most recent will be sent.)\n"
-"NewsCount can be configured in services.conf.\n"
+"NewsCount can be configured in anope.conf.\n"
 "\n"
 "OPERNEWS may only be used by Services Operators."
 
@@ -8985,7 +8985,7 @@ msgstr "%s için successor kaldırıldı."
 #, fuzzy
 msgid ""
 "Super admin can not be set because it is not enabled in the configuration."
-msgstr "SuperAdmin setting not enabled in services.conf"
+msgstr "SuperAdmin setting not enabled in anope.conf"
 
 #: modules/commands/ns_suspend.cpp:60
 #, fuzzy
diff --git a/src/config.cpp b/src/config.cpp
index 3b8e5c34d..b1fc8c8af 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -19,7 +19,7 @@
 
 using namespace Configuration;
 
-File ServicesConf("services.conf", false); // Services configuration file name
+File ServicesConf("anope.conf", false); // Services 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 31eae9901..1f60dd4b7 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -488,7 +488,7 @@ void Anope::Init(int ac, char **av)
 	catch (const ConfigException &ex)
 	{
 		Log(LOG_TERMINAL) << ex.GetReason();
-		Log(LOG_TERMINAL) << "*** Support resources: Read through the services.conf self-contained";
+		Log(LOG_TERMINAL) << "*** Support resources: Read through the anope.conf self-contained";
 		Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
 		Log(LOG_TERMINAL) << "*** folder. Visit our portal located at https://www.anope.org/. Join";
 		Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";
diff --git a/src/tools/anoperc.in b/src/tools/anoperc.in
index 8cf265ab7..bdcbe06a8 100644
--- a/src/tools/anoperc.in
+++ b/src/tools/anoperc.in
@@ -14,8 +14,8 @@
 
 
 
-ANOPEPID="@INSTDIR@/data/services.pid"
-ANOPROG="@INSTDIR@/bin/services"
+ANOPEPID="@INSTDIR@/data/anope.pid"
+ANOPROG="@INSTDIR@/bin/anope"
 LOG="@INSTDIR@/logs/"
 ARCVERSION="2"