Merge pull request #138 from SaberUK/master+always-anope

Use "anope" everywhere instead of "services". 

4 files changed, 11 insertions, 11 deletions

diff --git a/data/example.conf b/data/anope.example.conf
index 6843c8021..a09ce2378 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".
+ * 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
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/anope.conf"
 }
 
 /*
@@ -231,13 +231,13 @@ serverinfo
 	 * The filename containing the Services 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"
 }
 
 /*
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 7048e5e43..10c6255f9 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -695,7 +695,7 @@ module { name = "help" }
 
 	/* 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 1c83bede1..9b5c166ff 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -523,7 +523,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 = "operserv/reload" }
 command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }